Changeset 21572 for trunk/include/win/dsound.h

Timestamp:

Feb 9, 2011, 5:03:46 PM (15 years ago)

Author:

dmik

Message:

dsound: Fixed GUID definition in DirectSoundCreate().

File:

• trunk/include/win/dsound.h (modified) (4 diffs)

trunk/include/win/dsound.h

@@ -16 +16 @@
 typedef struct IDirectSound IDirectSound,*LPDIRECTSOUND;
 
-DEFINE_GUID(IID_IDirectSoundBuffer,     0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60); 
+DEFINE_GUID(IID_IDirectSoundBuffer,     0x279AFA85,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
 typedef struct IDirectSoundBuffer IDirectSoundBuffer,*LPDIRECTSOUNDBUFFER,**LPLPDIRECTSOUNDBUFFER;
 
@@ -25 +25 @@
 typedef struct IDirectSound3DListener IDirectSound3DListener,*LPDIRECTSOUND3DLISTENER;
 
-DEFINE_GUID(IID_IDirectSound3DBuffer,   0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60); 
+DEFINE_GUID(IID_IDirectSound3DBuffer,   0x279AFA86,0x4981,0x11CE,0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60);
 typedef struct IDirectSound3DBuffer IDirectSound3DBuffer,*LPDIRECTSOUND3DBUFFER;
 
@@ -183 +183 @@
 typedef BOOL (* CALLBACK LPDSENUMCALLBACKW)(LPGUID,LPWSTR,LPWSTR,LPVOID);
 typedef BOOL (* CALLBACK LPDSENUMCALLBACKA)(LPGUID,LPSTR,LPSTR,LPVOID);
-
-extern HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW lpCallback, LPVOID lpContext );
-extern HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA lpCallback, LPVOID lpContext );
-
-#ifdef UNICODE
-#define LPDSENUMCALLBACK        LPDSENUMCALLBACKW
-#define DirectSoundEnumerate    DirectSoundEnumerateW
-#else
-#define LPDSENUMCALLBACK        LPDSENUMCALLBACKA
-#define DirectSoundEnumerate    DirectSoundEnumerateA
-#endif
-
-extern HRESULT WINAPI DirectSoundCreate(REFGUID lpGUID,LPDIRECTSOUND * ppDS,IUnknown *pUnkOuter );
+DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK)
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+HRESULT WINAPI DirectSoundEnumerateW(LPDSENUMCALLBACKW lpCallback, LPVOID lpContext );
+HRESULT WINAPI DirectSoundEnumerateA(LPDSENUMCALLBACKA lpCallback, LPVOID lpContext );
+#define DirectSoundEnumerate WINELIB_NAME_AW(DirectSoundEnumerate)
+
+HRESULT WINAPI DirectSoundCreate(LPCGUID lpGUID,LPDIRECTSOUND * ppDS,IUnknown *pUnkOuter );
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
 
 
@@ -375 +378 @@
 
 typedef const DS3DLISTENER *LPCDS3DLISTENER;
-        
+
 #define ICOM_INTERFACE IDirectSound3DListener
 #define IDirectSound3DListener_METHODS \