Don't fallback to LoadMenu16 when the window is created with a null

instance.

Don't fallback to LoadMenu16 when the window is created with a null
42744ff4 · Alexandre Julliard · c3d87e7c · 42744ff4
Commit 42744ff4 authored Sep 07, 2005 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

win.c dlls/user/win.c +1 -1

No files found.
--- a/dlls/user/win.c
+++ b/dlls/user/win.c
@@ -1039,7 +1039,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom,
            LPCSTR menuName = (LPCSTR)GetClassLongPtrA( hwnd, GCLP_MENUNAME );
            if (menuName)
            {
-                if (HIWORD(cs->hInstance))
+                if (!cs->hInstance || HIWORD(cs->hInstance))
                    cs->hMenu = LoadMenuA(cs->hInstance,menuName);
                else
                    cs->hMenu = HMENU_32(LoadMenu16(HINSTANCE_16(cs->hInstance),menuName));