[ros-diffs] [akhaldi] 66882: [MCIQTZ32] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Wed Mar 25 16:00:49 2015
New Revision: 66882

URL: http://svn.reactos.org/svn/reactos?rev=66882&view=rev
Log:
[MCIQTZ32] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/dll/win32/mciqtz32/mciqtz.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.…
==============================================================================
--- trunk/reactos/dll/win32/mciqtz32/mciqtz.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c	[iso-8859-1] Wed Mar 25 16:00:49 2015
@@ -608,6 +608,7 @@
 {
     WINE_MCIQTZ* wma;
     HRESULT hr;
+    DWORD ret = MCI_INTEGER_RETURNED;
 
     TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms);
 
@@ -666,30 +667,33 @@
             LONG state = State_Stopped;
             IMediaControl_GetState(wma->pmctrl, -1, &state);
             if (state == State_Stopped)
-                lpParms->dwReturn = MCI_MODE_STOP;
+                lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_STOP, MCI_MODE_STOP);
             else if (state == State_Running) {
                 LONG code;
                 LONG_PTR p1, p2;
 
-                lpParms->dwReturn = MCI_MODE_PLAY;
+                lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_PLAY, MCI_MODE_PLAY);
 
                 do {
                     hr = IMediaEvent_GetEvent(wma->mevent, &code, &p1,
&p2, 0);
                     if (hr == S_OK && code == EC_COMPLETE){
-                        lpParms->dwReturn = MCI_MODE_STOP;
+                        lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_STOP,
MCI_MODE_STOP);
                         IMediaControl_Stop(wma->pmctrl);
                     }
                 } while (hr == S_OK);
 
             } else if (state == State_Paused)
-                lpParms->dwReturn = MCI_MODE_PAUSE;
+                lpParms->dwReturn = MAKEMCIRESOURCE(MCI_MODE_PAUSE, MCI_MODE_PAUSE);
+            ret = MCI_RESOURCE_RETURNED;
             break;
         }
         case MCI_STATUS_MEDIA_PRESENT:
             FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n");
             return MCIERR_UNRECOGNIZED_COMMAND;
         case MCI_STATUS_TIME_FORMAT:
-            lpParms->dwReturn = wma->time_format;
+            lpParms->dwReturn = MAKEMCIRESOURCE(wma->time_format,
+                                                MCI_FORMAT_RETURN_BASE +
wma->time_format);
+            ret = MCI_RESOURCE_RETURNED;
             break;
         case MCI_STATUS_READY:
             FIXME("MCI_STATUS_READY not implemented yet\n");
@@ -705,7 +709,7 @@
     if (dwFlags & MCI_NOTIFY)
         mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID,
MCI_NOTIFY_SUCCESSFUL);
 
-    return 0;
+    return ret;
 }
 
 /***************************************************************************

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Wed Mar 25 16:00:49 2015
@@ -103,7 +103,7 @@
 reactos/dll/win32/mapi32              # Synced to Wine-1.7.27
 reactos/dll/win32/mciavi32            # Synced to WineStaging-1.7.37
 reactos/dll/win32/mcicda              # Synced to Wine-1.7.27
-reactos/dll/win32/mciqtz32            # Synced to Wine-1.7.27
+reactos/dll/win32/mciqtz32            # Synced to WineStaging-1.7.37
 reactos/dll/win32/mciseq              # Synced to Wine-1.7.27
 reactos/dll/win32/mciwave             # Synced to Wine-1.7.27
 reactos/dll/win32/mgmtapi             # Synced to Wine-1.7.27