Alex Villacís Lasso : msacm: Fix acmMetrics(ACM_METRIC_DRIVER_PRIORITY) return on error.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jan 17 09:29:33 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 1da4b59e332771edf593c8056dfa55b3d64a9db1
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1da4b59e332771edf593c8056dfa55b3d64a9db1

Author: Alex Villacís Lasso <a_villacis at palosanto.com>
Date:   Tue Jan 17 15:59:59 2006 +0100

msacm: Fix acmMetrics(ACM_METRIC_DRIVER_PRIORITY) return on error.

---

 dlls/msacm/msacm32_main.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

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 @@ MMRESULT WINAPI acmMetrics(HACMOBJ hao, 
     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;
             }
         }




More information about the wine-cvs mailing list