From 83fca4eef791798c59469a0809512d2703b6a294 Mon Sep 17 00:00:00 2001 From: Michal Janusz Miroslaw Date: Mon, 22 Sep 2003 19:25:11 +0000 Subject: [PATCH] MMDRV_Install: Fix confusing indentation. --- dlls/winmm/lolvldrv.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 5f2cee31a26..ae02a73486b 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -640,9 +640,9 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) } if (TRACE_ON(winmm)) { if (MMDRV_GetDescription32(drvFileName, buffer, sizeof(buffer))) - TRACE("%s => %s\n", drvFileName, buffer); - else - TRACE("%s => No description\n", drvFileName); + TRACE("%s => %s\n", drvFileName, buffer); + else + TRACE("%s => No description\n", drvFileName); } } else if (WINMM_CheckForMMSystem() && pFnLoadMMDrvFunc16) { count += pFnLoadMMDrvFunc16(drvFileName, d, lpDrv); @@ -663,15 +663,20 @@ static BOOL MMDRV_Install(LPCSTR drvRegName, LPCSTR drvFileName, BOOL bIsMapper) lpDrv->drvname = strcpy(HeapAlloc(GetProcessHeap(), 0, strlen(drvRegName) + 1), drvRegName); /* Finish init and get the count of the devices */ - MMDRV_InitPerType(lpDrv, MMDRV_AUX, AUXDM_GETNUMDEVS); - MMDRV_InitPerType(lpDrv, MMDRV_MIXER, MXDM_GETNUMDEVS); - MMDRV_InitPerType(lpDrv, MMDRV_MIDIIN, MIDM_GETNUMDEVS); - MMDRV_InitPerType(lpDrv, MMDRV_MIDIOUT, MODM_GETNUMDEVS); - MMDRV_InitPerType(lpDrv, MMDRV_WAVEIN, WIDM_GETNUMDEVS); - MMDRV_InitPerType(lpDrv, MMDRV_WAVEOUT, WODM_GETNUMDEVS); - /* FIXME: if all those func calls return FALSE, - * then the driver must be unloaded - */ + i = 0; + if (MMDRV_InitPerType(lpDrv, MMDRV_AUX, AUXDM_GETNUMDEVS)) i = 1; + if (MMDRV_InitPerType(lpDrv, MMDRV_MIXER, MXDM_GETNUMDEVS)) i = 1; + if (MMDRV_InitPerType(lpDrv, MMDRV_MIDIIN, MIDM_GETNUMDEVS)) i = 1; + if (MMDRV_InitPerType(lpDrv, MMDRV_MIDIOUT, MODM_GETNUMDEVS)) i = 1; + if (MMDRV_InitPerType(lpDrv, MMDRV_WAVEIN, WIDM_GETNUMDEVS)) i = 1; + if (MMDRV_InitPerType(lpDrv, MMDRV_WAVEOUT, WODM_GETNUMDEVS)) i = 1; + /* if all those func calls return FALSE, then the driver must be unloaded */ + if (!i) { + CloseDriver(lpDrv->hDriver, 0, 0); + HeapFree(GetProcessHeap(), 0, lpDrv->drvname); + WARN("Driver initialization failed\n"); + return FALSE; + } MMDrvsHi++;