winmm: MMIO_ALLOCBUF is ignored if mmioOpen gets a valid buffer.

Existing tests show that MMIO_ALLOCBUF flag is dropped if a valid buffer is being passed to mmioOpen, that means the buffer is valid in that case.

winmm: MMIO_ALLOCBUF is ignored if mmioOpen gets a valid buffer.
d40e0033 · Dmitry Timoshkov · Alexandre Julliard · 94d753c6 · d40e0033
Commit d40e0033 authored Oct 21, 2008 by Dmitry Timoshkov Committed by Alexandre Julliard Oct 21, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

mmio.c dlls/winmm/mmio.c +3 -2

No files found.
--- a/dlls/winmm/mmio.c
+++ b/dlls/winmm/mmio.c
@@ -667,10 +667,11 @@ HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags,
        refmminfo->wErrorRet = MMIO_SetBuffer(wm, refmminfo->pchBuffer, refmminfo->cchBuffer, 0);
 	if (refmminfo->wErrorRet != MMSYSERR_NOERROR)
 	    goto error1;
-	if (wm->info.fccIOProc == FOURCC_MEM)
-	    wm->bBufferLoaded = TRUE;
    }

+    if (wm->info.fccIOProc == FOURCC_MEM && !(wm->info.dwFlags & MMIO_ALLOCBUF))
+        wm->bBufferLoaded = TRUE;
+
    /* see mmioDosIOProc for that one */
    wm->info.adwInfo[0] = refmminfo->adwInfo[0];