user.exe16: Fix handling of 16-bit HBITMAPs in InsertMenu16.

Signed-off-by: Martin Payne <development@martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user.exe16: Fix handling of 16-bit HBITMAPs in InsertMenu16.
81fb745e · Martin Payne · Alexandre Julliard · b9f32e16 · 81fb745e
Commit 81fb745e authored Dec 13, 2017 by Martin Payne Committed by Alexandre Julliard Dec 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

user.c dlls/user.exe16/user.c +4 -0

No files found.
--- a/dlls/user.exe16/user.c
+++ b/dlls/user.exe16/user.c
@@ -2405,6 +2405,10 @@ BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags,
    if ((pos == (UINT16)-1) && (flags & MF_BYPOSITION)) pos32 = (UINT)-1;
    if (IS_MENU_STRING_ITEM(flags) && data)
        return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, MapSL(data) );
+
+    /* If "data" is an HBITMAP, the high WORD will contain the application's DGROUP selector if the
+     * application cast (LPSTR)hBitmap rather than (LPSTR)(LONG)hBitmap. */
+    if (flags & MF_BITMAP) data = (SEGPTR)HBITMAP_32(LOWORD(data));
    return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, (LPSTR)data );
 }