Author: akhaldi
Date: Sat Nov 21 09:27:41 2015
New Revision: 69976
URL:
http://svn.reactos.org/svn/reactos?rev=69976&view=rev
Log:
[MCISEQ] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/reactos/dll/win32/mciseq/mcimidi.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/mcimidi.c…
==============================================================================
--- trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] Sat Nov 21 09:27:41 2015
@@ -778,7 +778,7 @@
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 @@
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);
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] Sat Nov 21 09:27:41 2015
@@ -96,7 +96,7 @@
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