https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba893e11723adbea6923a1899b700e8223020eda
commit ba893e11723adbea6923a1899b700e8223020eda Author: Timo Kreuzer <[email protected]> AuthorDate: Tue Mar 13 23:00:17 2018 +0100 Commit: Timo Kreuzer <[email protected]> CommitDate: Sun Mar 10 11:14:40 2019 +0100 [WIN32K] Keep a reference on an ETHREAD while THREADINFO exists --- win32ss/user/ntuser/main.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 318a7ea70e..b790fd84ef 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -89,13 +89,6 @@ AllocW32Process(IN PEPROCESS Process, return STATUS_SUCCESS; } -#define FreeW32Process(/*Process*/ W32Process) \ -do { \ - /*PPROCESSINFO W32Process = PsGetProcessWin32Process(Process);*/ \ - /*ASSERT(W32Process);*/ \ - IntDereferenceProcessInfo(W32Process); \ -} while(0) - /* * Called from IntDereferenceProcessInfo */ @@ -332,7 +325,7 @@ ExitProcessCallback(PEPROCESS Process) ppiCurrent->peProcess = NULL; /* Finally, dereference */ - FreeW32Process(/*Process*/ ppiCurrent); // IntDereferenceProcessInfo(ppiCurrent); + IntDereferenceProcessInfo(ppiCurrent); return STATUS_SUCCESS; } @@ -397,19 +390,13 @@ AllocW32Thread(IN PETHREAD Thread, RtlZeroMemory(ptiCurrent, sizeof(*ptiCurrent)); PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); + ObReferenceObject(Thread); IntReferenceThreadInfo(ptiCurrent); *W32Thread = ptiCurrent; return STATUS_SUCCESS; } -#define FreeW32Thread(/*Thread*/ W32Thread) \ -do { \ - /*PTHREADINFO W32Thread = PsGetThreadWin32Thread(Thread);*/ \ - /*ASSERT(W32Thread);*/ \ - IntDereferenceThreadInfo(W32Thread); \ -} while(0) - /* * Called from IntDereferenceThreadInfo */ @@ -428,6 +415,8 @@ UserDeleteW32Thread(PTHREADINFO pti) MsqCleanupThreadMsgs(pti); + ObDereferenceObject(pti->pEThread); + ExFreePoolWithTag(pti, USERTAG_THREADINFO); IntDereferenceProcessInfo(ppi); @@ -845,10 +834,9 @@ ExitThreadCallback(PETHREAD Thread) /* The thread is dying */ PsSetThreadWin32Thread(Thread /*ptiCurrent->pEThread*/, NULL, ptiCurrent); - ptiCurrent->pEThread = NULL; - /* Free the THREADINFO */ - FreeW32Thread(/*Thread*/ ptiCurrent); // IntDereferenceThreadInfo(ptiCurrent); + /* Dereference the THREADINFO */ + IntDereferenceThreadInfo(ptiCurrent); return STATUS_SUCCESS; }
