[PATCH v6 2/2] winmm: Remove 'dwLineID' check when MIXER_GETLINECONTROLSF_ONEBYID

[YeshunYe]

From: YeshunYe

Signed-off-by: YeshunYe 
---
 dlls/winmm/tests/mixer.c | 4 ++--
 dlls/winmm/waveform.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c
index 8d592233d65..f0131157b6b 100644
--- a/dlls/winmm/tests/mixer.c
+++ b/dlls/winmm/tests/mixer.c
@@ -877,7 +877,6 @@ static void test_mixerGetLineControlsW(MIXERLINEW* mixerlineW, HMIXEROBJ mix, DW
                 }

rc = mixerGetLineControlsW(mix, &controls, fdwControls);
-                todo_wine_if(fdwControls == MIXER_GETLINECONTROLSF_ONEBYID)
                 ok(rc==MMSYSERR_NOERROR,
                     "mixerGetLineControlsW(%s): "
                     "MMSYSERR_NOERROR expected, got %s\n",
@@ -1049,7 +1048,8 @@ static void mixer_test_deviceW(int device)
                 mixerlineW.cbStruct = sizeof(mixerlineW);
                 mixerlineW.dwDestination=d;
                 mixerlineW.dwSource=s;
-                rc = mixerGetLineInfoW(mix, &mixerlineW, MIXER_GETLINEINFOF_SOURCE);
+                // test MIXER_GETLINEINFOF_DESTINATION, MIXER_GETLINEINFOF_SOURCE has been tested by mixerGetLineInfoA
+                rc = mixerGetLineInfoW(mix, &mixerlineW, MIXER_GETLINEINFOF_DESTINATION);
                 ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER,
                    "mixerGetLineInfoW(MIXER_GETLINEINFOF_SOURCE): "
                    "MMSYSERR_NOERROR expected, got %s\n",
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index ecd2acb8b28..b521f6cf5fc 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -4108,8 +4108,8 @@ UINT WINAPI mixerGetLineControlsW(HMIXEROBJ hmix, LPMIXERLINECONTROLSW lpmlcW,
             return MMSYSERR_INVALPARAM;
         if(lpmlcW->cbmxctrl < sizeof(MIXERCONTROLW))
             return MMSYSERR_INVALPARAM;
-        if(lpmlcW->dwLineID != 0 && lpmlcW->dwLineID != 0xFFFF0000)
-            return MIXERR_INVALLINE;
+        if(lpmlcW->u.dwControlID == 0 || lpmlcW->u.dwControlID == 1)
+            lpmlcW->dwLineID = 0xFFFF0000;
         if(lpmlcW->u.dwControlID == 0)
             return WINMM_GetVolumeLineControl(mmdevice, lpmlcW->dwLineID,
                     lpmlcW->pamxctrl, fdwControls);