[ros-diffs] [janderwald] 41902: [MMEBUDDY] - Pass DeviceId to GetDeviceCapabilities function [WDMAUD.DRV] - Use DeviceId to determine the capabilities of the requested device, not just always the first one

Author: janderwald
Date: Sun Jul 12 03:49:24 2009
New Revision: 41902

URL: http://svn.reactos.org/svn/reactos?rev=41902&view=rev
Log:
[MMEBUDDY]
- Pass DeviceId to GetDeviceCapabilities function
[WDMAUD.DRV]
- Use DeviceId to determine the capabilities of the requested device, not just always the first one

Modified:
    trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c
    trunk/reactos/include/reactos/libs/sound/mmebuddy.h
    trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c
    trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c

Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmaud...
==============================================================================
--- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Sun Jul 12 03:49:24 2009
@@ -72,6 +72,7 @@
 MMRESULT
 GetWdmDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
+    IN  DWORD DeviceId,
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize)
 {
@@ -95,7 +96,7 @@

ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO));
     DeviceInfo.DeviceType = DeviceType;
-    DeviceInfo.DeviceIndex = 0; //FIXME
+    DeviceInfo.DeviceIndex = DeviceId;

Result = SyncOverlappedDeviceIoControl(KernelHandle,
                                            IOCTL_GETCAPABILITIES,

Modified: trunk/reactos/include/reactos/libs/sound/mmebuddy.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/sound/...
==============================================================================
--- trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/libs/sound/mmebuddy.h [iso-8859-1] Sun Jul 12 03:49:24 2009
@@ -156,6 +156,7 @@
 #define DEFINE_GETCAPS_FUNCTYPE(func_typename, caps_type) \
     typedef MMRESULT (*func_typename)( \
         IN  struct _SOUND_DEVICE* SoundDevice, \
+        IN  DWORD DeviceId, \
         OUT caps_type Capabilities, \
         IN  DWORD CapabilitiesSize);

@@ -414,6 +415,7 @@
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
+    IN  DWORD DeviceId,
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize);

Modified: trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy/...
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/capabilities.c [iso-8859-1] Sun Jul 12 03:49:24 2009
@@ -28,6 +28,7 @@
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
+    IN  DWORD DeviceId,
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize)
 {
@@ -104,6 +105,7 @@
         return MMSYSERR_NOTSUPPORTED;

return FunctionTable->GetCapabilities(SoundDevice,
+                                          DeviceId,
                                           Capabilities,
                                           CapabilitiesSize);
 }

Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy/...
==============================================================================
--- trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/sound/mmebuddy/mmewrap.c [iso-8859-1] Sun Jul 12 03:49:24 2009
@@ -72,6 +72,7 @@
         return Result;

return GetSoundDeviceCapabilities(SoundDevice,
+                                      DeviceId,
                                       Capabilities,
                                       CapabilitiesSize);
 }