From e119a04a2699d50129bfbf0aebd56a344a588d53 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Fri, 6 Oct 2006 12:43:28 +0200 Subject: [PATCH] shlwapi: Win64 printf format warning fixes. --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/assoc.c | 28 ++++++------ dlls/shlwapi/clist.c | 6 +-- dlls/shlwapi/istream.c | 32 ++++++------- dlls/shlwapi/msgbox.c | 2 +- dlls/shlwapi/ordinal.c | 90 ++++++++++++++++++------------------- dlls/shlwapi/path.c | 28 ++++++------ dlls/shlwapi/reg.c | 88 ++++++++++++++++++------------------ dlls/shlwapi/regstream.c | 16 +++---- dlls/shlwapi/shlwapi_main.c | 4 +- dlls/shlwapi/stopwatch.c | 6 +-- dlls/shlwapi/string.c | 12 ++--- dlls/shlwapi/thread.c | 8 ++-- dlls/shlwapi/url.c | 40 ++++++++--------- 14 files changed, 181 insertions(+), 181 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 7679f86cd16..44c2cdf8073 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHLWAPI_ -DWINE_NO_LONG_AS_INT +EXTRADEFS = -D_SHLWAPI_ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 8f3827f1871..2669358609c 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -170,7 +170,7 @@ HRESULT WINAPI AssocQueryKeyW(ASSOCF cfFlags, ASSOCKEY assockey, LPCWSTR pszAsso HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(0x%8lx,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), + TRACE("(0x%8x,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_w(pszAssoc), debugstr_w(pszExtra), phkeyOut); lpAssoc = IQueryAssociations_Constructor(); @@ -211,7 +211,7 @@ HRESULT WINAPI AssocQueryKeyA(ASSOCF cfFlags, ASSOCKEY assockey, LPCSTR pszAssoc WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL; HRESULT hRet = E_OUTOFMEMORY; - TRACE("(0x%8lx,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc), + TRACE("(0x%8x,0x%8x,%s,%s,%p)\n", cfFlags, assockey, debugstr_a(pszAssoc), debugstr_a(pszExtra), phkeyOut); if (SHLWAPI_ParamAToW(pszAssoc, szAssocW, MAX_PATH, &lpszAssocW) && @@ -240,7 +240,7 @@ HRESULT WINAPI AssocQueryStringW(ASSOCF cfFlags, ASSOCSTR str, LPCWSTR pszAssoc, HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(0x%8lx,0x%8x,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc), + TRACE("(0x%8x,0x%8x,%s,%s,%p,%p)\n", cfFlags, str, debugstr_w(pszAssoc), debugstr_w(pszExtra), pszOut, pcchOut); if (!pcchOut) @@ -286,7 +286,7 @@ HRESULT WINAPI AssocQueryStringA(ASSOCF cfFlags, ASSOCSTR str, LPCSTR pszAssoc, WCHAR szExtraW[MAX_PATH], *lpszExtraW = NULL; HRESULT hRet = E_OUTOFMEMORY; - TRACE("(0x%8lx,0x%8x,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc), + TRACE("(0x%8x,0x%8x,%s,%s,%p,%p)\n", cfFlags, str, debugstr_a(pszAssoc), debugstr_a(pszExtra), pszOut, pcchOut); if (!pcchOut) @@ -336,7 +336,7 @@ HRESULT WINAPI AssocQueryStringByKeyW(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc HRESULT hRet; IQueryAssociations* lpAssoc; - TRACE("(0x%8lx,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, + TRACE("(0x%8x,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_w(pszExtra), pszOut, pcchOut); lpAssoc = IQueryAssociations_Constructor(); @@ -380,7 +380,7 @@ HRESULT WINAPI AssocQueryStringByKeyA(ASSOCF cfFlags, ASSOCSTR str, HKEY hkAssoc WCHAR szReturnW[MAX_PATH], *lpszReturnW = szReturnW; HRESULT hRet = E_OUTOFMEMORY; - TRACE("(0x%8lx,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, + TRACE("(0x%8x,0x%8x,%p,%s,%p,%p)\n", cfFlags, str, hkAssoc, debugstr_a(pszExtra), pszOut, pcchOut); if (!pcchOut) @@ -469,7 +469,7 @@ static ULONG WINAPI IQueryAssociations_fnAddRef(IQueryAssociations *iface) IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); return refCount; } @@ -484,7 +484,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); if (!refCount) { @@ -522,7 +522,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; HRESULT hr; - TRACE("(%p)->(%ld,%s,%p,%p)\n", iface, + TRACE("(%p)->(%d,%s,%p,%p)\n", iface, cfFlags, debugstr_w(pszAssoc), hkeyProgid, @@ -530,7 +530,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( if (hWnd != NULL) FIXME("hwnd != NULL not supported\n"); if (cfFlags != 0) - FIXME("unsupported flags: %lx\n", cfFlags); + FIXME("unsupported flags: %x\n", cfFlags); if (pszAssoc != NULL) { hr = RegOpenKeyExW(HKEY_CLASSES_ROOT, @@ -591,7 +591,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( { IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - FIXME("(%p,0x%8lx,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, str, + FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, str, debugstr_w(pszExtra), pszOut, pcchOut); return E_NOTIMPL; } @@ -621,7 +621,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetKey( { IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - FIXME("(%p,0x%8lx,0x%8x,%s,%p)-stub!\n", This, cfFlags, assockey, + FIXME("(%p,0x%8x,0x%8x,%s,%p)-stub!\n", This, cfFlags, assockey, debugstr_w(pszExtra), phkeyOut); return E_NOTIMPL; } @@ -653,7 +653,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetData( { IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - FIXME("(%p,0x%8lx,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, assocdata, + FIXME("(%p,0x%8x,0x%8x,%s,%p,%p)-stub!\n", This, cfFlags, assocdata, debugstr_w(pszExtra), pvOut, pcbOut); return E_NOTIMPL; } @@ -688,7 +688,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetEnum( { IQueryAssociationsImpl *This = (IQueryAssociationsImpl *)iface; - FIXME("(%p,0x%8lx,0x%8x,%s,%s,%p)-stub!\n", This, cfFlags, assocenum, + FIXME("(%p,0x%8x,0x%8x,%s,%s,%p)-stub!\n", This, cfFlags, assocenum, debugstr_w(pszExtra), debugstr_guid(riid), ppvOut); return E_NOTIMPL; } diff --git a/dlls/shlwapi/clist.c b/dlls/shlwapi/clist.c index b4fdf0a58a4..274dafa30f3 100644 --- a/dlls/shlwapi/clist.c +++ b/dlls/shlwapi/clist.c @@ -293,7 +293,7 @@ HRESULT WINAPI SHAddDataBlock(LPSHLWAPI_CLIST* lppList, LPCSHLWAPI_CLIST lpNewIt { /* Tune size to a ULONG boundary, add space for container element */ ulSize = ((ulSize + 0x3) & 0xFFFFFFFC) + sizeof(SHLWAPI_CLIST); - TRACE("Creating container item, new size = %ld\n", ulSize); + TRACE("Creating container item, new size = %d\n", ulSize); } if(!*lppList) @@ -372,7 +372,7 @@ BOOL WINAPI SHRemoveDataBlock(LPSHLWAPI_CLIST* lppList, ULONG ulId) LPSHLWAPI_CLIST lpNext; ULONG ulNewSize; - TRACE("(%p,%ld)\n", lppList, ulId); + TRACE("(%p,%d)\n", lppList, ulId); if(lppList && (lpList = *lppList)) { @@ -437,7 +437,7 @@ BOOL WINAPI SHRemoveDataBlock(LPSHLWAPI_CLIST* lppList, ULONG ulId) */ LPSHLWAPI_CLIST WINAPI SHFindDataBlock(LPSHLWAPI_CLIST lpList, ULONG ulId) { - TRACE("(%p,%ld)\n", lpList, ulId); + TRACE("(%p,%d)\n", lpList, ulId); if(lpList) { diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index edcd254ef56..ff93b77621f 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -83,7 +83,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface) ISHFileStream *This = (ISHFileStream *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); return refCount; } @@ -96,7 +96,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) ISHFileStream *This = (ISHFileStream *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); if (!refCount) { @@ -117,14 +117,14 @@ static HRESULT WINAPI IStream_fnRead(IStream *iface, void* pv, ULONG cb, ULONG* ISHFileStream *This = (ISHFileStream *)iface; DWORD dwRead = 0; - TRACE("(%p,%p,0x%08lx,%p)\n", This, pv, cb, pcbRead); + TRACE("(%p,%p,0x%08x,%p)\n", This, pv, cb, pcbRead); if (!pv) return STG_E_INVALIDPOINTER; if (!ReadFile(This->hFile, pv, cb, &dwRead, NULL)) { - ERR("error %ld reading file\n", GetLastError()); + ERR("error %d reading file\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); } if (pcbRead) @@ -140,7 +140,7 @@ static HRESULT WINAPI IStream_fnWrite(IStream *iface, const void* pv, ULONG cb, ISHFileStream *This = (ISHFileStream *)iface; DWORD dwWritten = 0; - TRACE("(%p,%p,0x%08lx,%p)\n", This, pv, cb, pcbWritten); + TRACE("(%p,%p,0x%08x,%p)\n", This, pv, cb, pcbWritten); if (!pv) return STG_E_INVALIDPOINTER; @@ -171,7 +171,7 @@ static HRESULT WINAPI IStream_fnSeek(IStream *iface, LARGE_INTEGER dlibMove, ISHFileStream *This = (ISHFileStream *)iface; DWORD dwPos; - TRACE("(%p,%ld,%ld,%p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); + TRACE("(%p,%d,%d,%p)\n", This, dlibMove.u.LowPart, dwOrigin, pNewPos); IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ dwPos = SetFilePointer(This->hFile, dlibMove.u.LowPart, NULL, dwOrigin); @@ -193,7 +193,7 @@ static HRESULT WINAPI IStream_fnSetSize(IStream *iface, ULARGE_INTEGER libNewSiz { ISHFileStream *This = (ISHFileStream *)iface; - TRACE("(%p,%ld)\n", This, libNewSize.u.LowPart); + TRACE("(%p,%d)\n", This, libNewSize.u.LowPart); IStream_fnCommit(iface, 0); /* If ever buffered, this will be needed */ if( ! SetFilePointer( This->hFile, libNewSize.QuadPart, NULL, FILE_BEGIN ) ) @@ -216,7 +216,7 @@ static HRESULT WINAPI IStream_fnCopyTo(IStream *iface, IStream* pstm, ULARGE_INT ULONGLONG ulSize; HRESULT hRet = S_OK; - TRACE("(%p,%p,%ld,%p,%p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); + TRACE("(%p,%p,%d,%p,%p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); if (pcbRead) pcbRead->QuadPart = 0; @@ -262,7 +262,7 @@ static HRESULT WINAPI IStream_fnCommit(IStream *iface, DWORD grfCommitFlags) { ISHFileStream *This = (ISHFileStream *)iface; - TRACE("(%p,%ld)\n", This, grfCommitFlags); + TRACE("(%p,%d)\n", This, grfCommitFlags); /* Currently unbuffered: This function is not needed */ return S_OK; } @@ -285,7 +285,7 @@ static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER ULARGE_INTEGER cb, DWORD dwLockType) { ISHFileStream *This = (ISHFileStream *)iface; - TRACE("(%p,%ld,%ld,%ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + TRACE("(%p,%d,%d,%d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); return E_NOTIMPL; } @@ -299,7 +299,7 @@ static HRESULT WINAPI IStream_fnStat(IStream *iface, STATSTG* lpStat, BY_HANDLE_FILE_INFORMATION fi; HRESULT hRet = S_OK; - TRACE("(%p,%p,%ld)\n", This, lpStat, grfStatFlag); + TRACE("(%p,%p,%d)\n", This, lpStat, grfStatFlag); if (!grfStatFlag) hRet = STG_E_INVALIDPOINTER; @@ -410,7 +410,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, DWORD dwAccess, dwShare, dwCreate; HANDLE hFile; - TRACE("(%s,%ld,0x%08lX,%d,%p,%p)\n", debugstr_w(lpszPath), dwMode, + TRACE("(%s,%d,0x%08X,%d,%p,%p)\n", debugstr_w(lpszPath), dwMode, dwAttributes, bCreate, lpTemplate, lppStream); if (!lpszPath || !lppStream || lpTemplate) @@ -498,7 +498,7 @@ HRESULT WINAPI SHCreateStreamOnFileEx(LPCWSTR lpszPath, DWORD dwMode, HRESULT WINAPI SHCreateStreamOnFileW(LPCWSTR lpszPath, DWORD dwMode, IStream **lppStream) { - TRACE("(%s,%ld,%p)\n", debugstr_w(lpszPath), dwMode, lppStream); + TRACE("(%s,%d,%p)\n", debugstr_w(lpszPath), dwMode, lppStream); if (!lpszPath || !lppStream) return E_INVALIDARG; @@ -525,7 +525,7 @@ HRESULT WINAPI SHCreateStreamOnFileA(LPCSTR lpszPath, DWORD dwMode, { WCHAR szPath[MAX_PATH]; - TRACE("(%s,%ld,%p)\n", debugstr_a(lpszPath), dwMode, lppStream); + TRACE("(%s,%d,%p)\n", debugstr_a(lpszPath), dwMode, lppStream); if (!lpszPath) return E_INVALIDARG; @@ -553,7 +553,7 @@ HRESULT WINAPI SHLWAPI_184(IStream *lpStream, LPVOID lpvDest, ULONG ulSize) ULONG ulRead; HRESULT hRet; - TRACE("(%p,%p,%ld)\n", lpStream, lpvDest, ulSize); + TRACE("(%p,%p,%d)\n", lpStream, lpvDest, ulSize); hRet = IStream_Read(lpStream, lpvDest, ulSize, &ulRead); @@ -625,7 +625,7 @@ HRESULT WINAPI SHLWAPI_212(IStream *lpStream, LPCVOID lpvSrc, ULONG ulSize) ULONG ulWritten; HRESULT hRet; - TRACE("(%p,%p,%ld)\n", lpStream, lpvSrc, ulSize); + TRACE("(%p,%p,%d)\n", lpStream, lpvSrc, ulSize); hRet = IStream_Write(lpStream, lpvSrc, ulSize, &ulWritten); diff --git a/dlls/shlwapi/msgbox.c b/dlls/shlwapi/msgbox.c index 65665cf2dca..a9c355aa49a 100644 --- a/dlls/shlwapi/msgbox.c +++ b/dlls/shlwapi/msgbox.c @@ -195,7 +195,7 @@ static INT_PTR CALLBACK SHDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP case WM_INITDIALOG: { DLGDATA *d = (DLGDATA *)lParam; - TRACE("WM_INITDIALOG: %p, %s,%s,%ld\n", hDlg, debugstr_w(d->lpszTitle), + TRACE("WM_INITDIALOG: %p, %s,%s,%d\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 d4b05bc6c42..ea71849c110 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -153,7 +153,7 @@ HANDLE WINAPI SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, DWORD dwMyProcId = GetCurrentProcessId(); HANDLE hRet = NULL; - TRACE("(%p,%ld,%ld,%08lx,%08lx)\n", hShared, dwDstProcId, dwSrcProcId, + TRACE("(%p,%d,%d,%08x,%08x)\n", hShared, dwDstProcId, dwSrcProcId, dwAccess, dwOptions); /* Get dest process handle */ @@ -217,7 +217,7 @@ HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId) LPVOID pMapped; HANDLE hRet = NULL; - TRACE("(%p,%ld,%ld)\n", lpvData, dwSize, dwProcId); + TRACE("(%p,%d,%d)\n", lpvData, dwSize, dwProcId); /* Create file mapping of the correct length */ hMap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, FILE_MAP_READ, 0, @@ -265,7 +265,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) HANDLE hDup; LPVOID pMapped; - TRACE("(%p %ld)\n", hShared, dwProcId); + TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), @@ -316,7 +316,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) { HANDLE hClose; - TRACE("(%p %ld)\n", hShared, dwProcId); + TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ hClose = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), @@ -796,7 +796,7 @@ BOOL WINAPI IsCharXDigitW(WCHAR wc) */ BOOL WINAPI GetStringType3ExW(LPWSTR lpszStr, DWORD dwLen, LPVOID p3) { - FIXME("(%s,0x%08lx,%p): stub\n", debugstr_w(lpszStr), dwLen, p3); + FIXME("(%s,0x%08x,%p): stub\n", debugstr_w(lpszStr), dwLen, p3); return TRUE; } @@ -1000,7 +1000,7 @@ BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen) { WCHAR buff[2084]; - TRACE("(%p,%ld)\n", lpszDest, dwDestLen); + TRACE("(%p,%d)\n", lpszDest, dwDestLen); if (lpszDest && SHAboutInfoW(buff, dwDestLen)) { @@ -1046,7 +1046,7 @@ BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen) HKEY hReg; DWORD dwType, dwLen; - TRACE("(%p,%ld)\n", lpszDest, dwDestLen); + TRACE("(%p,%d)\n", lpszDest, dwDestLen); if (!lpszDest) return FALSE; @@ -1134,7 +1134,7 @@ HRESULT WINAPI IUnknown_QueryStatus(IUnknown* lpUnknown, REFGUID pguidCmdGroup, { HRESULT hRet = E_FAIL; - TRACE("(%p,%p,%ld,%p,%p)\n",lpUnknown, pguidCmdGroup, cCmds, prgCmds, pCmdText); + TRACE("(%p,%p,%d,%p,%p)\n",lpUnknown, pguidCmdGroup, cCmds, prgCmds, pCmdText); if (lpUnknown) { @@ -1174,7 +1174,7 @@ HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, { HRESULT hRet = E_FAIL; - TRACE("(%p,%p,%ld,%ld,%p,%p)\n",lpUnknown, pguidCmdGroup, nCmdID, + TRACE("(%p,%p,%d,%d,%p,%p)\n",lpUnknown, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); if (lpUnknown) @@ -1472,7 +1472,7 @@ HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg) }; IMalloc *pUnk2; - TRACE("(%p,%ld)\n", pUnk, arg); + TRACE("(%p,%d)\n", pUnk, arg); /* Note: arg may not be a ULONG and pUnk2 is for sure not an IMalloc - * We use this interface as its vtable entry is compatible with the @@ -1506,21 +1506,21 @@ HRESULT WINAPI IUnknown_SetSite( if (!obj) return E_FAIL; hr = IUnknown_QueryInterface(obj, &IID_IObjectWithSite, (LPVOID *)&iobjwithsite); - TRACE("IID_IObjectWithSite QI ret=%08lx, %p\n", hr, iobjwithsite); + TRACE("IID_IObjectWithSite QI ret=%08x, %p\n", hr, iobjwithsite); if (SUCCEEDED(hr)) { hr = IObjectWithSite_SetSite(iobjwithsite, site); - TRACE("done IObjectWithSite_SetSite ret=%08lx\n", hr); + TRACE("done IObjectWithSite_SetSite ret=%08x\n", hr); IUnknown_Release(iobjwithsite); } else { hr = IUnknown_QueryInterface(obj, &IID_IInternetSecurityManager, (LPVOID *)&isecmgr); - TRACE("IID_IInternetSecurityManager QI ret=%08lx, %p\n", hr, isecmgr); + TRACE("IID_IInternetSecurityManager QI ret=%08x, %p\n", hr, isecmgr); if (FAILED(hr)) return hr; hr = IInternetSecurityManager_SetSecuritySite(isecmgr, (IInternetSecurityMgrSite *)site); - TRACE("done IInternetSecurityManager_SetSecuritySite ret=%08lx\n", hr); + TRACE("done IInternetSecurityManager_SetSecuritySite ret=%08x\n", hr); IUnknown_Release(isecmgr); } return hr; @@ -1852,7 +1852,7 @@ HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg IOleControlSite* lpCSite = NULL; HRESULT hRet = E_INVALIDARG; - TRACE("(%p,%p,0x%08lx)\n", lpUnknown, lpMsg, dwModifiers); + TRACE("(%p,%p,0x%08x)\n", lpUnknown, lpMsg, dwModifiers); if (lpUnknown) { hRet = IUnknown_QueryInterface(lpUnknown, &IID_IOleControlSite, @@ -2162,7 +2162,7 @@ HRESULT WINAPI MayQSForward(IUnknown* lpUnknown, PVOID lpReserved, REFGUID riidCmdGrp, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText) { - FIXME("(%p,%p,%p,%ld,%p,%p) - stub\n", + FIXME("(%p,%p,%p,%d,%p,%p) - stub\n", lpUnknown, lpReserved, riidCmdGrp, cCmds, prgCmds, pCmdText); /* FIXME: Calls IsQSForward & IUnknown_QueryStatus */ @@ -2177,7 +2177,7 @@ HRESULT WINAPI MayExecForward(IUnknown* lpUnknown, INT iUnk, REFGUID pguidCmdGro DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut) { - FIXME("(%p,%d,%p,%ld,%ld,%p,%p) - stub!\n", lpUnknown, iUnk, pguidCmdGroup, + FIXME("(%p,%d,%p,%d,%d,%p,%p) - stub!\n", lpUnknown, iUnk, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); return DRAGDROP_E_NOTREGISTERED; } @@ -2188,7 +2188,7 @@ HRESULT WINAPI MayExecForward(IUnknown* lpUnknown, INT iUnk, REFGUID pguidCmdGro */ HRESULT WINAPI IsQSForward(REFGUID pguidCmdGroup,ULONG cCmds, OLECMD *prgCmds) { - FIXME("(%p,%ld,%p) - stub!\n", pguidCmdGroup, cCmds, prgCmds); + FIXME("(%p,%d,%p) - stub!\n", pguidCmdGroup, cCmds, prgCmds); return DRAGDROP_E_NOTREGISTERED; } @@ -2240,7 +2240,7 @@ typedef struct BOOL WINAPI FDSA_Initialize(DWORD block_size, DWORD inc, FDSA_info *info, void *mem, DWORD init_blocks) { - TRACE("(0x%08lx 0x%08lx %p %p 0x%08lx)\n", block_size, inc, info, mem, init_blocks); + TRACE("(0x%08x 0x%08x %p %p 0x%08x)\n", block_size, inc, info, mem, init_blocks); if(inc == 0) inc = 1; @@ -2283,7 +2283,7 @@ BOOL WINAPI FDSA_Destroy(FDSA_info *info) */ DWORD WINAPI FDSA_InsertItem(FDSA_info *info, DWORD where, const void *block) { - TRACE("(%p 0x%08lx %p)\n", info, where, block); + TRACE("(%p 0x%08x %p)\n", info, where, block); if(where > info->num_items) where = info->num_items; @@ -2321,7 +2321,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%08lx)\n", info, where); + TRACE("(%p 0x%08x)\n", info, where); if(where >= info->num_items) return FALSE; @@ -2367,7 +2367,7 @@ HRESULT WINAPI QISearch( if (ppv) { xmove = x; while (xmove->refid) { - TRACE("trying (indx %ld) %s\n", xmove->indx, debugstr_guid(xmove->refid)); + TRACE("trying (indx %d) %s\n", xmove->indx, debugstr_guid(xmove->refid)); if (IsEqualIID(riid, xmove->refid)) { a_vtbl = (IUnknown*)(xmove->indx + (LPBYTE)w); TRACE("matched, returning (%p)\n", a_vtbl); @@ -2390,7 +2390,7 @@ HRESULT WINAPI QISearch( } else ret = E_POINTER; - TRACE("-- 0x%08lx\n", ret); + TRACE("-- 0x%08x\n", ret); return ret; } @@ -2582,7 +2582,7 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08lx,%p,0x%08lx,0x%08lx,%p,0x%08lx)\n", + TRACE("(0x%08x,%p,0x%08x,0x%08x,%p,0x%08x)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); /* Create Window class */ @@ -2686,7 +2686,7 @@ DWORD WINAPI SHRestrictionLookup( LPPOLICYDATA polTable, LPDWORD polArr) { - TRACE("(0x%08lx %s %p %p)\n", policy, debugstr_w(initial), polTable, polArr); + TRACE("(0x%08x %s %p %p)\n", policy, debugstr_w(initial), polTable, polArr); if (!polTable || !polArr) return 0; @@ -2704,7 +2704,7 @@ DWORD WINAPI SHRestrictionLookup( } } /* we don't know this policy, return 0 */ - TRACE("unknown policy: (%08lx)\n", policy); + TRACE("unknown policy: (%08x)\n", policy); return 0; } @@ -2737,7 +2737,7 @@ HRESULT WINAPI SHWeakQueryInterface( hret = IUnknown_QueryInterface(pInner, riid, (LPVOID*)ppv); if (SUCCEEDED(hret)) IUnknown_Release(pUnk); } - TRACE("-- 0x%08lx\n", hret); + TRACE("-- 0x%08x\n", hret); return hret; } @@ -2865,7 +2865,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle WNDCLASSW wc; HWND hWnd; - TRACE("(0x%08lx,%p,0x%08lx,0x%08lx,%p,0x%08lx)\n", + TRACE("(0x%08x,%p,0x%08x,0x%08x,%p,0x%08x)\n", wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); /* If our OS is natively ASCII, use the ASCII version */ @@ -2975,7 +2975,7 @@ HRESULT WINAPI IConnectionPoint_OnChanged(IConnectionPoint* lpCP, DISPID dispID) IEnumConnections *lpEnum; HRESULT hRet = E_NOINTERFACE; - TRACE("(%p,0x%8lX)\n", lpCP, dispID); + TRACE("(%p,0x%8X)\n", lpCP, dispID); /* Get an enumerator for the connections */ if (lpCP) @@ -3023,7 +3023,7 @@ HRESULT WINAPI IUnknown_CPContainerOnChanged(IUnknown *lpUnknown, DISPID dispID) IConnectionPointContainer* lpCPC = NULL; HRESULT hRet = E_NOINTERFACE; - TRACE("(%p,0x%8lX)\n", lpUnknown, dispID); + TRACE("(%p,0x%8X)\n", lpUnknown, dispID); if (lpUnknown) hRet = IUnknown_QueryInterface(lpUnknown, &IID_IConnectionPointContainer, (void**)&lpCPC); @@ -3072,7 +3072,7 @@ BOOL WINAPI SHGetIniStringW(LPSTR str1, LPSTR str2, LPSTR pStr, DWORD some_len, * shlwapi.294(str1, str2, pStr, some_len, lpStr2); * shlwapi.PathRemoveBlanksW(pStr); */ - FIXME("('%s', '%s', '%s', %08lx, '%s'): stub!\n", str1, str2, pStr, some_len, lpStr2); + FIXME("('%s', '%s', '%s', %08x, '%s'): stub!\n", str1, str2, pStr, some_len, lpStr2); return TRUE; } @@ -3483,7 +3483,7 @@ HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCod */ COLORREF WINAPI ColorAdjustLuma(COLORREF cRGB, int dwLuma, BOOL bUnknown) { - TRACE("(0x%8lx,%d,%d)\n", cRGB, dwLuma, bUnknown); + TRACE("(0x%8x,%d,%d)\n", cRGB, dwLuma, bUnknown); if (dwLuma) { @@ -3668,7 +3668,7 @@ DWORD WINAPI SHGetMachineInfo(DWORD dwFlags) { HW_PROFILE_INFOA hwInfo; - TRACE("(0x%08lx)\n", dwFlags); + TRACE("(0x%08x)\n", dwFlags); GetCurrentHwProfileA(&hwInfo); switch (hwInfo.dwDockInfo & (DOCKINFO_DOCKED|DOCKINFO_UNDOCKED)) @@ -3744,7 +3744,7 @@ DWORD WINAPI MLSetMLHInstance(HINSTANCE hInst, HANDLE hHeap) */ DWORD WINAPI MLClearMLHInstance(DWORD x) { - FIXME("(0x%08lx)stub\n", x); + FIXME("(0x%08x)stub\n", x); return 0xabba1247; } @@ -3882,7 +3882,7 @@ BOOL WINAPI IsOS(DWORD feature) platform = osvi.dwPlatformId; #define ISOS_RETURN(x) \ - TRACE("(0x%lx) ret=%d\n",feature,(x)); \ + TRACE("(0x%x) ret=%d\n",feature,(x)); \ return (x); switch(feature) { @@ -3975,7 +3975,7 @@ BOOL WINAPI IsOS(DWORD feature) #undef ISOS_RETURN - WARN("(0x%lx) unknown parameter\n",feature); + WARN("(0x%x) unknown parameter\n",feature); return FALSE; } @@ -4081,7 +4081,7 @@ VOID WINAPI ColorRGBToHLS(COLORREF cRGB, LPWORD pwHue, { int wR, wG, wB, wMax, wMin, wHue, wLuminosity, wSaturation; - TRACE("(%08lx,%p,%p,%p)\n", cRGB, pwHue, pwLuminance, pwSaturation); + TRACE("(%08x,%p,%p,%p)\n", cRGB, pwHue, pwLuminance, pwSaturation); wR = GetRValue(cRGB); wG = GetGValue(cRGB); @@ -4173,7 +4173,7 @@ HRESULT WINAPI SHGetInverseCMAP(LPDWORD dest, DWORD dwSize) *dest = (DWORD)0xabba1249; return 0; } - FIXME("(%p, %#lx) stub\n", dest, dwSize); + FIXME("(%p, %#x) stub\n", dest, dwSize); return 0; } @@ -4191,7 +4191,7 @@ HRESULT WINAPI SHGetInverseCMAP(LPDWORD dest, DWORD dwSize) */ BOOL WINAPI SHIsLowMemoryMachine (DWORD x) { - FIXME("(0x%08lx) stub\n", x); + FIXME("(0x%08x) stub\n", x); return FALSE; } @@ -4254,7 +4254,7 @@ VOID WINAPI FixSlashesAndColonW(LPWSTR lpwstr) */ DWORD WINAPI SHGetAppCompatFlags(DWORD dwUnknown) { - FIXME("(0x%08lx) stub\n", dwUnknown); + FIXME("(0x%08x) stub\n", dwUnknown); return 0; } @@ -4311,7 +4311,7 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) */ DWORD WINAPI SHGetShellKey(DWORD a, DWORD b, DWORD c) { - FIXME("(%lx, %lx, %lx): stub\n", a, b, c); + FIXME("(%x, %x, %x): stub\n", a, b, c); return 0x50; } @@ -4320,7 +4320,7 @@ DWORD WINAPI SHGetShellKey(DWORD a, DWORD b, DWORD c) */ HRESULT WINAPI SHQueueUserWorkItem(DWORD a, DWORD b, DWORD c, DWORD d, DWORD e, DWORD f, DWORD g) { - FIXME("(%lx, %lx, %lx, %lx, %lx, %lx, %lx): stub\n", a, b, c, d, e, f, g); + FIXME("(%x, %x, %x, %x, %x, %x, %x): stub\n", a, b, c, d, e, f, g); return E_FAIL; } @@ -4352,7 +4352,7 @@ HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObj */ HRESULT WINAPI SKGetValueW(DWORD a, LPWSTR b, LPWSTR c, DWORD d, DWORD e, DWORD f) { - FIXME("(%lx, %s, %s, %lx, %lx, %lx): stub\n", a, debugstr_w(b), debugstr_w(c), d, e, f); + FIXME("(%x, %s, %s, %x, %x, %x): stub\n", a, debugstr_w(b), debugstr_w(c), d, e, f); return E_FAIL; } @@ -4404,7 +4404,7 @@ DWORD WINAPI GetUIVersion(void) BOOL WINAPI ShellMessageBoxWrapW(HMODULE mod, DWORD unknown1, UINT uId, LPCWSTR title, DWORD unknown2, LPCWSTR filename) { - FIXME("%p %lx %d %s %lx %s\n", + FIXME("%p %x %d %s %x %s\n", mod, unknown1, uId, debugstr_w(title), unknown2, debugstr_w(filename)); return TRUE; } @@ -4412,7 +4412,7 @@ BOOL WINAPI ShellMessageBoxWrapW(HMODULE mod, DWORD unknown1, UINT uId, HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *unk, REFIID service, REFIID clsid, DWORD x1, DWORD x2, DWORD x3, void **ppvOut) { - FIXME("%p %s %s %08lx %08lx %08lx %p\n", unk, + FIXME("%p %s %s %08x %08x %08x %p\n", unk, debugstr_guid(service), debugstr_guid(clsid), x1, x2, x3, ppvOut); return E_NOTIMPL; } diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index c298f35f665..a1c114badd0 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1068,7 +1068,7 @@ BOOL WINAPI PathFileExistsDefExtW(LPWSTR lpszPath,DWORD dwWhich) { '.', 'c', 'm', 'd', 0}, { 0, 0, 0, 0, 0} }; - TRACE("(%s,%ld)\n", debugstr_w(lpszPath), dwWhich); + TRACE("(%s,%d)\n", debugstr_w(lpszPath), dwWhich); if (!lpszPath || PathIsUNCServerW(lpszPath) || PathIsUNCServerShareW(lpszPath)) return FALSE; @@ -1124,7 +1124,7 @@ BOOL WINAPI PathFileExistsDefExtA(LPSTR lpszPath,DWORD dwWhich) { BOOL bRet = FALSE; - TRACE("(%s,%ld)\n", debugstr_a(lpszPath), dwWhich); + TRACE("(%s,%d)\n", debugstr_a(lpszPath), dwWhich); if (lpszPath) { @@ -1151,7 +1151,7 @@ static BOOL WINAPI SHLWAPI_PathFindInOtherDirs(LPWSTR lpszFile, DWORD dwWhich) WCHAR *lpszPATH; WCHAR buff[MAX_PATH]; - TRACE("(%s,%08lx)\n", debugstr_w(lpszFile), dwWhich); + TRACE("(%s,%08x)\n", debugstr_w(lpszFile), dwWhich); /* Try system directories */ GetSystemDirectoryW(buff, MAX_PATH); @@ -1237,7 +1237,7 @@ BOOL WINAPI PathFindOnPathExA(LPSTR lpszFile,LPCSTR *lppszOtherDirs,DWORD dwWhic WCHAR szFile[MAX_PATH]; WCHAR buff[MAX_PATH]; - TRACE("(%s,%p,%08lx)\n", debugstr_a(lpszFile), lppszOtherDirs, dwWhich); + TRACE("(%s,%p,%08x)\n", debugstr_a(lpszFile), lppszOtherDirs, dwWhich); if (!lpszFile || !PathIsFileSpecA(lpszFile)) return FALSE; @@ -1280,7 +1280,7 @@ BOOL WINAPI PathFindOnPathExW(LPWSTR lpszFile,LPCWSTR *lppszOtherDirs,DWORD dwWh { WCHAR buff[MAX_PATH]; - TRACE("(%s,%p,%08lx)\n", debugstr_w(lpszFile), lppszOtherDirs, dwWhich); + TRACE("(%s,%p,%08x)\n", debugstr_w(lpszFile), lppszOtherDirs, dwWhich); if (!lpszFile || !PathIsFileSpecW(lpszFile)) return FALSE; @@ -1365,7 +1365,7 @@ BOOL WINAPI PathCompactPathExA(LPSTR lpszDest, LPCSTR lpszPath, { BOOL bRet = FALSE; - TRACE("(%p,%s,%d,0x%08lx)\n", lpszDest, debugstr_a(lpszPath), cchMax, dwFlags); + TRACE("(%p,%s,%d,0x%08x)\n", lpszDest, debugstr_a(lpszPath), cchMax, dwFlags); if (lpszPath && lpszDest) { @@ -1392,7 +1392,7 @@ BOOL WINAPI PathCompactPathExW(LPWSTR lpszDest, LPCWSTR lpszPath, LPCWSTR lpszFile; DWORD dwLen, dwFileLen = 0; - TRACE("(%p,%s,%d,0x%08lx)\n", lpszDest, debugstr_w(lpszPath), cchMax, dwFlags); + TRACE("(%p,%s,%d,0x%08x)\n", lpszDest, debugstr_w(lpszPath), cchMax, dwFlags); if (!lpszPath) return FALSE; @@ -2127,7 +2127,7 @@ BOOL WINAPI PathIsPrefixW(LPCWSTR lpszPrefix, LPCWSTR lpszPath) */ BOOL WINAPI PathIsSystemFolderA(LPCSTR lpszPath, DWORD dwAttrib) { - TRACE("(%s,0x%08lx)\n", debugstr_a(lpszPath), dwAttrib); + TRACE("(%s,0x%08x)\n", debugstr_a(lpszPath), dwAttrib); if (lpszPath && *lpszPath) dwAttrib = GetFileAttributesA(lpszPath); @@ -2145,7 +2145,7 @@ BOOL WINAPI PathIsSystemFolderA(LPCSTR lpszPath, DWORD dwAttrib) */ BOOL WINAPI PathIsSystemFolderW(LPCWSTR lpszPath, DWORD dwAttrib) { - TRACE("(%s,0x%08lx)\n", debugstr_w(lpszPath), dwAttrib); + TRACE("(%s,0x%08x)\n", debugstr_w(lpszPath), dwAttrib); if (lpszPath && *lpszPath) dwAttrib = GetFileAttributesW(lpszPath); @@ -3270,7 +3270,7 @@ HRESULT WINAPI PathCreateFromUrlW(LPCWSTR pszUrl, LPWSTR pszPath, DWORD nslashes = 0; WCHAR *ptr; - TRACE("(%s,%p,%p,0x%08lx)\n", debugstr_w(pszUrl), pszPath, pcchPath, dwReserved); + TRACE("(%s,%p,%p,0x%08x)\n", debugstr_w(pszUrl), pszPath, pcchPath, dwReserved); if (!pszUrl || !pszPath || !pcchPath || !*pcchPath) return E_INVALIDARG; @@ -3361,7 +3361,7 @@ BOOL WINAPI PathRelativePathToA(LPSTR lpszPath, LPCSTR lpszFrom, DWORD dwAttrFro { BOOL bRet = FALSE; - TRACE("(%p,%s,0x%08lx,%s,0x%08lx)\n", lpszPath, debugstr_a(lpszFrom), + TRACE("(%p,%s,0x%08x,%s,0x%08x)\n", lpszPath, debugstr_a(lpszFrom), dwAttrFrom, debugstr_a(lpszTo), dwAttrTo); if(lpszPath && lpszFrom && lpszTo) @@ -3391,7 +3391,7 @@ BOOL WINAPI PathRelativePathToW(LPWSTR lpszPath, LPCWSTR lpszFrom, DWORD dwAttrF WCHAR szTo[MAX_PATH]; DWORD dwLen; - TRACE("(%p,%s,0x%08lx,%s,0x%08lx)\n", lpszPath, debugstr_w(lpszFrom), + TRACE("(%p,%s,0x%08x,%s,0x%08x)\n", lpszPath, debugstr_w(lpszFrom), dwAttrFrom, debugstr_w(lpszTo), dwAttrTo); if(!lpszPath || !lpszFrom || !lpszTo) @@ -3969,7 +3969,7 @@ HRESULT WINAPI SHGetWebFolderFilePathA(LPCSTR lpszFile, LPSTR lpszPath, DWORD dw WCHAR szFile[MAX_PATH], szPath[MAX_PATH]; HRESULT hRet; - TRACE("(%s,%p,%ld)\n", lpszFile, lpszPath, dwPathLen); + TRACE("(%s,%p,%d)\n", lpszFile, lpszPath, dwPathLen); MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, szFile, MAX_PATH); szPath[0] = '\0'; @@ -3992,7 +3992,7 @@ HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR lpszFile, LPWSTR lpszPath, DWORD DWORD dwLen, dwFileLen; LANGID lidSystem, lidUser; - TRACE("(%s,%p,%ld)\n", debugstr_w(lpszFile), lpszPath, dwPathLen); + TRACE("(%s,%p,%d)\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 e1d43e20b7b..32bb7d66d7f 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -126,7 +126,7 @@ LONG WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, HUSKEY hRelativeUSK LONG ret2, ret1 = ~ERROR_SUCCESS; LPSHUSKEY hKey; - TRACE("(%s,0x%lx,%p,%p,%d)\n", debugstr_w(Path),(LONG)AccessType, + TRACE("(%s,0x%x,%p,%p,%d)\n", debugstr_w(Path),(LONG)AccessType, hRelativeUSKey, phNewUSKey, fIgnoreHKCU); if (phNewUSKey) @@ -163,7 +163,7 @@ LONG WINAPI SHRegOpenUSKeyW(LPCWSTR Path, REGSAM AccessType, HUSKEY hRelativeUSK hKey->HKLMkey = 0; if (ret1 || ret2) - TRACE("one or more opens failed: HKCU=%ld HKLM=%ld\n", ret1, ret2); + TRACE("one or more opens failed: HKCU=%d HKLM=%d\n", ret1, ret2); if (ret1 && ret2) { @@ -225,7 +225,7 @@ LONG WINAPI SHRegCloseUSKey( LONG WINAPI SHRegCreateUSKeyA(LPCSTR pszPath, REGSAM samDesired, HUSKEY hRelativeUSKey, PHUSKEY phNewUSKey, DWORD dwFlags) { - FIXME("(%s, 0x%08lx, %p, %p, 0x%08lx) stub\n", debugstr_a(pszPath), samDesired, + FIXME("(%s, 0x%08x, %p, %p, 0x%08x) stub\n", debugstr_a(pszPath), samDesired, hRelativeUSKey, phNewUSKey, dwFlags); return ERROR_SUCCESS; } @@ -238,7 +238,7 @@ LONG WINAPI SHRegCreateUSKeyA(LPCSTR pszPath, REGSAM samDesired, HUSKEY hRelativ LONG WINAPI SHRegCreateUSKeyW(LPCWSTR pszPath, REGSAM samDesired, HUSKEY hRelativeUSKey, PHUSKEY phNewUSKey, DWORD dwFlags) { - FIXME("(%s, 0x%08lx, %p, %p, 0x%08lx) stub\n", debugstr_w(pszPath), samDesired, + FIXME("(%s, 0x%08x, %p, %p, 0x%08x) stub\n", debugstr_w(pszPath), samDesired, hRelativeUSKey, phNewUSKey, dwFlags); return ERROR_SUCCESS; } @@ -331,7 +331,7 @@ LONG WINAPI SHRegEnumUSValueA(HUSKEY hUSKey, DWORD dwIndex, LPSTR pszValueName, LPDWORD pcchValueNameLen, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData, SHREGENUM_FLAGS enumRegFlags) { - FIXME("(%p, 0x%08lx, %s, %p, %p, %p, %p, 0x%08x) stub\n", hUSKey, dwIndex, + FIXME("(%p, 0x%08x, %s, %p, %p, %p, %p, 0x%08x) stub\n", hUSKey, dwIndex, debugstr_a(pszValueName), pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); return ERROR_INVALID_FUNCTION; } @@ -345,7 +345,7 @@ LONG WINAPI SHRegEnumUSValueW(HUSKEY hUSKey, DWORD dwIndex, LPWSTR pszValueName, LPDWORD pcchValueNameLen, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData, SHREGENUM_FLAGS enumRegFlags) { - FIXME("(%p, 0x%08lx, %s, %p, %p, %p, %p, 0x%08x) stub\n", hUSKey, dwIndex, + FIXME("(%p, 0x%08x, %s, %p, %p, %p, %p, 0x%08x) stub\n", hUSKey, dwIndex, debugstr_w(pszValueName), pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); return ERROR_INVALID_FUNCTION; } @@ -378,7 +378,7 @@ LONG WINAPI SHRegQueryUSValueA( if (!fIgnoreHKCU && (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKCU))) { ret = RegQueryValueExA(dokey, pszValue, 0, pdwType, pvData, pcbData); - TRACE("HKCU RegQueryValue returned %08lx\n", ret); + TRACE("HKCU RegQueryValue returned %08x\n", ret); } /* if HKCU did not work and HKLM exists, then try it */ @@ -386,7 +386,7 @@ LONG WINAPI SHRegQueryUSValueA( (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKLM))) { ret = RegQueryValueExA(dokey, pszValue, 0, pdwType, pvData, pcbData); - TRACE("HKLM RegQueryValue returned %08lx\n", ret); + TRACE("HKLM RegQueryValue returned %08x\n", ret); } /* if neither worked, and default data exists, then use it */ @@ -429,7 +429,7 @@ LONG WINAPI SHRegQueryUSValueW( if (!fIgnoreHKCU && (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKCU))) { ret = RegQueryValueExW(dokey, pszValue, 0, pdwType, pvData, pcbData); - TRACE("HKCU RegQueryValue returned %08lx\n", ret); + TRACE("HKCU RegQueryValue returned %08x\n", ret); } /* if HKCU did not work and HKLM exists, then try it */ @@ -437,7 +437,7 @@ LONG WINAPI SHRegQueryUSValueW( (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKLM))) { ret = RegQueryValueExW(dokey, pszValue, 0, pdwType, pvData, pcbData); - TRACE("HKLM RegQueryValue returned %08lx\n", ret); + TRACE("HKLM RegQueryValue returned %08x\n", ret); } /* if neither worked, and default data exists, then use it */ @@ -481,7 +481,7 @@ LONG WINAPI SHRegGetUSValueA( LONG ret; if (!pvData || !pcbData) return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/ - TRACE("key '%s', value '%s', datalen %ld, %s\n", + TRACE("key '%s', value '%s', datalen %d, %s\n", debugstr_a(pSubKey), debugstr_a(pValue), *pcbData, (flagIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM"); @@ -514,7 +514,7 @@ LONG WINAPI SHRegGetUSValueW( LONG ret; if (!pvData || !pcbData) return ERROR_INVALID_FUNCTION; /* FIXME:wrong*/ - TRACE("key '%s', value '%s', datalen %ld, %s\n", + TRACE("key '%s', value '%s', datalen %d, %s\n", debugstr_w(pSubKey), debugstr_w(pValue), *pcbData, (flagIgnoreHKCU) ? "Ignoring HKCU" : "Tries HKCU then HKLM"); @@ -556,7 +556,7 @@ LONG WINAPI SHRegSetUSValueA(LPCSTR pszSubKey, LPCSTR pszValue, DWORD dwType, HUSKEY hkey; LONG ret; - TRACE("(%s,%s,%ld,%p,%ld,0x%08lx\n", debugstr_a(pszSubKey), debugstr_a(pszValue), + TRACE("(%s,%s,%d,%p,%d,0x%08x\n", debugstr_a(pszSubKey), debugstr_a(pszValue), dwType, pvData, cbData, dwFlags); if (!pvData) @@ -586,7 +586,7 @@ LONG WINAPI SHRegSetUSValueW(LPCWSTR pszSubKey, LPCWSTR pszValue, DWORD dwType, HUSKEY hkey; LONG ret; - TRACE("(%s,%s,%ld,%p,%ld,0x%08lx\n", debugstr_w(pszSubKey), debugstr_w(pszValue), + TRACE("(%s,%s,%d,%p,%d,0x%08x\n", debugstr_w(pszSubKey), debugstr_w(pszValue), dwType, pvData, cbData, dwFlags); if (!pvData) @@ -658,10 +658,10 @@ BOOL WINAPI SHRegGetBoolUSValueA( break; } default: - FIXME("Unsupported registry data type %ld\n", type); + FIXME("Unsupported registry data type %d\n", type); ret = FALSE; } - TRACE("got value (type=%ld), returing <%s>\n", type, + TRACE("got value (type=%d), returing <%s>\n", type, (ret) ? "TRUE" : "FALSE"); } else { @@ -719,10 +719,10 @@ BOOL WINAPI SHRegGetBoolUSValueW( break; } default: - FIXME("Unsupported registry data type %ld\n", type); + FIXME("Unsupported registry data type %d\n", type); ret = FALSE; } - TRACE("got value (type=%ld), returing <%s>\n", type, + TRACE("got value (type=%d), returing <%s>\n", type, (ret) ? "TRUE" : "FALSE"); } else { @@ -837,7 +837,7 @@ LONG WINAPI SHRegEnumUSKeyA( { HKEY dokey; - TRACE("(%p,%ld,%p,%p(%ld),%d)\n", + TRACE("(%p,%d,%p,%p(%d),%d)\n", hUSKey, dwIndex, pszName, pcchValueNameLen, *pcchValueNameLen, enumRegFlags); @@ -872,7 +872,7 @@ LONG WINAPI SHRegEnumUSKeyW( { HKEY dokey; - TRACE("(%p,%ld,%p,%p(%ld),%d)\n", + TRACE("(%p,%d,%p,%p(%d),%d)\n", hUSKey, dwIndex, pszName, pcchValueNameLen, *pcchValueNameLen, enumRegFlags); @@ -939,7 +939,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, LPSHUSKEY hKey = (LPSHUSKEY)hUSKey; LONG ret = ERROR_SUCCESS; - TRACE("(%p,%s,%ld,%p,%ld,%ld)\n", hUSKey, debugstr_w(pszValue), + TRACE("(%p,%s,%d,%p,%d,%d)\n", hUSKey, debugstr_w(pszValue), dwType, pvData, cbData, dwFlags); if (!hUSKey || IsBadWritePtr(hUSKey, sizeof(SHUSKEY)) || @@ -952,7 +952,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, { /* Create the key */ ret = RegCreateKeyW(hKey->HKCUstart, hKey->lpszPath, &hKey->HKCUkey); - TRACE("Creating HKCU key, ret = %ld\n", ret); + TRACE("Creating HKCU key, ret = %d\n", ret); if (ret && (dwFlags & (SHREGSET_FORCE_HKCU))) { hKey->HKCUkey = 0; @@ -967,7 +967,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, { /* Doesn't exist or we are forcing: Write value */ ret = RegSetValueExW(hKey->HKCUkey, pszValue, 0, dwType, pvData, cbData); - TRACE("Writing HKCU value, ret = %ld\n", ret); + TRACE("Writing HKCU value, ret = %d\n", ret); } } } @@ -978,7 +978,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, { /* Create the key */ ret = RegCreateKeyW(hKey->HKLMstart, hKey->lpszPath, &hKey->HKLMkey); - TRACE("Creating HKLM key, ret = %ld\n", ret); + TRACE("Creating HKLM key, ret = %d\n", ret); if (ret && (dwFlags & (SHREGSET_FORCE_HKLM))) { hKey->HKLMkey = 0; @@ -993,7 +993,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, { /* Doesn't exist or we are forcing: Write value */ ret = RegSetValueExW(hKey->HKLMkey, pszValue, 0, dwType, pvData, cbData); - TRACE("Writing HKLM value, ret = %ld\n", ret); + TRACE("Writing HKLM value, ret = %d\n", ret); } } } @@ -1022,7 +1022,7 @@ DWORD WINAPI SHRegGetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, { DWORD dwSize = MAX_PATH; - TRACE("(hkey=%p,%s,%s,%p,%ld)\n", hKey, debugstr_a(lpszSubKey), + TRACE("(hkey=%p,%s,%s,%p,%d)\n", hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue), lpszPath, dwFlags); return SHGetValueA(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize); @@ -1038,7 +1038,7 @@ DWORD WINAPI SHRegGetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, { DWORD dwSize = MAX_PATH; - TRACE("(hkey=%p,%s,%s,%p,%ld)\n", hKey, debugstr_w(lpszSubKey), + TRACE("(hkey=%p,%s,%s,%p,%d)\n", hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue), lpszPath, dwFlags); return SHGetValueW(hKey, lpszSubKey, lpszValue, 0, lpszPath, &dwSize); @@ -1066,7 +1066,7 @@ DWORD WINAPI SHRegSetPathA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, { char szBuff[MAX_PATH]; - FIXME("(hkey=%p,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_a(lpszSubKey), + FIXME("(hkey=%p,%s,%s,%p,%d) - semi-stub\n",hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue), lpszPath, dwFlags); lstrcpyA(szBuff, lpszPath); @@ -1087,7 +1087,7 @@ DWORD WINAPI SHRegSetPathW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, { WCHAR szBuff[MAX_PATH]; - FIXME("(hkey=%p,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_w(lpszSubKey), + FIXME("(hkey=%p,%s,%s,%p,%d) - semi-stub\n",hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue), lpszPath, dwFlags); lstrcpyW(szBuff, lpszPath); @@ -1165,7 +1165,7 @@ DWORD WINAPI SHRegGetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWOR TRACE("(hkey=%p,%s,%s,%p,%p,%p)\n", hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue), pwType, pvData, pcbData); - FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08lx\n", srrfFlags); + FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08x\n", srrfFlags); dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); if (! dwRet) @@ -1188,9 +1188,9 @@ DWORD WINAPI SHRegGetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, DW DWORD dwRet = 0; HKEY hSubKey = 0; - TRACE("(hkey=%p,%s,%s,0x%08lx, %p,%p,%p)\n", hKey, debugstr_w(lpszSubKey), + TRACE("(hkey=%p,%s,%s,0x%08x, %p,%p,%p)\n", hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue), srrfFlags,pwType, pvData, pcbData); - FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08lx\n", srrfFlags); + FIXME("Semi-Stub: Find meaning and implement handling of SRFF Flags 0x%08x\n", srrfFlags); dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_QUERY_VALUE, &hSubKey); if (! dwRet) @@ -1254,7 +1254,7 @@ DWORD WINAPI SHSetValueA(HKEY hKey, LPCSTR lpszSubKey, LPCSTR lpszValue, DWORD dwRet = ERROR_SUCCESS, dwDummy; HKEY hSubKey; - TRACE("(hkey=%p,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_a(lpszSubKey), + TRACE("(hkey=%p,%s,%s,%d,%p,%d)\n", hKey, debugstr_a(lpszSubKey), debugstr_a(lpszValue), dwType, pvData, cbData); if (lpszSubKey && *lpszSubKey) @@ -1282,7 +1282,7 @@ DWORD WINAPI SHSetValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue, DWORD dwRet = ERROR_SUCCESS, dwDummy; HKEY hSubKey; - TRACE("(hkey=%p,%s,%s,%ld,%p,%ld)\n", hKey, debugstr_w(lpszSubKey), + TRACE("(hkey=%p,%s,%s,%d,%p,%d)\n", hKey, debugstr_w(lpszSubKey), debugstr_w(lpszValue), dwType, pvData, cbData); if (lpszSubKey && *lpszSubKey) @@ -1378,7 +1378,7 @@ DWORD WINAPI SHQueryValueExA( HKEY hKey, LPCSTR lpszValue, { DWORD dwRet, dwType, dwUnExpDataLen = 0, dwExpDataLen; - TRACE("(hkey=%p,%s,%p,%p,%p,%p=%ld)\n", hKey, debugstr_a(lpszValue), + TRACE("(hkey=%p,%s,%p,%p,%p,%p=%d)\n", hKey, debugstr_a(lpszValue), lpReserved, pwType, pvData, pcbData, pcbData ? *pcbData : 0); if (pcbData) dwUnExpDataLen = *pcbData; @@ -1437,7 +1437,7 @@ DWORD WINAPI SHQueryValueExW(HKEY hKey, LPCWSTR lpszValue, { DWORD dwRet, dwType, dwUnExpDataLen = 0, dwExpDataLen; - TRACE("(hkey=%p,%s,%p,%p,%p,%p=%ld)\n", hKey, debugstr_w(lpszValue), + TRACE("(hkey=%p,%s,%p,%p,%p,%p=%d)\n", hKey, debugstr_w(lpszValue), lpReserved, pwType, pvData, pcbData, pcbData ? *pcbData : 0); if (pcbData) dwUnExpDataLen = *pcbData; @@ -1800,7 +1800,7 @@ DWORD WINAPI SHDeleteValueW(HKEY hKey, LPCWSTR lpszSubKey, LPCWSTR lpszValue) LONG WINAPI SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey, LPDWORD pwLen) { - TRACE("(hkey=%p,%ld,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen); + TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_a(lpszSubKey), pwLen); return RegEnumKeyExA(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL); } @@ -1813,7 +1813,7 @@ LONG WINAPI SHEnumKeyExA(HKEY hKey, DWORD dwIndex, LPSTR lpszSubKey, LONG WINAPI SHEnumKeyExW(HKEY hKey, DWORD dwIndex, LPWSTR lpszSubKey, LPDWORD pwLen) { - TRACE("(hkey=%p,%ld,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen); + TRACE("(hkey=%p,%d,%s,%p)\n", hKey, dwIndex, debugstr_w(lpszSubKey), pwLen); return RegEnumKeyExW(hKey, dwIndex, lpszSubKey, pwLen, NULL, NULL, NULL, NULL); } @@ -1840,7 +1840,7 @@ LONG WINAPI SHEnumValueA(HKEY hKey, DWORD dwIndex, LPSTR lpszValue, LPDWORD pwLen, LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) { - TRACE("(hkey=%p,%ld,%s,%p,%p,%p,%p)\n", hKey, dwIndex, + TRACE("(hkey=%p,%d,%s,%p,%p,%p,%p)\n", hKey, dwIndex, debugstr_a(lpszValue), pwLen, pwType, pvData, pcbData); return RegEnumValueA(hKey, dwIndex, lpszValue, pwLen, NULL, @@ -1856,7 +1856,7 @@ LONG WINAPI SHEnumValueW(HKEY hKey, DWORD dwIndex, LPWSTR lpszValue, LPDWORD pwLen, LPDWORD pwType, LPVOID pvData, LPDWORD pcbData) { - TRACE("(hkey=%p,%ld,%s,%p,%p,%p,%p)\n", hKey, dwIndex, + TRACE("(hkey=%p,%d,%s,%p,%p,%p,%p)\n", hKey, dwIndex, debugstr_w(lpszValue), pwLen, pwType, pvData, pcbData); return RegEnumValueW(hKey, dwIndex, lpszValue, pwLen, NULL, @@ -1998,7 +1998,7 @@ BOOL WINAPI UnregisterMIMETypeForExtensionW(LPCWSTR lpszSubKey) */ BOOL WINAPI GetMIMETypeSubKeyA(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) { - TRACE("(%s,%p,%ld)\n", debugstr_a(lpszType), lpszBuffer, dwLen); + TRACE("(%s,%p,%d)\n", debugstr_a(lpszType), lpszBuffer, dwLen); if (dwLen > dwLenMimeDbContent && lpszType && lpszBuffer) { @@ -2021,7 +2021,7 @@ BOOL WINAPI GetMIMETypeSubKeyA(LPCSTR lpszType, LPSTR lpszBuffer, DWORD dwLen) */ BOOL WINAPI GetMIMETypeSubKeyW(LPCWSTR lpszType, LPWSTR lpszBuffer, DWORD dwLen) { - TRACE("(%s,%p,%ld)\n", debugstr_w(lpszType), lpszBuffer, dwLen); + TRACE("(%s,%p,%d)\n", debugstr_w(lpszType), lpszBuffer, dwLen); if (dwLen > dwLenMimeDbContent && lpszType && lpszBuffer) { @@ -2260,7 +2260,7 @@ DWORD WINAPI SHCopyKeyA(HKEY hKeySrc, LPCSTR lpszSrcSubKey, HKEY hKeyDst, DWORD { WCHAR szSubKeyW[MAX_PATH]; - TRACE("(hkey=%p,%s,%p08x,%ld)\n", hKeySrc, debugstr_a(lpszSrcSubKey), hKeyDst, dwReserved); + TRACE("(hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_a(lpszSrcSubKey), hKeyDst, dwReserved); if (lpszSrcSubKey) MultiByteToWideChar(0, 0, lpszSrcSubKey, -1, szSubKeyW, MAX_PATH); @@ -2282,7 +2282,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LPCWSTR lpszSrcSubKey, HKEY hKeyDst, DWORD WCHAR szName[MAX_PATH], *lpszName = szName; DWORD dwRet = S_OK; - TRACE("hkey=%p,%s,%p08x,%ld)\n", hKeySrc, debugstr_w(lpszSrcSubKey), hKeyDst, dwReserved); + TRACE("hkey=%p,%s,%p08x,%d)\n", hKeySrc, debugstr_w(lpszSrcSubKey), hKeyDst, dwReserved); if(!hKeyDst || !hKeySrc) dwRet = ERROR_INVALID_PARAMETER; diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index adb8d68775c..6aca8f937ef 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -79,7 +79,7 @@ static ULONG WINAPI IStream_fnAddRef(IStream *iface) ISHRegStream *This = (ISHRegStream *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); + TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); return refCount; } @@ -92,7 +92,7 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) ISHRegStream *This = (ISHRegStream *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); + TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); if (!refCount) { @@ -119,7 +119,7 @@ static HRESULT WINAPI IStream_fnRead (IStream * iface, void* pv, ULONG cb, ULONG DWORD dwBytesToRead, dwBytesLeft; - TRACE("(%p)->(%p,0x%08lx,%p)\n",This, pv, cb, pcbRead); + TRACE("(%p)->(%p,0x%08x,%p)\n",This, pv, cb, pcbRead); if (!pv) return STG_E_INVALIDPOINTER; @@ -382,7 +382,7 @@ IStream * WINAPI SHOpenRegStream2A(HKEY hKey, LPCSTR pszSubkey, LPBYTE lpBuff = NULL; DWORD dwLength, dwType; - TRACE("(%p,%s,%s,0x%08lx)\n", hKey, pszSubkey, pszValue, dwMode); + TRACE("(%p,%s,%s,0x%08x)\n", hKey, pszSubkey, pszValue, dwMode); /* Open the key, read in binary data and create stream */ if (!RegOpenKeyExA (hKey, pszSubkey, 0, KEY_READ, &hStrKey) && @@ -410,7 +410,7 @@ IStream * WINAPI SHOpenRegStream2W(HKEY hKey, LPCWSTR pszSubkey, LPBYTE lpBuff = NULL; DWORD dwLength, dwType; - TRACE("(%p,%s,%s,0x%08lx)\n", hKey, debugstr_w(pszSubkey), + TRACE("(%p,%s,%s,0x%08x)\n", hKey, debugstr_w(pszSubkey), debugstr_w(pszValue), dwMode); /* Open the key, read in binary data and create stream */ @@ -448,7 +448,7 @@ IStream * WINAPI SHOpenRegStreamA(HKEY hkey, LPCSTR pszSubkey, { IStream *iStream; - TRACE("(%p,%s,%s,0x%08lx)\n", hkey, pszSubkey, pszValue, dwMode); + TRACE("(%p,%s,%s,0x%08x)\n", hkey, pszSubkey, pszValue, dwMode); iStream = SHOpenRegStream2A(hkey, pszSubkey, pszValue, dwMode); return iStream ? iStream : (IStream *)&rsDummyRegStream; @@ -464,7 +464,7 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, { IStream *iStream; - TRACE("(%p,%s,%s,0x%08lx)\n", hkey, debugstr_w(pszSubkey), + TRACE("(%p,%s,%s,0x%08x)\n", hkey, debugstr_w(pszSubkey), debugstr_w(pszValue), dwMode); iStream = SHOpenRegStream2W(hkey, pszSubkey, pszValue, dwMode); return iStream ? iStream : (IStream *)&rsDummyRegStream; @@ -491,7 +491,7 @@ IStream * WINAPI SHCreateMemStream(LPBYTE lpbData, DWORD dwDataLen) { IStream *iStrmRet = NULL; - TRACE("(%p,%ld)\n", lpbData, dwDataLen); + TRACE("(%p,%d)\n", lpbData, dwDataLen); if (lpbData) { diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index a2e89466b94..51029575e2c 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -65,7 +65,7 @@ DWORD SHLWAPI_ThreadRef_index = TLS_OUT_OF_INDEXES; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -125,6 +125,6 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) return S_OK; } if (pdvi) - WARN("pdvi->cbSize = %ld, unhandled\n", pdvi2->info1.cbSize); + WARN("pdvi->cbSize = %d, unhandled\n", pdvi2->info1.cbSize); return E_INVALIDARG; } diff --git a/dlls/shlwapi/stopwatch.c b/dlls/shlwapi/stopwatch.c index 046c01272a2..7f86fded4b4 100644 --- a/dlls/shlwapi/stopwatch.c +++ b/dlls/shlwapi/stopwatch.c @@ -96,7 +96,7 @@ void WINAPI StopWatchFlush(void) DWORD WINAPI StopWatchW(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - FIXME("(%ld,%s,%ld,%ld,%ld) stub!\n", dwClass, debugstr_w(lpszStr), + FIXME("(%d,%s,%d,%d,%d) stub!\n", dwClass, debugstr_w(lpszStr), dwUnknown, dwMode, dwTimeStamp); return ERROR_SUCCESS; } @@ -174,7 +174,7 @@ void WINAPI StopWatch_MarkFrameStart(LPCSTR lpszName) */ void WINAPI StopWatch_MarkJavaStop(LPCWSTR lpszEvent, HWND hWnd, DWORD dwReserved) { - FIXME("(%s,%p,0x%08lx) stub!\n", debugstr_w(lpszEvent), hWnd, dwReserved); + FIXME("(%s,%p,0x%08x) stub!\n", debugstr_w(lpszEvent), hWnd, dwReserved); } /************************************************************************* @@ -218,7 +218,7 @@ DWORD WINAPI GetPerfTime(void) */ DWORD WINAPI StopWatch_SetMsgLastLocation(DWORD dwUnknown) { - FIXME("(%ld) stub!\n", dwUnknown); + FIXME("(%d) stub!\n", dwUnknown); return dwUnknown; } diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index f839546b038..f610a1e5508 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -813,7 +813,7 @@ BOOL WINAPI StrToIntExA(LPCSTR lpszStr, DWORD dwFlags, LPINT lpiRet) BOOL bNegative = FALSE; int iRet = 0; - TRACE("(%s,%08lX,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); + TRACE("(%s,%08X,%p)\n", debugstr_a(lpszStr), dwFlags, lpiRet); if (!lpszStr || !lpiRet) { @@ -883,7 +883,7 @@ BOOL WINAPI StrToIntExW(LPCWSTR lpszStr, DWORD dwFlags, LPINT lpiRet) BOOL bNegative = FALSE; int iRet = 0; - TRACE("(%s,%08lX,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); + TRACE("(%s,%08X,%p)\n", debugstr_w(lpszStr), dwFlags, lpiRet); if (!lpszStr || !lpiRet) { @@ -2047,7 +2047,7 @@ INT WINAPI StrFromTimeIntervalA(LPSTR lpszStr, UINT cchMax, DWORD dwMS, { INT iRet = 0; - TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits); + TRACE("(%p,%d,%d,%d)\n", lpszStr, cchMax, dwMS, iDigits); if (lpszStr && cchMax) { @@ -2069,7 +2069,7 @@ INT WINAPI StrFromTimeIntervalW(LPWSTR lpszStr, UINT cchMax, DWORD dwMS, { INT iRet = 0; - TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits); + TRACE("(%p,%d,%d,%d)\n", lpszStr, cchMax, dwMS, iDigits); if (lpszStr && cchMax) { @@ -2409,7 +2409,7 @@ LPSTR WINAPI StrFormatByteSize64A(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) */ LPSTR WINAPI StrFormatByteSizeA(DWORD dwBytes, LPSTR lpszDest, UINT cchMax) { - TRACE("(%ld,%p,%d)\n", dwBytes, lpszDest, cchMax); + TRACE("(%d,%p,%d)\n", dwBytes, lpszDest, cchMax); return StrFormatByteSize64A(dwBytes, lpszDest, cchMax); } @@ -2540,7 +2540,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=%ld\n", debugstr_a(lpSrcStr), debugstr_w(lpDstStr), dwRet); + TRACE("%s->%s,ret=%d\n", debugstr_a(lpSrcStr), debugstr_w(lpDstStr), dwRet); return dwRet; } diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index d82195abb27..58888f72cf7 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -81,7 +81,7 @@ LPSECURITY_ATTRIBUTES WINAPI _CreateAllAccessSecurityAttributes( /* This function is used within SHLWAPI only to create security attributes * for shell semaphores. */ - TRACE("(%p,%p,%08lx)\n", lpAttr, lpSec, p3); + TRACE("(%p,%p,%08x)\n", lpAttr, lpSec, p3); if (!(GetVersion() & 0x80000000)) /* NT */ { @@ -282,7 +282,7 @@ BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE pfnThreadProc, VOID *pData, SHLWAPI_THREAD_INFO ti; BOOL bCalled = FALSE; - TRACE("(%p,%p,0x%lX,%p)\n", pfnThreadProc, pData, dwFlags, pfnCallback); + TRACE("(%p,%p,0x%X,%p)\n", pfnThreadProc, pData, dwFlags, pfnCallback); /* Set up data to pass to the new thread (On our stack) */ ti.pfnThreadProc = pfnThreadProc; @@ -419,7 +419,7 @@ HANDLE WINAPI _SHGlobalCounterCreateNamedW(LPCWSTR lpszName, DWORD iInitial) SECURITY_ATTRIBUTES sAttr, *pSecAttr; HANDLE hRet; - TRACE("(%s,%ld)\n", debugstr_w(lpszName), iInitial); + TRACE("(%s,%d)\n", debugstr_w(lpszName), iInitial); /* Create Semaphore name */ memcpy(szBuff, szPrefix, (iPrefixLen + 1) * sizeof(WCHAR)); @@ -450,7 +450,7 @@ HANDLE WINAPI _SHGlobalCounterCreateNamedA(LPCSTR lpszName, DWORD iInitial) { WCHAR szBuff[MAX_PATH]; - TRACE("(%s,%ld)\n", debugstr_a(lpszName), iInitial); + TRACE("(%s,%d)\n", debugstr_a(lpszName), iInitial); if (lpszName) MultiByteToWideChar(0, 0, lpszName, -1, szBuff, MAX_PATH); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 3c4f28bb8d1..e1c653e71c8 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -284,7 +284,7 @@ HRESULT WINAPI UrlCanonicalizeA(LPCSTR pszUrl, LPSTR pszCanonicalized, LPWSTR base, canonical; DWORD ret, len, len2; - TRACE("(%s %p %p 0x%08lx) using W version\n", + TRACE("(%s %p %p 0x%08x) using W version\n", debugstr_a(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -334,7 +334,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, static const WCHAR wszFile[] = {'f','i','l','e',':'}; - TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, + TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); if(!pszUrl || !pszCanonicalized || !pcchCanonicalized) @@ -556,7 +556,7 @@ HRESULT WINAPI UrlCombineA(LPCSTR pszBase, LPCSTR pszRelative, LPWSTR base, relative, combined; DWORD ret, len, len2; - TRACE("(base %s, Relative %s, Combine size %ld, flags %08lx) using W version\n", + TRACE("(base %s, Relative %s, Combine size %d, flags %08x) using W version\n", debugstr_a(pszBase),debugstr_a(pszRelative), pcchCombined?*pcchCombined:0,dwFlags); @@ -609,7 +609,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, static const WCHAR single_slash[] = {'/','\0'}; HRESULT ret; - TRACE("(base %s, Relative %s, Combine size %ld, flags %08lx)\n", + TRACE("(base %s, Relative %s, Combine size %d, flags %08x)\n", debugstr_w(pszBase),debugstr_w(pszRelative), pcchCombined?*pcchCombined:0,dwFlags); @@ -797,7 +797,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, break; default: - FIXME("How did we get here????? process_case=%ld\n", process_case); + FIXME("How did we get here????? process_case=%d\n", process_case); ret = E_INVALIDARG; } @@ -807,7 +807,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, if(SUCCEEDED(ret) && pszCombined) { lstrcpyW(pszCombined, mrelative); } - TRACE("return-%ld len=%ld, %s\n", + TRACE("return-%d len=%d, %s\n", process_case, *pcchCombined, debugstr_w(pszCombined)); } HeapFree(GetProcessHeap(), 0, preliminary); @@ -964,7 +964,7 @@ HRESULT WINAPI UrlEscapeW( DWORD slashes = 0; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; - TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszEscaped, + TRACE("(%s %p %p 0x%08x)\n", debugstr_w(pszUrl), pszEscaped, pcchEscaped, dwFlags); if(!pszUrl || !pszEscaped || !pcchEscaped) @@ -974,7 +974,7 @@ HRESULT WINAPI UrlEscapeW( URL_ESCAPE_SEGMENT_ONLY | URL_DONT_ESCAPE_EXTRA_INFO | URL_ESCAPE_PERCENT)) - FIXME("Unimplemented flags: %08lx\n", dwFlags); + FIXME("Unimplemented flags: %08x\n", dwFlags); /* fix up flags */ if (dwFlags & URL_ESCAPE_SPACES_ONLY) @@ -1134,7 +1134,7 @@ HRESULT WINAPI UrlUnescapeA( DWORD needed; BOOL stop_unescaping = FALSE; - TRACE("(%s, %p, %p, 0x%08lx)\n", debugstr_a(pszUrl), pszUnescaped, + TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_a(pszUrl), pszUnescaped, pcchUnescaped, dwFlags); if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE)) || !pcchUnescaped) @@ -1201,7 +1201,7 @@ HRESULT WINAPI UrlUnescapeW( DWORD needed; BOOL stop_unescaping = FALSE; - TRACE("(%s, %p, %p, 0x%08lx)\n", debugstr_w(pszUrl), pszUnescaped, + TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(pszUrl), pszUnescaped, pcchUnescaped, dwFlags); if(!pszUrl || (!pszUnescaped && !(dwFlags & URL_UNESCAPE_INPLACE))|| !pcchUnescaped) @@ -1455,7 +1455,7 @@ HRESULT WINAPI UrlHashW(LPCWSTR pszUrl, unsigned char *lpDest, DWORD nDestLen) { char szUrl[MAX_PATH]; - TRACE("(%s,%p,%ld)\n",debugstr_w(pszUrl), lpDest, nDestLen); + TRACE("(%s,%p,%d)\n",debugstr_w(pszUrl), lpDest, nDestLen); if (IsBadStringPtrW(pszUrl, -1) || IsBadWritePtr(lpDest, nDestLen)) return E_INVALIDARG; @@ -1488,7 +1488,7 @@ HRESULT WINAPI UrlApplySchemeA(LPCSTR pszIn, LPSTR pszOut, LPDWORD pcchOut, DWOR LPWSTR in, out; DWORD ret, len, len2; - TRACE("(in %s, out size %ld, flags %08lx) using W version\n", + TRACE("(in %s, out size %d, flags %08x) using W version\n", debugstr_a(pszIn), *pcchOut, dwFlags); in = HeapAlloc(GetProcessHeap(), 0, @@ -1603,11 +1603,11 @@ HRESULT WINAPI UrlApplySchemeW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DW DWORD res1; HRESULT ret; - TRACE("(in %s, out size %ld, flags %08lx)\n", + TRACE("(in %s, out size %d, flags %08x)\n", debugstr_w(pszIn), *pcchOut, dwFlags); if (dwFlags & URL_APPLY_GUESSFILE) { - FIXME("(%s %p %p(%ld) 0x%08lx): stub URL_APPLY_GUESSFILE not implemented\n", + FIXME("(%s %p %p(%d) 0x%08x): stub URL_APPLY_GUESSFILE not implemented\n", debugstr_w(pszIn), pszOut, pcchOut, *pcchOut, dwFlags); strcpyW(pszOut, pszIn); *pcchOut = strlenW(pszOut); @@ -1917,7 +1917,7 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) FIXME("unknown type %d\n", type); return (LPWSTR)&alwayszero; } - /* TRACE("scanned %ld characters next char %p<%c>\n", + /* TRACE("scanned %d characters next char %p<%c>\n", *size, start, *start); */ return start; } @@ -1975,7 +1975,7 @@ static LONG URL_ParseUrl(LPCWSTR pszUrl, WINE_PARSE_URL *pl) pl->pQuery = strchrW(work, L'?'); if (pl->pQuery) pl->szQuery = strlenW(pl->pQuery); } - TRACE("parse successful: scheme=%p(%ld), user=%p(%ld), pass=%p(%ld), host=%p(%ld), port=%p(%ld), query=%p(%ld)\n", + TRACE("parse successful: scheme=%p(%d), user=%p(%d), pass=%p(%d), host=%p(%d), port=%p(%d), query=%p(%d)\n", pl->pScheme, pl->szScheme, pl->pUserName, pl->szUserName, pl->pPassword, pl->szPassword, @@ -2051,7 +2051,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, DWORD size, schsize; LPCWSTR addr, schaddr; - TRACE("(%s %p %p(%ld) %08lx %08lx)\n", + TRACE("(%s %p %p(%d) %08x %08x)\n", debugstr_w(pszIn), pszOut, pcchOut, *pcchOut, dwPart, dwFlags); ret = URL_ParseUrl(pszIn, &pl); @@ -2117,7 +2117,7 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, pszOut[size] = 0; *pcchOut = size; } - TRACE("len=%ld %s\n", *pcchOut, debugstr_w(pszOut)); + TRACE("len=%d %s\n", *pcchOut, debugstr_w(pszOut)); } return ret; } @@ -2224,7 +2224,7 @@ HRESULT WINAPI UrlCreateFromPathW(LPCWSTR pszPath, LPWSTR pszUrl, LPDWORD pcchUr WCHAR three_slashesW[] = {'/','/','/',0}; PARSEDURLW parsed_url; - TRACE("(%s, %p, %p, 0x%08lx)\n", debugstr_w(pszPath), pszUrl, pcchUrl, dwReserved); + TRACE("(%s, %p, %p, 0x%08x)\n", debugstr_w(pszPath), pszUrl, pcchUrl, dwReserved); /* Validate arguments */ if (dwReserved != 0) @@ -2331,7 +2331,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, #define szResLen ((sizeof(szRes) - sizeof(WCHAR))/sizeof(WCHAR)) HRESULT hRet = E_FAIL; - TRACE("(%s,%p,0x%08lx,%s,%p,%ld)\n", debugstr_w(lpszLibName), hMod, dwFlags, + TRACE("(%s,%p,0x%08x,%s,%p,%d)\n", debugstr_w(lpszLibName), hMod, dwFlags, debugstr_w(lpszRes), lpszDest, dwDestLen); if (!lpszLibName || !hMod || hMod == INVALID_HANDLE_VALUE || !lpszRes ||