[PATCH 3/4] msvfw32: Set correct styles for popup and child windows.

[Paul Gofman]

From: Paul Gofman

---
 dlls/msvfw32/mciwnd.c       | 11 +++++++----
 dlls/msvfw32/tests/mciwnd.c |  1 -
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c
index dd8878cf7d9..a3edb9e794f 100644
--- a/dlls/msvfw32/mciwnd.c
+++ b/dlls/msvfw32/mciwnd.c
@@ -110,10 +110,13 @@ HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,

if (!hInstance) hInstance = GetModuleHandleW(0);

-    if (hwndParent)
-        dwStyle |= WS_VISIBLE | WS_BORDER | WS_CHILD;
-    else
-        dwStyle |= WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+    if (!(dwStyle & (WS_POPUP | WS_CHILD)))
+    {
+        if (hwndParent)
+            dwStyle |= WS_VISIBLE | WS_BORDER | WS_CHILD;
+        else
+            dwStyle |= WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+    }

return CreateWindowExW(0, mciWndClassW, mciWndNameW,
                            dwStyle | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c
index d9fe7958c25..6131105dd5c 100644
--- a/dlls/msvfw32/tests/mciwnd.c
+++ b/dlls/msvfw32/tests/mciwnd.c
@@ -369,7 +369,6 @@ static void test_MCIWndCreate(void)
                 ok(!id, "got %d.\n", id);
             pump_messages();
             style = GetWindowLongA(window, GWL_STYLE);
-            todo_wine_if((tests[i].mci_style & (WS_POPUP | WS_CHILD)))
             ok(style == tests[i].expected_style, "got %#lx, expected %#lx (extra %#lx, missing %#lx).\n",
                     style, tests[i].expected_style, style & ~tests[i].expected_style, tests[i].expected_style & ~style);
         }