Hello,
this is the finale part to make comctl32 compile with STRICT turned on.
It's relative to part 1.
License: LGPL, X11
Changelog:
Michael Stefaniuc <mstefani@redhat.com>
- fix the "int format, HANDLE arg" type of warnings for comctl32
- compile the comctl32 dll with -DSTRICT
bye
michael
--
Michael Stefaniuc Tel.: +49-711-96437-199
System Administration Fax.: +49-711-96437-111
Red Hat GmbH Email: mstefani@redhat.com
Hauptstaetterstr. 58 http://www.redhat.de/
D-70178 Stuttgart
--- dlls/comctl32/animate.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/animate.c Wed Oct 23 00:22:31 2002
@@ -836,7 +836,7 @@
static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
if (!ANIMATE_GetInfoPtr(hWnd) && (uMsg != WM_NCCREATE))
return DefWindowProcA(hWnd, uMsg, wParam, lParam);
switch (uMsg)
--- dlls/comctl32/comboex.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/comboex.c Wed Oct 23 00:22:31 2002
@@ -324,7 +324,7 @@
GetTextExtentPointA (mydc, "A", 1, size);
SelectObject (mydc, ofont);
ReleaseDC (0, mydc);
- TRACE("selected font hwnd=%08x, height=%ld\n", nfont, size->cy);
+ TRACE("selected font hwnd=%p, height=%ld\n", nfont, size->cy);
}
@@ -1233,7 +1233,7 @@
NMCOMBOBOXEXW nmcit;
INT i;
- TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%x, data=%08lx\n",
+ TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%p, data=%08lx\n",
dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
if (dis->itemID >= infoPtr->nb_items) return FALSE;
@@ -1291,7 +1291,7 @@
dis->CtlType, dis->CtlID);
TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
dis->itemID, dis->itemAction, dis->itemState);
- TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+ TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n",
dis->hwndItem, dis->hDC, dis->rcItem.left,
dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom,
dis->itemData);
@@ -1358,7 +1358,7 @@
if (item->pszText)
GetWindowTextW(infoPtr->hwndEdit, item->pszText, len+1);
- TRACE("edit control hwndEdit=%0x, text len=%d str=%s\n",
+ TRACE("edit control hwndEdit=%p, text len=%d str=%s\n",
infoPtr->hwndEdit, len, debugstr_txt(item->pszText));
}
}
@@ -1552,7 +1552,7 @@
ReleaseDC (0, hdc);
mis->itemHeight = mysize.cy + CBE_EXTRA;
- TRACE("adjusted height hwnd=%08x, height=%d\n",
+ TRACE("adjusted height hwnd=%p, height=%d\n",
infoPtr->hwndSelf, mis->itemHeight);
return 0;
@@ -1677,7 +1677,7 @@
RECT rect;
LRESULT lret;
- TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
+ TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
hwnd, uMsg, wParam, lParam, infoPtr);
if (!infoPtr) return 0;
@@ -1879,7 +1879,7 @@
POINT pt;
WCHAR edit_text[260];
- TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
+ TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
hwnd, uMsg, wParam, lParam, infoPtr);
if (!infoPtr) return 0;
@@ -2116,7 +2116,7 @@
{
COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
- TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr) {
if (uMsg == WM_CREATE)
--- dlls/comctl32/commctrl.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/commctrl.c Wed Oct 23 00:22:31 2002
@@ -107,7 +107,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:
@@ -115,7 +115,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");
@@ -180,7 +180,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;
}
@@ -308,7 +308,7 @@
{
LPINT lpMenuId;
- TRACE("%x, %x, %p\n", hwnd, uFlags, lpInfo);
+ TRACE("%p, %x, %p\n", hwnd, uFlags, lpInfo);
if (lpInfo == NULL)
return FALSE;
@@ -1023,7 +1023,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
@@ -1116,7 +1116,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);
@@ -1153,7 +1153,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);
@@ -1221,7 +1221,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;
}
--- dlls/comctl32/datetime.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/datetime.c Wed Oct 23 00:22:31 2002
@@ -880,7 +880,7 @@
else
ShowWindow(infoPtr->hMonthCal, SW_SHOW);
- TRACE ("dt:%x mc:%x mc parent:%x, desktop:%x, mcpp:%x\n",
+ TRACE ("dt:%p mc:%p mc parent:%p, desktop:%p, mcpp:%p\n",
hwnd,infoPtr->hMonthCal,
GetParent (infoPtr->hMonthCal),
GetDesktopWindow (),
@@ -931,8 +931,8 @@
LPNMHDR lpnmh = (LPNMHDR) lParam;
TRACE ("%x,%lx\n",wParam, lParam);
- TRACE ("Got notification %x from %x\n", lpnmh->code, lpnmh->hwndFrom);
- TRACE ("info: %x %x %x\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
+ TRACE ("Got notification %x from %p\n", lpnmh->code, lpnmh->hwndFrom);
+ TRACE ("info: %p %p %p\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
return 0;
}
@@ -945,8 +945,8 @@
LPNMHDR lpnmh = (LPNMHDR) lParam;
TRACE ("%x,%lx\n",wParam, lParam);
- TRACE ("Got notification %x from %x\n", lpnmh->code, lpnmh->hwndFrom);
- TRACE ("info: %x %x %x\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
+ TRACE ("Got notification %x from %p\n", lpnmh->code, lpnmh->hwndFrom);
+ TRACE ("info: %p %p %p\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
return 0;
}
--- dlls/comctl32/hotkey.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/hotkey.c Wed Oct 23 00:22:31 2002
@@ -113,7 +113,7 @@
GetClientRect(infoPtr->hwndSelf, &rc);
- TRACE("(infoPtr=%p hdc=%x)\n", infoPtr, hdc);
+ TRACE("(infoPtr=%p hdc=%p)\n", infoPtr, hdc);
if(!infoPtr->CurrMod && !infoPtr->HotKey) {
HOTKEY_DrawHotKey (infoPtr, infoPtr->strNone, 4, &rc, hdc);
@@ -406,7 +406,7 @@
HOTKEY_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
HOTKEY_INFO *infoPtr = HOTKEY_GetInfoPtr (hwnd);
- TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
switch (uMsg)
--- dlls/comctl32/imagelist.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/imagelist.c Wed Oct 23 00:22:31 2002
@@ -170,7 +170,7 @@
BITMAP bmp;
HBITMAP hOldBitmapImage, hOldBitmap;
- TRACE("himl=%p hbmimage=%x hbmmask=%x\n", himl, hbmImage, hbmMask);
+ TRACE("himl=%p hbmimage=%p hbmmask=%p\n", himl, hbmImage, hbmMask);
if (!himl || !hbmImage)
return -1;
@@ -282,7 +282,7 @@
HBITMAP hMaskBitmap=0;
COLORREF bkColor;
- TRACE("himl=%p hbitmap=%x clrmask=%lx\n", himl, hBitmap, clrMask);
+ TRACE("himl=%p hbitmap=%p clrmask=%lx\n", himl, hBitmap, clrMask);
if (himl == NULL)
return -1;
@@ -720,7 +720,7 @@
BOOL WINAPI
ImageList_DragEnter (HWND hwndLock, INT x, INT y)
{
- TRACE("(hwnd=%#x x=%d y=%d)\n", hwndLock, x, y);
+ TRACE("(hwnd=%p x=%d y=%d)\n", hwndLock, x, y);
if (InternalDrag.himl == NULL)
return FALSE;
@@ -1094,7 +1094,7 @@
bIsTransparent = (fStyle & ILD_TRANSPARENT) || clrBk == CLR_NONE;
bBlend = fStyle & (ILD_BLEND25 | ILD_BLEND50);
- TRACE("hbmMask(0x%08x) iImage(%d) x(%d) y(%d) cx(%d) cy(%d)\n",
+ TRACE("hbmMask(%p) iImage(%d) x(%d) y(%d) cx(%d) cy(%d)\n",
himl->hbmMask, pimldp->i, pimldp->x, pimldp->y, cx, cy);
/* we will use these DCs to access the images and masks in the ImageList */
@@ -2202,7 +2202,7 @@
HDC hdcImageList, hdcImage;
BITMAP bmp;
- TRACE("%p %d %04x %04x\n", himl, i, hbmImage, hbmMask);
+ TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask);
if (himl == NULL) {
ERR("Invalid image list handle!\n");
@@ -2277,7 +2277,7 @@
ICONINFO ii;
BITMAP bmp;
- TRACE("(0x%lx 0x%x 0x%x)\n", (DWORD)himl, i, hIcon);
+ TRACE("(0x%lx 0x%x %p)\n", (DWORD)himl, i, hIcon);
if (himl == NULL)
return -1;
@@ -2307,12 +2307,12 @@
nIndex = i;
hdcImageList = CreateCompatibleDC (0);
- TRACE("hdcImageList=0x%x!\n", hdcImageList);
+ TRACE("hdcImageList=%p!\n", hdcImageList);
if (hdcImageList == 0)
ERR("invalid hdcImageList!\n");
hdcImage = CreateCompatibleDC (0);
- TRACE("hdcImage=0x%x!\n", hdcImage);
+ TRACE("hdcImage=%p!\n", hdcImage);
if (hdcImage == 0)
ERR("invalid hdcImage!\n");
--- dlls/comctl32/ipaddress.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/ipaddress.c Wed Oct 23 00:22:31 2002
@@ -106,12 +106,12 @@
{
int i;
- TRACE("(hwnd=%x)\n", hwnd);
+ TRACE("(hwnd=%p)\n", hwnd);
for (i = 0; i < 4; i++)
if (infoPtr->Part[i].EditHwnd == hwnd) return i;
- ERR("We subclassed the wrong window! (hwnd=%x)\n", hwnd);
+ ERR("We subclassed the wrong window! (hwnd=%p)\n", hwnd);
return -1;
}
@@ -415,7 +415,7 @@
INT index, len = 0, startsel, endsel;
IPPART_INFO *part;
- TRACE("(hwnd=0x%x msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("(hwnd=%p msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
if ( (index = IPADDRESS_GetPartIndex(infoPtr, hwnd)) < 0) return 0;
part = &infoPtr->Part[index];
@@ -494,7 +494,7 @@
{
IPADDRESS_INFO *infoPtr = IPADDRESS_GetInfoPtr (hwnd);
- TRACE("(hwnd=0x%x msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
+ TRACE("(hwnd=%p msg=0x%x wparam=0x%x lparam=0x%lx)\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
--- dlls/comctl32/progress.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/progress.c Wed Oct 23 00:22:31 2002
@@ -107,7 +107,7 @@
RECT rect;
DWORD dwStyle;
- TRACE("(infoPtr=%p, hdc=%x)\n", infoPtr, hdc);
+ TRACE("(infoPtr=%p, hdc=%p)\n", infoPtr, hdc);
/* get the required bar brush */
if (infoPtr->ColorBar == CLR_DEFAULT)
@@ -268,7 +268,7 @@
{
PROGRESS_INFO *infoPtr;
- TRACE("hwnd=%x msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam);
+ TRACE("hwnd=%p msg=%04x wparam=%x lParam=%lx\n", hwnd, message, wParam, lParam);
infoPtr = (PROGRESS_INFO *)GetWindowLongW(hwnd, 0);
@@ -300,12 +300,12 @@
infoPtr->ColorBar = CLR_DEFAULT;
infoPtr->ColorBk = CLR_DEFAULT;
infoPtr->Font = 0;
- TRACE("Progress Ctrl creation, hwnd=%04x\n", hwnd);
+ TRACE("Progress Ctrl creation, hwnd=%p\n", hwnd);
return 0;
}
case WM_DESTROY:
- TRACE("Progress Ctrl destruction, hwnd=%04x\n", hwnd);
+ TRACE("Progress Ctrl destruction, hwnd=%p\n", hwnd);
COMCTL32_Free (infoPtr);
SetWindowLongW(hwnd, 0, 0);
return 0;
--- dlls/comctl32/status.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/status.c Wed Oct 23 00:22:31 2002
@@ -1005,7 +1005,7 @@
STATUSBAR_WMSetFont (STATUSWINDOWINFO *infoPtr, HFONT font, BOOL redraw)
{
infoPtr->hFont = font;
- TRACE("%04x\n", infoPtr->hFont);
+ TRACE("%p\n", infoPtr->hFont);
if (redraw)
InvalidateRect(infoPtr->Self, NULL, FALSE);
@@ -1111,7 +1111,7 @@
INT nPart = ((INT) wParam) & 0x00ff;
LRESULT res;
- TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hwnd, msg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, msg, wParam, lParam);
if (!infoPtr && msg != WM_CREATE)
return DefWindowProcW (hwnd, msg, wParam, lParam);
--- dlls/comctl32/toolbar.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/toolbar.c Wed Oct 23 00:22:31 2002
@@ -226,11 +226,11 @@
DWORD dwStyle;
dwStyle = GetWindowLongA (iP->hwndSelf, GWL_STYLE);
- TRACE("toolbar %08x at line %d, exStyle=%08lx, buttons=%d, bitmaps=%d, strings=%d, style=%08lx\n",
+ TRACE("toolbar %p at line %d, exStyle=%08lx, buttons=%d, bitmaps=%d, strings=%d, style=%08lx\n",
iP->hwndSelf, line,
iP->dwExStyle, iP->nNumButtons, iP->nNumBitmaps,
iP->nNumStrings, dwStyle);
- TRACE("toolbar %08x at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n",
+ TRACE("toolbar %p at line %d, himlInt=%p, himlDef=%p, himlHot=%p, himlDis=%p, redrawable=%s\n",
iP->hwndSelf, line,
iP->himlInt, iP->himlDef, iP->himlHot, iP->himlDis,
(iP->bDoRedraw) ? "TRUE" : "FALSE");
@@ -252,9 +252,9 @@
TOOLBAR_CheckStyle (HWND hwnd, DWORD dwStyle)
{
if (dwStyle & TBSTYLE_ALTDRAG)
- FIXME("[%04x] TBSTYLE_ALTDRAG not implemented\n", hwnd);
+ FIXME("[%p] TBSTYLE_ALTDRAG not implemented\n", hwnd);
if (dwStyle & TBSTYLE_REGISTERDROP)
- FIXME("[%04x] TBSTYLE_REGISTERDROP not implemented\n", hwnd);
+ FIXME("[%p] TBSTYLE_REGISTERDROP not implemented\n", hwnd);
}
@@ -268,7 +268,7 @@
nmhdr->hwndFrom = infoPtr->hwndSelf;
nmhdr->code = code;
- TRACE("to window %04x, code=%08x, %s\n", infoPtr->hwndNotify, code,
+ TRACE("to window %p, code=%08x, %s\n", infoPtr->hwndNotify, code,
(infoPtr->bNtfUnicode) ? "via Unicode" : "via ANSI");
if (infoPtr->bNtfUnicode)
@@ -2082,7 +2082,7 @@
INT nIndex = 0, nButtons, nCount;
HBITMAP hbmLoad;
- TRACE("hwnd=%x wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
+ TRACE("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
if (!lpAddBmp)
return -1;
@@ -2648,7 +2648,7 @@
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
if (infoPtr == NULL) {
- ERR("(0x%x, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
+ ERR("(%p, 0x%x, 0x%lx)\n", hwnd, wParam, lParam);
ERR("infoPtr == NULL!\n");
return 0;
}
@@ -3283,7 +3283,7 @@
{
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
- TRACE("%s hwnd=0x%x stub!\n",
+ TRACE("%s hwnd=%p stub!\n",
infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
return infoPtr->bUnicode;
@@ -3679,7 +3679,7 @@
HBITMAP hBitmap;
int i = 0, nOldButtons = 0, pos = 0;
- TRACE("hInstOld %x nIDOld %x hInstNew %x nIDNew %x nButtons %x\n",
+ TRACE("hInstOld %p nIDOld %x hInstNew %p nIDNew %x nButtons %x\n",
lpReplace->hInstOld, lpReplace->nIDOld, lpReplace->hInstNew, lpReplace->nIDNew,
lpReplace->nButtons);
@@ -3698,18 +3698,18 @@
hBitmap = (HBITMAP) lpReplace->nIDNew;
}
- TRACE("To be replaced hInstOld %x nIDOld %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+ TRACE("To be replaced hInstOld %p nIDOld %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
for (i = 0; i < infoPtr->nNumBitmapInfos; i++) {
TBITMAP_INFO *tbi = &infoPtr->bitmaps[i];
- TRACE("tbimapinfo %d hInstOld %x nIDOld %x\n", i, tbi->hInst, tbi->nID);
+ TRACE("tbimapinfo %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID);
if (tbi->hInst == lpReplace->hInstOld && tbi->nID == lpReplace->nIDOld)
{
- TRACE("Found: nButtons %d hInst %x nID %x\n", tbi->nButtons, tbi->hInst, tbi->nID);
+ TRACE("Found: nButtons %d hInst %p nID %x\n", tbi->nButtons, tbi->hInst, tbi->nID);
nOldButtons = tbi->nButtons;
tbi->nButtons = lpReplace->nButtons;
tbi->hInst = lpReplace->hInstNew;
tbi->nID = lpReplace->nIDNew;
- TRACE("tbimapinfo changed %d hInstOld %x nIDOld %x\n", i, tbi->hInst, tbi->nID);
+ TRACE("tbimapinfo changed %d hInstOld %p nIDOld %x\n", i, tbi->hInst, tbi->nID);
break;
}
pos += tbi->nButtons;
@@ -3717,7 +3717,7 @@
if (nOldButtons == 0)
{
- WARN("No hinst/bitmap found! hInst %x nID %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
+ WARN("No hinst/bitmap found! hInst %p nID %x\n", lpReplace->hInstOld, lpReplace->nIDOld);
return FALSE;
}
@@ -4149,7 +4149,7 @@
ImageList_GetIconSize(infoPtr->himlDef, &infoPtr->nBitmapWidth,
&infoPtr->nBitmapHeight);
- TRACE("hwnd %08x, new himl=%08x, count=%d, bitmap w=%d, h=%d\n",
+ TRACE("hwnd %p, new himl=%08x, count=%d, bitmap w=%d, h=%d\n",
hwnd, (INT)infoPtr->himlDef, infoPtr->nNumBitmaps,
infoPtr->nBitmapWidth, infoPtr->nBitmapHeight);
@@ -4358,7 +4358,7 @@
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
BOOL bTemp;
- TRACE("%s hwnd=0x%04x stub!\n",
+ TRACE("%s hwnd=%p stub!\n",
((BOOL)wParam) ? "TRUE" : "FALSE", hwnd);
bTemp = infoPtr->bUnicode;
@@ -4652,7 +4652,7 @@
case CDRF_SKIPDEFAULT:
return TRUE;
default:
- FIXME("[%04x] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+ FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
hwnd, ntfret);
}
}
@@ -4690,7 +4690,7 @@
case CDRF_SKIPDEFAULT:
return TRUE;
default:
- FIXME("[%04x] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
+ FIXME("[%p] response %ld not handled to NM_CUSTOMDRAW (CDDS_PREERASE)\n",
hwnd, ntfret);
}
}
@@ -5476,7 +5476,7 @@
static LRESULT WINAPI
ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n",
+ TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n",
hwnd, uMsg, /* SPY_GetMsgName(uMsg), */ wParam, lParam);
if (!TOOLBAR_GetInfoPtr(hwnd) && (uMsg != WM_NCCREATE))
--- dlls/comctl32/tooltips.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/tooltips.c Wed Oct 23 00:22:31 2002
@@ -173,7 +173,7 @@
if (HIWORD((UINT)toolPtr->lpszText) == 0) {
/* load a resource */
- TRACE("load res string %x %x\n",
+ TRACE("load res string %p %x\n",
toolPtr->hinst, (int)toolPtr->lpszText);
LoadStringW (toolPtr->hinst, (UINT)toolPtr->lpszText,
infoPtr->szTipText, INFOTIPSIZE);
@@ -294,7 +294,7 @@
infoPtr->nCurrentTool = infoPtr->nTool;
- TRACE("Show tooltip pre %d! (%04x)\n", infoPtr->nTool, hwnd);
+ TRACE("Show tooltip pre %d! (%p)\n", infoPtr->nTool, hwnd);
TOOLTIPS_GetTipText (hwnd, infoPtr, infoPtr->nCurrentTool);
@@ -383,7 +383,7 @@
TTTOOL_INFO *toolPtr;
NMHDR hdr;
- TRACE("Hide tooltip %d! (%04x)\n", infoPtr->nCurrentTool, hwnd);
+ TRACE("Hide tooltip %d! (%p)\n", infoPtr->nCurrentTool, hwnd);
if (infoPtr->nCurrentTool == -1)
return;
@@ -668,7 +668,7 @@
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEA)
return FALSE;
- TRACE("add tool (%x) %x %d%s!\n",
+ TRACE("add tool (%p) %p %d%s!\n",
hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
(lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
@@ -746,7 +746,7 @@
if (lpToolInfo->cbSize < TTTOOLINFO_V1_SIZEW)
return FALSE;
- TRACE("add tool (%x) %x %d%s!\n",
+ TRACE("add tool (%p) %p %d%s!\n",
hwnd, lpToolInfo->hwnd, lpToolInfo->uId,
(lpToolInfo->uFlags & TTF_IDISHWND) ? " TTF_IDISHWND" : "");
@@ -1475,9 +1475,9 @@
nOldTool = infoPtr->nTool;
infoPtr->nTool = TOOLTIPS_GetToolFromPoint(infoPtr, lpMsg->hwnd,
&pt);
- TRACE("tool (%x) %d %d %d\n", hwnd, nOldTool,
+ TRACE("tool (%p) %d %d %d\n", hwnd, nOldTool,
infoPtr->nTool, infoPtr->nCurrentTool);
- TRACE("WM_MOUSEMOVE (%04x %ld %ld)\n", hwnd, pt.x, pt.y);
+ TRACE("WM_MOUSEMOVE (%p %ld %ld)\n", hwnd, pt.x, pt.y);
if (infoPtr->nTool != nOldTool) {
if(infoPtr->nTool == -1) { /* Moved out of all tools */
@@ -2065,7 +2065,7 @@
static LRESULT
TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
- FIXME ("hwnd=%x wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
+ FIXME ("hwnd=%p wParam=%x lParam=%lx\n", hwnd, wParam, lParam);
return 0;
}
@@ -2147,7 +2147,7 @@
TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
INT nOldTool;
- TRACE("timer %d (%x) expired!\n", wParam, hwnd);
+ TRACE("timer %d (%p) expired!\n", wParam, hwnd);
switch (wParam) {
case ID_TIMERSHOW:
@@ -2164,7 +2164,7 @@
case ID_TIMERLEAVE:
nOldTool = infoPtr->nTool;
infoPtr->nTool = TOOLTIPS_CheckTool (hwnd, FALSE);
- TRACE("tool (%x) %d %d %d\n", hwnd, nOldTool,
+ TRACE("tool (%p) %d %d %d\n", hwnd, nOldTool,
infoPtr->nTool, infoPtr->nCurrentTool);
if (infoPtr->nTool != nOldTool) {
if(infoPtr->nTool == -1) { /* Moved out of all tools */
@@ -2239,7 +2239,7 @@
static LRESULT CALLBACK
TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!TOOLTIPS_GetInfoPtr(hwnd) && (uMsg != WM_CREATE) && (uMsg != WM_NCCREATE))
return DefWindowProcA (hwnd, uMsg, wParam, lParam);
switch (uMsg)
--- dlls/comctl32/trackbar.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/trackbar.c Wed Oct 23 00:22:31 2002
@@ -1546,7 +1546,7 @@
{
TRACKBAR_INFO *infoPtr = (TRACKBAR_INFO *)GetWindowLongW (hwnd, 0);
- TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
+ TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hwnd, uMsg, wParam, lParam);
if (!infoPtr && (uMsg != WM_CREATE))
return DefWindowProcW (hwnd, uMsg, wParam, lParam);
--- dlls/comctl32/treeview.c.1 Wed Oct 23 00:21:06 2002
+++ dlls/comctl32/treeview.c Wed Oct 23 00:22:31 2002
@@ -540,7 +540,7 @@
NMTVCUSTOMDRAW nmcdhdr;
LPNMCUSTOMDRAW nmcd;
- TRACE("drawstage:%lx hdc:%x\n", dwDrawStage, hdc);
+ TRACE("drawstage:%lx hdc:%p\n", dwDrawStage, hdc);
nmcd = &nmcdhdr.nmcd;
nmcd->hdr.hwndFrom = hwnd;
@@ -600,7 +600,7 @@
nmcdhdr.clrTextBk = infoPtr->clrBk;
nmcdhdr.iLevel = wineItem->iLevel;
- TRACE("drawstage:%lx hdc:%x item:%lx, itemstate:%x, lItemlParam:%lx\n",
+ TRACE("drawstage:%lx hdc:%p item:%lx, itemstate:%x, lItemlParam:%lx\n",
nmcd->dwDrawStage, nmcd->hdc, nmcd->dwItemSpec,
nmcd->uItemState, nmcd->lItemlParam);
@@ -1769,7 +1769,7 @@
static LRESULT
TREEVIEW_GetFont(TREEVIEW_INFO *infoPtr)
{
- TRACE("%x\n", infoPtr->hFont);
+ TRACE("%p\n", infoPtr->hFont);
return (LRESULT)infoPtr->hFont;
}
@@ -1789,7 +1789,7 @@
{
UINT uHeight = infoPtr->uItemHeight;
- TRACE("%x %i\n", hFont, bRedraw);
+ TRACE("%p %i\n", hFont, bRedraw);
infoPtr->hFont = hFont ? hFont : GetStockObject(SYSTEM_FONT);
@@ -4683,7 +4683,7 @@
RECT rcClient;
TREEVIEW_INFO *infoPtr;
- TRACE("wnd %x, style %lx\n", hwnd, GetWindowLongA(hwnd, GWL_STYLE));
+ TRACE("wnd %p, style %lx\n", hwnd, GetWindowLongA(hwnd, GWL_STYLE));
infoPtr = (TREEVIEW_INFO *)COMCTL32_Alloc(sizeof(TREEVIEW_INFO));
Index: dlls/comctl32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/Makefile.in,v
retrieving revision 1.28
diff -u -r1.28 Makefile.in
--- dlls/comctl32/Makefile.in 18 Oct 2002 23:46:29 -0000 1.28
+++ dlls/comctl32/Makefile.in 22 Oct 2002 22:25:18 -0000
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_COMCTL32_ -DWINE_NO_STRICT
+EXTRADEFS = -D_COMCTL32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Attachment:
pgp00070.pgp
Description: PGP signature
