commit 1da4b59e332771edf593c8056dfa55b3d64a9db1
author Alex Villacís Lasso <a_villacis@palosanto.com> Tue Jan 17 15:59:59 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Jan 17 15:59:59 2006 +0100
tree 5c9bebbde020dde63f88128f079300a03ffd2095
parent 9a577e5e41ed6fb4527776d2fb29bd21cada100e

msacm: Fix acmMetrics(ACM_METRIC_DRIVER_PRIORITY) return on error.

dlls/msacm/msacm32_main.c

diff --git a/dlls/msacm/msacm32_main.c b/dlls/msacm/msacm32_main.c
index e0a1f44..7d8f9af 100644
--- a/dlls/msacm/msacm32_main.c
+++ b/dlls/msacm/msacm32_main.c
@@ -224,12 +224,15 @@
     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;
             }
         }