Removes dsconf IIDs from dxguid.lib.

Fixes propset files for missing IIDs.

Removes dsconf IIDs from dxguid.lib.
aa60b5ec · Robert Reif · Alexandre Julliard · 398d78e6 · aa60b5ec · aa60b5ec
Commit aa60b5ec authored Jul 22, 2004 by Robert Reif Committed by Alexandre Julliard Jul 22, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

propset.c dlls/dsound/propset.c +2 -1

propset.c dlls/dsound/tests/propset.c +4 -1

dxguid.c dlls/dxguid/dxguid.c +0 -1

No files found.
--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -47,9 +47,10 @@
 #include "wine/windef16.h"
 #include "wine/debug.h"
 #include "dsound.h"
-#include "dsconf.h"
 #include "dsdriver.h"
 #include "dsound_private.h"
+#include "initguid.h"
+#include "dsconf.h"

 WINE_DEFAULT_DEBUG_CHANNEL(dsound);


--- a/dlls/dsound/tests/propset.c
+++ b/dlls/dsound/tests/propset.c
@@ -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);

--- a/dlls/dxguid/dxguid.c
+++ b/dlls/dxguid/dxguid.c
@@ -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"