ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Thread safety fixes for RtlCriticalSection

This commit is contained in:
Silent 2020-10-26 20:51:19 +01:00
parent 1c465409c2
commit 4323e401d8
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/kernel/exports/EmuKrnlRtl.cpp
View File

@ -684,8 +684,7 @@ XBSYSAPI EXPORTNUM(277) xbox::void_xt NTAPI xbox::RtlEnterCriticalSection
HANDLE thread = (HANDLE)KeGetCurrentThread(); HANDLE thread = (HANDLE)KeGetCurrentThread();
CriticalSection->LockCount++; if(InterlockedIncrement(reinterpret_cast<LONG*>(&CriticalSection->LockCount)) == 0) {
if(CriticalSection->LockCount == 0) {
CriticalSection->OwningThread = thread; CriticalSection->OwningThread = thread;
CriticalSection->RecursionCount = 1; CriticalSection->RecursionCount = 1;
} }
@ -1228,10 +1227,10 @@ XBSYSAPI EXPORTNUM(294) xbox::void_xt NTAPI xbox::RtlLeaveCriticalSection
LOG_FUNC_ONE_ARG(CriticalSection); LOG_FUNC_ONE_ARG(CriticalSection);
CriticalSection->RecursionCount--; CriticalSection->RecursionCount--;
CriticalSection->LockCount--; LONG count = InterlockedDecrement(reinterpret_cast<LONG*>(&CriticalSection->LockCount));
if(CriticalSection->RecursionCount == 0) { if(CriticalSection->RecursionCount == 0) {
CriticalSection->OwningThread = 0; CriticalSection->OwningThread = 0;
if(CriticalSection->LockCount >= 0) { if(count >= 0) {
KeSetEvent((PRKEVENT)CriticalSection, (KPRIORITY)1, (boolean_xt)0); KeSetEvent((PRKEVENT)CriticalSection, (KPRIORITY)1, (boolean_xt)0);
} }
} }
@ -1647,14 +1646,14 @@ XBSYSAPI EXPORTNUM(306) xbox::boolean_xt NTAPI xbox::RtlTryEnterCriticalSection
BOOLEAN ret = false; BOOLEAN ret = false;
HANDLE thread = (HANDLE)KeGetCurrentThread(); HANDLE thread = (HANDLE)KeGetCurrentThread();
if(InterlockedCompareExchange((::PLONG)(&CriticalSection->LockCount), 0, -1) == -1) { if(InterlockedCompareExchange(reinterpret_cast<LONG*>(&CriticalSection->LockCount), 0, -1) == -1) {
CriticalSection->OwningThread = thread; CriticalSection->OwningThread = thread;
CriticalSection->RecursionCount = 1; CriticalSection->RecursionCount = 1;
ret = true; ret = true;
} }
else { else {
if(CriticalSection->OwningThread == thread) { if(CriticalSection->OwningThread == thread) {
CriticalSection->LockCount++; InterlockedIncrement(reinterpret_cast<LONG*>(&CriticalSection->LockCount));
CriticalSection->RecursionCount++; CriticalSection->RecursionCount++;
ret = true; ret = true;
} }