Alexandre Julliard : user32: Don' t use sizeof in traces to avoid printf format warnings.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Jun 14 06:51:00 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 2864377793f04ae5608e59d29d40314dbe15873d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2864377793f04ae5608e59d29d40314dbe15873d

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jun 13 14:11:36 2006 +0200

user32: Don't use sizeof in traces to avoid printf format warnings.

---

 dlls/user/dde_misc.c |    2 +-
 dlls/user/message.c  |   11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/dlls/user/dde_misc.c b/dlls/user/dde_misc.c
index f5c9d91..57721c2 100644
--- a/dlls/user/dde_misc.c
+++ b/dlls/user/dde_misc.c
@@ -1529,7 +1529,7 @@ HDDEDATA        WDML_Global2DataHandle(H
                     }
                     else
                     {
-                        ERR("Wrong count: %lu / %d\n", size, sizeof(BITMAP) + count);
+                        ERR("Wrong count: %lu / %d\n", size, count);
                     }
                 } else ERR("No bitmap header\n");
                 break;
diff --git a/dlls/user/message.c b/dlls/user/message.c
index d2af2bd..fde5fba 100644
--- a/dlls/user/message.c
+++ b/dlls/user/message.c
@@ -1450,7 +1450,6 @@ static BOOL unpack_dde_message( HWND hwn
     case WM_DDE_POKE:
 	if ((!buffer || !*buffer) && message != WM_DDE_DATA) return FALSE;
 	uiHi = *lparam;
-	TRACE( "recv ddepack %u %x\n", size, uiHi );
         if (size)
         {
             if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size )))
@@ -2032,9 +2031,6 @@ static BOOL peek_message( MSG *msg, HWND
             if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam,
                                  &info.msg.lParam, &buffer, size ))
             {
-                ERR( "invalid packed message %x (%s) hwnd %p wp %x lp %lx size %d\n",
-                     info.msg.message, SPY_GetMsgName(info.msg.message, info.msg.hwnd), info.msg.hwnd,
-                     info.msg.wParam, info.msg.lParam, size );
                 /* ignore it */
                 reply_message( &info, 0, TRUE );
                 goto next;
@@ -2055,12 +2051,7 @@ static BOOL peek_message( MSG *msg, HWND
 	    {
 		if (!unpack_dde_message( info.msg.hwnd, info.msg.message, &info.msg.wParam,
                                          &info.msg.lParam, &buffer, size ))
-		{
-		    ERR( "invalid packed dde-message %x (%s) hwnd %p wp %x lp %lx size %d\n",
-			 info.msg.message, SPY_GetMsgName(info.msg.message, info.msg.hwnd),
-			 info.msg.hwnd, info.msg.wParam, info.msg.lParam, size );
                     goto next;  /* ignore it */
-		}
 	    }
             *msg = info.msg;
             HeapFree( GetProcessHeap(), 0, buffer );
@@ -2246,7 +2237,7 @@ static LRESULT retrieve_reply( const str
     {
         if (!(reply_data = HeapAlloc( GetProcessHeap(), 0, reply_size )))
         {
-            WARN( "no memory for reply %d bytes, will be truncated\n", reply_size );
+            WARN( "no memory for reply, will be truncated\n" );
             reply_size = 0;
         }
     }




More information about the wine-cvs mailing list