commit 7b06d9840485e7e7e0aa7a181818f36fb41a256c
author Huw D M Davies <daviesh@abacus.physics.ox.ac.uk> Sat Nov 14 17:13:51 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Nov 14 17:13:51 1998 +0000
tree 4c9cda6e66fc11dc3b5b9f823d2ad060bced82e4
parent 698a8b17b7142585741b9393984ef437083a474a

Fixes a few of the many compiler warnings.

objects/dib.c

diff --git a/objects/dib.c b/objects/dib.c
index 662426f..81f20fb 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -999,7 +999,7 @@
     /* Clean up in case of errors */
     if (!res || !bmp || !dib || !bm.bmBits || (bm.bmBitsPixel <= 8 && !colorMap))
     {
-        TRACE(bitmap, "got an error res=%lu, bmp=%p, dib=%p, bm.bmBits=%p\n",
+        TRACE(bitmap, "got an error res=%08x, bmp=%p, dib=%p, bm.bmBits=%p\n",
               res, bmp, dib, bm.bmBits);
 	if (bm.bmBits)
         {

objects/enhmetafile.c

diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c
index 494034f..c57b127 100644
--- a/objects/enhmetafile.c
+++ b/objects/enhmetafile.c
@@ -514,7 +514,7 @@
 					     LPPALETTEENTRY lppe)
 {
   LPENHMETAHEADER h = GlobalLock32(hemf);
-  UINT32 temp = h->nPalEntries;
+
   if ( h == NULL ){
     GlobalUnlock32(hemf);
     return(0);
@@ -545,7 +545,7 @@
 					   ) 
 {
    FIXME(metafile,"Stub\n");
-   return NULL;
+   return 0;
 
 }
 

win32/console.c

diff --git a/win32/console.c b/win32/console.c
index 03d66f5..2015220 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -217,7 +217,8 @@
 	      done++;
 	    }
 	if (!done)
-	   WARN(console, "Attempt to remove non-installed CtrlHandler %p\n");
+	   WARN(console, "Attempt to remove non-installed CtrlHandler %p\n",
+		func);
 	return (done);
       }
     return (done);