mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-14 18:45:38 +00:00
a11d7b1a68
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.
309 lines
8.8 KiB
C
309 lines
8.8 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 */
|
|
NULL, /* read */
|
|
NULL, /* write */
|
|
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 );
|
|
}
|