DirectSoundEnumerateA() now passes a GUID to the callback if the first
call returned TRUE.
This commit is contained in:
parent
e6bdef2a41
commit
8fc98cdef8
|
@ -292,12 +292,15 @@ HRESULT WINAPI DirectSoundEnumerateA(
|
||||||
LPVOID lpContext)
|
LPVOID lpContext)
|
||||||
{
|
{
|
||||||
TRACE("lpDSEnumCallback = %p, lpContext = %p\n",
|
TRACE("lpDSEnumCallback = %p, lpContext = %p\n",
|
||||||
lpDSEnumCallback, lpContext);
|
lpDSEnumCallback, lpContext);
|
||||||
|
|
||||||
#ifdef HAVE_OSS
|
#ifdef HAVE_OSS
|
||||||
if (lpDSEnumCallback != NULL)
|
if (lpDSEnumCallback != NULL)
|
||||||
lpDSEnumCallback(NULL,"WINE DirectSound",
|
if (lpDSEnumCallback(NULL, "Primary DirectSound Driver",
|
||||||
"sound",lpContext);
|
"sound", lpContext))
|
||||||
|
lpDSEnumCallback((LPGUID)&DSDEVID_WinePlayback,
|
||||||
|
"WINE DirectSound", "sound",
|
||||||
|
lpContext);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return DS_OK;
|
return DS_OK;
|
||||||
|
|
|
@ -54,6 +54,7 @@ typedef struct IDirectSoundCapture IDirectSoundCapture,*LPDIRECTSOUNDCAPTURE;
|
||||||
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 IDirectSoundCaptureBuffer,*LPDIRECTSOUNDCAPTUREBUFFER;
|
typedef struct IDirectSoundCaptureBuffer IDirectSoundCaptureBuffer,*LPDIRECTSOUNDCAPTUREBUFFER;
|
||||||
|
|
||||||
|
DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE);
|
||||||
|
|
||||||
#define _FACDS 0x878
|
#define _FACDS 0x878
|
||||||
#define MAKE_DSHRESULT(code) MAKE_HRESULT(1,_FACDS,code)
|
#define MAKE_DSHRESULT(code) MAKE_HRESULT(1,_FACDS,code)
|
||||||
|
|
Loading…
Reference in New Issue