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

Properly set the ref count of ethread, fixes Amped

This commit is contained in:
ergo720 2022-01-29 20:03:05 +01:00
parent 733670c7f8
commit e85af190d5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/kernel/common/types.h
View File

@ -1916,10 +1916,10 @@ KTHREAD, *PKTHREAD, *RESTRICTED_POINTER PRKTHREAD;
typedef struct _ETHREAD typedef struct _ETHREAD
{ {
struct _KTHREAD Tcb; struct _KTHREAD Tcb;
LARGE_INTEGER CreateTime; LARGE_INTEGER CreateTime; // 0x110
LARGE_INTEGER ExitTime; LARGE_INTEGER ExitTime; // 0x118
ntstatus_xt ExitStatus; // 0x120 ntstatus_xt ExitStatus; // 0x120
uchar_xt UnknownB[0x8]; // 0x124 uchar_xt Unknown[0x8]; // 0x124
HANDLE UniqueThread; // 0x12C HANDLE UniqueThread; // 0x12C
} }
ETHREAD, *PETHREAD; ETHREAD, *PETHREAD;

7
src/core/kernel/exports/EmuKrnlPs.cpp
View File

@ -288,6 +288,11 @@ XBSYSAPI EXPORTNUM(255) xbox::ntstatus_xt NTAPI xbox::PsCreateSystemThreadEx
RETURN(X_STATUS_INSUFFICIENT_RESOURCES); RETURN(X_STATUS_INSUFFICIENT_RESOURCES);
} }
// Increment the ref count of the thread once more. This is to guard against the case the title closes the thread handle
// before this thread terminates with PsTerminateSystemThread
// Test case: Amped
ObfReferenceObject(eThread);
KeQuerySystemTime(&eThread->CreateTime); KeQuerySystemTime(&eThread->CreateTime);
KiUniqueProcess.StackCount++; KiUniqueProcess.StackCount++;
RegisterXboxHandle(*ThreadHandle, handle); RegisterXboxHandle(*ThreadHandle, handle);
@ -376,6 +381,8 @@ XBSYSAPI EXPORTNUM(258) xbox::void_xt NTAPI xbox::PsTerminateSystemThread
} }
EmuKeFreeThread(ExitStatus); EmuKeFreeThread(ExitStatus);
// Don't do this in EmuKeFreeThread because we only increment the thread ref count in PsCreateSystemThreadEx
ObfDereferenceObject(eThread);
KiUniqueProcess.StackCount--; KiUniqueProcess.StackCount--;
_endthreadex(ExitStatus); _endthreadex(ExitStatus);