From 426d27cbe60835fd6d7e2a21bdc7842b1a308435 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 5 Oct 2006 22:06:24 +0200
Subject: [PATCH] msdmo: Win64 printf format warning fixes.

---
 dlls/msdmo/Makefile.in | 1 -
 dlls/msdmo/dmoreg.c    | 6 +++---
 dlls/msdmo/dmort.c     | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index cc2cb7c61e8..57addcf517e 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -6,7 +6,6 @@ MODULE    = msdmo.dll
 IMPORTLIB = libmsdmo.$(IMPLIBEXT)
 IMPORTS   = ole32 user32 advapi32 kernel32 
 EXTRALIBS = -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
 
 C_SRCS = \
 	dmoreg.c \
diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c
index 9d2f43681a7..d5617c249bb 100644
--- a/dlls/msdmo/dmoreg.c
+++ b/dlls/msdmo/dmoreg.c
@@ -194,7 +194,7 @@ lend:
     if (hrkey)
         RegCloseKey(hrkey);
 
-    TRACE(" hresult=0x%08lx\n", hres);
+    TRACE(" hresult=0x%08x\n", hres);
     return hres;
 }
 
@@ -448,7 +448,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
 
     IEnumDMOImpl *This = (IEnumDMOImpl *)iface;
 
-    TRACE("%ld\n", cItemsToFetch);
+    TRACE("%d\n", cItemsToFetch);
 
     if (!pCLSID || !Names || !pcItemsFetched)
         return E_POINTER;
@@ -627,7 +627,7 @@ HRESULT WINAPI DMOEnum(
 {
     HRESULT hres = E_FAIL;
 
-    TRACE("guidCategory=%p dwFlags=0x%08lx cInTypes=%ld cOutTypes=%ld\n",
+    TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n",
         guidCategory, dwFlags, cInTypes, cOutTypes);
 
     *ppEnum = IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes,
diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c
index fb7afcbf97c..bf788a5c1cb 100644
--- a/dlls/msdmo/dmort.c
+++ b/dlls/msdmo/dmort.c
@@ -40,7 +40,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat)
 {
     HRESULT r;
 
-    TRACE("%p %lu\n", ppmedia, cbFormat);
+    TRACE("%p %u\n", ppmedia, cbFormat);
 
     if (!ppmedia)
         return E_POINTER;
@@ -66,7 +66,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat)
  */
 HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat)
 {
-    TRACE("%p %lu\n", pmedia, cbFormat);
+    TRACE("%p %u\n", pmedia, cbFormat);
 
     if (!pmedia)
         return E_POINTER;