marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fix the "int format, HANDLE arg" type of warnings for comctl32 

- compile the comctl32 dll with -DSTRICT
oldstable
Michael Stefaniuc 2002-10-23 22:19:10 +00:00 committed by Alexandre Julliard
parent 85e40cf37a
commit 353529b2c8
26 changed files with 191 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/comctl32/Makefile.in
View File

@ -1,4 +1,4 @@
EXTRADEFS = -D_COMCTL32_ -DWINE_NO_STRICT
EXTRADEFS = -D_COMCTL32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@

2
dlls/comctl32/animate.c
View File

@ -836,7 +836,7 @@ static LRESULT WINAPI ANIMATE_Size(HWND hWnd, WPARAM wParam, LPARAM lParam)
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)

16
dlls/comctl32/comboex.c
View File

@ -324,7 +324,7 @@ static void COMBOEX_GetComboFontSize (COMBOEX_INFO *infoPtr, SIZE *size)
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 @@ static BOOL COMBOEX_WM_DeleteItem (COMBOEX_INFO *infoPtr, DELETEITEMSTRUCT *dis)
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 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis)
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 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis)
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 @@ static LRESULT COMBOEX_MeasureItem (COMBOEX_INFO *infoPtr, MEASUREITEMSTRUCT *mi
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 @@ COMBOEX_EditWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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 @@ COMBOEX_ComboWndProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
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)

32
dlls/comctl32/comctl32undoc.c
View File

@ -669,7 +669,7 @@ FindMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData, LPINT lpRegNum)
if (lpRegNum && (ret != -1))
*lpRegNum = 'a' + i;
TRACE("(%08x, %p, %ld, %p) returning %d\n",
TRACE("(%p, %p, %ld, %p) returning %d\n",
hList, lpData, cbData, lpRegNum, ret);
return ret;
@ -730,7 +730,7 @@ AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
mp->realMRU[i] = mp->realMRU[i-1];
}
mp->realMRU[0] = replace + 'a';
TRACE("(%08x, %p, %ld) adding data, /%c/ now most current\n",
TRACE("(%p, %p, %ld) adding data, /%c/ now most current\n",
hList, lpData, cbData, replace+'a');
ret = replace;
@ -760,7 +760,7 @@ AddMRUData (HANDLE hList, LPCVOID lpData, DWORD cbData)
INT WINAPI
AddMRUStringW(HANDLE hList, LPCWSTR lpszString)
{
FIXME("(%08x, %s) empty stub!\n", hList, debugstr_w(lpszString));
FIXME("(%p, %s) empty stub!\n", hList, debugstr_w(lpszString));
return 0;
}
@ -771,7 +771,7 @@ AddMRUStringW(HANDLE hList, LPCWSTR lpszString)
INT WINAPI
AddMRUStringA(HANDLE hList, LPCSTR lpszString)
{
FIXME("(%08x, %s) empty stub!\n", hList, debugstr_a(lpszString));
FIXME("(%p, %s) empty stub!\n", hList, debugstr_a(lpszString));
return 0;
}
@ -791,7 +791,7 @@ AddMRUStringA(HANDLE hList, LPCSTR lpszString)
BOOL WINAPI
DelMRUString(HANDLE hList, INT nItemPos)
{
FIXME("(%08x, %d): stub\n", hList, nItemPos);
FIXME("(%p, %d): stub\n", hList, nItemPos);
return TRUE;
}
@ -1025,7 +1025,7 @@ DWORD nBufferSize)
witem = mp->array[desired];
datasize = min( witem->size, nBufferSize );
memcpy( lpBuffer, &witem->datastart, datasize);
TRACE("(%08x, %d, %p, %ld): returning len=%d\n",
TRACE("(%p, %d, %p, %ld): returning len=%d\n",
hList, nItemPos, lpBuffer, nBufferSize, datasize);
return datasize;
}
@ -1058,7 +1058,7 @@ DWORD nBufferSize)
WideCharToMultiByte(CP_ACP, 0, (LPWSTR)&witem->datastart, -1,
lpBuffer, datasize, NULL, NULL);
}
TRACE("(%08x, %d, %p, %ld): returning len=%d\n",
TRACE("(%p, %d, %p, %ld): returning len=%d\n",
hList, nItemPos, lpBuffer, nBufferSize, datasize);
return datasize;
}
@ -2225,7 +2225,7 @@ DPA_CreateEx (INT nGrow, HANDLE hHeap)
{
HDPA hdpa;
TRACE("(%d 0x%x)\n", nGrow, hHeap);
TRACE("(%d %p)\n", nGrow, hHeap);
if (hHeap)
hdpa = (HDPA)HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(DPA));
@ -2273,7 +2273,7 @@ DoNotify (LPNOTIFYDATA lpNotify, UINT uCode, LPNMHDR lpHdr)
LPNMHDR lpNmh = NULL;
UINT idFrom = 0;
TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
TRACE("(%p %p %d %p 0x%08lx)\n",
lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
lpNotify->dwParam5);
@ -2326,7 +2326,7 @@ COMCTL32_SendNotify (HWND hwndTo, HWND hwndFrom,
{
NOTIFYDATA notify;
TRACE("(0x%04x 0x%04x %d %p)\n",
TRACE("(%p %p %d %p)\n",
hwndTo, hwndFrom, uCode, lpHdr);
notify.hwndFrom = hwndFrom;
@ -2360,7 +2360,7 @@ COMCTL32_SendNotifyEx (HWND hwndTo, HWND hwndFrom, UINT uCode,
NOTIFYDATA notify;
HWND hwndNotify;
TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
TRACE("(%p %p %d %p 0x%08lx)\n",
hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
hwndNotify = hwndTo;
@ -2703,7 +2703,7 @@ INT WINAPI COMCTL32_StrSpnW( LPWSTR lpStr, LPWSTR lpSet) {
BOOL WINAPI COMCTL32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
FIXME("(%p, %lx, %lx, %lx): stub!\n", hw, b, c, d);
return TRUE;
}
@ -2717,7 +2717,7 @@ BOOL WINAPI COMCTL32_410( HWND hw, DWORD b, DWORD c, DWORD d) {
BOOL WINAPI COMCTL32_411( HWND hw, DWORD b, DWORD c) {
FIXME("(%x, %lx, %lx): stub!\n", hw, b, c);
FIXME("(%p, %lx, %lx): stub!\n", hw, b, c);
return TRUE;
}
@ -2731,7 +2731,7 @@ BOOL WINAPI COMCTL32_411( HWND hw, DWORD b, DWORD c) {
BOOL WINAPI COMCTL32_412( HWND hwnd, DWORD b, DWORD c)
{
FIXME("(%x, %lx, %lx): stub!\n", hwnd, b, c);
FIXME("(%p, %lx, %lx): stub!\n", hwnd, b, c);
if (IsWindow (hwnd) == FALSE)
return FALSE;
@ -2752,7 +2752,7 @@ BOOL WINAPI COMCTL32_412( HWND hwnd, DWORD b, DWORD c)
BOOL WINAPI COMCTL32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
FIXME("(%x, %lx, %lx, %lx): stub!\n", hw, b, c, d);
FIXME("(%p, %lx, %lx, %lx): stub!\n", hw, b, c, d);
return TRUE;
}
@ -2768,7 +2768,7 @@ BOOL WINAPI COMCTL32_413( HWND hw, DWORD b, DWORD c, DWORD d) {
BOOL WINAPI COMCTL32_415( HWND hwnd, DWORD b, DWORD c, DWORD d, DWORD e)
{
FIXME("(%x, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
FIXME("(%p, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
return TRUE;
}

16
dlls/comctl32/commctrl.c
View File

@ -142,7 +142,7 @@ static const WORD wPattern55AA[] =
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 @@ COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/* 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 @@ COMCTL32_LibMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
/* 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 @@ ShowHideMenuCtl (HWND hwnd, UINT uFlags, LPINT lpInfo)
{
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 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
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 @@ BOOL WINAPI GetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
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 @@ BOOL WINAPI RemoveWindowSubclass(HWND hWnd, SUBCLASSPROC pfnSubclass, UINT_PTR u
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 @@ LRESULT WINAPI DefSubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
/* 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;
}

10
dlls/comctl32/datetime.c
View File

@ -880,7 +880,7 @@ DATETIME_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ DATETIME_ParentNotify (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ DATETIME_Notify (HWND hwnd, WPARAM wParam, LPARAM lParam)
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;
}

6
dlls/comctl32/draglist.c
View File

@ -39,7 +39,7 @@ static DWORD dwLastScrollTime = 0;
*/
BOOL WINAPI MakeDragList (HWND hwndLB)
{
FIXME("(0x%x)\n", hwndLB);
FIXME("(%p)\n", hwndLB);
return FALSE;
@ -50,7 +50,7 @@ BOOL WINAPI MakeDragList (HWND hwndLB)
*/
VOID WINAPI DrawInsert (HWND hwndParent, HWND hwndLB, INT nItem)
{
FIXME("(0x%x 0x%x %d)\n", hwndParent, hwndLB, nItem);
FIXME("(%p %p %d)\n", hwndParent, hwndLB, nItem);
}
@ -64,7 +64,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
INT nIndex;
DWORD dwScrollTime;
FIXME("(0x%x %ld x %ld %s)\n",
FIXME("(%p %ld x %ld %s)\n",
hwndLB, pt.x, pt.y, bAutoScroll ? "TRUE" : "FALSE");
ScreenToClient (hwndLB, &pt);

12
dlls/comctl32/flatsb.c
View File

@ -53,7 +53,7 @@ typedef struct
*/
BOOL WINAPI InitializeFlatSB(HWND hwnd)
{
TRACE("[%04x]\n", hwnd);
TRACE("[%p]\n", hwnd);
FIXME("stub\n");
return FALSE;
}
@ -69,7 +69,7 @@ BOOL WINAPI InitializeFlatSB(HWND hwnd)
*/
HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
{
TRACE("[%04x]\n", hwnd);
TRACE("[%p]\n", hwnd);
FIXME("stub\n");
return S_FALSE;
}
@ -85,7 +85,7 @@ HRESULT WINAPI UninitializeFlatSB(HWND hwnd)
BOOL WINAPI
FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
{
TRACE("[%04x] propIndex=%d\n", hwnd, propIndex);
TRACE("[%p] propIndex=%d\n", hwnd, propIndex);
FIXME("stub\n");
return FALSE;
}
@ -96,7 +96,7 @@ FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
BOOL WINAPI
FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
{
TRACE("[%04x] index=%u newValue=%d flag=%d\n", hwnd, index, newValue, flag);
TRACE("[%p] index=%u newValue=%d flag=%d\n", hwnd, index, newValue, flag);
FIXME("stub\n");
return FALSE;
}
@ -193,7 +193,7 @@ FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)
static LRESULT
FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TRACE("[%04x] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
TRACE("[%p] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
return 0;
}
@ -201,7 +201,7 @@ FlatSB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT
FlatSB_Destroy (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
TRACE("[%04x] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
TRACE("[%p] wParam=%04x lParam=%08lx\n", hwnd, wParam, lParam);
return 0;
}

2
dlls/comctl32/header.c
View File

@ -1651,7 +1651,7 @@ HEADER_SetFont (HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT WINAPI
HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
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 (!HEADER_GetInfoPtr (hwnd) && (msg != WM_CREATE))
return DefWindowProcA (hwnd, msg, wParam, lParam);
switch (msg) {

4
dlls/comctl32/hotkey.c
View File

@ -113,7 +113,7 @@ HOTKEY_Refresh(HOTKEY_INFO *infoPtr, HDC hdc)
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 @@ static LRESULT WINAPI
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)

16
dlls/comctl32/imagelist.c
View File

@ -171,7 +171,7 @@ ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
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;
@ -283,7 +283,7 @@ ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask)
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;
@ -722,7 +722,7 @@ ImageList_Destroy (HIMAGELIST himl)
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;
@ -1096,7 +1096,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
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 */
@ -2205,7 +2205,7 @@ ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage,
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");
@ -2280,7 +2280,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon)
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;
@ -2310,12 +2310,12 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon)
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");

8
dlls/comctl32/ipaddress.c
View File

@ -106,12 +106,12 @@ static int IPADDRESS_GetPartIndex(IPADDRESS_INFO *infoPtr, HWND hwnd)
{
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 @@ IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
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_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
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);

26
dlls/comctl32/listview.c
View File

@ -339,16 +339,16 @@ typedef struct tagLISTVIEW_INFO
/* Dump the LISTVIEW_INFO structure to the debug channel */
#define LISTVIEW_DUMP(iP) do { \
TRACE("hwndSelf=%08x, clrBk=0x%06lx, clrText=0x%06lx, clrTextBk=0x%06lx, ItemHeight=%d, ItemWidth=%d, Style=0x%08lx\n", \
TRACE("hwndSelf=%p, clrBk=0x%06lx, clrText=0x%06lx, clrTextBk=0x%06lx, ItemHeight=%d, ItemWidth=%d, Style=0x%08lx\n", \
iP->hwndSelf, iP->clrBk, iP->clrText, iP->clrTextBk, \
iP->nItemHeight, iP->nItemWidth, infoPtr->dwStyle); \
TRACE("hwndSelf=%08x, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08lx, Focus=%d\n", \
TRACE("hwndSelf=%p, himlNor=%p, himlSml=%p, himlState=%p, Focused=%d, Hot=%d, exStyle=0x%08lx, Focus=%d\n", \
iP->hwndSelf, iP->himlNormal, iP->himlSmall, iP->himlState, \
iP->nFocusedItem, iP->nHotItem, iP->dwLvExStyle, iP->bFocus ); \
TRACE("hwndSelf=%08x, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \
TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \
iP->hwndSelf, iP->ntmHeight, iP->iconSize.cx, iP->iconSize.cy, \
iP->iconSpacing.cx, iP->iconSpacing.cy, iP->notifyFormat); \
TRACE("hwndSelf=%08x, rcList=%s\n", iP->hwndSelf, debugrect(&iP->rcList)); \
TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, debugrect(&iP->rcList)); \
} while(0)
@ -3363,7 +3363,7 @@ static inline BOOL LISTVIEW_FillBkgnd(LISTVIEW_INFO *infoPtr, HDC hdc, const REC
{
if (!infoPtr->hBkBrush) return FALSE;
TRACE("(hdc=%x, lprcBox=%s, hBkBrush=%x)\n", hdc, debugrect(lprcBox), infoPtr->hBkBrush);
TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, debugrect(lprcBox), infoPtr->hBkBrush);
return FillRect(hdc, lprcBox, infoPtr->hBkBrush);
}
@ -3395,7 +3395,7 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS
HIMAGELIST himl;
LVITEMW lvItem;
TRACE("(hdc=%x, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, debugpoint(&pos));
TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, debugpoint(&pos));
/* get information needed for drawing the item */
lvItem.mask = LVIF_TEXT | LVIF_IMAGE;
@ -5060,7 +5060,7 @@ static BOOL LISTVIEW_GetItemRect(LISTVIEW_INFO *infoPtr, INT nItem, LPRECT lprc)
LVITEMW lvItem;
RECT label_rect;
TRACE("(hwnd=%x, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc);
TRACE("(hwnd=%p, nItem=%d, lprc=%p)\n", infoPtr->hwndSelf, nItem, lprc);
if (!lprc || nItem < 0 || nItem >= infoPtr->nItemCount) return FALSE;
@ -6986,7 +6986,7 @@ static inline BOOL LISTVIEW_EraseBkgnd(LISTVIEW_INFO *infoPtr, HDC hdc)
{
RECT rc;
TRACE("(hdc=%x)\n", hdc);
TRACE("(hdc=%p)\n", hdc);
if (!GetClipBox(hdc, &rc)) return FALSE;
@ -7687,7 +7687,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, LPNMHEADERW l
*/
static LRESULT LISTVIEW_NotifyFormat(LISTVIEW_INFO *infoPtr, HWND hwndFrom, INT nCommand)
{
TRACE("(hwndFrom=%x, nCommand=%d)\n", hwndFrom, nCommand);
TRACE("(hwndFrom=%p, nCommand=%d)\n", hwndFrom, nCommand);
if (nCommand == NF_REQUERY)
infoPtr->notifyFormat = SendMessageW(hwndFrom, WM_NOTIFYFORMAT,
@ -7708,7 +7708,7 @@ static LRESULT LISTVIEW_NotifyFormat(LISTVIEW_INFO *infoPtr, HWND hwndFrom, INT
*/
static LRESULT LISTVIEW_Paint(LISTVIEW_INFO *infoPtr, HDC hdc)
{
TRACE("(hdc=%x)\n", hdc);
TRACE("(hdc=%p)\n", hdc);
if (hdc)
LISTVIEW_Refresh(infoPtr, hdc);
@ -7889,7 +7889,7 @@ static BOOL LISTVIEW_SetCursor(LISTVIEW_INFO *infoPtr, HWND hwnd, UINT nHittest,
*/
static LRESULT LISTVIEW_SetFocus(LISTVIEW_INFO *infoPtr, HWND hwndLoseFocus)
{
TRACE("(hwndLoseFocus=%x)\n", hwndLoseFocus);
TRACE("(hwndLoseFocus=%p)\n", hwndLoseFocus);
/* if we have the focus already, there's nothing to do */
if (infoPtr->bFocus) return 0;
@ -7925,7 +7925,7 @@ static LRESULT LISTVIEW_SetFont(LISTVIEW_INFO *infoPtr, HFONT hFont, WORD fRedra
{
HFONT oldFont = infoPtr->hFont;
TRACE("(hfont=%x,redraw=%hu)\n", hFont, fRedraw);
TRACE("(hfont=%p,redraw=%hu)\n", hFont, fRedraw);
infoPtr->hFont = hFont ? hFont : infoPtr->hDefaultFont;
if (infoPtr->hFont == oldFont) return 0;
@ -8767,7 +8767,7 @@ static LRESULT EditLblWndProcT(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPara
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(GetParent(hwnd), 0);
BOOL cancel = FALSE;
TRACE("(hwnd=%x, uMsg=%x, wParam=%x, lParam=%lx, isW=%d)\n",
TRACE("(hwnd=%p, uMsg=%x, wParam=%x, lParam=%lx, isW=%d)\n",
hwnd, uMsg, wParam, lParam, isW);
switch (uMsg)

6
dlls/comctl32/monthcal.c
View File

@ -1554,7 +1554,7 @@ MONTHCAL_LButtonUp(HWND hwnd, WPARAM wParam, LPARAM lParam)
nmhdr.hwndFrom = hwnd;
nmhdr.idFrom = GetWindowLongA( hwnd, GWL_ID);
nmhdr.code = NM_RELEASEDCAPTURE;
TRACE("Sent notification from %x to %x\n", hwnd, GetParent(hwnd));
TRACE("Sent notification from %p to %p\n", hwnd, GetParent(hwnd));
SendMessageA(GetParent(hwnd), WM_NOTIFY,
(WPARAM)nmhdr.idFrom, (LPARAM)&nmhdr);
@ -1850,7 +1850,7 @@ static void MONTHCAL_UpdateSize(HWND hwnd)
static LRESULT MONTHCAL_Size(HWND hwnd, int Width, int Height)
{
TRACE("(hwnd=%x, width=%d, height=%d)\n", hwnd, Width, Height);
TRACE("(hwnd=%p, width=%d, height=%d)\n", hwnd, Width, Height);
MONTHCAL_UpdateSize(hwnd);
@ -1928,7 +1928,7 @@ MONTHCAL_Destroy(HWND hwnd, WPARAM wParam, LPARAM lParam)
static LRESULT WINAPI
MONTHCAL_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 (!MONTHCAL_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
return DefWindowProcA(hwnd, uMsg, wParam, lParam);
switch(uMsg)

70
dlls/comctl32/pager.c
View File

@ -231,7 +231,7 @@ static void PAGER_CaptureandTrack(PAGER_INFO *infoPtr, HWND hwnd)
{
TRACKMOUSEEVENT trackinfo;
TRACE("[%08x] SetCapture\n", hwnd);
TRACE("[%p] SetCapture\n", hwnd);
SetCapture(hwnd);
infoPtr->bCapture = TRUE;
@ -260,7 +260,7 @@ static inline LRESULT
PAGER_ForwardMouse (HWND hwnd, WPARAM wParam)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x]\n", hwnd);
TRACE("[%p]\n", hwnd);
infoPtr->bForward = (BOOL)wParam;
@ -273,7 +273,7 @@ PAGER_GetButtonState (HWND hwnd, WPARAM wParam, LPARAM lParam)
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
LRESULT btnState = PGF_INVISIBLE;
INT btn = (INT)lParam;
TRACE("[%08x]\n", hwnd);
TRACE("[%p]\n", hwnd);
if (btn == PGB_TOPORLEFT)
btnState = infoPtr->TLbtnState;
@ -288,7 +288,7 @@ static inline LRESULT
PAGER_GetPos(HWND hwnd)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x] returns %d\n", hwnd, infoPtr->nPos);
TRACE("[%p] returns %d\n", hwnd, infoPtr->nPos);
return (LRESULT)infoPtr->nPos;
}
@ -296,7 +296,7 @@ static inline LRESULT
PAGER_GetButtonSize(HWND hwnd)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x] returns %d\n", hwnd, infoPtr->nButtonSize);
TRACE("[%p] returns %d\n", hwnd, infoPtr->nButtonSize);
return (LRESULT)infoPtr->nButtonSize;
}
@ -304,7 +304,7 @@ static inline LRESULT
PAGER_GetBorder(HWND hwnd)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x] returns %d\n", hwnd, infoPtr->nBorder);
TRACE("[%p] returns %d\n", hwnd, infoPtr->nBorder);
return (LRESULT)infoPtr->nBorder;
}
@ -312,7 +312,7 @@ static inline LRESULT
PAGER_GetBkColor(HWND hwnd)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x] returns %06lx\n", hwnd, infoPtr->clrBk);
TRACE("[%p] returns %06lx\n", hwnd, infoPtr->clrBk);
return (LRESULT)infoPtr->clrBk;
}
@ -332,7 +332,7 @@ PAGER_CalcSize (HWND hwnd, INT* size, BOOL getWidth)
*size = getWidth ? nmpgcs.iWidth : nmpgcs.iHeight;
TRACE("[%08x] PGN_CALCSIZE returns %s=%d\n", hwnd,
TRACE("[%p] PGN_CALCSIZE returns %s=%d\n", hwnd,
getWidth ? "width" : "height", *size);
}
@ -356,7 +356,7 @@ PAGER_PositionChildWnd(HWND hwnd, PAGER_INFO* infoPtr)
if (infoPtr->nWidth < wndSize)
infoPtr->nWidth = wndSize;
TRACE("[%08x] SWP %dx%d at (%d,%d)\n", hwnd,
TRACE("[%p] SWP %dx%d at (%d,%d)\n", hwnd,
infoPtr->nWidth, infoPtr->nHeight,
-nPos, 0);
SetWindowPos(infoPtr->hwndChild, 0,
@ -370,7 +370,7 @@ PAGER_PositionChildWnd(HWND hwnd, PAGER_INFO* infoPtr)
if (infoPtr->nHeight < wndSize)
infoPtr->nHeight = wndSize;
TRACE("[%08x] SWP %dx%d at (%d,%d)\n", hwnd,
TRACE("[%p] SWP %dx%d at (%d,%d)\n", hwnd,
infoPtr->nWidth, infoPtr->nHeight,
0, -nPos);
SetWindowPos(infoPtr->hwndChild, 0,
@ -412,7 +412,7 @@ PAGER_GetScrollRange(HWND hwnd, PAGER_INFO* infoPtr)
scrollRange = childSize - wndSize + infoPtr->nButtonSize;
}
TRACE("[%08x] returns %d\n", hwnd, scrollRange);
TRACE("[%p] returns %d\n", hwnd, scrollRange);
return scrollRange;
}
@ -524,7 +524,7 @@ PAGER_SetPos(HWND hwnd, INT newPos, BOOL fromBtnPress)
else
infoPtr->nPos = newPos;
TRACE("[%08x] pos=%d, oldpos=%d\n", hwnd, infoPtr->nPos, oldPos);
TRACE("[%p] pos=%d, oldpos=%d\n", hwnd, infoPtr->nPos, oldPos);
if (infoPtr->nPos != oldPos)
{
@ -593,7 +593,7 @@ PAGER_SetFixedWidth(HWND hwnd, PAGER_INFO* infoPtr)
h = wndRect.bottom - wndRect.top + infoPtr->nButtonSize;
TRACE("[%08x] infoPtr->nWidth set to %d\n",
TRACE("[%p] infoPtr->nWidth set to %d\n",
hwnd, infoPtr->nWidth);
return h;
@ -624,7 +624,7 @@ PAGER_SetFixedHeight(HWND hwnd, PAGER_INFO* infoPtr)
w = wndRect.right - wndRect.left + infoPtr->nButtonSize;
TRACE("[%08x] infoPtr->nHeight set to %d\n",
TRACE("[%p] infoPtr->nHeight set to %d\n",
hwnd, infoPtr->nHeight);
return w;
@ -647,7 +647,7 @@ PAGER_RecalcSize(HWND hwnd)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x]\n", hwnd);
TRACE("[%p]\n", hwnd);
if (infoPtr->hwndChild)
{
@ -676,7 +676,7 @@ PAGER_SetBkColor (HWND hwnd, WPARAM wParam, LPARAM lParam)
COLORREF clrTemp = infoPtr->clrBk;
infoPtr->clrBk = (COLORREF)lParam;
TRACE("[%08x] %06lx\n", hwnd, infoPtr->clrBk);
TRACE("[%p] %06lx\n", hwnd, infoPtr->clrBk);
/* the native control seems to do things this way */
SetWindowPos(hwnd, 0,0,0,0,0,
@ -696,7 +696,7 @@ PAGER_SetBorder (HWND hwnd, WPARAM wParam, LPARAM lParam)
INT nTemp = infoPtr->nBorder;
infoPtr->nBorder = (INT)lParam;
TRACE("[%08x] %d\n", hwnd, infoPtr->nBorder);
TRACE("[%p] %d\n", hwnd, infoPtr->nBorder);
PAGER_RecalcSize(hwnd);
@ -711,7 +711,7 @@ PAGER_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
INT nTemp = infoPtr->nButtonSize;
infoPtr->nButtonSize = (INT)lParam;
TRACE("[%08x] %d\n", hwnd, infoPtr->nButtonSize);
TRACE("[%p] %d\n", hwnd, infoPtr->nButtonSize);
PAGER_RecalcSize(hwnd);
@ -729,7 +729,7 @@ PAGER_SetChild (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (infoPtr->hwndChild)
{
TRACE("[%08x] hwndChild=%08x\n", hwnd, infoPtr->hwndChild);
TRACE("[%p] hwndChild=%p\n", hwnd, infoPtr->hwndChild);
if (PAGER_IsHorizontal(hwnd)) {
hw = PAGER_SetFixedHeight(hwnd, infoPtr);
@ -792,7 +792,7 @@ PAGER_Scroll(HWND hwnd, INT dir)
SendMessageA (GetParent(hwnd), WM_NOTIFY,
(WPARAM)nmpgScroll.hdr.idFrom, (LPARAM)&nmpgScroll);
TRACE("[%08x] PGN_SCROLL returns iScroll=%d\n", hwnd, nmpgScroll.iScroll);
TRACE("[%p] PGN_SCROLL returns iScroll=%d\n", hwnd, nmpgScroll.iScroll);
if (nmpgScroll.iScroll > 0)
{
@ -851,7 +851,7 @@ PAGER_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
infoPtr->direction = -1;
if (dwStyle & PGS_DRAGNDROP)
FIXME("[%08x] Drag and Drop style is not implemented yet.\n", hwnd);
FIXME("[%p] Drag and Drop style is not implemented yet.\n", hwnd);
/*
* If neither horizontal nor vertical style specified, default to vertical.
* This is probably not necessary, since the style may be set later on as
@ -1003,7 +1003,7 @@ PAGER_NCCalcSize(HWND hwnd, WPARAM wParam, LPARAM lParam)
lpRect->bottom = infoPtr->nHeight;
}
TRACE("[%08x] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n",
hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top,
lpRect->left, lpRect->top,
infoPtr->TLbtnState, infoPtr->BRbtnState);
@ -1163,7 +1163,7 @@ PAGER_MouseLeave (HWND hwnd, WPARAM wParam, LPARAM lParam)
KillTimer (hwnd, TIMERID1);
KillTimer (hwnd, TIMERID2);
TRACE("[%08x] ReleaseCapture\n", hwnd);
TRACE("[%p] ReleaseCapture\n", hwnd);
ReleaseCapture();
infoPtr->bCapture = FALSE;
@ -1199,7 +1199,7 @@ PAGER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
pt.x = SLOWORD(lParam);
pt.y = SHIWORD(lParam);
TRACE("[%08x] to (%ld,%ld)\n", hwnd, pt.x, pt.y);
TRACE("[%p] to (%ld,%ld)\n", hwnd, pt.x, pt.y);
ClientToScreen(hwnd, &pt);
GetWindowRect(hwnd, &wnrect);
if (PtInRect(&wnrect, pt)) {
@ -1232,7 +1232,7 @@ PAGER_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* If in one of the buttons the capture and draw buttons */
if (btnrect) {
TRACE("[%08x] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n",
TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n",
hwnd, btnrect->left, btnrect->top,
btnrect->right, btnrect->bottom,
(infoPtr->bCapture) ? "TRUE" : "FALSE",
@ -1285,7 +1285,7 @@ PAGER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
pt.x = SLOWORD(lParam);
pt.y = SHIWORD(lParam);
TRACE("[%08x] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
TRACE("[%p] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
hit = PAGER_HitTest(hwnd, &pt);
@ -1309,19 +1309,19 @@ PAGER_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
switch(hit)
{
case HTLEFT:
TRACE("[%08x] PGF_SCROLLLEFT\n", hwnd);
TRACE("[%p] PGF_SCROLLLEFT\n", hwnd);
PAGER_Scroll(hwnd, PGF_SCROLLLEFT);
break;
case HTTOP:
TRACE("[%08x] PGF_SCROLLUP\n", hwnd);
TRACE("[%p] PGF_SCROLLUP\n", hwnd);
PAGER_Scroll(hwnd, PGF_SCROLLUP);
break;
case HTRIGHT:
TRACE("[%08x] PGF_SCROLLRIGHT\n", hwnd);
TRACE("[%p] PGF_SCROLLRIGHT\n", hwnd);
PAGER_Scroll(hwnd, PGF_SCROLLRIGHT);
break;
case HTBOTTOM:
TRACE("[%08x] PGF_SCROLLDOWN\n", hwnd);
TRACE("[%p] PGF_SCROLLDOWN\n", hwnd);
PAGER_Scroll(hwnd, PGF_SCROLLDOWN);
break;
default:
@ -1335,7 +1335,7 @@ static LRESULT
PAGER_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x]\n", hwnd);
TRACE("[%p]\n", hwnd);
KillTimer (hwnd, TIMERID1);
KillTimer (hwnd, TIMERID2);
@ -1354,7 +1354,7 @@ PAGER_NCLButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
pt.x = SLOWORD(lParam);
pt.y = SHIWORD(lParam);
TRACE("[%08x] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
TRACE("[%p] at (%d,%d)\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
MapWindowPoints(0, hwnd, &pt, 1);
lParam = MAKELONG(pt.x, pt.y);
return PAGER_LButtonDown (hwnd, wParam, lParam);
@ -1377,7 +1377,7 @@ PAGER_Timer (HWND hwnd, WPARAM wParam)
dir = (infoPtr->TLbtnState & PGF_DEPRESSED) ?
PGF_SCROLLUP : PGF_SCROLLDOWN;
}
TRACE("[%08x] TIMERID1: style=%08lx, dir=%d\n", hwnd, dwStyle, dir);
TRACE("[%p] TIMERID1: style=%08lx, dir=%d\n", hwnd, dwStyle, dir);
KillTimer(hwnd, TIMERID1);
SetTimer(hwnd, TIMERID1, REPEAT_DELAY, 0);
if (dwStyle & PGS_AUTOSCROLL) {
@ -1390,7 +1390,7 @@ PAGER_Timer (HWND hwnd, WPARAM wParam)
}
TRACE("[%08x] TIMERID2: dir=%d\n", hwnd, infoPtr->direction);
TRACE("[%p] TIMERID2: dir=%d\n", hwnd, infoPtr->direction);
KillTimer(hwnd, TIMERID2);
if (infoPtr->direction > 0) {
PAGER_Scroll(hwnd, infoPtr->direction);
@ -1452,7 +1452,7 @@ PAGER_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
/* note that WM_SIZE is sent whenever NCCalcSize resizes the client wnd */
PAGER_INFO *infoPtr = PAGER_GetInfoPtr (hwnd);
TRACE("[%08x] %dx%d\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
TRACE("[%p] %dx%d\n", hwnd, SLOWORD(lParam), SHIWORD(lParam));
if (PAGER_IsHorizontal(hwnd))
infoPtr->nHeight = SHIWORD(lParam);

8
dlls/comctl32/progress.c
View File

@ -107,7 +107,7 @@ static LRESULT PROGRESS_Draw (PROGRESS_INFO *infoPtr, HDC hdc)
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 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
{
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 @@ static LRESULT WINAPI ProgressWindowProc(HWND hwnd, UINT message,
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;

6
dlls/comctl32/propsheet.c
View File

@ -292,7 +292,7 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
psInfo->isModeless = dwFlags & PSH_MODELESS;
memcpy(&psInfo->ppshheader,lppsh,dwSize);
TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%04x\nhInstance\t%08x\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance,
debugstr_a(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
@ -343,7 +343,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
psInfo->isModeless = dwFlags & PSH_MODELESS;
memcpy(&psInfo->ppshheader,lppsh,dwSize);
TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%04x\nhInstance\t%08x\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
TRACE("\n** PROPSHEETHEADER **\ndwSize\t\t%ld\ndwFlags\t\t%08lx\nhwndParent\t%p\nhInstance\t%p\npszCaption\t'%s'\nnPages\t\t%d\npfnCallback\t%p\n",
lppsh->dwSize, lppsh->dwFlags, lppsh->hwndParent, lppsh->hInstance, debugstr_w(lppsh->pszCaption), lppsh->nPages, lppsh->pfnCallback);
PROPSHEET_UnImplementedFlags(lppsh->dwFlags);
@ -2665,7 +2665,7 @@ static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID)
BOOL WINAPI
PROPSHEET_DialogProc(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, wParam, lParam);
switch (uMsg)

32
dlls/comctl32/rebar.c
View File

@ -399,7 +399,7 @@ static VOID
REBAR_DumpBandInfo( LPREBARBANDINFOA pB)
{
if( !TRACE_ON(rebar) ) return;
TRACE("band info: ID=%u, size=%u, child=%04x, clrF=0x%06lx, clrB=0x%06lx\n",
TRACE("band info: ID=%u, size=%u, child=%p, clrF=0x%06lx, clrB=0x%06lx\n",
pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack);
TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask));
if (pB->fMask & RBBIM_STYLE)
@ -430,19 +430,19 @@ REBAR_DumpBand (REBAR_INFO *iP)
if(! TRACE_ON(rebar) ) return;
TRACE("hwnd=%04x: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n",
TRACE("hwnd=%p: color=%08lx/%08lx, bands=%u, rows=%u, cSize=%ld,%ld\n",
iP->hwndSelf, iP->clrText, iP->clrBk, iP->uNumBands, iP->uNumRows,
iP->calcSize.cx, iP->calcSize.cy);
TRACE("hwnd=%04x: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, ihitBand=%d\n",
TRACE("hwnd=%p: flags=%08x, dragStart=%d,%d, dragNow=%d,%d, ihitBand=%d\n",
iP->hwndSelf, iP->fStatus, iP->dragStart.x, iP->dragStart.y,
iP->dragNow.x, iP->dragNow.y,
iP->ihitBand);
TRACE("hwnd=%04x: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n",
TRACE("hwnd=%p: style=%08lx, I'm Unicode=%s, notify in Unicode=%s, redraw=%s\n",
iP->hwndSelf, iP->dwStyle, (iP->bUnicode)?"TRUE":"FALSE",
(iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE");
for (i = 0; i < iP->uNumBands; i++) {
pB = &iP->bands[i];
TRACE("band # %u: ID=%u, child=%04x, row=%u, clrF=0x%06lx, clrB=0x%06lx\n",
TRACE("band # %u: ID=%u, child=%p, row=%u, clrF=0x%06lx, clrB=0x%06lx\n",
i, pB->wID, pB->hwndChild, pB->iRow, pB->clrFore, pB->clrBack);
TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask));
if (pB->fMask & RBBIM_STYLE)
@ -506,7 +506,7 @@ REBAR_Notify (NMHDR *nmhdr, REBAR_INFO *infoPtr, UINT code)
nmhdr->hwndFrom = infoPtr->hwndSelf;
nmhdr->code = code;
TRACE("window %04x, code=%08x, %s\n", parent, code,
TRACE("window %p, code=%08x, %s\n", parent, code,
(infoPtr->NtfUnicode) ? "via Unicode" : "via ANSI");
if (infoPtr->NtfUnicode)
@ -638,7 +638,7 @@ REBAR_Refresh (REBAR_INFO *infoPtr, HDC hdc)
if (HIDDENBAND(lpBand)) continue;
/* now draw the band */
TRACE("[%04x] drawing band %i, flags=%08x\n",
TRACE("[%p] drawing band %i, flags=%08x\n",
infoPtr->hwndSelf, i, lpBand->fDraw);
REBAR_DrawBand (hdc, infoPtr, lpBand);
@ -1224,7 +1224,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr)
y = infoPtr->origin.y;
}
TRACE("hwnd %08x, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
TRACE("hwnd %p, style=%08lx, setting at (%d,%d) for (%d,%d)\n",
infoPtr->hwndSelf, infoPtr->dwStyle,
x, y, width, height);
SetWindowPos (infoPtr->hwndSelf, 0, x, y, width, height,
@ -1250,7 +1250,7 @@ REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus)
if (HIDDENBAND(lpBand)) continue;
if (lpBand->hwndChild) {
TRACE("hwndChild = %x\n", lpBand->hwndChild);
TRACE("hwndChild = %p\n", lpBand->hwndChild);
/* Always geterate the RBN_CHILDSIZE even it child
did not change */
@ -1296,7 +1296,7 @@ REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus)
yPos = (lpBand->rcChild.bottom + lpBand->rcChild.top - nEditHeight)/2;
/* center combo box inside child area */
TRACE("moving child (Combo(Ex)) %04x to (%d,%d) for (%d,%d)\n",
TRACE("moving child (Combo(Ex)) %p to (%d,%d) for (%d,%d)\n",
lpBand->hwndChild,
lpBand->rcChild.left, yPos,
lpBand->rcChild.right - lpBand->rcChild.left,
@ -1311,7 +1311,7 @@ REBAR_MoveChildWindows (REBAR_INFO *infoPtr, UINT start, UINT endplus)
ERR("DeferWindowPos returned NULL\n");
}
else {
TRACE("moving child (Other) %04x to (%d,%d) for (%d,%d)\n",
TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n",
lpBand->hwndChild,
lpBand->rcChild.left, lpBand->rcChild.top,
lpBand->rcChild.right - lpBand->rcChild.left,
@ -2060,7 +2060,7 @@ REBAR_CommonSetupBand (HWND hwnd, LPREBARBANDINFOA lprbbi, REBAR_BAND *lpBand)
/* above in trace fro WinRAR */
}
else {
TRACE("child: 0x%x prev parent: 0x%x\n",
TRACE("child: %p prev parent: %p\n",
lpBand->hwndChild, lpBand->hwndPrevParent);
lpBand->hwndChild = 0;
lpBand->hwndPrevParent = 0;
@ -2922,7 +2922,7 @@ REBAR_GetToolTips (REBAR_INFO *infoPtr)
inline static LRESULT
REBAR_GetUnicodeFormat (REBAR_INFO *infoPtr)
{
TRACE("%s hwnd=0x%x\n",
TRACE("%s hwnd=%p\n",
infoPtr->bUnicode ? "TRUE" : "FALSE", infoPtr->hwndSelf);
return infoPtr->bUnicode;
@ -3553,7 +3553,7 @@ REBAR_SetUnicodeFormat (REBAR_INFO *infoPtr, WPARAM wParam)
{
BOOL bTemp = infoPtr->bUnicode;
TRACE("to %s hwnd=0x%04x, was %s\n",
TRACE("to %s hwnd=%p, was %s\n",
((BOOL)wParam) ? "TRUE" : "FALSE", infoPtr->hwndSelf,
(bTemp) ? "TRUE" : "FALSE");
@ -4249,7 +4249,7 @@ REBAR_WindowPosChanged (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED,
wParam, lParam);
GetWindowRect(infoPtr->hwndSelf, &rc);
TRACE("hwnd %08x new pos (%d,%d)-(%d,%d)\n",
TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n",
infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom);
return ret;
}
@ -4260,7 +4260,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
REBAR_INFO *infoPtr = REBAR_GetInfoPtr (hwnd);
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 (!infoPtr && (uMsg != WM_NCCREATE))
return DefWindowProcA (hwnd, uMsg, wParam, lParam);

2
dlls/comctl32/smoothscroll.c
View File

@ -106,7 +106,7 @@ BOOL WINAPI SmoothScrollWindow( SMOOTHSCROLLSTRUCT *smooth ) {
);
}
FIXME("(hwnd=%x,flags=%lx,x2=%lx): should smooth scroll here.\n",
FIXME("(hwnd=%p,flags=%lx,x2=%lx): should smooth scroll here.\n",
smooth->hwnd,flags,smooth->x2
);
/* FIXME: do timer based smooth scrolling */

4
dlls/comctl32/status.c
View File

@ -1005,7 +1005,7 @@ static LRESULT
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 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
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);

12
dlls/comctl32/tab.c
View File

@ -2386,7 +2386,7 @@ TAB_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
RECT rect;
GetClientRect (hwnd, &rect);
TRACE("Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
rect.top, rect.left, rect.bottom, rect.right);
pti = (TCITEMA *)lParam;
@ -2445,7 +2445,7 @@ TAB_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
else
InvalidateRect(hwnd, NULL, TRUE);
TRACE("[%04x]: added item %d %s\n",
TRACE("[%p]: added item %d %s\n",
hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
return iItem;
@ -2461,7 +2461,7 @@ TAB_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
RECT rect;
GetClientRect (hwnd, &rect);
TRACE("Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
TRACE("Rect: %p T %i, L %i, B %i, R %i\n", hwnd,
rect.top, rect.left, rect.bottom, rect.right);
pti = (TCITEMW *)lParam;
@ -2519,7 +2519,7 @@ TAB_InsertItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
else
InvalidateRect(hwnd, NULL, TRUE);
TRACE("[%04x]: added item %d %s\n",
TRACE("[%p]: added item %d %s\n",
hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
return iItem;
@ -2907,7 +2907,7 @@ TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
infoPtr->fSizeSet = FALSE;
infoPtr->bUnicode = IsWindowUnicode (hwnd);
TRACE("Created tab control, hwnd [%04x]\n", hwnd);
TRACE("Created tab control, hwnd [%p]\n", hwnd);
/* The tab control always has the WS_CLIPSIBLINGS style. Even
if you don't specify it in CreateWindow. This is necessary in
@ -3001,7 +3001,7 @@ static LRESULT WINAPI
TAB_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 (!TAB_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
return DefWindowProcA (hwnd, uMsg, wParam, lParam);

38
dlls/comctl32/toolbar.c
View File

@ -226,11 +226,11 @@ TOOLBAR_DumpToolbar(TOOLBAR_INFO *iP, INT line)
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 @@ static void
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 @@ TOOLBAR_SendNotify (NMHDR *nmhdr, TOOLBAR_INFO *infoPtr, UINT code)
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 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_ButtonStructSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_GetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
{
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 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLBAR_ReplaceBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLBAR_SetImageList (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_SetUnicodeFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLBAR_EraseBackground (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLBAR_SysColorChange (HWND hwnd)
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))

22
dlls/comctl32/tooltips.c
View File

@ -173,7 +173,7 @@ TOOLTIPS_GetTipText (HWND hwnd, TOOLTIPS_INFO *infoPtr, INT nTool)
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 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr)
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 @@ TOOLTIPS_Hide (HWND hwnd, TOOLTIPS_INFO *infoPtr)
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 @@ TOOLTIPS_AddToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLTIPS_AddToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLTIPS_RelayEvent (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLTIPS_NCHitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
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_Timer (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLTIPS_Timer (HWND hwnd, WPARAM wParam, LPARAM lParam)
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 @@ TOOLTIPS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_
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)

2
dlls/comctl32/trackbar.c
View File

@ -1546,7 +1546,7 @@ TRACKBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
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);

10
dlls/comctl32/treeview.c
View File

@ -540,7 +540,7 @@ TREEVIEW_SendCustomDrawNotify(TREEVIEW_INFO *infoPtr, DWORD dwDrawStage,
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 @@ TREEVIEW_SendCustomDrawItemNotify(TREEVIEW_INFO *infoPtr, HDC hdc,
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 @@ TREEVIEW_GetItemHeight(TREEVIEW_INFO *infoPtr)
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 @@ TREEVIEW_SetFont(TREEVIEW_INFO *infoPtr, HFONT hFont, BOOL bRedraw)
{
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 @@ TREEVIEW_Create(HWND hwnd)
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));

18
dlls/comctl32/updown.c
View File

@ -425,7 +425,7 @@ static LRESULT CALLBACK
UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
WNDPROC superClassWndProc = (WNDPROC)GetPropA(hwnd, BUDDY_SUPERCLASS_WNDPROC);
TRACE("hwnd=%04x, wndProc=%d, uMsg=%04x, wParam=%d, lParam=%d\n",
TRACE("hwnd=%p, wndProc=%d, uMsg=%04x, wParam=%d, lParam=%d\n",
hwnd, (INT)superClassWndProc, uMsg, wParam, (UINT)lParam);
if (uMsg == WM_KEYDOWN) {
@ -458,7 +458,7 @@ static BOOL UPDOWN_SetBuddy (UPDOWN_INFO* infoPtr, HWND bud)
/* Is it a valid bud? */
if(!IsWindow(bud)) return FALSE;
TRACE("(hwnd=%04x, bud=%04x)\n", infoPtr->Self, bud);
TRACE("(hwnd=%p, bud=%p)\n", infoPtr->Self, bud);
/* there is already a body assigned */
if (infoPtr->Buddy) RemovePropA(infoPtr->Buddy, BUDDY_UPDOWN_HWND);
@ -732,7 +732,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
if (dwStyle & UDS_AUTOBUDDY)
UPDOWN_SetBuddy (infoPtr, GetWindow (hwnd, GW_HWNDPREV));
TRACE("UpDown Ctrl creation, hwnd=%04x\n", hwnd);
TRACE("UpDown Ctrl creation, hwnd=%p\n", hwnd);
break;
case WM_DESTROY:
@ -742,7 +742,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
COMCTL32_Free (infoPtr);
SetWindowLongW (hwnd, 0, 0);
TRACE("UpDown Ctrl destruction, hwnd=%04x\n", hwnd);
TRACE("UpDown Ctrl destruction, hwnd=%p\n", hwnd);
break;
case WM_ENABLE:
@ -830,7 +830,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
return 0;
case UDM_SETACCEL:
TRACE("UpDown Ctrl new accel info, hwnd=%04x\n", hwnd);
TRACE("UpDown Ctrl new accel info, hwnd=%p\n", hwnd);
if(infoPtr->AccelVect) {
COMCTL32_Free (infoPtr->AccelVect);
infoPtr->AccelCount = 0;
@ -846,7 +846,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
return infoPtr->Base;
case UDM_SETBASE:
TRACE("UpDown Ctrl new base(%d), hwnd=%04x\n", wParam, hwnd);
TRACE("UpDown Ctrl new base(%d), hwnd=%p\n", wParam, hwnd);
if (wParam==10 || wParam==16) {
temp = infoPtr->Base;
infoPtr->Base = wParam;
@ -868,7 +868,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
case UDM_SETPOS:
temp = SLOWORD(lParam);
TRACE("UpDown Ctrl new value(%d), hwnd=%04x\n", temp, hwnd);
TRACE("UpDown Ctrl new value(%d), hwnd=%p\n", temp, hwnd);
if(!UPDOWN_InBounds(infoPtr, temp)) {
if(temp < infoPtr->MinVal) temp = infoPtr->MinVal;
if(temp > infoPtr->MaxVal) temp = infoPtr->MaxVal;
@ -886,7 +886,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
infoPtr->MaxVal = SLOWORD(lParam); /* UD_MINVAL <= Max <= UD_MAXVAL */
infoPtr->MinVal = SHIWORD(lParam); /* UD_MINVAL <= Min <= UD_MAXVAL */
/* |Max-Min| <= UD_MAXVAL */
TRACE("UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n",
infoPtr->MinVal, infoPtr->MaxVal, hwnd);
break;
@ -900,7 +900,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam,
infoPtr->MaxVal = (INT)lParam;
if (infoPtr->MaxVal <= infoPtr->MinVal)
infoPtr->MaxVal = infoPtr->MinVal + 1;
TRACE("UpDown Ctrl new range(%d to %d), hwnd=%04x\n",
TRACE("UpDown Ctrl new range(%d to %d), hwnd=%p\n",
infoPtr->MinVal, infoPtr->MaxVal, hwnd);
break;