winmm message mapping fix

[Eric Pouech]

this patch provides, in the area of 16 <=> 32 multimedia message
mapping:
- a fix for an evilish copy&paste 
- some relaxed test in large buffer mapping (it's forbidden to enlarge a
  buffer after it has been prepared. Old code simply dropped the
request,
  the patch allows for using only the old prepared size

A+
-------------- next part --------------
Name:          winmm_map
ChangeLog:     fixed a mismatch in wavein 16/32 mapping
	relaxed some tests about buffer lengths
License:       X11
GenDate:       2002/04/22 19:05:48 UTC
ModifiedFiles: dlls/winmm/lolvldrv.c
AddedFiles:    
===================================================================
RCS file: /home/cvs/cvsroot/wine/wine/dlls/winmm/lolvldrv.c,v
retrieving revision 1.26
diff -u -u -r1.26 lolvldrv.c
--- dlls/winmm/lolvldrv.c	9 Mar 2002 23:44:33 -0000	1.26
+++ dlls/winmm/lolvldrv.c	21 Apr 2002 08:53:40 -0000
@@ -116,7 +116,7 @@
     if (_lread(hFile, &dw, 4) != 4)			E(("Can't read nr table offset\n"));
     if (_llseek(hFile, dw, SEEK_SET) < 0) 		E(("Can't seek to nr table %lu\n", dw));
     if (_lread(hFile, buf, 1) != 1)			E(("Can't read descr length\n"));
-    buflen = min((BYTE)buf[0], buflen - 1);
+    buflen = min((int)(unsigned)(BYTE)buf[0], buflen - 1);
     if (_lread(hFile, buf, buflen) != buflen)		E(("Can't read descr (%d)\n", buflen));
     buf[buflen] = '\0';
     ret = TRUE;
@@ -490,12 +490,11 @@
 	    *lpParam1 = (DWORD)mh32;
 	    *lpParam2 = sizeof(MIDIHDR);
 	    /* dwBufferLength can be reduced between prepare & write */
-	    if (mh32->dwBufferLength < mh16->dwBufferLength) {
-		ERR("Size of buffer has been increased (%ld, %ld)\n",
+	    if (wMsg == MODM_LONGDATA && mh32->dwBufferLength < mh16->dwBufferLength) {
+		ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n",
 		    mh32->dwBufferLength, mh16->dwBufferLength);
-		return MMDRV_MAP_MSGERROR;
-	    }
-	    mh32->dwBufferLength = mh16->dwBufferLength;
+	    } else
+                mh32->dwBufferLength = mh16->dwBufferLength;
 	    ret = MMDRV_MAP_OKMEM;
 	}
 	break;
@@ -663,12 +662,11 @@
                   *lpParam1, (DWORD)mh16->lpData, mh32->dwBufferLength, (DWORD)mh32->lpData);
 
 	    /* dwBufferLength can be reduced between prepare & write */
-	    if (mh16->dwBufferLength < mh32->dwBufferLength) {
-		ERR("Size of buffer has been increased (%ld, %ld)\n",
+	    if (wMsg == MODM_LONGDATA && mh16->dwBufferLength < mh32->dwBufferLength) {
+		ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n",
 		    mh16->dwBufferLength, mh32->dwBufferLength);
-		return MMDRV_MAP_MSGERROR;
-	    }
-	    mh16->dwBufferLength = mh32->dwBufferLength;
+	    } else
+                mh16->dwBufferLength = mh32->dwBufferLength;
 	    ret = MMDRV_MAP_OKMEM;
 	}
 	break;
@@ -935,12 +933,11 @@
 	    *lpParam1 = (DWORD)wh32;
 	    *lpParam2 = sizeof(WAVEHDR);
 	    /* dwBufferLength can be reduced between prepare & write */
-	    if (wh32->dwBufferLength < wh16->dwBufferLength) {
-		ERR("Size of buffer has been increased (%ld, %ld)\n",
+	    if (wMsg == WIDM_ADDBUFFER && wh32->dwBufferLength < wh16->dwBufferLength) {
+		ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n",
 		    wh32->dwBufferLength, wh16->dwBufferLength);
-		return MMDRV_MAP_MSGERROR;
-	    }
-	    wh32->dwBufferLength = wh16->dwBufferLength;
+	    } else
+                wh32->dwBufferLength = wh16->dwBufferLength;
 	    ret = MMDRV_MAP_OKMEM;
 	}
 	break;
@@ -1144,12 +1141,11 @@
 	    *lpParam1 = seg_ptr + sizeof(LPWAVEHDR);
 	    *lpParam2 = sizeof(WAVEHDR);
 	    /* dwBufferLength can be reduced between prepare & write */
-	    if (wh32->dwBufferLength < wh16->dwBufferLength) {
-		ERR("Size of buffer has been increased (%ld, %ld)\n",
-		    wh32->dwBufferLength, wh16->dwBufferLength);
-		return MMDRV_MAP_MSGERROR;
-	    }
-	    wh32->dwBufferLength = wh16->dwBufferLength;
+	    if (wMsg == WIDM_ADDBUFFER && wh16->dwBufferLength < wh32->dwBufferLength) {
+		ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n",
+		    wh16->dwBufferLength, wh32->dwBufferLength);
+	    } else
+                wh16->dwBufferLength = wh32->dwBufferLength;
 	    ret = MMDRV_MAP_OKMEM;
 	}
 	break;
@@ -1436,12 +1432,11 @@
 	    *lpParam1 = (DWORD)wh32;
 	    *lpParam2 = sizeof(WAVEHDR);
 	    /* dwBufferLength can be reduced between prepare & write */
-	    if (wh32->dwBufferLength < wh16->dwBufferLength) {
-		ERR("Size of buffer has been increased (%ld, %ld)\n",
+	    if (wMsg == WODM_WRITE && wh32->dwBufferLength < wh16->dwBufferLength) {
+		ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n",
 		    wh32->dwBufferLength, wh16->dwBufferLength);
-		return MMDRV_MAP_MSGERROR;
-	    }
-	    wh32->dwBufferLength = wh16->dwBufferLength;
+	    } else
+                wh32->dwBufferLength = wh16->dwBufferLength;
 	    ret = MMDRV_MAP_OKMEM;
 	}
 	break;
@@ -1705,12 +1700,11 @@
 	    *lpParam1 = seg_ptr + sizeof(LPWAVEHDR);
 	    *lpParam2 = sizeof(WAVEHDR);
 	    /* dwBufferLength can be reduced between prepare & write */
-	    if (wh16->dwBufferLength < wh32->dwBufferLength) {
-		ERR("Size of buffer has been increased (%ld, %ld)\n",
+	    if (wMsg == WODM_WRITE && wh16->dwBufferLength < wh32->dwBufferLength) {
+		ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n",
 		    wh16->dwBufferLength, wh32->dwBufferLength);
-		return MMDRV_MAP_MSGERROR;
-	    }
-	    wh16->dwBufferLength = wh32->dwBufferLength;
+	    } else
+                wh16->dwBufferLength = wh32->dwBufferLength;
 	    ret = MMDRV_MAP_OKMEM;
 	}
 	break;