Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/shlwapi/Makefile.in | 2 - dlls/shlwapi/assoc.c | 12 ++--- dlls/shlwapi/clist.c | 6 +- dlls/shlwapi/msgbox.c | 6 +- dlls/shlwapi/ordinal.c | 106 ++++++++++++++++++++++--------------------- dlls/shlwapi/path.c | 22 ++++----- dlls/shlwapi/reg.c | 4 +- dlls/shlwapi/regstream.c | 12 ++--- dlls/shlwapi/shlwapi_main.c | 8 ++- dlls/shlwapi/stopwatch.c | 6 +- dlls/shlwapi/string.c | 8 ++- dlls/shlwapi/thread.c | 6 +- dlls/shlwapi/url.c | 2 - 13 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 56474e1da18..070dc232cee 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHLWAPI_ +EXTRADEFS = -D_SHLWAPI_ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid shcore user32 gdi32 advapi32 kernelbase diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 5a9928cc0eb..b4f5b0cf8ce 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -148,7 +148,7 @@ HRESULT WINAPI AssocQueryKeyW(ASSOCF cfFlags, ASSOCKEY assockey, LPCWSTR pszAsso HRESULT hRet; IQueryAssociations* lpAssoc;
- TRACE("(0x%x,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), + TRACE("(0x%lx,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), debugstr_w(pszExtra), phkeyOut);
hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); @@ -187,7 +187,7 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfFlags, ASSOCKEY assockey, LPCSTR pszAssoc WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL; HRESULT hRet = E_OUTOFMEMORY;
- TRACE("(0x%x,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc), + TRACE("(0x%lx,%d,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc), debugstr_a(pszExtra), phkeyOut);
if (SHLWAPI_ParamAToW(pszAssoc, szAssocW, MAX_PATH, &lpszAssocW) && @@ -216,7 +216,7 @@ HRESULT WINAPI AssocQueryStringW(ASSOCF cfFlags, ASSOCSTR str, LPCWSTR pszAssoc, HRESULT hRet; IQueryAssociations* lpAssoc;
- TRACE("(0x%x,%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc), + TRACE("(0x%lx,%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc), debugstr_w(pszExtra), pszOut, pcchOut);
if (!pcchOut) @@ -260,7 +260,7 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL; HRESULT hRet = E_OUTOFMEMORY;
- TRACE("(0x%x,0x%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc), + TRACE("(0x%lx,0x%d,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc), debugstr_a(pszExtra), pszOut, pcchOut);
if (!pcchOut) @@ -313,7 +313,7 @@ HRESULT WINAPI AssocQueryStringByKeyW(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc HRESULT hRet; IQueryAssociations* lpAssoc;
- TRACE("(0x%x,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, + TRACE("(0x%lx,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_w(pszExtra), pszOut, pcchOut);
hRet = AssocCreate( CLSID_QueryAssociations, &IID_IQueryAssociations, (void **)&lpAssoc ); @@ -355,7 +355,7 @@ HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc WCHAR szReturnW[MAX_PATH], *lpszReturnW = szReturnW; HRESULT hRet = E_OUTOFMEMORY;
- TRACE("(0x%x,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, + TRACE("(0x%lx,0x%d,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_a(pszExtra), pszOut, pcchOut);
if (!pcchOut) diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index 47bd8d7392f..beb47001c5a 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -85,7 +85,7 @@ BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) { /* Tune size to a ULONG boundary, add space for container element */ ulSize = ((ulSize + 0x3) & 0xFFFFFFFC) + sizeof(DATABLOCK_HEADER); - TRACE("Creating container item, new size = %d\n", ulSize); + TRACE("Creating container item, new size = %ld\n", ulSize); }
if(!*lppList) @@ -359,7 +359,7 @@ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) LPDATABLOCK_HEADER lpNext; ULONG ulNewSize;
- TRACE("(%p,%d)\n", lppList, dwSignature); + TRACE("(%p,%ld)\n", lppList, dwSignature);
if(lppList && (lpList = *lppList)) { @@ -423,7 +423,7 @@ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) */ DATABLOCK_HEADER* WINAPI SHFindDataBlock(LPDBLIST lpList, DWORD dwSignature) { - TRACE("(%p,%d)\n", lpList, dwSignature); + TRACE("(%p,%ld)\n", lpList, dwSignature);
if(lpList) { diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c index a03cf411c72..3a30e570fb4 100644 --- a/dlls/shlwapi/msgbox.c +++ b/dlls/shlwapi/msgbox.c @@ -57,7 +57,7 @@ static INT_PTR CALLBACK SHDlgProcEx(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM { DLGDATAEX *d = (DLGDATAEX *)GetWindowLongPtrW(hDlg, DWLP_USER);
- TRACE("(%p,%u,%ld,%ld) data %p\n", hDlg, uMsg, wParam, lParam, d); + TRACE("(%p,%u,%Id,%Id) data %p\n", hDlg, uMsg, wParam, lParam, d);
switch (uMsg) { @@ -181,14 +181,14 @@ typedef struct tagDLGDATA /* Dialogue procedure for shlwapi message boxes */ static INT_PTR CALLBACK SHDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TRACE("(%p,%u,%ld,%ld)\n", hDlg, uMsg, wParam, lParam); + TRACE("(%p,%u,%Id,%Id)\n", hDlg, uMsg, wParam, lParam);
switch (uMsg) { case WM_INITDIALOG: { DLGDATA *d = (DLGDATA *)lParam; - TRACE("WM_INITDIALOG: %p, %s,%s,%d\n", hDlg, debugstr_w(d->lpszTitle), + TRACE("WM_INITDIALOG: %p, %s,%s,%ld\n", hDlg, debugstr_w(d->lpszTitle), debugstr_w(d->lpszText), d->dwType);
SetWindowTextW(hDlg, d->lpszTitle); diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e35ecd77644..885da3f2269 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -90,7 +90,7 @@ HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, DWORD dwMyProcId = GetCurrentProcessId(); HANDLE hRet = NULL;
- TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, + TRACE("(%p,%ld,%ld,%08lx,%08lx)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions);
if (!hShared) @@ -160,7 +160,7 @@ HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId) LPVOID pMapped; HANDLE hRet = NULL;
- TRACE("(%p,%d,%d)\n", lpvData, dwSize, dwProcId); + TRACE("(%p,%ld,%ld)\n", lpvData, dwSize, dwProcId);
/* Create file mapping of the correct length */ hMap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, FILE_MAP_READ, 0, @@ -207,7 +207,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) HANDLE hDup; LPVOID pMapped;
- TRACE("(%p %d)\n", hShared, dwProcId); + TRACE("(%p %ld)\n", hShared, dwProcId);
/* Get handle to shared memory for current process */ hDup = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, 0); @@ -258,7 +258,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) { HANDLE hClose;
- TRACE("(%p %d)\n", hShared, dwProcId); + TRACE("(%p %ld)\n", hShared, dwProcId);
if (!hShared) return TRUE; @@ -535,7 +535,7 @@ BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen) { WCHAR buff[2084];
- TRACE("(%p,%d)\n", lpszDest, dwDestLen); + TRACE("(%p,%ld)\n", lpszDest, dwDestLen);
if (lpszDest && SHAboutInfoW(buff, dwDestLen)) { @@ -581,7 +581,7 @@ BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen) HKEY hReg; DWORD dwType, dwLen;
- TRACE("(%p,%d)\n", lpszDest, dwDestLen); + TRACE("(%p,%ld)\n", lpszDest, dwDestLen);
if (!lpszDest) return FALSE; @@ -669,7 +669,7 @@ HRESULT WINAPI IUnknown_QueryStatus(IUnknown* lpUnknown, REFGUID pguidCmdGroup, { HRESULT hRet = E_FAIL;
- TRACE("(%p,%p,%d,%p,%p)\n",lpUnknown, pguidCmdGroup, cCmds, prgCmds, pCmdText); + TRACE("(%p,%p,%ld,%p,%p)\n",lpUnknown, pguidCmdGroup, cCmds, prgCmds, pCmdText);
if (lpUnknown) { @@ -709,7 +709,7 @@ HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, { HRESULT hRet = E_FAIL;
- TRACE("(%p,%p,%d,%d,%p,%p)\n",lpUnknown, pguidCmdGroup, nCmdID, + TRACE("(%p,%p,%ld,%ld,%p,%p)\n",lpUnknown, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
if (lpUnknown) @@ -1095,7 +1095,7 @@ HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, IOleCommandTarget *target; HRESULT hr;
- TRACE("%p %s %s %d %08x %p %p\n", lpUnknown, debugstr_guid(service), + TRACE("%p %s %s %ld %08lx %p %p\n", lpUnknown, debugstr_guid(service), debugstr_guid(group), cmdId, cmdOpt, pIn, pOut);
hr = iunknown_query_service(lpUnknown, service, &IID_IOleCommandTarget, (void**)&target); @@ -1105,7 +1105,7 @@ HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, IOleCommandTarget_Release(target); }
- TRACE("<-- hr=0x%08x\n", hr); + TRACE("<-- hr=0x%08lx\n", hr);
return hr; } @@ -1259,7 +1259,7 @@ void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lP { enumWndData data;
- TRACE("(%p,%u,%ld,%ld,%d)\n", hWnd, uiMsgId, wParam, lParam, bSend); + TRACE("(%p,%u,%Id,%Id,%d)\n", hWnd, uiMsgId, wParam, lParam, bSend);
if(hWnd) { @@ -1370,7 +1370,7 @@ BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, DWORD dwEffect = DROPEFFECT_LINK | DROPEFFECT_MOVE | DROPEFFECT_COPY; POINTL pt = { 0, 0 };
- TRACE("%p %p 0x%08x %p %p\n", pDrop, pDataObj, grfKeyState, lpPt, pdwEffect); + TRACE("%p %p 0x%08lx %p %p\n", pDrop, pDataObj, grfKeyState, lpPt, pdwEffect);
if (!lpPt) lpPt = &pt; @@ -1439,7 +1439,7 @@ HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg IOleControlSite* lpCSite = NULL; HRESULT hRet = E_INVALIDARG;
- TRACE("(%p,%p,0x%08x)\n", lpUnknown, lpMsg, dwModifiers); + TRACE("(%p,%p,0x%08lx)\n", lpUnknown, lpMsg, dwModifiers); if (lpUnknown) { hRet = IUnknown_QueryInterface(lpUnknown, &IID_IOleControlSite, @@ -1721,7 +1721,7 @@ HRESULT WINAPI MayQSForward(IUnknown* lpUnknown, PVOID lpReserved, REFGUID riidCmdGrp, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText) { - FIXME("(%p,%p,%p,%d,%p,%p) - stub\n", + FIXME("(%p,%p,%p,%ld,%p,%p) - stub\n", lpUnknown, lpReserved, riidCmdGrp, cCmds, prgCmds, pCmdText);
/* FIXME: Calls IsQSForward & IUnknown_QueryStatus */ @@ -1736,7 +1736,7 @@ HRESULT WINAPI MayExecForward(IUnknown* lpUnknown, INT iUnk, REFGUID pguidCmdGro DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut) { - FIXME("(%p,%d,%p,%d,%d,%p,%p) - stub!\n", lpUnknown, iUnk, pguidCmdGroup, + FIXME("(%p,%d,%p,%ld,%ld,%p,%p) - stub!\n", lpUnknown, iUnk, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); return DRAGDROP_E_NOTREGISTERED; } @@ -1747,7 +1747,7 @@ HRESULT WINAPI MayExecForward(IUnknown* lpUnknown, INT iUnk, REFGUID pguidCmdGro */ HRESULT WINAPI IsQSForward(REFGUID pguidCmdGroup,ULONG cCmds, OLECMD *prgCmds) { - FIXME("(%p,%d,%p) - stub!\n", pguidCmdGroup, cCmds, prgCmds); + FIXME("(%p,%ld,%p) - stub!\n", pguidCmdGroup, cCmds, prgCmds); return DRAGDROP_E_NOTREGISTERED; }
@@ -1799,7 +1799,7 @@ typedef struct BOOL WINAPI FDSA_Initialize(DWORD block_size, DWORD inc, FDSA_info *info, void *mem, DWORD init_blocks) { - TRACE("(0x%08x 0x%08x %p %p 0x%08x)\n", block_size, inc, info, mem, init_blocks); + TRACE("(0x%08lx 0x%08lx %p %p 0x%08lx)\n", block_size, inc, info, mem, init_blocks);
if(inc == 0) inc = 1; @@ -1842,7 +1842,7 @@ BOOL WINAPI FDSA_Destroy(FDSA_info *info) */ DWORD WINAPI FDSA_InsertItem(FDSA_info *info, DWORD where, const void *block) { - TRACE("(%p 0x%08x %p)\n", info, where, block); + TRACE("(%p 0x%08lx %p)\n", info, where, block); if(where > info->num_items) where = info->num_items;
@@ -1880,7 +1880,7 @@ DWORD WINAPI FDSA_InsertItem(FDSA_info *info, DWORD where, const void *block) */ BOOL WINAPI FDSA_DeleteItem(FDSA_info *info, DWORD where) { - TRACE("(%p 0x%08x)\n", info, where); + TRACE("(%p 0x%08lx)\n", info, where);
if(where >= info->num_items) return FALSE; @@ -2080,7 +2080,7 @@ HWND WINAPI SHCreateWorkerWindowA(WNDPROC wndProc, HWND hWndParent, DWORD dwExSt WNDCLASSA wc; HWND hWnd;
- TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + TRACE("(%p, %p, 0x%08lx, 0x%08lx, %p, 0x%08Ix)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra);
/* Create Window class */ @@ -2181,7 +2181,7 @@ DWORD WINAPI SHRestrictionLookup( LPPOLICYDATA polTable, LPDWORD polArr) { - TRACE("(0x%08x %s %p %p)\n", policy, debugstr_w(initial), polTable, polArr); + TRACE("(0x%08lx %s %p %p)\n", policy, debugstr_w(initial), polTable, polArr);
if (!polTable || !polArr) return 0; @@ -2199,7 +2199,7 @@ DWORD WINAPI SHRestrictionLookup( } } /* we don't know this policy, return 0 */ - TRACE("unknown policy: (%08x)\n", policy); + TRACE("unknown policy: (%08lx)\n", policy); return 0; }
@@ -2232,7 +2232,7 @@ HRESULT WINAPI SHWeakQueryInterface( hret = IUnknown_QueryInterface(pInner, riid, ppv); if (SUCCEEDED(hret)) IUnknown_Release(pUnk); } - TRACE("-- 0x%08x\n", hret); + TRACE("-- 0x%08lx\n", hret); return hret; }
@@ -2303,13 +2303,13 @@ HWND WINAPI SHCreateWorkerWindowW(WNDPROC wndProc, HWND hWndParent, DWORD dwExSt WNDCLASSW wc; HWND hWnd;
- TRACE("(%p, %p, 0x%08x, 0x%08x, %p, 0x%08lx)\n", + TRACE("(%p, %p, 0x%08lx, 0x%08lx, %p, 0x%08Ix)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra);
/* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { - TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); + TRACE("fallback to ANSI, ver 0x%08lx\n", GetVersion()); return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, wnd_extra); }
@@ -2479,7 +2479,7 @@ HRESULT WINAPI IConnectionPoint_InvokeWithCancel( IConnectionPoint* iCP, IID iid; HRESULT result;
- FIXME("(%p)->(0x%x %p %x %x) partial stub\n", iCP, dispId, dispParams, unknown1, unknown2); + FIXME("(%p)->(0x%lx %p %lx %lx) partial stub\n", iCP, dispId, dispParams, unknown1, unknown2);
result = IConnectionPoint_GetConnectionInterface(iCP, &iid); if (SUCCEEDED(result)) @@ -2504,7 +2504,7 @@ HRESULT WINAPI IConnectionPoint_SimpleInvoke( IID iid; HRESULT result;
- TRACE("(%p)->(0x%x %p)\n",iCP,dispId,dispParams); + TRACE("(%p)->(0x%lx %p)\n",iCP,dispId,dispParams);
result = IConnectionPoint_GetConnectionInterface(iCP, &iid); if (SUCCEEDED(result)) @@ -2534,7 +2534,7 @@ HRESULT WINAPI IConnectionPoint_OnChanged(IConnectionPoint* lpCP, DISPID dispID) IEnumConnections *lpEnum; HRESULT hRet = E_NOINTERFACE;
- TRACE("(%p,0x%8X)\n", lpCP, dispID); + TRACE("(%p,0x%8lX)\n", lpCP, dispID);
/* Get an enumerator for the connections */ if (lpCP) @@ -2622,7 +2622,7 @@ HRESULT WINAPI IUnknown_CPContainerOnChanged(IUnknown *lpUnknown, DISPID dispID) IConnectionPointContainer* lpCPC = NULL; HRESULT hRet = E_NOINTERFACE;
- TRACE("(%p,0x%8X)\n", lpUnknown, dispID); + TRACE("(%p,0x%8lX)\n", lpUnknown, dispID);
if (lpUnknown) hRet = IUnknown_QueryInterface(lpUnknown, &IID_IConnectionPointContainer, (void**)&lpCPC); @@ -2672,7 +2672,7 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, INT ret; WCHAR *buf;
- TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), + TRACE("(%s,%s,%p,%08lx,%s)\n", debugstr_w(appName), debugstr_w(keyName), out, outLen, debugstr_w(filename));
if(outLen == 0) @@ -2915,7 +2915,7 @@ HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST IContextMenu *iContext; HRESULT hRet;
- TRACE("(%p, %p, %p, %u)\n", hWnd, lpFolder, lpApidl, dwCommandId); + TRACE("(%p, %p, %p, %lu)\n", hWnd, lpFolder, lpApidl, dwCommandId);
if (!lpFolder) return E_FAIL; @@ -3008,7 +3008,7 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwCrossCo LPSTR ptr; DWORD len;
- FIXME("(%s,%p,%d) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwCrossCodePage); + FIXME("(%s,%p,%ld) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwCrossCodePage); len = GetModuleFileNameA(inst_hwnd, mod_path, sizeof(mod_path)); if (!len || len >= sizeof(mod_path)) return NULL;
@@ -3032,7 +3032,7 @@ HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwCrossC LPWSTR ptr; DWORD len;
- FIXME("(%s,%p,%d) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwCrossCodePage); + FIXME("(%s,%p,%ld) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwCrossCodePage); len = GetModuleFileNameW(inst_hwnd, mod_path, ARRAY_SIZE(mod_path)); if (!len || len >= ARRAY_SIZE(mod_path)) return NULL;
@@ -3060,7 +3060,7 @@ HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwCrossC */ COLORREF WINAPI ColorAdjustLuma(COLORREF cRGB, int dwLuma, BOOL bUnknown) { - TRACE("(0x%8x,%d,%d)\n", cRGB, dwLuma, bUnknown); + TRACE("(0x%8lx,%d,%d)\n", cRGB, dwLuma, bUnknown);
if (dwLuma) { @@ -3234,7 +3234,7 @@ DWORD WINAPI SHGetMachineInfo(DWORD dwFlags) { HW_PROFILE_INFOA hwInfo;
- TRACE("(0x%08x)\n", dwFlags); + TRACE("(0x%08lx)\n", dwFlags);
GetCurrentHwProfileA(&hwInfo); switch (hwInfo.dwDockInfo & (DOCKINFO_DOCKED|DOCKINFO_UNDOCKED)) @@ -3254,7 +3254,7 @@ DWORD WINAPI SHGetMachineInfo(DWORD dwFlags) DWORD WINAPI SHWinHelpOnDemandW(HWND hwnd, LPCWSTR helpfile, DWORD flags1, VOID *ptr1, DWORD flags2) {
- FIXME("(%p, %s, 0x%x, %p, %d)\n", hwnd, debugstr_w(helpfile), flags1, ptr1, flags2); + FIXME("(%p, %s, 0x%lx, %p, %ld)\n", hwnd, debugstr_w(helpfile), flags1, ptr1, flags2); return 0; }
@@ -3265,7 +3265,7 @@ DWORD WINAPI SHWinHelpOnDemandW(HWND hwnd, LPCWSTR helpfile, DWORD flags1, VOID DWORD WINAPI SHWinHelpOnDemandA(HWND hwnd, LPCSTR helpfile, DWORD flags1, VOID *ptr1, DWORD flags2) {
- FIXME("(%p, %s, 0x%x, %p, %d)\n", hwnd, debugstr_a(helpfile), flags1, ptr1, flags2); + FIXME("(%p, %s, 0x%lx, %p, %ld)\n", hwnd, debugstr_a(helpfile), flags1, ptr1, flags2); return 0; }
@@ -3322,7 +3322,7 @@ DWORD WINAPI MLSetMLHInstance(HINSTANCE hInst, HANDLE hHeap) */ DWORD WINAPI MLClearMLHInstance(DWORD x) { - FIXME("(0x%08x)stub\n", x); + FIXME("(0x%08lx)stub\n", x); return 0xabba1247; }
@@ -3468,7 +3468,7 @@ VOID WINAPI ColorRGBToHLS(COLORREF cRGB, LPWORD pwHue, { int wR, wG, wB, wMax, wMin, wHue, wLuminosity, wSaturation;
- TRACE("(%08x,%p,%p,%p)\n", cRGB, pwHue, pwLuminance, pwSaturation); + TRACE("(%08lx,%p,%p,%p)\n", cRGB, pwHue, pwLuminance, pwSaturation);
wR = GetRValue(cRGB); wG = GetGValue(cRGB); @@ -3560,7 +3560,7 @@ HRESULT WINAPI SHGetInverseCMAP(LPDWORD dest, DWORD dwSize) *dest = (DWORD)0xabba1249; return 0; } - FIXME("(%p, %#x) stub\n", dest, dwSize); + FIXME("(%p, %#lx) stub\n", dest, dwSize); return 0; }
@@ -3630,7 +3630,7 @@ VOID WINAPI FixSlashesAndColonW(LPWSTR lpwstr) */ DWORD WINAPI SHGetAppCompatFlags(DWORD dwUnknown) { - FIXME("(0x%08x) stub\n", dwUnknown); + FIXME("(0x%08lx) stub\n", dwUnknown); return 0; }
@@ -3729,7 +3729,7 @@ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) int size_key, size_subkey, size_user; HKEY hkey = NULL;
- TRACE("(0x%08x, %s, %d)\n", flags, debugstr_w(sub_key), create); + TRACE("(0x%08lx, %s, %d)\n", flags, debugstr_w(sub_key), create);
/* For compatibility with Vista+ */ if(flags == 0x1ffff) @@ -3753,7 +3753,7 @@ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) size_key = sizeof(classesW); break; default: - FIXME("unsupported flags (0x%08x)\n", flags); + FIXME("unsupported flags (0x%08lx)\n", flags); return NULL; }
@@ -3787,7 +3787,7 @@ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) size_subkey = sizeof(file_extsW); break; default: - FIXME("unsupported flags (0x%08x)\n", flags); + FIXME("unsupported flags (0x%08lx)\n", flags); return NULL; }
@@ -3827,7 +3827,7 @@ BOOL WINAPI SHQueueUserWorkItem(LPTHREAD_START_ROUTINE pfnCallback, LPVOID pContext, LONG lPriority, DWORD_PTR dwTag, DWORD_PTR *pdwId, LPCSTR pszModule, DWORD dwFlags) { - TRACE("(%p, %p, %d, %lx, %p, %s, %08x)\n", pfnCallback, pContext, + TRACE("(%p, %p, %ld, %Ix, %p, %s, %08lx)\n", pfnCallback, pContext, lPriority, dwTag, pdwId, debugstr_a(pszModule), dwFlags);
if(lPriority || dwTag || pdwId || pszModule || dwFlags) @@ -3894,7 +3894,7 @@ HRESULT WINAPI SKAllocValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD * DWORD ret, size; HKEY hkey;
- TRACE("(0x%x, %s, %s, %p, %p, %p)\n", flags, debugstr_w(subkey), + TRACE("(0x%lx, %s, %s, %p, %p, %p)\n", flags, debugstr_w(subkey), debugstr_w(value), type, data, count);
hkey = SHGetShellKey(flags, subkey, FALSE); @@ -3930,7 +3930,7 @@ HRESULT WINAPI SKDeleteValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value) DWORD ret; HKEY hkey;
- TRACE("(0x%x, %s %s)\n", flags, debugstr_w(subkey), debugstr_w(value)); + TRACE("(0x%lx, %s %s)\n", flags, debugstr_w(subkey), debugstr_w(value));
hkey = SHGetShellKey(flags, subkey, FALSE); if (!hkey) @@ -3951,7 +3951,7 @@ HRESULT WINAPI SKGetValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD *ty DWORD ret; HKEY hkey;
- TRACE("(0x%x, %s, %s, %p, %p, %p)\n", flags, debugstr_w(subkey), + TRACE("(0x%lx, %s, %s, %p, %p, %p)\n", flags, debugstr_w(subkey), debugstr_w(value), type, data, count);
hkey = SHGetShellKey(flags, subkey, FALSE); @@ -3973,7 +3973,7 @@ HRESULT WINAPI SKSetValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD ret; HKEY hkey;
- TRACE("(0x%x, %s, %s, %x, %p, %d)\n", flags, debugstr_w(subkey), + TRACE("(0x%lx, %s, %s, %lx, %p, %ld)\n", flags, debugstr_w(subkey), debugstr_w(value), type, data, count);
hkey = SHGetShellKey(flags, subkey, TRUE); @@ -4260,7 +4260,7 @@ free_sids: HRESULT WINAPI SHCreatePropertyBagOnRegKey (HKEY hKey, LPCWSTR subkey, DWORD grfMode, REFIID riid, void **ppv) { - FIXME("%p %s %d %s %p STUB\n", hKey, debugstr_w(subkey), grfMode, + FIXME("%p %s %ld %s %p STUB\n", hKey, debugstr_w(subkey), grfMode, debugstr_guid(riid), ppv);
return E_NOTIMPL; @@ -4297,7 +4297,7 @@ INT WINAPI SHFormatDateTimeW(const FILETIME UNALIGNED *fileTime, DWORD *flags, return 0;
if (fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS) - FIXME("ignoring some flags - 0x%08x\n", fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS); + FIXME("ignoring some flags - 0x%08lx\n", fmt_flags & SHFORMATDT_UNSUPPORTED_FLAGS);
FileTimeToLocalFileTime(fileTime, &ft); FileTimeToSystemTime(&ft, &st); @@ -4385,7 +4385,7 @@ INT WINAPI ZoneCheckUrlExW(LPWSTR szURL, PVOID pUnknown, DWORD dwUnknown2, DWORD dwUnknown3, DWORD dwUnknown4, DWORD dwUnknown5, DWORD dwUnknown6, DWORD dwUnknown7) { - FIXME("(%s,%p,%x,%x,%x,%x,%x,%x) STUB\n", debugstr_w(szURL), pUnknown, dwUnknown2, + FIXME("(%s,%p,%lx,%lx,%lx,%lx,%lx,%lx) STUB\n", debugstr_w(szURL), pUnknown, dwUnknown2, dwUnknown3, dwUnknown4, dwUnknown5, dwUnknown6, dwUnknown7);
return 0; @@ -4406,7 +4406,7 @@ INT WINAPI ZoneCheckUrlExW(LPWSTR szURL, PVOID pUnknown, DWORD dwUnknown2, */ INT WINAPI SHVerbExistsNA(LPSTR verb, PVOID pUnknown, PVOID pUnknown2, DWORD dwUnknown3) { - FIXME("(%s, %p, %p, %i) STUB\n",verb, pUnknown, pUnknown2, dwUnknown3); + FIXME("(%s, %p, %p, %li) STUB\n",verb, pUnknown, pUnknown2, dwUnknown3); return 0; }
diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index aa43b30b5cc..385875e2ec4 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -162,7 +162,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich) { '.', 'c', 'm', 'd', 0}, { 0, 0, 0, 0, 0} };
- TRACE("(%s,%d)\n", debugstr_w(lpszPath), dwWhich); + TRACE("(%s,%ld)\n", debugstr_w(lpszPath), dwWhich);
if (!lpszPath || PathIsUNCServerW(lpszPath) || PathIsUNCServerShareW(lpszPath)) return FALSE; @@ -218,7 +218,7 @@ BOOL WINAPI PathFileExistsDefExtA(LPSTR lpszPath,DWORD dwWhich) { BOOL bRet = FALSE;
- TRACE("(%s,%d)\n", debugstr_a(lpszPath), dwWhich); + TRACE("(%s,%ld)\n", debugstr_a(lpszPath), dwWhich);
if (lpszPath) { @@ -245,7 +245,7 @@ static BOOL SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich) WCHAR *lpszPATH; WCHAR buff[MAX_PATH];
- TRACE("(%s,%08x)\n", debugstr_w(lpszFile), dwWhich); + TRACE("(%s,%08lx)\n", debugstr_w(lpszFile), dwWhich);
/* Try system directories */ GetSystemDirectoryW(buff, MAX_PATH); @@ -331,7 +331,7 @@ BOOL WINAPI PathFindOnPathExA(LPSTR lpszFile,LPCSTR *lppszOtherDirs,DWORD dwWhic WCHAR szFile[MAX_PATH]; WCHAR buff[MAX_PATH];
- TRACE("(%s,%p,%08x)\n", debugstr_a(lpszFile), lppszOtherDirs, dwWhich); + TRACE("(%s,%p,%08lx)\n", debugstr_a(lpszFile), lppszOtherDirs, dwWhich);
if (!lpszFile || !PathIsFileSpecA(lpszFile)) return FALSE; @@ -374,7 +374,7 @@ BOOL WINAPI PathFindOnPathExW(LPWSTR lpszFile,LPCWSTR *lppszOtherDirs,DWORD dwWh { WCHAR buff[MAX_PATH];
- TRACE("(%s,%p,%08x)\n", debugstr_w(lpszFile), lppszOtherDirs, dwWhich); + TRACE("(%s,%p,%08lx)\n", debugstr_w(lpszFile), lppszOtherDirs, dwWhich);
if (!lpszFile || !PathIsFileSpecW(lpszFile)) return FALSE; @@ -459,7 +459,7 @@ BOOL WINAPI PathCompactPathExA(LPSTR lpszDest, LPCSTR lpszPath, { BOOL bRet = FALSE;
- TRACE("(%p,%s,%d,0x%08x)\n", lpszDest, debugstr_a(lpszPath), cchMax, dwFlags); + TRACE("(%p,%s,%d,0x%08lx)\n", lpszDest, debugstr_a(lpszPath), cchMax, dwFlags);
if (lpszPath && lpszDest) { @@ -486,7 +486,7 @@ BOOL WINAPI PathCompactPathExW(LPWSTR lpszDest, LPCWSTR lpszPath, LPCWSTR lpszFile; DWORD dwLen, dwFileLen = 0;
- TRACE("(%p,%s,%d,0x%08x)\n", lpszDest, debugstr_w(lpszPath), cchMax, dwFlags); + TRACE("(%p,%s,%d,0x%08lx)\n", lpszDest, debugstr_w(lpszPath), cchMax, dwFlags);
if (!lpszPath) return FALSE; @@ -764,7 +764,7 @@ BOOL WINAPI PathIsContentTypeW(LPCWSTR lpszPath, LPCWSTR lpszContentType) */ BOOL WINAPI PathIsSystemFolderA(LPCSTR lpszPath, DWORD dwAttrib) { - TRACE("(%s,0x%08x)\n", debugstr_a(lpszPath), dwAttrib); + TRACE("(%s,0x%08lx)\n", debugstr_a(lpszPath), dwAttrib);
if (lpszPath && *lpszPath) dwAttrib = GetFileAttributesA(lpszPath); @@ -782,7 +782,7 @@ BOOL WINAPI PathIsSystemFolderA(LPCSTR lpszPath, DWORD dwAttrib) */ BOOL WINAPI PathIsSystemFolderW(LPCWSTR lpszPath, DWORD dwAttrib) { - TRACE("(%s,0x%08x)\n", debugstr_w(lpszPath), dwAttrib); + TRACE("(%s,0x%08lx)\n", debugstr_w(lpszPath), dwAttrib);
if (lpszPath && *lpszPath) dwAttrib = GetFileAttributesW(lpszPath); @@ -1502,7 +1502,7 @@ HRESULT WINAPI SHGetWebFolderFilePathA(LPCSTR lpszFile, LPSTR lpszPath, DWORD dw WCHAR szFile[MAX_PATH], szPath[MAX_PATH]; HRESULT hRet;
- TRACE("(%s,%p,%d)\n", lpszFile, lpszPath, dwPathLen); + TRACE("(%s,%p,%ld)\n", lpszFile, lpszPath, dwPathLen);
MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, szFile, MAX_PATH); szPath[0] = '\0'; @@ -1523,7 +1523,7 @@ HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR lpszFile, LPWSTR lpszPath, DWORD DWORD dwLen, dwFileLen; LANGID lidSystem, lidUser;
- TRACE("(%s,%p,%d)\n", debugstr_w(lpszFile), lpszPath, dwPathLen); + TRACE("(%s,%p,%ld)\n", debugstr_w(lpszFile), lpszPath, dwPathLen);
/* Get base directory for web content */ dwLen = GetSystemWindowsDirectoryW(lpszPath, dwPathLen); diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 44e3bde56ee..b8070f44c78 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -225,7 +225,7 @@ BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey) */ BOOL WINAPI GetMIMETypeSubKeyA(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) { - TRACE("(%s,%p,%d)\n", debugstr_a(lpszType), lpszBuffer, dwLen); + TRACE("(%s,%p,%ld)\n", debugstr_a(lpszType), lpszBuffer, dwLen);
if (dwLen > dwLenMimeDbContent && lpszType && lpszBuffer) { @@ -248,7 +248,7 @@ BOOL WINAPI GetMIMETypeSubKeyA(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) */ BOOL WINAPI GetMIMETypeSubKeyW(LPCWSTR lpszType, LPWSTR lpszBuffer, DWORD dwLen) { - TRACE("(%s,%p,%d)\n", debugstr_w(lpszType), lpszBuffer, dwLen); + TRACE("(%s,%p,%ld)\n", debugstr_w(lpszType), lpszBuffer, dwLen);
if (dwLen > dwLenMimeDbContent && lpszType && lpszBuffer) { diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index decc1f666db..b85c7a4244b 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -82,7 +82,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface) ISHRegStream *This = impl_from_IStream(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); + TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1);
return refCount; } @@ -95,7 +95,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) ISHRegStream *This = impl_from_IStream(iface); ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); + TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1);
if (!refCount) { @@ -115,7 +115,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG ISHRegStream *This = impl_from_IStream(iface); DWORD dwBytesToRead;
- TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead); + TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead);
if (This->dwPos >= This->dwLength) dwBytesToRead = 0; @@ -143,7 +143,7 @@ static HRESULT WINAPI IStream_fnWrite (IStream * iface, const void* pv, ULONG cb ISHRegStream *This = impl_from_IStream(iface); DWORD newLen = This->dwPos + cb;
- TRACE("(%p, %p, %d, %p)\n",This, pv, cb, pcbWritten); + TRACE("(%p, %p, %ld, %p)\n",This, pv, cb, pcbWritten);
if (newLen < This->dwPos) /* overflow */ return STG_E_INSUFFICIENTMEMORY; @@ -173,7 +173,7 @@ static HRESULT WINAPI IStream_fnSeek (IStream * iface, LARGE_INTEGER dlibMove, D { ISHRegStream *This = impl_from_IStream(iface); LARGE_INTEGER tmp; - TRACE("(%p, %s, %d %p)\n", This, + TRACE("(%p, %s, %ld %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), dwOrigin, plibNewPosition);
if (dwOrigin == STREAM_SEEK_SET) @@ -282,7 +282,7 @@ static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD { ISHRegStream *This = impl_from_IStream(iface);
- TRACE("(%p, %p, %d)\n",This,pstatstg,grfStatFlag); + TRACE("(%p, %p, %ld)\n",This,pstatstg,grfStatFlag);
pstatstg->pwcsName = NULL; pstatstg->type = STGTY_STREAM; diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 04abf30ffc8..1843fa04951 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -54,7 +54,7 @@ DECLSPEC_HIDDEN HINSTANCE shlwapi_hInstance = 0; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -105,7 +105,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) return S_OK; }
- WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); + WARN("pdvi->cbSize = %ld, unhandled\n", pdvi2->info1.cbSize); return E_INVALIDARG; }
@@ -162,7 +162,7 @@ UINT WINAPI WhichPlatform(void) */ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name, DWORD flags, REFIID riid, void **ppv) { - FIXME("%p, %s, %#x, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv); + FIXME("%p, %s, %#lx, %s, %p stub.\n", pidl, debugstr_w(bag_name), flags, debugstr_guid(riid), ppv);
return E_NOTIMPL; } @@ -172,7 +172,7 @@ HRESULT WINAPI SHGetViewStatePropertyBag(PCIDLIST_ABSOLUTE pidl, PCWSTR bag_name */ BOOL WINAPI SHIsLowMemoryMachine(DWORD type) { - FIXME("%d stub\n", type); + FIXME("%ld stub\n", type);
return FALSE; } diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index cb8b860d025..68ffab944ea 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -93,7 +93,7 @@ void WINAPI StopWatchFlush(void) DWORD WINAPI StopWatchW(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - FIXME("(%d,%s,%d,%d,%d) stub!\n", dwClass, debugstr_w(lpszStr), + FIXME("(%ld,%s,%ld,%ld,%ld) stub!\n", dwClass, debugstr_w(lpszStr), dwUnknown, dwMode, dwTimeStamp); return ERROR_SUCCESS; } @@ -171,7 +171,7 @@ void WINAPI StopWatch_MarkFrameStart(LPCSTR lpszName) */ void WINAPI StopWatch_MarkJavaStop(LPCWSTR lpszEvent, HWND hWnd, DWORD dwReserved) { - FIXME("(%s,%p,0x%08x) stub!\n", debugstr_w(lpszEvent), hWnd, dwReserved); + FIXME("(%s,%p,0x%08lx) stub!\n", debugstr_w(lpszEvent), hWnd, dwReserved); }
/************************************************************************* @@ -215,7 +215,7 @@ DWORD WINAPI GetPerfTime(void) */ DWORD WINAPI StopWatch_SetMsgLastLocation(DWORD dwUnknown) { - FIXME("(%d) stub!\n", dwUnknown); + FIXME("(%ld) stub!\n", dwUnknown);
return dwUnknown; } diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index fc565f45355..49aef6d12aa 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -754,7 +754,7 @@ INT WINAPI StrFromTimeIntervalA(LPSTR lpszStr, UINT cchMax, DWORD dwMS, { INT iRet = 0;
- TRACE("(%p,%d,%d,%d)\n", lpszStr, cchMax, dwMS, iDigits); + TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits);
if (lpszStr && cchMax) { @@ -776,7 +776,7 @@ INT WINAPI StrFromTimeIntervalW(LPWSTR lpszStr, UINT cchMax, DWORD dwMS, { INT iRet = 0;
- TRACE("(%p,%d,%d,%d)\n", lpszStr, cchMax, dwMS, iDigits); + TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits);
if (lpszStr && cchMax) { @@ -947,7 +947,7 @@ LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) */ LPSTR WINAPI StrFormatByteSizeA(DWORD dwBytes, LPSTR lpszDest, UINT cchMax) { - TRACE("(%d,%p,%d)\n", dwBytes, lpszDest, cchMax); + TRACE("(%ld,%p,%d)\n", dwBytes, lpszDest, cchMax);
return StrFormatByteSize64A(dwBytes, lpszDest, cchMax); } @@ -1036,7 +1036,7 @@ DWORD WINAPI SHAnsiToUnicodeCP(DWORD dwCp, LPCSTR lpSrcStr, LPWSTR lpDstStr, int DWORD dwRet;
dwRet = MultiByteToWideChar(dwCp, 0, lpSrcStr, -1, lpDstStr, iLen); - TRACE("%s->%s,ret=%d\n", debugstr_a(lpSrcStr), debugstr_w(lpDstStr), dwRet); + TRACE("%s->%s,ret=%ld\n", debugstr_a(lpSrcStr), debugstr_w(lpDstStr), dwRet); return dwRet; }
diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index f58488aac04..ee79f73c040 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -68,7 +68,7 @@ LPSECURITY_ATTRIBUTES WINAPI CreateAllAccessSecurityAttributes( /* This function is used within SHLWAPI only to create security attributes * for shell semaphores. */
- TRACE("(%p,%p,%08x)\n", lpAttr, lpSec, p3); + TRACE("(%p,%p,%08lx)\n", lpAttr, lpSec, p3);
if (!(GetVersion() & 0x80000000)) /* NT */ { @@ -185,7 +185,7 @@ HANDLE WINAPI SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial) SECURITY_ATTRIBUTES sAttr, *pSecAttr; HANDLE hRet;
- TRACE("(%s,%d)\n", debugstr_w(lpszName), iInitial); + TRACE("(%s,%ld)\n", debugstr_w(lpszName), iInitial);
/* Create Semaphore name */ memcpy(szBuff, szPrefix, (iPrefixLen + 1) * sizeof(WCHAR)); @@ -216,7 +216,7 @@ HANDLE WINAPI SHGlobalCounterCreateNamedA(LPCSTR lpszName, DWORD iInitial) { WCHAR szBuff[MAX_PATH];
- TRACE("(%s,%d)\n", debugstr_a(lpszName), iInitial); + TRACE("(%s,%ld)\n", debugstr_a(lpszName), iInitial);
if (lpszName) MultiByteToWideChar(CP_ACP, 0, lpszName, -1, szBuff, MAX_PATH); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 8318c5d7a62..f657d6c007c 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -111,7 +111,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, static const unsigned int szResLen = ARRAY_SIZE(szRes) - 1; HRESULT hRet = E_FAIL;
- TRACE("(%s,%p,0x%08x,%s,%p,%d)\n", debugstr_w(lpszLibName), hMod, dwFlags, + TRACE("(%s,%p,0x%08lx,%s,%p,%ld)\n", debugstr_w(lpszLibName), hMod, dwFlags, debugstr_w(lpszRes), lpszDest, dwDestLen);
if (!lpszLibName || !hMod || hMod == INVALID_HANDLE_VALUE || !lpszRes ||