[DSOUND] Clean up a trace and a secondary buffer creation

Peter Berg Larsen pebl at math.ku.dk
Sat Nov 5 04:59:12 CST 2005


Changelog:
 	A ( is missing in a TRACE. Everywere is the output argument only
 	assigned if the function succed, but for a secondary buffer.
 	This swaps the assignments to follow that.


Index: dlls/dsound/dsound.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/dsound.c,v
retrieving revision 1.42
diff -u -r1.42 dsound.c
--- dlls/dsound/dsound.c	19 Oct 2005 19:21:38 -0000	1.42
+++ dlls/dsound/dsound.c	5 Nov 2005 10:24:36 -0000
@@ -364,10 +364,10 @@

          hres = IDirectSoundBufferImpl_Create(This, (IDirectSoundBufferImpl**)&dsb, dsbd);
          if (dsb) {
-            hres = SecondaryBufferImpl_Create(dsb, (SecondaryBufferImpl**)ppdsb);
-            if (*ppdsb) {
-                dsb->secondary = (SecondaryBufferImpl*)*ppdsb;
-                IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)*ppdsb);
+            hres = SecondaryBufferImpl_Create(dsb, (SecondaryBufferImpl**)&(dsb->secondary));
+            if (dsb->secondary) {
+                IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)dsb->secondary);
+		*ppdsb = (LPDIRECTSOUNDBUFFER)(dsb->secondary);
              } else
                  WARN("SecondaryBufferImpl_Create failed\n");
          } else
Index: dlls/dsound/primary.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/primary.c,v
retrieving revision 1.51
diff -u -r1.51 primary.c
--- dlls/dsound/primary.c	17 Oct 2005 09:24:50 -0000	1.51
+++ dlls/dsound/primary.c	5 Nov 2005 10:24:38 -0000
@@ -1039,7 +1039,7 @@
  	LPCDSBUFFERDESC dsbd)
  {
  	PrimaryBufferImpl *dsb;
-	TRACE("%p,%p,%p)\n",ds,pdsb,dsbd);
+	TRACE("(%p,%p,%p)\n",ds,pdsb,dsbd);

  	if (dsbd->lpwfxFormat) {
  		WARN("invalid parameter: dsbd->lpwfxFormat != NULL\n");



More information about the wine-patches mailing list