From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/win.c | 6 ------ dlls/win32u/window.c | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ad49db58811..4957bb46314 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -14194,7 +14194,6 @@ static void test_GW_ENABLEDPOPUP(void) ok(!hwnd, "Unexpected value %p.\n", hwnd); ShowWindow(hwnd2, SW_SHOW); hwnd = GetWindow(parent, GW_ENABLEDPOPUP); - todo_wine ok(hwnd == hwnd2, "Unexpected value %p.\n", hwnd); popup = CreateWindowA("static", "popup", WS_POPUP, 0, 0, 16, 16, parent, 0, 0, NULL); @@ -14204,12 +14203,10 @@ static void test_GW_ENABLEDPOPUP(void) ok(!IsWindowVisible(popup), "Unexpected state.\n"); hwnd = GetWindow(parent, GW_ENABLEDPOPUP); - todo_wine ok(hwnd == hwnd2, "Unexpected value %p.\n", hwnd); ShowWindow(popup, SW_SHOW); hwnd = GetWindow(parent, GW_ENABLEDPOPUP); - todo_wine ok(hwnd == popup, "Unexpected value %p.\n", hwnd); popup2 = CreateWindowA("static", "popup2", WS_POPUP, 0, 0, 16, 16, parent, 0, 0, NULL); @@ -14217,17 +14214,14 @@ static void test_GW_ENABLEDPOPUP(void) ok(GetWindow(popup2, GW_OWNER) == parent, "Unexpected owner.\n"); hwnd = GetWindow(parent, GW_ENABLEDPOPUP); - todo_wine ok(hwnd == popup, "Unexpected value %p.\n", hwnd); ShowWindow(popup2, SW_SHOW); hwnd = GetWindow(parent, GW_ENABLEDPOPUP); - todo_wine ok(hwnd == popup2, "Unexpected value %p.\n", hwnd); ShowWindow(popup2, SW_HIDE); hwnd = GetWindow(parent, GW_ENABLEDPOPUP); - todo_wine ok(hwnd == popup, "Unexpected value %p.\n", hwnd); DestroyWindow(parent); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c5c5d0522c8..0bc00df857f 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -643,6 +643,28 @@ HWND get_window_relative( HWND hwnd, UINT rel ) { HWND retval = 0; + if (rel == GW_ENABLEDPOPUP) + { + HWND *list; + int i; + + if (!(list = list_window_children( 0 ))) return NULL; + + for (i = 0; list[i]; i++) + { + if (get_window_relative( list[i], GW_OWNER ) != hwnd) continue; + if (is_window_visible( list[i] )) + { + retval = list[i]; + break; + } + } + + free(list); + + return retval; + } + if (rel == GW_OWNER) /* this one may be available locally */ { WND *win = get_win_ptr( hwnd ); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9388