commit 353529b2c80fd11b6bebcee80575b4ef8817c1ac
author Michael Stefaniuc <mstefani@redhat.de> Wed Oct 23 22:19:10 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Oct 23 22:19:10 2002 +0000
tree 8843152150ca78d622680be68248d0b30873ca1d
parent 85e40cf37a54b7fc12ad9a9eb2606ffb2ed3f676

- fix the "int format, HANDLE arg" type of warnings for comctl32
- compile the comctl32 dll with -DSTRICT

dlls/comctl32/commctrl.c

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index a36d156..c29c40b 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -142,7 +142,7 @@
 BOOL WINAPI
 COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%x,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
 	case DLL_PROCESS_ATTACH:
@@ -150,7 +150,7 @@
 
             /* create private heap */
             COMCTL32_hHeap = HeapCreate (0, 0x10000, 0);
-            TRACE("Heap created: 0x%x\n", COMCTL32_hHeap);
+            TRACE("Heap created: %p\n", COMCTL32_hHeap);
 
             /* add global subclassing atom (used by 'tooltip' and 'updown') */
             COMCTL32_aSubclass = (LPSTR)(DWORD)GlobalAddAtomA ("CC32SubclassInfo");
@@ -215,7 +215,7 @@
 
             /* destroy private heap */
             HeapDestroy (COMCTL32_hHeap);
-            TRACE("Heap destroyed: 0x%x\n", COMCTL32_hHeap);
+            TRACE("Heap destroyed: %p\n", COMCTL32_hHeap);
             COMCTL32_hHeap = (HANDLE)NULL;
             break;
     }
@@ -343,7 +343,7 @@
 {
     LPINT lpMenuId;
 
-    TRACE("%x, %x, %p\n", hwnd, uFlags, lpInfo);
+    TRACE("%p, %x, %p\n", hwnd, uFlags, lpInfo);
 
     if (lpInfo == NULL)
 	return FALSE;
@@ -1066,7 +1066,7 @@
    LPSUBCLASS_INFO stack;
    int newnum, n;
 
-   TRACE ("(%x, %p, %x, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
+   TRACE ("(%p, %p, %x, %lx)\n", hWnd, pfnSubclass, uIDSubclass, dwRef);
 
    /* Since the window procedure that we set here has two additional arguments,
     * we can't simply set it as the new window procedure of the window. So we
@@ -1160,7 +1160,7 @@
    LPSUBCLASS_INFO stack;
    int n;
 
-   TRACE ("(%x, %p, %x, %p)\n", hWnd, pfnSubclass, uID, pdwRef);
+   TRACE ("(%p, %p, %x, %p)\n", hWnd, pfnSubclass, uID, pdwRef);
 
    /* See if we have been called for this window */
    stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
@@ -1198,7 +1198,7 @@
    LPSUBCLASS_INFO stack;
    int n;
 
-   TRACE ("(%x, %p, %x)\n", hWnd, pfnSubclass, uID);
+   TRACE ("(%p, %p, %x)\n", hWnd, pfnSubclass, uID);
 
    /* Find the Subclass to remove */
    stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
@@ -1267,7 +1267,7 @@
    /* retrieve our little stack from the Properties */
    stack = (LPSUBCLASS_INFO)GetPropA (hWnd, COMCTL32_aSubclass);
    if (!stack) {
-      ERR ("Our sub classing stack got erased for %x!! Nothing we can do\n", hWnd);
+      ERR ("Our sub classing stack got erased for %p!! Nothing we can do\n", hWnd);
       return 0;
    }