From 3ab9ab88fba378d51857ac52704c7896284e06ca Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 21 Nov 2015 09:27:41 +0000 Subject: [PATCH] [MCISEQ] Sync with Wine Staging 1.7.55. CORE-10536 svn path=/trunk/; revision=69976 --- reactos/dll/win32/mciseq/mcimidi.c | 7 +++++-- reactos/media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/mciseq/mcimidi.c b/reactos/dll/win32/mciseq/mcimidi.c index 3c0c685963a..4cd6f510067 100644 --- a/reactos/dll/win32/mciseq/mcimidi.c +++ b/reactos/dll/win32/mciseq/mcimidi.c @@ -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); diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index a7abad05de2..a8c82b022f7 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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 -- 2.17.1