Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c
new file mode 100644
index 0000000..d8c1535
--- /dev/null
+++ b/scheduler/semaphore.c
@@ -0,0 +1,214 @@
+/*
+ * Win32 semaphores
+ *
+ * Copyright 1998 Alexandre Julliard
+ */
+
+#include <assert.h>
+#include "windows.h"
+#include "winerror.h"
+#include "k32obj.h"
+#include "process.h"
+#include "thread.h"
+#include "heap.h"
+
+typedef struct
+{
+ K32OBJ header;
+ THREAD_QUEUE wait_queue;
+ LONG count;
+ LONG max;
+} SEMAPHORE;
+
+static BOOL32 SEMAPHORE_Signaled( K32OBJ *obj, DWORD thread_id );
+static void SEMAPHORE_Satisfied( K32OBJ *obj, DWORD thread_id );
+static void SEMAPHORE_AddWait( K32OBJ *obj, DWORD thread_id );
+static void SEMAPHORE_RemoveWait( K32OBJ *obj, DWORD thread_id );
+static void SEMAPHORE_Destroy( K32OBJ *obj );
+
+const K32OBJ_OPS SEMAPHORE_Ops =
+{
+ SEMAPHORE_Signaled, /* signaled */
+ SEMAPHORE_Satisfied, /* satisfied */
+ SEMAPHORE_AddWait, /* add_wait */
+ SEMAPHORE_RemoveWait, /* remove_wait */
+ SEMAPHORE_Destroy /* destroy */
+};
+
+
+/***********************************************************************
+ * CreateSemaphore32A (KERNEL32.174)
+ */
+HANDLE32 WINAPI CreateSemaphore32A( SECURITY_ATTRIBUTES *sa, LONG initial,
+ LONG max, LPCSTR name )
+{
+ HANDLE32 handle;
+ SEMAPHORE *sem;
+
+ /* Check parameters */
+
+ if ((max <= 0) || (initial < 0) || (initial > max))
+ {
+ SetLastError( ERROR_INVALID_PARAMETER );
+ return INVALID_HANDLE_VALUE32;
+ }
+
+ SYSTEM_LOCK();
+ sem = (SEMAPHORE *)K32OBJ_Create( K32OBJ_SEMAPHORE, sizeof(*sem),
+ name, &handle );
+ if (sem)
+ {
+ /* Finish initializing it */
+ sem->wait_queue = NULL;
+ sem->count = initial;
+ sem->max = max;
+ K32OBJ_DecCount( &sem->header );
+ }
+ SYSTEM_UNLOCK();
+ return handle;
+}
+
+
+/***********************************************************************
+ * CreateSemaphore32W (KERNEL32.175)
+ */
+HANDLE32 WINAPI CreateSemaphore32W( SECURITY_ATTRIBUTES *sa, LONG initial,
+ LONG max, LPCWSTR name )
+{
+ LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
+ HANDLE32 ret = CreateSemaphore32A( sa, initial, max, nameA );
+ if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
+ return ret;
+}
+
+
+/***********************************************************************
+ * OpenSemaphore32A (KERNEL32.545)
+ */
+HANDLE32 WINAPI OpenSemaphore32A( DWORD access, BOOL32 inherit, LPCSTR name )
+{
+ HANDLE32 handle = 0;
+ K32OBJ *obj;
+ SYSTEM_LOCK();
+ if ((obj = K32OBJ_FindNameType( name, K32OBJ_SEMAPHORE )) != NULL)
+ {
+ handle = PROCESS_AllocHandle( obj, 0 );
+ K32OBJ_DecCount( obj );
+ }
+ SYSTEM_UNLOCK();
+ return handle;
+}
+
+
+/***********************************************************************
+ * OpenSemaphore32W (KERNEL32.546)
+ */
+HANDLE32 WINAPI OpenSemaphore32W( DWORD access, BOOL32 inherit, LPCWSTR name )
+{
+ LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
+ HANDLE32 ret = OpenSemaphore32A( access, inherit, nameA );
+ if (nameA) HeapFree( GetProcessHeap(), 0, nameA );
+ return ret;
+}
+
+
+/***********************************************************************
+ * ReleaseSemaphore (KERNEL32.583)
+ */
+BOOL32 WINAPI ReleaseSemaphore( HANDLE32 handle, LONG count, LONG *previous )
+{
+ SEMAPHORE *sem;
+
+ SYSTEM_LOCK();
+ if (!(sem = (SEMAPHORE *)PROCESS_GetObjPtr( handle, K32OBJ_SEMAPHORE )))
+ {
+ SYSTEM_UNLOCK();
+ return FALSE;
+ }
+ if (previous) *previous = sem->count;
+ if (sem->count + count > sem->max)
+ {
+ SYSTEM_UNLOCK();
+ SetLastError( ERROR_TOO_MANY_POSTS );
+ return FALSE;
+ }
+ if (sem->count > 0)
+ {
+ /* There cannot be any thread waiting if the count is > 0 */
+ assert( sem->wait_queue == NULL );
+ sem->count += count;
+ }
+ else
+ {
+ sem->count = count;
+ SYNC_WakeUp( &sem->wait_queue, count );
+ }
+ K32OBJ_DecCount( &sem->header );
+ SYSTEM_UNLOCK();
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * SEMAPHORE_Signaled
+ */
+static BOOL32 SEMAPHORE_Signaled( K32OBJ *obj, DWORD thread_id )
+{
+ SEMAPHORE *sem = (SEMAPHORE *)obj;
+ assert( obj->type == K32OBJ_SEMAPHORE );
+ return (sem->count > 0);
+}
+
+
+/***********************************************************************
+ * SEMAPHORE_Satisfied
+ *
+ * Wait on this object has been satisfied.
+ */
+static void SEMAPHORE_Satisfied( K32OBJ *obj, DWORD thread_id )
+{
+ SEMAPHORE *sem = (SEMAPHORE *)obj;
+ assert( obj->type == K32OBJ_SEMAPHORE );
+ assert( sem->count > 0 );
+ sem->count--;
+}
+
+
+/***********************************************************************
+ * SEMAPHORE_AddWait
+ *
+ * Add current thread to object wait queue.
+ */
+static void SEMAPHORE_AddWait( K32OBJ *obj, DWORD thread_id )
+{
+ SEMAPHORE *sem = (SEMAPHORE *)obj;
+ assert( obj->type == K32OBJ_SEMAPHORE );
+ THREAD_AddQueue( &sem->wait_queue, THREAD_ID_TO_THDB(thread_id) );
+}
+
+
+/***********************************************************************
+ * SEMAPHORE_RemoveWait
+ *
+ * Remove thread from object wait queue.
+ */
+static void SEMAPHORE_RemoveWait( K32OBJ *obj, DWORD thread_id )
+{
+ SEMAPHORE *sem = (SEMAPHORE *)obj;
+ assert( obj->type == K32OBJ_SEMAPHORE );
+ THREAD_RemoveQueue( &sem->wait_queue, THREAD_ID_TO_THDB(thread_id) );
+}
+
+
+/***********************************************************************
+ * SEMAPHORE_Destroy
+ */
+static void SEMAPHORE_Destroy( K32OBJ *obj )
+{
+ SEMAPHORE *sem = (SEMAPHORE *)obj;
+ assert( obj->type == K32OBJ_SEMAPHORE );
+ /* There cannot be any thread on the list since the ref count is 0 */
+ assert( sem->wait_queue == NULL );
+ obj->type = K32OBJ_UNKNOWN;
+ HeapFree( SystemHeap, 0, sem );
+}
