Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-22 02:25:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K] Add some NULL checks for THREADINFO::rpdesk

Browse source 
rpdesk should probably never be NULL, but it happens in rare circumstances, like csrss being terminated.
This commit is contained in:
Timo Kreuzer 2022-12-26 16:11:14 +01:00
parent e56da4854f
commit abb75b6214
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
win32ss/user/ntuser/desktop.c
View file

@ -1788,6 +1788,14 @@ BOOL IntDeRegisterShellHookWindow(HWND hWnd)
PLIST_ENTRY ListEntry; PLIST_ENTRY ListEntry;
PSHELL_HOOK_WINDOW Current; PSHELL_HOOK_WINDOW Current;
// FIXME: This probably shouldn't happen, but it does
if (Desktop == NULL)
{
Desktop = IntGetActiveDesktop();
if (Desktop == NULL)
return FALSE;
}
ListEntry = Desktop->ShellHookWindows.Flink; ListEntry = Desktop->ShellHookWindows.Flink;
while (ListEntry != &Desktop->ShellHookWindows) while (ListEntry != &Desktop->ShellHookWindows)
{ {

2
win32ss/user/ntuser/window.c
View file

@ -493,7 +493,7 @@ static void IntSendDestroyMsg(HWND hWnd)
} }
/* If the window being destroyed is currently tracked... */ /* If the window being destroyed is currently tracked... */
if (ti->rpdesk->spwndTrack == Window) if (ti->rpdesk && ti->rpdesk->spwndTrack == Window)
{ {
IntRemoveTrackMouseEvent(ti->rpdesk); IntRemoveTrackMouseEvent(ti->rpdesk);
} }

4
win32ss/user/ntuser/winpos.c
View file

@ -436,12 +436,12 @@ co_WinPosActivateOtherWindow(PWND Wnd)
// Find any window to bring to top. Works Okay for wine since it does not see X11 windows. // Find any window to bring to top. Works Okay for wine since it does not see X11 windows.
WndTo = UserGetDesktopWindow(); WndTo = UserGetDesktopWindow();
WndTo = WndTo->spwndChild; if ((WndTo == NULL) || (WndTo->spwndChild == NULL))
if ( WndTo == NULL )
{ {
//ERR("WinPosActivateOtherWindow No window!\n"); //ERR("WinPosActivateOtherWindow No window!\n");
return; return;
} }
WndTo = WndTo->spwndChild;
for (;;) for (;;)
{ {
if (WndTo == Wnd) if (WndTo == Wnd)