commit 1bf5dea29a0d12d8e49f32da550cab5390dd102a
author Eric Pouech <Eric.Pouech@wanadoo.fr> Tue Jan 04 00:25:39 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 04 00:25:39 2000 +0000
tree 01f132354bae89062e9183576d874c848a1069b2
parent 507950c461f7a5b017f12bdddb0de22c9d87527e

Removed extraneous ERR message.

dlls/winmm/wineoss/mixer.c

diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 869a82c..f680c89 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -119,7 +119,7 @@
 /**************************************************************************
  * 				MIX_GetLineInfoFromIndex	[internal]
  */
-static	void	MIX_GetLineInfoFromIndex(LPMIXERLINEA lpMl, int devmask, DWORD idx)
+static	DWORD	MIX_GetLineInfoFromIndex(LPMIXERLINEA lpMl, int devmask, DWORD idx)
 {
     strcpy(lpMl->szShortName, MIX_Labels[idx]);
     strcpy(lpMl->szName, MIX_Names[idx]);
@@ -149,9 +149,10 @@
 	lpMl->fdwLine	 |= MIXERLINE_LINEF_SOURCE;
 	break;
     default:
-	ERR("Index %ld not handled.\n", idx);
-	break;
+	WARN("Index %ld not handled.\n", idx);
+	return MIXERR_INVALLINE;
     }
+    return MMSYSERR_NOERROR;
 }
 
 /**************************************************************************
@@ -206,7 +207,8 @@
 	    return MIXERR_INVALLINE;
 	if (WINE_CHN_SUPPORTS(MIX_StereoMask, j))
 	    lpMl->cChannels++;
-	MIX_GetLineInfoFromIndex(lpMl, MIX_DevMask, j);
+	if ((ret = MIX_GetLineInfoFromIndex(lpMl, MIX_DevMask, j)) != MMSYSERR_NOERROR)
+	    return ret;
 	break;
     case MIXER_GETLINEINFOF_LINEID:
 	TRACE("LINEID (%08lx)\n", lpMl->dwLineID);
@@ -214,7 +216,8 @@
 	    return MIXERR_INVALLINE;
 	if (WINE_CHN_SUPPORTS(MIX_StereoMask, lpMl->dwLineID))
 	    lpMl->cChannels++;
-	MIX_GetLineInfoFromIndex(lpMl, MIX_DevMask, lpMl->dwLineID);
+	if ((ret = MIX_GetLineInfoFromIndex(lpMl, MIX_DevMask, lpMl->dwLineID)) != MMSYSERR_NOERROR)
+	    return ret;
 	break;
     case MIXER_GETLINEINFOF_COMPONENTTYPE:
 	TRACE("COMPONENT TYPE (%08lx)\n", lpMl->dwComponentType);