[akhaldi] 62909: [MSACM32] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Wed Apr 23 14:15:25 2014
New Revision: 62909

URL: http://svn.reactos.org/svn/reactos?rev=62909&view=rev
Log:
[MSACM32]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/reactos/dll/win32/msacm32/stream.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/msacm32/stream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/stream.c…
==============================================================================
--- trunk/reactos/dll/win32/msacm32/stream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msacm32/stream.c	[iso-8859-1] Wed Apr 23 14:15:25 2014
@@ -298,9 +298,6 @@
     if (fdwPrepare)
 	ret = MMSYSERR_INVALFLAG;
 
-    if (pash->fdwStatus & ACMSTREAMHEADER_STATUSF_DONE)
-	return MMSYSERR_NOERROR;
-
     /* Note: the ACMSTREAMHEADER and ACMDRVSTREAMHEADER structs are of same
      * size. some fields are private to msacm internals, and are exposed
      * in ACMSTREAMHEADER in the dwReservedDriver array
@@ -321,7 +318,7 @@
     ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_PREPARE,
(LPARAM)&was->drvInst, (LPARAM)padsh);
     if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) {
 	ret = MMSYSERR_NOERROR;
-	padsh->fdwStatus &=
~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE);
+	padsh->fdwStatus &= ~ACMSTREAMHEADER_STATUSF_INQUEUE;
 	padsh->fdwStatus |= ACMSTREAMHEADER_STATUSF_PREPARED;
 	padsh->fdwPrepared = padsh->fdwStatus;
 	padsh->dwPrepared = 0;
@@ -464,8 +461,8 @@
     ret = MSACM_Message((HACMDRIVER)was->pDrv, ACMDM_STREAM_UNPREPARE,
(LPARAM)&was->drvInst, (LPARAM)padsh);
     if (ret == MMSYSERR_NOERROR || ret == MMSYSERR_NOTSUPPORTED) {
 	ret = MMSYSERR_NOERROR;
-	padsh->fdwStatus &=
~(ACMSTREAMHEADER_STATUSF_DONE|ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED);
-    }
-    TRACE("=> (%d)\n", ret);
-    return ret;
-}
+	padsh->fdwStatus &=
~(ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED);
+    }
+    TRACE("=> (%d)\n", ret);
+    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 Apr 23 14:15:25 2014
@@ -107,7 +107,7 @@
 reactos/dll/win32/mmdevapi         # Synced to Wine-1.7.1
 reactos/dll/win32/mpr              # Synced to Wine-1.7.1
 reactos/dll/win32/mprapi           # Synced to Wine-1.7.1
-reactos/dll/win32/msacm32          # Synced to Wine-1.7.1
+reactos/dll/win32/msacm32          # Synced to Wine-1.7.17
 reactos/dll/win32/msadp32.acm      # Synced to Wine-1.7.1
 reactos/dll/win32/mscat32          # Synced to Wine-1.7.1
 reactos/dll/win32/mscms            # Synced to Wine-1.7.1