Fixing dsdesc stuct with right name from wine I did correct right datatype in the struct fix minor change in dsound.h Modified: trunk/reactos/w32api/include/dsdriver.h Modified: trunk/reactos/w32api/include/dsound.h _____
Modified: trunk/reactos/w32api/include/dsdriver.h --- trunk/reactos/w32api/include/dsdriver.h 2005-10-08 10:52:43 UTC (rev 18323) +++ trunk/reactos/w32api/include/dsdriver.h 2005-10-08 11:26:13 UTC (rev 18324) @@ -61,8 +61,8 @@
typedef struct _DSDRIVERDESC { DWORD dwFlags; - CHAR szDesc[256]; - CHAR szDrvName[256]; + TCHAR szDesc[256]; + TCHAR szDrvname[256]; DWORD dnDevNode; WORD wVxdId; WORD wReserved; @@ -76,6 +76,9 @@ LPVOID pvReserved2; } DSDRIVERDESC,*PDSDRIVERDESC;
+ + + typedef struct _DSDRIVERCAPS { DWORD dwFlags; _____
Modified: trunk/reactos/w32api/include/dsound.h --- trunk/reactos/w32api/include/dsound.h 2005-10-08 10:52:43 UTC (rev 18323) +++ trunk/reactos/w32api/include/dsound.h 2005-10-08 11:26:13 UTC (rev 18324) @@ -86,7 +86,7 @@
DEFINE_GUID(IID_IDirectSoundCapture, 0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16); typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE,**LPLPDIRECTSOUNDCAPTURE; #define IID_IDirectSoundCapture8 IID_IDirectSoundCapture -typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE8,**LPLPDIRECTSOUNDCAPTURE8; +typedef struct IDirectSoundCapture IDirectSoundCapture8,*LPDIRECTSOUNDCAPTURE8,**LPLPDIRECTSOUNDCAPTURE8;
DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xB0210782,0x89CD,0x11D0,0xAF, 0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16); typedef struct IDirectSoundCaptureBuffer *LPDIRECTSOUNDCAPTUREBUFFER,**LPLPDIRECTSOUNDCAPTUREBUFFER; @@ -384,14 +384,11 @@ #define DSCBSTATUS_CAPTURING 0x00000001 #define DSCBSTATUS_LOOPING 0x00000002
-// this is already in ros include files #ifndef __LPCGUID_DEFINED__ -//#define __LPCGUID_DEFINED__ -//typedef const GUID *LPCGUID; +#define __LPCGUID_DEFINED__ +typedef const GUID *LPCGUID; #endif
-typedef LPVOID* LPLPVOID; - typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID); typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID);
@@ -404,7 +401,7 @@ extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW, LPVOID);
extern HRESULT WINAPI DirectSoundCreate8(LPCGUID lpGUID,LPDIRECTSOUND8 *ppDS8,LPUNKNOWN pUnkOuter); -extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID lpGUID, LPDIRECTSOUNDCAPTURE *ppDSC8, LPUNKNOWN pUnkOuter); +extern HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID lpGUID, LPDIRECTSOUNDCAPTURE8 *ppDSC8, LPUNKNOWN pUnkOuter); extern HRESULT WINAPI DirectSoundFullDuplexCreate(LPCGUID pcGuidCaptureDevice, LPCGUID pcGuidRenderDevice, LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd, DWORD dwLevel, LPDIRECTSOUNDFULLDUPLEX *ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter);