Dmitry Timoshkov : winmm: Clear the fccType in mmioDescend for a not RIFF/ LIST case.

Alexandre Julliard julliard at winehq.org
Wed Jun 18 12:59:30 CDT 2008


Module: wine
Branch: master
Commit: efcdb202b2c37f1696f196955c6bbf4a523da4c3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=efcdb202b2c37f1696f196955c6bbf4a523da4c3

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Jun 18 18:53:05 2008 +0900

winmm: Clear the fccType in mmioDescend for a not RIFF/LIST case.

---

 dlls/winmm/mmio.c       |    3 +++
 dlls/winmm/tests/mmio.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c
index d0a4f49..42f1d32 100644
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -1224,7 +1224,10 @@ MMRESULT WINAPI mmioDescend(HMMIO hmmio, LPMMCKINFO lpck,
     if (lpck->ckid == FOURCC_RIFF || lpck->ckid == FOURCC_LIST)
 	mmioSeek(hmmio, lpck->dwDataOffset + sizeof(DWORD), SEEK_SET);
     else
+    {
 	mmioSeek(hmmio, lpck->dwDataOffset, SEEK_SET);
+	lpck->fccType = 0;
+    }
     TRACE("lpck: ckid=%.4s, cksize=%d, dwDataOffset=%d fccType=%08X (%.4s)!\n",
 	  (LPSTR)&lpck->ckid, lpck->cksize, lpck->dwDataOffset,
 	  lpck->fccType, srchType?(LPSTR)&lpck->fccType:"");
diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
index 856e6e0..5fac90a 100644
--- a/dlls/winmm/tests/mmio.c
+++ b/dlls/winmm/tests/mmio.c
@@ -32,7 +32,7 @@ static DWORD RIFF_buf[] =
 {
     FOURCC_RIFF, 7*sizeof(DWORD)+sizeof(MainAVIHeader), mmioFOURCC('A','V','I',' '),
     FOURCC_LIST, sizeof(DWORD)+sizeof(MMCKINFO)+sizeof(MainAVIHeader), listtypeAVIHEADER,
-    ckidAVIMAINHDR, sizeof(MainAVIHeader),
+    ckidAVIMAINHDR, sizeof(MainAVIHeader), 0xdeadbeef, 0xdeadbeef,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,




More information about the wine-cvs mailing list