Added patch to respect return value of callback in DirectSoundEnumerateA/W.

This commit is contained in:
Sebastian Lackner 2017-01-14 23:20:54 +01:00
parent 96a6d1cecc
commit 577b85bdc8
3 changed files with 45 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From 2bec406f8c9a80d8bb7beef2a9cb39455be6b125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 14 Jan 2017 23:06:28 +0100
Subject: dsound: Respect return value of callback in DirectSoundEnumerateA/W.
---
dlls/dsound/dsound_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index db2ca506bda..2e12fe7a40d 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -522,7 +522,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids,
}
if(device != defdev){
- send_device(device, &guids[n], cb, user);
+ keep_going = send_device(device, &guids[n], cb, user);
++n;
}
--
2.11.0

View File

@ -0,0 +1 @@
Fixes: [42163] Respect return value of callback in DirectSoundEnumerateA/W

View File

@ -147,6 +147,7 @@ patch_enable_all ()
enable_dsound_EAX="$1"
enable_dsound_Fast_Mixer="$1"
enable_dsound_Revert_Cleanup="$1"
enable_dsound_enumerate_mmdevices="$1"
enable_dxdiagn_Display_Information="$1"
enable_dxdiagn_Enumerate_DirectSound="$1"
enable_dxdiagn_GetChildContainer_Leaf_Nodes="$1"
@ -645,6 +646,9 @@ patch_enable ()
dsound-Revert_Cleanup)
enable_dsound_Revert_Cleanup="$2"
;;
dsound-enumerate_mmdevices)
enable_dsound_enumerate_mmdevices="$2"
;;
dxdiagn-Display_Information)
enable_dxdiagn_Display_Information="$2"
;;
@ -3956,6 +3960,21 @@ if test "$enable_dsound_EAX" -eq 1; then
) >> "$patchlist"
fi
# Patchset dsound-enumerate_mmdevices
# |
# | This patchset fixes the following Wine bugs:
# | * [#42163] Respect return value of callback in DirectSoundEnumerateA/W
# |
# | Modified files:
# | * dlls/dsound/dsound_main.c
# |
if test "$enable_dsound_enumerate_mmdevices" -eq 1; then
patch_apply dsound-enumerate_mmdevices/0001-dsound-Respect-return-value-of-callback-in-DirectSou.patch
(
echo '+ { "Michael Müller", "dsound: Respect return value of callback in DirectSoundEnumerateA/W.", 1 },';
) >> "$patchlist"
fi
# Patchset dxdiagn-Display_Information
# |
# | This patchset fixes the following Wine bugs: