Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 02:34:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing dsdesc stuct with right name from wine

Browse source 
I did correct right datatype in the struct
fix minor change in dsound.h

svn path=/trunk/; revision=18324
This commit is contained in:
Magnus Olsen 2005-10-08 11:26:13 +00:00
parent cd198924db
commit c787e10fca
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/w32api/include/dsdriver.h
View file

@ -61,8 +61,8 @@ typedef struct IDsCaptureDriverBuffer *PIDSCDRIVERBUFFER;
typedef struct _DSDRIVERDESC typedef struct _DSDRIVERDESC
{ {
DWORD dwFlags; DWORD dwFlags;
CHAR szDesc[256]; TCHAR szDesc[256];
CHAR szDrvName[256]; TCHAR szDrvname[256];
DWORD dnDevNode; DWORD dnDevNode;
WORD wVxdId; WORD wVxdId;
WORD wReserved; WORD wReserved;
@ -76,6 +76,9 @@ typedef struct _DSDRIVERDESC
LPVOID pvReserved2; LPVOID pvReserved2;
} DSDRIVERDESC,*PDSDRIVERDESC; } DSDRIVERDESC,*PDSDRIVERDESC;
typedef struct _DSDRIVERCAPS typedef struct _DSDRIVERCAPS
{ {
DWORD dwFlags; DWORD dwFlags;

11
reactos/w32api/include/dsound.h
View file

@ -86,7 +86,7 @@ typedef struct IDirectSound3DBuffer *LPDIRECTSOUND3DBUFFER,**LPLPDIRECTSOUND3DBU
DEFINE_GUID(IID_IDirectSoundCapture, 0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16); DEFINE_GUID(IID_IDirectSoundCapture, 0xB0210781,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE,**LPLPDIRECTSOUNDCAPTURE; typedef struct IDirectSoundCapture *LPDIRECTSOUNDCAPTURE,**LPLPDIRECTSOUNDCAPTURE;
#define IID_IDirectSoundCapture8 IID_IDirectSoundCapture #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); DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xB0210782,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
typedef struct IDirectSoundCaptureBuffer *LPDIRECTSOUNDCAPTUREBUFFER,**LPLPDIRECTSOUNDCAPTUREBUFFER; typedef struct IDirectSoundCaptureBuffer *LPDIRECTSOUNDCAPTUREBUFFER,**LPLPDIRECTSOUNDCAPTUREBUFFER;
@ -384,14 +384,11 @@ typedef const DSCBCAPS *LPCDSCBCAPS;
#define DSCBSTATUS_CAPTURING 0x00000001 #define DSCBSTATUS_CAPTURING 0x00000001
#define DSCBSTATUS_LOOPING 0x00000002 #define DSCBSTATUS_LOOPING 0x00000002
// this is already in ros include files
#ifndef __LPCGUID_DEFINED__ #ifndef __LPCGUID_DEFINED__
//#define __LPCGUID_DEFINED__ #define __LPCGUID_DEFINED__
//typedef const GUID *LPCGUID; typedef const GUID *LPCGUID;
#endif #endif
typedef LPVOID* LPLPVOID;
typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID); typedef BOOL (CALLBACK *LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID);
typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID); typedef BOOL (CALLBACK *LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID);
@ -404,7 +401,7 @@ extern HRESULT WINAPI DirectSoundCaptureEnumerateA(LPDSENUMCALLBACKA, LPVOID);
extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW, LPVOID); extern HRESULT WINAPI DirectSoundCaptureEnumerateW(LPDSENUMCALLBACKW, LPVOID);
extern HRESULT WINAPI DirectSoundCreate8(LPCGUID lpGUID,LPDIRECTSOUND8 *ppDS8,LPUNKNOWN pUnkOuter); 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, extern HRESULT WINAPI DirectSoundFullDuplexCreate(LPCGUID pcGuidCaptureDevice, LPCGUID pcGuidRenderDevice,
LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd, DWORD dwLevel, LPCDSCBUFFERDESC pcDSCBufferDesc, LPCDSBUFFERDESC pcDSBufferDesc, HWND hWnd, DWORD dwLevel,
LPDIRECTSOUNDFULLDUPLEX *ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter); LPDIRECTSOUNDFULLDUPLEX *ppDSFD, LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, LPUNKNOWN pUnkOuter);