msacm: Fix acmMetrics(ACM_METRIC_DRIVER_PRIORITY) return on error.

1da4b59e · Alex Villacís Lasso · Alexandre Julliard · 9a577e5e · 1da4b59e
Commit 1da4b59e authored Jan 17, 2006 by Alex Villacís Lasso Committed by Alexandre Julliard Jan 17, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

msacm32_main.c dlls/msacm/msacm32_main.c +6 -3

No files found.
--- a/dlls/msacm/msacm32_main.c
+++ b/dlls/msacm/msacm32_main.c
@@ -224,12 +224,15 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, UINT uMetric, LPVOID pMetric)
    case ACM_METRIC_DRIVER_PRIORITY:
        /* Return current list position of driver */
        if (!hao) return MMSYSERR_INVALHANDLE;
-        if (!pMetric) return MMSYSERR_INVALPARAM;
        mmr = MMSYSERR_INVALHANDLE;
        for (i = 1, padid = MSACM_pFirstACMDriverID; padid; i++, padid = padid->pNextACMDriverID) {
            if (padid == (PWINE_ACMDRIVERID)hao) {
-                *(LPDWORD)pMetric = i;
-                mmr = MMSYSERR_NOERROR;
+                if (pMetric) {
+                    *(LPDWORD)pMetric = i;
+                    mmr = MMSYSERR_NOERROR;
+                } else {
+                    mmr = MMSYSERR_INVALPARAM;
+                }
                break;
            }
        }