Map WM_MENUSELECT 32->16 bits for closing menu.

7e70e56b · Gerard Patel · Alexandre Julliard · e8a3d071 · 7e70e56b
Commit 7e70e56b authored Jan 23, 2000 by Gerard Patel Committed by Alexandre Julliard Jan 23, 2000
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

winproc.c windows/winproc.c +5 -1

No files found.
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -1796,7 +1796,11 @@ INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32,
        if(HIWORD(wParam32) & MF_POPUP)
        {
            UINT16 hmenu;
-            if((hmenu = GetSubMenu((HMENU16)*plparam, *pwparam16))) *pwparam16=hmenu;
+            if (((UINT)HIWORD(wParam32) != 0xFFFF) || (*plparam))
+            {
+                if((hmenu = GetSubMenu((HMENU16)*plparam, *pwparam16)))
+                    *pwparam16=hmenu;
+            }
        }
        /* fall through */
    case WM_MENUCHAR: