[MCISEQ] Sync with Wine Staging 1.7.55. CORE-10536
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Nov 2015 09:27:41 +0000 (09:27 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 21 Nov 2015 09:27:41 +0000 (09:27 +0000)
svn path=/trunk/; revision=69976

reactos/dll/win32/mciseq/mcimidi.c
reactos/media/doc/README.WINE

index 3c0c685..4cd6f51 100644 (file)
@@ -778,7 +778,7 @@ static DWORD MIDI_mciStop(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS
        if (oldstat == MCI_MODE_PAUSE)
            dwRet = midiOutReset((HMIDIOUT)wmm->hMidi);
 
-       if ((dwFlags & MCI_WAIT) && wmm->hThread)
+       if (wmm->hThread)
            WaitForSingleObject(wmm->hThread, INFINITE);
     }
 
@@ -810,7 +810,10 @@ static DWORD MIDI_mciClose(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS
            wmm->hFile = 0;
            TRACE("hFile closed !\n");
        }
-       if (wmm->hThread) CloseHandle(wmm->hThread);
+       if (wmm->hThread) {
+           CloseHandle(wmm->hThread);
+           wmm->hThread = 0;
+       }
        HeapFree(GetProcessHeap(), 0, wmm->tracks);
        HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName);
        HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright);
index a7abad0..a8c82b0 100644 (file)
@@ -96,7 +96,7 @@ reactos/dll/win32/mapi32              # Synced to WineStaging-1.7.47
 reactos/dll/win32/mciavi32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/mcicda              # Synced to WineStaging-1.7.55
 reactos/dll/win32/mciqtz32            # Synced to WineStaging-1.7.47
-reactos/dll/win32/mciseq              # Synced to WineStaging-1.7.47
+reactos/dll/win32/mciseq              # Synced to WineStaging-1.7.55
 reactos/dll/win32/mciwave             # Synced to WineStaging-1.7.47
 reactos/dll/win32/mgmtapi             # Synced to WineStaging-1.7.47
 reactos/dll/win32/mlang               # Synced to WineStaging-1.7.47