diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d04028c8baa27ef6b85ab4f52b97e242f0ae8d76..799c891baf44e259cf66abd51cd2f4be00e46ab8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9250,7 +9250,7 @@ static void test_SetForegroundWindow(void) trace("SetForegroundWindow( GetDesktopWindow() )\n"); SetForegroundWindow( GetDesktopWindow() ); ok_sequence(SetForegroundWindowSeq, "SetForegroundWindow( desktop ) away from " - "foreground top level window", TRUE); + "foreground top level window", FALSE); trace("done\n"); DestroyWindow(hwnd); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b5d2ad5b63799621163712d81bfaade94c51b035..6cbddebe24ae0975fa7b5c78fb885b50b5cc3922 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2213,12 +2213,9 @@ static void test_SetForegroundWindow(HWND hwnd) hwnd2 = GetForegroundWindow(); ok(hwnd2 == hwnd, "Wrong foreground window %p\n", hwnd2); - todo_wine - { ok(SetForegroundWindow( GetDesktopWindow() ), "SetForegroundWindow(desktop) error: %d\n", GetLastError()); hwnd2 = GetForegroundWindow(); ok(hwnd2 != hwnd, "Wrong foreground window %p\n", hwnd2); - } ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); diff --git a/server/window.c b/server/window.c index cbb4296b3612477f081345c84c7c9fac5cbbaf6c..182213ee2e67deab9e67b451541903321159bd1f 100644 --- a/server/window.c +++ b/server/window.c @@ -514,7 +514,7 @@ int is_child_window( user_handle_t parent, user_handle_t child ) int is_top_level_window( user_handle_t window ) { struct window *win = get_user_object( window, USER_WINDOW ); - return (win && win->parent && is_desktop_window(win->parent)); + return (win && (is_desktop_window(win) || is_desktop_window(win->parent))); } /* make a window active if possible */