Changeset 2456 for trunk/src/winmm/mciwave/mciwave.cpp

Timestamp:

Jan 15, 2000, 11:02:50 PM (26 years ago)

Author:

sandervl

Message:

JW: Updated to Wine level 20000109 + corrected compile errors

File:

• trunk/src/winmm/mciwave/mciwave.cpp (modified) (7 diffs)

trunk/src/winmm/mciwave/mciwave.cpp

@@ -31 +31 @@
     LPWAVEFORMATEX              lpWaveFormat;
     BOOL                        fInput;         /* FALSE = Output, TRUE = Input */
-    WORD                        dwStatus;       /* one from MCI_MODE_xxxx */
+    volatile WORD               dwStatus;       /* one from MCI_MODE_xxxx */
     DWORD                       dwMciTimeFormat;/* One of the supported MCI_FORMAT_xxxx */
     DWORD                       dwFileOffset;   /* Offset of chunk in mmio file */
@@ -38 +38 @@
     HANDLE                      hEvent;         /* for synchronization */
     DWORD                       dwEventCount;   /* for synchronization */
-} WINE_MCIWAVE, *PWINE_MCIWAVE;
+} WINE_MCIWAVE;
 
 /* ===================================================================
@@ -128 +128 @@
 static  DWORD   WAVE_drvOpen(LPSTR str, LPMCI_OPEN_DRIVER_PARMSA modp)
 {
-    WINE_MCIWAVE*       wmw = PWINE_MCIWAVE(HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIWAVE)));
+    WINE_MCIWAVE*       wmw = (WINE_MCIWAVE*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCIWAVE));
 
     if (!wmw)
@@ -435 +435 @@
                 dwRet = (wmw->fInput) ? waveInReset(wmw->hWave) : waveOutReset(wmw->hWave);
         }
-        while (((volatile WINE_MCIWAVE*)wmw)->dwStatus != MCI_MODE_STOP)
+        while (wmw->dwStatus != MCI_MODE_STOP)
             Sleep(10);
         break;
@@ -553 +553 @@
     }
     
+        if (wmw->dwStatus == MCI_MODE_PAUSE) {
+            /* FIXME: parameters (start/end) in lpParams may not be used */
+            return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms);
+        }
+    
+    /** This function will be called again by a thread when async is used.
+     * We have to set MCI_MODE_PLAY before we do this so that the app can spin
+     * on MCI_STATUS, so we have to allow it here if we're not going to start this thread.
+     */
+    if ((wmw->dwStatus != MCI_MODE_STOP) && ((wmw->dwStatus != MCI_MODE_PLAY) && (dwFlags & MCI_WAIT))) {
+        return MCIERR_INTERNAL;
+    }
+
+    wmw->dwStatus = MCI_MODE_PLAY;
+    
     if (!(dwFlags & MCI_WAIT)) {
         return MCI_SendCommandAsync(wmw->wNotifyDeviceID, MCI_PLAY, dwFlags, 
                                     (DWORD)lpParms, sizeof(MCI_PLAY_PARMS));
-    }
-
-    if (wmw->dwStatus != MCI_MODE_STOP) {
-        if (wmw->dwStatus == MCI_MODE_PAUSE) {
-            /* FIXME: parameters (start/end) in lpParams may not be used */
-            return WAVE_mciResume(wDevID, dwFlags, (LPMCI_GENERIC_PARMS)lpParms);
-        }
-        return MCIERR_INTERNAL;
     }
 
@@ -628 +635 @@
 
     TRACE("Playing (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, left);
-    wmw->dwStatus = MCI_MODE_PLAY;
     
     /* FIXME: this doesn't work if wmw->dwPosition != 0 */
@@ -719 +725 @@
     }
     bufsize = 64000;
-    waveHdr.lpData = (CHAR*)HeapAlloc(GetProcessHeap(), 0, bufsize);
+    waveHdr.lpData = (char*)HeapAlloc(GetProcessHeap(), 0, bufsize);
     waveHdr.dwBufferLength = bufsize;
     waveHdr.dwUser = 0L;