Made user compile with -DSTRICT.
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index d03aa36..95fdd79 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in
@@ -1,4 +1,4 @@ -EXTRADEFS = -D_USER32_ -D_WINABLE_ -DWINE_NO_STRICT +EXTRADEFS = -D_USER32_ -D_WINABLE_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@
diff --git a/dlls/user/caret.c b/dlls/user/caret.c index 0d14194..f16de2b 100644 --- a/dlls/user/caret.c +++ b/dlls/user/caret.c
@@ -112,7 +112,7 @@ HBITMAP hBmp = 0; HWND prev = 0; - TRACE("hwnd=%04x\n", hwnd); + TRACE("hwnd=%p\n", hwnd); if (!hwnd) return FALSE;
diff --git a/dlls/user/comm16.c b/dlls/user/comm16.c index c789c3a..2548207 100644 --- a/dlls/user/comm16.c +++ b/dlls/user/comm16.c
@@ -317,7 +317,7 @@ /* send notifications, if any */ if (ptr->wnd && mask) { - TRACE("notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); + TRACE("notifying %p: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); PostMessageA(ptr->wnd, WM_COMMNOTIFY, cid, mask); } @@ -395,7 +395,7 @@ /* send notifications, if any */ if (ptr->wnd && mask) { - TRACE("notifying %04x: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); + TRACE("notifying %p: cid=%d, mask=%02x\n", ptr->wnd, cid, mask); PostMessageA(ptr->wnd, WM_COMMNOTIFY, cid, mask); }
diff --git a/dlls/user/dde/client.c b/dlls/user/dde/client.c index 3eda3cf..7c7227c 100644 --- a/dlls/user/dde/client.c +++ b/dlls/user/dde/client.c
@@ -60,7 +60,7 @@ HCONVLIST WINAPI DdeConnectList(DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, LPCONVCONTEXT pCC) { - FIXME("(%ld,%d,%d,%d,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); + FIXME("(%ld,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); return (HCONVLIST)1; } @@ -69,7 +69,7 @@ */ HCONV WINAPI DdeQueryNextServer(HCONVLIST hConvList, HCONV hConvPrev) { - FIXME("(%d,%d): stub\n", hConvList, hConvPrev); + FIXME("(%p,%p): stub\n", hConvList, hConvPrev); return 0; } @@ -86,7 +86,7 @@ */ BOOL WINAPI DdeDisconnectList(HCONVLIST hConvList) { - FIXME("(%d): stub\n", hConvList); + FIXME("(%p): stub\n", hConvList); return TRUE; } @@ -101,7 +101,7 @@ WDML_CONV* pConv = NULL; ATOM aSrv = 0, aTpc = 0; - TRACE("(0x%lx,0x%x,0x%x,%p)\n", idInst, hszService, hszTopic, pCC); + TRACE("(0x%lx,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); EnterCriticalSection(&WDML_CritSect); @@ -201,7 +201,7 @@ pConv = NULL; goto theEnd; } - TRACE("Connected to Server window (%x)\n", pConv->hwndServer); + TRACE("Connected to Server window (%p)\n", pConv->hwndServer); pConv->wConvst = XST_CONNECTED; /* finish init of pConv */ @@ -1087,8 +1087,8 @@ WDML_XACT* pXAct; HDDEDATA hDdeData = 0; - TRACE("(%p,%ld,0x%lx,0x%x,%d,%d,%ld,%p)\n", - pData, cbData, (DWORD)hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); + TRACE("(%p,%ld,%p,%p,%d,%d,%ld,%p)\n", + pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); if (hConv == 0) { @@ -1162,7 +1162,7 @@ if (!PostMessageA(pConv->hwndServer, pXAct->ddeMsg, (WPARAM)pConv->hwndClient, pXAct->lParam)) { - TRACE("Failed posting message %d to 0x%04x (error=0x%lx)\n", + TRACE("Failed posting message %d to %p (error=0x%lx)\n", pXAct->ddeMsg, pConv->hwndServer, GetLastError()); pConv->wStatus &= ~ST_CONNECTED; WDML_UnQueueTransaction(pConv, pXAct);
diff --git a/dlls/user/dde/misc.c b/dlls/user/dde/misc.c index 5bb75b2..756dd4e 100644 --- a/dlls/user/dde/misc.c +++ b/dlls/user/dde/misc.c
@@ -82,7 +82,7 @@ } if (!(params = GlobalLock(hMem))) { - ERR("GlobalLock failed (%x)\n", hMem); + ERR("GlobalLock failed (%p)\n", hMem); return 0; } params[0] = uiLo; @@ -224,7 +224,7 @@ */ BOOL WINAPI ImpersonateDdeClientWindow(HWND hWndClient, HWND hWndServer) { - FIXME("(%04x %04x): stub\n", hWndClient, hWndServer); + FIXME("(%p %p): stub\n", hWndClient, hWndServer); return FALSE; } @@ -235,7 +235,7 @@ BOOL WINAPI DdeSetQualityOfService(HWND hwndClient, CONST SECURITY_QUALITY_OF_SERVICE *pqosNew, PSECURITY_QUALITY_OF_SERVICE pqosPrev) { - FIXME("(%04x %p %p): stub\n", hwndClient, pqosNew, pqosPrev); + FIXME("(%p %p %p): stub\n", hwndClient, pqosNew, pqosPrev); return TRUE; } @@ -716,9 +716,9 @@ if (pInstance == NULL) return (HDDEDATA)0; - TRACE("invoking CB%d[%08lx] (%u %u %08lx 0x%x 0x%x %u %lu %lu)\n", - pInstance->win16 ? 16 : 32, (DWORD)pInstance->callback, uType, uFmt, - (DWORD)hConv, hsz1, hsz2, hdata, dwData1, dwData2); + TRACE("invoking CB%d[%p] (%u %u %p %p %p %p %lu %lu)\n", + pInstance->win16 ? 16 : 32, pInstance->callback, uType, uFmt, + hConv, hsz1, hsz2, hdata, dwData1, dwData2); if (pInstance->win16) { ret = WDML_InvokeCallback16(pInstance->callback, uType, uFmt, hConv, @@ -826,7 +826,7 @@ { if (pNode->hsz == hsz) break; } - if (!pNode) WARN("HSZ 0x%x not found\n", hsz); + if (!pNode) WARN("HSZ %p not found\n", hsz); return pNode; } @@ -842,7 +842,7 @@ if (GetAtomNameW(HSZ2ATOM(hsz), nameBuffer, MAX_BUFFER_LEN)) return GlobalAddAtomW(nameBuffer); - WARN("HSZ 0x%x not found\n", hsz); + WARN("HSZ %p not found\n", hsz); return 0; } @@ -919,7 +919,7 @@ return TRUE; } } - WARN("HSZ 0x%x not found\n", hsz); + WARN("HSZ %p not found\n", hsz); return FALSE; } @@ -1008,7 +1008,7 @@ DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld, 0x%x, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); EnterCriticalSection(&WDML_CritSect); @@ -1035,7 +1035,7 @@ DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld, 0x%x, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); EnterCriticalSection(&WDML_CritSect); @@ -1066,11 +1066,11 @@ { case CP_WINANSI: hsz = ATOM2HSZ(AddAtomA(ptr)); - TRACE("added atom %s with HSZ 0x%x, \n", debugstr_a(ptr), hsz); + TRACE("added atom %s with HSZ %p, \n", debugstr_a(ptr), hsz); break; case CP_WINUNICODE: hsz = ATOM2HSZ(AddAtomW(ptr)); - TRACE("added atom %s with HSZ 0x%x, \n", debugstr_w(ptr), hsz); + TRACE("added atom %s with HSZ %p, \n", debugstr_w(ptr), hsz); break; default: ERR("Unknown code page %d\n", codepage); @@ -1149,7 +1149,7 @@ WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,0x%x): \n", idInst, hsz); + TRACE("(%ld,%p): \n", idInst, hsz); EnterCriticalSection(&WDML_CritSect); @@ -1175,7 +1175,7 @@ WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,0x%x): \n", idInst, hsz); + TRACE("(%ld,%p): \n", idInst, hsz); EnterCriticalSection(&WDML_CritSect); @@ -1210,7 +1210,7 @@ ret1 = GetAtomNameW(HSZ2ATOM(hsz1), psz1, MAX_BUFFER_LEN); ret2 = GetAtomNameW(HSZ2ATOM(hsz2), psz2, MAX_BUFFER_LEN); - TRACE("(%x<%s> %x<%s>);\n", hsz1, debugstr_w(psz1), hsz2, debugstr_w(psz2)); + TRACE("(%p<%s> %p<%s>);\n", hsz1, debugstr_w(psz1), hsz2, debugstr_w(psz2)); /* Make sure we found both strings. */ if (ret1 == 0 && ret2 == 0) @@ -1397,7 +1397,7 @@ pDdh = (DDE_DATAHANDLE_HEAD*)GlobalLock(hMem); if (pDdh == NULL) { - ERR("Failed on GlobalLock(%04x)\n", hMem); + ERR("Failed on GlobalLock(%p)\n", hMem); return 0; } @@ -1826,7 +1826,7 @@ */ BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) { - FIXME("(%ld, 0x%x, %d) stub\n", idInst, hConv, wCmd); + FIXME("(%ld, %p, %d) stub\n", idInst, hConv, wCmd); return 0; }
diff --git a/dlls/user/dde/server.c b/dlls/user/dde/server.c index 33dee61..3809e73 100644 --- a/dlls/user/dde/server.c +++ b/dlls/user/dde/server.c
@@ -67,7 +67,7 @@ ATOM atom = 0; UINT count; - TRACE("(%ld,0x%x,0x%x)\n", idInst, hszTopic, hszItem); + TRACE("(%ld,%p,%p)\n", idInst, hszTopic, hszItem); EnterCriticalSection(&WDML_CritSect); @@ -176,7 +176,7 @@ hDdeData = (HDDEDATA)NULL; - TRACE("(%ld,0x%x,0x%x,%d)\n", idInst, hsz1, hsz2, afCmd); + TRACE("(%ld,%p,%p,%d)\n", idInst, hsz1, hsz2, afCmd); EnterCriticalSection(&WDML_CritSect); @@ -251,7 +251,7 @@ SetWindowLongA(hwndServer, GWL_WDML_INSTANCE, (DWORD)pInstance); SetWindowLongA(hwndServer, GWL_WDML_SERVER, (DWORD)pServer); - TRACE("Created nameServer=%04x for instance=%08lx\n", hwndServer, idInst); + TRACE("Created nameServer=%p for instance=%08lx\n", hwndServer, idInst); pServer->hwndServer = hwndServer; break; @@ -356,7 +356,7 @@ hwndServerName, 0, 0, 0); } - TRACE("Created convServer=%04x (nameServer=%04x) for instance=%08lx\n", + TRACE("Created convServer=%p (nameServer=%p) for instance=%08lx\n", hwndServerConv, hwndServerName, pInstance->instanceID); pConv = WDML_AddConv(pInstance, WDML_SERVER_SIDE, hszApp, hszTopic,
diff --git a/dlls/user/focus.c b/dlls/user/focus.c index 7a18f12..46e446b 100644 --- a/dlls/user/focus.c +++ b/dlls/user/focus.c
@@ -218,7 +218,7 @@ { HWND prev; - TRACE( "%x\n", hwnd ); + TRACE( "%p\n", hwnd ); if (hwnd) { @@ -243,7 +243,7 @@ HWND hwndTop = hwnd; HWND previous = GetFocus(); - TRACE( "%x prev %x\n", hwnd, previous ); + TRACE( "%p prev %p\n", hwnd, previous ); if (hwnd) { @@ -286,7 +286,7 @@ */ BOOL WINAPI SetForegroundWindow( HWND hwnd ) { - TRACE( "%x\n", hwnd ); + TRACE( "%p\n", hwnd ); if (hwnd) hwnd = WIN_GetFullHandle( hwnd ); return set_foreground_window( hwnd, FALSE ); }
diff --git a/dlls/user/hook.c b/dlls/user/hook.c index 43b7022..6ca4460 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c
@@ -145,7 +145,7 @@ } SERVER_END_REQ; - TRACE( "%s %p %lx -> %x\n", hook_names[id-WH_MINHOOK], proc, tid, handle ); + TRACE( "%s %p %lx -> %p\n", hook_names[id-WH_MINHOOK], proc, tid, handle ); return handle; } @@ -380,7 +380,7 @@ { BOOL ret; - TRACE( "%x\n", hhook ); + TRACE( "%p\n", hhook ); SERVER_START_REQ( remove_hook ) { @@ -481,7 +481,7 @@ WINEVENTPROC pfnProc, DWORD dwProcess, DWORD dwThread, DWORD dwFlags) { - FIXME("(%ld,%ld,0x%08x,%p,%ld,%ld,0x%08lx)-stub!\n", dwMin, dwMax, hModule, + FIXME("(%ld,%ld,%p,%p,%ld,%ld,0x%08lx)-stub!\n", dwMin, dwMax, hModule, pfnProc, dwProcess, dwThread, dwFlags); return 0; } @@ -504,7 +504,7 @@ */ BOOL WINAPI UnhookWinEvent(HWINEVENTHOOK hEventHook) { - FIXME("(%x)-stub!\n", hEventHook); + FIXME("(%p)-stub!\n", hEventHook); return (hEventHook != 0); } @@ -529,7 +529,7 @@ */ void WINAPI NotifyWinEvent(DWORD dwEvent, HWND hWnd, LONG nId, LONG nChildId) { - FIXME("(%ld,0x%08x,%ld,%ld)-stub!\n", dwEvent, hWnd, nId, nChildId); + FIXME("(%ld,%p,%ld,%ld)-stub!\n", dwEvent, hWnd, nId, nChildId); }
diff --git a/dlls/user/message.c b/dlls/user/message.c index 9232eaa..4ec5e00 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c
@@ -1445,7 +1445,7 @@ if (res) return FALSE; - TRACE( "got type %d msg %x hwnd %x wp %x lp %lx\n", + TRACE( "got type %d msg %x hwnd %p wp %x lp %lx\n", info.type, info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam ); switch(info.type) @@ -1465,7 +1465,7 @@ if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, &info.msg.lParam, &buffer, size )) { - ERR( "invalid packed message %x (%s) hwnd %x wp %x lp %lx size %d\n", + 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 */ @@ -1494,7 +1494,7 @@ 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 %x wp %x lp %lx size %d\n", + 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 ); /* ignore it */ @@ -1662,7 +1662,7 @@ if (reply_data) HeapFree( GetProcessHeap(), 0, reply_data ); - TRACE( "hwnd %x msg %x (%s) wp %x lp %lx got reply %lx (err=%ld)\n", + TRACE( "hwnd %p msg %x (%s) wp %x lp %lx got reply %lx (err=%ld)\n", info->hwnd, info->msg, SPY_GetMsgName(info->msg, info->hwnd), info->wparam, info->lparam, *result, status ); @@ -1683,7 +1683,7 @@ int locks; size_t reply_size = 0; - TRACE( "hwnd %x msg %x (%s) wp %x lp %lx\n", + TRACE( "hwnd %p msg %x (%s) wp %x lp %lx\n", info->hwnd, info->msg, SPY_GetMsgName(info->msg, info->hwnd), info->wparam, info->lparam ); if (!put_message_in_queue( dest_tid, info, &reply_size )) return 0;
diff --git a/dlls/user/misc.c b/dlls/user/misc.c index 7c64997..125066f 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c
@@ -178,7 +178,7 @@ BOOL WINAPI SetUserObjectInformationA( HANDLE hObj, INT nIndex, LPVOID pvInfo, DWORD nLength ) { - FIXME("(%x,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength); + FIXME("(%p,%d,%p,%lx): stub\n",hObj,nIndex,pvInfo,nLength); return TRUE; } @@ -187,7 +187,7 @@ */ BOOL WINAPI SetThreadDesktop( HANDLE hDesktop ) { - FIXME("(%x): stub\n",hDesktop); + FIXME("(%p): stub\n",hDesktop); return TRUE; }
diff --git a/dlls/user/msg16.c b/dlls/user/msg16.c index 243b23d..3d14a75 100644 --- a/dlls/user/msg16.c +++ b/dlls/user/msg16.c
@@ -207,7 +207,7 @@ &msg16->msg.message, &msg16->msg.wParam, &msg16->msg.lParam ) == -1); - TRACE( "message %04x, hwnd %04x, filter(%04x - %04x)\n", + TRACE( "message %04x, hwnd %p, filter(%04x - %04x)\n", msg16->msg.message, hwnd, first, last ); return msg16->msg.message != WM_QUIT; @@ -282,7 +282,7 @@ if (wndPtr == WND_OTHER_PROCESS) { if (IsWindow( hwnd )) - ERR( "cannot dispatch msg to other process window %x\n", hwnd ); + ERR( "cannot dispatch msg to other process window %p\n", hwnd ); SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } @@ -307,7 +307,7 @@ WIN_ReleasePtr( wndPtr ); if (validate) { - ERR( "BeginPaint not called on WM_PAINT for hwnd %x!\n", hwnd ); + ERR( "BeginPaint not called on WM_PAINT for hwnd %p!\n", hwnd ); /* Validate the update region to avoid infinite WM_PAINT loop */ RedrawWindow( hwnd, NULL, 0, RDW_NOFRAME | RDW_VALIDATE | RDW_NOCHILDREN | RDW_NOINTERNALPAINT );
diff --git a/dlls/user/painting.c b/dlls/user/painting.c index 04e06fa..b39fd19 100644 --- a/dlls/user/painting.c +++ b/dlls/user/painting.c
@@ -118,7 +118,7 @@ if (!wnd || wnd == WND_OTHER_PROCESS) return 0; - TRACE("hwnd %04x [%04x] ncf %i\n", + TRACE("hwnd %p [%p] ncf %i\n", hwnd, wnd->hrgnUpdate, wnd->flags & WIN_NEEDS_NCPAINT); get_update_regions( wnd, &whole_rgn, &client_rgn ); @@ -162,7 +162,7 @@ if (!(full_handle = WIN_IsCurrentThread( hwnd ))) { if (IsWindow(hwnd)) - FIXME( "window %x belongs to other thread\n", hwnd ); + FIXME( "window %p belongs to other thread\n", hwnd ); return 0; } hwnd = full_handle; @@ -202,7 +202,7 @@ if (!lps->hdc) { - WARN("GetDCEx() failed in BeginPaint(), hwnd=%04x\n", hwnd); + WARN("GetDCEx() failed in BeginPaint(), hwnd=%p\n", hwnd); DeleteObject( hrgnUpdate ); return 0; } @@ -219,7 +219,7 @@ IntersectRect(&lps->rcPaint, &clientRect, &clipRect); DPtoLP(lps->hdc, (LPPOINT)&lps->rcPaint, 2); /* we must return LP */ - TRACE("hdc = %x box = (%i,%i - %i,%i)\n", + TRACE("hdc = %p box = (%i,%i - %i,%i)\n", lps->hdc, lps->rcPaint.left, lps->rcPaint.top, lps->rcPaint.right, lps->rcPaint.bottom ); if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0;
diff --git a/dlls/user/resource.c b/dlls/user/resource.c index 990ca9a..2600339 100644 --- a/dlls/user/resource.c +++ b/dlls/user/resource.c
@@ -105,7 +105,7 @@ accel16[i-1].fVirt |= 0x80; } } - TRACE_(accel)("returning HACCEL 0x%x\n", hRsrc); + TRACE_(accel)("returning HACCEL %p\n", hRsrc); return HACCEL_32(hRetval); } @@ -218,7 +218,7 @@ /* Allocate memory and copy the table. */ hAccel = HACCEL_32(GlobalAlloc16(0,cEntries*sizeof(ACCEL16))); - TRACE_(accel)("handle %x\n", hAccel); + TRACE_(accel)("handle %p\n", hAccel); if(!hAccel) { ERR_(accel)("Out of memory.\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -233,7 +233,7 @@ /* Set the end-of-table terminator. */ accel[cEntries-1].fVirt |= 0x80; - TRACE_(accel)("Allocated accelerator handle %x\n", hAccel); + TRACE_(accel)("Allocated accelerator handle %p\n", hAccel); return hAccel; } @@ -264,7 +264,7 @@ /* Allocate memory and copy the table. */ hAccel = HACCEL_32(GlobalAlloc16(0,cEntries*sizeof(ACCEL16))); - TRACE_(accel)("handle %x\n", hAccel); + TRACE_(accel)("handle %p\n", hAccel); if(!hAccel) { ERR_(accel)("Out of memory.\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -288,7 +288,7 @@ /* Set the end-of-table terminator. */ accel[cEntries-1].fVirt |= 0x80; - TRACE_(accel)("Allocated accelerator handle %x\n", hAccel); + TRACE_(accel)("Allocated accelerator handle %p\n", hAccel); return hAccel; } @@ -368,7 +368,7 @@ if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */ resource_id = (UINT)(-((INT)resource_id)); - TRACE("instance = %04x, id = %04x, buffer = %08x, length = %d\n", + TRACE("instance = %p, id = %04x, buffer = %08x, length = %d\n", instance, (int)resource_id, (int) buffer, buflen); /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out @@ -414,7 +414,7 @@ INT retval; LPWSTR wbuf; - TRACE("instance = %04x, id = %04x, buffer = %08x, length = %d\n", + TRACE("instance = %p, id = %04x, buffer = %08x, length = %d\n", instance, (int)resource_id, (int) buffer, buflen); if(buffer == NULL) /* asked size of string */
diff --git a/dlls/user/text.c b/dlls/user/text.c index 4ceafa9..66b759a 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c
@@ -1286,7 +1286,7 @@ LONG WINAPI TabbedTextOutW( HDC hdc, INT x, INT y, LPCWSTR str, INT count, INT cTabStops, const INT *lpTabPos, INT nTabOrg ) { - TRACE("%x %d,%d %s %d\n", hdc, x, y, debugstr_wn(str,count), count ); + TRACE("%p %d,%d %s %d\n", hdc, x, y, debugstr_wn(str,count), count ); return TEXT_TabbedTextOut( hdc, x, y, str, count, cTabStops, lpTabPos, nTabOrg, TRUE ); } @@ -1314,6 +1314,6 @@ DWORD WINAPI GetTabbedTextExtentW( HDC hdc, LPCWSTR lpstr, INT count, INT cTabStops, const INT *lpTabPos ) { - TRACE("%x %s %d\n", hdc, debugstr_wn(lpstr,count), count ); + TRACE("%p %s %d\n", hdc, debugstr_wn(lpstr,count), count ); return TEXT_TabbedTextOut( hdc, 0, 0, lpstr, count, cTabStops, lpTabPos, 0, FALSE ); }