[DSOUND] fix block align error message

Robert Reif reif at earthlink.net
Sat Mar 19 08:25:45 CST 2005


Fix block align error message to show length before fix up.
-------------- next part --------------
Index: dlls/dsound/mixer.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/mixer.c,v
retrieving revision 1.33
diff -u -p -r1.33 mixer.c
--- dlls/dsound/mixer.c	15 Mar 2005 15:40:36 -0000	1.33
+++ dlls/dsound/mixer.c	19 Mar 2005 14:21:50 -0000
@@ -388,8 +388,8 @@ static DWORD DSOUND_MixInBuffer(IDirectS
 
 	if (len % dsb->dsound->pwfx->nBlockAlign) {
 		INT nBlockAlign = dsb->dsound->pwfx->nBlockAlign;
-		len = (len / nBlockAlign) * nBlockAlign;	/* data alignment */
 		ERR("length not a multiple of block size, len = %d, block size = %d\n", len, nBlockAlign);
+		len = (len / nBlockAlign) * nBlockAlign;	/* data alignment */
 	}
 
 	if (len == 0) {
@@ -505,8 +505,8 @@ static void DSOUND_PhaseCancel(IDirectSo
 
 	if (len % dsb->dsound->pwfx->nBlockAlign) {
 		INT nBlockAlign = dsb->dsound->pwfx->nBlockAlign;
-		len = (len / nBlockAlign) * nBlockAlign;	/* data alignment */
 		ERR("length not a multiple of block size, len = %ld, block size = %d\n", len, nBlockAlign);
+		len = (len / nBlockAlign) * nBlockAlign;	/* data alignment */
 	}
 
 	if ((buf = ibuf = DSOUND_tmpbuffer(dsb->dsound, len)) == NULL)


More information about the wine-patches mailing list