- Wine-devel - list.winehq.org

[PATCH v2 0/6] MR159: ntdll: More heap code cleanup.
by Rémi Bernon 31 May '22

31 May '22

-- v2: ntdll: Remove tail checking on large blocks. ntdll: Merge common resize case in heap_realloc. ntdll: Call valgrind alloc notifications at the topmost level. ntdll: Correctly free pending pointer in RtlDestroyHeap. ntdll: Split valgrind memory access control to separate helpers. ntdll: Fix handling of back pointer in heap_set_debug_flags. https://gitlab.winehq.org/wine/wine/-/merge_requests/159

1 6

[PATCH 0/6] MR159: ntdll: More heap code cleanup.
by Rémi Bernon 31 May '22

31 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/159

3 9

[PATCH] dlls/user32: enable compilation with long types
by Eric Pouech 31 May '22

31 May '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/user32/Makefile.in | 2 +- dlls/user32/combo.c | 6 +++-- dlls/user32/cursoricon.c | 36 +++++++++++++++---------------- dlls/user32/dde_client.c | 16 +++++++------- dlls/user32/dde_misc.c | 54 +++++++++++++++++++++++----------------------- dlls/user32/dde_server.c | 12 +++++----- dlls/user32/dialog.c | 12 +++++----- dlls/user32/edit.c | 16 +++++++------- dlls/user32/exticon.c | 8 +++---- dlls/user32/hook.c | 12 +++++----- dlls/user32/input.c | 2 +- dlls/user32/listbox.c | 4 ++- dlls/user32/mdi.c | 18 ++++++++------- dlls/user32/menu.c | 26 +++++++++++----------- dlls/user32/message.c | 22 +++++++++---------- dlls/user32/misc.c | 34 ++++++++++++++--------------- dlls/user32/msgbox.c | 4 ++- dlls/user32/nonclient.c | 16 +++++++------- dlls/user32/rawinput.c | 10 ++++----- dlls/user32/resource.c | 2 +- dlls/user32/scroll.c | 10 ++++----- dlls/user32/static.c | 4 ++- dlls/user32/user_main.c | 4 ++- dlls/user32/win.c | 10 ++++----- dlls/user32/winhelp.c | 2 +- dlls/user32/winpos.c | 2 +- dlls/user32/winproc.c | 12 +++++----- dlls/user32/winstation.c | 2 +- 28 files changed, 179 insertions(+), 179 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 4a413746de7..3f4115c5679 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_USER32_ +EXTRADEFS = -D_USER32_ MODULE = user32.dll IMPORTLIB = user32 IMPORTS = $(PNG_PE_LIBS) gdi32 version sechost advapi32 kernelbase win32u diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index d9123057295..73ec5691e88 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1459,7 +1459,7 @@ static void COMBO_Size( HEADCOMBO *lphc ) */ if( curComboHeight > newComboHeight ) { - TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%d, oldDropTop=%d\n", + TRACE("oldComboHeight=%d, newComboHeight=%d, oldDropBottom=%ld, oldDropTop=%ld\n", curComboHeight, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + curComboHeight - newComboHeight; @@ -1720,7 +1720,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); - TRACE("[%p]: msg %s wp %08lx lp %08lx\n", + TRACE("[%p]: msg %s wp %08Ix lp %08Ix\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); if (!IsWindow(hwnd)) return 0; @@ -2107,7 +2107,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar return TRUE; default: if (message >= WM_USER) - WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", + WARN("unknown msg WM_USER+%04x wp=%04Ix lp=%08Ix\n", message - WM_USER, wParam, lParam ); break; } diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3ce3d3f24aa..3e83ada3ee5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -231,7 +231,7 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, *compr = header->biCompression; return 1; } - WARN("unknown/wrong size (%u) for header\n", header->biSize); + WARN("unknown/wrong size (%lu) for header\n", header->biSize); return -1; } @@ -805,12 +805,12 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp if (maxsize < sizeof(BITMAPCOREHEADER)) { - WARN( "invalid size %u\n", maxsize ); + WARN( "invalid size %lu\n", maxsize ); return FALSE; } if (maxsize < bmi->bmiHeader.biSize) { - WARN( "invalid header size %u\n", bmi->bmiHeader.biSize ); + WARN( "invalid header size %lu\n", bmi->bmiHeader.biSize ); return FALSE; } if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && @@ -818,7 +818,7 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp (bmi->bmiHeader.biCompression != BI_RGB && bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { - WARN( "invalid bitmap header %u\n", bmi->bmiHeader.biSize ); + WARN( "invalid bitmap header %lu\n", bmi->bmiHeader.biSize ); return FALSE; } @@ -829,7 +829,7 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp mask_size = get_dib_image_size( bmi_width, bmi_height / 2, 1 ); if (size > maxsize || color_size > maxsize - size) { - WARN( "truncated file %u < %u+%u+%u\n", maxsize, size, color_size, mask_size ); + WARN( "truncated file %lu < %lu+%lu+%lu\n", maxsize, size, color_size, mask_size ); return 0; } if (mask_size > maxsize - size - color_size) mask_size = 0; /* no mask */ @@ -1043,15 +1043,15 @@ typedef struct { static void dump_ani_header( const ani_header *header ) { - TRACE(" header size: %d\n", header->header_size); - TRACE(" frames: %d\n", header->num_frames); - TRACE(" steps: %d\n", header->num_steps); - TRACE(" width: %d\n", header->width); - TRACE(" height: %d\n", header->height); - TRACE(" bpp: %d\n", header->bpp); - TRACE(" planes: %d\n", header->num_planes); - TRACE(" display rate: %d\n", header->display_rate); - TRACE(" flags: 0x%08x\n", header->flags); + TRACE(" header size: %ld\n", header->header_size); + TRACE(" frames: %ld\n", header->num_frames); + TRACE(" steps: %ld\n", header->num_steps); + TRACE(" width: %ld\n", header->width); + TRACE(" height: %ld\n", header->height); + TRACE(" bpp: %ld\n", header->bpp); + TRACE(" planes: %ld\n", header->num_planes); + TRACE(" display rate: %ld\n", header->display_rate); + TRACE(" flags: 0x%08lx\n", header->flags); } @@ -1133,7 +1133,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, const unsigned char *icon_chunk; const unsigned char *icon_data; - TRACE("bits %p, bits_size %d\n", bits, bits_size); + TRACE("bits %p, bits_size %ld\n", bits, bits_size); riff_find_chunk( ANI_ACON_ID, ANI_RIFF_ID, &root_chunk, &ACON_chunk ); if (!ACON_chunk.data) @@ -1266,7 +1266,7 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, POINT hotspot; const BITMAPINFO *bmi; - TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", + TRACE_(cursor)("%p (%u bytes), ver %08lx, %ix%i %s %s\n", bits, cbSize, dwVersion, width, height, bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); @@ -1619,7 +1619,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) */ BOOL WINAPI SetSystemCursor(HCURSOR hcur, DWORD id) { - FIXME("(%p,%08x),stub!\n", hcur, id); + FIXME("(%p,%08lx),stub!\n", hcur, id); return TRUE; } @@ -1857,7 +1857,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) HICON ret; HDC hdc; - TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", + TRACE("color %p, mask %p, hotspot %lux%lu, fIcon %d\n", iconinfo->hbmColor, iconinfo->hbmMask, iconinfo->xHotspot, iconinfo->yHotspot, iconinfo->fIcon); diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 3b066bde4ec..dae520bfeb3 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -59,7 +59,7 @@ const WCHAR WDML_szClientConvClassW[] = L"WineDdeClientW"; HCONVLIST WINAPI DdeConnectList(DWORD idInst, HSZ hszService, HSZ hszTopic, HCONVLIST hConvList, PCONVCONTEXT pCC) { - FIXME("(%d,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); + FIXME("(%ld,%p,%p,%p,%p): stub\n", idInst, hszService, hszTopic, hConvList, pCC); return (HCONVLIST)1; } @@ -100,7 +100,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, WDML_CONV* pConv; ATOM aSrv = 0, aTpc = 0; - TRACE("(0x%x,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); + TRACE("(0x%lx,%p,%p,%p)\n", idInst, hszService, hszTopic, pCC); pInstance = WDML_GetInstance(idInst); if (!pInstance) @@ -520,7 +520,7 @@ static WDML_QUEUE_STATE WDML_HandleRequestReply(WDML_CONV* pConv, MSG* msg, WDML case WM_DDE_DATA: UnpackDDElParam(WM_DDE_DATA, msg->lParam, &uiLo, &uiHi); - TRACE("Got the result (%08lx)\n", uiLo); + TRACE("Got the result (%08Ix)\n", uiLo); hsz = WDML_MakeHszFromAtom(pConv->instance, uiHi); @@ -1021,7 +1021,7 @@ static HDDEDATA WDML_SyncWaitTransactionReply(HCONV hConv, DWORD dwTimeout, cons DWORD err; WDML_CONV* pConv; - TRACE("Starting wait for a timeout of %d ms\n", dwTimeout); + TRACE("Starting wait for a timeout of %ld ms\n", dwTimeout); start = GetTickCount(); while ((elapsed = GetTickCount() - start) < dwTimeout) @@ -1104,7 +1104,7 @@ HDDEDATA WDML_ClientHandle(WDML_CONV *pConv, WDML_XACT *pXAct, DWORD dwTimeout, if (!PostMessageW(pConv->hwndServer, pXAct->ddeMsg, (WPARAM)pConv->hwndClient, pXAct->lParam)) { - WARN("Failed posting message %x to %p (error=0x%x)\n", + WARN("Failed posting message %x to %p (error=0x%lx)\n", pXAct->ddeMsg, pConv->hwndServer, GetLastError()); pConv->wStatus &= ~ST_CONNECTED; pConv->instance->lastError = DMLERR_POSTMSG_FAILED; @@ -1137,7 +1137,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS WDML_XACT* pXAct; HDDEDATA hDdeData; - TRACE("(%p,%d,%p,%p,%x,%x,%d,%p)\n", + TRACE("(%p,%ld,%p,%p,%x,%x,%ld,%p)\n", pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); if (hConv == 0) @@ -1211,7 +1211,7 @@ HDDEDATA WINAPI DdeClientTransaction(LPBYTE pData, DWORD cbData, HCONV hConv, HS WDML_QueueTransaction(pConv, pXAct); - TRACE("pConv->wStatus %04x\n", pConv->wStatus); + TRACE("pConv->wStatus %04lx\n", pConv->wStatus); if (pConv->wStatus & ST_BLOCKED) { @@ -1293,7 +1293,7 @@ static LRESULT CALLBACK WDML_ClientProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPA WDML_CONV* pConv = NULL; HSZ hszSrv, hszTpc; - TRACE("%p %04x %08lx %08lx\n", hwnd, iMsg, wParam , lParam); + TRACE("%p %04x %08Ix %08Ix\n", hwnd, iMsg, wParam, lParam); if (iMsg == WM_DDE_ACK && /* in the initial WM_INITIATE sendmessage */ diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index 7bc1656432e..1751a5f481a 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -202,7 +202,7 @@ LPARAM WINAPI ReuseDDElParam(LPARAM lParam, UINT msgIn, UINT msgOut, } params[0] = uiLo; params[1] = uiHi; - TRACE("Reusing pack %08lx %08lx\n", uiLo, uiHi); + TRACE("Reusing pack %08Ix %08Ix\n", uiLo, uiHi); GlobalUnlock( (HGLOBAL)lParam ); return lParam; @@ -512,7 +512,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); /* First check instance */ @@ -523,7 +523,7 @@ DWORD WINAPI DdeQueryStringA(DWORD idInst, HSZ hsz, LPSTR psz, DWORD cchMax, INT ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); } - TRACE("returning %d (%s)\n", ret, debugstr_a(psz)); + TRACE("returning %ld (%s)\n", ret, debugstr_a(psz)); return ret; } @@ -536,7 +536,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN DWORD ret = 0; WDML_INSTANCE* pInstance; - TRACE("(%d, %p, %p, %d, %d)\n", idInst, hsz, psz, cchMax, iCodePage); + TRACE("(%ld, %p, %p, %ld, %d)\n", idInst, hsz, psz, cchMax, iCodePage); /* First check instance */ @@ -547,7 +547,7 @@ DWORD WINAPI DdeQueryStringW(DWORD idInst, HSZ hsz, LPWSTR psz, DWORD cchMax, IN ret = WDML_QueryString(pInstance, hsz, psz, cchMax, iCodePage); } - TRACE("returning %d (%s)\n", ret, debugstr_w(psz)); + TRACE("returning %ld (%s)\n", ret, debugstr_w(psz)); return ret; } @@ -588,7 +588,7 @@ HSZ WINAPI DdeCreateStringHandleA(DWORD idInst, LPCSTR psz, INT codepage) HSZ hsz = 0; WDML_INSTANCE* pInstance; - TRACE("(%d,%s,%d)\n", idInst, debugstr_a(psz), codepage); + TRACE("(%ld,%s,%d)\n", idInst, debugstr_a(psz), codepage); pInstance = WDML_GetInstance(idInst); if (pInstance == NULL) @@ -642,7 +642,7 @@ BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%d,%p):\n", idInst, hsz); + TRACE("(%ld,%p):\n", idInst, hsz); /* First check instance */ @@ -665,7 +665,7 @@ BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%d,%p):\n", idInst, hsz); + TRACE("(%ld,%p):\n", idInst, hsz); /* First check instance */ @@ -757,7 +757,7 @@ static void WDML_IncrementInstanceId(WDML_INSTANCE* pInstance) DWORD id = InterlockedIncrement(&WDML_MaxInstanceID); pInstance->instanceID = id; - TRACE("New instance id %d allocated\n", id); + TRACE("New instance id %ld allocated\n", id); } /****************************************************************** @@ -841,7 +841,7 @@ static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, UINT ret; WNDCLASSEXW wndclass; - TRACE("(%p,%p,0x%x,%d,0x%x)\n", + TRACE("(%p,%p,0x%lx,%ld,0x%x)\n", pidInst, pfnCallback, afCmd, ulRes, bUnicode); if (ulRes) @@ -896,7 +896,7 @@ static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, if (*pidInst == 0) { /* Initialisation of new Instance Identifier */ - TRACE("new instance, callback %p flags %X\n",pfnCallback,afCmd); + TRACE("new instance, callback %p flags %lX\n", pfnCallback, afCmd); EnterCriticalSection(&WDML_CritSect); @@ -999,7 +999,7 @@ static UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, else { /* Reinitialisation situation --- FIX */ - TRACE("reinitialisation of (%p,%p,0x%x,%d): stub\n", pidInst, pfnCallback, afCmd, ulRes); + TRACE("reinitialisation of (%p,%p,0x%lx,%ld): stub\n", pidInst, pfnCallback, afCmd, ulRes); EnterCriticalSection(&WDML_CritSect); @@ -1126,7 +1126,7 @@ BOOL WINAPI DdeUninitialize(DWORD idInst) WDML_CONV* pConv; WDML_CONV* pConvNext; - TRACE("(%d)\n", idInst); + TRACE("(%ld)\n", idInst); /* First check instance */ @@ -1221,7 +1221,7 @@ HDDEDATA WDML_InvokeCallback(WDML_INSTANCE* pInstance, UINT uType, UINT uFmt, H if (pInstance == NULL) return NULL; - TRACE("invoking CB[%p] (%x %x %p %p %p %p %lx %lx)\n", + TRACE("invoking CB[%p] (%x %x %p %p %p %p %Ix %Ix)\n", pInstance->callback, uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); ret = pInstance->callback(uType, uFmt, hConv, hsz1, hsz2, hdata, dwData1, dwData2); @@ -1258,7 +1258,7 @@ WDML_INSTANCE* WDML_GetInstance(DWORD instId) LeaveCriticalSection(&WDML_CritSect); if (!pInstance) - WARN("Instance entry missing for id %04x\n", instId); + WARN("Instance entry missing for id %04lx\n", instId); return pInstance; } @@ -1308,7 +1308,7 @@ HDDEDATA WINAPI DdeCreateDataHandle(DWORD idInst, LPBYTE pSrc, DWORD cb, DWORD c psz[1] = 0; } - TRACE("(%d,%p,cb %d, cbOff %d,%p <%s>,fmt %04x,%x)\n", + TRACE("(%ld,%p,cb %ld, cbOff %ld,%p <%s>,fmt %04x,%x)\n", idInst, pSrc, cb, cbOff, hszItem, debugstr_w(psz), wFmt, afCmd); if (afCmd != 0 && afCmd != HDATA_APPOWNED) @@ -1351,7 +1351,7 @@ HDDEDATA WINAPI DdeAddData(HDDEDATA hData, LPBYTE pSrc, DWORD cb, DWORD cbOff) DWORD old_sz, new_sz; LPBYTE pDst; - TRACE("(%p,%p,cb %d, cbOff %d)\n", hData, pSrc, cb, cbOff); + TRACE("(%p,%p,cb %ld, cbOff %ld)\n", hData, pSrc, cb, cbOff); pDst = DdeAccessData(hData, &old_sz); if (!pDst) return 0; @@ -1390,7 +1390,7 @@ DWORD WINAPI DdeGetData(HDDEDATA hData, LPBYTE pDst, DWORD cbMax, DWORD cbOff) DWORD dwSize, dwRet; LPBYTE pByte; - TRACE("(%p,%p,%d,%d)\n", hData, pDst, cbMax, cbOff); + TRACE("(%p,%p,%ld,%ld)\n", hData, pDst, cbMax, cbOff); pByte = DdeAccessData(hData, &dwSize); @@ -1446,7 +1446,7 @@ LPBYTE WINAPI DdeAccessData(HDDEDATA hData, LPDWORD pcbDataSize) { *pcbDataSize = GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD); } - TRACE("=> %p (%lu) fmt %04x\n", pDdh + 1, GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD), pDdh->cfFormat); + TRACE("=> %p (%Iu) fmt %04x\n", pDdh + 1, GlobalSize(hMem) - sizeof(DDE_DATAHANDLE_HEAD), pDdh->cfFormat); return (LPBYTE)(pDdh + 1); } @@ -1553,7 +1553,7 @@ HDDEDATA WDML_Global2DataHandle(WDML_CONV* pConv, HGLOBAL hMem, WINE_DDEH } else { - ERR("Wrong count: %u / %d\n", size, count); + ERR("Wrong count: %lu / %d\n", size, count); } } else ERR("No bitmap header\n"); break; @@ -2043,7 +2043,7 @@ WDML_CONV* WDML_AddConv(WDML_INSTANCE* pInstance, WDML_SIDE side, pConv->next = pInstance->convs[side]; pInstance->convs[side] = pConv; - TRACE("pConv->wStatus %04x pInstance(%p)\n", pConv->wStatus, pInstance); + TRACE("pConv->wStatus %04lx pInstance(%p)\n", pConv->wStatus, pInstance); return pConv; } @@ -2137,7 +2137,7 @@ static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) if (wCmd == EC_DISABLE) { pConv->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: conv %p status flags %04x\n", pConv, pConv->wStatus); + TRACE("EC_DISABLE: conv %p status flags %04lx\n", pConv, pConv->wStatus); return TRUE; } @@ -2153,7 +2153,7 @@ static BOOL WDML_EnableCallback(WDML_CONV *pConv, UINT wCmd) if (wCmd == EC_ENABLEALL) { pConv->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: conv %p status flags %04x\n", pConv, pConv->wStatus); + TRACE("EC_ENABLEALL: conv %p status flags %04lx\n", pConv, pConv->wStatus); } while (pConv->transactions) @@ -2188,7 +2188,7 @@ BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) BOOL ret = FALSE; WDML_CONV *pConv; - TRACE("(%d, %p, %04x)\n", idInst, hConv, wCmd); + TRACE("(%ld, %p, %04x)\n", idInst, hConv, wCmd); if (hConv) { @@ -2210,12 +2210,12 @@ BOOL WINAPI DdeEnableCallback(DWORD idInst, HCONV hConv, UINT wCmd) if (wCmd == EC_DISABLE) { pInstance->wStatus |= ST_BLOCKED; - TRACE("EC_DISABLE: inst %p status flags %04x\n", pInstance, pInstance->wStatus); + TRACE("EC_DISABLE: inst %p status flags %04lx\n", pInstance, pInstance->wStatus); } else if (wCmd == EC_ENABLEALL) { pInstance->wStatus &= ~ST_BLOCKED; - TRACE("EC_ENABLEALL: inst %p status flags %04x\n", pInstance, pInstance->wStatus); + TRACE("EC_ENABLEALL: inst %p status flags %04lx\n", pInstance, pInstance->wStatus); } ret = TRUE; @@ -2437,7 +2437,7 @@ UINT WINAPI DdeQueryConvInfo(HCONV hConv, DWORD id, PCONVINFO lpConvInfo) CONVINFO ci; WDML_CONV* pConv; - TRACE("(%p,%x,%p)\n", hConv, id, lpConvInfo); + TRACE("(%p,%lx,%p)\n", hConv, id, lpConvInfo); if (!hConv) { diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 26494b835e5..7f5dff5605c 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -67,7 +67,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) ATOM atom; UINT count; - TRACE("(%d,%p,%p)\n", idInst, hszTopic, hszItem); + TRACE("(%ld,%p,%p)\n", idInst, hszTopic, hszItem); pInstance = WDML_GetInstance(idInst); @@ -169,7 +169,7 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) HWND hwndServer; WNDCLASSEXW wndclass; - TRACE("(%d,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); + TRACE("(%ld,%p,%p,%x)\n", idInst, hsz1, hsz2, afCmd); /* First check instance */ @@ -237,7 +237,7 @@ HDDEDATA WINAPI DdeNameService(DWORD idInst, HSZ hsz1, HSZ hsz2, UINT afCmd) hwndServer = CreateWindowW(L"WineDdeServerName", NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, 0); SetWindowLongPtrW(hwndServer, GWL_WDML_INSTANCE, (ULONG_PTR)pInstance); SetWindowLongPtrW(hwndServer, GWL_WDML_SERVER, (ULONG_PTR)pServer); - TRACE("Created nameServer=%p for instance=%08x\n", hwndServer, idInst); + TRACE("Created nameServer=%p for instance=%08lx\n", hwndServer, idInst); pServer->hwndServer = hwndServer; break; @@ -338,7 +338,7 @@ static WDML_CONV* WDML_CreateServerConv(WDML_INSTANCE* pInstance, HWND hwndClien hwndServerName, 0, 0, 0); } - TRACE("Created convServer=%p (nameServer=%p) for instance=%08x unicode=%d\n", + TRACE("Created convServer=%p (nameServer=%p) for instance=%08lx unicode=%d\n", hwndServerConv, hwndServerName, pInstance->instanceID, pInstance->unicode); pConv = WDML_AddConv(pInstance, WDML_SERVER_SIDE, hszApp, hszTopic, @@ -391,7 +391,7 @@ static LRESULT CALLBACK WDML_ServerNameProc(HWND hwndServer, UINT iMsg, WPARAM w pInstance = WDML_GetInstanceFromWnd(hwndServer); if (!pInstance) return 0; - TRACE("idInst=%d, threadID=0x%x\n", pInstance->instanceID, GetCurrentThreadId()); + TRACE("idInst=%ld, threadID=0x%lx\n", pInstance->instanceID, GetCurrentThreadId()); /* don't free DDEParams, since this is a broadcast */ UnpackDDElParam(WM_DDE_INITIATE, lParam, &uiLo, &uiHi); @@ -1027,7 +1027,7 @@ static LRESULT CALLBACK WDML_ServerConvProc(HWND hwndServer, UINT iMsg, WPARAM w WDML_CONV* pConv; WDML_XACT* pXAct = NULL; - TRACE("%p %04x %08lx %08lx\n", hwndServer, iMsg, wParam, lParam); + TRACE("%p %04x %08Ix %08Ix\n", hwndServer, iMsg, wParam, lParam); if (iMsg == WM_DESTROY) { diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 95967269daf..66000995861 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -177,7 +177,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, p += lstrlenW( info->windowName ) + 1; } - TRACE(" %s %s %ld, %d, %d, %d, %d, %08x, %08x, %08x\n", + TRACE(" %s %s %Id, %d, %d, %d, %d, %08lx, %08lx, %08lx\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 ); @@ -335,11 +335,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, %d\n", + TRACE("DIALOG%s %d, %d, %d, %d, %ld\n", result->dialogEx ? "EX" : "", result->x, result->y, result->cx, result->cy, result->helpId ); - TRACE(" STYLE 0x%08x\n", result->style ); - TRACE(" EXSTYLE 0x%08x\n", result->exStyle ); + TRACE(" STYLE 0x%08lx\n", result->style ); + TRACE(" EXSTYLE 0x%08lx\n", result->exStyle ); /* Get the menu name */ @@ -909,7 +909,7 @@ BOOL WINAPI EndDialog( HWND hwnd, INT_PTR retval ) DIALOGINFO * dlgInfo; HWND owner; - TRACE("%p %ld\n", hwnd, retval ); + TRACE("%p %Id\n", hwnd, retval ); if (!(dlgInfo = DIALOG_get_info( hwnd, FALSE ))) { @@ -1530,7 +1530,7 @@ DWORD WINAPI GetDialogBaseUnits(void) cx = GdiGetCharDimensions( hdc, NULL, &cy ); NtUserReleaseDC( 0, hdc ); } - TRACE( "base units = %d,%d\n", cx, cy ); + TRACE( "base units = %ld,%ld\n", cx, cy ); } return MAKELONG( MulDiv( cx, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ), diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4e32a59df48..b7eaf2b9ddf 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -405,7 +405,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData_linedef(EDITSTATE *es, HD NULL, NULL, NULL, &tabdef, NULL, &line_def->ssa); if (FAILED(hr)) { - WARN("ScriptStringAnalyse failed (%x)\n",hr); + WARN("ScriptStringAnalyse failed (%lx)\n",hr); line_def->ssa = NULL; } @@ -2466,7 +2466,7 @@ static HLOCAL EDIT_EM_GetHandle(EDITSTATE *es) /* The text buffer handle belongs to the app */ es->hlocapp = hLocal; - TRACE("Returning %p, LocalSize() = %ld\n", hLocal, LocalSize(hLocal)); + TRACE("Returning %p, LocalSize() = %Id\n", hLocal, LocalSize(hLocal)); return hLocal; } @@ -4027,7 +4027,7 @@ static LRESULT EDIT_WM_StyleChanged ( EDITSTATE *es, WPARAM which, const STYLES } else if (GWL_EXSTYLE == which) { ; /* FIXME - what is needed here */ } else { - WARN ("Invalid style change %ld\n",which); + WARN ("Invalid style change %Id\n",which); } return 0; @@ -4176,7 +4176,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) INT fw = es->format_rect.right - es->format_rect.left; ret = es->text_width ? es->x_offset * 100 / (es->text_width - fw) : 0; } - TRACE("EM_GETTHUMB: returning %ld\n", ret); + TRACE("EM_GETTHUMB: returning %Id\n", ret); return ret; } case EM_LINESCROLL: @@ -4299,7 +4299,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) INT vlc = get_vertical_line_count(es); ret = es->line_count ? es->y_offset * 100 / (es->line_count - vlc) : 0; } - TRACE("EM_GETTHUMB: returning %ld\n", ret); + TRACE("EM_GETTHUMB: returning %Id\n", ret); return ret; } case EM_LINESCROLL: @@ -4483,7 +4483,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) EDITSTATE *es; UINT alloc_size; - TRACE("Creating %s edit control, style = %08x\n", + TRACE("Creating %s edit control, style = %08lx\n", unicode ? "Unicode" : "ANSI", lpcs->style); if (!(es = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*es)))) @@ -4691,7 +4691,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); LRESULT result = 0; - TRACE("hwnd=%p msg=%x (%s) wparam=%lx lparam=%lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE("hwnd=%p msg=%x (%s) wparam=%Ix lparam=%Ix\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), wParam, lParam); if (!es && msg != WM_NCCREATE) return DefWindowProcT(hwnd, msg, wParam, lParam, unicode); @@ -5246,7 +5246,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) EDIT_UnlockBuffer(es, FALSE); - TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); + TRACE("hwnd=%p msg=%x (%s) -- 0x%08Ix\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); return result; } diff --git a/dlls/user32/exticon.c b/dlls/user32/exticon.c index a9bc922a782..80106a62edb 100644 --- a/dlls/user32/exticon.c +++ b/dlls/user32/exticon.c @@ -297,13 +297,13 @@ static UINT ICO_ExtractIconExW( CloseHandle(hFile); if (!fmapping) { - WARN("CreateFileMapping error %d\n", GetLastError() ); + WARN("CreateFileMapping error %ld\n", GetLastError() ); return 0xFFFFFFFF; } if (!(peimage = MapViewOfFile(fmapping, FILE_MAP_READ, 0, 0, 0))) { - WARN("MapViewOfFile error %d\n", GetLastError() ); + WARN("MapViewOfFile error %ld\n", GetLastError() ); CloseHandle(fmapping); return 0xFFFFFFFF; } @@ -332,7 +332,7 @@ static UINT ICO_ExtractIconExW( LPicoICONDIR lpiID = NULL; ULONG uSize = 0; - TRACE("-- OS2/icon Signature (0x%08x)\n", sig); + TRACE("-- OS2/icon Signature (0x%08lx)\n", sig); if (pData == (BYTE*)-1) { @@ -340,7 +340,7 @@ static UINT ICO_ExtractIconExW( if (pCIDir) { iconDirCount = 1; iconCount = lpiID->idCount; - TRACE("-- icon found %p 0x%08x 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); + TRACE("-- icon found %p 0x%08lx 0x%08x 0x%08x\n", pCIDir, uSize, iconDirCount, iconCount); } } else while (pTInfo->type_id && !(pIconStorage && pIconDir)) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index c0ebe05684f..357a7fdb25a 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -289,14 +289,14 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L { LRESULT ret; - TRACE_(relay)( "\1Call hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx)\n", + TRACE_(relay)( "\1Call hook proc %p (id=%s,code=%x,wp=%08Ix,lp=%08Ix)\n", proc, hook_names[id-WH_MINHOOK], code, wparam, lparam ); if (!prev_unicode == !next_unicode) ret = proc( code, wparam, lparam ); else if (prev_unicode) ret = call_hook_WtoA( proc, id, code, wparam, lparam ); else ret = call_hook_AtoW( proc, id, code, wparam, lparam ); - TRACE_(relay)( "\1Ret hook proc %p (id=%s,code=%x,wp=%08lx,lp=%08lx) retval=%08lx\n", + TRACE_(relay)( "\1Ret hook proc %p (id=%s,code=%x,wp=%08Ix,lp=%08Ix) retval=%08Ix\n", proc, hook_names[id-WH_MINHOOK], code, wparam, lparam, ret ); return ret; @@ -409,7 +409,7 @@ HWINEVENTHOOK WINAPI SetWinEventHook(DWORD event_min, DWORD event_max, UNICODE_STRING str; DWORD len = 0; - TRACE("%d,%d,%p,%p,%08x,%04x,%08x\n", event_min, event_max, inst, + TRACE("%ld,%ld,%p,%p,%08lx,%04lx,%08lx\n", event_min, event_max, inst, proc, pid, tid, flags); if (inst && (!(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH)) @@ -429,14 +429,14 @@ BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, if (params->module[0] && !(proc = get_hook_proc( proc, params->module, &free_module ))) return FALSE; - TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", + TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n", proc, params->handle, params->event, params->hwnd, params->object_id, params->child_id, params->tid, params->time ); proc( params->handle, params->event, params->hwnd, params->object_id, params->child_id, params->tid, params->time ); - TRACE_(relay)( "\1Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", + TRACE_(relay)( "\1Ret winevent hook proc %p (hhook=%p,event=%lx,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04lx,time=%lx)\n", proc, params->handle, params->event, params->hwnd, params->object_id, params->child_id, params->tid, params->time ); @@ -477,7 +477,7 @@ BOOL WINAPI User32CallWindowsHook( const struct win_hook_params *params, ULONG s BOOL WINAPI IsWinEventHookInstalled(DWORD dwEvent) { /* FIXME: Needed by Office 2007 installer */ - WARN("(%d)-stub!\n", dwEvent); + WARN("(%ld)-stub!\n", dwEvent); return TRUE; } diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 06756b5551e..5fd5fe6d044 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -578,7 +578,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationW( HANDLE handle, void *filter, DWOR struct device_notification_details details; DEV_BROADCAST_HDR *header = filter; - TRACE("handle %p, filter %p, flags %#x\n", handle, filter, flags); + TRACE("handle %p, filter %p, flags %#lx\n", handle, filter, flags); if (flags & ~(DEVICE_NOTIFY_SERVICE_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES)) { diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5c0aab5b008..0eed2fdfe65 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2688,7 +2688,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam } if (descr->style & LBS_COMBOBOX) lphc = descr->lphc; - TRACE("[%p]: msg %s wp %08lx lp %08lx\n", + TRACE("[%p]: msg %s wp %08Ix lp %08Ix\n", descr->self, SPY_GetMsgName(msg, descr->self), wParam, lParam ); switch(msg) @@ -3257,7 +3257,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam default: if ((msg >= WM_USER) && (msg < 0xc000)) - WARN("[%p]: unknown msg %04x wp %08lx lp %08lx\n", + WARN("[%p]: unknown msg %04x wp %08Ix lp %08Ix\n", hwnd, msg, wParam, lParam ); } diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index e6a391e03c3..e5a52012413 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -717,7 +717,7 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) LONG posOptions = SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER; MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL); - TRACE("move %p to (%d,%d) size [%d,%d]\n", + TRACE("move %p to (%ld,%ld) size [%ld,%ld]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); style = GetWindowLongW(win_array[i], GWL_STYLE); @@ -1032,7 +1032,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM { MDICLIENTINFO *ci; - TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08Ix %08Ix\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); if (!(ci = get_client_info( hwnd ))) { @@ -1209,7 +1209,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM pt.y = (short)HIWORD(lParam); child = ChildWindowFromPoint(hwnd, pt); - TRACE("notification from %p (%i,%i)\n",child,pt.x,pt.y); + TRACE("notification from %p (%li,%li)\n",child,pt.x,pt.y); if (child && child != hwnd && child != ci->hwndActiveChild) NtUserSetWindowPos( child, 0,0,0,0,0, SWP_NOSIZE | SWP_NOMOVE ); @@ -1290,7 +1290,7 @@ LRESULT WINAPI DefFrameProcW( HWND hwnd, HWND hwndMDIClient, { MDICLIENTINFO *ci = get_client_info( hwndMDIClient ); - TRACE("%p %p %04x (%s) %08lx %08lx\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %p %04x (%s) %08Ix %08Ix\n", hwnd, hwndMDIClient, message, SPY_GetMsgName(message, hwnd), wParam, lParam); if (ci) { @@ -1388,7 +1388,7 @@ LRESULT WINAPI DefMDIChildProcA( HWND hwnd, UINT message, HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client ); - TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08Ix %08Ix\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); hwnd = WIN_GetFullHandle( hwnd ); if (!ci) return DefWindowProcA( hwnd, message, wParam, lParam ); @@ -1428,7 +1428,7 @@ LRESULT WINAPI DefMDIChildProcW( HWND hwnd, UINT message, HWND client = GetParent(hwnd); MDICLIENTINFO *ci = get_client_info( client ); - TRACE("%p %04x (%s) %08lx %08lx\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); + TRACE("%p %04x (%s) %08Ix %08Ix\n", hwnd, message, SPY_GetMsgName(message, hwnd), wParam, lParam); hwnd = WIN_GetFullHandle( hwnd ); if (!ci) return DefWindowProcW( hwnd, message, wParam, lParam ); @@ -1598,7 +1598,7 @@ HWND WINAPI CreateMDIWindowA( HINSTANCE hInstance, /* [in] Handle to application instance */ LPARAM lParam) /* [in] Application-defined value */ { - TRACE("(%s,%s,%08x,%d,%d,%d,%d,%p,%p,%08lx)\n", + TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08Ix)\n", debugstr_a(lpClassName),debugstr_a(lpWindowName),dwStyle,X,Y, nWidth,nHeight,hWndParent,hInstance,lParam); @@ -1626,7 +1626,7 @@ HWND WINAPI CreateMDIWindowW( HINSTANCE hInstance, /* [in] Handle to application instance */ LPARAM lParam) /* [in] Application-defined value */ { - TRACE("(%s,%s,%08x,%d,%d,%d,%d,%p,%p,%08lx)\n", + TRACE("(%s,%s,%08lx,%d,%d,%d,%d,%p,%p,%08Ix)\n", debugstr_w(lpClassName), debugstr_w(lpWindowName), dwStyle, X, Y, nWidth, nHeight, hWndParent, hInstance, lParam); @@ -1668,7 +1668,7 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg ) default: return FALSE; } - TRACE("wParam = %04lx\n", wParam); + TRACE("wParam = %04Ix\n", wParam); SendMessageW(ci->hwndActiveChild, WM_SYSCOMMAND, wParam, msg->wParam); return TRUE; } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index afe3c50154e..1ae722b7662 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -167,7 +167,7 @@ static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, TRACE("%s ", prefix); if (mp) { UINT flags = mp->fType; - TRACE( "{ ID=0x%lx", mp->wID); + TRACE( "{ ID=0x%Ix", mp->wID); if ( mp->hSubMenu) TRACE( ", Sub=%p", mp->hSubMenu); if (flags) { @@ -207,7 +207,7 @@ static void do_debug_print_menuitem(const char *prefix, const MENUITEM *mp, if (mp->text) TRACE( ", Text=%s", debugstr_w(mp->text)); if (mp->dwItemData) - TRACE( ", ItemData=0x%08lx", mp->dwItemData); + TRACE( ", ItemData=0x%08Ix", mp->dwItemData); if (mp->hbmpItem) { if( IS_MAGIC_BITMAP(mp->hbmpItem)) @@ -915,7 +915,7 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, HFONT hfont, hfontsav; LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, L"Marlett" }; logfont.lfHeight = min( h, w) - 5 ; - TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); + TRACE(" height %ld rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); hfont = CreateFontIndirectW( &logfont); hfontsav = SelectObject(hdc, hfont); TextOutW( hdc, rect->left, rect->top + 2, &bmchr, 1); @@ -1001,7 +1001,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, } else lpitem->rect.bottom += mis.itemHeight; - TRACE("id=%04lx size=%dx%d\n", + TRACE("id=%04Ix size=%ldx%ld\n", lpitem->wID, lpitem->rect.right-lpitem->rect.left, lpitem->rect.bottom-lpitem->rect.top); return; @@ -1747,7 +1747,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) if (menu) { - TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); + TRACE("hmenu %p Style %08lx\n", hmenu, menu->dwStyle); /* draw menu items */ if (menu->nItems) { @@ -2408,7 +2408,7 @@ static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu, UINT wFlags ) item = &menu->items[menu->FocusedItem]; - TRACE("hMenu %p wID %08lx hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType); + TRACE("hMenu %p wID %08Ix hSubMenu %p fType %04x\n", hMenu, item->wID, item->hSubMenu, item->fType); if (!(item->fType & MF_POPUP)) { @@ -3444,7 +3444,7 @@ BOOL WINAPI TrackPopupMenu( HMENU hMenu, UINT wFlags, INT x, INT y, */ LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - TRACE("hwnd=%p msg=0x%04x wp=0x%04lx lp=0x%08lx\n", hwnd, message, wParam, lParam); + TRACE("hwnd=%p msg=0x%04x wp=0x%04Ix lp=0x%08Ix\n", hwnd, message, wParam, lParam); switch(message) { @@ -3770,9 +3770,9 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, MENUITEMINFOW mii; if (IS_STRING_ITEM(flags) && str) - TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", + TRACE("hMenu %p, pos %d, flags %08x, id %04Ix, str %s\n", hMenu, pos, flags, id, debugstr_w(str) ); - else TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %p (not a string)\n", + else TRACE("hMenu %p, pos %d, flags %08x, id %04Ix, str %p (not a string)\n", hMenu, pos, flags, id, str ); MENU_mnu2mnuii( flags, id, str, &mii); @@ -3834,9 +3834,9 @@ BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, MENUITEMINFOW mii; if (IS_STRING_ITEM(flags)) - TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); + TRACE("%p %d %04x %04Ix %s\n", hMenu, pos, flags, id, debugstr_w(str) ); else - TRACE("%p %d %04x %04lx %p\n", hMenu, pos, flags, id, str ); + TRACE("%p %d %04x %04Ix %p\n", hMenu, pos, flags, id, str ); MENU_mnu2mnuii( flags, id, str, &mii); return NtUserThunkedMenuItemInfo( hMenu, pos, flags, NtUserSetMenuItemInfo, &mii, NULL ); @@ -3944,7 +3944,7 @@ BOOL WINAPI GetMenuBarInfo( HWND hwnd, LONG idObject, LONG idItem, PMENUBARINFO HMENU hmenu = NULL; ATOM class_atom; - TRACE( "(%p,0x%08x,0x%08x,%p)\n", hwnd, idObject, idItem, pmbi ); + TRACE( "(%p,0x%08lx,0x%08lx,%p)\n", hwnd, idObject, idItem, pmbi ); switch (idObject) { @@ -4683,7 +4683,7 @@ INT WINAPI MenuItemFromPoint(HWND hWnd, HMENU hMenu, POINT ptScreen) */ DWORD WINAPI CalcMenuBar(HWND hwnd, DWORD left, DWORD right, DWORD top, RECT *rect) { - FIXME("(%p, %d, %d, %d, %p): stub\n", hwnd, left, right, top, rect); + FIXME("(%p, %ld, %ld, %ld, %p): stub\n", hwnd, left, right, top, rect); return 0; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 990323dde65..02c40f2ca4f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -393,13 +393,13 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD ptr = &hpack; size = sizeof(hpack); lp = uiLo; - TRACE( "send dde-ack %lx %08lx => %p\n", uiLo, uiHi, h ); + TRACE( "send dde-ack %Ix %08Ix => %p\n", uiLo, uiHi, h ); } } else { /* uiHi should contain either an atom or 0 */ - TRACE( "send dde-ack %lx atom=%lx\n", uiLo, uiHi ); + TRACE( "send dde-ack %Ix atom=%Ix\n", uiLo, uiHi ); lp = MAKELONG( uiLo, uiHi ); } break; @@ -428,7 +428,7 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD hunlock = (HGLOBAL)uiLo; } } - TRACE( "send ddepack %u %lx\n", size, uiHi ); + TRACE( "send ddepack %u %Ix\n", size, uiHi ); break; case WM_DDE_EXECUTE: if (lparam) @@ -496,13 +496,13 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam memcpy( &hpack, *buffer, size ); hMem = unpack_ptr( hpack ); uiHi = (UINT_PTR)hMem; - TRACE("recv dde-ack %lx mem=%lx[%lx]\n", uiLo, uiHi, GlobalSize( hMem )); + TRACE("recv dde-ack %Ix mem=%Ix[%Ix]\n", uiLo, uiHi, GlobalSize( hMem )); } else { uiLo = LOWORD( *lparam ); uiHi = HIWORD( *lparam ); - TRACE("recv dde-ack %lx atom=%lx\n", uiLo, uiHi); + TRACE("recv dde-ack %Ix atom=%Ix\n", uiLo, uiHi); } *lparam = PackDDElParam( WM_DDE_ACK, uiLo, uiHi ); break; @@ -539,7 +539,7 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam { memcpy( ptr, *buffer, size ); GlobalUnlock( hMem ); - TRACE( "exec: pairing c=%08lx s=%p\n", *lparam, hMem ); + TRACE( "exec: pairing c=%08Ix s=%p\n", *lparam, hMem ); if (!dde_add_pair( (HGLOBAL)*lparam, hMem )) { GlobalFree( hMem ); @@ -1153,7 +1153,7 @@ static BOOL CALLBACK bcast_winsta( LPWSTR winsta, LPARAM lp ) { BOOL ret; HWINSTA hwinsta = OpenWindowStationW( winsta, FALSE, WINSTA_ENUMDESKTOPS ); - TRACE("hwinsta: %p/%s/%08x\n", hwinsta, debugstr_w( winsta ), GetLastError()); + TRACE("hwinsta: %p/%s/%08lx\n", hwinsta, debugstr_w( winsta ), GetLastError()); if (!hwinsta) return TRUE; ((BroadcastParm *)lp)->winsta = hwinsta; @@ -1203,7 +1203,7 @@ LONG WINAPI BroadcastSystemMessageExW( DWORD flags, LPDWORD recipients, UINT msg | BSF_POSTMESSAGE | BSF_FORCEIFHUNG | BSF_NOTIMEOUTIFNOTHUNG | BSF_ALLOWSFW | BSF_SENDNOTIFYMESSAGE | BSF_RETURNHDESK | BSF_LUID ); - TRACE("Flags: %08x, recipients: %p(0x%x), msg: %04x, wparam: %08lx, lparam: %08lx\n", flags, recipients, + TRACE("Flags: %08lx, recipients: %p(0x%lx), msg: %04x, wparam: %08Ix, lparam: %08Ix\n", flags, recipients, (recipients ? *recipients : recips), msg, wp, lp); if (flags & ~all_flags) @@ -1233,7 +1233,7 @@ LONG WINAPI BroadcastSystemMessageExW( DWORD flags, LPDWORD recipients, UINT msg ret = parm.success; } else - FIXME("Recipients %08x not supported!\n", *recipients); + FIXME("Recipients %08lx not supported!\n", *recipients); return ret; } @@ -1318,7 +1318,7 @@ BOOL WINAPI IsHungAppWindow( HWND hWnd ) */ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) { - FIXME( "%x %08x\n", message, flag ); + FIXME( "%x %08lx\n", message, flag ); return TRUE; } @@ -1327,6 +1327,6 @@ BOOL WINAPI ChangeWindowMessageFilter( UINT message, DWORD flag ) */ BOOL WINAPI ChangeWindowMessageFilterEx( HWND hwnd, UINT message, DWORD action, CHANGEFILTERSTRUCT *changefilter ) { - FIXME( "%p %x %d %p\n", hwnd, message, action, changefilter ); + FIXME( "%p %x %ld %p\n", hwnd, message, action, changefilter ); return TRUE; } diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 04ba0a8810c..35518578c6c 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -146,7 +146,7 @@ static UINT WM_MSIME_DOCUMENTFEED; WORD WINAPI UserSignalProc( UINT uCode, DWORD dwThreadOrProcessID, DWORD dwFlags, HMODULE16 hModule ) { - FIXME("(%04x, %08x, %04x, %04x)\n", + FIXME("(%04x, %08lx, %04lx, %04x)\n", uCode, dwThreadOrProcessID, dwFlags, hModule ); /* FIXME: Should chain to GdiSignalProc now. */ return 0; @@ -165,7 +165,7 @@ void WINAPI SetLastErrorEx( DWORD error, /* [in] Per-thread error code */ DWORD type) /* [in] Error type */ { - TRACE("(0x%08x, 0x%08x)\n", error,type); + TRACE("(0x%08lx, 0x%08lx)\n", error,type); switch(type) { case 0: break; @@ -174,7 +174,7 @@ void WINAPI SetLastErrorEx( case SLE_WARNING: /* Fall through for now */ default: - FIXME("(error=%08x, type=%08x): Unhandled type\n", error,type); + FIXME("(error=%08lx, type=%08lx): Unhandled type\n", error,type); break; } SetLastError( error ); @@ -210,7 +210,7 @@ BOOL WINAPI GetAltTabInfoW(HWND hwnd, int iItem, PALTTABINFO pati, LPWSTR pszIte */ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) { - FIXME("(%d): stub\n", dwLevel); + FIXME("(%ld): stub\n", dwLevel); } @@ -219,7 +219,7 @@ VOID WINAPI SetDebugErrorLevel( DWORD dwLevel ) */ DWORD WINAPI SetWindowStationUser(DWORD x1,DWORD x2) { - FIXME("(0x%08x,0x%08x),stub!\n",x1,x2); + FIXME("(0x%08lx,0x%08lx),stub!\n",x1,x2); return 1; } @@ -246,7 +246,7 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) */ void WINAPI RegisterSystemThread(DWORD flags, DWORD reserved) { - FIXME("(%08x, %08x)\n", flags, reserved); + FIXME("(%08lx, %08lx)\n", flags, reserved); } /*********************************************************************** @@ -274,7 +274,7 @@ BOOL WINAPI DeregisterShellHookWindow(HWND hWnd) */ DWORD WINAPI RegisterTasklist (DWORD x) { - FIXME("0x%08x\n",x); + FIXME("0x%08lx\n",x); return TRUE; } @@ -302,7 +302,7 @@ DWORD WINAPI GetAppCompatFlags2( HTASK hTask ) */ BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { - FIXME("(%p, %d, %d, %d): stub\n", rect, b, c, d); + FIXME("(%p, %ld, %ld, %ld): stub\n", rect, b, c, d); if (rect) FIXME("rect: %s\n", wine_dbgstr_rect(rect)); /* Calls OffsetRect */ @@ -327,7 +327,7 @@ BOOL WINAPI User32InitializeImmEntryTable(DWORD magic) { HMODULE imm32 = GetModuleHandleW(L"imm32.dll"); - TRACE("(%x)\n", magic); + TRACE("(%lx)\n", magic); if (!imm32 || magic != IMM_INIT_MAGIC) return FALSE; @@ -388,7 +388,7 @@ BOOL WINAPI WINNLSGetEnableStatus(HWND hwnd) */ LRESULT WINAPI SendIMEMessageExA(HWND hwnd, LPARAM lparam) { - FIXME("(%p,%lx): stub\n", hwnd, lparam); + FIXME("(%p,%Ix): stub\n", hwnd, lparam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -399,7 +399,7 @@ LRESULT WINAPI SendIMEMessageExA(HWND hwnd, LPARAM lparam) */ LRESULT WINAPI SendIMEMessageExW(HWND hwnd, LPARAM lparam) { - FIXME("(%p,%lx): stub\n", hwnd, lparam); + FIXME("(%p,%Ix): stub\n", hwnd, lparam); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -430,7 +430,7 @@ BOOL WINAPI UserHandleGrantAccess(HANDLE handle, HANDLE job, BOOL grant) */ HPOWERNOTIFY WINAPI RegisterPowerSettingNotification(HANDLE recipient, const GUID *guid, DWORD flags) { - FIXME("(%p,%s,%x): stub\n", recipient, debugstr_guid(guid), flags); + FIXME("(%p,%s,%lx): stub\n", recipient, debugstr_guid(guid), flags); return (HPOWERNOTIFY)0xdeadbeef; } @@ -448,7 +448,7 @@ BOOL WINAPI UnregisterPowerSettingNotification(HPOWERNOTIFY handle) */ HPOWERNOTIFY WINAPI RegisterSuspendResumeNotification(HANDLE recipient, DWORD flags) { - FIXME("%p, %#x: stub.\n", recipient, flags); + FIXME("%p, %#lx: stub.\n", recipient, flags); return (HPOWERNOTIFY)0xdeadbeef; } @@ -466,7 +466,7 @@ BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) */ BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size ) { - FIXME("(%p %08x %08x %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); + FIXME("(%p %08lx %08lx %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -476,7 +476,7 @@ BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *coun */ BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) { - FIXME("(%p %08x %u %p %u): stub\n", hwnd, reserved, id, config, size); + FIXME("(%p %08lx %u %p %u): stub\n", hwnd, reserved, id, config, size); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -530,7 +530,7 @@ BOOL WINAPI GetPointerDevices(UINT32 *device_count, POINTER_DEVICE_INFO *devices */ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value) { - FIXME("(%p %d): stub\n", hwnd, value); + FIXME("(%p %ld): stub\n", hwnd, value); return TRUE; } @@ -605,7 +605,7 @@ static LRESULT ime_internal_msg( WPARAM wParam, LPARAM lParam) ImmReleaseContext(hwnd, himc); break; default: - FIXME("wParam = %lx\n", wParam); + FIXME("wParam = %Ix\n", wParam); break; } diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index c74d33092f0..cc53ab0457e 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -447,7 +447,7 @@ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title, INT WINAPI MessageBoxTimeoutA( HWND hWnd, LPCSTR text, LPCSTR title, UINT type, WORD langid, DWORD timeout ) { - FIXME("timeout not supported (%u)\n", timeout); + FIXME("timeout not supported (%lu)\n", timeout); return MessageBoxExA( hWnd, text, title, type, langid ); } @@ -457,7 +457,7 @@ INT WINAPI MessageBoxTimeoutA( HWND hWnd, LPCSTR text, LPCSTR title, INT WINAPI MessageBoxTimeoutW( HWND hWnd, LPCWSTR text, LPCWSTR title, UINT type, WORD langid, DWORD timeout ) { - FIXME("timeout not supported (%u)\n", timeout); + FIXME("timeout not supported (%lu)\n", timeout); return MessageBoxExW( hWnd, text, title, type, langid ); } diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 85d1a14a195..e677f1aeb66 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -313,7 +313,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectEx( LPRECT rect, DWORD style, BOOL { NONCLIENTMETRICSW ncm; - TRACE("(%s) %08x %d %08x\n", wine_dbgstr_rect(rect), style, menu, exStyle ); + TRACE("(%s) %08lx %d %08lx\n", wine_dbgstr_rect(rect), style, menu, exStyle ); ncm.cbSize = sizeof(ncm); SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); @@ -331,7 +331,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH AdjustWindowRectExForDpi( LPRECT rect, DWORD style { NONCLIENTMETRICSW ncm; - TRACE("(%s) %08x %d %08x %u\n", wine_dbgstr_rect(rect), style, menu, exStyle, dpi ); + TRACE("(%s) %08lx %d %08lx %u\n", wine_dbgstr_rect(rect), style, menu, exStyle, dpi ); ncm.cbSize = sizeof(ncm); SystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); @@ -366,7 +366,7 @@ void NC_HandleNCCalcSize( HWND hwnd, WPARAM wparam, RECT *winRect ) if (((style & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) { - TRACE("Calling GetMenuBarHeight with hwnd %p, width %d, at (%d, %d).\n", + TRACE("Calling GetMenuBarHeight with hwnd %p, width %ld, at (%ld, %ld).\n", hwnd, winRect->right - winRect->left, -tmpRect.left, -tmpRect.top ); winRect->top += @@ -458,7 +458,7 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) RECT rect, rcClient; DWORD style, ex_style; - TRACE("hwnd=%p pt=%d,%d\n", hwnd, pt.x, pt.y ); + TRACE("hwnd=%p pt=%ld,%ld\n", hwnd, pt.x, pt.y ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &rect, &rcClient ); if (!PtInRect( &rect, pt )) return HTNOWHERE; @@ -634,7 +634,7 @@ LRESULT NC_HandleNCMouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam) RECT rect; POINT pt; - TRACE("hwnd=%p wparam=%#lx lparam=%#lx\n", hwnd, wParam, lParam); + TRACE("hwnd=%p wparam=%#Ix lparam=%#Ix\n", hwnd, wParam, lParam); if (wParam != HTHSCROLL && wParam != HTVSCROLL) return 0; @@ -1538,7 +1538,7 @@ LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam ) */ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) { - TRACE("hwnd %p WM_SYSCOMMAND %lx %lx\n", hwnd, wParam, lParam ); + TRACE("hwnd %p WM_SYSCOMMAND %Ix %Ix\n", hwnd, wParam, lParam ); if (!NtUserMessageCall( hwnd, WM_SYSCOMMAND, wParam, lParam, 0, NtUserDefWindowProc, FALSE )) return 0; @@ -1602,7 +1602,7 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) case SC_ARRANGE: case SC_NEXTWINDOW: case SC_PREVWINDOW: - FIXME("unimplemented WM_SYSCOMMAND %04lx!\n", wParam); + FIXME("unimplemented WM_SYSCOMMAND %04Ix!\n", wParam); break; } return 0; @@ -1624,7 +1624,7 @@ BOOL WINAPI GetTitleBarInfo(HWND hwnd, PTITLEBARINFO tbi) { } if(tbi->cbSize != sizeof(TITLEBARINFO)) { - TRACE("Invalid TITLEBARINFO size: %d\n", tbi->cbSize); + TRACE("Invalid TITLEBARINFO size: %ld\n", tbi->cbSize); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index a014066f988..d706e19d64f 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -107,14 +107,14 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) SetupDiGetDeviceInterfaceDetailW(set, iface, NULL, 0, &size, &device_data); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - ERR("Failed to get device path, error %#x.\n", GetLastError()); + ERR("Failed to get device path, error %#lx.\n", GetLastError()); return FALSE; } if (!SetupDiGetDevicePropertyW(set, &device_data, &DEVPROPKEY_HID_HANDLE, &type, (BYTE *)&handle, sizeof(handle), NULL, 0) || type != DEVPROP_TYPE_UINT32) { - ERR("Failed to get device handle, error %#x.\n", GetLastError()); + ERR("Failed to get device handle, error %#lx.\n", GetLastError()); return NULL; } @@ -133,7 +133,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) { - ERR("Failed to open device file %s, error %u.\n", debugstr_w(detail->DevicePath), GetLastError()); + ERR("Failed to open device file %s, error %lu.\n", debugstr_w(detail->DevicePath), GetLastError()); free(detail); return NULL; } @@ -506,11 +506,11 @@ BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devi for (i = 0; i < device_count; ++i) { - TRACE("device %u: page %#x, usage %#x, flags %#x, target %p.\n", + TRACE("device %u: page %#x, usage %#x, flags %#lx, target %p.\n", i, devices[i].usUsagePage, devices[i].usUsage, devices[i].dwFlags, devices[i].hwndTarget); if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) - FIXME("Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i); + FIXME("Unhandled flags %#lx for device %u.\n", devices[i].dwFlags, i); d[i].usage_page = devices[i].usUsagePage; d[i].usage = devices[i].usUsage; diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1031ee2da65..3714b05ce8d 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -237,7 +237,7 @@ DWORD WINAPI GetGuiResources( HANDLE hProcess, DWORD uiFlags ) static BOOL warn = TRUE; if (warn) { - FIXME("(%p,%x): stub\n",hProcess,uiFlags); + FIXME("(%p,%lx): stub\n",hProcess,uiFlags); warn = FALSE; } diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 1909d4082ce..8bf1f4312ab 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -752,7 +752,7 @@ static void SCROLL_RefreshScrollBar( HWND hwnd, INT nBar, */ static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%p wParam=%ld lParam=%ld\n", hwnd, wParam, lParam); + TRACE("hwnd=%p wParam=%Id lParam=%Id\n", hwnd, wParam, lParam); /* hide caret on first KEYDOWN to prevent flicker */ if ((lParam & PFD_DOUBLEBUFFER_DONTCARE) == 0) @@ -923,7 +923,7 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) return; /* Should never happen */ } - TRACE("Event: hwnd=%p bar=%d msg=%s pt=%d,%d hit=%d\n", + TRACE("Event: hwnd=%p bar=%d msg=%s pt=%ld,%ld hit=%d\n", hwnd, nBar, SPY_GetMsgName(msg,hwnd), pt.x, pt.y, hittest ); switch (g_tracking_info.hit_test) @@ -1574,13 +1574,13 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA case 0x00ed: case 0x00ee: case 0x00ef: - ERR("unknown Win32 msg %04x wp=%08lx lp=%08lx\n", + ERR("unknown Win32 msg %04x wp=%08Ix lp=%08Ix\n", message, wParam, lParam ); break; default: if (message >= WM_USER) - WARN("unknown msg %04x wp=%04lx lp=%08lx\n", + WARN("unknown msg %04x wp=%04Ix lp=%08Ix\n", message, wParam, lParam ); if (unicode) return DefWindowProcW( hwnd, message, wParam, lParam ); @@ -1825,7 +1825,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO in */ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info) { - TRACE("hwnd=%p idObject=%d info=%p\n", hwnd, idObject, info); + TRACE("hwnd=%p idObject=%ld info=%p\n", hwnd, idObject, info); /* Refer OBJID_CLIENT requests to the window */ if (idObject == OBJID_CLIENT) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 3c9b67b20ac..cfcbe92cd98 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -344,7 +344,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_CREATE: if (style < 0L || style > SS_TYPEMASK) { - ERR("Unknown style 0x%02x\n", style ); + ERR("Unknown style 0x%02lx\n", style ); return -1; } STATIC_InitColours(); @@ -527,7 +527,7 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: - FIXME("STM_SETIMAGE: Unhandled type %lx\n", wParam); + FIXME("STM_SETIMAGE: Unhandled type %Ix\n", wParam); break; } STATIC_TryPaintFcn( hwnd, full_style ); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 9cd9bd60146..bdb878c9f51 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -93,7 +93,7 @@ static void dpiaware_init(void) if (!LdrQueryImageFileExecutionOptions( &NtCurrentTeb()->Peb->ProcessParameters->ImagePathName, L"dpiAwareness", REG_DWORD, &option, sizeof(option), NULL )) { - TRACE( "got option %x\n", option ); + TRACE( "got option %lx\n", option ); if (option <= 2) { SetProcessDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~(ULONG_PTR)option ); @@ -347,7 +347,7 @@ BOOL WINAPI LockWorkStation(void) */ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId) { - FIXME("(0x%x): stub\n", ServicesProcessId); + FIXME("(0x%lx): stub\n", ServicesProcessId); return 0; } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 99ee93adba7..9b9dde82561 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -458,7 +458,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_MINIMIZEBOX | \ WS_MAXIMIZEBOX)) - if(style & ~DUMPED_STYLES) TRACE(" %08x", style & ~DUMPED_STYLES); + if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES); TRACE("\n"); #undef DUMPED_STYLES @@ -510,7 +510,7 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) WS_EX_COMPOSITED |\ WS_EX_NOACTIVATE)) - if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08x", exstyle & ~DUMPED_EX_STYLES); + if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES); TRACE("\n"); #undef DUMPED_EX_STYLES } @@ -536,7 +536,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if (!get_class_info( module, className, &info, &class, FALSE )) return FALSE; - TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", + TRACE("%s %s%s%s ex=%08lx style=%08lx %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), debugstr_w(className), class.Buffer != className ? "->" : "", class.Buffer != className ? debugstr_wn(class.Buffer, class.Length / sizeof(WCHAR)) : "", @@ -1753,7 +1753,7 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) */ BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) { - FIXME("(%p %08x): stub\n", hwnd, flags); + FIXME("(%p %08lx): stub\n", hwnd, flags); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1820,7 +1820,7 @@ BOOL WINAPI GetWindowDisplayAffinity(HWND hwnd, DWORD *affinity) */ BOOL WINAPI SetWindowDisplayAffinity(HWND hwnd, DWORD affinity) { - FIXME("(%p, %u): stub\n", hwnd, affinity); + FIXME("(%p, %lu): stub\n", hwnd, affinity); if (!hwnd) { diff --git a/dlls/user32/winhelp.c b/dlls/user32/winhelp.c index 2b4ca5b89b5..b689cffbf5b 100644 --- a/dlls/user32/winhelp.c +++ b/dlls/user32/winhelp.c @@ -149,7 +149,7 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand, ULONG_PTR dwD lpwh->ofsData = sizeof(WINHELP) + nlen; } else lpwh->ofsData = 0; - TRACE("Sending[%u]: cmd=%u data=%08x fn=%s\n", + TRACE("Sending[%u]: cmd=%u data=%08lx fn=%s\n", lpwh->size, lpwh->command, lpwh->data, lpwh->ofsFilename ? (LPSTR)lpwh + lpwh->ofsFilename : ""); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 03fe731ee0e..d38a3df18da 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -516,7 +516,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) capturePoint = pt; NtUserClipCursor( NULL ); - TRACE("hwnd %p command %04lx, hittest %d, pos %d,%d\n", + TRACE("hwnd %p command %04Ix, hittest %ld, pos %ld,%ld\n", hwnd, syscommand, hittest, pt.x, pt.y); if (syscommand == SC_MOVE) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9e90906bc5d..098bd17fbc0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -137,12 +137,12 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES { WNDPROC proc = arg; - TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); - TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", + TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix) retval=%08Ix\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); return *result; } @@ -157,7 +157,7 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES USER_CheckNotLock(); hwnd = WIN_GetFullHandle( hwnd ); - TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); @@ -165,7 +165,7 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES *result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); SetThreadDpiAwarenessContext( context ); - TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n", + TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix) retval=%08Ix result=%08Ix\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result ); return ret; } @@ -212,7 +212,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, { LRESULT ret = 0; - TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); switch(msg) @@ -473,7 +473,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { LRESULT ret = 0; - TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", + TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); switch(msg) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index c0c8ec7a14f..23844482f2c 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -404,7 +404,7 @@ BOOL WINAPI SetUserObjectInformationA( 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=%d %p),stub!\n", handle, info, sid, len, needed ); + FIXME( "(%p %p %p len=%ld %p),stub!\n", handle, info, sid, len, needed ); if (needed) *needed = sizeof(SECURITY_DESCRIPTOR); if (len < sizeof(SECURITY_DESCRIPTOR))

1 0

[PATCH v3 0/6] MR73: Improvement in PDB's types record handling
by eric pouech (＠epo) 31 May '22

31 May '22

This serie tackles several issues encountered while loading PDB files through dbghelp. It happens that PDB allows to have several type records for user defined types (struct / enums) with the same name. This seems to be generated by a) compiler (when modifying a structure definition between several compilation phases), b) the incremental linker (likely an optimisation of previous case, but not 100% certain when it's triggered). Wine's dbghelp ended up not picking the right record, hence generating errneous outputs. This series: - cleans up some PDB related code - update winedump to display the PDB hash table internals - fixes dbghelp to preserve in Wine's dbghelp hash table the partial order between type records of same name. v2: - rebased - removed a bunch of stray comments -- v3: dlls/dbghelp{pdb}: use remap table from PDB hash stream dlls/dbghelp{pdb}: ensure dbghelp's list order in hash table matches PDB's dlls/dbghelp{pdb}: clearly separate the type loading into two passes include/wine/mscvpdb.h: redefine property with bitfields dlls/dbghelp{pdb}: rely on first/last index from type header tools/winedump{pdb}: explore a bit more TPI hash elements https://gitlab.winehq.org/wine/wine/-/merge_requests/73

2 7

[PATCH v2 0/6] MR73: Improvement in PDB's types record handling
by eric pouech (＠epo) 31 May '22

31 May '22

This serie tackles several issues encountered while loading PDB files through dbghelp. It happens that PDB allows to have several type records for user defined types (struct / enums) with the same name. This seems to be generated by a) compiler (when modifying a structure definition between several compilation phases), b) the incremental linker (likely an optimisation of previous case, but not 100% certain when it's triggered). Wine's dbghelp ended up not picking the right record, hence generating errneous outputs. This series: - cleans up some PDB related code - update winedump to display the PDB hash table internals - fixes dbghelp to preserve in Wine's dbghelp hash table the partial order between type records of same name. -- v2: dlls/dbghelp{pdb}: use remap table from PDB hash stream dlls/dbghelp{pdb}: ensure dbghelp's list order in hash table matches PDB's dlls/dbghelp{pdb}: clearly separate the type loading into two passes include/wine/mscvpdb.h: redefine property with bitfields dlls/dbghelp{pdb}: rely on first/last index from type header tools/winedump{pdb}: explore a bit more TPI hash elements https://gitlab.winehq.org/wine/wine/-/merge_requests/73

3 7

[PATCH 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux
by Alex Henrie (＠alexhenrie) 31 May '22

31 May '22

Look through all of the devices in /sys/class/power_supply and take the statistics from the first battery and the first AC adapter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52831 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/134

3 2

[PATCH v2 0/1] MR155: ntdll: Fix reading state Information from IOSB.
by Jinoh Kang (＠iamahuman) 31 May '22

31 May '22

Enforce proper atomic update so that other threads do not read stale data from IO_STATUS_BLOCK. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: ntdll: Fix reading stale Information from IOSB. https://gitlab.winehq.org/wine/wine/-/merge_requests/155

4 6

[PATCH v3 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 30 May '22

30 May '22

-- v3: ntoskrnl: Add KeLowerIrql stub. ntoskrnl: Add KfRaiseIrql stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/156

2 3

[PATCH v2 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 30 May '22

30 May '22

-- v2: ntoskrnl: Add KeLowerIrql stub. ntoskrnl: Add KfRaiseIrql stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/156

3 4

[PATCH 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) 30 May '22

30 May '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/156

3 3