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

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Tue Jun 13 14:09:16 2006 +0200

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

---

dlls/comctl32/propsheet.c |    7 ++++---
 dlls/comctl32/tests/mru.c |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 66f88cc..f21852c 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -1248,6 +1248,7 @@ static UINT GetTemplateSize(DLGTEMPLATE*
   const WORD*  p = (const WORD *)pTemplate;
   BOOL  istemplateex = (((MyDLGTEMPLATEEX*)pTemplate)->signature == 0xFFFF);
   WORD nrofitems;
+  UINT ret;

if (istemplateex)
   {
@@ -1363,9 +1364,9 @@ static UINT GetTemplateSize(DLGTEMPLATE*
       --nrofitems;
     }

-  TRACE("%p %p size 0x%08x\n",p, (WORD*)pTemplate,sizeof(WORD)*(p - (WORD*)pTemplate));
-  return (p - (WORD*)pTemplate)*sizeof(WORD);
-  
+  ret = (p - (WORD*)pTemplate) * sizeof(WORD);
+  TRACE("%p %p size 0x%08x\n", p, pTemplate, ret);
+  return ret;
 }

/******************************************************************************
diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c
index c8776d6..5b51736 100644
--- a/dlls/comctl32/tests/mru.c
+++ b/dlls/comctl32/tests/mru.c
@@ -100,7 +100,7 @@ static void check_reg_entries(const char
     char buff[128];
     HKEY hKey = NULL;
     DWORD type, size, ret;
-    size_t i;
+    unsigned int i;

ok(!RegOpenKeyA(HKEY_CURRENT_USER, REG_TEST_FULLKEY, &hKey),
        "Couldn't open test key "%s"\n", REG_TEST_FULLKEY);