
Sun Mar 1 10:45:23 1998 Andreas Mohr <100.30936@germany.net> * [loader/ne_image.c] Fixed problem with weird DLLs (NE_FFLAGS_SINGLEDATA && DGROUP = 0). * [msdos/dosmem.c] Export address for __0000H, too. * [msdos/dpmi.c] Changed MemAlloc functions to return less fragmented addresses. Sat Feb 28 18:50:12 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [scheduler/process.c] [scheduler/sysdeps.c] Don't use %fs register before threading initialization. Sat Feb 28 14:04:56 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [configure.in] [include/acconfig.h] Autoconf macro to check for non-reentrant X libraries. * [windows/winpos.c] In SetWindowPos32(), do not cause WM_SIZE messages when the SWP_NOSIZE flag is specified. This fixes the division-by-zero in Borland C++ 4.0 "Open Project" menu item. Sat Feb 28 13:11:26 1998 James Moody <013263m@dragon.acadiau.ca> * [ole/ole2nls.c] Changed "English" values from German to English. * [files/dos_fs.c] Fixed off-by-one month bug. Fri Feb 27 22:12:01 1998 Douglas Ridgway <ridgway@winehq.com> * [windows/win.c] Fix winelib class menu loading bug. * [include/module.h] [loader/module.c] LoadModule32 should be implemented in terms of CreateProcess. * [programs/view/*] Metafile viewer sample program. * [documentation/wine.texinfo] [documentation/Makefile.in] Improvements and additions, HTML target. Fri Feb 27 04:27:48 1998 Dimitrie O. Paun <dimi@cs.toronto.edu> * [*/*] Switched to the new debug messages interface. For more information please refer to documentation/debug-msgs. Because the new scheme introduces a new semantic level, I had to manually do through about 530 dprintf_xxx! The rest of about 2400 where transformed via a script. Because of the large number of changes that I had to do, some may have not come out as nicely as I wanted them. If this is the case, please let me know. There is a lot of work left to do: -- a few hundred printf's to be converted -- about 2300 fprintf's to be converted -- about 600 FIXME's to be transformed The problem is that in the above mentioned cases, a lot of manual intervention is required because a lot of the information is missing. There are also a lot of other things to be done to the interface and so forth. I have now ideas for a at least a month worth of full time work :) I will proceed with many changes in the next few releases, so please do not start modifing things because there will be a hell of a lot of conflicts. If you have ideas that you want to integrate or you want to work on different things, please coordinate with me. Thu Feb 26 13:04:29 1998 David Lee Lambert <lamber45@egr.msu.edu> * [ole/ole2nls.c] [include/windows.h] First try at OLE date- and time-formatting functions. Wed Feb 25 11:20:35 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [files/*.c] Changed dos device handling, added 'CON' devicehandling. * [graphics/ddraw.c] Bug fixes, some additions. * [if1632/builtin.c][loader/module.c][library/winestub.c] Small hack so we don't need a dummy BUILTIN_LoadModule in winestub.c. * [ole/*][relay32/ole32.spec][if1632/storage.spec] storage.dll started. winword loads documents (saving doesn't work yet, dunno why). Several ole additions, some cleanups and bugfixes. IMalloc16 implemented. * [loader/pe_image.c] Added some comments, fixed circular dll references, fixed modref ordering, fixed tls allocation. * [memory/global.c] Added validity checks before every GET_ARENA_PTR. (several functions rely on Global* return values on invalid handles, like IsTask). Implemented GlobalUnlockFree16. * [memory/virtual.c] Replaced dprintf_virtual by fprintf, so we can do 'info map' again in the debugger. Increase read linesize for Linux2.1 cases. * [misc/cpu.c][misc/registry.c] Moved cpu registry initialization to misc/cpu.c. * [multimedia/dsound.c] Enhanced, replaced GETOSPACE bufferingcheck by SETFRAGMENT. * [relay32/crtdll.spec][relay32/ntdll.spec] Replaced some ptr by respective 'str' and 'wstr' arguments for libc functions. * [scheduler/thread.c] Added some sanity checks to stackallocation, tlshandling fixed. * [tools/build.c] Fixed cdecl argumenttype order (was reversed). * [win32/ordinals.c] Implemented KERNEL_449. * [windows/dinput.c] Some fixes, needs much more work. Tomb Raider2 works with keyboard ;) Tue Feb 24 20:46:37 1998 James Juran <jrj120@psu.edu> * [windows/win.c] Fixed USER32 ordinal numbers in documentation. Sat Feb 21 12:30:38 1998 John Richardson <jrichard@zko.dec.com> * [files/file.c] [include/k32obj.h] [memory/virtual.c] [scheduler/critsection.c] [scheduler/event.c] [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/mutex.c] [scheduler/process.c] [scheduler/semaphore.c] [scheduler/thread.c] Added generic k32obj read and write routines for k32objs that support I/O. * [documentation/console] Updated console docs. * [win32/console.c] Make console work like a k32obj that supports I/O. * [include/windows.h] Make WriteFile and ReadFile take HANDLE32 for handle. Sun Feb 15 14:07:07 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [controls/menu.c] [misc/ver.c] [multimedia/dsound.c] [multimedia/joystick.c] [windows/dialog.c] Modified some dprintf_xxx's to prepare them for a new dprintf_ scheme. Basically, I changed the dprintf's that outputed a line with many dprintf calls to do just one dprintf call.
219 lines
6.0 KiB
C
219 lines
6.0 KiB
C
/*
|
|
* 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 BOOL32 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 */
|
|
NULL, /* read */
|
|
NULL, /* write */
|
|
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, SEMAPHORE_ALL_ACCESS, &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 = HANDLE_Alloc( obj, access, inherit );
|
|
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 *)HANDLE_GetObjPtr( handle, K32OBJ_SEMAPHORE,
|
|
SEMAPHORE_MODIFY_STATE )))
|
|
{
|
|
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 BOOL32 SEMAPHORE_Satisfied( K32OBJ *obj, DWORD thread_id )
|
|
{
|
|
SEMAPHORE *sem = (SEMAPHORE *)obj;
|
|
assert( obj->type == K32OBJ_SEMAPHORE );
|
|
assert( sem->count > 0 );
|
|
sem->count--;
|
|
return FALSE; /* Not abandoned */
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* 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 );
|
|
}
|