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

[WIN32SS][NTUSER] Fix popup menu window styles (#1814)

Browse source 
Fix the class style, the window style and the extended style of the popup menu window. CORE-16244
This commit is contained in:
Katayama Hirofumi MZ 2019-08-10 08:33:25 +09:00 • committed by GitHub
parent 75623bb1fa
commit 0749a868fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ REGISTER_SYSCLASS DefaultServerClasses[] =
ICLS_SWITCH ICLS_SWITCH
}, },
{ ((PWSTR)((ULONG_PTR)(WORD)(0x8000))), { ((PWSTR)((ULONG_PTR)(WORD)(0x8000))),
CS_DBLCLKS|CS_SAVEBITS, CS_DBLCLKS|CS_SAVEBITS|CS_DROPSHADOW,
NULL, // Use User32 procs NULL, // Use User32 procs
sizeof(LONG), sizeof(LONG),
(HICON)OCR_NORMAL, (HICON)OCR_NORMAL,

9
win32ss/user/ntuser/menu.c
View file

@ -2794,21 +2794,20 @@ static BOOL MENU_InitPopup( PWND pWndOwner, PMENU menu, UINT flags )
CREATESTRUCTW Cs; CREATESTRUCTW Cs;
LARGE_STRING WindowName; LARGE_STRING WindowName;
UNICODE_STRING ClassName; UNICODE_STRING ClassName;
DWORD ex_style = WS_EX_TOOLWINDOW; DWORD ex_style = WS_EX_PALETTEWINDOW | WS_EX_DLGMODALFRAME;
TRACE("owner=%p hmenu=%p\n", pWndOwner, menu); TRACE("owner=%p hmenu=%p\n", pWndOwner, menu);
menu->spwndNotify = pWndOwner; menu->spwndNotify = pWndOwner;
if (flags & TPM_LAYOUTRTL || pWndOwner->ExStyle & WS_EX_LAYOUTRTL) if (flags & TPM_LAYOUTRTL || pWndOwner->ExStyle & WS_EX_LAYOUTRTL)
ex_style = WS_EX_LAYOUTRTL; ex_style |= WS_EX_LAYOUTRTL;
ClassName.Buffer = WC_MENU; RtlInitUnicodeString(&ClassName, WC_MENU);
ClassName.Length = 0;
RtlZeroMemory(&WindowName, sizeof(WindowName)); RtlZeroMemory(&WindowName, sizeof(WindowName));
RtlZeroMemory(&Cs, sizeof(Cs)); RtlZeroMemory(&Cs, sizeof(Cs));
Cs.style = WS_POPUP; Cs.style = WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER;
Cs.dwExStyle = ex_style; Cs.dwExStyle = ex_style;
Cs.hInstance = hModClient; // hModuleWin; // Server side winproc! Cs.hInstance = hModClient; // hModuleWin; // Server side winproc!
Cs.lpszName = (LPCWSTR) &WindowName; Cs.lpszName = (LPCWSTR) &WindowName;