Re: dsound tests propset.c windows compile patch

[Robert Reif]

Robert Reif wrote:
> Fix so it compiles with VC7 on XP.

Here is the proper fix.

Don't include dsconf IIDs in dxguid.lib.

Index: dlls/dsound/tests/propset.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/tests/propset.c,v
retrieving revision 1.5
diff -u -r1.5 propset.c
--- dlls/dsound/tests/propset.c	5 Sep 2003 23:08:38 -0000	1.5
+++ dlls/dsound/tests/propset.c	19 Jul 2004 04:14:11 -0000
@@ -29,9 +29,12 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "dsound.h"
+#include "initguid.h"
 #include "dsconf.h"

-#include "initguid.h"
+#ifndef DSBCAPS_CTRLDEFAULT
+#define DSBCAPS_CTRLDEFAULT DSBCAPS_CTRLFREQUENCY|DSBCAPS_CTRLPAN|DSBCAPS_CTRLVOLUME
+#endif

DEFINE_GUID(DSPROPSETID_VoiceManager,0x62A69BAE,0xDF9D,0x11D1,0x99,0xA6,0x00,0xC0,0x4F,0xC9,0x9D,0x46);
 DEFINE_GUID(DSPROPSETID_EAX20_ListenerProperties,0x306a6a8,0xb224,0x11d2,0x99,0xe5,0x0,0x0,0xe8,0xd8,0xc7,0x22);
Index: dlls/dxguid/dxguid.c
===================================================================
RCS file: /home/wine/wine/dlls/dxguid/dxguid.c,v
retrieving revision 1.2
diff -u -r1.2 dxguid.c
--- dlls/dxguid/dxguid.c	3 Jun 2004 00:03:23 -0000	1.2
+++ dlls/dxguid/dxguid.c	19 Jul 2004 04:14:11 -0000
@@ -37,7 +37,6 @@
 #include "mmsystem.h"
 #include "dsound.h"
 #include "dsdriver.h"
-#include "dsconf.h"
 #include "dmusici.h"
 #include "dmusics.h"
 #include "dplay.h"