diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 1e2276c425..7a43e2de0d 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -55,11 +55,9 @@ void wave_out_tests()
     ndev=waveOutGetNumDevs();
     trace("found %d WaveOut devices\n",ndev);
 
-    todo_wine {
-        rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps));
-        ok(rc==MMSYSERR_BADDEVICEID,
-           "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc);
-    }
+    rc=waveOutGetDevCapsA(ndev+1,&caps,sizeof(caps));
+    ok(rc==MMSYSERR_BADDEVICEID,
+       "waveOutGetDevCa psA: MMSYSERR_BADDEVICEID expected, got %d",rc);
 
     format.wFormatTag=WAVE_FORMAT_PCM;
     format.nChannels=2;
diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
index 44a4952e35..d5c451c55f 100644
--- a/dlls/winmm/winmm.c
+++ b/dlls/winmm/winmm.c
@@ -2225,7 +2225,7 @@ UINT WINAPI waveOutGetDevCapsA(UINT uDeviceID, LPWAVEOUTCAPSA lpCaps,
     if (lpCaps == NULL)	return MMSYSERR_INVALPARAM;
 
     if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_WAVEOUT, TRUE)) == NULL)
-	return MMSYSERR_INVALHANDLE;
+        return MMSYSERR_BADDEVICEID;
 
     return MMDRV_Message(wmld, WODM_GETDEVCAPS, (DWORD)lpCaps, uSize, TRUE);