ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vcomp: Use RtlIsCriticalSectionLockedByThread to check lock owner. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2015-10-10 05:40:56 +02:00 committed by Alexandre Julliard
parent 240cf96235
commit 2964c2b34b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/vcomp/main.c
View File

@ -29,6 +29,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winternl.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/list.h" #include "wine/list.h"
@ -1051,12 +1052,6 @@ static void destroy_critsect(CRITICAL_SECTION *critsect)
HeapFree(GetProcessHeap(), 0, critsect); HeapFree(GetProcessHeap(), 0, critsect);
} }
static BOOL critsect_is_locked(CRITICAL_SECTION *critsect)
{
return critsect->OwningThread == ULongToHandle(GetCurrentThreadId()) &&
critsect->RecursionCount;
}
void CDECL omp_init_lock(omp_lock_t *lock) void CDECL omp_init_lock(omp_lock_t *lock)
{ {
TRACE("(%p)\n", lock); TRACE("(%p)\n", lock);
@ -1073,7 +1068,7 @@ void CDECL omp_set_lock(omp_lock_t *lock)
{ {
TRACE("(%p)\n", lock); TRACE("(%p)\n", lock);
if (critsect_is_locked(*lock)) if (RtlIsCriticalSectionLockedByThread(*lock))
{ {
ERR("omp_set_lock called while holding lock %p\n", *lock); ERR("omp_set_lock called while holding lock %p\n", *lock);
ExitProcess(1); ExitProcess(1);
@ -1092,7 +1087,7 @@ int CDECL omp_test_lock(omp_lock_t *lock)
{ {
TRACE("(%p)\n", lock); TRACE("(%p)\n", lock);
if (critsect_is_locked(*lock)) if (RtlIsCriticalSectionLockedByThread(*lock))
return 0; return 0;
return TryEnterCriticalSection(*lock); return TryEnterCriticalSection(*lock);