Changelog:
DirectSoundEnumerateA() now passes a GUID to the callback if the first
call returned TRUE.
--
Johan Gill, johane@lysator.liu.se
Index: wine/dlls/dsound/dsound_main.c
===================================================================
RCS file: /home/wine/wine/dlls/dsound/dsound_main.c,v
retrieving revision 1.55
diff -u -r1.55 dsound_main.c
--- wine/dlls/dsound/dsound_main.c 26 Apr 2002 19:05:16 -0000 1.55
+++ wine/dlls/dsound/dsound_main.c 30 Apr 2002 13:09:43 -0000
@@ -3,6 +3,7 @@
* Copyright 1998 Marcus Meissner
* Copyright 1998 Rob Riggs
* Copyright 2000-2001 TransGaming Technologies, Inc.
+ * Copyright 2002 Johan Gill
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -292,12 +293,15 @@
LPVOID lpContext)
{
TRACE("lpDSEnumCallback = %p, lpContext = %p\n",
- lpDSEnumCallback, lpContext);
+ lpDSEnumCallback, lpContext);
#ifdef HAVE_OSS
if (lpDSEnumCallback != NULL)
- lpDSEnumCallback(NULL,"WINE DirectSound",
- "sound",lpContext);
+ if (lpDSEnumCallback(NULL, "Primary DirectSound Driver",
+ "sound", lpContext))
+ lpDSEnumCallback((LPGUID)&DSDEVID_WinePlayback,
+ "WINE DirectSound", "sound",
+ lpContext);
#endif
return DS_OK;
Index: wine/include/dsound.h
===================================================================
RCS file: /home/wine/wine/include/dsound.h,v
retrieving revision 1.24
diff -u -r1.24 dsound.h
--- wine/include/dsound.h 10 Mar 2002 00:02:34 -0000 1.24
+++ wine/include/dsound.h 30 Apr 2002 13:09:43 -0000
@@ -53,7 +53,8 @@
DEFINE_GUID(IID_IDirectSoundCaptureBuffer,0xB0210782,0x89CD,0x11D0,0xAF,0x08,0x00,0xA0,0xC9,0x25,0xCD,0x16);
typedef struct IDirectSoundCaptureBuffer IDirectSoundCaptureBuffer,*LPDIRECTSOUNDCAPTUREBUFFER;
-
+
+DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE);
#define _FACDS 0x878
#define MAKE_DSHRESULT(code) MAKE_HRESULT(1,_FACDS,code)
