From 95bd820fe17dbe88554325df406131af482ffd47 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Mon, 14 Jun 2004 16:53:59 +0000 Subject: [PATCH] Don't try to map the mapper device. --- dlls/winmm/winmm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 9e9365a85dc..919e009c7f9 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -2502,10 +2502,10 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, TRACE("dwRet = %s\n", WINMM_ErrorToString(dwRet)); if (dwRet != WAVERR_BADFORMAT || - (dwFlags & (WAVE_MAPPED|WAVE_FORMAT_DIRECT)) != 0) break; + ((dwFlags & (WAVE_MAPPED|WAVE_FORMAT_DIRECT)) != 0) || (uDeviceID == WAVE_MAPPER)) break; /* if we ask for a format which isn't supported by the physical driver, * let's try to map it through the wave mapper (except, if we already tried - * or user didn't allow us to use acm codecs) + * or user didn't allow us to use acm codecs or the device is already the mapper) */ dwFlags |= WAVE_MAPPED; /* we shall loop only one */