Release 980822
Sat Aug 22 17:46:19 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [include/dosexe.h] [include/module.h] [include/pe_image.h]
[include/process.h] [include/windows.h] [loader/dos/module.c]
[loader/module.c] [loader/ne/module.c] [loader/pe_image.c]
[scheduler/process.c] [win32/process.c]
Partially implemented CreateProcess32.
* [win32/device.c] [relay32/kernel32.spec] [scheduler/k32obj.c]
[misc/registry.c] [win32/file.c]
Partially implemented VxDCall (VMM registry services).
* [files/dos_fs.c]
DOSFS_FindNext made thread-safe.
* [include/sig_context.h] [include/syslevel.h] [loader/signal.c]
[scheduler/syslevel.c] [tools/build.c]
Replaced CALLTO16_Current_fs by SYSLEVEL_Win16CurrentTeb.
* [win32/kernel32.c]
Bugfix: QT_Thunk/FT_Thunk should return 'long' in DX:AX, not EAX.
* [if1632/relay.c] [relay32/builtin32.c] [windows/msgbox.c]
[msdos/int20.c] [msdos/int21.c]
Use ExitProcess instead of TASK_KillCurrentTask.
* [include/task.h] [include/thread.h] [loader/task.c]
[scheduler/thread.c] [include/queue.h] [windows/message.c]
[windows/queue.c] [windows/win.c]
Prevent Win32 threads from entering the TASK_Reschedule loop.
(Note: Win32 messaging still doesn't work correctly; this patch
is just preventing the system from crashing when Win32 threads
call messaging functions. Messages will probably still get lost.)
* [scheduler/critsection.c]
Deactivated the use of SEM_UNDO for the SYSTEM_LOCK semaphore;
for some reason, this leads to problems after threads terminate...
Sat Aug 22 15:00:00 1998 Jürgen Schmied <juergen.schmied@metronet.de>
* [include/authors.h]
New file, includes all names of the developer (former shell.c)
* [Makefile.in][configure][configure.in][dlls/Makefile.in]
[dlls/shell32/Makefile.in][shres.rc]
Created dlls/shell32 and moved the shell32 stuff in it.
Started to create internal resources.
* [dlls/shell32/*]
Split the shell32 implementation into smaller files.
New classes: IContextMenu, IExtractIcon, IShellView.
Implemented Shell_GetImageList().
shell32 links to comctl32 now dynamically so it can use
internal/external implementations.
* [documentation/internal-dll] [documentation/shell32]
New, could anybody do a spellcheck?
* [include/commctrl.h]
Many new LV constants, structures, functions.
* [controls/comctl32undoc.c]
Rewrote the DSA* functions.
* [windows/winpos.c]
SetShellWindow32, GetShellWindow32.
Sat Aug 22 14:02:15 1998 Alexander Lukyanov <lav@long.yar.ru>
* [loader/resource.c]
Mark last accelerator as such in LoadAccelerators32W.
* [relay32/shell32.spec] [misc/shell.c]
Add stubs for SHGetSpecialFolderPath[AW].
Sat Aug 22 02:07:42 1998 Adrian Harvey <adrian@select.com.au>
* [include/file.h] [file/file.c] [msdos/int21.c] [msdos/vxd.c]
[misc/lzexpand.c] [win32/kernel32.c] [documentation/filehandles]
Fixed file handle handling. Created universal HFILE16 to HFILE32
translation macro from msdos/int21 code by Ove Kaaven.
Used macro in all Win16 functions so that win32 handles are translated
to avoid DOS/Win16 stdxx handles.
Removed handle translation from int21.c where Win16 functions are
called. Changed remaining calls to use new macro names.
Documented filehandle handling and differences between win 16 & 32.
Fri Aug 21 20:32:49 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [server/process.c] [server/thread.c]
Implemented object wait queues and synchronization.
Fri Aug 21 18:40:02 1998 Huw D M Davies <daviesh@abacus.physics.ox.ac.uk>
* [graphics/psdrv/*]
DEVMODE dmPaper{Width|Length} fields are in 0.1mm.
Select a 100 pixel default font in CreateDC.
Thu Aug 20 22:47:39 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
* [objects/bitmap.c]
Handle bits=32 in SetBitmapBits32 and GetBitmapBits32.
* [msdos/int21.c]
Add handling of Int21 0A and 37.
* [misc/commdlg.c]
Use MapHModuleLS and MapHModuleSL when translating HINSTANCE16 to
HINSTANCE32 and vice versa.
* [win32/file.c]
CreateFile32A: Abort if filename == NULL.
Thu Aug 20 12:28:31 1998 Marcus Meissner <marcus@jet.franken.de>
* [*/*]
Lots of missing prototypes added, some parameter types adapted to match
SDK.
* [debugger/stabs.c]
Don't loop forever if we don't find wine or one of the libxxx.so.
* [loader/ne/module.c]
Implemented MapHModuleLS,MapHModuleSL,MapHinstLS,MapHinstSL.
* [misc/network.c]
Implemented WNetGetUser32A.
* [misc/shellord.c]
Implemented ILRemoveLastID.
* [multimedia/dsound.c]
Fixed StarCraft memory leak.
* [graphics/ddraw.c]
Removed some unnecessary simple relaying functions, tried polishing
up the Xlib implementation (still doesn't work), temp. removed Xshm
code (to be remerged with working Xlib code).
Tue Aug 18 22:29:17 1998 Ove Kaaven <ovek@arcticnet.no>
* [multimedia/mmio.c] [multimedia/mmsystem.c]
Fixed most mmio bugs, fully implementing mmioSetBuffer
buffering, ability to read memory files, and the
sndPlaySound() SND_MEMORY flag. Most mmio-using programs
now work fine.
* [include/dosexe.h] [include/miscemu.h] [include/module.h]
[loader/module.c] [loader/task.c] [msdos/dosmem.c]
Improved DOS VM flexibility and portability somewhat. (Did
I get the #ifdefs right this time, BSD-ers?)
* [msdos/int21.c]
Made "Get Current PSP address" work as expected in a DOS VM.
* [loader/dos/*]
Began improving flexibility and portability somewhat. It
should be easier to add DPMI RMCB callbacks now. The
DOS VM no longer leaves big files lying around in /tmp
after a crash.
Tue Aug 18 12:38:31 1998 Turchanov Sergey <turchanov@usa.net>
* [relay32/winmm.spec]
This patch allows WinAmp to play WAV files (at least in PCM
format).
Sun Aug 16 05:34:13 1998 Pablo Saratxaga <srtxg@chanae.alphanet.ch>
* [windows/keyboard.c]
Corrected keyboard code to properly handle keys : ? ~ and "
on non US keyboards.
Sat Aug 15 18:47:14 1998 Brian Craft <bcboy@dorothy.wanglab.brandeis.edu>
* [windows/win.c]
Fixed severe bug in EnumChildWindwos().
Thu Aug 13 21:05:35 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de>
* [controls/tooltips.c]
Fixed some bugs. Added subclassing support.
* [controls/toolbar.c]
Improved tooltip integration. Fixed some bugs.
* [controls/commctrl.c]
Changed control registration and added some documentation.
Fixed ShowHideMenuCtl.
* [controls/rebar.c][include/rebar.h][include/commctrl.h]
Improved rebar implementation (still no display).
* [controls/pager.c][include/pager.h][include/commctrl.h]
Improved pager implementation (still no display).
* [misc/imagelist.c]
Fixed a bug.
* [documentation/common_controls]
Updated.
Sun Aug 9 19:50:20 1998 James Juran <jrj120@psu.edu>
* [Makefile.in] [documentation/Makefile.in]
[programs/Makefile.in] [programs/*/Makefile.in]
Added uninstall rules, cleaned up install rules a little bit.
Sun Aug 9 13:21:35 1998 Andreas Mohr <100.30936@germany.net>
* [loader/ne/module.c] [if1632/kernel.spec]
Added the undocumented HIWORD of GetModuleHandle (hFirstModule).
* [loader/ne/segment.c]
Wine forgot to set some NE_SEGFLAGS_*.
Combined with another loader change, this fixed the
"BLINKER -- error in loading module" or ghost MessageBox problem
that about 1% of all Windows programs have.
Some BLINKER programs still don't work, though.
But I'm working on it, with great help from Blinkinc.
* [loader/task.c]
InitTask needs to decrement the SP register by two as Win95 does.
Sun Aug 9 02:41:28 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de>
* [if1632/kernel.spec] [relay32/kernel32.spec] [scheduler/syslevel.c]
[loader/main.c] [win32/ordinals.c] [include/syslevel.h]
[scheduler/Makefile.in]
Implemented Win95 'syslevel' routines (including Win16Lock).
* [if1632/relay.c] [if1632/thunk.c] [tools/build.c] [loader/task.c]
[loader/ne/segment.c] [win32/kernel32.c] [memory/selector.c]
[include/stackframe.h] [include/thread.h]
16-bit %fs handling revised. Use Win16Lock where appropriate.
* [include/thread.h] [scheduler/synchro.c] [windows/message.c]
[windows/queue.c] [win32/process.c]
Implemented MsgWaitForMultipleObjects.
* [files/change.c] [files/Makefile.in] [scheduler/k32obj.c]
[win32/newfns.c]
Implemented (dummy) file change notification objects.
* [debugger/dbg.y] [scheduler/process.c] [scheduler/thread.c]
[include/process.h] [include/thread.h]
Suspend all threads except current when hitting debugger break point.
* [objects/dib.c]
Bugfix for CreateDIBSection.
diff --git a/server/object.c b/server/object.c
index 17a6843..c05a310 100644
--- a/server/object.c
+++ b/server/object.c
@@ -69,6 +69,8 @@
{
obj->refcount = 1;
obj->ops = ops;
+ obj->head = NULL;
+ obj->tail = NULL;
if (!name) obj->name = NULL;
else obj->name = add_name( obj, name );
}
@@ -89,6 +91,9 @@
assert( obj->refcount );
if (!--obj->refcount)
{
+ /* if the refcount is 0, nobody can be in the wait queue */
+ assert( !obj->head );
+ assert( !obj->tail );
if (obj->name) free_name( obj );
obj->ops->destroy( obj );
}
diff --git a/server/process.c b/server/process.c
index b3adcb2..06d3d63 100644
--- a/server/process.c
+++ b/server/process.c
@@ -6,6 +6,7 @@
#include <assert.h>
#include <limits.h>
+#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
@@ -54,12 +55,17 @@
/* process operations */
static void dump_process( struct object *obj, int verbose );
+static int process_signaled( struct object *obj, struct thread *thread );
+static int process_satisfied( struct object *obj, struct thread *thread );
static void destroy_process( struct object *obj );
static void free_handles( struct process *process );
+static int copy_handle_table( struct process *process, struct process *parent );
static const struct object_ops process_ops =
{
dump_process,
+ process_signaled,
+ process_satisfied,
destroy_process
};
@@ -67,10 +73,10 @@
struct process *create_process(void)
{
struct process *process;
- struct handle_entry *entries;
if (!(process = malloc( sizeof(*process) ))) return NULL;
- if (!(entries = malloc( MIN_HANDLE_ENTRIES * sizeof(struct handle_entry))))
+
+ if (!copy_handle_table( process, current ? current->process : NULL ))
{
free( process );
return NULL;
@@ -81,14 +87,12 @@
process->thread_list = NULL;
process->exit_code = 0x103; /* STILL_ACTIVE */
process->running_threads = 0;
- process->handle_count = MIN_HANDLE_ENTRIES;
- process->handle_last = -1;
- process->entries = entries;
if (first_process) first_process->prev = process;
first_process = process;
gettimeofday( &process->start_time, NULL );
+ /* alloc a handle for the process itself */
alloc_handle( process, process, PROCESS_ALL_ACCESS, 0 );
return process;
}
@@ -105,6 +109,7 @@
if (process->prev) process->prev->next = process->next;
else first_process = process->next;
free_handles( process );
+ if (debug_level) memset( process, 0xbb, sizeof(process) ); /* catch errors */
free( process );
}
@@ -117,6 +122,17 @@
printf( "Process next=%p prev=%p\n", process->next, process->prev );
}
+static int process_signaled( struct object *obj, struct thread *thread )
+{
+ struct process *process = (struct process *)obj;
+ return (process->running_threads > 0);
+}
+
+static int process_satisfied( struct object *obj, struct thread *thread )
+{
+ return 0;
+}
+
/* get a process from an id (and increment the refcount) */
struct process *get_process_from_id( void *id )
{
@@ -140,6 +156,7 @@
assert( !process->thread_list );
process->exit_code = exit_code;
gettimeofday( &process->end_time, NULL );
+ wake_up( &process->obj, 0 );
free_handles( process );
}
@@ -308,6 +325,45 @@
return 1;
}
+/* copy the handle table of the parent process */
+/* return 1 if OK, 0 on error */
+static int copy_handle_table( struct process *process, struct process *parent )
+{
+ struct handle_entry *ptr;
+ int i, count, last;
+
+ if (!parent) /* first process */
+ {
+ count = MIN_HANDLE_ENTRIES;
+ last = -1;
+ }
+ else
+ {
+ assert( parent->entries );
+ count = parent->handle_count;
+ last = parent->handle_last;
+ }
+
+ if (!(ptr = malloc( count * sizeof(struct handle_entry)))) return 0;
+ process->entries = ptr;
+ process->handle_count = count;
+ process->handle_last = last;
+
+ if (last >= 0)
+ {
+ memcpy( ptr, parent->entries, (last + 1) * sizeof(struct handle_entry) );
+ for (i = 0; i <= last; i++, ptr++)
+ {
+ if (!ptr->ptr) continue;
+ if (ptr->access & RESERVED_INHERIT) grab_object( ptr->ptr );
+ else ptr->ptr = NULL; /* don't inherit this entry */
+ }
+ }
+ /* attempt to shrink the table */
+ shrink_handle_table( process );
+ return 1;
+}
+
/* close a handle and decrement the refcount of the associated object */
/* return 1 if OK, 0 on error */
int close_handle( struct process *process, int handle )
@@ -390,7 +446,7 @@
if (!process->entries) return;
entry = process->entries;
- for (i = 0; i < process->handle_last; i++, entry++)
+ for (i = 0; i <= process->handle_last; i++, entry++)
{
if (!entry->ptr) continue;
printf( "%5d: %p %08x ", i + 1, entry->ptr, entry->access );
diff --git a/server/request.c b/server/request.c
index 397fe4f..e481d76 100644
--- a/server/request.c
+++ b/server/request.c
@@ -7,6 +7,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
@@ -71,7 +72,7 @@
current = thread;
if (debug_level) trace_timeout();
CLEAR_ERROR();
- send_reply( current, -1, 0 );
+ thread_timeout();
current = NULL;
}
@@ -131,6 +132,12 @@
/* create a new thread */
DECL_HANDLER(init_thread)
{
+ if (current->state != STARTING)
+ {
+ fatal_protocol_error( "init_thread: already running\n" );
+ return;
+ }
+ current->state = RUNNING;
current->unix_pid = req->unix_pid;
if (!(current->name = malloc( len + 1 )))
{
@@ -213,7 +220,21 @@
send_reply( current, -1, 1, &reply, sizeof(reply) );
}
-/* open a handle a process */
+/* fetch information about a thread */
+DECL_HANDLER(get_thread_info)
+{
+ struct thread *thread;
+ struct get_thread_info_reply reply = { 0, 0 };
+
+ if ((thread = get_thread_from_handle( req->handle, THREAD_QUERY_INFORMATION )))
+ {
+ get_thread_info( thread, &reply );
+ release_object( thread );
+ }
+ send_reply( current, -1, 1, &reply, sizeof(reply) );
+}
+
+/* open a handle to a process */
DECL_HANDLER(open_process)
{
struct open_process_reply reply = { -1 };
@@ -226,3 +247,12 @@
}
send_reply( current, -1, 1, &reply, sizeof(reply) );
}
+
+/* select on a handle list */
+DECL_HANDLER(select)
+{
+ if (len != req->count * sizeof(int))
+ fatal_protocol_error( "select: bad length %d for %d handles\n",
+ len, req->count );
+ sleep_on( current, req->count, (int *)data, req->flags, req->timeout );
+}
diff --git a/server/socket.c b/server/socket.c
index 5d96a93..fd85741 100644
--- a/server/socket.c
+++ b/server/socket.c
@@ -165,9 +165,6 @@
#endif
int ret;
- if (client->state == RUNNING) client->state = SENDING;
- assert( client->state == SENDING );
-
if (client->count < sizeof(client->head))
{
vec.iov_base = (char *)&client->head + client->count;
@@ -207,6 +204,9 @@
return;
}
+ if (client->state == RUNNING) client->state = SENDING;
+ assert( client->state == SENDING );
+
client->count += ret;
/* received the complete header yet? */
diff --git a/server/thread.c b/server/thread.c
index 206e1a9..e250cc8 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <sys/uio.h>
#include <unistd.h>
@@ -19,14 +20,37 @@
#include "server/thread.h"
+/* thread queues */
+
+struct wait_queue_entry
+{
+ struct wait_queue_entry *next;
+ struct wait_queue_entry *prev;
+ struct object *obj;
+ struct thread *thread;
+};
+
+struct thread_wait
+{
+ int count; /* count of objects */
+ int flags;
+ struct timeval timeout;
+ struct wait_queue_entry queues[1];
+};
+
+
/* thread operations */
static void dump_thread( struct object *obj, int verbose );
+static int thread_signaled( struct object *obj, struct thread *thread );
+static int thread_satisfied( struct object *obj, struct thread *thread );
static void destroy_thread( struct object *obj );
static const struct object_ops thread_ops =
{
dump_thread,
+ thread_signaled,
+ thread_satisfied,
destroy_thread
};
@@ -55,7 +79,9 @@
thread->process = process;
thread->unix_pid = 0; /* not known yet */
thread->name = NULL;
+ thread->wait = NULL;
thread->error = 0;
+ thread->state = STARTING;
thread->exit_code = 0x103; /* STILL_ACTIVE */
thread->next = first_thread;
thread->prev = NULL;
@@ -104,6 +130,7 @@
if (thread->prev) thread->prev->next = thread->next;
else first_thread = thread->next;
if (thread->name) free( thread->name );
+ if (debug_level) memset( thread, 0xaa, sizeof(thread) ); /* catch errors */
free( thread );
}
@@ -117,6 +144,17 @@
thread->unix_pid, thread->client_fd, thread->name );
}
+static int thread_signaled( struct object *obj, struct thread *thread )
+{
+ struct thread *mythread = (struct thread *)obj;
+ return (mythread->state == TERMINATED);
+}
+
+static int thread_satisfied( struct object *obj, struct thread *thread )
+{
+ return 0;
+}
+
/* get a thread pointer from a thread id (and increment the refcount) */
struct thread *get_thread_from_id( void *id )
{
@@ -133,6 +171,14 @@
access, &thread_ops );
}
+/* get all information about a thread */
+void get_thread_info( struct thread *thread,
+ struct get_thread_info_reply *reply )
+{
+ reply->pid = thread;
+ reply->exit_code = thread->exit_code;
+}
+
/* send a reply to a thread */
int send_reply( struct thread *thread, int pass_fd, int n,
... /* arg_1, len_1, ..., arg_n, len_n */ )
@@ -152,6 +198,201 @@
return send_reply_v( thread->client_fd, thread->error, pass_fd, vec, n );
}
+/* add a thread to an object wait queue; return 1 if OK, 0 on error */
+static void add_queue( struct object *obj, struct wait_queue_entry *entry )
+{
+ entry->obj = obj;
+ entry->prev = obj->tail;
+ entry->next = NULL;
+ if (obj->tail) obj->tail->next = entry;
+ else obj->head = entry;
+ obj->tail = entry;
+}
+
+/* remove a thread from an object wait queue */
+static void remove_queue( struct wait_queue_entry *entry )
+{
+ struct object *obj = entry->obj;
+
+ if (entry->next) entry->next->prev = entry->prev;
+ else obj->tail = entry->prev;
+ if (entry->prev) entry->prev->next = entry->next;
+ else obj->head = entry->next;
+ release_object( obj );
+}
+
+/* finish waiting */
+static void end_wait( struct thread *thread )
+{
+ struct thread_wait *wait = thread->wait;
+ struct wait_queue_entry *entry;
+ int i;
+
+ assert( wait );
+ for (i = 0, entry = wait->queues; i < wait->count; i++)
+ remove_queue( entry++ );
+ if (wait->flags & SELECT_TIMEOUT) set_timeout( thread->client_fd, NULL );
+ free( wait );
+ thread->wait = NULL;
+}
+
+/* build the thread wait structure */
+static int wait_on( struct thread *thread, int count,
+ int *handles, int flags, int timeout )
+{
+ struct thread_wait *wait;
+ struct wait_queue_entry *entry;
+ struct object *obj;
+ int i;
+
+ if ((count < 0) || (count > MAXIMUM_WAIT_OBJECTS))
+ {
+ SET_ERROR( ERROR_INVALID_PARAMETER );
+ return 0;
+ }
+ if (!(wait = malloc( sizeof(*wait) + (count-1) * sizeof(*entry) )))
+ {
+ SET_ERROR( ERROR_OUTOFMEMORY );
+ return 0;
+ }
+ thread->wait = wait;
+ wait->count = count;
+ wait->flags = flags;
+ if (flags & SELECT_TIMEOUT)
+ {
+ gettimeofday( &wait->timeout, 0 );
+ if (timeout)
+ {
+ wait->timeout.tv_usec += (timeout % 1000) * 1000;
+ if (wait->timeout.tv_usec >= 1000000)
+ {
+ wait->timeout.tv_usec -= 1000000;
+ wait->timeout.tv_sec++;
+ }
+ wait->timeout.tv_sec += timeout / 1000;
+ }
+ }
+
+ for (i = 0, entry = wait->queues; i < count; i++, entry++)
+ {
+ if (!(obj = get_handle_obj( thread->process, handles[i],
+ SYNCHRONIZE, NULL )))
+ {
+ wait->count = i - 1;
+ end_wait( thread );
+ return 0;
+ }
+ entry->thread = thread;
+ add_queue( obj, entry );
+ }
+ return 1;
+}
+
+/* check if the thread waiting condition is satisfied */
+static int check_wait( struct thread *thread, int *signaled )
+{
+ int i;
+ struct thread_wait *wait = thread->wait;
+ struct wait_queue_entry *entry = wait->queues;
+ struct timeval now;
+
+ assert( wait );
+ if (wait->flags & SELECT_ALL)
+ {
+ for (i = 0, entry = wait->queues; i < wait->count; i++, entry++)
+ if (!entry->obj->ops->signaled( entry->obj, thread )) goto check_timeout;
+ /* Wait satisfied: tell it to all objects */
+ *signaled = 0;
+ for (i = 0, entry = wait->queues; i < wait->count; i++, entry++)
+ if (entry->obj->ops->satisfied( entry->obj, thread ))
+ *signaled = STATUS_ABANDONED_WAIT_0;
+ return 1;
+ }
+ else
+ {
+ for (i = 0, entry = wait->queues; i < wait->count; i++, entry++)
+ {
+ if (!entry->obj->ops->signaled( entry->obj, thread )) continue;
+ /* Wait satisfied: tell it to the object */
+ *signaled = i;
+ if (entry->obj->ops->satisfied( entry->obj, thread ))
+ *signaled += STATUS_ABANDONED_WAIT_0;
+ return 1;
+ }
+ }
+ check_timeout:
+ if (!(wait->flags & SELECT_TIMEOUT)) return 0;
+ gettimeofday( &now, NULL );
+ if ((now.tv_sec > wait->timeout.tv_sec) ||
+ ((now.tv_sec == wait->timeout.tv_sec) &&
+ (now.tv_usec >= wait->timeout.tv_usec)))
+ {
+ *signaled = STATUS_TIMEOUT;
+ return 1;
+ }
+ return 0;
+}
+
+/* sleep on a list of objects */
+void sleep_on( struct thread *thread, int count, int *handles, int flags, int timeout )
+{
+ struct select_reply reply;
+
+ assert( !thread->wait );
+ reply.signaled = -1;
+ if (!wait_on( thread, count, handles, flags, timeout )) goto done;
+ if (!check_wait( thread, &reply.signaled ))
+ {
+ /* we need to wait */
+ if (flags & SELECT_TIMEOUT)
+ set_timeout( thread->client_fd, &thread->wait->timeout );
+ return;
+ }
+ end_wait( thread );
+ done:
+ send_reply( thread, -1, 1, &reply, sizeof(reply) );
+}
+
+/* attempt to wake up a thread */
+/* return 1 if OK, 0 if the wait condition is still not satisfied */
+static int wake_thread( struct thread *thread )
+{
+ struct select_reply reply;
+
+ if (!check_wait( thread, &reply.signaled )) return 0;
+ end_wait( thread );
+ send_reply( thread, -1, 1, &reply, sizeof(reply) );
+ return 1;
+}
+
+/* timeout for the current thread */
+void thread_timeout(void)
+{
+ struct select_reply reply;
+
+ assert( current->wait );
+
+ reply.signaled = STATUS_TIMEOUT;
+ end_wait( current );
+ send_reply( current, -1, 1, &reply, sizeof(reply) );
+}
+
+/* attempt to wake threads sleeping on the object wait queue */
+void wake_up( struct object *obj, int max )
+{
+ struct wait_queue_entry *entry = obj->head;
+
+ while (entry)
+ {
+ struct wait_queue_entry *next = entry->next;
+ if (wake_thread( entry->thread ))
+ {
+ if (max && !--max) break;
+ }
+ entry = next;
+ }
+}
+
/* kill a thread on the spot */
void kill_thread( struct thread *thread, int exit_code )
{
@@ -162,7 +403,10 @@
/* a thread has been killed */
void thread_killed( struct thread *thread, int exit_code )
{
+ thread->state = TERMINATED;
thread->exit_code = exit_code;
+ if (thread->wait) end_wait( thread );
remove_process_thread( thread->process, thread );
+ wake_up( &thread->obj, 0 );
release_object( thread );
}
diff --git a/server/trace.c b/server/trace.c
index 712edea..a9158ce 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1,6 +1,7 @@
/* File generated automatically by tools/make_requests; DO NOT EDIT!! */
#include <stdio.h>
+#include <sys/types.h>
#include <sys/uio.h>
#include "server.h"
#include "server/thread.h"
@@ -46,6 +47,17 @@
printf( " exit_code=%d", req->exit_code );
}
+static void dump_get_thread_info_request( struct get_thread_info_request *req )
+{
+ printf( " handle=%d", req->handle );
+}
+
+static void dump_get_thread_info_reply( struct get_thread_info_reply *req )
+{
+ printf( " pid=%p,", req->pid );
+ printf( " exit_code=%d", req->exit_code );
+}
+
static void dump_close_handle_request( struct close_handle_request *req )
{
printf( " handle=%d", req->handle );
@@ -79,6 +91,18 @@
printf( " handle=%d", req->handle );
}
+static void dump_select_request( struct select_request *req )
+{
+ printf( " count=%d,", req->count );
+ printf( " flags=%d,", req->flags );
+ printf( " timeout=%d", req->timeout );
+}
+
+static void dump_select_reply( struct select_reply *req )
+{
+ printf( " signaled=%d", req->signaled );
+}
+
struct dumper
{
void (*dump_req)();
@@ -103,6 +127,9 @@
{ (void(*)())dump_get_process_info_request,
(void(*)())dump_get_process_info_reply,
sizeof(struct get_process_info_request) },
+ { (void(*)())dump_get_thread_info_request,
+ (void(*)())dump_get_thread_info_reply,
+ sizeof(struct get_thread_info_request) },
{ (void(*)())dump_close_handle_request,
(void(*)())0,
sizeof(struct close_handle_request) },
@@ -112,6 +139,9 @@
{ (void(*)())dump_open_process_request,
(void(*)())dump_open_process_reply,
sizeof(struct open_process_request) },
+ { (void(*)())dump_select_request,
+ (void(*)())dump_select_reply,
+ sizeof(struct select_request) },
};
static const char * const req_names[REQ_NB_REQUESTS] =
@@ -121,9 +151,11 @@
"terminate_process",
"terminate_thread",
"get_process_info",
+ "get_thread_info",
"close_handle",
"dup_handle",
"open_process",
+ "select",
};
void trace_request( enum request req, void *data, int len, int fd )
