[MMEBUDDY]

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

svn path=/trunk/; revision=41902

reactos/dll/win32/wdmaud.drv/wdmaud.c

@@ -72,6 +72,7 @@ GetNumWdmDevs(
 MMRESULT
 GetWdmDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
+    IN  DWORD DeviceId,
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize)
 {
@@ -95,7 +96,7 @@ GetWdmDeviceCapabilities(
 
     ZeroMemory(&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO));
     DeviceInfo.DeviceType = DeviceType;
-    DeviceInfo.DeviceIndex = 0; //FIXME
+    DeviceInfo.DeviceIndex = DeviceId;
 
     Result = SyncOverlappedDeviceIoControl(KernelHandle,
                                            IOCTL_GETCAPABILITIES,

reactos/include/reactos/libs/sound/mmebuddy.h

@@ -156,6 +156,7 @@ struct _SOUND_DEVICE_INSTANCE;
 #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 @@ MmeResetWavePlayback(
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
+    IN  DWORD DeviceId,
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize);
 

reactos/lib/drivers/sound/mmebuddy/capabilities.c

@@ -28,6 +28,7 @@
 MMRESULT
 GetSoundDeviceCapabilities(
     IN  PSOUND_DEVICE SoundDevice,
+    IN  DWORD DeviceId,
     OUT PVOID Capabilities,
     IN  DWORD CapabilitiesSize)
 {
@@ -104,6 +105,7 @@ GetSoundDeviceCapabilities(
         return MMSYSERR_NOTSUPPORTED;
 
     return FunctionTable->GetCapabilities(SoundDevice,
+                                          DeviceId,
                                           Capabilities,
                                           CapabilitiesSize);
 }

reactos/lib/drivers/sound/mmebuddy/mmewrap.c

@@ -72,6 +72,7 @@ MmeGetSoundDeviceCapabilities(
         return Result;
 
     return GetSoundDeviceCapabilities(SoundDevice,
+                                      DeviceId,
                                       Capabilities,
                                       CapabilitiesSize);
 }