From aa60b5ec0d300f0971d27aabd980a75be4431db7 Mon Sep 17 00:00:00 2001
From: Robert Reif <reif@earthlink.net>
Date: Thu, 22 Jul 2004 19:40:44 +0000
Subject: [PATCH] Removes dsconf IIDs from dxguid.lib. Fixes propset files for
 missing IIDs.

---
 dlls/dsound/propset.c       | 3 ++-
 dlls/dsound/tests/propset.c | 5 ++++-
 dlls/dxguid/dxguid.c        | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
index 398c814ded1..d9c2334582f 100644
--- 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);
 
diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c
index a213267275e..5c45a03c5c8 100644
--- 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);
diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c
index 211df12bc1e..f79d1bf4223 100644
--- 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"