Michael Stefaniuc : msacm32/tests: Win64 printf format warning fixes.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Thu Oct  5 22:05:58 2006 +0200

msacm32/tests: Win64 printf format warning fixes.

---

 dlls/msacm32/tests/Makefile.in |    1 -
 dlls/msacm32/tests/msacm.c     |   12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/msacm32/tests/Makefile.in b/dlls/msacm32/tests/Makefile.in
index 7310562..00d2ed3 100644
--- a/dlls/msacm32/tests/Makefile.in
+++ b/dlls/msacm32/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msacm32.dll
 IMPORTS   = msacm32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 CTESTS = \
 	msacm.c
diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
index 3b98d58..c3b866c 100644
--- a/dlls/msacm32/tests/msacm.c
+++ b/dlls/msacm32/tests/msacm.c
@@ -38,7 +38,7 @@ static BOOL CALLBACK FormatTagEnumProc(H
                                        DWORD fdwSupport)
 {
     if (winetest_interactive)
-        trace("   Format 0x%04lx: %s\n", paftd->dwFormatTag, paftd->szFormatTag);
+        trace("   Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag);
 
     return TRUE;
 }
@@ -49,7 +49,7 @@ static BOOL CALLBACK FormatEnumProc(HACM
                                     DWORD fd)
 {
     if (winetest_interactive)
-        trace("   0x%04lx, %s\n", pafd->dwFormatTag, pafd->szFormat);
+        trace("   0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat);
 
     return TRUE;
 }
@@ -128,7 +128,7 @@ static BOOL CALLBACK DriverEnumProc(HACM
      */
     if (rc == MMSYSERR_NOERROR) {    
         ok(dd.cbStruct == sizeof(dd),
-            "acmDriverDetails(): cbStruct = %08lx, should be %08lx\n",
+            "acmDriverDetails(): cbStruct = %08x, should be %08lx\n",
             dd.cbStruct, (unsigned long)sizeof(dd));
     }
 
@@ -138,8 +138,8 @@ static BOOL CALLBACK DriverEnumProc(HACM
         trace("  Copyright: %s\n", dd.szCopyright);
         trace("  Licensing: %s\n", dd.szLicensing);
         trace("  Features: %s\n", dd.szFeatures);
-        trace("  Supports %lu formats\n", dd.cFormatTags);
-        trace("  Supports %lu filter formats\n", dd.cFilterTags);
+        trace("  Supports %u formats\n", dd.cFormatTags);
+        trace("  Supports %u filter formats\n", dd.cFilterTags);
     }
 
     /* try bad pointer */
@@ -453,7 +453,7 @@ static DWORD check_count(UINT uMetric)
     ok(rc == MMSYSERR_NOERROR, "acmMetrics() failed: rc = 0x%08x\n", rc);
 
     if (rc == MMSYSERR_NOERROR && winetest_interactive)
-        trace("%s: %lu\n", get_metric(uMetric), dwMetric);
+        trace("%s: %u\n", get_metric(uMetric), dwMetric);
 
     return dwMetric;
 }