Gerald Pfeifer : msacm32/tests: Simplify check_count and msacm_tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bf9d6f2dfdd1a9c4824ed93db20d3def2e52ee44
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bf9d6f2dfdd1a9c4824ed93db2...

Author: Gerald Pfeifer 
Date:   Sat May  1 01:39:29 2010 +0200

msacm32/tests: Simplify check_count and msacm_tests.

---

dlls/msacm32/tests/msacm.c |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
index b68ff8c..a961067 100644
--- a/dlls/msacm32/tests/msacm.c
+++ b/dlls/msacm32/tests/msacm.c
@@ -423,7 +423,7 @@ static const char * get_metric(UINT uMetric)
     return "UNKNOWN";
 }

-static DWORD check_count(UINT uMetric)
+static void check_count(UINT uMetric)
 {
     DWORD dwMetric;
     MMRESULT rc;
@@ -452,14 +452,11 @@ static DWORD check_count(UINT uMetric)

if (rc == MMSYSERR_NOERROR && winetest_interactive)
         trace("%s: %u\n", get_metric(uMetric), dwMetric);
-
-    return dwMetric;
 }

static void msacm_tests(void)
 {
     MMRESULT rc;
-    DWORD dwCount;
     DWORD dwACMVersion = acmGetVersion();

if (winetest_interactive) {
@@ -470,17 +467,17 @@ static void msacm_tests(void)
             LOWORD(dwACMVersion)  ==  0 ? " (Retail)" : "");
     }

-    dwCount = check_count(ACM_METRIC_COUNT_CODECS);
-    dwCount = check_count(ACM_METRIC_COUNT_CONVERTERS);
-    dwCount = check_count(ACM_METRIC_COUNT_DISABLED);
-    dwCount = check_count(ACM_METRIC_COUNT_DRIVERS);
-    dwCount = check_count(ACM_METRIC_COUNT_FILTERS);
-    dwCount = check_count(ACM_METRIC_COUNT_HARDWARE);
-    dwCount = check_count(ACM_METRIC_COUNT_LOCAL_CODECS);
-    dwCount = check_count(ACM_METRIC_COUNT_LOCAL_CONVERTERS);
-    dwCount = check_count(ACM_METRIC_COUNT_LOCAL_DISABLED);
-    dwCount = check_count(ACM_METRIC_COUNT_LOCAL_DRIVERS);
-    dwCount = check_count(ACM_METRIC_COUNT_LOCAL_FILTERS);
+    check_count(ACM_METRIC_COUNT_CODECS);
+    check_count(ACM_METRIC_COUNT_CONVERTERS);
+    check_count(ACM_METRIC_COUNT_DISABLED);
+    check_count(ACM_METRIC_COUNT_DRIVERS);
+    check_count(ACM_METRIC_COUNT_FILTERS);
+    check_count(ACM_METRIC_COUNT_HARDWARE);
+    check_count(ACM_METRIC_COUNT_LOCAL_CODECS);
+    check_count(ACM_METRIC_COUNT_LOCAL_CONVERTERS);
+    check_count(ACM_METRIC_COUNT_LOCAL_DISABLED);
+    check_count(ACM_METRIC_COUNT_LOCAL_DRIVERS);
+    check_count(ACM_METRIC_COUNT_LOCAL_FILTERS);

if (winetest_interactive)
         trace("enabled drivers:\n");