[MSACM32]

* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62909

diff --git a/reactos/dll/win32/msacm32/stream.c b/reactos/dll/win32/msacm32/stream.c
index 74ad5ae..44b9729 100644 (file)
--- a/reactos/dll/win32/msacm32/stream.c
+++ b/reactos/dll/win32/msacm32/stream.c
@@ -298,9 +298,6 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
     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 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
     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,7 +461,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
     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);
+       padsh->fdwStatus &= ~(ACMSTREAMHEADER_STATUSF_INQUEUE|ACMSTREAMHEADER_STATUSF_PREPARED);
     }
     TRACE("=> (%d)\n", ret);
     return ret;

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 3e41901..9b5b876 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -107,7 +107,7 @@ reactos/dll/win32/mlang            # Synced to Wine-1.7.17
 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