commit 2ae461e400d7dbc63b8a7e8a7f8f841381194416
author Dmitry Timoshkov <dmitry@codeweavers.com> Fri Feb 27 04:32:16 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Feb 27 04:32:16 2004 +0000
tree 8596e45f399513b253198b1dc823f650a8c1393b
parent cb283489adc2892d0a6d51634298ac8f1c62bd73

Use some heuristics to decide what type of MCIWNDM_OPEN message to
use.

dlls/msvideo/mciwnd.c

diff --git a/dlls/msvideo/mciwnd.c b/dlls/msvideo/mciwnd.c
index 1047bcb..ff42f43 100644
--- a/dlls/msvideo/mciwnd.c
+++ b/dlls/msvideo/mciwnd.c
@@ -108,6 +108,8 @@
 
     MCIWndRegisterClass();
 
+    if (!hInstance) hInstance = GetModuleHandleW(0);
+
     if (hwndParent)
         dwStyle |= WS_VISIBLE | WS_BORDER /*| WS_CHILD*/;
     else
@@ -255,6 +257,10 @@
     SetWindowLongW(hWnd, 0, (LPARAM)mwi);
 
     mwi->dwStyle = cs->style;
+    /* There is no need to show stats if there is no caption */
+    if ((mwi->dwStyle & WS_CAPTION) != WS_CAPTION)
+        mwi->dwStyle &= ~MCIWNDF_SHOWALL;
+
     mwi->hWnd = hWnd;
     mwi->hwndOwner = cs->hwndParent;
     mwi->active_timer = 500;
@@ -306,8 +312,18 @@
         }
         else
             lParam = (LPARAM)cs->lpCreateParams;
-        /* yes, A variant of the message */
-        SendMessageW(hWnd, MCIWNDM_OPENA, 0, lParam);
+
+        /* If it's our internal caption, file name is a unicode string */
+        if (cs->lpszClass == mciWndClassW)
+            SendMessageW(hWnd, MCIWNDM_OPENW, 0, lParam);
+        else
+        {
+            /* Otherwise let's try to figure out what string format is used */
+            HWND parent = cs->hwndParent;
+            if (!parent) parent = GetWindow(hWnd, GW_OWNER);
+
+            SendMessageW(hWnd, IsWindowUnicode(parent) ? MCIWNDM_OPENW : MCIWNDM_OPENA, 0, lParam);
+        }
     }
 
     return 0;