[PATCH v2 2/2] user32: Implement GetWindow(GW_ENABLEDPOPUP).

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/user32/tests/win.c | 11 -----------
 dlls/win32u/window.c    | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index c178f11354b..41c241c22d3 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -14194,14 +14194,12 @@ 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);
     EnableWindow(hwnd2, FALSE);
     hwnd = GetWindow(parent, GW_ENABLEDPOPUP);
     ok(!hwnd, "Unexpected value %p.\n", hwnd);
     EnableWindow(hwnd2, TRUE);
     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);
@@ -14211,20 +14209,16 @@ 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);
     EnableWindow(popup, FALSE);
     hwnd = GetWindow(parent, GW_ENABLEDPOPUP);
-    todo_wine
     ok(hwnd == hwnd2, "Unexpected value %p.\n", hwnd);
     EnableWindow(popup, TRUE);
     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);
@@ -14232,26 +14226,21 @@ 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);

ShowWindow(popup2, SW_SHOW);
     hwnd = GetWindow(parent, GW_ENABLEDPOPUP);
-    todo_wine
     ok(hwnd == popup2, "Unexpected value %p.\n", hwnd);
     EnableWindow(popup2, FALSE);
     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..90b1a72da1c 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -643,6 +643,26 @@ 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; !retval && list[i]; i++)
+        {
+            if (get_window_relative( list[i], GW_OWNER ) != hwnd) continue;
+            if (!is_window_visible( list[i] )) continue;
+            if (!is_window_enabled( list[i] )) continue;
+            retval = list[i];
+        }
+
+        free(list);
+
+        return retval;
+    }
+
     if (rel == GW_OWNER)  /* this one may be available locally */
     {
         WND *win = get_win_ptr( hwnd );