niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

ntdll: Don't use debug info presence to detect critical section global status.

Browse source
This commit is contained in:
Paul Gofman 2024-03-22 13:58:11 -06:00 • committed by Alexandre Julliard
parent e1606d698f
commit 2745228b14
1 changed files with 11 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
dlls/ntdll/sync.c
View file

@ -163,29 +163,16 @@ static const char *crit_section_get_name( const RTL_CRITICAL_SECTION *crit )
static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit )
{
HANDLE ret = crit->LockSemaphore;
if (!ret)
{
HANDLE sem;
if (NtCreateSemaphore( &sem, SEMAPHORE_ALL_ACCESS, NULL, 0, 1 )) return 0;
if (!(ret = InterlockedCompareExchangePointer( &crit->LockSemaphore, sem, 0 )))
ret = sem;
else
NtClose(sem); /* somebody beat us to it */
}
return ret;
if ((ULONG_PTR)crit->LockSemaphore > 1) return crit->LockSemaphore;
return NULL;
}
static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout )
{
LARGE_INTEGER time = {.QuadPart = timeout * (LONGLONG)-10000000};
HANDLE sem = get_semaphore( crit );
/* debug info is cleared by MakeCriticalSectionGlobal */
if (!crit_section_has_debuginfo( crit ))
{
HANDLE sem = get_semaphore( crit );
return NtWaitForSingleObject( sem, FALSE, &time );
}
if (sem) return NtWaitForSingleObject( sem, FALSE, &time );
else
{
LONG *lock = (LONG *)&crit->LockSemaphore;
@ -276,6 +263,8 @@ ULONG WINAPI RtlSetCriticalSectionSpinCount( RTL_CRITICAL_SECTION *crit, ULONG s
*/
NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit )
{
HANDLE sem;
crit->LockCount = -1;
crit->RecursionCount = 0;
crit->OwningThread = 0;
@ -288,11 +277,9 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit )
crit->DebugInfo = NULL;
}
}
else
{
NtClose( crit->LockSemaphore );
crit->DebugInfo = NULL;
}
else crit->DebugInfo = NULL;
if ((sem = get_semaphore( crit ))) NtClose( sem );
crit->LockSemaphore = 0;
return STATUS_SUCCESS;
}
@ -335,13 +322,9 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit )
NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit )
{
NTSTATUS ret;
HANDLE sem = get_semaphore( crit );
/* debug info is cleared by MakeCriticalSectionGlobal */
if (!crit_section_has_debuginfo( crit ))
{
HANDLE sem = get_semaphore( crit );
ret = NtReleaseSemaphore( sem, 1, NULL );
}
if (sem) ret = NtReleaseSemaphore( sem, 1, NULL );
else
{
LONG *lock = (LONG *)&crit->LockSemaphore;