Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K] Attach to the target process before unhooking

Browse source 
CORE-16083
This commit is contained in:
Mark Jansen 2019-06-10 19:47:50 +02:00
parent 7a3937ddaf
commit 97d1590914
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
win32ss/user/ntuser/hook.c
View file

@ -1037,12 +1037,15 @@ BOOLEAN
IntRemoveHook(PVOID Object) IntRemoveHook(PVOID Object)
{ {
INT HookId; INT HookId;
PTHREADINFO ptiHook; PTHREADINFO ptiHook, pti;
PDESKTOP pdo; PDESKTOP pdo;
PHOOK Hook = Object; PHOOK Hook = Object;
BOOL bOtherProcess;
NT_ASSERT(UserIsEnteredExclusive());
HookId = Hook->HookId; HookId = Hook->HookId;
pti = PsGetCurrentThreadWin32Thread();
if (Hook->ptiHooked) // Local if (Hook->ptiHooked) // Local
{ {
@ -1053,6 +1056,10 @@ IntRemoveHook(PVOID Object)
if (IsListEmpty(&ptiHook->aphkStart[HOOKID_TO_INDEX(HookId)])) if (IsListEmpty(&ptiHook->aphkStart[HOOKID_TO_INDEX(HookId)]))
{ {
ptiHook->fsHooks &= ~HOOKID_TO_FLAG(HookId); ptiHook->fsHooks &= ~HOOKID_TO_FLAG(HookId);
bOtherProcess = (ptiHook->ppi != pti->ppi);
if (bOtherProcess)
KeAttachProcess(&ptiHook->ppi->peProcess->Pcb);
_SEH2_TRY _SEH2_TRY
{ {
@ -1064,6 +1071,9 @@ IntRemoveHook(PVOID Object)
(void)0; (void)0;
} }
_SEH2_END; _SEH2_END;
if (bOtherProcess)
KeDetachProcess();
} }
} }
else // Global else // Global