user32: Setup system menu even when used through TrackPopupMenu.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Setup system menu even when used through TrackPopupMenu.
83ed0a63 · Alexandre Julliard · 552555cf · 83ed0a63
Commit 83ed0a63 authored Jun 08, 2016 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

menu.c dlls/user32/menu.c +4 -0

No files found.
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3479,6 +3479,10 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y,
        if (!(wFlags & TPM_NONOTIFY))
            SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0);

+        if (menu->wFlags & MF_SYSMENU)
+            MENU_InitSysMenuPopup( hMenu, GetWindowLongW( hWnd, GWL_STYLE ),
+                                   GetClassLongW( hWnd, GCL_STYLE));
+
        if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 ))
            ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd,
                                  lpTpm ? &lpTpm->rcExclude : NULL );