Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 13:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.7][NTUSER] co_UserDestroyWindow: Validate window before destroying it (#5054)

Browse source 
Prevent the window from being destroyed twice
fixes CORE-18821 'WIN32K BSOD 0x1E when opening Build menu in AVR Studio 4.19'
port of 0.4.15-dev-5938-g 77d4653164

And port back also some unrelated formatting improvements,
and kill a block of code that was commented out in all branches,
and was not x64 compatible in 0.4.7/0.4.8, and therefore was a diff already anyway.
This commit is contained in:
Joachim Henze 2023-06-10 12:44:02 +02:00
parent a373df0d07
commit c41493fcf9
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -739,7 +739,7 @@ IntGetWindowProc(PWND pWnd,
PCLS Class;
WNDPROC gcpd, Ret = 0;
ASSERT(UserIsEnteredExclusive() == TRUE);
ASSERT(UserIsEnteredExclusive());
Class = pWnd->pcls;
@ -1695,7 +1695,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
pWnd->spwndOwner = OwnerWindow;
pWnd->fnid = 0;
pWnd->spwndLastActive = pWnd;
pWnd->state2 |= WNDS2_WIN40COMPAT; // FIXME!!!
pWnd->state2 |= WNDS2_WIN40COMPAT;
pWnd->pcls = Class;
pWnd->hModule = Cs->hInstance;
pWnd->style = Cs->style & ~WS_VISIBLE;
@ -1897,7 +1897,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
}
}
else // Not a child
pWnd->IDMenu = (UINT) Cs->hMenu;
pWnd->IDMenu = (UINT)Cs->hMenu;
if ( ParentWindow &&
@ -2563,6 +2563,9 @@ BOOLEAN co_UserDestroyWindow(PVOID Object)
ASSERT_REFS_CO(Window); // FIXME: Temp HACK?
if (!IntIsWindow(UserHMGetHandle(Window)))
return TRUE;
hWnd = Window->head.h;
ti = PsGetCurrentThreadWin32Thread();
@ -3565,15 +3568,6 @@ co_IntSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi, BOOL bAlte
}
OldValue = *((LONG *)((PCHAR)(Window + 1) + Index));
/*
if ( Index == DWLP_DLGPROC && Wnd->state & WNDS_DIALOGWINDOW)
{
OldValue = (LONG)IntSetWindowProc( Wnd,
(WNDPROC)NewValue,
Ansi);
if (!OldValue) return 0;
}
*/
*((LONG *)((PCHAR)(Window + 1) + Index)) = NewValue;
}
else
@ -3924,7 +3918,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index)
break;
default:
Result = (DWORD)NULL;
Result = 0;
break;
}
@ -4345,7 +4339,6 @@ IntShowOwnedPopups(PWND OwnerWnd, BOOL fShow )
continue;
}
}
}
ExFreePoolWithTag(win_array, USERTAG_WINDOWLIST);
TRACE("Leave ShowOwnedPopups\n");