mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 17:06:19 +00:00
60ce85c965
Sun Feb 1 13:24:54 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [files/drive.c] Added Device= parameter to drive configuration. * [if1632/relay.c] Throw() and Catch() now use the correct CATCHBUF layout (untested). * [tools/build.c] [include/stackframe.h] [loader/task.c] Moved 16-bit stack pointer into thread database. Save current %fs while running 16-bit code. Fri Jan 30 09:25:49 1998 Martin Boehme <boehme@informatik.mu-luebeck.de> * [graphics/mapping.c] Made DPtoLP32 and LPtoDP32 respect world transforms. * [graphics/path.c] [graphics/painting.c] [if1632/gdi.spec] [include/path.h] More path support. * [include/gdi.h] [include/windows.h] [objects/dc.c] [relay/gdi32.spec] Support for Get/SetArcDirection and Get/SetWorldTransform * [windows/hook.c] Fixed a bug in HOOK_Map16To32Common. Thu Jan 29 23:43:18 1998 Douglas Ridgway <ridgway@taiga.gmcl.com> * [graphics/metafiledrv/init.c] [objects/metafile.c] Documentation for metafile related API calls. Fixed a bug to avoid documenting it. * [include/windows.h] Declaration for LoadImage. Thu Jan 29 21:44:45 1998 Huw D M Davies <h.davies1@physics.oxford.ac.uk> * [graphics/win16drv/*] Changes to printing code to enable use of printer fonts with the win3.1 postscript driver. Remember to add printer=on to [wine] section of wine.conf . You will also need to disable truetype fonts from control panel. Winword 6.0 and Write seem to be happy with this... * [include/bitmap.h] Fix Widthbytes for 15bpp displays. Tue Jan 27 20:54:08 1998 Kristian Nielsen <kristian.nielsen@risoe.dk> * [tsx11/*] [include/ts*] [tools/make_X11wrappers] Implemented thread-safe X11 wrappers. Tue Jan 27 13:54:09 1998 Constantine Sapuntzakis <csapuntz@tma-1.lcs.mit.edu> * [windows/queue.c] Forgot to convert thdb to thread_id. * [misc/registry.c] Sped up Windows 95 registry reading. Changed code to traverse registry as a tree rather than read in all possible keys (including dead ones). Tue Jan 27 12:46:09 1998 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de> * [loader/pe_image.c][Makefile.in][scheduler/thread.c] [libtest/hello5.c] Don't exit() on failed to load referenced dlls. Fixed static tls allocation for multiple threads. WINELIB should now be able to load PE dlls. A sample winelib program, that dynamically loads a internal dll is included. * [graphics/ddraw.c][include/ddraw.h][include/d3d.h] Cleaned up and enhanced further. Added several DirectX5 interface definitions and DirectSurface3 implementation. Stubs for D3D (NOT coming soon, just there so it fails safely). * [multimedia/dsound.c][include/dsound.h] Actually works now for a lot of cases. Some DirectX5 stuff added. Still lacking several features. * [windows/dinput.c][include/dinput.h] Started implementing DirectInput. Doesn't work yet, don't know why. * [if1632/thunk.c][misc/callbacks.c] [win32/kernel.c][include/callbacks.h] Added WOWCallback16Ex, WOWHandle32. * [misc/cpu.c] Fixed GetSystemInfo, IsProcessorFeaturePresent. * [multimedia/joystick.c][multimedia/time.c] Several fixes. Small hack to get timerevents in timeGetTime() loops. Tue Jan 20 11:26:27 1998 Slaven Rezic <eserte@cs.tu-berlin.de> * [configure.in] Fixed check for union semun on FreeBSD systems. Sun Jan 18 23:05:04 1998 Karl Backström <karl_b@geocities.com> * [misc/ole2nls.c] [programs/progman/Sw.rc] [programs/winhelp/Sw.rc] [resources/sysres_Sw.rc] Added/updated Swedish language support. Sun Jan 18 18:49:01 1998 Alex Korobka <alex@trantor.pharm.sunysb.edu> * [misc/winsock.c] [misc/winsock_dns.c] [windows/event.c] [windows/win.c] [windows/dce.c] [windows/winpos.c] Bug fixes. Sun Jan 18 12:45:23 1997 Andreas Mohr <100.30936@germany.net> * [msdos/int25.c] [msdos/int26.c] Implemented "native" absolute disk read/write access. * [msdos/int13.c] [msdos/ioports.c] Enhanced GET DRIVE PARAMETERS (int13 AH=08). * [graphics/win16drv/prtdrv.c] [if1632/gdi.spec] Fixed typos, implemented dmEnumDFonts, Started implementation of dmRealizeObject. * [if1632/compobj.spec] [ole/compobj.c] [relay32/ole32.spec] Stubs CoCreateInstance, CoFreeUnusedLibraries, implemented CoFileTimeNow. * [if1632/kernel.spec] [include/windows.h] [memory/global.c] [memory/string.c] [misc/kernel.c] [misc/Makefile.in] [misc/toolhelp.c] [msdos/int21.c] Implemented GlobalHandleNoRIP, GetFreeMemInfo, DebugFillBuffer, stubs GetSetKernelDOSProc, DiagQuery, DiagOutput, ToolHelpHook (Undocumented Windows). * [if1632/user.spec] [if1632/win32s16.spec] [misc/win32s16.c] Misc stubs. * [if1632/winaspi.spec] [misc/aspi.c] Implemented GetASPIDLLVersion. * [if1632/wprocs.spec] [msdos/int20.c] [msdos/Makefile.in] Added handler for Int 0x20 (terminate program, _very_ old-fashioned). * [misc/w32scomb.c] Implemented Get16DLLAddress() partially (big thanks to Marcus and Alexandre). * [relay32/Makefile.in] [relay32/builtin32.c] [relay32/dplay.spec] Added built-in DPLAY.DLL. * [relay32/winmm.spec] [multimedia/joystick.c] Added joySetThreshold. * [misc/windebug.c] Added WinNotify. * [win32/console.c] Stubs CreateConsoleScreenBuffer, SetConsoleActiveScreenBuffer, WriteConsoleOutput32A. * [windows/user.c] Stub SetEventHook. Sat Jan 17 19:30:35 1998 Matthew Toseland <Paul.Toseland@btinternet.com> * [windows/painting.c] Fixed broken restore-to-maximized. Mon Jan 12 21:25:32 1998 Perceval - Marc Huguet Puig <mhp@tinet.fut.es> * [documentation/wine.man] [include/options.h] [misc/main.c] [ole/ole2nls.c] [resources/sysres.c] [resources/sysres_Ca.rc] [resources/Makefile.in] Added language catalan. (Afegit l'idioma català).
307 lines
8.7 KiB
C
307 lines
8.7 KiB
C
/*
|
|
* Win32 critical sections
|
|
*
|
|
* Copyright 1998 Alexandre Julliard
|
|
*/
|
|
|
|
/* Note: critical sections are not implemented exactly the same way
|
|
* than under NT (LockSemaphore should be a real semaphore handle).
|
|
* But since they are even more different under Win95, it probably
|
|
* doesn't matter...
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <sys/sem.h>
|
|
#include "windows.h"
|
|
#include "winerror.h"
|
|
#include "winbase.h"
|
|
#include "heap.h"
|
|
#include "k32obj.h"
|
|
#include "thread.h"
|
|
|
|
typedef struct
|
|
{
|
|
K32OBJ header;
|
|
THREAD_QUEUE wait_queue;
|
|
BOOL32 signaled;
|
|
} CRIT_SECTION;
|
|
|
|
/* On some systems this is supposed to be defined in the program */
|
|
#ifndef HAVE_UNION_SEMUN
|
|
union semun {
|
|
int val;
|
|
struct semid_ds *buf;
|
|
ushort *array;
|
|
};
|
|
#endif
|
|
|
|
static BOOL32 CRIT_SECTION_Signaled( K32OBJ *obj, DWORD thread_id );
|
|
static BOOL32 CRIT_SECTION_Satisfied( K32OBJ *obj, DWORD thread_id );
|
|
static void CRIT_SECTION_AddWait( K32OBJ *obj, DWORD thread_id );
|
|
static void CRIT_SECTION_RemoveWait( K32OBJ *obj, DWORD thread_id );
|
|
static void CRIT_SECTION_Destroy( K32OBJ *obj );
|
|
|
|
const K32OBJ_OPS CRITICAL_SECTION_Ops =
|
|
{
|
|
CRIT_SECTION_Signaled, /* signaled */
|
|
CRIT_SECTION_Satisfied, /* satisfied */
|
|
CRIT_SECTION_AddWait, /* add_wait */
|
|
CRIT_SECTION_RemoveWait, /* remove_wait */
|
|
CRIT_SECTION_Destroy /* destroy */
|
|
};
|
|
|
|
/***********************************************************************
|
|
* InitializeCriticalSection (KERNEL32.472) (NTDLL.406)
|
|
*/
|
|
void WINAPI InitializeCriticalSection( CRITICAL_SECTION *crit )
|
|
{
|
|
CRIT_SECTION *obj;
|
|
|
|
crit->LockCount = -1;
|
|
crit->RecursionCount = 0;
|
|
crit->OwningThread = 0;
|
|
crit->LockSemaphore = 0;
|
|
if (SystemHeap)
|
|
{
|
|
if (!(obj = (CRIT_SECTION *)HeapAlloc( SystemHeap, 0, sizeof(*obj) )))
|
|
return; /* No way to return an error... */
|
|
obj->header.type = K32OBJ_CRITICAL_SECTION;
|
|
obj->header.refcount = 1;
|
|
obj->wait_queue = NULL;
|
|
obj->signaled = FALSE;
|
|
crit->LockSemaphore = (HANDLE32)obj;
|
|
crit->Reserved = (DWORD)-1;
|
|
}
|
|
else
|
|
{
|
|
union semun val;
|
|
crit->Reserved = (DWORD)semget( IPC_PRIVATE, 1, IPC_CREAT | 0777 );
|
|
if (crit->Reserved == (DWORD)-1)
|
|
{
|
|
perror( "semget" );
|
|
return;
|
|
}
|
|
val.val = 0;
|
|
semctl( (int)crit->Reserved, 0, SETVAL, val );
|
|
}
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* DeleteCriticalSection (KERNEL32.185) (NTDLL.327)
|
|
*/
|
|
void WINAPI DeleteCriticalSection( CRITICAL_SECTION *crit )
|
|
{
|
|
CRIT_SECTION *obj = (CRIT_SECTION *)crit->LockSemaphore;
|
|
|
|
if (obj)
|
|
{
|
|
if (crit->RecursionCount) /* Should not happen */
|
|
fprintf( stderr, "Deleting owned critical section (%p)\n", crit );
|
|
crit->LockCount = -1;
|
|
crit->RecursionCount = 0;
|
|
crit->OwningThread = 0;
|
|
crit->LockSemaphore = 0;
|
|
K32OBJ_DecCount( &obj->header );
|
|
}
|
|
else if (crit->Reserved != (DWORD)-1)
|
|
{
|
|
semctl( (int)crit->Reserved, 0, IPC_RMID, (union semun)0 );
|
|
}
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* EnterCriticalSection (KERNEL32.195) (NTDLL.344)
|
|
*/
|
|
void WINAPI EnterCriticalSection( CRITICAL_SECTION *crit )
|
|
{
|
|
if (InterlockedIncrement( &crit->LockCount ))
|
|
{
|
|
if (crit->OwningThread == GetCurrentThreadId())
|
|
{
|
|
crit->RecursionCount++;
|
|
return;
|
|
}
|
|
/* Now wait for it */
|
|
if (crit->LockSemaphore)
|
|
{
|
|
WAIT_STRUCT *wait = &THREAD_Current()->wait_struct;
|
|
SYSTEM_LOCK();
|
|
wait->count = 1;
|
|
wait->signaled = WAIT_FAILED;
|
|
wait->wait_all = FALSE;
|
|
wait->objs[0] = (K32OBJ *)crit->LockSemaphore;
|
|
K32OBJ_IncCount( wait->objs[0] );
|
|
SYNC_WaitForCondition( wait, INFINITE32 );
|
|
K32OBJ_DecCount( wait->objs[0] );
|
|
SYSTEM_UNLOCK();
|
|
}
|
|
else if (crit->Reserved != (DWORD)-1)
|
|
{
|
|
int ret;
|
|
struct sembuf sop;
|
|
sop.sem_num = 0;
|
|
sop.sem_op = -1;
|
|
sop.sem_flg = SEM_UNDO;
|
|
do
|
|
{
|
|
ret = semop( (int)crit->Reserved, &sop, 1 );
|
|
} while ((ret == -1) && (errno == EINTR));
|
|
}
|
|
else
|
|
{
|
|
fprintf( stderr, "Uninitialized critical section (%p)\n", crit );
|
|
return;
|
|
}
|
|
}
|
|
crit->OwningThread = GetCurrentThreadId();
|
|
crit->RecursionCount = 1;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* TryEnterCriticalSection (KERNEL32.898) (NTDLL.969)
|
|
*/
|
|
BOOL32 WINAPI TryEnterCriticalSection( CRITICAL_SECTION *crit )
|
|
{
|
|
if (InterlockedIncrement( &crit->LockCount ))
|
|
{
|
|
if (crit->OwningThread == GetCurrentThreadId())
|
|
{
|
|
crit->RecursionCount++;
|
|
return TRUE;
|
|
}
|
|
/* FIXME: this doesn't work */
|
|
InterlockedDecrement( &crit->LockCount );
|
|
return FALSE;
|
|
}
|
|
crit->OwningThread = GetCurrentThreadId();
|
|
crit->RecursionCount = 1;
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* LeaveCriticalSection (KERNEL32.494) (NTDLL.426)
|
|
*/
|
|
void WINAPI LeaveCriticalSection( CRITICAL_SECTION *crit )
|
|
{
|
|
if (crit->OwningThread != GetCurrentThreadId()) return;
|
|
|
|
if (--crit->RecursionCount)
|
|
{
|
|
InterlockedDecrement( &crit->LockCount );
|
|
return;
|
|
}
|
|
crit->OwningThread = 0;
|
|
if (InterlockedDecrement( &crit->LockCount ) >= 0)
|
|
{
|
|
/* Someone is waiting */
|
|
if (crit->LockSemaphore)
|
|
{
|
|
CRIT_SECTION *obj = (CRIT_SECTION *)crit->LockSemaphore;
|
|
SYSTEM_LOCK();
|
|
obj->signaled = TRUE;
|
|
SYNC_WakeUp( &obj->wait_queue, 1 );
|
|
SYSTEM_UNLOCK();
|
|
}
|
|
else if (crit->Reserved != (DWORD)-1)
|
|
{
|
|
struct sembuf sop;
|
|
sop.sem_num = 0;
|
|
sop.sem_op = 1;
|
|
sop.sem_flg = SEM_UNDO;
|
|
semop( (int)crit->Reserved, &sop, 1 );
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* MakeCriticalSectionGlobal (KERNEL32.515)
|
|
*/
|
|
void WINAPI MakeCriticalSectionGlobal( CRITICAL_SECTION *crit )
|
|
{
|
|
/* Nothing to do: a critical section is always global */
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* ReinitializeCriticalSection (KERNEL32.581)
|
|
*/
|
|
void WINAPI ReinitializeCriticalSection( CRITICAL_SECTION *crit )
|
|
{
|
|
DeleteCriticalSection( crit );
|
|
InitializeCriticalSection( crit );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CRIT_SECTION_Signaled
|
|
*/
|
|
static BOOL32 CRIT_SECTION_Signaled( K32OBJ *obj, DWORD thread_id )
|
|
{
|
|
CRIT_SECTION *crit = (CRIT_SECTION *)obj;
|
|
assert( obj->type == K32OBJ_CRITICAL_SECTION );
|
|
return crit->signaled;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CRIT_SECTION_Satisfied
|
|
*
|
|
* Wait on this object has been satisfied.
|
|
*/
|
|
static BOOL32 CRIT_SECTION_Satisfied( K32OBJ *obj, DWORD thread_id )
|
|
{
|
|
CRIT_SECTION *crit = (CRIT_SECTION *)obj;
|
|
assert( obj->type == K32OBJ_CRITICAL_SECTION );
|
|
/* Only one thread is allowed to wake up */
|
|
crit->signaled = FALSE;
|
|
return FALSE; /* Not abandoned */
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CRIT_SECTION_AddWait
|
|
*
|
|
* Add thread to object wait queue.
|
|
*/
|
|
static void CRIT_SECTION_AddWait( K32OBJ *obj, DWORD thread_id )
|
|
{
|
|
CRIT_SECTION *crit = (CRIT_SECTION *)obj;
|
|
assert( obj->type == K32OBJ_CRITICAL_SECTION );
|
|
THREAD_AddQueue( &crit->wait_queue, THREAD_ID_TO_THDB(thread_id) );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CRIT_SECTION_RemoveWait
|
|
*
|
|
* Remove current thread from object wait queue.
|
|
*/
|
|
static void CRIT_SECTION_RemoveWait( K32OBJ *obj, DWORD thread_id )
|
|
{
|
|
CRIT_SECTION *crit = (CRIT_SECTION *)obj;
|
|
assert( obj->type == K32OBJ_CRITICAL_SECTION );
|
|
THREAD_RemoveQueue( &crit->wait_queue, THREAD_ID_TO_THDB(thread_id) );
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CRIT_SECTION_Destroy
|
|
*/
|
|
static void CRIT_SECTION_Destroy( K32OBJ *obj )
|
|
{
|
|
CRIT_SECTION *crit = (CRIT_SECTION *)obj;
|
|
assert( obj->type == K32OBJ_CRITICAL_SECTION );
|
|
/* There cannot be any thread on the list since the ref count is 0 */
|
|
assert( crit->wait_queue == NULL );
|
|
obj->type = K32OBJ_UNKNOWN;
|
|
HeapFree( SystemHeap, 0, crit );
|
|
}
|