From 3c60ce85250eed89efa3151dcaa077ee49774827 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Sat, 30 Sep 2006 00:25:15 +0200 Subject: [PATCH] user: Win64 printf format warning fixes. --- dlls/user/Makefile.in | 2 +- dlls/user/bidi16.c | 2 +- dlls/user/class.c | 6 +++--- dlls/user/clipboard.c | 2 +- dlls/user/combo.c | 8 ++++---- dlls/user/comm16.c | 8 ++++---- dlls/user/cursoricon.c | 8 ++++---- dlls/user/dde_client.c | 12 ++++++------ dlls/user/dde_misc.c | 40 ++++++++++++++++++++-------------------- dlls/user/dde_server.c | 10 +++++----- dlls/user/defwnd.c | 2 +- dlls/user/dialog.c | 8 ++++---- dlls/user/dialog16.c | 6 +++--- dlls/user/driver.c | 2 +- dlls/user/driver16.c | 6 +++--- dlls/user/edit.c | 2 +- dlls/user/exticon.c | 12 ++++++------ dlls/user/hook.c | 22 +++++++++++----------- dlls/user/input.c | 14 +++++++------- dlls/user/listbox.c | 6 +++--- dlls/user/mdi.c | 10 +++++----- dlls/user/menu.c | 6 +++--- dlls/user/message.c | 24 ++++++++++++------------ dlls/user/misc.c | 28 ++++++++++++++-------------- dlls/user/nonclient.c | 12 ++++++------ dlls/user/painting.c | 2 +- dlls/user/resource.c | 2 +- dlls/user/scroll.c | 4 ++-- dlls/user/spy.c | 22 +++++++++++----------- dlls/user/static.c | 2 +- dlls/user/sysparams.c | 2 +- dlls/user/uitools.c | 2 +- dlls/user/user16.c | 4 ++-- dlls/user/win.c | 14 +++++++------- dlls/user/winhelp.c | 2 +- dlls/user/winpos.c | 6 +++--- dlls/user/winproc.c | 8 ++++---- dlls/user/winstation.c | 4 ++-- 38 files changed, 166 insertions(+), 166 deletions(-) diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index ddf3edb1122..a8208db17c3 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_USER32_ -D_WINABLE_ -DWINE_NO_LONG_AS_INT +EXTRADEFS = -D_USER32_ -D_WINABLE_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/user/bidi16.c b/dlls/user/bidi16.c index 25c78f518c2..e415785a0de 100644 --- a/dlls/user/bidi16.c +++ b/dlls/user/bidi16.c @@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id, */ BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout ) { - FIXME( "( %08lx ): No BiDi16\n", dwDefaultLayout ); + FIXME( "( %08x ): No BiDi16\n", dwDefaultLayout ); return SetProcessDefaultLayout( dwDefaultLayout ); } diff --git a/dlls/user/class.c b/dlls/user/class.c index 2506737942d..b158ece682f 100644 --- a/dlls/user/class.c +++ b/dlls/user/class.c @@ -304,7 +304,7 @@ static CLASS *CLASS_RegisterClass( ATOM atom, HINSTANCE hInstance, BOOL local, CLASS *classPtr; BOOL ret; - TRACE("atom=0x%x hinst=%p style=0x%lx clExtr=0x%x winExtr=0x%x\n", + TRACE("atom=0x%x hinst=%p style=0x%x clExtr=0x%x winExtr=0x%x\n", atom, hInstance, style, classExtra, winExtra ); /* Fix the extra bytes value */ @@ -934,7 +934,7 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, */ DWORD WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) { - TRACE("%p %d %lx\n", hwnd, offset, newval); + TRACE("%p %d %x\n", hwnd, offset, newval); return CLASS_SetClassLong( hwnd, offset, newval, sizeof(LONG), TRUE ); } @@ -945,7 +945,7 @@ DWORD WINAPI SetClassLongW( HWND hwnd, INT offset, LONG newval ) */ DWORD WINAPI SetClassLongA( HWND hwnd, INT offset, LONG newval ) { - TRACE("%p %d %lx\n", hwnd, offset, newval); + TRACE("%p %d %x\n", hwnd, offset, newval); return CLASS_SetClassLong( hwnd, offset, newval, sizeof(LONG), FALSE ); } diff --git a/dlls/user/clipboard.c b/dlls/user/clipboard.c index cc8c6dc3002..7076ef25801 100644 --- a/dlls/user/clipboard.c +++ b/dlls/user/clipboard.c @@ -672,6 +672,6 @@ DWORD WINAPI GetClipboardSequenceNumber(VOID) } SERVER_END_REQ; - TRACE("returning %lx\n", seqno); + TRACE("returning %x\n", seqno); return seqno; } diff --git a/dlls/user/combo.c b/dlls/user/combo.c index 27c2923d51f..a82cd5fd647 100644 --- a/dlls/user/combo.c +++ b/dlls/user/combo.c @@ -439,13 +439,13 @@ static void CBCalcPlacement( if (lprEdit->right < lprEdit->left) lprEdit->right = lprEdit->left; - TRACE("\ttext\t= (%ld,%ld-%ld,%ld)\n", + TRACE("\ttext\t= (%d,%d-%d,%d)\n", lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); - TRACE("\tbutton\t= (%ld,%ld-%ld,%ld)\n", + TRACE("\tbutton\t= (%d,%d-%d,%d)\n", lprButton->left, lprButton->top, lprButton->right, lprButton->bottom); - TRACE("\tlbox\t= (%ld,%ld-%ld,%ld)\n", + TRACE("\tlbox\t= (%d,%d-%d,%d)\n", lprLB->left, lprLB->top, lprLB->right, lprLB->bottom ); } @@ -496,7 +496,7 @@ static LRESULT COMBO_WindowPosChanging( */ if (posChanging->cy != newComboHeight) { - TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%ld, oldtop=%ld\n", + TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", posChanging->cy, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; diff --git a/dlls/user/comm16.c b/dlls/user/comm16.c index d4a58dfab0c..9329c82e7ae 100644 --- a/dlls/user/comm16.c +++ b/dlls/user/comm16.c @@ -199,11 +199,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE /* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async read failed, error %ld\n",dwErrorCode); + ERR("async read failed, error %d\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async read completed %ld bytes\n",len); + TRACE("async read completed %d bytes\n",len); prev = comm_inbuf(ptr); @@ -279,11 +279,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP /* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async write failed, error %ld\n",dwErrorCode); + ERR("async write failed, error %d\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async write completed %ld bytes\n",len); + TRACE("async write completed %d bytes\n",len); /* update the buffer pointers */ prev = comm_outbuf(&COM[cid]); diff --git a/dlls/user/cursoricon.c b/dlls/user/cursoricon.c index 3e4df18cb58..1a43ebd72fc 100644 --- a/dlls/user/cursoricon.c +++ b/dlls/user/cursoricon.c @@ -345,7 +345,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = v5hdr->bV5Compression; return 5; } - ERR("(%ld): unknown/wrong size for header\n", header->biSize ); + ERR("(%d): unknown/wrong size for header\n", header->biSize ); return -1; } @@ -1134,7 +1134,7 @@ static HICON CURSORICON_ExtCopy(HICON hIcon, UINT nType, dwBytesInRes = pDirEntry->dwBytesInRes; FreeResource(hMem); - TRACE_(icon)("ResID %u, BytesInRes %lu, Width %d, Height %d DX %d, DY %d\n", + TRACE_(icon)("ResID %u, BytesInRes %u, Width %d, Height %d DX %d, DY %d\n", wResId, dwBytesInRes, pDirEntry->ResInfo.icon.bWidth, pDirEntry->ResInfo.icon.bHeight, iDesiredCX, iDesiredCY); @@ -1583,7 +1583,7 @@ BOOL WINAPI GetClipCursor( RECT *rect ) */ BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id) { - FIXME("(%p,%08lx),stub!\n", hcur, id); + FIXME("(%p,%08x),stub!\n", hcur, id); return TRUE; } @@ -1671,7 +1671,7 @@ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) return (WORD)LookupIconIdFromDirectoryEx16( lpDir, TRUE, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0 ); default: - WARN_(cursor)("invalid res type %ld\n", resType ); + WARN_(cursor)("invalid res type %d\n", resType ); } return 0; } diff --git a/dlls/user/dde_client.c b/dlls/user/dde_client.c index 14d182f797d..f2e4a3d3e9c 100644 --- a/dlls/user/dde_client.c +++ b/dlls/user/dde_client.c @@ -60,7 +60,7 @@ const WCHAR WDML_szClientConvClassW[] = {'W','i','n','e','D','d','e','C','l','i' HCONVLIST WINAPI DdeConnectList(DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, PCONVCONTEXT pCC) { - FIXME("(%ld,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); + FIXME("(%d,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); return (HCONVLIST)1; } @@ -101,7 +101,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, WDML_CONV* pConv = NULL; ATOM aSrv = 0, aTpc = 0; - TRACE("(0x%lx,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); + TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); EnterCriticalSection(&WDML_CritSect); @@ -1019,7 +1019,7 @@ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, WDML DWORD err; WDML_CONV* pConv; - TRACE("Starting wait for a timeout of %ld ms\n", dwTimeout); + TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); /* FIXME: time 32 bit wrap around */ dwTimeout += GetCurrentTime(); @@ -1113,7 +1113,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS WDML_XACT* pXAct; HDDEDATA hDdeData = 0; - TRACE("(%p,%ld,%p,%p,%x,%x,%ld,%p)\n", + TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n", pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); if (hConv == 0) @@ -1184,7 +1184,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS if (!PostMessageW(pConv->hwndServer, pXAct->ddeMsg, (WPARAM)pConv->hwndClient, pXAct->lParam)) { - WARN("Failed posting message %x to %p (error=0x%lx)\n", + WARN("Failed posting message %x to %p (error=0x%x)\n", pXAct->ddeMsg, pConv->hwndServer, GetLastError()); pConv->wStatus &= ~ST_CONNECTED; WDML_UnQueueTransaction(pConv, pXAct); @@ -1230,7 +1230,7 @@ BOOL WINAPI DdeAbandonTransaction(DWORD idInst, HCONV hConv, DWORD idTransaction WDML_CONV* pConv; WDML_XACT* pXAct; - TRACE("(%08lx,%p,%08lx);\n", idInst, hConv, idTransaction); + TRACE("(%08x,%p,%08x);\n", idInst, hConv, idTransaction); EnterCriticalSection(&WDML_CritSect); if ((pInstance = WDML_GetInstance(idInst))) diff --git a/dlls/user/dde_misc.c b/dlls/user/dde_misc.c index 57721c26b08..506f2dfd5a1 100644 --- a/dlls/user/dde_misc.c +++ b/dlls/user/dde_misc.c @@ -264,7 +264,7 @@ static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance) DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); pInstance->instanceID = id; - TRACE("New instance id %ld allocated\n", id); + TRACE("New instance id %d allocated\n", id); } /****************************************************************** @@ -348,7 +348,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, UINT ret; WNDCLASSEXW wndclass; - TRACE("(%p,%p,0x%lx,%ld)\n", + TRACE("(%p,%p,0x%x,%d)\n", pidInst, pfnCallback, afCmd, ulRes); if (ulRes) @@ -402,7 +402,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, if (*pidInst == 0) { /* Initialisation of new Instance Identifier */ - TRACE("new instance, callback %p flags %lX\n",pfnCallback,afCmd); + TRACE("new instance, callback %p flags %X\n",pfnCallback,afCmd); EnterCriticalSection(&WDML_CritSect); @@ -505,7 +505,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, else { /* Reinitialisation situation --- FIX */ - TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, afCmd, ulRes); + TRACE("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); EnterCriticalSection(&WDML_CritSect); @@ -630,7 +630,7 @@ BOOL WINAPI DdeUninitialize(DWORD idInst) WDML_CONV* pConv; WDML_CONV* pConvNext; - TRACE("(%ld)\n", idInst); + TRACE("(%d)\n", idInst); EnterCriticalSection(&WDML_CritSect); @@ -1016,7 +1016,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); EnterCriticalSection(&WDML_CritSect); @@ -1030,7 +1030,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT } LeaveCriticalSection(&WDML_CritSect); - TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); + TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -1043,7 +1043,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); EnterCriticalSection(&WDML_CritSect); @@ -1057,7 +1057,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN } LeaveCriticalSection(&WDML_CritSect); - TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); + TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); return ret; } @@ -1098,7 +1098,7 @@ HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) HSZ hsz = 0; WDML_INSTANCE* pInstance; - TRACE("(%ld,%s,%d)\n", idInst, debugstr_a(psz), codepage); + TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); EnterCriticalSection(&WDML_CritSect); @@ -1130,7 +1130,7 @@ HSZ WINAPI DdeCreateStringHandleW(DWORD idInst, LPCWSTR psz, INT codepage) WDML_INSTANCE* pInstance; HSZ hsz = 0; - TRACE("(%ld,%s,%d)\n", idInst, debugstr_w(psz), codepage); + TRACE("(%d,%s,%d)\n", idInst, debugstr_w(psz), codepage); EnterCriticalSection(&WDML_CritSect); @@ -1156,7 +1156,7 @@ BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,%p):\n", idInst, hsz); + TRACE("(%d,%p):\n", idInst, hsz); EnterCriticalSection(&WDML_CritSect); @@ -1183,7 +1183,7 @@ BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,%p):\n", idInst, hsz); + TRACE("(%d,%p):\n", idInst, hsz); EnterCriticalSection(&WDML_CritSect); @@ -1289,7 +1289,7 @@ HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD c psz[1] = 0; } - TRACE("(%ld,%p,cb %ld, cbOff %ld,%p <%s>,fmt %04x,%x)\n", + TRACE("(%d,%p,cb %d, cbOff %d,%p <%s>,fmt %04x,%x)\n", idInst, pSrc, cb, cbOff, hszItem, debugstr_w(psz), wFmt, afCmd); if (afCmd != 0 && afCmd != HDATA_APPOWNED) @@ -1332,7 +1332,7 @@ HDDEDATA WINAPI DdeAddData(HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff) DWORD old_sz, new_sz; LPBYTE pDst; - TRACE("(%p,%p,cb %ld, cbOff %ld)\n", hData, pSrc, cb, cbOff); + TRACE("(%p,%p,cb %d, cbOff %d)\n", hData, pSrc, cb, cbOff); pDst = DdeAccessData(hData, &old_sz); if (!pDst) return 0; @@ -1371,7 +1371,7 @@ DWORD WINAPI DdeGetData(HDDEDATA hData, LPBYTE pDst, DWORD cbMax, DWORD cbOff) DWORD dwSize, dwRet; LPBYTE pByte; - TRACE("(%p,%p,%ld,%ld)\n", hData, pDst, cbMax, cbOff); + TRACE("(%p,%p,%d,%d)\n", hData, pDst, cbMax, cbOff); pByte = DdeAccessData(hData, &dwSize); @@ -1529,7 +1529,7 @@ HDDEDATA WDML_Global2DataHandle(HGLOBAL hMem, WINE_DDEHEAD* p) } else { - ERR("Wrong count: %lu / %d\n", size, count); + ERR("Wrong count: %u / %d\n", size, count); } } else ERR("No bitmap header\n"); break; @@ -1897,7 +1897,7 @@ BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) BOOL ret = FALSE; WDML_CONV *pConv; - TRACE("(%ld, %p, %04x)\n", idInst, hConv, wCmd); + TRACE("(%d, %p, %04x)\n", idInst, hConv, wCmd); EnterCriticalSection(&WDML_CritSect); @@ -1994,7 +1994,7 @@ BOOL WINAPI DdeSetUserHandle(HCONV hConv, DWORD id, DWORD hUser) WDML_CONV* pConv; BOOL ret = TRUE; - TRACE("(%p,%lx,%lx)\n", hConv, id, hUser); + TRACE("(%p,%x,%x)\n", hConv, id, hUser); EnterCriticalSection(&WDML_CritSect); @@ -2116,7 +2116,7 @@ UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) CONVINFO ci; WDML_CONV* pConv; - TRACE("(%p,%lx,%p)\n", hConv, id, lpConvInfo); + TRACE("(%p,%x,%p)\n", hConv, id, lpConvInfo); if (!hConv) { diff --git a/dlls/user/dde_server.c b/dlls/user/dde_server.c index d2f13f3eb85..e12980e397b 100644 --- a/dlls/user/dde_server.c +++ b/dlls/user/dde_server.c @@ -67,7 +67,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) ATOM atom = 0; UINT count; - TRACE("(%ld,%p,%p)\n", idInst, hszTopic, hszItem); + TRACE("(%d,%p,%p)\n", idInst, hszTopic, hszItem); EnterCriticalSection(&WDML_CritSect); @@ -176,7 +176,7 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) hDdeData = NULL; - TRACE("(%ld,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); + TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); EnterCriticalSection(&WDML_CritSect); @@ -251,7 +251,7 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) SetWindowLongPtrW(hwndServer, GWL_WDML_INSTANCE, (ULONG_PTR)pInstance); SetWindowLongPtrW(hwndServer, GWL_WDML_SERVER, (ULONG_PTR)pServer); - TRACE("Created nameServer=%p for instance=%08lx\n", hwndServer, idInst); + TRACE("Created nameServer=%p for instance=%08x\n", hwndServer, idInst); pServer->hwndServer = hwndServer; break; @@ -357,7 +357,7 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien hwndServerName, 0, 0, 0); } - TRACE("Created convServer=%p (nameServer=%p) for instance=%08lx\n", + TRACE("Created convServer=%p (nameServer=%p) for instance=%08x\n", hwndServerConv, hwndServerName, pInstance->instanceID); pConv = WDML_AddConv(pInstance, WDML_SERVER_SIDE, hszApp, hszTopic, @@ -409,7 +409,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w hwndClient = (HWND)wParam; pInstance = WDML_GetInstanceFromWnd(hwndServer); - TRACE("idInst=%ld, threadID=0x%lx\n", pInstance->instanceID, GetCurrentThreadId()); + TRACE("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); if (!pInstance) return 0; /* don't free DDEParams, since this is a broadcast */ diff --git a/dlls/user/defwnd.c b/dlls/user/defwnd.c index c4339eb322a..c07398fce05 100644 --- a/dlls/user/defwnd.c +++ b/dlls/user/defwnd.c @@ -419,7 +419,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa GetClientRect( hwnd, &rc ); x = (rc.right - rc.left - GetSystemMetrics(SM_CXICON))/2; y = (rc.bottom - rc.top - GetSystemMetrics(SM_CYICON))/2; - TRACE("Painting class icon: vis rect=(%ld,%ld - %ld,%ld)\n", + TRACE("Painting class icon: vis rect=(%d,%d - %d,%d)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom ); DrawIcon( hdc, x, y, hIcon ); } diff --git a/dlls/user/dialog.c b/dlls/user/dialog.c index 6eaa9422087..c2f6d959581 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -220,7 +220,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, p += strlenW( info->windowName ) + 1; } - TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %08lx, %08lx\n", + TRACE(" %s %s %d, %d, %d, %d, %d, %08x, %08x, %08x\n", debugstr_w( info->className ), debugstr_w( info->windowName ), info->id, info->x, info->y, info->cx, info->cy, info->style, info->exStyle, info->helpId ); @@ -369,11 +369,11 @@ static LPCSTR DIALOG_ParseTemplate32( LPCSTR template, DLG_TEMPLATE * result ) result->y = GET_WORD(p); p++; result->cx = GET_WORD(p); p++; result->cy = GET_WORD(p); p++; - TRACE("DIALOG%s %d, %d, %d, %d, %ld\n", + TRACE("DIALOG%s %d, %d, %d, %d, %d\n", result->dialogEx ? "EX" : "", result->x, result->y, result->cx, result->cy, result->helpId ); - TRACE(" STYLE 0x%08lx\n", result->style ); - TRACE(" EXSTYLE 0x%08lx\n", result->exStyle ); + TRACE(" STYLE 0x%08x\n", result->style ); + TRACE(" EXSTYLE 0x%08x\n", result->exStyle ); /* Get the menu name */ diff --git a/dlls/user/dialog16.c b/dlls/user/dialog16.c index 821cf23ed20..c7bb73f4bb6 100644 --- a/dlls/user/dialog16.c +++ b/dlls/user/dialog16.c @@ -122,7 +122,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info ) p += *p + 1; - TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %p\n", + TRACE(" %s %s %d, %d, %d, %d, %d, %08x, %p\n", debugstr_a(info->className), debugstr_a(info->windowName), info->id, info->x, info->y, info->cx, info->cy, info->style, info->data ); @@ -220,7 +220,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result ) result->cy = GET_WORD(p); p += sizeof(WORD); TRACE("DIALOG %d, %d, %d, %d\n", result->x, result->y, result->cx, result->cy ); - TRACE(" STYLE %08lx\n", result->style ); + TRACE(" STYLE %08x\n", result->style ); /* Get the menu name */ @@ -748,7 +748,7 @@ HWND16 WINAPI CreateDialogParam16( HINSTANCE16 hInst, LPCSTR dlgTemplate, HGLOBAL16 hmem; LPCVOID data; - TRACE("%04x,%s,%04x,%08lx,%ld\n", + TRACE("%04x,%s,%04x,%08x,%ld\n", hInst, debugstr_a(dlgTemplate), owner, (DWORD)dlgProc, param ); if (!(hRsrc = FindResource16( hInst, dlgTemplate, (LPSTR)RT_DIALOG ))) return 0; diff --git a/dlls/user/driver.c b/dlls/user/driver.c index e9ffe5ad888..2ac74712b45 100644 --- a/dlls/user/driver.c +++ b/dlls/user/driver.c @@ -316,7 +316,7 @@ static BOOL nulldrv_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) MESSAGE( "Make sure that your X server is running and that $DISPLAY is set correctly.\n" ); break; default: - MESSAGE( "Unknown error (%ld).\n", driver_load_error ); + MESSAGE( "Unknown error (%d).\n", driver_load_error ); } return FALSE; diff --git a/dlls/user/driver16.c b/dlls/user/driver16.c index 5c93294db4c..8b4874652e2 100644 --- a/dlls/user/driver16.c +++ b/dlls/user/driver16.c @@ -122,7 +122,7 @@ inline static LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg, WORD args[8]; DWORD ret; - TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n", + TRACE("Before CallDriverProc proc=%p driverID=%08x wMsg=%04x p1=%08lx p2=%08lx\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, msg, lParam1, lParam2); args[7] = HIWORD(lpDrv->dwDriverID); @@ -353,7 +353,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - TRACE("devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx\n", + TRACE("devID=0x%08x hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx\n", dwDevID, hDriv, wMsg, lParam1, lParam2); switch(wMsg) { @@ -408,7 +408,7 @@ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags) HDRVR16 hRetDrv = 0; LPWINE_DRIVER lpDrv; - TRACE("(%04x, %08lX);\n", hDrvr, dwFlags); + TRACE("(%04x, %08X);\n", hDrvr, dwFlags); if (hDrvr == 0) { if (lpDrvItemList == NULL) { diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 116340f51ce..5b38b68440a 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -4717,7 +4717,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) EDITSTATE *es; UINT alloc_size; - TRACE("Creating %s edit control, style = %08lx\n", + TRACE("Creating %s edit control, style = %08x\n", unicode ? "Unicode" : "ANSI", lpcs->style); if (!(es = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*es)))) diff --git a/dlls/user/exticon.c b/dlls/user/exticon.c index 485aef03056..7961124f825 100644 --- a/dlls/user/exticon.c +++ b/dlls/user/exticon.c @@ -388,13 +388,13 @@ static UINT ICO_ExtractIconExW( CloseHandle(hFile); if (!fmapping) { - WARN("CreateFileMapping error %ld\n", GetLastError() ); + WARN("CreateFileMapping error %d\n", GetLastError() ); return 0xFFFFFFFF; } if (!(peimage = MapViewOfFile(fmapping, FILE_MAP_READ, 0, 0, 0))) { - WARN("MapViewOfFile error %ld\n", GetLastError() ); + WARN("MapViewOfFile error %d\n", GetLastError() ); CloseHandle(fmapping); return 0xFFFFFFFF; } @@ -422,7 +422,7 @@ static UINT ICO_ExtractIconExW( NE_NAMEINFO *pIconDir = NULL; LPicoICONDIR lpiID = NULL; - TRACE("-- OS2/icon Signature (0x%08lx)\n", sig); + TRACE("-- OS2/icon Signature (0x%08x)\n", sig); if (pData == (BYTE*)-1) { @@ -430,7 +430,7 @@ static UINT ICO_ExtractIconExW( if (pCIDir) { iconDirCount = 1; iconCount = lpiID->idCount; - TRACE("-- icon found %p 0x%08lx 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); + TRACE("-- icon found %p 0x%08x 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); } } else while (pTInfo->type_id && !(pIconStorage && pIconDir)) @@ -526,7 +526,7 @@ static UINT ICO_ExtractIconExW( if (pe_sections[i].Characteristics & IMAGE_SCN_CNT_UNINITIALIZED_DATA) continue; if (fsizel < pe_sections[i].PointerToRawData+pe_sections[i].SizeOfRawData) { - FIXME("File %s too short (section is at %ld bytes, real size is %ld)\n", + FIXME("File %s too short (section is at %d bytes, real size is %d)\n", debugstr_w(lpszExeFileName), pe_sections[i].PointerToRawData+pe_sections[i].SizeOfRawData, fsizel @@ -624,7 +624,7 @@ static UINT ICO_ExtractIconExW( continue; if (igdataent->OffsetToData-pe_sections[j].VirtualAddress+pe_sections[j].PointerToRawData+igdataent->Size > fsizel) { - FIXME("overflow in PE lookup (%s has len %ld, have offset %ld), short file?\n", debugstr_w(lpszExeFileName), fsizel, + FIXME("overflow in PE lookup (%s has len %d, have offset %d), short file?\n", debugstr_w(lpszExeFileName), fsizel, igdataent->OffsetToData - pe_sections[j].VirtualAddress + pe_sections[j].PointerToRawData + igdataent->Size); goto end; /* failure */ } diff --git a/dlls/user/hook.c b/dlls/user/hook.c index 0d36a6f1a8d..c5a7d497ea1 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c @@ -191,7 +191,7 @@ static HHOOK set_windows_hook( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid, } SERVER_END_REQ; - TRACE( "%s %p %lx -> %p\n", hook_names[id-WH_MINHOOK], proc, tid, handle ); + TRACE( "%s %p %x -> %p\n", hook_names[id-WH_MINHOOK], proc, tid, handle ); return handle; } @@ -282,7 +282,7 @@ static LRESULT call_hook( HOOKPROC proc, INT id, INT code, WPARAM wparam, LPARAM LRESULT ret; if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx)\n", + DPRINTF( "%04x:Call hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx)\n", GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam ); if (!prev_unicode == !next_unicode) ret = proc( code, wparam, lparam ); @@ -290,7 +290,7 @@ static LRESULT call_hook( HOOKPROC proc, INT id, INT code, WPARAM wparam, LPARAM else ret = call_hook_AtoW( proc, id, code, wparam, lparam ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx) retval=%08lx\n", + DPRINTF( "%04x:Ret hook proc %p (id=%s,code=%x,wp=%08x,lp=%08lx) retval=%08lx\n", GetCurrentThreadId(), proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret ); return ret; @@ -357,7 +357,7 @@ LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL uni if (tid) { - TRACE( "calling hook in thread %04lx %s code %x wp %x lp %lx\n", + TRACE( "calling hook in thread %04x %s code %x wp %x lp %lx\n", tid, hook_names[id-WH_MINHOOK], code, wparam, lparam ); switch(id) @@ -530,7 +530,7 @@ LRESULT WINAPI CallNextHookEx( HHOOK hhook, INT code, WPARAM wparam, LPARAM lpar if (tid) { - TRACE( "calling hook in thread %04lx %s code %x wp %x lp %lx\n", + TRACE( "calling hook in thread %04x %s code %x wp %x lp %lx\n", tid, hook_names[id-WH_MINHOOK], code, wparam, lparam ); switch(id) @@ -612,7 +612,7 @@ HWINEVENTHOOK WINAPI SetWinEventHook(DWORD event_min, DWORD event_max, WCHAR module[MAX_PATH]; DWORD len; - TRACE("%ld,%ld,%p,%p,%08lx,%04lx,%08lx\n", event_min, event_max, inst, + TRACE("%d,%d,%p,%p,%08x,%04x,%08x\n", event_min, event_max, inst, proc, pid, tid, flags); if (inst) @@ -783,7 +783,7 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id { struct hook_info info; - TRACE("%04lx,%p,%ld,%ld\n", event, hwnd, object_id, child_id); + TRACE("%04x,%p,%d,%d\n", event, hwnd, object_id, child_id); if (!hwnd) { @@ -819,13 +819,13 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id { if (info.proc) { - TRACE( "calling WH_WINEVENT hook %p event %lx hwnd %p %lx %lx module %s\n", + TRACE( "calling WH_WINEVENT hook %p event %x hwnd %p %x %x module %s\n", info.proc, event, hwnd, object_id, child_id, debugstr_w(info.module) ); if (!info.module[0] || (info.proc = get_hook_proc( info.proc, info.module )) != NULL) { if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n", + DPRINTF( "%04x:Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); @@ -833,7 +833,7 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id GetCurrentThreadId(), GetCurrentTime()); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n", + DPRINTF( "%04x:Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", GetCurrentThreadId(), info.proc, info.handle, event, hwnd, object_id, child_id, GetCurrentThreadId(), GetCurrentTime()); } @@ -864,6 +864,6 @@ void WINAPI NotifyWinEvent(DWORD event, HWND hwnd, LONG object_id, LONG child_id */ BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) { - FIXME("(%ld)-stub!\n", dwEvent); + FIXME("(%d)-stub!\n", dwEvent); return TRUE; } diff --git a/dlls/user/input.c b/dlls/user/input.c index 54ab2461463..2be1cf53c70 100644 --- a/dlls/user/input.c +++ b/dlls/user/input.c @@ -90,24 +90,24 @@ UINT WINAPI SendInput( UINT count, LPINPUT inputs, int size ) switch(inputs[i].type) { case INPUT_MOUSE: - TRACE("mouse: dx %ld, dy %ld, data %lx, flags %lx, time %lu, info %lx\n", + TRACE("mouse: dx %d, dy %d, data %x, flags %x, time %u, info %lx\n", inputs[i].u.mi.dx, inputs[i].u.mi.dy, inputs[i].u.mi.mouseData, inputs[i].u.mi.dwFlags, inputs[i].u.mi.time, inputs[i].u.mi.dwExtraInfo); break; case INPUT_KEYBOARD: - TRACE("keyboard: vk %x, scan %x, flags %lx, time %lu, info %lx\n", + TRACE("keyboard: vk %x, scan %x, flags %x, time %u, info %lx\n", inputs[i].u.ki.wVk, inputs[i].u.ki.wScan, inputs[i].u.ki.dwFlags, inputs[i].u.ki.time, inputs[i].u.ki.dwExtraInfo); break; case INPUT_HARDWARE: - TRACE("hardware: msg %ld, wParamL %x, wParamH %x\n", + TRACE("hardware: msg %d, wParamL %x, wParamH %x\n", inputs[i].u.hi.uMsg, inputs[i].u.hi.wParamL, inputs[i].u.hi.wParamH); break; default: - FIXME("unknown input type %lu\n", inputs[i].type); + FIXME("unknown input type %u\n", inputs[i].type); break; } } @@ -764,7 +764,7 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, POINT pos; INT hoverwidth = 0, hoverheight = 0, hittest; - TRACE("hwnd %p, msg %04x, id %04x, time %lu\n", hwnd, uMsg, idEvent, dwTime); + TRACE("hwnd %p, msg %04x, id %04x, time %u\n", hwnd, uMsg, idEvent, dwTime); GetCursorPos(&pos); hwnd = WINPOS_WindowFromPoint(hwnd, pos, &hittest); @@ -895,7 +895,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) DWORD hover_time; INT hittest; - TRACE("%lx, %lx, %p, %lu\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); + TRACE("%x, %x, %p, %u\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime); if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) { WARN("wrong TRACKMOUSEEVENT size from app\n"); @@ -930,7 +930,7 @@ TrackMouseEvent (TRACKMOUSEEVENT *ptme) TRACE("point %s hwnd %p hittest %d\n", wine_dbgstr_point(&pos), hwnd, hittest); if (ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)) - FIXME("Unknown flag(s) %08lx\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); + FIXME("Unknown flag(s) %08x\n", ptme->dwFlags & ~(TME_CANCEL | TME_HOVER | TME_LEAVE | TME_NONCLIENT)); if (ptme->dwFlags & TME_CANCEL) { diff --git a/dlls/user/listbox.c b/dlls/user/listbox.c index 08c1eb7b2e8..701e91b6778 100644 --- a/dlls/user/listbox.c +++ b/dlls/user/listbox.c @@ -575,7 +575,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item ? item->data : 0; dis.rcItem = *rect; - TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%ld,%ld-%ld,%ld\n", + TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%d,%d-%d,%d\n", descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, rect->left, rect->top, rect->right, rect->bottom ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); @@ -595,7 +595,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); } - TRACE("[%p]: painting %d (%s) action=%02x rect=%ld,%ld-%ld,%ld\n", + TRACE("[%p]: painting %d (%s) action=%02x rect=%d,%d-%d,%d\n", descr->self, index, item ? debugstr_w(item->str) : "", action, rect->left, rect->top, rect->right, rect->bottom ); if (!item) @@ -2560,7 +2560,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, CREATESTRUCTW *lpcs = (CREATESTRUCTW *)lParam; if (lpcs->style & LBS_COMBOBOX) lphc = (LPHEADCOMBO)lpcs->lpCreateParams; if (!LISTBOX_Create( hwnd, lphc )) return -1; - TRACE("creating wnd=%p descr=%lx\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); + TRACE("creating wnd=%p descr=%x\n", hwnd, GetWindowLongPtrW( hwnd, 0 ) ); return 0; } /* Ignore all other messages before we get a WM_CREATE */ diff --git a/dlls/user/mdi.c b/dlls/user/mdi.c index 6b1d6db8089..bfeb2db64ec 100644 --- a/dlls/user/mdi.c +++ b/dlls/user/mdi.c @@ -485,7 +485,7 @@ static void MDI_ChildGetMinMaxInfo( HWND client, HWND hwnd, MINMAXINFO* lpMinMax lpMinMax->ptMaxPosition.x = rect.left; lpMinMax->ptMaxPosition.y = rect.top; - TRACE("max rect (%ld,%ld - %ld, %ld)\n", + TRACE("max rect (%d,%d - %d, %d)\n", rect.left,rect.top,rect.right,rect.bottom); } @@ -700,7 +700,7 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) /* walk the list (backwards) and move windows */ for (i = total - 1; i >= 0; i--) { - TRACE("move %p to (%ld,%ld) size [%ld,%ld]\n", + TRACE("move %p to (%d,%d) size [%d,%d]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL); @@ -1203,7 +1203,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, pt.y = (short)HIWORD(lParam); child = ChildWindowFromPoint(hwnd, pt); - TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y); + TRACE("notification from %p (%i,%i)\n",child,pt.x,pt.y); if( child && child != hwnd && child != ci->hwndActiveChild ) SetWindowPos(child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); @@ -1571,7 +1571,7 @@ HWND WINAPI CreateMDIWindowA( HINSTANCE hInstance, /* [in] Handle to application instance */ LPARAM lParam) /* [in] Application-defined value */ { - TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08lx)\n", + TRACE("(%s,%s,%08x,%d,%d,%d,%d,%p,%p,%08lx)\n", debugstr_a(lpClassName),debugstr_a(lpWindowName),dwStyle,X,Y, nWidth,nHeight,hWndParent,hInstance,lParam); @@ -1599,7 +1599,7 @@ HWND WINAPI CreateMDIWindowW( HINSTANCE hInstance, /* [in] Handle to application instance */ LPARAM lParam) /* [in] Application-defined value */ { - TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08lx)\n", + TRACE("(%s,%s,%08x,%d,%d,%d,%d,%p,%p,%08lx)\n", debugstr_w(lpClassName), debugstr_w(lpWindowName), dwStyle, X, Y, nWidth, nHeight, hWndParent, hInstance, lParam); diff --git a/dlls/user/menu.c b/dlls/user/menu.c index a28eff7e657..19c73f378cc 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -992,7 +992,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, } else lpitem->rect.bottom += mis.itemHeight; - TRACE("id=%04x size=%ldx%ld\n", + TRACE("id=%04x size=%dx%d\n", lpitem->wID, lpitem->rect.right-lpitem->rect.left, lpitem->rect.bottom-lpitem->rect.top); return; @@ -4037,7 +4037,7 @@ HMENU WINAPI GetMenu( HWND hWnd ) */ BOOL WINAPI GetMenuBarInfo( HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO pmbi ) { - FIXME( "(%p,0x%08lx,0x%08lx,%p)\n", hwnd, idObject, idItem, pmbi ); + FIXME( "(%p,0x%08x,0x%08x,%p)\n", hwnd, idObject, idItem, pmbi ); return FALSE; } @@ -4957,7 +4957,7 @@ BOOL WINAPI SetMenuContextHelpId( HMENU hMenu, DWORD dwContextHelpID) { LPPOPUPMENU menu; - TRACE("(%p 0x%08lx)\n", hMenu, dwContextHelpID); + TRACE("(%p 0x%08x)\n", hMenu, dwContextHelpID); if ((menu = MENU_GetMenu(hMenu))) { diff --git a/dlls/user/message.c b/dlls/user/message.c index 2561bcf105b..d07655fe3a6 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -1476,7 +1476,7 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM { memcpy( ptr, *buffer, size ); GlobalUnlock( hMem ); - TRACE( "exec: pairing c=%08lx s=%08lx\n", *lparam, (DWORD)hMem ); + TRACE( "exec: pairing c=%08lx s=%08x\n", *lparam, (DWORD)hMem ); if (!dde_add_pair( (HGLOBAL)*lparam, hMem )) { GlobalFree( hMem ); @@ -1837,7 +1837,7 @@ static BOOL process_mouse_message( MSG *msg, UINT hw_id, ULONG_PTR extra_info, H if (!FOCUS_MouseActivate( hwndTop )) eatMsg = TRUE; break; default: - WARN( "unknown WM_MOUSEACTIVATE code %ld\n", ret ); + WARN( "unknown WM_MOUSEACTIVATE code %d\n", ret ); break; } } @@ -1883,12 +1883,12 @@ static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UIN ULONG_PTR data, LRESULT result ) { if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", + DPRINTF( "%04x:Call message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ), data, result ); callback( hwnd, msg, data, result ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", + DPRINTF( "%04x:Ret message callback %p (hwnd=%p,msg=%s,data=%08lx,result=%08lx)\n", GetCurrentThreadId(), callback, hwnd, SPY_GetMsgName( msg, hwnd ), data, result ); } @@ -2010,7 +2010,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, int flags } } if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%lx)\n", + DPRINTF( "%04x:Call winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%x)\n", GetCurrentThreadId(), info.hook_proc, info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam, extra_info, info.msg.time); @@ -2019,7 +2019,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, int flags info.msg.lParam, extra_info, info.msg.time ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%lx)\n", + DPRINTF( "%04x:Ret winevent proc %p (hook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%lx,tid=%04lx,time=%x)\n", GetCurrentThreadId(), info.hook_proc, info.hook, info.msg.message, info.msg.hwnd, info.msg.wParam, info.msg.lParam, extra_info, info.msg.time); @@ -2251,7 +2251,7 @@ static LRESULT retrieve_reply( const struct send_message_info *info, HeapFree( GetProcessHeap(), 0, reply_data ); - TRACE( "hwnd %p 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=%d)\n", info->hwnd, info->msg, SPY_GetMsgName(info->msg, info->hwnd), info->wparam, info->lparam, *result, status ); @@ -2826,7 +2826,7 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) if (changed_bits & mask) continue; if (wake_bits & QS_SENDMESSAGE) continue; - TRACE( "(%04lx) mask=%08x, bits=%08x, changed=%08x, waiting\n", + TRACE( "(%04x) mask=%08x, bits=%08x, changed=%08x, waiting\n", GetCurrentThreadId(), mask, wake_bits, changed_bits ); ReleaseThunkLock( &dwlc ); @@ -3277,13 +3277,13 @@ LONG WINAPI BroadcastSystemMessageA( DWORD flags, LPDWORD recipients, UINT msg, { if ((*recipients & BSM_APPLICATIONS) || (*recipients == BSM_ALLCOMPONENTS)) { - FIXME( "(%08lx,%08lx,%08x,%08x,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp ); + FIXME( "(%08x,%08x,%08x,%08x,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp ); PostMessageA( HWND_BROADCAST, msg, wp, lp ); return 1; } else { - FIXME( "(%08lx,%08lx,%08x,%08x,%08lx): stub!\n", flags, *recipients, msg, wp, lp); + FIXME( "(%08x,%08x,%08x,%08x,%08lx): stub!\n", flags, *recipients, msg, wp, lp); return -1; } } @@ -3296,13 +3296,13 @@ LONG WINAPI BroadcastSystemMessageW( DWORD flags, LPDWORD recipients, UINT msg, { if ((*recipients & BSM_APPLICATIONS) || (*recipients == BSM_ALLCOMPONENTS)) { - FIXME( "(%08lx,%08lx,%08x,%08x,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp ); + FIXME( "(%08x,%08x,%08x,%08x,%08lx): semi-stub!\n", flags, *recipients, msg, wp, lp ); PostMessageW( HWND_BROADCAST, msg, wp, lp ); return 1; } else { - FIXME( "(%08lx,%08lx,%08x,%08x,%08lx): stub!\n", flags, *recipients, msg, wp, lp ); + FIXME( "(%08x,%08x,%08x,%08x,%08lx): stub!\n", flags, *recipients, msg, wp, lp ); return -1; } } diff --git a/dlls/user/misc.c b/dlls/user/misc.c index fdcaafab79e..d5691f0d442 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c @@ -132,7 +132,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID, DWORD dwFlags, HMODULE16 hModule ) { - FIXME("(%04x, %08lx, %04lx, %04x)\n", + FIXME("(%04x, %08x, %04x, %04x)\n", uCode, dwThreadOrProcessID, dwFlags, hModule ); /* FIXME: Should chain to GdiSignalProc now. */ return 0; @@ -151,7 +151,7 @@ void WINAPI SetLastErrorEx( DWORD error, /* [in] Per-thread error code */ DWORD type) /* [in] Error type */ { - TRACE("(0x%08lx, 0x%08lx)\n", error,type); + TRACE("(0x%08x, 0x%08x)\n", error,type); switch(type) { case 0: break; @@ -160,7 +160,7 @@ void WINAPI SetLastErrorEx( case SLE_WARNING: /* Fall through for now */ default: - FIXME("(error=%08lx, type=%08lx): Unhandled type\n", error,type); + FIXME("(error=%08x, type=%08x): Unhandled type\n", error,type); break; } SetLastError( error ); @@ -196,7 +196,7 @@ BOOL WINAPI GetAltTabInfoW(HWND hwnd, int iItem, PALTTABINFO pati, LPWSTR pszIte */ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) { - FIXME("(%ld): stub\n", dwLevel); + FIXME("(%d): stub\n", dwLevel); } @@ -242,7 +242,7 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD dwDefaultLayout ) { if ( dwDefaultLayout == 0 ) return TRUE; - FIXME( "( %08lx ): No BiDi\n", dwDefaultLayout ); + FIXME( "( %08x ): No BiDi\n", dwDefaultLayout ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } @@ -253,7 +253,7 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD dwDefaultLayout ) */ DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) { - FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2); + FIXME("(0x%08x,0x%08x),stub!\n",x1,x2); return 1; } @@ -318,7 +318,7 @@ BOOL WINAPI EnumDisplayDevicesA( LPCSTR lpDevice, DWORD i, LPDISPLAY_DEVICEA lpD BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lpDisplayDevice, DWORD dwFlags ) { - FIXME("(%s,%ld,%p,0x%08lx), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); + FIXME("(%s,%d,%p,0x%08x), stub!\n",debugstr_w(lpDevice),i,lpDisplayDevice,dwFlags); if (i) return FALSE; @@ -500,7 +500,7 @@ BOOL WINAPI EnumDisplayMonitors( */ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) { - FIXME("(%08lx, %08lx)\n", flags, reserved); + FIXME("(%08x, %08x)\n", flags, reserved); } /*********************************************************************** @@ -518,7 +518,7 @@ BOOL WINAPI RegisterShellHookWindow ( HWND hWnd ) */ HRESULT WINAPI DeregisterShellHookWindow ( DWORD u ) { - FIXME("0x%08lx stub\n",u); + FIXME("0x%08x stub\n",u); return 0; } @@ -529,7 +529,7 @@ HRESULT WINAPI DeregisterShellHookWindow ( DWORD u ) */ DWORD WINAPI RegisterTasklist (DWORD x) { - FIXME("0x%08lx\n",x); + FIXME("0x%08x\n",x); return TRUE; } @@ -541,7 +541,7 @@ DWORD WINAPI RegisterTasklist (DWORD x) */ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08lx), STUB!\n", hnd,notifyfilter,flags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x), STUB!\n", hnd,notifyfilter,flags ); return 0; } @@ -570,7 +570,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D */ HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08lx), STUB!\n", hRecepient,pNotificationFilter,dwFlags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x), STUB!\n", hRecepient,pNotificationFilter,dwFlags ); return 0; } @@ -599,9 +599,9 @@ DWORD WINAPI GetAppCompatFlags( HTASK hTask ) */ BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { - FIXME("(%p, %ld, %ld, %ld): stub\n", rect, b, c, d); + FIXME("(%p, %d, %d, %d): stub\n", rect, b, c, d); if (rect) - FIXME("rect: [[%ld, %ld], [%ld, %ld]]\n", rect->left, rect->top, rect->right, rect->bottom); + FIXME("rect: [[%d, %d], [%d, %d]]\n", rect->left, rect->top, rect->right, rect->bottom); /* Calls OffsetRect */ return FALSE; } diff --git a/dlls/user/nonclient.c b/dlls/user/nonclient.c index 00c29133b42..304539756d7 100644 --- a/dlls/user/nonclient.c +++ b/dlls/user/nonclient.c @@ -412,7 +412,7 @@ BOOL WINAPI AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL menu, DWORD exSty WS_EX_STATICEDGE | WS_EX_TOOLWINDOW); if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME; - TRACE("(%ld,%ld)-(%ld,%ld) %08lx %d %08lx\n", + TRACE("(%d,%d)-(%d,%d) %08x %d %08x\n", rect->left, rect->top, rect->right, rect->bottom, style, menu, exStyle ); @@ -450,7 +450,7 @@ LRESULT NC_HandleNCCalcSize( HWND hwnd, RECT *winRect ) if (((style & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) { - TRACE("Calling GetMenuBarHeight with hwnd %p, width %ld, at (%ld, %ld).\n", + TRACE("Calling GetMenuBarHeight with hwnd %p, width %d, at (%d, %d).\n", hwnd, winRect->right - winRect->left, -tmpRect.left, -tmpRect.top ); winRect->top += @@ -549,7 +549,7 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) RECT rect, rcClient; POINT ptClient; - TRACE("hwnd=%p pt=%ld,%ld\n", wndPtr->hwndSelf, pt.x, pt.y ); + TRACE("hwnd=%p pt=%d,%d\n", wndPtr->hwndSelf, pt.x, pt.y ); GetWindowRect(wndPtr->hwndSelf, &rect ); if (!PtInRect( &rect, pt )) return HTNOWHERE; @@ -1081,13 +1081,13 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) RECT r = rect; r.bottom = rect.top + GetSystemMetrics(SM_CYMENU); - TRACE("Calling DrawMenuBar with rect (%ld, %ld)-(%ld, %ld)\n", + TRACE("Calling DrawMenuBar with rect (%d, %d)-(%d, %d)\n", r.left, r.top, r.right, r.bottom); rect.top += MENU_DrawMenuBar( hdc, &r, hwnd, suppress_menupaint ) + 1; } - TRACE("After MenuBar, rect is (%ld, %ld)-(%ld, %ld).\n", + TRACE("After MenuBar, rect is (%d, %d)-(%d, %d).\n", rect.left, rect.top, rect.right, rect.bottom ); if (dwExStyle & WS_EX_CLIENTEDGE) @@ -1673,7 +1673,7 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) { TRACE("(%p %p)\n", hwnd, tbi); if(tbi->cbSize != sizeof(TITLEBARINFO)) { - TRACE("Invalid TITLEBARINFO size: %ld\n", tbi->cbSize); + TRACE("Invalid TITLEBARINFO size: %d\n", tbi->cbSize); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user/painting.c b/dlls/user/painting.c index f1698210371..dbc8cfeb814 100644 --- a/dlls/user/painting.c +++ b/dlls/user/painting.c @@ -444,7 +444,7 @@ HDC WINAPI BeginPaint( HWND hwnd, PAINTSTRUCT *lps ) lps->fErase = send_erase( hwnd, flags, hrgn, &lps->rcPaint, &lps->hdc ); - TRACE("hdc = %p box = (%ld,%ld - %ld,%ld), fErase = %d\n", + TRACE("hdc = %p box = (%d,%d - %d,%d), fErase = %d\n", lps->hdc, lps->rcPaint.left, lps->rcPaint.top, lps->rcPaint.right, lps->rcPaint.bottom, lps->fErase); diff --git a/dlls/user/resource.c b/dlls/user/resource.c index 8c66431a5de..b9a51ae0990 100644 --- a/dlls/user/resource.c +++ b/dlls/user/resource.c @@ -434,7 +434,7 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, */ DWORD WINAPI GetGuiResources( HANDLE hProcess, DWORD uiFlags ) { - FIXME("(%p,%lx): stub\n",hProcess,uiFlags); + FIXME("(%p,%x): stub\n",hProcess,uiFlags); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; } diff --git a/dlls/user/scroll.c b/dlls/user/scroll.c index e9eae77f9eb..7c2168b6211 100644 --- a/dlls/user/scroll.c +++ b/dlls/user/scroll.c @@ -893,7 +893,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) return; /* Should never happen */ } - TRACE("Event: hwnd=%p bar=%d msg=%s pt=%ld,%ld hit=%d\n", + TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest ); switch(SCROLL_trackHitTest) @@ -1782,7 +1782,7 @@ BOOL WINAPI GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info) */ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) { - TRACE("hwnd=%p idObject=%ld info=%p\n", hwnd, idObject, info); + TRACE("hwnd=%p idObject=%d info=%p\n", hwnd, idObject, info); /* Refer OBJID_CLIENT requests to the window */ if (idObject == OBJID_CLIENT) diff --git a/dlls/user/spy.c b/dlls/user/spy.c index 4a2084ce669..bd84508c1c8 100644 --- a/dlls/user/spy.c +++ b/dlls/user/spy.c @@ -2265,7 +2265,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) { LPRECT rc = (LPRECT) sp_e->lParam; if (rc) { - TRACE("lParam rect (%ld,%ld)-(%ld,%ld)\n", + TRACE("lParam rect (%d,%d)-(%d,%d)\n", rc->left, rc->top, rc->right, rc->bottom); } break; @@ -2278,7 +2278,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) { LPPOINT point = (LPPOINT) sp_e->lParam; if (point) { - TRACE("lParam point x=%ld, y=%ld\n", point->x, point->y); + TRACE("lParam point x=%d, y=%d\n", point->x, point->y); } break; } @@ -2304,14 +2304,14 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) if (enter && sp_e->lParam) { CHARRANGE *cr = (CHARRANGE *) sp_e->lParam; - TRACE("CHARRANGE: cpMin=%ld cpMax=%ld\n", cr->cpMin, cr->cpMax); + TRACE("CHARRANGE: cpMin=%d cpMax=%d\n", cr->cpMin, cr->cpMax); } break; case EM_SETCHARFORMAT: if (enter && sp_e->lParam) { CHARFORMATW *cf = (CHARFORMATW *) sp_e->lParam; - TRACE("CHARFORMAT: dwMask=0x%08lx dwEffects=", cf->dwMask); + TRACE("CHARFORMAT: dwMask=0x%08x dwEffects=", cf->dwMask); if ((cf->dwMask & CFM_BOLD) && (cf->dwEffects & CFE_BOLD)) TRACE(" CFE_BOLD"); if ((cf->dwMask & CFM_COLOR) && (cf->dwEffects & CFE_AUTOCOLOR)) @@ -2326,11 +2326,11 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) TRACE(" CFE_UNDERLINE"); TRACE("\n"); if (cf->dwMask & CFM_SIZE) - TRACE("yHeight=%ld\n", cf->yHeight); + TRACE("yHeight=%d\n", cf->yHeight); if (cf->dwMask & CFM_OFFSET) - TRACE("yOffset=%ld\n", cf->yOffset); + TRACE("yOffset=%d\n", cf->yOffset); if ((cf->dwMask & CFM_COLOR) && !(cf->dwEffects & CFE_AUTOCOLOR)) - TRACE("crTextColor=%lx\n", cf->crTextColor); + TRACE("crTextColor=%x\n", cf->crTextColor); TRACE("bCharSet=%x bPitchAndFamily=%x\n", cf->bCharSet, cf->bPitchAndFamily); /* FIXME: we should try to be a bit more intelligent about * whether this is in ANSI or Unicode (it could be either) */ @@ -2347,7 +2347,7 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) lpdis->CtlType, lpdis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); - TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, lpdis->rcItem.right, lpdis->rcItem.bottom, lpdis->itemData); @@ -2382,14 +2382,14 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) case WM_STYLECHANGING: { LPSTYLESTRUCT ss = (LPSTYLESTRUCT) sp_e->lParam; - TRACE("STYLESTRUCT: StyleOld=0x%08lx, StyleNew=0x%08lx\n", + TRACE("STYLESTRUCT: StyleOld=0x%08x, StyleNew=0x%08x\n", ss->styleOld, ss->styleNew); } break; case WM_NCCALCSIZE: { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%ld,%ld)-(%ld,%ld)\n", + TRACE("Rect (%d,%d)-(%d,%d)\n", rc->left, rc->top, rc->right, rc->bottom); } break; @@ -2478,7 +2478,7 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg, DWORD tid = GetWindowThreadProcessId( hWnd, NULL ); if (tid == GetCurrentThreadId()) strcpy( taskName, "self" ); - else sprintf( taskName, "tid %04lx", GetCurrentThreadId() ); + else sprintf( taskName, "tid %04x", GetCurrentThreadId() ); if (iFlag == SPY_SENDMESSAGE16) TRACE("%*s(%04x) %-16s message [%04x] %s sent from %s wp=%04x lp=%08lx\n", diff --git a/dlls/user/static.c b/dlls/user/static.c index ecfb8e4323a..b70754aef40 100644 --- a/dlls/user/static.c +++ b/dlls/user/static.c @@ -378,7 +378,7 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_CREATE: if (style < 0L || style > SS_TYPEMASK) { - ERR("Unknown style 0x%02lx\n", style ); + ERR("Unknown style 0x%02x\n", style ); return -1; } STATIC_InitColours(); diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 9e476d50347..35be4fa9bff 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -962,7 +962,7 @@ static BOOL reg_get_logfont(LPCWSTR key, LPCWSTR value, LOGFONTW *lf) found = TRUE; SYSPARAMS_LogFont16To32W( (LOGFONT16*) &lfbuf, lf); } else - WARN("Unknown format in key %s value %s, size is %ld\n", + WARN("Unknown format in key %s value %s, size is %d\n", debugstr_w( key), debugstr_w( value), size); } RegCloseKey(hkey); diff --git a/dlls/user/uitools.c b/dlls/user/uitools.c index 88f3ed6a9f8..c504c4c15a5 100644 --- a/dlls/user/uitools.c +++ b/dlls/user/uitools.c @@ -577,7 +577,7 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc, */ BOOL WINAPI DrawEdge( HDC hdc, LPRECT rc, UINT edge, UINT flags ) { - TRACE("%p %ld,%ld-%ld,%ld %04x %04x\n", + TRACE("%p %d,%d-%d,%d %04x %04x\n", hdc, rc->left, rc->top, rc->right, rc->bottom, edge, flags ); if(flags & BF_DIAGONAL) diff --git a/dlls/user/user16.c b/dlls/user/user16.c index 37535ee6624..1b3e24ea050 100644 --- a/dlls/user/user16.c +++ b/dlls/user/user16.c @@ -1681,7 +1681,7 @@ DWORD WINAPI FormatMessage16( BOOL eos = FALSE; LPSTR allocstring = NULL; - TRACE("(0x%lx,%lx,%d,0x%x,%p,%d,%p)\n", + TRACE("(0x%x,%x,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0; @@ -1690,7 +1690,7 @@ DWORD WINAPI FormatMessage16( || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - FIXME("line wrapping (%lu) not supported.\n", width); + FIXME("line wrapping (%u) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { diff --git a/dlls/user/win.c b/dlls/user/win.c index 362f18d3d04..61188487b7c 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -129,7 +129,7 @@ static WND *create_window_handle( HWND parent, HWND owner, ATOM atom, if (!handle) { - WARN( "error %ld creating window\n", GetLastError() ); + WARN( "error %d creating window\n", GetLastError() ); return NULL; } @@ -496,7 +496,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (win == WND_OTHER_PROCESS) { if (IsWindow(hwnd)) - ERR( "cannot set style %lx/%lx on other process window %p\n", + ERR( "cannot set style %x/%x on other process window %p\n", set_bits, clear_bits, hwnd ); return 0; } @@ -895,7 +895,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, ATOM classAtom, UINT flags ) BOOL unicode = (flags & WIN_ISUNICODE) != 0; MDICREATESTRUCTA mdi_cs; - TRACE("%s %s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + TRACE("%s %s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w((LPCWSTR)cs->lpszName) : debugstr_a(cs->lpszName), unicode ? debugstr_w((LPCWSTR)cs->lpszClass) : debugstr_a(cs->lpszClass), cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, @@ -1625,13 +1625,13 @@ HWND WINAPI GetDesktopWindow(void) if (CreateProcessW( NULL, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) { - TRACE( "started explorer pid %04lx tid %04lx\n", pi.dwProcessId, pi.dwThreadId ); + TRACE( "started explorer pid %04x tid %04x\n", pi.dwProcessId, pi.dwThreadId ); WaitForInputIdle( pi.hProcess, 10000 ); CloseHandle( pi.hThread ); CloseHandle( pi.hProcess ); } - else WARN( "failed to start explorer, err %ld\n", GetLastError() ); + else WARN( "failed to start explorer, err %d\n", GetLastError() ); SERVER_START_REQ( get_desktop_window ) { @@ -3132,7 +3132,7 @@ BOOL WINAPI SwitchDesktop( HDESK hDesktop) BOOL WINAPI SetLayeredWindowAttributes( HWND hWnd, COLORREF rgbKey, BYTE bAlpha, DWORD dwFlags ) { - FIXME("(%p,0x%.8lx,%d,%ld): stub!\n", hWnd, rgbKey, bAlpha, dwFlags); + FIXME("(%p,0x%.8x,%d,%d): stub!\n", hWnd, rgbKey, bAlpha, dwFlags); return TRUE; } @@ -3143,7 +3143,7 @@ BOOL WINAPI UpdateLayeredWindow( HWND hwnd, HDC hdcDst, POINT *pptDst, SIZE *psi HDC hdcSrc, POINT *pptSrc, COLORREF crKey, BLENDFUNCTION *pblend, DWORD dwFlags) { - FIXME("(%p,%p,%p,%p,%p,%p,0x%08lx,%p,%ld): stub!\n", + FIXME("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%d): stub!\n", hwnd, hdcDst, pptDst, psize, hdcSrc, pptSrc, crKey, pblend, dwFlags); return 0; } diff --git a/dlls/user/winhelp.c b/dlls/user/winhelp.c index 5c0df84fefd..27deaadadc2 100644 --- a/dlls/user/winhelp.c +++ b/dlls/user/winhelp.c @@ -152,7 +152,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->ofsData = sizeof(WINHELP) + nlen; } else lpwh->ofsData = 0; - WINE_TRACE("Sending[%u]: cmd=%u data=%08lx fn=%s\n", + WINE_TRACE("Sending[%u]: cmd=%u data=%08x fn=%s\n", lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 6bc90563d1d..c9307cd6873 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -165,7 +165,7 @@ BOOL WINAPI GetWindowRect( HWND hwnd, LPRECT rect ) if (ret) { MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), 0, (POINT *)rect, 2 ); - TRACE( "hwnd %p (%ld,%ld)-(%ld,%ld)\n", + TRACE( "hwnd %p (%d,%d)-(%d,%d)\n", hwnd, rect->left, rect->top, rect->right, rect->bottom); } return ret; @@ -396,7 +396,7 @@ HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest ) } ret = list[i]; HeapFree( GetProcessHeap(), 0, list ); - TRACE( "scope %p (%ld,%ld) returning %p\n", hwndScope, pt.x, pt.y, ret ); + TRACE( "scope %p (%d,%d) returning %p\n", hwndScope, pt.x, pt.y, ret ); return ret; } @@ -800,7 +800,7 @@ void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, /* Some sanity checks */ - TRACE("%ld %ld / %ld %ld / %ld %ld / %ld %ld\n", + TRACE("%d %d / %d %d / %d %d / %d %d\n", MinMax.ptMaxSize.x, MinMax.ptMaxSize.y, MinMax.ptMaxPosition.x, MinMax.ptMaxPosition.y, MinMax.ptMaxTrackSize.x, MinMax.ptMaxTrackSize.y, diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 0c1f36f665b..e4a5c5aa6e8 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -446,13 +446,13 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES hwnd = WIN_GetFullHandle( hwnd ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", + DPRINTF( "%04x:Call window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx\n", + DPRINTF( "%04x:Ret window proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx\n", GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); return *result; } @@ -467,14 +467,14 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES hwnd = WIN_GetFullHandle( hwnd ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Call dialog proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", + DPRINTF( "%04x:Call dialog proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); ret = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); *result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); if (TRACE_ON(relay)) - DPRINTF( "%04lx:Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx result=%08lx\n", + DPRINTF( "%04x:Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx) retval=%08lx result=%08lx\n", GetCurrentThreadId(), proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result ); return ret; } diff --git a/dlls/user/winstation.c b/dlls/user/winstation.c index c77eb6ae175..ab00b41b5b1 100644 --- a/dlls/user/winstation.c +++ b/dlls/user/winstation.c @@ -395,7 +395,7 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam */ HDESK WINAPI OpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ) { - FIXME( "(%lx,%i,%lx): stub\n", flags, inherit, access ); + FIXME( "(%x,%i,%x): stub\n", flags, inherit, access ); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return 0; } @@ -571,7 +571,7 @@ BOOL WINAPI SetUserObjectInformationW( HANDLE handle, INT index, LPVOID info, DW BOOL WINAPI GetUserObjectSecurity( HANDLE handle, PSECURITY_INFORMATION info, PSECURITY_DESCRIPTOR sid, DWORD len, LPDWORD needed ) { - FIXME( "(%p %p %p len=%ld %p),stub!\n", handle, info, sid, len, needed ); + FIXME( "(%p %p %p len=%d %p),stub!\n", handle, info, sid, len, needed ); return TRUE; } -- 2.11.4.GIT