[PATCH v3 1/5] win32u: Return FALSE in HiliteMenuItem when window handle is NULL

[Vladislav Timonin]

From: Vladislav Timonin

---
 dlls/user32/tests/menu.c | 3 ---
 dlls/win32u/menu.c       | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index 6862f13c6b1..b00c403940f 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -2531,11 +2531,8 @@ static void test_menu_hilitemenuitem( void )
       "HiliteMenuItem: Item 2 is hilited\n");

SetLastError(0xdeadbeef);
-    todo_wine
-    {
     ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION),
       "HiliteMenuItem: call should have failed.\n");
-    }
     ok(GetLastError() == 0xdeadbeef || /* 9x */
        GetLastError() == ERROR_INVALID_WINDOW_HANDLE /* NT */,
       "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %ld\n", GetLastError());
diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index 98456446e11..3e42547650a 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -4545,6 +4545,12 @@ BOOL WINAPI NtUserHiliteMenuItem( HWND hwnd, HMENU handle, UINT item, UINT hilit

TRACE( "(%p, %p, %04x, %04x);\n", hwnd, handle, item, hilite );

+    if (!hwnd)
+    {
+        RtlSetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
+        return FALSE;
+    }
+
     if (!(menu = find_menu_item(handle, item, hilite, &pos))) return FALSE;
     handle_menu = menu->obj.handle;
     focused_item = menu->FocusedItem;