[PATCH 2/4] msvfw32: Add WS_CHILD attribute for window if parent is specified.

[Paul Gofman]

From: Paul Gofman

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

diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c
index c71e4fe5567..dd8878cf7d9 100644
--- a/dlls/msvfw32/mciwnd.c
+++ b/dlls/msvfw32/mciwnd.c
@@ -111,7 +111,7 @@ HWND VFWAPIV MCIWndCreateW(HWND hwndParent, HINSTANCE hInstance,
     if (!hInstance) hInstance = GetModuleHandleW(0);

if (hwndParent)
-        dwStyle |= WS_VISIBLE | WS_BORDER /*| WS_CHILD*/;
+        dwStyle |= WS_VISIBLE | WS_BORDER | WS_CHILD;
     else
         dwStyle |= WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;

diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c
index b1459a28768..d9fe7958c25 100644
--- a/dlls/msvfw32/tests/mciwnd.c
+++ b/dlls/msvfw32/tests/mciwnd.c
@@ -369,7 +369,7 @@ 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)) || tests[i].parent)
+            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);
         }