- fix some prototypes, remove dxroslayer from dsound

[reactos.git] / reactos / lib / sdk / dxguid / dxguid-mingw.c

diff --git a/reactos/lib/sdk/dxguid/dxguid-mingw.c b/reactos/lib/sdk/dxguid/dxguid-mingw.c
index 5aa6115..e7267c5 100644 (file)
--- a/reactos/lib/sdk/dxguid/dxguid-mingw.c
+++ b/reactos/lib/sdk/dxguid/dxguid-mingw.c
@@ -15,18 +15,15 @@
 #include <basetyps.h>
 #include <guiddef.h>
 
-/* Hack letting wine dsound be happy, it should not be in this file */
-
-DEFINE_GUID(IID_IDsDriver,             0x8C4233C0l, 0xB4CC, 0x11CE, 0x92, 0x94, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00);
-DEFINE_GUID(IID_IDsDriverNotify,       0x00363EF44, 0x3B57, 0x11D3, 0xAC, 0x79, 0x00, 0x10, 0x5A, 0x01, 0x7f, 0xe1);
-DEFINE_GUID(IID_IDsDriverPropertySet,  0x0F6F2E8E0, 0xD842, 0x11D0, 0x8F, 0x75, 0x00, 0xC0, 0x4F, 0xC2, 0x8A, 0xCA);
-DEFINE_GUID(IID_IDsDriverBuffer,       0x8C4233C1l, 0xB4CC, 0x11CE, 0x92, 0x94, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00);
+/* FIXME - find a better place for these, needed for dsound */
+DEFINE_GUID(CLSID_DirectSoundPrivate, 0x11ab3ec0, 0x25ec, 0x11d1, 0xa4, 0xd8, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
+DEFINE_GUID(DSPROPSETID_DirectSoundDevice, 0x84624f82, 0x25ec, 0x11d1, 0xa4, 0xd8, 0x0, 0xc0, 0x4f, 0xc2, 0x8a, 0xca);
 
 /* Hack Getting ddraw to compile with kernel interface u can not mix dxguid and striims */
 DEFINE_GUID(IID_IDirectDrawKernel, 0x8D56C120, 0x6A08, 0x11D0, 0x9B, 0x06, 0x00, 0xA0, 0xC9, 0x03, 0xA3, 0xB8);
 DEFINE_GUID(IID_IDirectDrawSurfaceKernel, 0x60755DA0, 0x6A40, 0x11D0, 0x9B, 0x06, 0x00, 0xA0, 0xC9, 0x03, 0xA3, 0xB8);
 
-/* This GUIDs does not extists in ms dxsdk 2004 dec in dxguid, I have tested */
+/* These GUIDs do not exist in ms dxsdk 2004 dec in dxguid, tested by Magnus Olsen */
 DEFINE_GUID(CLSID_DirectMusicMelodyFormulationTrack,0xb0684266,0xb57f,0x11d2,0x97,0xf9,0x0,0xc0,0x4f,0xa3,0x6e,0x58);
 DEFINE_GUID(CLSID_DirectMusicSong,0xaed5f0a5,0xd972,0x483d,0xa3,0x84,0x64,0x9d,0xfe,0xb9,0xc1,0x81);
 DEFINE_GUID(GUID_Clear_All_MelodyFragments,0x8509fee6,0xb617,0x11d2,0x97,0xfa,0x0,0xc0,0x4f,0xa3,0x6e,0x58);
@@ -50,8 +47,9 @@ DEFINE_GUID(IID_ID3DXTechnique,0xa00f378d,0xaf79,0x4917,0x90,0x7e,0x4d,0x63,0x5e
 DEFINE_GUID(IID_IDirectDraw3, 0x618F8AD4,0x8b7A,0x11D0,0x8F,0xCC,0x00,0xC0,0x4F,0xd9,0x18,0x9D);
 DEFINE_GUID(IID_IDirectMusicSong,0xa862b2ec,0x3676,0x4982,0x85,0xa,0x78,0x42,0x77,0x5e,0x1d,0x86);
 DEFINE_GUID(IID_IKsFastClock,0xc9902485,0xc180,0x11d2,0x84,0x73,0xd4,0x23,0x94,0x45,0x9e,0x5e);
+DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
-/* Match ms dxsdk 2004 dec this guids exists in dxguid, tested by Magnus Olsen */
+/* Match ms dxsdk 2004 dec these guids exist in dxguid, tested by Magnus Olsen */
 DEFINE_GUID(CLSID_DirectMusicAudioPathConfig,       0xEE0B9CA0, 0xA81E, 0x11D3, 0x9B, 0xD1, 0x00, 0x80, 0xC7, 0x15, 0x0A, 0x74);
 DEFINE_GUID(CLSID_CDirect3DRM,                      0x4516EC41, 0x8F20, 0x11D0, 0x9B, 0x6D, 0x00, 0x00, 0xC0, 0x78, 0x1B, 0xC3);
 DEFINE_GUID(CLSID_CDirect3DRMAnimation,             0x4FA35698, 0x623F, 0x11CF, 0xAC, 0x4A, 0x00, 0x00, 0xC0, 0x38, 0x25, 0xA1);