Aric Stewart : winmm: Correct check for MIXER_GETLINECONTROLSF_ONEBYTYPE in mixerGetLineControlsA .

Alexandre Julliard julliard at winehq.org
Thu Nov 29 10:31:26 CST 2007


Module: wine
Branch: master
Commit: 35ecb1b6ee117a3bb97a7352a056f4532fc86dd5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=35ecb1b6ee117a3bb97a7352a056f4532fc86dd5

Author: Aric Stewart <aric at codeweavers.com>
Date:   Thu Nov 29 13:34:06 2007 +0900

winmm: Correct check for MIXER_GETLINECONTROLSF_ONEBYTYPE in mixerGetLineControlsA.

---

 dlls/winmm/winmm.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 6ead107..1f3602c 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -521,7 +521,7 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA,
     /* Debugging on Windows shows for MIXER_GETLINECONTROLSF_ONEBYTYPE only,
        the control count is assumed to be 1 - This is relied upon by a game,
        "Dynomite Deluze"                                                    */
-    if (MIXER_GETLINECONTROLSF_ONEBYTYPE == fdwControls) {
+    if (MIXER_GETLINECONTROLSF_ONEBYTYPE == (fdwControls & MIXER_GETLINECONTROLSF_QUERYMASK)) {
         mlcW.cControls = 1;
     } else {
         mlcW.cControls = lpmlcA->cControls;
@@ -536,7 +536,6 @@ UINT WINAPI mixerGetLineControlsA(HMIXEROBJ hmix, LPMIXERLINECONTROLSA lpmlcA,
 	lpmlcA->dwLineID = mlcW.dwLineID;
 	lpmlcA->u.dwControlID = mlcW.u.dwControlID;
 	lpmlcA->u.dwControlType = mlcW.u.dwControlType;
-	lpmlcA->cControls = mlcW.cControls;
 
 	for (i = 0; i < mlcW.cControls; i++) {
 	    lpmlcA->pamxctrl[i].cbStruct = sizeof(MIXERCONTROLA);




More information about the wine-cvs mailing list