Module: wine Branch: master Commit: 3cf9f84561b67a46d91cd70b66fc077817f8157c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf9f84561b67a46d91cd70b66...
Author: Michael Stefaniuc mstefani@redhat.de Date: Tue Jan 9 00:39:23 2007 +0100
dsound: Remove stray '' at end of lines.
---
dlls/dsound/sound3d.c | 12 ++++++------ dlls/dsound/tests/propset.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 6f16686..234c40b 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -70,7 +70,7 @@ static inline D3DVALUE ScalarProduct (LP { D3DVALUE c; c = (a->x*b->x) + (a->y*b->y) + (a->z*b->z); - TRACE("(%f,%f,%f) * (%f,%f,%f) = %f)\n", a->x, a->y, a->z, b->x, b->y, \ + TRACE("(%f,%f,%f) * (%f,%f,%f) = %f)\n", a->x, a->y, a->z, b->x, b->y, b->z, c); return c; } @@ -82,7 +82,7 @@ static inline D3DVECTOR VectorProduct (L c.x = (a->y*b->z) - (a->z*b->y); c.y = (a->z*b->x) - (a->x*b->z); c.z = (a->x*b->y) - (a->y*b->x); - TRACE("(%f,%f,%f) x (%f,%f,%f) = (%f,%f,%f)\n", a->x, a->y, a->z, b->x, b->y, \ + TRACE("(%f,%f,%f) x (%f,%f,%f) = (%f,%f,%f)\n", a->x, a->y, a->z, b->x, b->y, b->z, c.x, c.y, c.z); return c; } @@ -304,7 +304,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBuf /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */ flFreq = dsb->freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %lf, Listener velocity (component) = %lf => Doppler shift: %ld Hz -> %lf Hz\n", flBufferVel, flListenerVel, \ + TRACE("doppler: Buffer velocity (component) = %lf, Listener velocity (component) = %lf => Doppler shift: %ld Hz -> %lf Hz\n", flBufferVel, flListenerVel, dsb->freq, flFreq); /* FIXME: replace following line with correct frequency setting ! */ dsb->freq = flFreq; @@ -860,8 +860,8 @@ static HRESULT WINAPI IDirectSound3DList LPD3DVECTOR lpvOrientTop) { IDirectSound3DListenerImpl *This = (IDirectSound3DListenerImpl *)iface; - TRACE("returning: OrientFront vector = (%f,%f,%f); OrientTop vector = (%f,%f,%f)\n", This->device->ds3dl.vOrientFront.x, \ - This->device->ds3dl.vOrientFront.y, This->device->ds3dl.vOrientFront.z, This->device->ds3dl.vOrientTop.x, This->device->ds3dl.vOrientTop.y, \ + TRACE("returning: OrientFront vector = (%f,%f,%f); OrientTop vector = (%f,%f,%f)\n", This->device->ds3dl.vOrientFront.x, + This->device->ds3dl.vOrientFront.y, This->device->ds3dl.vOrientFront.z, This->device->ds3dl.vOrientTop.x, This->device->ds3dl.vOrientTop.y, This->device->ds3dl.vOrientTop.z); *lpvOrientFront = This->device->ds3dl.vOrientFront; *lpvOrientTop = This->device->ds3dl.vOrientTop; @@ -956,7 +956,7 @@ static HRESULT WINAPI IDirectSound3DList DWORD dwApply) { IDirectSound3DListenerImpl *This = (IDirectSound3DListenerImpl *)iface; - TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %d\n", \ + TRACE("setting: Front vector = (%f,%f,%f); Top vector = (%f,%f,%f); dwApply = %d\n", xFront, yFront, zFront, xTop, yTop, zTop, dwApply); This->device->ds3dl.vOrientFront.x = xFront; This->device->ds3dl.vOrientFront.y = yFront; diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 3beebf2..3c9a3d4 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -36,17 +36,17 @@
#include "initguid.h"
-DEFINE_GUID(DSPROPSETID_VoiceManager, \ +DEFINE_GUID(DSPROPSETID_VoiceManager, 0x62A69BAE,0xDF9D,0x11D1,0x99,0xA6,0x00,0xC0,0x4F,0xC9,0x9D,0x46); -DEFINE_GUID(DSPROPSETID_EAX20_ListenerProperties, \ +DEFINE_GUID(DSPROPSETID_EAX20_ListenerProperties, 0x306a6a8,0xb224,0x11d2,0x99,0xe5,0x0,0x0,0xe8,0xd8,0xc7,0x22); -DEFINE_GUID(DSPROPSETID_EAX20_BufferProperties, \ +DEFINE_GUID(DSPROPSETID_EAX20_BufferProperties, 0x306a6a7,0xb224,0x11d2,0x99,0xe5,0x0,0x0,0xe8,0xd8,0xc7,0x22); -DEFINE_GUID(DSPROPSETID_I3DL2_ListenerProperties, \ +DEFINE_GUID(DSPROPSETID_I3DL2_ListenerProperties, 0xDA0F0520,0x300A,0x11D3,0x8A,0x2B,0x00,0x60,0x97,0x0D,0xB0,0x11); -DEFINE_GUID(DSPROPSETID_I3DL2_BufferProperties, \ +DEFINE_GUID(DSPROPSETID_I3DL2_BufferProperties, 0xDA0F0521,0x300A,0x11D3,0x8A,0x2B,0x00,0x60,0x97,0x0D,0xB0,0x11); -DEFINE_GUID(DSPROPSETID_ZOOMFX_BufferProperties, \ +DEFINE_GUID(DSPROPSETID_ZOOMFX_BufferProperties, 0xCD5368E0,0x3450,0x11D3,0x8B,0x6E,0x00,0x10,0x5A,0x9B,0x7B,0xBC);
typedef HRESULT (CALLBACK * MYPROC)(REFCLSID, REFIID, LPVOID *);