Michael Stefaniuc : msvidc32: Win64 printf format warning fixes.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Thu Oct  5 22:05:02 2006 +0200

msvidc32: Win64 printf format warning fixes.

---

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

diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in
index 89bc127..3f9be06 100644
--- a/dlls/msvidc32/Makefile.in
+++ b/dlls/msvidc32/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = msvidc32.dll
 IMPORTS   = user32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT

C_SRCS = \
    msvideo1.c
diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c
index de6ff9c..d49b35a 100644
--- a/dlls/msvidc32/msvideo1.c
+++ b/dlls/msvidc32/msvideo1.c
@@ -311,9 +311,9 @@ CRAM_DecompressQuery( Msvideo1Context *i

TRACE("planes = %d\n", in->bmiHeader.biPlanes );
     TRACE("bpp    = %d\n", in->bmiHeader.biBitCount );
-    TRACE("height = %ld\n", in->bmiHeader.biHeight );
-    TRACE("width  = %ld\n", in->bmiHeader.biWidth );
-    TRACE("compr  = %lx\n", in->bmiHeader.biCompression );
+    TRACE("height = %d\n", in->bmiHeader.biHeight );
+    TRACE("width  = %d\n", in->bmiHeader.biWidth );
+    TRACE("compr  = %x\n", in->bmiHeader.biCompression );

if( ( in->bmiHeader.biCompression != CRAM_MAGIC ) &&
         ( in->bmiHeader.biCompression != MSVC_MAGIC ) &&
@@ -397,7 +397,7 @@ static LRESULT CRAM_Decompress( Msvideo1
     LONG width, height, stride, sz;
     WORD bit_per_pixel;

-    TRACE("ICM_DECOMPRESS %p %p %ld\n", info, icd, size);
+    TRACE("ICM_DECOMPRESS %p %p %d\n", info, icd, size);

if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) )
         return ICERR_BADPARAM;
@@ -429,7 +429,7 @@ static LRESULT CRAM_DecompressEx( Msvide
     LONG width, height, stride, sz;
     WORD bit_per_pixel;

-    TRACE("ICM_DECOMPRESSEX %p %p %ld\n", info, icd, size);
+    TRACE("ICM_DECOMPRESSEX %p %p %d\n", info, icd, size);

if( (info==NULL) || (info->dwMagic!=CRAM_MAGIC) )
         return ICERR_BADPARAM;
@@ -582,7 +582,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT
  */
 BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved)
 {
-    TRACE("(%p,%ld,%p)\n", hModule, dwReason, lpReserved);
+    TRACE("(%p,%d,%p)\n", hModule, dwReason, lpReserved);

switch (dwReason)
     {