Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 11:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.13][NTUSER] NtUserWaitForInputIdle: Fix unhandled exception BSOD 0x1E, and tweaks

Browse source 
Backport the following commits:

0.4.15-dev-6397-g 6b7efb331c [NTUSER] co_IntSendMessageWithCallBack: Formatting only, no functional changes
0.4.15-dev-6227-g c7e4c3a8e9 [NTUSER] NtUserWaitForInputIdle: Fix unhandled exception BSOD 0x1E CORE-18728 CORE-19014 (#5391)
0.4.15-dev-697-g 9f428f5522 [NTUSER] Demote ERR to TRACE, also some minor corrections (#3132)

win32k.sys master GCC8.4.0dbg RosBEWin2.2.0              3.477.504
win32k.sys 0.4.14 GCC4.7.2dbg RosBEWin2.1.6 2.904.064 -> 2.904.064
win32k.sys 0.4.13 GCC4.7.2dbg RosBEWin2.1.6 2.895.872 -> 2.895.872
win32k.sys 0.4.12 GCC4.7.2dbg RosBEWin2.1.6 2.887.680 -> 2.887.680
win32k.sys 0.4.11 GCC4.7.2dbg RosBEWin2.1.6 2.867.200 -> 2.867.200
win32k.sys 0.4.10 GCC4.7.2dbg RosBEWin2.1.6 2.863.104 -> 2.863.104
win32k.sys 0.4. 9 GCC4.7.2dbg RosBEWin2.1.6 2.834.432 -> 2.834.432
win32k.sys 0.4. 8 GCC4.7.2dbg RosBEWin2.1.6 2.830.336 -> 2.830.336
win32k.sys 0.4. 7 GCC4.7.2dbg RosBEWin2.1.6 2.830.336 -> 2.830.336
This commit is contained in:
Joachim Henze 2023-07-30 21:48:42 +02:00
parent 6e0018d86b
commit 866a12fe3c
1 changed files with 41 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

23
win32ss/user/ntuser/message.c
View file

@ -2,7 +2,6 @@
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem * PROJECT: ReactOS Win32k subsystem
* PURPOSE: Messages * PURPOSE: Messages
* FILE: win32ss/user/ntuser/message.c
* PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net) * PROGRAMER: Casper S. Hornstrup (chorns@users.sourceforge.net)
*/ */
@ -788,7 +787,7 @@ static LRESULT handle_internal_message( PWND pWnd, UINT msg, WPARAM wparam, LPAR
} }
case WM_ASYNC_DESTROYWINDOW: case WM_ASYNC_DESTROYWINDOW:
{ {
ERR("WM_ASYNC_DESTROYWINDOW\n"); TRACE("WM_ASYNC_DESTROYWINDOW\n");
if (pWnd->style & WS_CHILD) if (pWnd->style & WS_CHILD)
return co_UserFreeWindow(pWnd, PsGetCurrentProcessWin32Process(), PsGetCurrentThreadWin32Thread(), TRUE); return co_UserFreeWindow(pWnd, PsGetCurrentProcessWin32Process(), PsGetCurrentThreadWin32Thread(), TRUE);
else else
@ -1734,7 +1733,7 @@ co_IntSendMessageWithCallBack( HWND hWnd,
if (!(Window = UserGetWindowObject(hWnd))) if (!(Window = UserGetWindowObject(hWnd)))
{ {
TRACE("SendMessageWithCallBack: Invalid handle 0x%p!\n",hWnd); TRACE("SendMessageWithCallBack: Invalid handle 0x%p\n",hWnd);
RETURN(FALSE); RETURN(FALSE);
} }
@ -1743,17 +1742,14 @@ co_IntSendMessageWithCallBack( HWND hWnd,
if (Window->state & WNDS_DESTROYED) if (Window->state & WNDS_DESTROYED)
{ {
/* FIXME: last error? */ /* FIXME: last error? */
ERR("Attempted to send message to window %p that is being destroyed!\n", hWnd); ERR("Attempted to send message to window %p that is being destroyed\n", hWnd);
RETURN(FALSE); RETURN(FALSE);
} }
Win32Thread = PsGetCurrentThreadWin32Thread(); Win32Thread = PsGetCurrentThreadWin32Thread();
if (Win32Thread == NULL || if (Win32Thread == NULL || Win32Thread->TIF_flags & TIF_INCLEANUP)
Win32Thread->TIF_flags & TIF_INCLEANUP)
{
RETURN(FALSE); RETURN(FALSE);
}
ptiSendTo = IntSendTo(Window, Win32Thread, Msg); ptiSendTo = IntSendTo(Window, Win32Thread, Msg);
@ -1762,7 +1758,7 @@ co_IntSendMessageWithCallBack( HWND hWnd,
{ {
if (Win32Thread->TIF_flags & TIF_INCLEANUP) RETURN(FALSE); if (Win32Thread->TIF_flags & TIF_INCLEANUP) RETURN(FALSE);
TRACE("SMWCB: Internal Message!\n"); TRACE("SMWCB: Internal Message\n");
Result = (ULONG_PTR)handle_internal_message(Window, Msg, wParam, lParam); Result = (ULONG_PTR)handle_internal_message(Window, Msg, wParam, lParam);
if (uResult) *uResult = Result; if (uResult) *uResult = Result;
RETURN(TRUE); RETURN(TRUE);
@ -1851,7 +1847,7 @@ co_IntSendMessageWithCallBack( HWND hWnd,
if(!(Message = AllocateUserMessage(FALSE))) if(!(Message = AllocateUserMessage(FALSE)))
{ {
ERR("MsqSendMessage(): Not enough memory to allocate a message"); ERR("Failed to allocate message\n");
RETURN(FALSE); RETURN(FALSE);
} }
@ -1863,7 +1859,7 @@ co_IntSendMessageWithCallBack( HWND hWnd,
Message->lResult = 0; Message->lResult = 0;
Message->QS_Flags = 0; Message->QS_Flags = 0;
Message->ptiReceiver = ptiSendTo; Message->ptiReceiver = ptiSendTo;
Message->ptiSender = NULL; // mjmartin, you are right! This is null. Message->ptiSender = NULL;
Message->ptiCallBackSender = Win32Thread; Message->ptiCallBackSender = Win32Thread;
Message->CompletionCallback = CompletionCallback; Message->CompletionCallback = CompletionCallback;
Message->CompletionCallbackContext = CompletionCallbackContext; Message->CompletionCallbackContext = CompletionCallbackContext;
@ -3094,14 +3090,12 @@ NtUserWaitForInputIdle( IN HANDLE hProcess,
Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000; Timeout.QuadPart = (LONGLONG) dwMilliseconds * (LONGLONG) -10000;
KeStackAttachProcess(&Process->Pcb, &ApcState); KeStackAttachProcess(&Process->Pcb, &ApcState);
W32Process->W32PF_flags |= W32PF_WAITFORINPUTIDLE; W32Process->W32PF_flags |= W32PF_WAITFORINPUTIDLE;
for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling)
{ {
pti->TIF_flags |= TIF_WAITFORINPUTIDLE; pti->TIF_flags |= TIF_WAITFORINPUTIDLE;
pti->pClientInfo->dwTIFlags = pti->TIF_flags; pti->pClientInfo->dwTIFlags = pti->TIF_flags;
} }
KeUnstackDetachProcess(&ApcState); KeUnstackDetachProcess(&ApcState);
TRACE("WFII: ppi %p\n", W32Process); TRACE("WFII: ppi %p\n", W32Process);
@ -3160,12 +3154,15 @@ NtUserWaitForInputIdle( IN HANDLE hProcess,
while (TRUE); while (TRUE);
WaitExit: WaitExit:
KeStackAttachProcess(&Process->Pcb, &ApcState);
for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling) for (pti = W32Process->ptiList; pti; pti = pti->ptiSibling)
{ {
pti->TIF_flags &= ~TIF_WAITFORINPUTIDLE; pti->TIF_flags &= ~TIF_WAITFORINPUTIDLE;
pti->pClientInfo->dwTIFlags = pti->TIF_flags; pti->pClientInfo->dwTIFlags = pti->TIF_flags;
} }
W32Process->W32PF_flags &= ~W32PF_WAITFORINPUTIDLE; W32Process->W32PF_flags &= ~W32PF_WAITFORINPUTIDLE;
KeUnstackDetachProcess(&ApcState);
IntDereferenceProcessInfo(W32Process); IntDereferenceProcessInfo(W32Process);
ObDereferenceObject(Process); ObDereferenceObject(Process);
UserLeave(); UserLeave();