[PATCH 01/24] dlls/sfc_os: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sfc_os/Makefile.in | 1 - dlls/sfc_os/sfc_os.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sfc_os/Makefile.in b/dlls/sfc_os/Makefile.in index 5488245195f..e3e727fc262 100644 --- a/dlls/sfc_os/Makefile.in +++ b/dlls/sfc_os/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sfc_os.dll IMPORTLIB = sfc_os diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c index f6163f5b4eb..61614264c77 100644 --- a/dlls/sfc_os/sfc_os.c +++ b/dlls/sfc_os/sfc_os.c @@ -119,7 +119,7 @@ BOOL WINAPI SfcIsKeyProtected(HKEY hKey, LPCWSTR lpSubKey, REGSAM samDesired) DWORD WINAPI SfcConnectToServer(DWORD unknown) { - FIXME("%x\n", unknown); + FIXME("%lx\n", unknown); return 0; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shdocvw/Makefile.in | 2 +- dlls/shdocvw/shdocvw_main.c | 24 ++++++++++++------------ dlls/shdocvw/shlinstobj.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 88b5340abda..30b0a1a299c 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHDOCVW_ +EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32 diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index a641bd92a73..b5b60054f2c 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -120,7 +120,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) */ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -246,7 +246,7 @@ DWORD WINAPI RunInstallUninstallStubs2(int arg) */ DWORD WINAPI SetQueryNetSessionCount(DWORD arg) { - FIXME("(%u), stub!\n", arg); + FIXME("(%lu), stub!\n", arg); return 0; } @@ -318,7 +318,7 @@ HRESULT WINAPI URLSubRegQueryA(LPCSTR regpath, LPCSTR name, DWORD type, DWORD len; LONG res; - TRACE("(%s, %s, %d, %p, %d, %d)\n", debugstr_a(regpath), debugstr_a(name), + TRACE("(%s, %s, %ld, %p, %ld, %ld)\n", debugstr_a(regpath), debugstr_a(name), type, out, outlen, unknown); if (!out) return S_OK; @@ -347,14 +347,14 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L DWORD res = 0; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_w(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_w(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); - TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); + TRACE("got 0x%lx with %s\n", hr, debugstr_w(buffer_in)); if (hr == S_OK) { /* we parsed the url to buffer_in */ ptr = buffer_in; @@ -369,7 +369,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; - TRACE("got 0x%x with %s (need %d)\n", hr, debugstr_w(buffer_out), needed); + TRACE("got 0x%lx with %s (need %ld)\n", hr, debugstr_w(buffer_out), needed); if (*plen >= needed) { if (out != NULL) { @@ -381,7 +381,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -398,7 +398,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD DWORD res; DWORD len; - TRACE("(%s, %p, %p, %p) len: %d, unknown: 0x%x\n", debugstr_a(url), out, plen, unknown, + TRACE("(%s, %p, %p, %p) len: %ld, unknown: 0x%lx\n", debugstr_a(url), out, plen, unknown, plen ? *plen : 0, unknown ? *unknown : 0); if (url) { @@ -424,7 +424,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD *plen = needed; - TRACE("=> %d\n", res); + TRACE("=> %ld\n", res); return res; } @@ -434,7 +434,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName, LPBC pbc, LPITEMIDLIST *ppidl) { /* Guessing at parameter 3 based on IShellFolder's ParseDisplayName */ - FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); + FIXME("stub: 0x%lx %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); return E_FAIL; } @@ -443,7 +443,7 @@ HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName */ DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved) { - FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved); + FIXME("(%ld %s %ld) stub\n", res, debugstr_w(url), reserved); return 0; } @@ -457,7 +457,7 @@ DWORD WINAPI SHRestricted2A(DWORD restriction, LPCSTR url, DWORD reserved) LPWSTR urlW = NULL; DWORD res; - TRACE("(%d, %s, %d)\n", restriction, debugstr_a(url), reserved); + TRACE("(%ld, %s, %ld)\n", restriction, debugstr_a(url), reserved); if (url) { DWORD len = MultiByteToWideChar(CP_ACP, 0, url, -1, NULL, 0); urlW = heap_alloc(len * sizeof(WCHAR)); diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index f148a27619e..d1405a6bb53 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -274,14 +274,14 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassF hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag); if (FAILED(hr)) { - TRACE("Failed to create instance of %s. hr = %08x\n", + TRACE("Failed to create instance of %s. hr = %08lx\n", debugstr_guid(&This->m_clsidInstance), hr); return hr; } hr = IPersistPropertyBag_Load(pPersistPropertyBag, This->m_pPropertyBag, NULL); if (FAILED(hr)) { - TRACE("Failed to initialize object from PropertyBag: hr = %08x\n", hr); + TRACE("Failed to initialize object from PropertyBag: hr = %08lx\n", hr); IPersistPropertyBag_Release(pPersistPropertyBag); return hr; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shell32/Makefile.in | 2 - dlls/shell32/appbar.c | 6 +-- dlls/shell32/assoc.c | 34 ++++++++-------- dlls/shell32/autocomplete.c | 6 +-- dlls/shell32/brsfolder.c | 16 ++++--- dlls/shell32/changenotify.c | 16 ++++--- dlls/shell32/classes.c | 2 - dlls/shell32/control.c | 6 +-- dlls/shell32/cpanelfolder.c | 36 ++++++++--------- dlls/shell32/dataobject.c | 14 +++---- dlls/shell32/debughlp.c | 6 +-- dlls/shell32/dragdrophelper.c | 12 +++--- dlls/shell32/ebrowser.c | 38 +++++++++--------- dlls/shell32/enumidlist.c | 10 ++--- dlls/shell32/folders.c | 4 +- dlls/shell32/iconcache.c | 6 +-- dlls/shell32/pidl.c | 32 +++++++-------- dlls/shell32/recyclebin.c | 14 +++---- dlls/shell32/shell32_main.c | 34 ++++++++-------- dlls/shell32/shelldispatch.c | 84 ++++++++++++++++++++------------------- dlls/shell32/shellitem.c | 34 ++++++++-------- dlls/shell32/shelllink.c | 48 +++++++++++----------- dlls/shell32/shellole.c | 32 +++++++-------- dlls/shell32/shellord.c | 64 +++++++++++++++--------------- dlls/shell32/shellpath.c | 84 ++++++++++++++++++++------------------- dlls/shell32/shellstring.c | 8 ++-- dlls/shell32/shfldr_desktop.c | 24 ++++++----- dlls/shell32/shfldr_fs.c | 30 +++++++------- dlls/shell32/shfldr_mycomp.c | 30 +++++++------- dlls/shell32/shfldr_netplaces.c | 26 ++++++------ dlls/shell32/shfldr_printers.c | 16 ++++--- dlls/shell32/shlexec.c | 26 ++++++------ dlls/shell32/shlfileop.c | 16 ++++--- dlls/shell32/shlfolder.c | 24 ++++++----- dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 20 +++++---- dlls/shell32/shlview.c | 50 ++++++++++++----------- dlls/shell32/shlview_cmenu.c | 14 +++---- dlls/shell32/systray.c | 6 +-- 39 files changed, 467 insertions(+), 467 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index e31c165ccff..eeb6cd63d60 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHELL32_ +EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 diff --git a/dlls/shell32/appbar.c b/dlls/shell32/appbar.c index fc6e26f3c6e..68373dc2c15 100644 --- a/dlls/shell32/appbar.c +++ b/dlls/shell32/appbar.c @@ -69,7 +69,7 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) DWORD_PTR msg_result; UINT_PTR ret = 0; - TRACE("msg=%d, data={cb=%d, hwnd=%p}\n", msg, data->cbSize, data->hWnd); + TRACE("msg=%ld, data={cb=%ld, hwnd=%p}\n", msg, data->cbSize, data->hWnd); /* These members are message dependent */ switch(msg) @@ -92,11 +92,11 @@ UINT_PTR WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) break; case ABM_SETAUTOHIDEBAR: - TRACE("edge: %d, lParam: %lx\n", data->uEdge, data->lParam); + TRACE("edge: %d, lParam: %Ix\n", data->uEdge, data->lParam); break; default: - FIXME("unknown msg: %d\n", msg); + FIXME("unknown msg: %ld\n", msg); break; } diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 6b0de1d04c4..339be6ac445 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -131,7 +131,7 @@ static ULONG WINAPI IQueryAssociations_fnAddRef(IQueryAssociations *iface) IQueryAssociationsImpl *This = impl_from_IQueryAssociations(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; } @@ -146,7 +146,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) IQueryAssociationsImpl *This = impl_from_IQueryAssociations(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) { @@ -185,7 +185,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); LONG ret; - TRACE("(%p)->(%d,%s,%p,%p)\n", iface, + TRACE("(%p)->(%ld,%s,%p,%p)\n", iface, cfFlags, debugstr_w(pszAssoc), hkeyProgid, @@ -193,7 +193,7 @@ static HRESULT WINAPI IQueryAssociations_fnInit( if (hWnd != NULL) FIXME("hwnd != NULL not supported\n"); if (cfFlags != 0) - FIXME("unsupported flags: %x\n", cfFlags); + FIXME("unsupported flags: %lx\n", cfFlags); RegCloseKey(This->hkeySource); if (This->hkeySource != This->hkeyProgID) @@ -439,7 +439,7 @@ static HRESULT ASSOC_ReturnString(ASSOCF flags, LPWSTR out, DWORD *outlen, LPCWS HRESULT hr = S_OK; DWORD len; - TRACE("flags=0x%08x, data=%s\n", flags, debugstr_w(data)); + TRACE("flags=0x%08lx, data=%s\n", flags, debugstr_w(data)); if (!out) { @@ -502,10 +502,10 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( HRESULT hr; WCHAR path[MAX_PATH]; - TRACE("(%p)->(0x%08x, %u, %s, %p, %p)\n", This, flags, str, debugstr_w(pszExtra), pszOut, pcchOut); + TRACE("(%p)->(0x%08lx, %u, %s, %p, %p)\n", This, flags, str, debugstr_w(pszExtra), pszOut, pcchOut); if (flags & unimplemented_flags) - FIXME("%08x: unimplemented flags\n", flags & unimplemented_flags); + FIXME("%08lx: unimplemented flags\n", flags & unimplemented_flags); if (!pcchOut) return E_UNEXPECTED; @@ -708,7 +708,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetKey( { IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); - FIXME("(%p,0x%8x,0x%8x,%s,%p)-stub!\n", This, cfFlags, assockey, + FIXME("(%p,0x%8lx,0x%8x,%s,%p)-stub!\n", This, cfFlags, assockey, debugstr_w(pszExtra), phkeyOut); return E_NOTIMPL; } @@ -739,11 +739,11 @@ static HRESULT WINAPI IQueryAssociations_fnGetData(IQueryAssociations *iface, DWORD size; HRESULT hres; - TRACE("(%p,0x%8x,0x%8x,%s,%p,%p)\n", This, cfFlags, assocdata, + TRACE("(%p,0x%8lx,0x%8x,%s,%p,%p)\n", This, cfFlags, assocdata, debugstr_w(pszExtra), pvOut, pcbOut); if(cfFlags) - FIXME("Unsupported flags: %x\n", cfFlags); + FIXME("Unsupported flags: %lx\n", cfFlags); switch(assocdata) { case ASSOCDATA_EDITFLAGS: @@ -791,7 +791,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetEnum( { IQueryAssociationsImpl *This = impl_from_IQueryAssociations(iface); - FIXME("(%p,0x%8x,0x%8x,%s,%s,%p)-stub!\n", This, cfFlags, assocenum, + FIXME("(%p,0x%8lx,0x%8x,%s,%s,%p)-stub!\n", This, cfFlags, assocenum, debugstr_w(pszExtra), debugstr_guid(riid), ppvOut); return E_NOTIMPL; } @@ -844,7 +844,7 @@ static ULONG WINAPI ApplicationAssociationRegistration_AddRef(IApplicationAssoci IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -853,7 +853,7 @@ static ULONG WINAPI ApplicationAssociationRegistration_Release(IApplicationAssoc IApplicationAssociationRegistrationImpl *This = impl_from_IApplicationAssociationRegistration(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { SHFree(This); @@ -1042,7 +1042,7 @@ HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, R if (FAILED(hr)) SHFree(This); - TRACE("returning 0x%x with %p\n", hr, *ppv); + TRACE("returning 0x%lx with %p\n", hr, *ppv); return hr; } @@ -1069,7 +1069,7 @@ static ULONG WINAPI enumassochandlers_AddRef(IEnumAssocHandlers *iface) struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -1078,7 +1078,7 @@ static ULONG WINAPI enumassochandlers_Release(IEnumAssocHandlers *iface) struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) SHFree(This); @@ -1091,7 +1091,7 @@ static HRESULT WINAPI enumassochandlers_Next(IEnumAssocHandlers *iface, ULONG co { struct enumassochandlers *This = impl_from_IEnumAssocHandlers(iface); - FIXME("(%p)->(%u %p %p): stub\n", This, count, handlers, fetched); + FIXME("(%p)->(%lu %p %p): stub\n", This, count, handlers, fetched); return E_NOTIMPL; } diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 79b95432880..68901be1265 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -952,7 +952,7 @@ static ULONG WINAPI IAutoComplete2_fnAddRef( IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, refCount - 1); + TRACE("(%p)->(%lu)\n", This, refCount - 1); return refCount; } @@ -966,7 +966,7 @@ static ULONG WINAPI IAutoComplete2_fnRelease( IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, refCount + 1); + TRACE("(%p)->(%lu)\n", This, refCount + 1); if (!refCount) { TRACE("destroying IAutoComplete(%p)\n", This); @@ -1147,7 +1147,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( DWORD changed = This->options ^ dwFlag; HRESULT hr = S_OK; - TRACE("(%p) -> (0x%x)\n", This, dwFlag); + TRACE("(%p) -> (0x%lx)\n", This, dwFlag); This->options = dwFlag; diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 3df7119edf7..63b51fc81df 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -221,7 +221,7 @@ static void InitializeTreeView( browse_info *info ) IShellFolder *lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); if (FAILED(hr)) { - WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); + WARN("SHGetDesktopFolder failed! hr = %08lx\n", hr); ILFree(pidlChild); ILFree(pidlParent); return; @@ -231,7 +231,7 @@ static void InitializeTreeView( browse_info *info ) } if (FAILED(hr)) { - WARN("Could not bind to parent shell folder! hr = %08x\n", hr); + WARN("Could not bind to parent shell folder! hr = %08lx\n", hr); ILFree(pidlChild); ILFree(pidlParent); return; @@ -245,7 +245,7 @@ static void InitializeTreeView( browse_info *info ) } if (FAILED(hr)) { - WARN("Could not bind to root shell folder! hr = %08x\n", hr); + WARN("Could not bind to root shell folder! hr = %08lx\n", hr); IShellFolder_Release(lpsfParent); ILFree(pidlChild); ILFree(pidlParent); @@ -255,7 +255,7 @@ static void InitializeTreeView( browse_info *info ) flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); if (FAILED(hr)) { - WARN("Could not get child iterator! hr = %08x\n", hr); + WARN("Could not get child iterator! hr = %08lx\n", hr); IShellFolder_Release(lpsfParent); IShellFolder_Release(lpsfRoot); ILFree(pidlChild); @@ -327,7 +327,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR BOOL bSuccess=TRUE; STRRET str; - TRACE("%p %p %x %p\n", lpsf, lpi, dwFlags, lpFriendlyName); + TRACE("%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName); if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str))) bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); else @@ -1069,7 +1069,7 @@ static LRESULT BrsFolder_OnChange(browse_info *info, const LPCITEMIDLIST *pidls, { BOOL ret = TRUE; - TRACE("(%p)->(%p, %p, 0x%08x)\n", info, pidls[0], pidls[1], event); + TRACE("(%p)->(%p, %p, 0x%08lx)\n", info, pidls[0], pidls[1], event); switch (event) { @@ -1096,7 +1096,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, { browse_info *info; - TRACE("hwnd=%p msg=%04x 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam ); + TRACE("hwnd=%p msg=%04x 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam ); if (msg == WM_INITDIALOG) return BrsFolder_OnCreate( hWnd, (browse_info*) lParam ); @@ -1132,7 +1132,7 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, break; case BFFM_ENABLEOK: - TRACE("Enable %ld\n", lParam); + TRACE("Enable %Id\n", lParam); EnableWindow(GetDlgItem(hWnd, 1), lParam != 0); break; diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 35c090ceb67..93feedfabc7 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -171,7 +171,7 @@ SHChangeNotifyRegister( item = SHAlloc(sizeof(NOTIFICATIONLIST)); - TRACE("(%p,0x%08x,0x%08x,0x%08x,%d,%p) item=%p\n", + TRACE("(%p,0x%08x,0x%08lx,0x%08x,%d,%p) item=%p\n", hwnd, fSources, wEventMask, uMsg, cItems, lpItems, item); item->cidl = cItems; @@ -205,7 +205,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) { LPNOTIFICATIONLIST node; - TRACE("(0x%08x)\n", hNotify); + TRACE("(0x%08lx)\n", hNotify); EnterCriticalSection(&SHELL32_ChangenotifyCS); @@ -228,7 +228,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) { - FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n", + FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx)\n", unknown1, unknown2, unknown3, unknown4); return TRUE; @@ -275,7 +275,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID Pidls[0] = NULL; Pidls[1] = NULL; - TRACE("(0x%08x,0x%08x,%p,%p)\n", wEventId, uFlags, dwItem1, dwItem2); + TRACE("(0x%08lx,0x%08x,%p,%p)\n", wEventId, uFlags, dwItem1, dwItem2); if(uFlags & ~(SHCNF_TYPE|SHCNF_FLUSH)) FIXME("ignoring unsupported flags: %x\n", uFlags); @@ -374,7 +374,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID LIST_FOR_EACH_ENTRY_SAFE(cur, next, &recipients, struct notification_recipients, entry) { - TRACE("notifying %p, event %s(%x)\n", cur->hwnd, DumpEvent(wEventId), wEventId); + TRACE("notifying %p, event %s(%lx)\n", cur->hwnd, DumpEvent(wEventId), wEventId); if (cur->flags & SHCNRF_NewDelivery) { if(!shared_data) { @@ -437,7 +437,7 @@ DWORD WINAPI NTSHChangeNotifyRegister( int count, SHChangeNotifyEntry *idlist) { - FIXME("(%p,0x%08x,0x%08x,0x%08x,0x%08x,%p):semi stub.\n", + FIXME("(%p,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p):semi stub.\n", hwnd,events1,events2,msg,count,idlist); return SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); @@ -455,7 +455,7 @@ HANDLE WINAPI SHChangeNotification_Lock( struct new_delivery_notification *ndn; UINT offset; - TRACE("%p %08x %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); + TRACE("%p %08lx %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); ndn = SHLockShared(hChange, dwProcessId); if(!ndn) { @@ -490,7 +490,7 @@ BOOL WINAPI SHChangeNotification_Unlock ( HANDLE hLock) */ DWORD WINAPI NTSHChangeNotifyDeregister(ULONG x1) { - FIXME("(0x%08x):semi stub.\n",x1); + FIXME("(0x%08lx):semi stub.\n",x1); return SHChangeNotifyDeregister( x1 ); } diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 10870b70ab9..a8e70c021c2 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -454,7 +454,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) } } - TRACE("-- *pdwAttributes == 0x%08x\n", *pdwAttributes); + TRACE("-- *pdwAttributes == 0x%08lx\n", *pdwAttributes); return TRUE; } diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index a2b72a7f748..d8a5edd9722 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -811,7 +811,7 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS { CPanel panel; - TRACE("(%p, %p, %s, 0x%08x)\n", + TRACE("(%p, %p, %s, 0x%08lx)\n", hWnd, hInst, debugstr_w(cmd), nCmdShow); memset(&panel, 0, sizeof(panel)); @@ -845,7 +845,7 @@ void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdSh */ HRESULT WINAPI Control_FillCache_RunDLLW(HWND hWnd, HANDLE hModule, DWORD w, DWORD x) { - FIXME("%p %p 0x%08x 0x%08x stub\n", hWnd, hModule, w, x); + FIXME("%p %p 0x%08lx 0x%08lx stub\n", hWnd, hModule, w, x); return S_OK; } @@ -867,7 +867,7 @@ HRESULT WINAPI Control_FillCache_RunDLLA(HWND hWnd, HANDLE hModule, DWORD w, DWO */ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) { - FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); + FIXME("(%p, %p, %08lx, %08lx, %08lx, %08lx): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 83d84b74404..122c3180dd4 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -179,7 +179,7 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 *iface) ICPanelImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -189,7 +189,7 @@ static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 *iface) ICPanelImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { TRACE("-- destroying IShellFolder(%p)\n", This); @@ -217,7 +217,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnParseDisplayName(IShellFolder2 *iface, if (pchEaten) *pchEaten = 0; - TRACE("(%p)->(-- ret=0x%08x)\n", This, hr); + TRACE("(%p)->(-- ret=0x%08lx)\n", This, hr); return hr; } @@ -394,7 +394,7 @@ static BOOL CreateCPanelEnumList(IEnumIDListImpl *list, DWORD dwFlags) WIN32_FIND_DATAA wfd; HANDLE hFile; - TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); /* enumerate control panel folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -445,7 +445,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnEnumObjects(IShellFolder2 *iface, HWND ICPanelImpl *This = impl_from_IShellFolder2(iface); IEnumIDListImpl *list; - TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); + TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); if (!(list = IEnumIDList_Constructor())) return E_OUTOFMEMORY; @@ -495,7 +495,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnCompareIDs(IShellFolder2 *iface, LPARAM int nReturn; - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + TRACE("(%p)->(0x%08Ix,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE("-- %i\n", nReturn); return nReturn; @@ -545,7 +545,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 *iface, U HRESULT hr = S_OK; - TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", + TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -565,7 +565,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 *iface, U /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE("-- result=0x%08x\n", *rgfInOut); + TRACE("-- result=0x%08lx\n", *rgfInOut); return hr; } @@ -625,7 +625,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 *iface, HWN *ppvOut = pObj; } - TRACE("(%p)->hr=0x%08x\n", This, hr); + TRACE("(%p)->hr=0x%08lx\n", This, hr); return hr; } @@ -643,7 +643,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 *iface, *szPath = '\0'; - TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + TRACE("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump(pidl); if (!pidl || !strRet) @@ -703,7 +703,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 *iface, HWND hw LPCITEMIDLIST pidl, LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST *pPidlOut) { ICPanelImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut); + FIXME("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -727,7 +727,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDefaultColumn(IShellFolder2 *iface, { ICPanelImpl *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(%#x %p %p)\n", This, reserved, sort, display); + TRACE("(%p)->(%#lx %p %p)\n", This, reserved, sort, display); return E_NOTIMPL; } @@ -837,7 +837,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_AddRef(IPersistFolder2 * iface) { ICPanelImpl *This = impl_from_IPersistFolder2(iface); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, This->ref); return IShellFolder2_AddRef(&This->IShellFolder2_iface); } @@ -849,7 +849,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_Release(IPersistFolder2 * iface) { ICPanelImpl *This = impl_from_IPersistFolder2(iface); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, This->ref); return IShellFolder2_Release(&This->IShellFolder2_iface); } @@ -932,7 +932,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface( { ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, This->ref); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); } @@ -941,7 +941,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnAddRef(IShellExecuteHookW* i { ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, This->ref); return IUnknown_AddRef(This->pUnkOuter); } @@ -1019,7 +1019,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnQueryInterface(IShellExecuteHookA* if { ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, This->ref); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); } @@ -1028,7 +1028,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnAddRef(IShellExecuteHookA* i { ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); - TRACE("(%p)->(count=%u)\n", This, This->ref); + TRACE("(%p)->(count=%lu)\n", This, This->ref); return IUnknown_AddRef(This->pUnkOuter); } diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 803c9fe935f..f7f7ee152c8 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -82,7 +82,7 @@ static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -92,7 +92,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, refCount + 1); + TRACE("(%p)->(%lu)\n", This, refCount + 1); if (!refCount) { @@ -108,7 +108,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); UINT i; - TRACE("(%p)->(%u,%p)\n", This, celt, rgelt); + TRACE("(%p)->(%lu,%p)\n", This, celt, rgelt); if(!This->pFmt)return S_FALSE; if(!rgelt) return E_INVALIDARG; @@ -127,7 +127,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt) { IEnumFORMATETCImpl *This = impl_from_IEnumFORMATETC(iface); - TRACE("(%p)->(num=%u)\n", This, celt); + TRACE("(%p)->(num=%lu)\n", This, celt); if((This->posFmt + celt) >= This->countFmt) return S_FALSE; This->posFmt += celt; @@ -254,7 +254,7 @@ static ULONG WINAPI IDataObject_fnAddRef(IDataObject *iface) IDataObjectImpl *This = impl_from_IDataObject(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -267,7 +267,7 @@ static ULONG WINAPI IDataObject_fnRelease(IDataObject *iface) IDataObjectImpl *This = impl_from_IDataObject(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, refCount + 1); + TRACE("(%p)->(%lu)\n", This, refCount + 1); if (!refCount) { @@ -338,7 +338,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(IDataObject *iface, LPFORMATETC IDataObjectImpl *This = impl_from_IDataObject(iface); UINT i; - TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\n", This, pformatetc->cfFormat, pformatetc->tymed); + TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); if(!(DVASPECT_CONTENT & pformatetc->dwAspect)) return DV_E_DVASPECT; diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c index c988bab481b..fca8070439a 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -287,7 +287,7 @@ void pdump (LPCITEMIDLIST pidl) if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) dwAttrib = pData->u.file.uFileAttribs; - MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", + MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", pidltemp, pidltemp->mkid.cb, type, dwAttrib, debugstr_a(szName), debugstr_w(szLongName), debugstr_w(szShortName)); } @@ -304,7 +304,7 @@ void pdump (LPCITEMIDLIST pidl) if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) dwAttrib = pData->u.file.uFileAttribs; - MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", + MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", pidltemp, pidltemp->mkid.cb, type, dwAttrib, debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); } @@ -376,7 +376,7 @@ BOOL pcheck( LPCITEMIDLIST pidl ) case PT_SHARE: break; default: - ERR("unknown IDLIST %p [%p] size=%u type=%x\n", + ERR("unknown IDLIST %p [%p] size=%u type=%lx\n", pidl, pidltemp, pidltemp->mkid.cb,type ); dump_pidl_hex( pidltemp ); return FALSE; diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 00db2163750..8a41eee7b43 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -95,7 +95,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) dragdrophelper *This = impl_from_IDropTargetHelper(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -105,7 +105,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) dragdrophelper *This = impl_from_IDropTargetHelper(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { TRACE ("-- destroying (%p)\n", This); @@ -123,7 +123,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( DWORD dwEffect) { dragdrophelper *This = impl_from_IDropTargetHelper(iface); - FIXME ("(%p)->(%p %p %p 0x%08x)\n", This,hwndTarget, pDataObject, ppt, dwEffect); + FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect); return E_NOTIMPL; } @@ -137,14 +137,14 @@ static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) { dragdrophelper *This = impl_from_IDropTargetHelper(iface); - FIXME ("(%p)->(%p 0x%08x)\n", This, ppt, dwEffect); + FIXME ("(%p)->(%p 0x%08lx)\n", This, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) { dragdrophelper *This = impl_from_IDropTargetHelper(iface); - FIXME ("(%p)->(%p %p 0x%08x)\n", This, pDataObject, ppt, dwEffect); + FIXME ("(%p)->(%p %p 0x%08lx)\n", This, pDataObject, ppt, dwEffect); return E_NOTIMPL; } @@ -209,7 +209,7 @@ static HRESULT WINAPI DragSourceHelper2_SetFlags(IDragSourceHelper2 *iface, DWOR { dragdrophelper *This = impl_from_IDragSourceHelper2(iface); - FIXME("(%p)->(%08x): stub\n", This, flags); + FIXME("(%p)->(%08lx): stub\n", This, flags); return S_OK; } diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 6e0e1755b79..9704228d426 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -392,17 +392,17 @@ static HRESULT create_new_shellview(ExplorerBrowserImpl *This, IShellItem *psi) } else { - ERR("CreateViewWindow failed (0x%x)\n", hr); + ERR("CreateViewWindow failed (0x%lx)\n", hr); IShellView_Release(psv); } } else - ERR("CreateViewObject failed (0x%x)\n", hr); + ERR("CreateViewObject failed (0x%lx)\n", hr); IShellFolder_Release(psf); } else - ERR("SI::BindToHandler failed (0x%x)\n", hr); + ERR("SI::BindToHandler failed (0x%lx)\n", hr); return hr; } @@ -595,7 +595,7 @@ static LRESULT navpane_on_wm_create(HWND hwnd, CREATESTRUCTW *crs) hr = INameSpaceTreeControl2_SetControlStyle2(pnstc2, 0xFF, style2); if(FAILED(hr)) - ERR("SetControlStyle2 failed (0x%08x)\n", hr); + ERR("SetControlStyle2 failed (0x%08lx)\n", hr); hr = INameSpaceTreeControl2_QueryInterface(pnstc2, &IID_IOleWindow, (void**)&pow); if(SUCCEEDED(hr)) @@ -604,12 +604,12 @@ static LRESULT navpane_on_wm_create(HWND hwnd, CREATESTRUCTW *crs) IOleWindow_Release(pow); } else - ERR("QueryInterface(IOleWindow) failed (0x%08x)\n", hr); + ERR("QueryInterface(IOleWindow) failed (0x%08lx)\n", hr); pnstce = &This->INameSpaceTreeControlEvents_iface; hr = INameSpaceTreeControl2_TreeAdvise(pnstc2, (IUnknown*)pnstce, &cookie); if(FAILED(hr)) - ERR("TreeAdvise failed. (0x%08x).\n", hr); + ERR("TreeAdvise failed. (0x%08lx).\n", hr); /* * Add the default roots @@ -650,7 +650,7 @@ static LRESULT navpane_on_wm_create(HWND hwnd, CREATESTRUCTW *crs) } This->navpane.pnstc2 = NULL; - ERR("Failed (0x%08x)\n", hr); + ERR("Failed (0x%08lx)\n", hr); return FALSE; } @@ -727,7 +727,7 @@ static void initialize_navpane(ExplorerBrowserImpl *This, HWND hwnd_parent, RECT splitter_width, rc->bottom - rc->top, hwnd_parent, 0, shell32_hInstance, This); if(!splitter) - ERR("Failed to create navpane : %d.\n", GetLastError()); + ERR("Failed to create navpane : %ld.\n", GetLastError()); } /************************************************************************** @@ -826,7 +826,7 @@ static ULONG WINAPI IExplorerBrowser_fnAddRef(IExplorerBrowser *iface) { ExplorerBrowserImpl *This = impl_from_IExplorerBrowser(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); return ref; } @@ -835,7 +835,7 @@ static ULONG WINAPI IExplorerBrowser_fnRelease(IExplorerBrowser *iface) { ExplorerBrowserImpl *This = impl_from_IExplorerBrowser(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); if(!ref) { @@ -1026,7 +1026,7 @@ static HRESULT WINAPI IExplorerBrowser_fnUnadvise(IExplorerBrowser *iface, { ExplorerBrowserImpl *This = impl_from_IExplorerBrowser(iface); event_client *client; - TRACE("%p (0x%x)\n", This, dwCookie); + TRACE("%p (0x%lx)\n", This, dwCookie); LIST_FOR_EACH_ENTRY(client, &This->event_clients, event_client, entry) { @@ -1420,7 +1420,7 @@ static HRESULT WINAPI IShellBrowser_fnGetViewStateStream(IShellBrowser *iface, IStream **ppStrm) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); - FIXME("stub, %p (0x%x, %p)\n", This, grfMode, ppStrm); + FIXME("stub, %p (0x%lx, %p)\n", This, grfMode, ppStrm); *ppStrm = NULL; return E_FAIL; @@ -1441,7 +1441,7 @@ static HRESULT WINAPI IShellBrowser_fnSendControlMsg(IShellBrowser *iface, LRESULT *pret) { ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface); - FIXME("stub, %p (%d, %d, %lx, %lx, %p)\n", This, id, uMsg, wParam, lParam, pret); + FIXME("stub, %p (%d, %d, %Ix, %Ix, %p)\n", This, id, uMsg, wParam, lParam, pret); return E_NOTIMPL; } @@ -1587,7 +1587,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnOnStateChange(ICommDlgBrowser3 *iface, IShellView *shv, ULONG uChange) { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); - TRACE("%p (%p, %d)\n", This, shv, uChange); + TRACE("%p (%p, %ld)\n", This, shv, uChange); if(This->pcdb_site) return ICommDlgBrowser_OnStateChange(This->pcdb_site, shv, uChange); @@ -1611,7 +1611,7 @@ static HRESULT WINAPI ICommDlgBrowser3_fnNotify(ICommDlgBrowser3 *iface, DWORD dwNotifyType) { ExplorerBrowserImpl *This = impl_from_ICommDlgBrowser3(iface); - TRACE("%p (%p, 0x%x)\n", This, pshv, dwNotifyType); + TRACE("%p (%p, 0x%lx)\n", This, pshv, dwNotifyType); if(This->pcdb2_site) return ICommDlgBrowser2_Notify(This->pcdb2_site, pshv, dwNotifyType); @@ -1816,7 +1816,7 @@ static HRESULT WINAPI NSTCEvents_fnOnItemClick(INameSpaceTreeControlEvents *ifac NSTCECLICKTYPE nstceClickType) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); - TRACE("%p (%p, 0x%x, 0x%x)\n", This, psi, nstceHitTest, nstceClickType); + TRACE("%p (%p, 0x%lx, 0x%lx)\n", This, psi, nstceHitTest, nstceClickType); return S_OK; } @@ -1834,7 +1834,7 @@ static HRESULT WINAPI NSTCEvents_fnOnItemStateChanging(INameSpaceTreeControlEven NSTCITEMSTATE nstcisState) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); - TRACE("%p (%p, 0x%x, 0x%x)\n", This, psi, nstcisMask, nstcisState); + TRACE("%p (%p, 0x%lx, 0x%lx)\n", This, psi, nstcisMask, nstcisState); return E_NOTIMPL; } @@ -1844,7 +1844,7 @@ static HRESULT WINAPI NSTCEvents_fnOnItemStateChanged(INameSpaceTreeControlEvent NSTCITEMSTATE nstcisState) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); - TRACE("%p (%p, 0x%x, 0x%x)\n", This, psi, nstcisMask, nstcisState); + TRACE("%p (%p, 0x%lx, 0x%lx)\n", This, psi, nstcisMask, nstcisState); return E_NOTIMPL; } @@ -1871,7 +1871,7 @@ static HRESULT WINAPI NSTCEvents_fnOnKeyboardInput(INameSpaceTreeControlEvents * UINT uMsg, WPARAM wParam, LPARAM lParam) { ExplorerBrowserImpl *This = impl_from_INameSpaceTreeControlEvents(iface); - TRACE("%p (%d, 0x%lx, 0x%lx)\n", This, uMsg, wParam, lParam); + TRACE("%p (%d, 0x%Ix, 0x%Ix)\n", This, uMsg, wParam, lParam); return S_OK; } diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 87ef1878303..73f8d32e214 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -69,7 +69,7 @@ BOOL CreateFolderEnumList(IEnumIDListImpl *list, LPCWSTR lpszPath, DWORD dwFlags WCHAR szPath[MAX_PATH]; BOOL succeeded = TRUE; - TRACE("(%p)->(path=%s flags=0x%08x)\n", list, debugstr_w(lpszPath), dwFlags); + TRACE("(%p)->(path=%s flags=0x%08lx)\n", list, debugstr_w(lpszPath), dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; @@ -157,7 +157,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef(IEnumIDList *iface) IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, refCount - 1); + TRACE("(%p)->(%lu)\n", This, refCount - 1); return refCount; } @@ -170,7 +170,7 @@ static ULONG WINAPI IEnumIDList_fnRelease(IEnumIDList *iface) IEnumIDListImpl *This = impl_from_IEnumIDList(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, refCount + 1); + TRACE("(%p)->(%lu)\n", This, refCount + 1); if (!refCount) { @@ -199,7 +199,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(IEnumIDList *iface, ULONG celt, LPITEMI HRESULT hr = S_OK; ULONG i; - TRACE("(%p)->(%d, %p, %p)\n", This, celt, rgelt, fetched); + TRACE("(%p)->(%ld, %p, %p)\n", This, celt, rgelt, fetched); /* It is valid to leave pceltFetched NULL when celt is 1. Some of explorer's * subsystems actually use it (and so may a third party browser) @@ -239,7 +239,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip(IEnumIDList *iface, ULONG celt) HRESULT hr = S_OK; ULONG i; - TRACE("(%p)->(%u)\n", This, celt); + TRACE("(%p)->(%lu)\n", This, celt); for (i = 0; i < celt; i++) { diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 1fa4310eba3..1a30180d05d 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -103,7 +103,7 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) IExtractIconWImpl *This = impl_from_IExtractIconW(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -115,7 +115,7 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) IExtractIconWImpl *This = impl_from_IExtractIconW(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index eeed5b0a09b..3f3741540d0 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -78,7 +78,7 @@ static INT CALLBACK SIC_CompareEntries( LPVOID p1, LPVOID p2, LPARAM lparam) { LPSIC_ENTRY e1 = p1, e2 = p2; - TRACE("%p %p %8lx\n", p1, p2, lparam); + TRACE("%p %p %8Ix\n", p1, p2, lparam); /* Icons in the cache are keyed by the name of the file they are * loaded from, their resource index and the fact if they have a shortcut @@ -295,7 +295,7 @@ static INT SIC_IconAppend (const WCHAR *sourcefile, INT src_index, HICON *hicons SIC_ENTRY *entry; unsigned int i; - TRACE("%s %i %p %#x\n", debugstr_w(sourcefile), src_index, hicons, flags); + TRACE("%s %i %p %#lx\n", debugstr_w(sourcefile), src_index, hicons, flags); entry = SHAlloc(sizeof(*entry)); @@ -452,7 +452,7 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context sizes[SHIL_SYSSMALL].cy = GetSystemMetrics( SM_CYSMICON ); sizes[SHIL_JUMBO].cx = sizes[SHIL_JUMBO].cy = 256; - TRACE("large %dx%d small %dx%d\n", sizes[SHIL_LARGE].cx, sizes[SHIL_LARGE].cy, sizes[SHIL_SMALL].cx, sizes[SHIL_SMALL].cy); + TRACE("large %ldx%ld small %ldx%ld\n", sizes[SHIL_LARGE].cx, sizes[SHIL_LARGE].cy, sizes[SHIL_SMALL].cx, sizes[SHIL_SMALL].cy); sic_hdpa = DPA_Create(16); if (!sic_hdpa) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f22c6275665..4c66a14c700 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -75,7 +75,7 @@ static BOOL ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR pat BOOL ret = FALSE; WCHAR wPath[MAX_PATH]; - TRACE("%p %p %p %d\n", psf, pidl, path, type); + TRACE("%p %p %p %ld\n", psf, pidl, path, type); if (!pidl || !path) return FALSE; @@ -95,7 +95,7 @@ BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWO STRRET strret; DWORD flag; - TRACE("%p %p %p %x\n", psf, pidl, path, type); + TRACE("%p %p %p %lx\n", psf, pidl, path, type); if (!pidl || !path) return FALSE; @@ -119,7 +119,7 @@ BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWO flag = SHGDN_INFOLDER; break; default: - FIXME("Unknown type parameter = %x\n", type); + FIXME("Unknown type parameter = %lx\n", type); flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; break; } @@ -160,7 +160,7 @@ BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWO */ BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { - TRACE_(shell)("%p %p %p %d\n", psf, pidl, path, type); + TRACE_(shell)("%p %p %p %ld\n", psf, pidl, path, type); if (SHELL_OsIsUnicode()) return ILGetDisplayNameExW(psf, pidl, path, type); @@ -380,7 +380,7 @@ static HRESULT SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * at { WCHAR lpszDisplayName[MAX_PATH]; - TRACE_(shell)("%s %p 0x%08x\n", path, ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08lx\n", path, ppidl, attributes ? *attributes : 0); if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH)) lpszDisplayName[MAX_PATH-1] = 0; @@ -394,7 +394,7 @@ HRESULT SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * attribut DWORD pchEaten; HRESULT ret = E_FAIL; - TRACE_(shell)("%s %p 0x%08x\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08lx\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); if (SUCCEEDED (SHGetDesktopFolder(&sf))) { @@ -433,7 +433,7 @@ HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD * LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate) { LPITEMIDLIST ppidl; - TRACE_(shell)("(hwnd=%p,csidl=0x%x,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); + TRACE_(shell)("(hwnd=%p,csidl=0x%lx,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); if (fCreate) nFolder |= CSIDL_FLAG_CREATE; @@ -996,7 +996,7 @@ static HRESULT _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, LPBC pBC = NULL; HRESULT ret; - TRACE("%s %p %d (%p)->%p (%p)->0x%x\n", debugstr_w(path), lpFindFile, bBindCtx, + TRACE("%s %p %d (%p)->%p (%p)->0x%lx\n", debugstr_w(path), lpFindFile, bBindCtx, ppidl, ppidl ? *ppidl : NULL, prgfInOut, prgfInOut ? *prgfInOut : 0); @@ -1023,7 +1023,7 @@ static HRESULT _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, if (FAILED(ret) && ppidl) *ppidl = NULL; - TRACE("%s %p 0x%x\n", debugstr_w(path), ppidl ? *ppidl : NULL, prgfInOut ? *prgfInOut : 0); + TRACE("%s %p 0x%lx\n", debugstr_w(path), ppidl ? *ppidl : NULL, prgfInOut ? *prgfInOut : 0); return ret; } @@ -1255,7 +1255,7 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si DWORD dwAttributes; STRRET strret; - TRACE_(shell)("(pidl=%p,%p,%u,%x)\n", pidl, path, path_size, flags); + TRACE_(shell)("(pidl=%p,%p,%lu,%x)\n", pidl, path, path_size, flags); pdump(pidl); if (flags != GPFIDL_DEFAULT) @@ -1281,7 +1281,7 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si hr = StrRetToBufW(&strret, pidlLast, path, path_size); - TRACE_(shell)("-- %s, 0x%08x\n",debugstr_w(path), hr); + TRACE_(shell)("-- %s, 0x%08lx\n",debugstr_w(path), hr); return SUCCEEDED(hr); } @@ -1325,7 +1325,7 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI if (SUCCEEDED(hr) && ppidlLast) *ppidlLast = ILFindLastID(pidl); - TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08x\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } @@ -1359,7 +1359,7 @@ HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *p if (psfDesktop) IShellFolder_Release(psfDesktop); - TRACE_(shell)("-- ppv=%p ret=0x%08x\n", *ppv, hr); + TRACE_(shell)("-- ppv=%p ret=0x%08lx\n", *ppv, hr); return hr; } @@ -1373,7 +1373,7 @@ HRESULT WINAPI SHParseDisplayName(LPCWSTR name, IBindCtx *bindctx, LPITEMIDLIST IShellFolder *desktop; HRESULT hr; - TRACE("%s %p %p %d %p\n", debugstr_w(name), bindctx, pidlist, attr_in, attr_out); + TRACE("%s %p %p %ld %p\n", debugstr_w(name), bindctx, pidlist, attr_in, attr_out); *pidlist = NULL; @@ -2008,7 +2008,7 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) ERR("-- no text\n"); } - TRACE("-- (%p=%s 0x%08x)\n",szOut,debugstr_a(szOut),dwReturn); + TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_a(szOut),dwReturn); return dwReturn; } @@ -2088,7 +2088,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) } } - TRACE("-- (%p=%s 0x%08x)\n",szOut,debugstr_w(szOut),dwReturn); + TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_w(szOut),dwReturn); return dwReturn; } diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 8cfc1042fe7..7a03dd13a6d 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -646,7 +646,7 @@ static HRESULT WINAPI RecycleBinMenu_GetCommandString(IContextMenu2 *iface, LPSTR pszName, UINT cchMax) { - TRACE("(%p, %lu, %u, %p, %s, %u) - stub\n",iface,idCmd,uType,pwReserved,debugstr_a(pszName),cchMax); + TRACE("(%p, %Iu, %u, %p, %s, %u) - stub\n",iface,idCmd,uType,pwReserved,debugstr_a(pszName),cchMax); return E_NOTIMPL; } @@ -654,7 +654,7 @@ static HRESULT WINAPI RecycleBinMenu_HandleMenuMsg(IContextMenu2 *iface, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TRACE("(%p, %u, 0x%lx, 0x%lx) - stub\n",iface,uMsg,wParam,lParam); + TRACE("(%p, %u, 0x%Ix, 0x%Ix) - stub\n",iface,uMsg,wParam,lParam); return E_NOTIMPL; } @@ -799,7 +799,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH int pidls_count = 0; int i=0; - TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); + TRACE("(%p, %p, %lx, %p)\n", This, hwnd, grfFlags, ppenumIDList); *ppenumIDList = NULL; list = IEnumIDList_Constructor(); @@ -887,7 +887,7 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn static HRESULT WINAPI RecycleBin_GetAttributesOf(IShellFolder2 *This, UINT cidl, LPCITEMIDLIST *apidl, SFGAOF *rgfInOut) { - TRACE("(%p, %d, {%p, ...}, {%x})\n", This, cidl, apidl[0], *rgfInOut); + TRACE("(%p, %d, {%p, ...}, {%lx})\n", This, cidl, apidl[0], *rgfInOut); *rgfInOut &= SFGAO_CANMOVE|SFGAO_CANDELETE|SFGAO_HASPROPSHEET|SFGAO_FILESYSTEM; return S_OK; } @@ -912,7 +912,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID { const WIN32_FIND_DATAW *data = get_trash_item_data( pidl ); - TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); + TRACE("(%p, %p, %lx, %p)\n", This, pidl, uFlags, pName); pName->uType = STRRET_WSTR; return SHStrDupW(PathFindFileNameW(data->cFileName), &pName->u.pOleStr); } @@ -970,7 +970,7 @@ static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD re { RecycleBin *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + TRACE("(%p)->(%#lx, %p, %p)\n", This, reserved, sort, display); return E_NOTIMPL; } @@ -1267,7 +1267,7 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) INT i=0; HRESULT ret; - TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); + TRACE("(%p, %s, 0x%08lx)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); ret = enum_trash_items(&apidl, &cidl); if (FAILED(ret)) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 6b418343ee1..212de7445a4 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -165,7 +165,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, HRESULT hr = S_OK; UINT uGilFlags = 0; - TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", + TRACE("%s fattr=0x%lx sfi=%p(attr=0x%08lx) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, psfi, psfi ? psfi->dwAttributes : 0, sizeofpsfi, flags); @@ -480,7 +480,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, SHFree(pidlLast); - TRACE ("icon=%p index=0x%08x attr=0x%08x name=%s type=%s ret=0x%08lx\n", + TRACE ("icon=%p index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08Ix\n", psfi->hIcon, psfi->iIcon, psfi->dwAttributes, debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret); @@ -621,7 +621,7 @@ HICON WINAPI ExtractIconW(HINSTANCE hInstance, LPCWSTR lpszFile, UINT nIconIndex HRESULT WINAPI SHCreateFileExtractIconW(LPCWSTR file, DWORD attribs, REFIID riid, void **ppv) { - FIXME("%s, %x, %s, %p\n", debugstr_w(file), attribs, debugstr_guid(riid), ppv); + FIXME("%s, %lx, %s, %p\n", debugstr_w(file), attribs, debugstr_guid(riid), ppv); *ppv = NULL; return E_NOTIMPL; } @@ -666,7 +666,7 @@ VOID WINAPI Printer_LoadIconsW(LPCWSTR wsPrinterName, HICON * pLargeIcon, HICON BOOL WINAPI Printers_RegisterWindowW(LPCWSTR wsPrinter, DWORD dwType, HANDLE * phClassPidl, HWND * phwnd) { - FIXME("(%s, %x, %p (%p), %p (%p)) stub!\n", debugstr_w(wsPrinter), dwType, + FIXME("(%s, %lx, %p (%p), %p (%p)) stub!\n", debugstr_w(wsPrinter), dwType, phClassPidl, (phClassPidl != NULL) ? *(phClassPidl) : NULL, phwnd, (phwnd != NULL) ? *(phwnd) : NULL); @@ -696,7 +696,7 @@ static ULONG WINAPI window_prop_store_AddRef(IPropertyStore *iface) { struct window_prop_store *store = impl_from_IPropertyStore(iface); LONG ref = InterlockedIncrement(&store->ref); - TRACE("returning %d\n", ref); + TRACE("returning %ld\n", ref); return ref; } @@ -705,7 +705,7 @@ static ULONG WINAPI window_prop_store_Release(IPropertyStore *iface) struct window_prop_store *store = impl_from_IPropertyStore(iface); LONG ref = InterlockedDecrement(&store->ref); if (!ref) heap_free(store); - TRACE("returning %d\n", ref); + TRACE("returning %ld\n", ref); return ref; } @@ -738,19 +738,19 @@ static HRESULT WINAPI window_prop_store_GetCount(IPropertyStore *iface, DWORD *c static HRESULT WINAPI window_prop_store_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) { - FIXME("%p, %u,%p\n", iface, prop, key); + FIXME("%p, %lu,%p\n", iface, prop, key); return E_NOTIMPL; } static HRESULT WINAPI window_prop_store_GetValue(IPropertyStore *iface, const PROPERTYKEY *key, PROPVARIANT *var) { - FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + FIXME("%p, {%s,%lu}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); return E_NOTIMPL; } static HRESULT WINAPI window_prop_store_SetValue(IPropertyStore *iface, const PROPERTYKEY *key, const PROPVARIANT *var) { - FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + FIXME("%p, {%s,%lu}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); return S_OK; } @@ -831,7 +831,7 @@ static void paint_dropline( HDC hdc, HWND hWnd ) */ DWORD WINAPI SHHelpShortcuts_RunDLLA(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4) { - FIXME("(%x, %x, %x, %x) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); + FIXME("(%lx, %lx, %lx, %lx) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); return 0; } @@ -841,7 +841,7 @@ DWORD WINAPI SHHelpShortcuts_RunDLLA(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, D */ DWORD WINAPI SHHelpShortcuts_RunDLLW(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4) { - FIXME("(%x, %x, %x, %x) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); + FIXME("(%lx, %lx, %lx, %lx) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); return 0; } @@ -1038,7 +1038,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, */ void WINAPI FreeIconList( DWORD dw ) { - FIXME("%x: stub\n",dw); + FIXME("%lx: stub\n",dw); } /************************************************************************* @@ -1086,7 +1086,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) WINE_FILEVERSION_BUILD, WINE_FILEVERSION_PLATFORMID); } - TRACE("%u.%u.%u.%u\n", + TRACE("%lu.%lu.%lu.%lu\n", pdvi->dwMajorVersion, pdvi->dwMinorVersion, pdvi->dwBuildNumber, pdvi->dwPlatformID); return S_OK; @@ -1114,7 +1114,7 @@ HINSTANCE shell32_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) { @@ -1178,7 +1178,7 @@ HRESULT WINAPI DllUnregisterServer(void) */ BOOL WINAPI ExtractVersionResource16W(LPWSTR s, DWORD d) { - FIXME("(%s %x) stub!\n", debugstr_w(s), d); + FIXME("(%s %lx) stub!\n", debugstr_w(s), d); return FALSE; } @@ -1214,7 +1214,7 @@ HRESULT WINAPI SHGetLocalizedName(LPCWSTR path, LPWSTR module, UINT size, INT *r */ HRESULT WINAPI SHSetUnreadMailCountW(LPCWSTR mailaddress, DWORD count, LPCWSTR executecommand) { - FIXME("%s %x %s: stub\n", debugstr_w(mailaddress), count, debugstr_w(executecommand)); + FIXME("%s %lx %s: stub\n", debugstr_w(mailaddress), count, debugstr_w(executecommand)); return E_NOTIMPL; } @@ -1223,7 +1223,7 @@ HRESULT WINAPI SHSetUnreadMailCountW(LPCWSTR mailaddress, DWORD count, LPCWSTR e */ HRESULT WINAPI SHEnumerateUnreadMailAccountsW(HKEY user, DWORD idx, LPWSTR mailaddress, INT mailaddresslen) { - FIXME("%p %d %p %d: stub\n", user, idx, mailaddress, mailaddresslen); + FIXME("%p %ld %p %d: stub\n", user, idx, mailaddress, mailaddresslen); return E_NOTIMPL; } diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 93f61144912..fbf90bb125e 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -149,7 +149,7 @@ static HRESULT load_typelib(void) hr = LoadRegTypeLib(&LIBID_Shell32, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR("LoadRegTypeLib failed: %08lx\n", hr); return hr; } @@ -188,7 +188,7 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hr); return hr; } @@ -228,7 +228,7 @@ static ULONG WINAPI FolderItemVerbImpl_AddRef(FolderItemVerb *iface) FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -238,7 +238,7 @@ static ULONG WINAPI FolderItemVerbImpl_Release(FolderItemVerb *iface) FolderItemVerbImpl *This = impl_from_FolderItemVerb(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) { @@ -262,7 +262,7 @@ static HRESULT WINAPI FolderItemVerbImpl_GetTypeInfo(FolderItemVerb *iface, UINT { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", iface, iTInfo, lcid, ppTInfo); hr = get_typeinfo(FolderItemVerb_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -276,7 +276,7 @@ static HRESULT WINAPI FolderItemVerbImpl_GetIDsOfNames(FolderItemVerb *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(FolderItemVerb_tid, &ti); @@ -293,7 +293,7 @@ static HRESULT WINAPI FolderItemVerbImpl_Invoke(FolderItemVerb *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(FolderItemVerb_tid, &ti); @@ -398,7 +398,7 @@ static ULONG WINAPI FolderItemVerbsImpl_AddRef(FolderItemVerbs *iface) FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -408,7 +408,7 @@ static ULONG WINAPI FolderItemVerbsImpl_Release(FolderItemVerbs *iface) FolderItemVerbsImpl *This = impl_from_FolderItemVerbs(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) { @@ -432,7 +432,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_GetTypeInfo(FolderItemVerbs *iface, UI { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", iface, iTInfo, lcid, ppTInfo); hr = get_typeinfo(FolderItemVerbs_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -446,7 +446,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_GetIDsOfNames(FolderItemVerbs *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(FolderItemVerbs_tid, &ti); @@ -463,7 +463,7 @@ static HRESULT WINAPI FolderItemVerbsImpl_Invoke(FolderItemVerbs *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(FolderItemVerbs_tid, &ti); @@ -656,7 +656,7 @@ static ULONG WINAPI ShellLinkObject_AddRef(IShellLinkDual2 *iface) ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -666,7 +666,7 @@ static ULONG WINAPI ShellLinkObject_Release(IShellLinkDual2 *iface) ShellLinkObjectImpl *This = impl_from_IShellLinkDual(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) { @@ -689,7 +689,7 @@ static HRESULT WINAPI ShellLinkObject_GetTypeInfo(IShellLinkDual2 *iface, UINT i { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", iface, iTInfo, lcid, ppTInfo); hr = get_typeinfo(IShellLinkDual2_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -704,7 +704,7 @@ static HRESULT WINAPI ShellLinkObject_GetIDsOfNames(IShellLinkDual2 *iface, REFI ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IShellLinkDual2_tid, &ti); @@ -721,7 +721,7 @@ static HRESULT WINAPI ShellLinkObject_Invoke(IShellLinkDual2 *iface, DISPID disp ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IShellLinkDual2_tid, &ti); @@ -964,7 +964,7 @@ static ULONG WINAPI FolderItemImpl_AddRef(FolderItem2 *iface) FolderItemImpl *This = impl_from_FolderItem(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -974,7 +974,7 @@ static ULONG WINAPI FolderItemImpl_Release(FolderItem2 *iface) FolderItemImpl *This = impl_from_FolderItem(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) { @@ -999,7 +999,7 @@ static HRESULT WINAPI FolderItemImpl_GetTypeInfo(FolderItem2 *iface, UINT iTInfo { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", iface, iTInfo, lcid, ppTInfo); hr = get_typeinfo(FolderItem2_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -1014,7 +1014,7 @@ static HRESULT WINAPI FolderItemImpl_GetIDsOfNames(FolderItem2 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(FolderItem2_tid, &ti); @@ -1032,7 +1032,7 @@ static HRESULT WINAPI FolderItemImpl_Invoke(FolderItem2 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(FolderItem2_tid, &ti); @@ -1344,7 +1344,7 @@ static ULONG WINAPI FolderItemsImpl_AddRef(FolderItems3 *iface) FolderItemsImpl *This = impl_from_FolderItems(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -1355,7 +1355,7 @@ static ULONG WINAPI FolderItemsImpl_Release(FolderItems3 *iface) ULONG ref = InterlockedDecrement(&This->ref); LONG i; - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) { @@ -1382,7 +1382,7 @@ static HRESULT WINAPI FolderItemsImpl_GetTypeInfo(FolderItems3 *iface, { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, type, lcid, ppti); + TRACE("(%p,%u,%ld,%p)\n", iface, type, lcid, ppti); hr = get_typeinfo(FolderItems3_tid, ppti); if (SUCCEEDED(hr)) @@ -1396,7 +1396,7 @@ static HRESULT WINAPI FolderItemsImpl_GetIDsOfNames(FolderItems3 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), names, count, lcid, dispid); + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), names, count, lcid, dispid); hr = get_typeinfo(FolderItems3_tid, &ti); if (SUCCEEDED(hr)) @@ -1412,7 +1412,7 @@ static HRESULT WINAPI FolderItemsImpl_Invoke(FolderItems3 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispid, shdebugstr_guid(riid), lcid, flags, params, result, ei, err); + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispid, shdebugstr_guid(riid), lcid, flags, params, result, ei, err); hr = get_typeinfo(FolderItems3_tid, &ti); if (SUCCEEDED(hr)) @@ -1545,7 +1545,7 @@ static HRESULT WINAPI FolderItemsImpl_InvokeVerbEx(FolderItems3 *iface, VARIANT static HRESULT WINAPI FolderItemsImpl_Filter(FolderItems3 *iface, LONG flags, BSTR spec) { - FIXME("(%p,%d,%s)\n", iface, flags, wine_dbgstr_w(spec)); + FIXME("(%p,%ld,%s)\n", iface, flags, wine_dbgstr_w(spec)); return E_NOTIMPL; } @@ -1717,7 +1717,7 @@ static ULONG WINAPI FolderImpl_AddRef(Folder3 *iface) FolderImpl *This = impl_from_Folder(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -1727,7 +1727,7 @@ static ULONG WINAPI FolderImpl_Release(Folder3 *iface) FolderImpl *This = impl_from_Folder(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) { @@ -1753,7 +1753,7 @@ static HRESULT WINAPI FolderImpl_GetTypeInfo(Folder3 *iface, UINT iTInfo, { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", iface, iTInfo, lcid, ppTInfo); hr = get_typeinfo(Folder3_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -1768,7 +1768,7 @@ static HRESULT WINAPI FolderImpl_GetIDsOfNames(Folder3 *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(Folder3_tid, &ti); @@ -1785,7 +1785,7 @@ static HRESULT WINAPI FolderImpl_Invoke(Folder3 *iface, DISPID dispIdMember, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(Folder3_tid, &ti); @@ -2059,7 +2059,7 @@ static ULONG WINAPI ShellDispatch_AddRef(IShellDispatch6 *iface) ShellDispatch *This = impl_from_IShellDispatch6(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -2069,7 +2069,7 @@ static ULONG WINAPI ShellDispatch_Release(IShellDispatch6 *iface) ShellDispatch *This = impl_from_IShellDispatch6(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (!ref) heap_free(This); @@ -2091,7 +2091,7 @@ static HRESULT WINAPI ShellDispatch_GetTypeInfo(IShellDispatch6 *iface, { HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", iface, iTInfo, lcid, ppTInfo); hr = get_typeinfo(IShellDispatch6_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -2105,7 +2105,7 @@ static HRESULT WINAPI ShellDispatch_GetIDsOfNames(IShellDispatch6 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%s,%p,%u,%d,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p,%s,%p,%u,%ld,%p)\n", iface, shdebugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IShellDispatch6_tid, &ti); @@ -2123,7 +2123,7 @@ static HRESULT WINAPI ShellDispatch_Invoke(IShellDispatch6 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, + TRACE("(%p,%ld,%s,%ld,%u,%p,%p,%p,%p)\n", iface, dispIdMember, shdebugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IShellDispatch6_tid, &ti); @@ -2232,7 +2232,7 @@ static HRESULT WINAPI ShellDispatch_BrowseForFolder(IShellDispatch6 *iface, BROWSEINFOW bi = { 0 }; HRESULT hr; - TRACE("(%p,%x,%s,%x,%s,%p)\n", iface, hwnd, debugstr_w(title), options, debugstr_variant(&rootfolder), folder); + TRACE("(%p,%lx,%s,%lx,%s,%p)\n", iface, hwnd, debugstr_w(title), options, debugstr_variant(&rootfolder), folder); *folder = NULL; @@ -2483,7 +2483,7 @@ static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch6 *iface, BST service = OpenServiceW(scm, name, SERVICE_QUERY_STATUS); if (!service) { - ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); + ERR("Failed to open service %s (%lu)\n", debugstr_w(name), GetLastError()); CloseServiceHandle(scm); return S_OK; } @@ -2491,7 +2491,7 @@ static HRESULT WINAPI ShellDispatch_IsServiceRunning(IShellDispatch6 *iface, BST if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(SERVICE_STATUS_PROCESS), &dummy)) { - TRACE("failed to query service status (%u)\n", GetLastError()); + TRACE("failed to query service status (%lu)\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(scm); return S_OK; @@ -2544,7 +2544,7 @@ static HRESULT WINAPI ShellDispatch_ExplorerPolicy(IShellDispatch6 *iface, BSTR static HRESULT WINAPI ShellDispatch_GetSetting(IShellDispatch6 *iface, LONG setting, VARIANT_BOOL *result) { - FIXME("(%d %p): stub\n", setting, result); + FIXME("(%ld %p): stub\n", setting, result); return E_NOTIMPL; } diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 4693641d6ef..0a3a76cbd6a 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -94,7 +94,7 @@ static ULONG WINAPI ShellItem_AddRef(IShellItem2 *iface) ShellItem *This = impl_from_IShellItem2(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); return ref; } @@ -104,7 +104,7 @@ static ULONG WINAPI ShellItem_Release(IShellItem2 *iface) ShellItem *This = impl_from_IShellItem2(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", iface, ref); + TRACE("(%p), new refcount=%li\n", iface, ref); if (ref == 0) { @@ -269,7 +269,7 @@ static HRESULT WINAPI ShellItem_GetAttributes(IShellItem2 *iface, SFGAOF sfgaoMa LPITEMIDLIST child_pidl; HRESULT ret; - TRACE("(%p,%x,%p)\n", iface, sfgaoMask, psfgaoAttribs); + TRACE("(%p,%lx,%p)\n", iface, sfgaoMask, psfgaoAttribs); if (_ILIsDesktop(This->pidl)) ret = SHGetDesktopFolder(&parent_folder); @@ -300,10 +300,10 @@ static HRESULT WINAPI ShellItem_Compare(IShellItem2 *iface, IShellItem *oth, { LPWSTR dispname, dispname_oth; HRESULT ret; - TRACE("(%p,%p,%x,%p)\n", iface, oth, hint, piOrder); + TRACE("(%p,%p,%lx,%p)\n", iface, oth, hint, piOrder); if(hint & (SICHINT_CANONICAL | SICHINT_ALLFIELDS)) - FIXME("Unsupported flags 0x%08x\n", hint); + FIXME("Unsupported flags 0x%08lx\n", hint); ret = IShellItem2_GetDisplayName(iface, SIGDN_DESKTOPABSOLUTEEDITING, &dispname); if(SUCCEEDED(ret)) @@ -715,7 +715,7 @@ HRESULT WINAPI SHCreateItemInKnownFolder(REFKNOWNFOLDERID rfid, DWORD flags, IShellItem *parent = NULL; LPITEMIDLIST pidl = NULL; - TRACE("(%p, %x, %s, %s, %p)\n", rfid, flags, wine_dbgstr_w(filename), + TRACE("(%p, %lx, %s, %s, %p)\n", rfid, flags, wine_dbgstr_w(filename), debugstr_guid(riid), ppv); if(!rfid || !ppv) @@ -900,7 +900,7 @@ static ULONG WINAPI IEnumShellItems_fnAddRef(IEnumShellItems *iface) { IEnumShellItemsImpl *This = impl_from_IEnumShellItems(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); return ref; } @@ -909,7 +909,7 @@ static ULONG WINAPI IEnumShellItems_fnRelease(IEnumShellItems *iface) { IEnumShellItemsImpl *This = impl_from_IEnumShellItems(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); if(!ref) { @@ -931,7 +931,7 @@ static HRESULT WINAPI IEnumShellItems_fnNext(IEnumShellItems* iface, HRESULT hr = S_FALSE; UINT i; ULONG fetched = 0; - TRACE("%p (%d %p %p)\n", This, celt, rgelt, pceltFetched); + TRACE("%p (%ld %p %p)\n", This, celt, rgelt, pceltFetched); if(pceltFetched == NULL && celt != 1) return E_INVALIDARG; @@ -961,7 +961,7 @@ static HRESULT WINAPI IEnumShellItems_fnNext(IEnumShellItems* iface, static HRESULT WINAPI IEnumShellItems_fnSkip(IEnumShellItems* iface, ULONG celt) { IEnumShellItemsImpl *This = impl_from_IEnumShellItems(iface); - TRACE("%p (%d)\n", This, celt); + TRACE("%p (%ld)\n", This, celt); This->position = min(This->position + celt, This->count-1); @@ -1066,7 +1066,7 @@ static ULONG WINAPI IShellItemArray_fnAddRef(IShellItemArray *iface) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); return ref; } @@ -1075,7 +1075,7 @@ static ULONG WINAPI IShellItemArray_fnRelease(IShellItemArray *iface) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("%p - ref %d\n", This, ref); + TRACE("%p - ref %ld\n", This, ref); if(!ref) { @@ -1138,7 +1138,7 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, HRESULT hr = S_OK; SFGAOF attr; UINT i; - TRACE("%p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); + TRACE("%p (%x, %lx, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); if(AttribFlags & ~(SIATTRIBFLAGS_AND|SIATTRIBFLAGS_OR)) FIXME("%08x contains unsupported attribution flags\n", AttribFlags); @@ -1193,7 +1193,7 @@ static HRESULT WINAPI IShellItemArray_fnGetItemAt(IShellItemArray *iface, IShellItem **ppsi) { IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); - TRACE("%p (%x, %p)\n", This, dwIndex, ppsi); + TRACE("%p (%lx, %p)\n", This, dwIndex, ppsi); /* zero indexed */ if(dwIndex + 1 > This->item_count) @@ -1231,7 +1231,7 @@ static HRESULT create_shellitemarray(IShellItem **items, DWORD count, IShellItem { IShellItemArrayImpl *This; - TRACE("(%p, %d, %p)\n", items, count, ret); + TRACE("(%p, %ld, %p)\n", items, count, ret); This = heap_alloc(sizeof(*This)); if(!This) @@ -1457,7 +1457,7 @@ static ULONG WINAPI CustomDestinationList_AddRef(ICustomDestinationList *iface) CustomDestinationList *This = impl_from_ICustomDestinationList(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", This, ref); + TRACE("(%p), new refcount=%li\n", This, ref); return ref; } @@ -1467,7 +1467,7 @@ static ULONG WINAPI CustomDestinationList_Release(ICustomDestinationList *iface) CustomDestinationList *This = impl_from_ICustomDestinationList(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", This, ref); + TRACE("(%p), new refcount=%li\n", This, ref); if (ref == 0) heap_free(This); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 2f3c4b20f28..042b3bf5829 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -275,7 +275,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile HRESULT r; IStream *stm; - TRACE("(%p, %s, %x)\n",This, debugstr_w(pszFileName), dwMode); + TRACE("(%p, %s, %lx)\n",This, debugstr_w(pszFileName), dwMode); if( dwMode == 0 ) dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; @@ -292,7 +292,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile This->bDirty = FALSE; } - TRACE("-- returning hr %08x\n", r); + TRACE("-- returning hr %08lx\n", r); return r; } @@ -583,7 +583,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) return E_FAIL; } - TRACE("Read %d bytes\n",chunk->size); + TRACE("Read %ld bytes\n",chunk->size); *data = chunk; @@ -662,7 +662,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, if( n && (n < loc->dwTotalSize) ) *path = Stream_LoadPath( &p[n], loc->dwTotalSize - n ); - TRACE("type %d serial %08x name %s path %s\n", volume->type, + TRACE("type %ld serial %08lx name %s path %s\n", volume->type, volume->serial, debugstr_w(volume->label), debugstr_w(*path)); heap_free( p ); @@ -711,11 +711,11 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str ) if( count != size ) return E_FAIL; - TRACE("magic %08x string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); + TRACE("magic %08lx string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); if( (buffer.dbh.dwSignature&0xffff0000) != 0xa0000000 ) { - ERR("Unknown magic number %08x in advertised shortcut\n", buffer.dbh.dwSignature); + ERR("Unknown magic number %08lx in advertised shortcut\n", buffer.dbh.dwSignature); return E_FAIL; } @@ -1256,7 +1256,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA *iface, LPSTR pszFile, I IShellLinkImpl *This = impl_from_IShellLinkA(iface); HRESULT res = S_OK; - TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", + TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)(%s)\n", This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); if (This->sComponent || This->sProduct) @@ -1299,7 +1299,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA *iface, LPSTR pszFile, I } } - TRACE("attr 0x%08x size 0x%08x%08x name %s shortname %s\n", pfd->dwFileAttributes, + TRACE("attr 0x%08lx size 0x%08lx%08lx name %s shortname %s\n", pfd->dwFileAttributes, pfd->nFileSizeHigh, pfd->nFileSizeLow, wine_dbgstr_a(pfd->cFileName), wine_dbgstr_a(pfd->cAlternateFileName)); } @@ -1496,7 +1496,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA *iface, LPCSTR p WCHAR *pathW; HRESULT hr; - TRACE("(%p)->(path=%s %x)\n",This, pszPathRel, dwReserved); + TRACE("(%p)->(path=%s %lx)\n",This, pszPathRel, dwReserved); pathW = heap_strdupAtoW(pszPathRel); if (!pathW) return E_OUTOFMEMORY; @@ -1511,7 +1511,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA *iface, HWND hwnd, DWORD { IShellLinkImpl *This = impl_from_IShellLinkA(iface); - TRACE("(%p)->(hwnd=%p flags=%x)\n",This, hwnd, fFlags); + TRACE("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags); return IShellLinkW_Resolve(&This->IShellLinkW_iface, hwnd, fFlags); } @@ -1633,7 +1633,7 @@ static ULONG WINAPI IShellLinkW_fnAddRef(IShellLinkW * iface) IShellLinkImpl *This = impl_from_IShellLinkW(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, ref - 1); + TRACE("(%p)->(count=%lu)\n", This, ref - 1); return ref; } @@ -1646,7 +1646,7 @@ static ULONG WINAPI IShellLinkW_fnRelease(IShellLinkW * iface) IShellLinkImpl *This = impl_from_IShellLinkW(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); if (refCount) return refCount; @@ -1679,7 +1679,7 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile, IShellLinkImpl *This = impl_from_IShellLinkW(iface); HRESULT res = S_OK; - TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", + TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)(%s)\n", This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); if (This->sComponent || This->sProduct) @@ -1719,7 +1719,7 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile, } } - TRACE("attr 0x%08x size 0x%08x%08x name %s shortname %s\n", pfd->dwFileAttributes, + TRACE("attr 0x%08lx size 0x%08lx%08lx name %s shortname %s\n", pfd->dwFileAttributes, pfd->nFileSizeHigh, pfd->nFileSizeLow, wine_dbgstr_w(pfd->cFileName), wine_dbgstr_w(pfd->cAlternateFileName)); } @@ -1961,7 +1961,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR { IShellLinkImpl *This = impl_from_IShellLinkW(iface); - TRACE("(%p)->(path=%s %x)\n",This, debugstr_w(pszPathRel), dwReserved); + TRACE("(%p)->(path=%s %lx)\n",This, debugstr_w(pszPathRel), dwReserved); heap_free(This->sPathRel); This->sPathRel = heap_alloc((lstrlenW( pszPathRel )+1) * sizeof (WCHAR) ); @@ -1980,7 +1980,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR IShellLinkImpl *This = impl_from_IShellLinkW(iface); - TRACE("(%p)->(hwnd=%p flags=%x)\n",This, hwnd, fFlags); + TRACE("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags); /*FIXME: use IResolveShellLink interface */ @@ -2107,7 +2107,7 @@ static BOOL ShellLink_GetVolumeInfo(LPCWSTR path, volume_info *volume) volume->type = GetDriveTypeW(drive); r = GetVolumeInformationW(drive, volume->label, label_sz, &volume->serial, NULL, NULL, NULL, 0); - TRACE("r = %d type %d serial %08x name %s\n", r, + TRACE("r = %d type %ld serial %08lx name %s\n", r, volume->type, volume->serial, debugstr_w(volume->label)); return r; } @@ -2245,7 +2245,7 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl LPVOID block = NULL; HRESULT r = E_FAIL; - TRACE("%p %08x %p\n", iface, dwSig, ppDataBlock ); + TRACE("%p %08lx %p\n", iface, dwSig, ppDataBlock ); switch (dwSig) { @@ -2260,10 +2260,10 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl case NT_FE_CONSOLE_PROPS_SIG: case EXP_SPECIAL_FOLDER_SIG: case EXP_SZ_ICON_SIG: - FIXME("valid but unhandled datablock %08x\n", dwSig); + FIXME("valid but unhandled datablock %08lx\n", dwSig); break; default: - ERR("unknown datablock %08x\n", dwSig); + ERR("unknown datablock %08lx\n", dwSig); } *ppDataBlock = block; return r; @@ -2272,7 +2272,7 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl static HRESULT WINAPI ShellLink_RemoveDataBlock( IShellLinkDataList* iface, DWORD dwSig ) { - FIXME("(%p)->(%u): stub\n", iface, dwSig); + FIXME("(%p)->(%lu): stub\n", iface, dwSig); return E_NOTIMPL; } @@ -2304,7 +2304,7 @@ ShellLink_GetFlags( IShellLinkDataList* iface, DWORD* pdwFlags ) static HRESULT WINAPI ShellLink_SetFlags( IShellLinkDataList* iface, DWORD dwFlags ) { - FIXME("(%p)->(%u): stub\n", iface, dwFlags); + FIXME("(%p)->(%lu): stub\n", iface, dwFlags); return S_OK; } @@ -2557,7 +2557,7 @@ ShellLink_GetCommandString( IContextMenu* iface, UINT_PTR idCmd, UINT uType, { IShellLinkImpl *This = impl_from_IContextMenu(iface); - FIXME("(%p)->(%lu %u %p %p %u): stub\n", This, + FIXME("(%p)->(%Iu %u %p %p %u): stub\n", This, idCmd, uType, pwReserved, pszName, cchMax ); return E_NOTIMPL; @@ -2661,7 +2661,7 @@ static HRESULT WINAPI propertystore_GetCount(IPropertyStore *iface, DWORD *props static HRESULT WINAPI propertystore_GetAt(IPropertyStore *iface, DWORD propid, PROPERTYKEY *key) { IShellLinkImpl *This = impl_from_IPropertyStore(iface); - FIXME("(%p)->(%d %p): stub\n", This, propid, key); + FIXME("(%p)->(%ld %p): stub\n", This, propid, key); return E_NOTIMPL; } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index b1ba0c8343b..7cd46ba2d98 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -172,7 +172,7 @@ HRESULT WINAPI SHCoCreateInstance( hres = E_ACCESSDENIED; goto end; } else if (FAILED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { - TRACE("GetClassObject failed 0x%08x\n", hres); + TRACE("GetClassObject failed 0x%08lx\n", hres); goto end; } @@ -188,7 +188,7 @@ end: if (hKey) RegCloseKey(hKey); if(hres!=S_OK) { - ERR("failed (0x%08x) to create CLSID:%s IID:%s\n", + ERR("failed (0x%08lx) to create CLSID:%s IID:%s\n", hres, shdebugstr_guid(myclsid), shdebugstr_guid(refiid)); ERR("class not found in registry\n"); } @@ -308,7 +308,7 @@ LPVOID WINAPI SHAlloc(DWORD len) LPVOID ret; ret = CoTaskMemAlloc(len); - TRACE("%u bytes at %p\n",len, ret); + TRACE("%lu bytes at %p\n",len, ret); return ret; } @@ -345,7 +345,7 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) *psf = NULL; hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder, (LPVOID*)psf); - TRACE("-- %p->(%p) 0x%08x\n", psf, *psf, hres); + TRACE("-- %p->(%p) 0x%08lx\n", psf, *psf, hres); return hres; } /************************************************************************** @@ -425,7 +425,7 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) IDefClFImpl *This = impl_from_IClassFactory(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -437,7 +437,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) IDefClFImpl *This = impl_from_IClassFactory(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount + 1); + TRACE("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { @@ -678,7 +678,7 @@ HRESULT WINAPI SHPropStgCreate(IPropertySetStorage *psstg, REFFMTID fmtid, PROPVARIANT ret; HRESULT hres; - TRACE("%p %s %s %x %x %x %p %p\n", psstg, debugstr_guid(fmtid), debugstr_guid(pclsid), + TRACE("%p %s %s %lx %lx %lx %p %p\n", psstg, debugstr_guid(fmtid), debugstr_guid(pclsid), grfFlags, grfMode, dwDisposition, ppstg, puCodePage); hres = IPropertySetStorage_Open(psstg, fmtid, grfMode, ppstg); @@ -726,7 +726,7 @@ HRESULT WINAPI SHPropStgReadMultiple(IPropertyStorage *pps, UINT uCodePage, STATPROPSETSTG stat; HRESULT hres; - FIXME("%p %u %u %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); + FIXME("%p %u %lu %p %p\n", pps, uCodePage, cpspec, rgpspec, rgvar); memset(rgvar, 0, cpspec*sizeof(PROPVARIANT)); hres = IPropertyStorage_ReadMultiple(pps, cpspec, rgpspec, rgvar); @@ -764,7 +764,7 @@ HRESULT WINAPI SHPropStgWriteMultiple(IPropertyStorage *pps, UINT *uCodePage, UINT codepage; HRESULT hres; - FIXME("%p %p %u %p %p %d\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); + FIXME("%p %p %lu %p %p %ld\n", pps, uCodePage, cpspec, rgpspec, rgvar, propidNameFirst); hres = IPropertyStorage_Stat(pps, &stat); if(FAILED(hres)) @@ -860,7 +860,7 @@ static ULONG WINAPI ShellImageData_AddRef(IShellImageData *iface) ShellImageData *This = impl_from_IShellImageData(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("%p, %u\n", This, ref); + TRACE("%p, %lu\n", This, ref); return ref; } @@ -870,7 +870,7 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) ShellImageData *This = impl_from_IShellImageData(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p, %u\n", This, ref); + TRACE("%p, %lu\n", This, ref); if (!ref) { @@ -888,7 +888,7 @@ static HRESULT WINAPI ShellImageData_Decode(IShellImageData *iface, DWORD flags, GpImage *image; HRESULT hr; - TRACE("%p, %#x, %u, %u\n", This, flags, cx_desired, cy_desired); + TRACE("%p, %#lx, %lu, %lu\n", This, flags, cx_desired, cy_desired); if (This->image) return S_FALSE; @@ -1052,7 +1052,7 @@ static HRESULT WINAPI ShellImageDate_SelectPage(IShellImageData *iface, ULONG pa { ShellImageData *This = impl_from_IShellImageData(iface); - FIXME("%p, %u: stub\n", This, page); + FIXME("%p, %lu: stub\n", This, page); return E_NOTIMPL; } @@ -1109,7 +1109,7 @@ static HRESULT WINAPI ShellImageData_GetProperties(IShellImageData *iface, DWORD { ShellImageData *This = impl_from_IShellImageData(iface); - FIXME("%p, %#x, %p: stub\n", This, mode, props); + FIXME("%p, %#lx, %p: stub\n", This, mode, props); return E_NOTIMPL; } @@ -1118,7 +1118,7 @@ static HRESULT WINAPI ShellImageData_Rotate(IShellImageData *iface, DWORD angle) { ShellImageData *This = impl_from_IShellImageData(iface); - FIXME("%p, %u: stub\n", This, angle); + FIXME("%p, %lu: stub\n", This, angle); return E_NOTIMPL; } @@ -1127,7 +1127,7 @@ static HRESULT WINAPI ShellImageData_Scale(IShellImageData *iface, ULONG cx, ULO { ShellImageData *This = impl_from_IShellImageData(iface); - FIXME("%p, %u, %u, %#x: stub\n", This, cx, cy, mode); + FIXME("%p, %lu, %lu, %#x: stub\n", This, cx, cy, mode); return E_NOTIMPL; } diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 97aad0fe14f..55b02d4188f 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -115,7 +115,7 @@ DWORD WINAPI ParseFieldA( LPSTR dst, DWORD len) { - WARN("(%s,0x%08x,%p,%d) semi-stub.\n",debugstr_a(src),nField,dst,len); + WARN("(%s,0x%08lx,%p,%ld) semi-stub.\n",debugstr_a(src),nField,dst,len); if (!src || !src[0] || !dst || !len) return 0; @@ -145,7 +145,7 @@ DWORD WINAPI ParseFieldA( */ DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len) { - WARN("(%s,0x%08x,%p,%d) semi-stub.\n", debugstr_w(src), nField, dst, len); + WARN("(%s,0x%08lx,%p,%ld) semi-stub.\n", debugstr_w(src), nField, dst, len); if (!src || !src[0] || !dst || !len) return 0; @@ -193,7 +193,7 @@ static BOOL GetFileNameFromBrowseA( OPENFILENAMEA ofn; BOOL ret; - TRACE("%p, %s, %d, %s, %s, %s, %s)\n", + TRACE("%p, %s, %ld, %s, %s, %s, %s)\n", hwndOwner, lpstrFile, nMaxFile, lpstrInitialDir, lpstrDefExt, lpstrFilter, lpstrTitle); @@ -240,7 +240,7 @@ static BOOL GetFileNameFromBrowseW( OPENFILENAMEW ofn; BOOL ret; - TRACE("%p, %s, %d, %s, %s, %s, %s)\n", + TRACE("%p, %s, %ld, %s, %s, %s, %s)\n", hwndOwner, debugstr_w(lpstrFile), nMaxFile, debugstr_w(lpstrInitialDir), debugstr_w(lpstrDefExt), debugstr_w(lpstrFilter), debugstr_w(lpstrTitle)); @@ -296,7 +296,7 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet) { if(bSet) { - FIXME("%p 0x%08x TRUE\n", lpss, dwMask); + FIXME("%p 0x%08lx TRUE\n", lpss, dwMask); } else { @@ -318,7 +318,7 @@ VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask) DWORD dwData; DWORD dwDataSize = sizeof (DWORD); - TRACE("(%p 0x%08x)\n",lpsfs,dwMask); + TRACE("(%p 0x%08lx)\n",lpsfs,dwMask); if (RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0)) @@ -386,7 +386,7 @@ LRESULT WINAPI SHShellFolderView_Message( UINT uMessage, LPARAM lParam) { - FIXME("%p %08x %08lx stub\n",hwndCabinet, uMessage, lParam); + FIXME("%p %08x %08Ix stub\n",hwndCabinet, uMessage, lParam); return 0; } @@ -406,7 +406,7 @@ BOOL WINAPI RegisterShellHook( HWND hWnd, DWORD dwType) { - FIXME("(%p,0x%08x):stub.\n",hWnd, dwType); + FIXME("(%p,0x%08lx):stub.\n",hWnd, dwType); return TRUE; } @@ -596,7 +596,7 @@ HRESULT WINAPI SHDoDragDrop( DWORD dwOKEffect, LPDWORD pdwEffect) { - FIXME("(%p %p %p 0x%08x %p):stub.\n", + FIXME("(%p %p %p 0x%08lx %p):stub.\n", hWnd, lpDataObject, lpDropSource, dwOKEffect, pdwEffect); return DoDragDrop(lpDataObject, lpDropSource, dwOKEffect, pdwEffect); } @@ -608,7 +608,7 @@ HRESULT WINAPI SHDoDragDrop( WORD WINAPI ArrangeWindows(HWND hwndParent, DWORD dwReserved, const RECT *lpRect, WORD cKids, const HWND *lpKids) { - FIXME("(%p 0x%08x %p 0x%04x %p):stub.\n", + FIXME("(%p 0x%08lx %p 0x%04x %p):stub.\n", hwndParent, dwReserved, lpRect, cKids, lpKids); return 0; } @@ -797,12 +797,12 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) if (ret == ERROR_SUCCESS) { if (!( (type == REG_DWORD) || ((type == REG_BINARY) && (datalen == 4)) )) { - ERR("Error policy data for \"NoRecentDocsHistory\" not formatted correctly, type=%d, len=%d\n", + ERR("Error policy data for \"NoRecentDocsHistory\" not formatted correctly, type=%ld, len=%ld\n", type, datalen); return; } - TRACE("policy value for NoRecentDocsHistory = %08x\n", data[0]); + TRACE("policy value for NoRecentDocsHistory = %08lx\n", data[0]); /* now test the actual policy value */ if ( data[0] != 0) return; @@ -960,7 +960,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) if (!DeleteFileA(old_lnk_name)) { if ((attr = GetFileAttributesA(old_lnk_name)) == INVALID_FILE_ATTRIBUTES) { if ((err = GetLastError()) != ERROR_FILE_NOT_FOUND) { - ERR("Delete for %s failed, err=%d, attr=%08x\n", + ERR("Delete for %s failed, err=%d, attr=%08lx\n", old_lnk_name, err, attr); } else { @@ -969,7 +969,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) } } else { - ERR("Delete for %s failed, attr=%08x\n", + ERR("Delete for %s failed, attr=%08lx\n", old_lnk_name, attr); } } @@ -1032,7 +1032,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) (LPVOID *)&pPf); if(FAILED(hres)) { /* bombed */ - ERR("failed QueryInterface for IPersistFile %08x\n", hres); + ERR("failed QueryInterface for IPersistFile %08lx\n", hres); goto fail; } @@ -1044,7 +1044,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) } if(FAILED(hres)) { /* bombed */ - ERR("failed Set{IDList|Path} %08x\n", hres); + ERR("failed Set{IDList|Path} %08lx\n", hres); goto fail; } @@ -1053,7 +1053,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) hres = IShellLinkA_SetDescription(psl, desc); if(FAILED(hres)) { /* bombed */ - ERR("failed SetDescription %08x\n", hres); + ERR("failed SetDescription %08lx\n", hres); goto fail; } @@ -1063,7 +1063,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) hres = IPersistFile_Save(pPf, widelink, TRUE); if(FAILED(hres)) { /* bombed */ - ERR("failed IPersistFile::Save %08x\n", hres); + ERR("failed IPersistFile::Save %08lx\n", hres); IPersistFile_Release(pPf); IShellLinkA_Release(psl); goto fail; @@ -1071,11 +1071,11 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) hres = IPersistFile_SaveCompleted(pPf, widelink); IPersistFile_Release(pPf); IShellLinkA_Release(psl); - TRACE("shortcut %s has been created, result=%08x\n", + TRACE("shortcut %s has been created, result=%08lx\n", new_lnk_filepath, hres); } else { - ERR("CoCreateInstance failed, hres=%08x\n", hres); + ERR("CoCreateInstance failed, hres=%08lx\n", hres); } } @@ -1092,7 +1092,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) * */ HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) -{ FIXME("0x%08x 0x%08x 0x%08x 0x%08x stub\n",v,w,x,z); +{ FIXME("0x%08lx 0x%08lx 0x%08lx 0x%08lx stub\n",v,w,x,z); return 0; } /************************************************************************* @@ -1147,7 +1147,7 @@ BOOL WINAPI DAD_DragEnter(HWND hwnd) */ BOOL WINAPI DAD_DragEnterEx(HWND hwnd, POINT p) { - FIXME("hwnd = %p (%d,%d)\n",hwnd,p.x,p.y); + FIXME("hwnd = %p (%ld,%ld)\n",hwnd,p.x,p.y); return FALSE; } /************************************************************************* @@ -1156,7 +1156,7 @@ BOOL WINAPI DAD_DragEnterEx(HWND hwnd, POINT p) */ BOOL WINAPI DAD_DragMove(POINT p) { - FIXME("(%d,%d)\n",p.x,p.y); + FIXME("(%ld,%ld)\n",p.x,p.y); return FALSE; } /************************************************************************* @@ -1395,7 +1395,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) * SetAppStartingCursor [SHELL32.99] */ HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v) -{ FIXME("hwnd=%p 0x%04x stub\n",u,v ); +{ FIXME("hwnd=%p 0x%04lx stub\n",u,v ); return 0; } @@ -1419,7 +1419,7 @@ HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v) * hack in SHCoCreateInstance) */ HRESULT WINAPI SHLoadOLE(LPARAM lParam) -{ FIXME("0x%08lx stub\n",lParam); +{ FIXME("0x%08Ix stub\n",lParam); return S_OK; } /************************************************************************* @@ -1476,7 +1476,7 @@ BOOL WINAPI SHWaitForFileToOpen( DWORD dwFlags, DWORD dwTimeout) { - FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout); + FIXME("%p 0x%08lx 0x%08lx stub\n", pidl, dwFlags, dwTimeout); return FALSE; } @@ -1662,7 +1662,7 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd UINT i; PPSXA psxa = (PPSXA)hpsxa; - TRACE("(%p,%p,%08lx)\n", hpsxa, lpfnAddPage, lParam); + TRACE("(%p,%p,%08Ix)\n", hpsxa, lpfnAddPage, lParam); if (psxa) { @@ -1808,7 +1808,7 @@ UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPRO UINT i; PPSXA psxa = (PPSXA)hpsxa; - TRACE("(%p,%u,%p,%08lx)\n", hpsxa, uPageID, lpfnReplaceWith, lParam); + TRACE("(%p,%u,%p,%08Ix)\n", hpsxa, uPageID, lpfnReplaceWith, lParam); if (psxa) { @@ -1865,7 +1865,7 @@ HRESULT WINAPI CIDLData_CreateFromIDArray( UINT i; HWND hwnd = 0; /*FIXME: who should be hwnd of owner? set to desktop */ - TRACE("(%p, %d, %p, %p)\n", pidlFolder, cpidlFiles, lppidlFiles, ppdataObject); + TRACE("(%p, %ld, %p, %p)\n", pidlFolder, cpidlFiles, lppidlFiles, ppdataObject); if (TRACE_ON(pidl)) { pdump (pidlFolder); @@ -1890,7 +1890,7 @@ HRESULT WINAPI SHCreateStdEnumFmtEtc( { IEnumFORMATETC *pef; HRESULT hRes; - TRACE("cf=%d fe=%p pef=%p\n", cFormats, lpFormats, ppenumFormatetc); + TRACE("cf=%ld fe=%p pef=%p\n", cFormats, lpFormats, ppenumFormatetc); pef = IEnumFORMATETC_Constructor(cFormats, lpFormats); if (!pef) @@ -1955,7 +1955,7 @@ INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST pidlExtra) BOOL WINAPI SHObjectProperties(HWND hwnd, DWORD dwType, LPCWSTR szObject, LPCWSTR szPage) { - FIXME("%p, 0x%08x, %s, %s - stub\n", hwnd, dwType, debugstr_w(szObject), debugstr_w(szPage)); + FIXME("%p, 0x%08lx, %s, %s - stub\n", hwnd, dwType, debugstr_w(szObject), debugstr_w(szPage)); return TRUE; } @@ -2029,7 +2029,7 @@ BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName, HRESULT WINAPI SHStartNetConnectionDialog(HWND hwnd, LPCSTR pszRemoteName, DWORD dwType) { - FIXME("%p, %s, 0x%08x - stub\n", hwnd, debugstr_a(pszRemoteName), dwType); + FIXME("%p, %s, 0x%08lx - stub\n", hwnd, debugstr_a(pszRemoteName), dwType); return S_OK; } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d42b64646f8..5dd9f4b6310 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -495,7 +495,7 @@ static BOOL PathMakeUniqueNameA( LPCSTR lpszLongName, LPCSTR lpszPathName) { - FIXME("%p %u %s %s %s stub\n", + FIXME("%p %lu %s %s %s stub\n", lpszBuffer, dwBuffSize, debugstr_a(lpszShortName), debugstr_a(lpszLongName), debugstr_a(lpszPathName)); return TRUE; @@ -511,7 +511,7 @@ static BOOL PathMakeUniqueNameW( LPCWSTR lpszLongName, LPCWSTR lpszPathName) { - FIXME("%p %u %s %s %s stub\n", + FIXME("%p %lu %s %s %s stub\n", lpszBuffer, dwBuffSize, debugstr_w(lpszShortName), debugstr_w(lpszLongName), debugstr_w(lpszPathName)); return TRUE; @@ -689,7 +689,7 @@ static BOOL PathResolveA(char *path, const char **dirs, DWORD flags) BOOL is_file_spec = PathIsFileSpecA(path); DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; - TRACE("(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); + TRACE("(%s,%p,0x%08lx)\n", debugstr_a(path), dirs, flags); if (flags & PRF_VERIFYEXISTS && !PathFileExistsA(path)) { @@ -718,7 +718,7 @@ static BOOL PathResolveW(WCHAR *path, const WCHAR **dirs, DWORD flags) BOOL is_file_spec = PathIsFileSpecW(path); DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; - TRACE("(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); + TRACE("(%s,%p,0x%08lx)\n", debugstr_w(path), dirs, flags); if (flags & PRF_VERIFYEXISTS && !PathFileExistsW(path)) { @@ -762,7 +762,7 @@ static LONG PathProcessCommandA ( DWORD dwBuffSize, DWORD dwFlags) { - FIXME("%s %p 0x%04x 0x%04x stub\n", + FIXME("%s %p 0x%04lx 0x%04lx stub\n", lpszPath, lpszBuff, dwBuffSize, dwFlags); if(!lpszPath) return -1; if(lpszBuff) strcpy(lpszBuff, lpszPath); @@ -778,7 +778,7 @@ static LONG PathProcessCommandW ( DWORD dwBuffSize, DWORD dwFlags) { - FIXME("(%s, %p, 0x%04x, 0x%04x) stub\n", + FIXME("(%s, %p, 0x%04lx, 0x%04lx) stub\n", debugstr_w(lpszPath), lpszBuff, dwBuffSize, dwFlags); if(!lpszPath) return -1; if(lpszBuff) lstrcpyW(lpszBuff, lpszPath); @@ -874,7 +874,7 @@ static ULONG WINAPI ApplicationDestinations_AddRef(IApplicationDestinations *ifa IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", This, ref); + TRACE("(%p), new refcount=%li\n", This, ref); return ref; } @@ -884,7 +884,7 @@ static ULONG WINAPI ApplicationDestinations_Release(IApplicationDestinations *if IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", This, ref); + TRACE("(%p), new refcount=%li\n", This, ref); if (ref == 0) heap_free(This); @@ -993,7 +993,7 @@ static ULONG WINAPI ApplicationDocumentLists_AddRef(IApplicationDocumentLists *i IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p), new refcount=%i\n", This, ref); + TRACE("(%p), new refcount=%li\n", This, ref); return ref; } @@ -1003,7 +1003,7 @@ static ULONG WINAPI ApplicationDocumentLists_Release(IApplicationDocumentLists * IApplicationDocumentListsImpl *This = impl_from_IApplicationDocumentLists(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p), new refcount=%i\n", This, ref); + TRACE("(%p), new refcount=%li\n", This, ref); if (ref == 0) heap_free(This); @@ -2156,7 +2156,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, hr = E_FAIL; RegCloseKey(shellFolderKey); RegCloseKey(userShellFolderKey); - TRACE("returning 0x%08x\n", hr); + TRACE("returning 0x%08lx\n", hr); return hr; } @@ -2245,7 +2245,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) if (SUCCEEDED(hr)) append_relative_path(folder, pszPath); - TRACE("returning 0x%08x\n", hr); + TRACE("returning 0x%08lx\n", hr); return hr; } @@ -2260,7 +2260,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, { HRESULT hr; - TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); + TRACE("0x%08lx,0x%02x,%p\n", dwFlags, folder, pszPath); if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; @@ -2312,7 +2312,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, RegCloseKey(hKey); } } - TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); + TRACE("returning 0x%08lx (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; } @@ -2364,7 +2364,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, WCHAR buffer[40]; HRESULT hr; - TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); + TRACE("%p,0x%08lx,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; @@ -2423,7 +2423,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, LocalFree((HLOCAL) userPrefix); } error: - TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); + TRACE("returning 0x%08lx (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; } @@ -2437,7 +2437,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, { HRESULT hr; - TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); + TRACE("0x%08lx,0x%02x,%p\n", dwFlags, folder, pszPath); if (folder >= ARRAY_SIZE(CSIDL_Data)) return E_INVALIDARG; @@ -2455,7 +2455,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); } - TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); + TRACE("returning 0x%08lx (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; } @@ -2506,7 +2506,7 @@ static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName, else hr = S_OK; } - TRACE("returning 0x%08x (output value is %s)\n", hr, debugstr_w(szValue)); + TRACE("returning 0x%08lx (output value is %s)\n", hr, debugstr_w(szValue)); return hr; } @@ -2634,7 +2634,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) end: if (key) RegCloseKey(key); - TRACE("returning 0x%08x (input was %s, output is %s)\n", hr, + TRACE("returning 0x%08lx (input was %s, output is %s)\n", hr, debugstr_w(szSrc), debugstr_w(szDest)); return hr; } @@ -2862,7 +2862,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( LPWSTR pszSubPathW = NULL; LPWSTR pszPathW = NULL; - TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); + TRACE("%p,%#x,%p,%#lx,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_a(pszSubPath), pszPath); if(pszPath) { pszPathW = heap_alloc(MAX_PATH * sizeof(WCHAR)); @@ -2871,7 +2871,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirA( goto cleanup; } } - TRACE("%08x,%08x,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); + TRACE("%08x,%08lx,%s\n",nFolder, dwFlags, debugstr_w(pszSubPathW)); /* SHGetFolderPathAndSubDirW does not distinguish if pszSubPath isn't * set (null), or an empty string.therefore call it without the parameter set @@ -2915,7 +2915,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( CSIDL_Type type; int ret; - TRACE("%p,%#x,%p,%#x,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); + TRACE("%p,%#x,%p,%#lx,%s,%p\n", hwndOwner, nFolder, hToken, dwFlags, debugstr_w(pszSubPath), pszPath); /* Windows always NULL-terminates the resulting path regardless of success * or failure, so do so first @@ -3019,7 +3019,7 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( TRACE("Created missing system directory %s\n", debugstr_w(szBuildPath)); end: - TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath)); + TRACE("returning 0x%08lx (final path is %s)\n", hr, debugstr_w(szBuildPath)); return hr; } @@ -3038,7 +3038,7 @@ HRESULT WINAPI SHGetFolderPathA( WCHAR szTemp[MAX_PATH]; HRESULT hr; - TRACE("%p,%d,%p,%#x,%p\n", hwndOwner, nFolder, hToken, dwFlags, pszPath); + TRACE("%p,%d,%p,%#lx,%p\n", hwndOwner, nFolder, hToken, dwFlags, pszPath); if (pszPath) *pszPath = '\0'; @@ -3143,7 +3143,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, if (hKey) RegCloseKey(hKey); - TRACE("returning 0x%08x\n", hr); + TRACE("returning 0x%08lx\n", hr); return hr; } @@ -3208,7 +3208,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, pShellFolderPath, folders, ARRAY_SIZE(folders)); - TRACE("returning 0x%08x\n", hr); + TRACE("returning 0x%08lx\n", hr); return hr; } @@ -3235,7 +3235,7 @@ static HRESULT _SHRegisterCommonShellFolders(void) L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", folders, ARRAY_SIZE(folders)); - TRACE("returning 0x%08x\n", hr); + TRACE("returning 0x%08lx\n", hr); return hr; } @@ -3415,7 +3415,7 @@ HRESULT WINAPI SHGetFolderLocation( { HRESULT hr = E_INVALIDARG; - TRACE("%p 0x%08x %p 0x%08x %p\n", + TRACE("%p 0x%08x %p 0x%08lx %p\n", hwndOwner, nFolder, hToken, dwReserved, ppidl); if (!ppidl) @@ -3520,7 +3520,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t HRESULT hr; int folder = csidl_from_id(rfid), shgfp_flags; - TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, ret_path); + TRACE("%s, 0x%08lx, %p, %p\n", debugstr_guid(rfid), flags, token, ret_path); *ret_path = NULL; @@ -3530,13 +3530,13 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t if (flags & ~(KF_FLAG_CREATE|KF_FLAG_SIMPLE_IDLIST|KF_FLAG_DONT_UNEXPAND| KF_FLAG_DONT_VERIFY|KF_FLAG_NO_ALIAS|KF_FLAG_INIT|KF_FLAG_DEFAULT_PATH|KF_FLAG_NOT_PARENT_RELATIVE)) { - FIXME("flags 0x%08x not supported\n", flags); + FIXME("flags 0x%08lx not supported\n", flags); return E_INVALIDARG; } if ((flags & (KF_FLAG_DEFAULT_PATH | KF_FLAG_NOT_PARENT_RELATIVE)) == KF_FLAG_NOT_PARENT_RELATIVE) { - WARN("Invalid flags mask %#x.\n", flags); + WARN("Invalid flags mask %#lx.\n", flags); return E_INVALIDARG; } @@ -3552,11 +3552,11 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t hr = SHGetFolderPathAndSubDirW( 0, folder, token, shgfp_flags, NULL, pathW ); if (FAILED( hr )) { - TRACE("Failed to get folder path, %#x.\n", hr); + TRACE("Failed to get folder path, %#lx.\n", hr); return hr; } - TRACE("Final path is %s, %#x\n", debugstr_w(pathW), hr); + TRACE("Final path is %s, %#lx\n", debugstr_w(pathW), hr); *ret_path = CoTaskMemAlloc((lstrlenW(pathW) + 1) * sizeof(WCHAR)); if (!*ret_path) @@ -3574,7 +3574,7 @@ HRESULT WINAPI SHGetFolderPathEx(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE toke HRESULT hr; WCHAR *buffer; - TRACE("%s, 0x%08x, %p, %p, %u\n", debugstr_guid(rfid), flags, token, path, len); + TRACE("%s, 0x%08lx, %p, %p, %lu\n", debugstr_guid(rfid), flags, token, path, len); if (!path || !len) return E_INVALIDARG; @@ -3929,7 +3929,7 @@ static HRESULT WINAPI knownfolder_GetShellItem( void **ppv) { struct knownfolder *knownfolder = impl_from_IKnownFolder(iface); - TRACE("(%p, 0x%08x, %s, %p)\n", knownfolder, flags, debugstr_guid(riid), ppv); + TRACE("(%p, 0x%08lx, %s, %p)\n", knownfolder, flags, debugstr_guid(riid), ppv); return SHGetKnownFolderItem(&knownfolder->id, flags, NULL, riid, ppv); } @@ -4034,7 +4034,7 @@ static HRESULT get_known_folder_path_by_id( WCHAR sGuid[39]; DWORD dwAttributes; - TRACE("(%s, %s, 0x%08x, %p)\n", debugstr_guid(folderId), debugstr_w(lpRegistryPath), dwFlags, ppszPath); + TRACE("(%s, %s, 0x%08lx, %p)\n", debugstr_guid(folderId), debugstr_w(lpRegistryPath), dwFlags, ppszPath); /* if this is registry-registered known folder, get path from registry */ if(lpRegistryPath) @@ -4069,7 +4069,7 @@ static HRESULT WINAPI knownfolder_GetPath( LPWSTR *ppszPath) { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); - TRACE("(%p, 0x%08x, %p)\n", knownfolder, dwFlags, ppszPath); + TRACE("(%p, 0x%08lx, %p)\n", knownfolder, dwFlags, ppszPath); return get_known_folder_path_by_id(&knownfolder->id, knownfolder->registryPath, dwFlags, ppszPath); } @@ -4082,7 +4082,7 @@ static HRESULT WINAPI knownfolder_SetPath( struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); HRESULT hr = S_OK; - TRACE("(%p, 0x%08x, %s)\n", knownfolder, dwFlags, debugstr_w(pszPath)); + TRACE("(%p, 0x%08lx, %s)\n", knownfolder, dwFlags, debugstr_w(pszPath)); /* check if the known folder is registered */ if(!knownfolder->registryPath) @@ -4100,7 +4100,7 @@ static HRESULT WINAPI knownfolder_GetIDList( PIDLIST_ABSOLUTE *ppidl) { struct knownfolder *knownfolder = impl_from_IKnownFolder( iface ); - TRACE("(%p, 0x%08x, %p)\n", knownfolder, flags, ppidl); + TRACE("(%p, 0x%08lx, %p)\n", knownfolder, flags, ppidl); return SHGetKnownFolderIDList(&knownfolder->id, flags, NULL, ppidl); } @@ -4584,13 +4584,13 @@ HRESULT WINAPI KnownFolderManager_Constructor( IUnknown *punk, REFIID riid, void HRESULT WINAPI SHGetKnownFolderIDList(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE token, PIDLIST_ABSOLUTE *pidl) { - TRACE("%s, 0x%08x, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); + TRACE("%s, 0x%08lx, %p, %p\n", debugstr_guid(rfid), flags, token, pidl); if (!pidl) return E_INVALIDARG; if (flags) - FIXME("unsupported flags: 0x%08x\n", flags); + FIXME("unsupported flags: 0x%08lx\n", flags); if (token) FIXME("user token is not used.\n"); diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 5604058703e..5ceb62bb1bf 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -59,7 +59,7 @@ static const char *debugstr_strret(STRRET *s) BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest, len, src, debugstr_strret(src), pidl); + TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", dest, len, src, debugstr_strret(src), pidl); if (!dest) return FALSE; @@ -90,7 +90,7 @@ BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST BOOL WINAPI StrRetToStrNW(LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest, len, src, debugstr_strret(src), pidl); + TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", dest, len, src, debugstr_strret(src), pidl); if (!dest) return FALSE; @@ -243,7 +243,7 @@ DWORD WINAPI CheckEscapesA( LPWSTR wString; DWORD ret = 0; - TRACE("(%s %d)\n", debugstr_a(string), len); + TRACE("(%s %ld)\n", debugstr_a(string), len); wString = LocalAlloc(LPTR, len * sizeof(WCHAR)); if (wString) { @@ -267,7 +267,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("%s, %u.\n", debugstr_w(string), len); + TRACE("%s, %lu.\n", debugstr_w(string), len); if (StrPBrkW(string, L" \",;^") && size + 2 <= len) { diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index adfef92417b..f8672836da9 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -270,7 +270,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, *ppidl = pidlTemp; - TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); + TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); return hr; } @@ -310,7 +310,7 @@ static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) BOOL ret = TRUE; WCHAR szPath[MAX_PATH]; - TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -336,7 +336,7 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); IEnumIDListImpl *list; - TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", + TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); if (!(list = IEnumIDList_Constructor())) @@ -387,9 +387,9 @@ static HRESULT WINAPI ISF_Desktop_fnCompareIDs (IShellFolder2 *iface, IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr; - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + TRACE ("(%p)->(0x%08Ix,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); hr = SHELL32_CompareIDs(iface, lParam, pidl1, pidl2); - TRACE ("-- 0x%08x\n", hr); + TRACE ("-- 0x%08lx\n", hr); return hr; } @@ -448,7 +448,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -478,7 +478,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08x\n", *rgfInOut); + TRACE ("-- result=0x%08lx\n", *rgfInOut); return S_OK; } @@ -559,7 +559,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, hr = E_OUTOFMEMORY; *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08x\n", This, hr); + TRACE ("(%p)->hr=0x%08lx\n", This, hr); return hr; } @@ -576,7 +576,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, HRESULT hr = S_OK; LPWSTR pszPath; - TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) @@ -702,7 +702,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, else CoTaskMemFree(pszPath); - TRACE ("-- (%p)->(%s,0x%08x)\n", This, + TRACE ("-- (%p)->(%s,0x%08lx)\n", This, strRet->uType == STRRET_CSTR ? strRet->u.cStr : debugstr_w(strRet->u.pOleStr), hr); return hr; @@ -726,7 +726,7 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p) stub\n", This, hwndOwner, pidl, + FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p) stub\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; @@ -751,7 +751,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDefaultColumn(IShellFolder2 *iface, DWORD { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + TRACE ("(%p)->(%#lx, %p, %p)\n", This, reserved, sort, display); return E_NOTIMPL; } diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 6c2a64f9336..662d8b52d5b 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -145,7 +145,7 @@ static ULONG WINAPI IUnknown_fnAddRef(IUnknown *iface) IGenericSFImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -155,7 +155,7 @@ static ULONG WINAPI IUnknown_fnRelease(IUnknown *iface) IGenericSFImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { TRACE("-- destroying IShellFolder(%p)\n", This); @@ -389,7 +389,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, else *ppidl = NULL; - TRACE ("(%p)->(-- pidl=%p ret=0x%08x)\n", This, *ppidl, hr); + TRACE ("(%p)->(-- pidl=%p ret=0x%08lx)\n", This, *ppidl, hr); if (fsbd) IFileSystemBindData_Release( fsbd ); return hr; @@ -409,7 +409,7 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, IGenericSFImpl *This = impl_from_IShellFolder2(iface); IEnumIDListImpl *list; - TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, + TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); if (!(list = IEnumIDList_Constructor())) @@ -479,7 +479,7 @@ IShellFolder_fnCompareIDs (IShellFolder2 * iface, LPARAM lParam, int nReturn; - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + TRACE ("(%p)->(0x%08Ix,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; @@ -536,7 +536,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, HRESULT hr = S_OK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, cidl, apidl, + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -576,7 +576,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08x\n", *rgfInOut); + TRACE ("-- result=0x%08lx\n", *rgfInOut); return hr; } @@ -736,7 +736,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, *ppvOut = pObj; } - TRACE ("(%p)->hr=0x%08x\n", This, hr); + TRACE ("(%p)->hr=0x%08lx\n", This, hr); return hr; } @@ -852,7 +852,7 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, HRESULT hr = S_OK; - TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) @@ -930,7 +930,7 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, LPWSTR ptr; BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl)); - TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, + TRACE ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); /* pidl has to contain a single non-empty SHITEMID */ @@ -993,7 +993,7 @@ IShellFolder_fnGetDefaultColumn(IShellFolder2 *iface, DWORD reserved, ULONG *sor { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + TRACE("(%p)->(%#lx, %p, %p)\n", This, reserved, sort, display); return E_NOTIMPL; } @@ -1515,7 +1515,7 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, TRACE ("(%p)->(%p,%p,%p)\n", This, pbc, pidlRoot, ppfti); if (ppfti) - TRACE ("--%p %s %s 0x%08x 0x%08x\n", + TRACE ("--%p %s %s 0x%08lx 0x%08x\n", ppfti->pidlTargetFolder, debugstr_w (ppfti->szTargetParsingName), debugstr_w (ppfti->szNetworkProvider), ppfti->dwAttributes, ppfti->csidl); @@ -1716,7 +1716,7 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject, FORMATETC format; STGMEDIUM medium; - TRACE("(%p)->(%p 0x%08x {.x=%d, .y=%d} %p)\n", This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); + TRACE("(%p)->(%p 0x%08lx {.x=%ld, .y=%ld} %p)\n", This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); if (!pdwEffect || !pDataObject) return E_INVALIDARG; @@ -1751,7 +1751,7 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt, { IGenericSFImpl *This = impl_from_IDropTarget(iface); - TRACE("(%p)->(0x%08x {.x=%d, .y=%d} %p)\n", This, dwKeyState, pt.x, pt.y, pdwEffect); + TRACE("(%p)->(0x%08lx {.x=%ld, .y=%ld} %p)\n", This, dwKeyState, pt.x, pt.y, pdwEffect); if (!pdwEffect) return E_INVALIDARG; @@ -1780,7 +1780,7 @@ ISFDropTarget_Drop (IDropTarget * iface, IDataObject * pDataObject, STGMEDIUM medium; HRESULT hr; - TRACE("(%p)->(%p %d {.x=%d, .y=%d} %p) semi-stub\n", + TRACE("(%p)->(%p %ld {.x=%ld, .y=%ld} %p) semi-stub\n", This, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index b4905202503..5b90458e145 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -158,7 +158,7 @@ static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface) IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -168,7 +168,7 @@ static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface) IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { @@ -233,7 +233,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, *ppidl = pidlTemp; - TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); + TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); return hr; } @@ -277,7 +277,7 @@ static BOOL CreateMyCompEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; - TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); /* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -339,7 +339,7 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); IEnumIDListImpl *list; - TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, + TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); if (!(list = IEnumIDList_Constructor())) @@ -391,9 +391,9 @@ static HRESULT WINAPI ISF_MyComputer_fnCompareIDs (IShellFolder2 *iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr; - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + TRACE ("(%p)->(0x%08Ix,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); hr = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); - TRACE ("-- 0x%08x\n", hr); + TRACE ("-- 0x%08lx\n", hr); return hr; } @@ -446,7 +446,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr = S_OK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -477,7 +477,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08x\n", *rgfInOut); + TRACE ("-- result=0x%08lx\n", *rgfInOut); return hr; } @@ -554,7 +554,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, hr = E_OUTOFMEMORY; *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08x\n", This, hr); + TRACE ("(%p)->hr=0x%08lx\n", This, hr); return hr; } @@ -569,7 +569,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, LPWSTR pszPath; HRESULT hr = S_OK; - TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) @@ -734,7 +734,7 @@ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf ( LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, + FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -758,7 +758,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDefaultColumn(IShellFolder2 *iface, DW { IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + TRACE("(%p)->(%#lx, %p, %p)\n", This, reserved, sort, display); return E_NOTIMPL; } @@ -886,7 +886,7 @@ static HRESULT WINAPI IMCFldr_PersistFolder2_QueryInterface ( static ULONG WINAPI IMCFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) { IMyComputerFolderImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, This->ref); return IShellFolder2_AddRef (&This->IShellFolder2_iface); } @@ -896,7 +896,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) static ULONG WINAPI IMCFldr_PersistFolder2_Release (IPersistFolder2 * iface) { IMyComputerFolderImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, This->ref); return IShellFolder2_Release (&This->IShellFolder2_iface); } diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index cda6bd6df69..5f5ec43491c 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -149,7 +149,7 @@ static ULONG WINAPI ISF_NetworkPlaces_fnAddRef (IShellFolder2 * iface) IGenericSFImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -159,7 +159,7 @@ static ULONG WINAPI ISF_NetworkPlaces_fnRelease (IShellFolder2 * iface) IGenericSFImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); @@ -219,7 +219,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnParseDisplayName (IShellFolder2 * ifac else ILFree(pidlTemp); - TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); + TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); return hr; } @@ -233,7 +233,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnEnumObjects (IShellFolder2 * iface, IGenericSFImpl *This = impl_from_IShellFolder2(iface); IEnumIDListImpl *list; - TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, + TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); if (!(list = IEnumIDList_Constructor())) @@ -284,7 +284,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCompareIDs (IShellFolder2 * iface, IGenericSFImpl *This = impl_from_IShellFolder2(iface); int nReturn; - TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + TRACE ("(%p)->(0x%08Ix,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); nReturn = SHELL32_CompareIDs(&This->IShellFolder2_iface, lParam, pidl1, pidl2); TRACE ("-- %i\n", nReturn); return nReturn; @@ -340,7 +340,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface IGenericSFImpl *This = impl_from_IShellFolder2(iface); HRESULT hr = S_OK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -377,7 +377,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetAttributesOf (IShellFolder2 * iface /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08x\n", *rgfInOut); + TRACE ("-- result=0x%08lx\n", *rgfInOut); return hr; } @@ -445,7 +445,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, hr = E_OUTOFMEMORY; *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08x\n", This, hr); + TRACE ("(%p)->hr=0x%08lx\n", This, hr); return hr; } @@ -458,7 +458,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetDisplayNameOf (IShellFolder2 * ifac { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + FIXME ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) @@ -485,7 +485,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnSetNameOf (IShellFolder2 * iface, { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, + FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -511,7 +511,7 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetDefaultColumn(IShellFolder2 *iface, { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + TRACE("(%p)->(%#lx, %p, %p)\n", This, reserved, sort, display); return E_NOTIMPL; } @@ -606,7 +606,7 @@ static ULONG WINAPI INPFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) { IGenericSFImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, This->ref); return IShellFolder2_AddRef (&This->IShellFolder2_iface); } @@ -618,7 +618,7 @@ static ULONG WINAPI INPFldr_PersistFolder2_Release (IPersistFolder2 * iface) { IGenericSFImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%u)\n", This, This->ref); + TRACE ("(%p)->(count=%lu)\n", This, This->ref); return IShellFolder2_Release (&This->IShellFolder2_iface); } diff --git a/dlls/shell32/shfldr_printers.c b/dlls/shell32/shfldr_printers.c index 76375525c52..5b3b9b1f900 100644 --- a/dlls/shell32/shfldr_printers.c +++ b/dlls/shell32/shfldr_printers.c @@ -100,7 +100,7 @@ static ULONG WINAPI IShellFolder_Printers_fnAddRef (IShellFolder2 * iface) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -109,7 +109,7 @@ static ULONG WINAPI IShellFolder_Printers_fnRelease (IShellFolder2 * iface) IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); if (!refCount) { @@ -137,7 +137,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnEnumObjects (IShellFolder2 *iface, HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p)->(HWND=%p flags=0x%08x pplist=%p) stub\n", This, + FIXME("(%p)->(HWND=%p flags=0x%08lx pplist=%p) stub\n", This, hwndOwner, dwFlags, ppEnumIDList); return E_NOTIMPL; } @@ -167,7 +167,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnCompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p)->(0x%08lx,pidl1=%p,pidl2=%p) stub\n", This, lParam, pidl1, pidl2); + FIXME("(%p)->(0x%08Ix,pidl1=%p,pidl2=%p) stub\n", This, lParam, pidl1, pidl2); return E_NOTIMPL; } @@ -207,7 +207,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetAttributesOf (IShellFolder2 * i UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x)) stub\n", + FIXME("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx)) stub\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); return E_NOTIMPL; } @@ -234,7 +234,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDisplayNameOf (IShellFolder2 *i { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME("(%p)->(pidl=%p,0x%08x,%p) stub\n", This, pidl, dwFlags, strRet); + FIXME("(%p)->(pidl=%p,0x%08lx,%p) stub\n", This, pidl, dwFlags, strRet); if (!strRet) return E_INVALIDARG; @@ -247,7 +247,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnSetNameOf ( LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p) stub\n", This, + FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p) stub\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -272,7 +272,7 @@ static HRESULT WINAPI IShellFolder_Printers_fnGetDefaultColumn(IShellFolder2 *if { IPrintersFolderImpl *This = impl_from_IShellFolder2(iface); - TRACE("(%p)->(%#x, %p, %p)\n", This, reserved, sort, display); + TRACE("(%p)->(%#lx, %p, %p)\n", This, reserved, sort, display); return E_NOTIMPL; } diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index c385c26e1e6..8c7e3cf0808 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -266,7 +266,7 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp else out[len-1] = '\0'; - TRACE("used %i of %i space\n",used,len); + TRACE("used %li of %i space\n",used,len); if (out_len) *out_len = used; @@ -333,7 +333,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, when starting app immediately before making a DDE connection. */ if (shWait) if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED) - WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); + WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() ); retval = 33; if (psei->fMask & SEE_MASK_NOCLOSEPROCESS) psei_out->hProcess = info.hProcess; @@ -343,11 +343,11 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, } else if ((retval = GetLastError()) >= 32) { - TRACE("CreateProcess returned error %ld\n", retval); + TRACE("CreateProcess returned error %Id\n", retval); retval = ERROR_BAD_FORMAT; } - TRACE("returning %lu\n", retval); + TRACE("returning %Iu\n", retval); psei_out->hInstApp = (HINSTANCE)retval; if( gcdret ) @@ -739,7 +739,7 @@ static HDDEDATA CALLBACK dde_cb(UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2, HDDEDATA hData, ULONG_PTR dwData1, ULONG_PTR dwData2) { - TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n", + TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08Ix, %08Ix\n", uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2); return NULL; } @@ -1199,7 +1199,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, string[0] = 0; GetMenuItemInfoW( hmenu, i, TRUE, &info ); - TRACE("menu %d %s %08x %08lx %08x %08x\n", i, debugstr_w(string), + TRACE("menu %d %s %08x %08Ix %08x %08x\n", i, debugstr_w(string), info.fState, info.dwItemData, info.fType, info.wID ); if ( ( !sei->lpVerb && (info.fState & MFS_DEFAULT) ) || ( sei->lpVerb && !lstrcmpiW( sei->lpVerb, string ) ) ) @@ -1223,7 +1223,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, r = IContextMenu_InvokeCommand( cm, (LPCMINVOKECOMMANDINFO) &ici ); - TRACE("invoke command returned %08x\n", r ); + TRACE("invoke command returned %08lx\n", r ); end: if ( hmenu ) @@ -1250,7 +1250,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC &IID_IShellExtInit, (LPVOID*)&obj ); if ( FAILED( r ) ) { - ERR("failed %08x\n", r ); + ERR("failed %08lx\n", r ); goto end; } @@ -1395,11 +1395,11 @@ static void SHELL_translate_idlist( LPSHELLEXECUTEINFOW sei, LPWSTR wszParameter if (buffer[0]==':' && buffer[1]==':') { /* open shell folder for the specified class GUID */ if (lstrlenW(buffer) + 1 > parametersLen) - ERR("parameters len exceeds buffer size (%i > %i), truncating\n", + ERR("parameters len exceeds buffer size (%i > %li), truncating\n", lstrlenW(buffer) + 1, parametersLen); lstrcpynW(wszParameters, buffer, parametersLen); if (lstrlenW(L"explorer.exe") > dwApplicationNameLen) - ERR("application len exceeds buffer size (%i), truncating\n", + ERR("application len exceeds buffer size (%li), truncating\n", dwApplicationNameLen); lstrcpynW(wszApplicationName, L"explorer.exe", dwApplicationNameLen); @@ -1552,7 +1552,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ sei_tmp = *sei; - TRACE("mask=0x%08x hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n", + TRACE("mask=0x%08lx hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n", sei_tmp.fMask, sei_tmp.hwnd, debugstr_w(sei_tmp.lpVerb), debugstr_w(sei_tmp.lpFile), debugstr_w(sei_tmp.lpParameters), debugstr_w(sei_tmp.lpDirectory), sei_tmp.nShow, @@ -1614,7 +1614,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (sei_tmp.fMask & unsupportedFlags) { - FIXME("flags ignored: 0x%08x\n", sei_tmp.fMask & unsupportedFlags); + FIXME("flags ignored: 0x%08lx\n", sei_tmp.fMask & unsupportedFlags); } /* process the IDList */ @@ -1830,7 +1830,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) } end: - TRACE("retval %lu\n", retval); + TRACE("retval %Iu\n", retval); heap_free(wszApplicationName); if (wszParameters != parametersBuffer) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 44b125c03bb..17a8e7046c7 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1738,10 +1738,10 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path WCHAR* last_slash; WCHAR* temppath=NULL; - TRACE("%p %p %s 0x%08x\n", hwnd, modless, debugstr_w(path), flags); + TRACE("%p %p %s 0x%08lx\n", hwnd, modless, debugstr_w(path), flags); if (flags & ~(SHPPFW_DIRCREATE|SHPPFW_ASKDIRCREATE|SHPPFW_IGNOREFILENAME)) - FIXME("unimplemented flags 0x%08x\n", flags); + FIXME("unimplemented flags 0x%08lx\n", flags); /* cut off filename if necessary */ if (flags & SHPPFW_IGNOREFILENAME) @@ -1795,7 +1795,7 @@ HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path HRESULT WINAPI SHMultiFileProperties(IDataObject *pdtobj, DWORD flags) { - FIXME("stub: %p %u\n", pdtobj, flags); + FIXME("stub: %p %lu\n", pdtobj, flags); return E_NOTIMPL; } @@ -1835,7 +1835,7 @@ static ULONG WINAPI file_operation_AddRef(IFileOperation *iface) struct file_operation *operation = impl_from_IFileOperation(iface); ULONG ref = InterlockedIncrement(&operation->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); return ref; } @@ -1845,7 +1845,7 @@ static ULONG WINAPI file_operation_Release(IFileOperation *iface) struct file_operation *operation = impl_from_IFileOperation(iface); ULONG ref = InterlockedDecrement(&operation->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); if (!ref) { @@ -1864,14 +1864,14 @@ static HRESULT WINAPI file_operation_Advise(IFileOperation *iface, IFileOperatio static HRESULT WINAPI file_operation_Unadvise(IFileOperation *iface, DWORD cookie) { - FIXME("(%p, %x): stub.\n", iface, cookie); + FIXME("(%p, %lx): stub.\n", iface, cookie); return E_NOTIMPL; } static HRESULT WINAPI file_operation_SetOperationFlags(IFileOperation *iface, DWORD flags) { - FIXME("(%p, %x): stub.\n", iface, flags); + FIXME("(%p, %lx): stub.\n", iface, flags); return E_NOTIMPL; } @@ -1981,7 +1981,7 @@ static HRESULT WINAPI file_operation_DeleteItems(IFileOperation *iface, IUnknown static HRESULT WINAPI file_operation_NewItem(IFileOperation *iface, IShellItem *folder, DWORD attributes, LPCWSTR name, LPCWSTR template, IFileOperationProgressSink *sink) { - FIXME("(%p, %p, %x, %s, %s, %p): stub.\n", iface, folder, attributes, + FIXME("(%p, %p, %lx, %s, %s, %p): stub.\n", iface, folder, attributes, debugstr_w(name), debugstr_w(template), sink); return E_NOTIMPL; diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index fd05c0f8da8..120376ba82c 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -118,7 +118,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) LPCWSTR pszTail = pszNext; DWORD dwCopy; - TRACE ("(%s %p 0x%08x)\n", debugstr_w(pszNext), pszOut, dwOut); + TRACE ("(%s %p 0x%08lx)\n", debugstr_w(pszNext), pszOut, dwOut); *pszOut = 0; @@ -136,7 +136,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) else pszTail = NULL; - TRACE ("--(%s %s 0x%08x %p)\n", debugstr_w (pszNext), debugstr_w (pszOut), dwOut, pszTail); + TRACE ("--(%s %s 0x%08lx %p)\n", debugstr_w (pszNext), debugstr_w (pszOut), dwOut, pszTail); return pszTail; } @@ -170,7 +170,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, ILFree (*pidlInOut); *pidlInOut = pidlTemp; - TRACE ("-- pidl=%p ret=0x%08x\n", pidlInOut ? *pidlInOut : NULL, hr); + TRACE ("-- pidl=%p ret=0x%08lx\n", pidlInOut ? *pidlInOut : NULL, hr); return hr; } @@ -231,7 +231,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, } ILFree (pidlAbsolute); } - TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); + TRACE ("-- (%p) ret=0x%08lx\n", *ppvOut, hr); return hr; } @@ -308,7 +308,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, const CLSID *clsidChild, IShellFolder_Release (pSF); } - TRACE ("-- returning (%p) 0x%08x\n", *ppvOut, hr); + TRACE ("-- returning (%p) 0x%08lx\n", *ppvOut, hr); return hr; } @@ -333,7 +333,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPITEMIDLIST pidlFirst; HRESULT hr; - TRACE ("(%p)->(pidl=%p 0x%08x %p 0x%08x)\n", psf, pidl, dwFlags, szOut, dwOutLen); + TRACE ("(%p)->(pidl=%p 0x%08lx %p 0x%08lx)\n", psf, pidl, dwFlags, szOut, dwOutLen); pdump (pidl); pidlFirst = ILCloneFirst (pidl); @@ -356,7 +356,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, } else hr = E_OUTOFMEMORY; - TRACE ("-- ret=0x%08x %s\n", hr, debugstr_w(szOut)); + TRACE ("-- ret=0x%08lx %s\n", hr, debugstr_w(szOut)); return hr; } @@ -400,11 +400,11 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO SFGAO_FILESYSTEM | /*0x40000000 */ SFGAO_HASSUBFOLDER; /*0x80000000 */ - TRACE ("0x%08x\n", *pdwAttributes); + TRACE ("0x%08lx\n", *pdwAttributes); if (*pdwAttributes & ~dwSupportedAttr) { - WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + WARN ("attributes 0x%08lx not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); *pdwAttributes &= dwSupportedAttr; } @@ -467,7 +467,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO } else { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; } - TRACE ("-- 0x%08x\n", *pdwAttributes); + TRACE ("-- 0x%08lx\n", *pdwAttributes); return S_OK; } @@ -618,7 +618,7 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY *apidl, DWORD flags ) { - FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); + FIXME("%p %u %p 0x%lx: stub\n", pidlFolder, cidl, apidl, flags); return E_NOTIMPL; } @@ -656,7 +656,7 @@ HRESULT WINAPI SHGetSetFolderCustomSettings( LPSHFOLDERCUSTOMSETTINGS fcs, PCWST } } else - FIXME("%p %s 0x%x: stub\n", fcs, debugstr_w(path), flag); + FIXME("%p %s 0x%lx: stub\n", fcs, debugstr_w(path), flag); return hr; } diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 4f1e56622b0..a71c0f82037 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -78,7 +78,7 @@ static ULONG WINAPI FileSystemBindData_AddRef(IFileSystemBindData *iface) { FileSystemBindData *This = impl_from_IFileSystemBindData(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -87,7 +87,7 @@ static ULONG WINAPI FileSystemBindData_Release(IFileSystemBindData *iface) FileSystemBindData *This = impl_from_IFileSystemBindData(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) heap_free(This); diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 60bb2a058c4..8a8e7127359 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -107,7 +107,7 @@ static LPFMINFO FM_GetMenuInfo(HMENU hmenu) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); return 0; } @@ -170,7 +170,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); return 0; } @@ -280,7 +280,7 @@ HMENU WINAPI FileMenu_Create ( HMENU hMenu = CreatePopupMenu(); - TRACE("0x%08x 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", + TRACE("0x%08lx 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu); menudata = heap_alloc_zero(sizeof(*menudata)); @@ -386,7 +386,7 @@ static BOOL FileMenu_AppendItemW( menudata = (LPFMINFO)MenuInfo.dwMenuData; if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); return FALSE; } @@ -677,7 +677,7 @@ LRESULT WINAPI FileMenu_HandleMenuChar( HMENU hMenu, WPARAM wParam) { - FIXME("%p 0x%08lx\n",hMenu,wParam); + FIXME("%p 0x%08Ix\n",hMenu,wParam); return 0; } @@ -843,7 +843,7 @@ void WINAPI FileMenu_AbortInitMenu (void) */ LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x) { - FIXME("hmenu=%p hwnd=%p 0x%08x 0x%08x stub\n", + FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n", hMenu,hWndParent,w,x); return NULL; /* this is supposed to be a pointer */ } @@ -882,7 +882,7 @@ UINT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAd WCHAR szName[256]; UINT uTemp, uIDMax = uIDAdjust; - TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04x\n", + TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04lx\n", hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags); if (!hmDst || !hmSrc) @@ -1125,7 +1125,7 @@ static HRESULT WINAPI CompositeCMenu_GetCommandString(IContextMenu3* iface, UINT { CompositeCMenu *This = impl_from_IContextMenu3(iface); UINT index = CompositeCMenu_GetIndexForCommandId(This,idCmd); - TRACE("(%p)->(%lx,%x,%p,%s,%u)\n",iface,idCmd,uFlags,pwReserved,pszName,cchMax); + TRACE("(%p)->(%Ix,%x,%p,%s,%u)\n",iface,idCmd,uFlags,pwReserved,pszName,cchMax); return IContextMenu_GetCommandString(This->menus[index],idCmd,uFlags,pwReserved,pszName,cchMax); } @@ -1181,7 +1181,7 @@ static HRESULT WINAPI CompositeCMenu_HandleMenuMsg(IContextMenu3 *iface, UINT uM UINT index; IContextMenu2 *handler; HRESULT hres; - TRACE("(%p)->(%x,%lx,%lx)\n",iface,uMsg,wParam,lParam); + TRACE("(%p)->(%x,%Ix,%Ix)\n",iface,uMsg,wParam,lParam); switch(uMsg) { case WM_INITMENUPOPUP: @@ -1215,7 +1215,7 @@ static HRESULT WINAPI CompositeCMenu_HandleMenuMsg2(IContextMenu3 *iface, UINT u IContextMenu3 *handler; HRESULT hres; LRESULT lres; - TRACE("(%p)->(%x,%lx,%lx,%p)\n",iface,uMsg,wParam,lParam,plResult); + TRACE("(%p)->(%x,%Ix,%Ix,%p)\n",iface,uMsg,wParam,lParam,plResult); if(!plResult) plResult=&lres; switch(uMsg) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8374e9a0fc6..2e557d79622 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -248,7 +248,7 @@ static HRESULT IncludeObject(IShellViewImpl * This, LPCITEMIDLIST pidl) { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView *)&This->IShellView3_iface, pidl); - TRACE("-- returns 0x%08x\n", ret); + TRACE("-- returns 0x%08lx\n", ret); } return ret; @@ -262,7 +262,7 @@ static HRESULT OnDefaultCommand(IShellViewImpl * This) { TRACE("ICommDlgBrowser::OnDefaultCommand\n"); ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView *)&This->IShellView3_iface); - TRACE("-- returns 0x%08x\n", ret); + TRACE("-- returns 0x%08lx\n", ret); } return ret; @@ -276,7 +276,7 @@ static HRESULT OnStateChange(IShellViewImpl * This, UINT change) { TRACE("ICommDlgBrowser::OnStateChange change=%d\n", change); ret = ICommDlgBrowser_OnStateChange(This->pCommDlgBrowser, (IShellView *)&This->IShellView3_iface, change); - TRACE("-- returns 0x%08x\n", ret); + TRACE("-- returns 0x%08lx\n", ret); } return ret; @@ -1268,7 +1268,7 @@ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) */ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dwCmd, HWND hwndCmd) { - TRACE("(%p)->(0x%08x 0x%08x %p) stub\n",This, dwCmdID, dwCmd, hwndCmd); + TRACE("(%p)->(0x%08lx 0x%08lx %p) stub\n",This, dwCmdID, dwCmd, hwndCmd); switch(dwCmdID) { @@ -1308,7 +1308,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw break; default: - TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); + TRACE("-- COMMAND 0x%04lx unhandled\n", dwCmdID); } return 0; } @@ -1645,7 +1645,7 @@ static LRESULT ShellView_OnChange(IShellViewImpl * This, const LPCITEMIDLIST *pi LPCITEMIDLIST pidl; BOOL ret = TRUE; - TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pidls[0], pidls[1], event); + TRACE("(%p)->(%p, %p, 0x%08lx)\n", This, pidls[0], pidls[1], event); switch (event) { @@ -1679,7 +1679,7 @@ static LRESULT CALLBACK ShellView_WndProc(HWND hWnd, UINT uMessage, WPARAM wPara IShellViewImpl * pThis = (IShellViewImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); LPCREATESTRUCTW lpcs; - TRACE("(hwnd=%p msg=%x wparm=%lx lparm=%lx)\n",hWnd, uMessage, wParam, lParam); + TRACE("(hwnd=%p msg=%x wparm=%Ix lparm=%Ix)\n",hWnd, uMessage, wParam, lParam); switch (uMessage) { @@ -1795,7 +1795,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView3 *iface) IShellViewImpl *This = impl_from_IShellView3(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%u)\n", This, refCount - 1); + TRACE("(%p)->(count=%lu)\n", This, refCount - 1); return refCount; } @@ -1807,7 +1807,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView3 *iface) IShellViewImpl *This = impl_from_IShellView3(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%i)\n", This, refCount + 1); + TRACE("(%p)->(count=%li)\n", This, refCount + 1); if (!refCount) { @@ -1867,7 +1867,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView3 *iface, MSG if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message<=WM_KEYLAST)) { - TRACE("-- key=0x04%lx\n",lpmsg->wParam) ; + TRACE("-- key=0x04%Ix\n",lpmsg->wParam) ; } return S_FALSE; /* not handled */ } @@ -2053,7 +2053,7 @@ static HRESULT WINAPI IShellView_fnGetItemObject(IShellView3 *iface, UINT uItem, static HRESULT WINAPI IShellView2_fnGetView(IShellView3 *iface, SHELLVIEWID *view_guid, ULONG view_type) { - FIXME("(%p)->(%s, %#x) stub!\n", iface, debugstr_guid(view_guid), view_type); + FIXME("(%p)->(%s, %#lx) stub!\n", iface, debugstr_guid(view_guid), view_type); return E_NOTIMPL; } @@ -2090,7 +2090,7 @@ static HRESULT WINAPI IShellView3_fnCreateViewWindow3(IShellView3 *iface, IShell HRESULT hr; HWND wnd; - TRACE("(%p)->(%p %p 0x%08x 0x%08x 0x%08x %d %s %s %p)\n", This, owner, prev_view, view_flags, + TRACE("(%p)->(%p %p 0x%08lx 0x%08x 0x%08x %d %s %s %p)\n", This, owner, prev_view, view_flags, mask, flags, mode, debugstr_guid(view_id), wine_dbgstr_rect(rect), hwnd); icex.dwSize = sizeof(icex); @@ -2103,7 +2103,7 @@ static HRESULT WINAPI IShellView3_fnCreateViewWindow3(IShellView3 *iface, IShell return E_UNEXPECTED; if (view_flags != SV3CVW3_DEFAULT) - FIXME("unsupported view flags 0x%08x\n", view_flags); + FIXME("unsupported view flags 0x%08lx\n", view_flags); /* Set up the member variables */ This->pShellBrowser = owner; @@ -2245,14 +2245,14 @@ static HRESULT WINAPI ISVOleCmdTarget_QueryStatus( IShellViewImpl *This = impl_from_IOleCommandTarget(iface); UINT i; - FIXME("(%p)->(%s %d %p %p)\n", + FIXME("(%p)->(%s %ld %p %p)\n", This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) return E_INVALIDARG; for (i = 0; i < cCmds; i++) { - FIXME("\tprgCmds[%d].cmdID = %d\n", i, prgCmds[i].cmdID); + FIXME("\tprgCmds[%d].cmdID = %ld\n", i, prgCmds[i].cmdID); prgCmds[i].cmdf = 0; } return OLECMDERR_E_UNKNOWNGROUP; @@ -2273,7 +2273,7 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec( { IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(%s %d 0x%08x %s %p)\n", + FIXME("(%p)->(%s %ld 0x%08lx %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); if (!pguidCmdGroup) @@ -2626,7 +2626,7 @@ static HRESULT WINAPI ISVViewObject_SetAdvise( IShellViewImpl *This = impl_from_IViewObject(iface); - FIXME("partial stub: %p %08x %08x %p\n", + FIXME("partial stub: %p %08lx %08lx %p\n", This, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ @@ -2852,7 +2852,7 @@ static HRESULT WINAPI FolderView_SelectItem(IFolderView2 *iface, int item, DWORD IShellViewImpl *This = impl_from_IFolderView2(iface); LVITEMW lvItem; - TRACE("(%p)->(%d, %x)\n", This, item, flags); + TRACE("(%p)->(%d, %lx)\n", This, item, flags); lvItem.state = 0; lvItem.stateMask = LVIS_SELECTED; @@ -2883,7 +2883,7 @@ static HRESULT WINAPI FolderView_SelectAndPositionItems(IFolderView2 *iface, UIN PCUITEMID_CHILD_ARRAY apidl, POINT *apt, DWORD flags) { IShellViewImpl *This = impl_from_IFolderView2(iface); - FIXME("(%p)->(%u %p %p %x), stub\n", This, cidl, apidl, apt, flags); + FIXME("(%p)->(%u %p %p %lx), stub\n", This, cidl, apidl, apt, flags); return E_NOTIMPL; } @@ -2943,7 +2943,7 @@ static HRESULT WINAPI FolderView2_SetText(IFolderView2 *iface, FVTEXTTYPE type, static HRESULT WINAPI FolderView2_SetCurrentFolderFlags(IFolderView2 *iface, DWORD mask, DWORD flags) { IShellViewImpl *This = impl_from_IFolderView2(iface); - FIXME("(%p)->(0x%08x 0x%08x), stub\n", This, mask, flags); + FIXME("(%p)->(0x%08lx 0x%08lx), stub\n", This, mask, flags); return E_NOTIMPL; } @@ -3142,7 +3142,7 @@ static ULONG WINAPI IShellFolderView_fnRelease(IShellFolderView *iface) static HRESULT WINAPI IShellFolderView_fnRearrange(IShellFolderView *iface, LPARAM sort) { IShellViewImpl *This = impl_from_IShellFolderView(iface); - FIXME("(%p)->(%ld) stub\n", This, sort); + FIXME("(%p)->(%Id) stub\n", This, sort); return E_NOTIMPL; } @@ -3511,7 +3511,7 @@ static HRESULT WINAPI shellfolderviewdual_GetTypeInfo(IShellFolderViewDual3 *ifa IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); HRESULT hr; - TRACE("(%p,%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p,%u,%ld,%p)\n", This, iTInfo, lcid, ppTInfo); hr = get_typeinfo(IShellFolderViewDual3_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -3527,7 +3527,7 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames( ITypeInfo *ti; HRESULT hr; - TRACE("(%p, %s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + TRACE("(%p, %s, %p, %u, %ld, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); @@ -3545,7 +3545,7 @@ static HRESULT WINAPI shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface, ITypeInfo *ti; HRESULT hr; - TRACE("(%p, %d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + TRACE("(%p, %ld, %s, %ld, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -3674,7 +3674,7 @@ static HRESULT WINAPI shellfolderviewdual_get_FolderFlags(IShellFolderViewDual3 static HRESULT WINAPI shellfolderviewdual_put_FolderFlags(IShellFolderViewDual3 *iface, DWORD flags) { IShellViewImpl *This = impl_from_IShellFolderViewDual3(iface); - FIXME("%p 0x%08x\n", This, flags); + FIXME("%p 0x%08lx\n", This, flags); return E_NOTIMPL; } diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 7a8e69a80aa..176ce6061e6 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -118,7 +118,7 @@ static ULONG WINAPI ContextMenu_AddRef(IContextMenu3 *iface) { ContextMenu *This = impl_from_IContextMenu3(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -127,7 +127,7 @@ static ULONG WINAPI ContextMenu_Release(IContextMenu3 *iface) ContextMenu *This = impl_from_IContextMenu3(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) { @@ -834,7 +834,7 @@ static HRESULT WINAPI ItemMenu_GetCommandString(IContextMenu3 *iface, UINT_PTR c const WCHAR *cmdW = NULL; HRESULT hr = S_OK; - TRACE("(%p)->(%lx, %#x, %p, %p, %u)\n", This, cmdid, flags, reserved, name, maxlen); + TRACE("(%p)->(%Ix, %#x, %p, %p, %u)\n", This, cmdid, flags, reserved, name, maxlen); switch (flags) { @@ -904,7 +904,7 @@ static HRESULT WINAPI ContextMenu_HandleMenuMsg(IContextMenu3 *iface, UINT msg, WPARAM wParam, LPARAM lParam) { ContextMenu *This = impl_from_IContextMenu3(iface); - FIXME("(%p)->(0x%x 0x%lx 0x%lx): stub\n", This, msg, wParam, lParam); + FIXME("(%p)->(0x%x 0x%Ix 0x%Ix): stub\n", This, msg, wParam, lParam); return E_NOTIMPL; } @@ -912,7 +912,7 @@ static HRESULT WINAPI ContextMenu_HandleMenuMsg2(IContextMenu3 *iface, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result) { ContextMenu *This = impl_from_IContextMenu3(iface); - FIXME("(%p)->(0x%x 0x%lx 0x%lx %p): stub\n", This, msg, wParam, lParam, result); + FIXME("(%p)->(0x%x 0x%Ix 0x%Ix %p): stub\n", This, msg, wParam, lParam, result); return E_NOTIMPL; } @@ -1081,7 +1081,7 @@ static HRESULT WINAPI BackgroundMenu_QueryContextMenu( } DestroyMenu(hMyMenu); - TRACE("(%p)->returning 0x%x\n",This,hr); + TRACE("(%p)->returning 0x%lx\n",This,hr); return hr; } @@ -1366,7 +1366,7 @@ static HRESULT WINAPI BackgroundMenu_GetCommandString( const WCHAR *cmdW = NULL; HRESULT hr = E_FAIL; - TRACE("(%p)->(idcom=%lx flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); + TRACE("(%p)->(idcom=%Ix flags=%x %p name=%p len=%x)\n",This, idCommand, uFlags, lpReserved, lpszName, uMaxNameLen); switch (uFlags) { diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 9064e6e7365..6916937c41b 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -76,7 +76,7 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) pnid->cbSize != NOTIFYICONDATAA_V3_SIZE && pnid->cbSize != sizeof(NOTIFYICONDATAA)) { - WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + WARN("Invalid cbSize (%ld) - using only Win95 fields (size=%ld)\n", pnid->cbSize, NOTIFYICONDATAA_V1_SIZE); cbSize = NOTIFYICONDATAA_V1_SIZE; } @@ -130,7 +130,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) struct notify_data *data = &data_buffer; BOOL ret; - TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize); + TRACE("dwMessage = %ld, nid->cbSize=%ld\n", dwMessage, nid->cbSize); /* Validate the cbSize so that WM_COPYDATA doesn't crash the application */ if (nid->cbSize != NOTIFYICONDATAW_V1_SIZE && @@ -140,7 +140,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) { NOTIFYICONDATAW newNid; - WARN("Invalid cbSize (%d) - using only Win95 fields (size=%d)\n", + WARN("Invalid cbSize (%ld) - using only Win95 fields (size=%ld)\n", nid->cbSize, NOTIFYICONDATAW_V1_SIZE); CopyMemory(&newNid, nid, NOTIFYICONDATAW_V1_SIZE); newNid.cbSize = NOTIFYICONDATAW_V1_SIZE;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/shell.dll16/Makefile.in | 1 - dlls/shell.dll16/shell.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell.dll16/Makefile.in b/dlls/shell.dll16/Makefile.in index f781f87b521..dad637e6081 100644 --- a/dlls/shell.dll16/Makefile.in +++ b/dlls/shell.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = shell.dll16 IMPORTS = shell32 user32 gdi32 advapi32 diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index 3e7c32a632d..1b55478be7f 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -470,7 +470,7 @@ DWORD WINAPI DoEnvironmentSubst16(LPSTR str,WORD length) */ static LRESULT WINAPI SHELL_HookProc(INT code, WPARAM wParam, LPARAM lParam) { - TRACE("%i, %lx, %08lx\n", code, wParam, lParam ); + TRACE("%i, %x, %08lx\n", code, wParam, lParam ); if (SHELL_hWnd) { @@ -675,7 +675,7 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cm WORD args[5]; SEGPTR cmdline_seg; - TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", + TRACE( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); cmdline_seg = MapLS( cmdline );
Signed-off-by: Eric Pouech <eric.pouech(a)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 ||
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/snmpapi/Makefile.in | 1 - dlls/snmpapi/main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index ea92b1d6bf3..eaee9374cfe 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = snmpapi.dll IMPORTLIB = snmpapi diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 1fd98c3da8d..7020c606228 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -120,7 +120,7 @@ BOOL WINAPI DllMain( DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p,%d,%p)\n", hInstDLL, fdwReason, lpvReserved); + TRACE("(%p,%ld,%p)\n", hInstDLL, fdwReason, lpvReserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -572,14 +572,14 @@ VOID WINAPI SnmpUtilPrintAsnAny(AsnAny *any) switch (any->asnType) { case ASN_NULL: TRACE("Null value\n"); return; - case ASN_INTEGER32: TRACE("Integer32 %d\n", any->asnValue.number); return; - case ASN_UNSIGNED32: TRACE("Unsigned32 %u\n", any->asnValue.unsigned32); return; - case ASN_COUNTER32: TRACE("Counter32 %u\n", any->asnValue.counter); return; - case ASN_GAUGE32: TRACE("Gauge32 %u\n", any->asnValue.gauge); return; - case ASN_TIMETICKS: TRACE("Timeticks %u\n", any->asnValue.ticks); return; + case ASN_INTEGER32: TRACE("Integer32 %ld\n", any->asnValue.number); return; + case ASN_UNSIGNED32: TRACE("Unsigned32 %lu\n", any->asnValue.unsigned32); return; + case ASN_COUNTER32: TRACE("Counter32 %lu\n", any->asnValue.counter); return; + case ASN_GAUGE32: TRACE("Gauge32 %lu\n", any->asnValue.gauge); return; + case ASN_TIMETICKS: TRACE("Timeticks %lu\n", any->asnValue.ticks); return; case ASN_COUNTER64: { - TRACE("Counter64 %x%08x\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); + TRACE("Counter64 %lx%08lx\n", (DWORD)(any->asnValue.counter64.QuadPart>>32),(DWORD)any->asnValue.counter64.QuadPart); return; } case ASN_OCTETSTRING:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sound.drv16/Makefile.in | 1 - dlls/sound.drv16/sound.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in index 8aa1117c905..8e9b04bfa83 100644 --- a/dlls/sound.drv16/Makefile.in +++ b/dlls/sound.drv16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sound.drv16 EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll diff --git a/dlls/sound.drv16/sound.c b/dlls/sound.drv16/sound.c index 0f1386cf160..f93b96c4fa1 100644 --- a/dlls/sound.drv16/sound.c +++ b/dlls/sound.drv16/sound.c @@ -97,7 +97,7 @@ INT16 WINAPI SetSoundNoise16(INT16 nSource, INT16 nDuration) */ INT16 WINAPI SetVoiceSound16(INT16 nVoice, DWORD lFrequency, INT16 nDuration) { - FIXME("(%d, %d, %d): stub\n",nVoice,lFrequency, nDuration); + FIXME("(%d, %ld, %d): stub\n",nVoice,lFrequency, nDuration); return 0; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/spoolss/Makefile.in | 1 - dlls/spoolss/router.c | 28 ++++++++++++++-------------- dlls/spoolss/spoolss_main.c | 4 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index a9a9ef8b723..d09836cbae6 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 24314b1f23a..4930a7eb18d 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -238,7 +238,7 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) used_backends++; backend[id]->index = used_backends; LeaveCriticalSection(&backend_cs); - TRACE("--> backend #%d: %p (%s)\n", id, backend[id], debugstr_w(dllname)); + TRACE("--> backend #%ld: %p (%s)\n", id, backend[id], debugstr_w(dllname)); return backend[id]; } } @@ -250,7 +250,7 @@ static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot) heap_free(backend[id]); backend[id] = NULL; LeaveCriticalSection(&backend_cs); - WARN("failed to init %s: %u\n", debugstr_w(dllname), GetLastError()); + WARN("failed to init %s: %lu\n", debugstr_w(dllname), GetLastError()); return NULL; } @@ -307,7 +307,7 @@ static backend_t * backend_first(LPWSTR name) } } - FIXME("server %s not supported in %d backends\n", debugstr_w(name), used_backends); + FIXME("server %s not supported in %ld backends\n", debugstr_w(name), used_backends); LeaveCriticalSection(&backend_cs); return NULL; } @@ -335,7 +335,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p)\n", debugstr_w(pName), Level, pMonitors); + TRACE("(%s, %ld, %p)\n", debugstr_w(pName), Level, pMonitors); if (Level != 2) { SetLastError(ERROR_INVALID_LEVEL); @@ -350,7 +350,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DWORD Level, LPBYTE pMonitors) SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -375,7 +375,7 @@ BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, D backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, 0x%x)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); + TRACE("(%s, %ld, %p, 0x%lx)\n", debugstr_w(pName), level, pDriverInfo, dwFileCopyFlags); if (!pDriverInfo) { SetLastError(ERROR_INVALID_PARAMETER); @@ -390,7 +390,7 @@ BOOL WINAPI AddPrinterDriverExW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo, D SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -424,7 +424,7 @@ BOOL WINAPI DeleteMonitorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pMonitorNam SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u\n", res, GetLastError()); + TRACE("got %lu with %lu\n", res, GetLastError()); return (res == ROUTER_SUCCESS); } @@ -452,7 +452,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbB backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pMonitors, + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors, cbBuf, pcbNeeded, pcReturned); if (pcbNeeded) *pcbNeeded = 0; @@ -466,7 +466,7 @@ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbB SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte for %u entries)\n\n", res, GetLastError(), + TRACE("got %lu with %lu (%lu byte for %lu entries)\n\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); return (res == ROUTER_SUCCESS); @@ -496,7 +496,7 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %d, %p, %d, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pPorts, cbBuf, pcbNeeded, pcReturned); if (pcbNeeded) *pcbNeeded = 0; @@ -510,7 +510,7 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte for %u entries)\n", res, GetLastError(), + TRACE("got %lu with %lu (%lu byte for %lu entries)\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0, pcReturned ? *pcReturned : 0); return (res == ROUTER_SUCCESS); @@ -550,7 +550,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, backend_t * pb; DWORD res = ROUTER_UNKNOWN; - TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), + TRACE("(%s, %s, %ld, %p, %ld, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); if (pcbNeeded) *pcbNeeded = 0; @@ -564,7 +564,7 @@ BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, SetLastError(ERROR_PROC_NOT_FOUND); } - TRACE("got %u with %u (%u byte)\n", + TRACE("got %lu with %lu (%lu byte)\n", res, GetLastError(), pcbNeeded ? *pcbNeeded : 0); return (res == ROUTER_SUCCESS); diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index bc02b43ff62..355bf72b822 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -43,7 +43,7 @@ static HMODULE hwinspool; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: { @@ -121,7 +121,7 @@ LPVOID WINAPI DllAllocSplMem(DWORD size) LPVOID res; res = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - TRACE("(%d) => %p\n", size, res); + TRACE("(%ld) => %p\n", size, res); return res; }
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sppc/Makefile.in | 1 - dlls/sppc/sppc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sppc/Makefile.in b/dlls/sppc/Makefile.in index 4d31f9dc923..1cd222f6175 100644 --- a/dlls/sppc/Makefile.in +++ b/dlls/sppc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sppc.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sppc/sppc.c b/dlls/sppc/sppc.c index ce3183f39bd..8819961d7c6 100644 --- a/dlls/sppc/sppc.c +++ b/dlls/sppc/sppc.c @@ -60,7 +60,7 @@ HRESULT WINAPI SLClose(HSLC handle) HRESULT WINAPI SLPersistApplicationPolicies(const SLID *app, const SLID *product, DWORD flags) { - FIXME("(%s,%s,%x) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); + FIXME("(%s,%s,%lx) stub\n", wine_dbgstr_guid(app), wine_dbgstr_guid(product), flags); if (!app) return E_INVALIDARG;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sti/Makefile.in | 1 - dlls/sti/sti.c | 14 +++++++------- dlls/sti/sti_main.c | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index 162205a5bf6..f6e542c64d5 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 0bb60382979..e079b9f2bb8 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -70,7 +70,7 @@ static ULONG WINAPI stillimagew_Release(IStillImageW *iface) static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) { stillimage *This = impl_from_IStillImageW(iface); - TRACE("(%p, %p, 0x%X)\n", This, hinst, dwVersion); + TRACE("(%p, %p, 0x%lX)\n", This, hinst, dwVersion); return S_OK; } @@ -78,7 +78,7 @@ static HRESULT WINAPI stillimagew_GetDeviceList(IStillImageW *iface, DWORD dwTyp DWORD *pdwItemsReturned, LPVOID *ppBuffer) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %u, 0x%X, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); + FIXME("(%p, %lu, 0x%lX, %p, %p): stub\n", This, dwType, dwFlags, pdwItemsReturned, ppBuffer); return E_NOTIMPL; } @@ -94,7 +94,7 @@ static HRESULT WINAPI stillimagew_CreateDevice(IStillImageW *iface, LPWSTR pwszD PSTIDEVICEW *pDevice, LPUNKNOWN pUnkOuter) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %s, %u, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); + FIXME("(%p, %s, %lu, %p, %p): stub\n", This, debugstr_w(pwszDeviceName), dwMode, pDevice, pUnkOuter); return E_NOTIMPL; } @@ -111,7 +111,7 @@ static HRESULT WINAPI stillimagew_SetDeviceValue(IStillImageW *iface, LPWSTR pws DWORD type, LPBYTE pData, DWORD cbData) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %s, %s, %u, %p, %u): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), + FIXME("(%p, %s, %s, %lu, %p, %lu): stub\n", This, debugstr_w(pwszDeviceName), debugstr_w(pValueName), type, pData, cbData); return E_NOTIMPL; } @@ -223,7 +223,7 @@ static HRESULT WINAPI stillimagew_SetupDeviceParameters(IStillImageW *iface, PST static HRESULT WINAPI stillimagew_WriteToErrorLog(IStillImageW *iface, DWORD dwMessageType, LPCWSTR pszMessage) { stillimage *This = impl_from_IStillImageW(iface); - FIXME("(%p, %u, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); + FIXME("(%p, %lu, %s): stub\n", This, dwMessageType, debugstr_w(pszMessage)); return E_NOTIMPL; } @@ -307,7 +307,7 @@ static const struct IUnknownVtbl internal_unk_vtbl = */ HRESULT WINAPI StiCreateInstanceA(HINSTANCE hinst, DWORD dwVer, PSTIA *ppSti, LPUNKNOWN pUnkOuter) { - FIXME("(%p, %u, %p, %p): stub, unimplemented on Windows Vista too, please report if it's needed\n", hinst, dwVer, ppSti, pUnkOuter); + FIXME("(%p, %lu, %p, %p): stub, unimplemented on Windows Vista too, please report if it's needed\n", hinst, dwVer, ppSti, pUnkOuter); return STG_E_UNIMPLEMENTEDFUNCTION; } @@ -319,7 +319,7 @@ HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LP stillimage *This; HRESULT hr; - TRACE("(%p, %u, %p, %p)\n", hinst, dwVer, ppSti, pUnkOuter); + TRACE("(%p, %lu, %p, %p)\n", hinst, dwVer, ppSti, pUnkOuter); This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(stillimage)); if (This) diff --git a/dlls/sti/sti_main.c b/dlls/sti/sti_main.c index 61118e910b6..4ae8a337f8a 100644 --- a/dlls/sti/sti_main.c +++ b/dlls/sti/sti_main.c @@ -135,7 +135,7 @@ static sti_cf the_sti_cf = { { &sti_cf_vtbl }, sti_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n",hInstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %ld, %p)\n",hInstDLL,fdwReason,lpvReserved); return STI_DllMain(hInstDLL, fdwReason, lpvReserved); }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/storage.dll16/Makefile.in | 1 - dlls/storage.dll16/storage.c | 58 ++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in index 69a06475c55..f390aca7dd9 100644 --- a/dlls/storage.dll16/Makefile.in +++ b/dlls/storage.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = storage.dll16 IMPORTS = uuid ole32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 1bcc72065ce..d2f91a77b46 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -345,12 +345,12 @@ STORAGE_get_big_block(stream_access16 *str,int n,BYTE *block) if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL, SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError()) { - WARN("(%p,%d,%p), seek failed (%d)\n",str->hf, n, block, GetLastError()); + WARN("(%p,%d,%p), seek failed (%ld)\n",str->hf, n, block, GetLastError()); return FALSE; } if (!ReadFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) { - WARN("(hf=%p, block size %d): read didn't read (%d)\n",str->hf,n,GetLastError()); + WARN("(hf=%p, block size %d): read didn't read (%ld)\n",str->hf,n,GetLastError()); return FALSE; } } else { @@ -374,7 +374,7 @@ STORAGE_get_big_block(stream_access16 *str,int n,BYTE *block) (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres); return FALSE; } memcpy(block, MapSL(args[3]), BIGSIZE); @@ -406,7 +406,7 @@ _ilockbytes16_writeat(SEGPTR lockbytes, DWORD offset, DWORD length, void *buffer (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::WriteAt() failed, hres %lx\n",hres); return FALSE; } UnMapLS(args[3]); @@ -426,12 +426,12 @@ STORAGE_put_big_block(stream_access16 *str,int n,BYTE *block) if ((SetFilePointer( str->hf, (n+1)*BIGSIZE, NULL, SEEK_SET ) == INVALID_SET_FILE_POINTER) && GetLastError()) { - WARN("seek failed (%d)\n",GetLastError()); + WARN("seek failed (%ld)\n",GetLastError()); return FALSE; } if (!WriteFile( str->hf, block, BIGSIZE, &result, NULL ) || result != BIGSIZE) { - WARN(" write failed (%d)\n",GetLastError()); + WARN(" write failed (%ld)\n",GetLastError()); return FALSE; } return TRUE; @@ -710,9 +710,9 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { return; TRACE("name: %s\n",name); TRACE("type: %d\n",stde->pps_type); - TRACE("prev pps: %d\n",stde->pps_prev); - TRACE("next pps: %d\n",stde->pps_next); - TRACE("dir pps: %d\n",stde->pps_dir); + TRACE("prev pps: %ld\n",stde->pps_prev); + TRACE("next pps: %ld\n",stde->pps_next); + TRACE("dir pps: %ld\n",stde->pps_dir); TRACE("guid: %s\n",debugstr_guid(&(stde->pps_guid))); if (stde->pps_type !=2) { time_t t; @@ -724,8 +724,8 @@ STORAGE_dump_pps_entry(struct storage_pps_entry *stde) { t = dw; TRACE("ts2: %s\n",ctime(&t)); } - TRACE("startblock: %d\n",stde->pps_sb); - TRACE("size: %d\n",stde->pps_size); + TRACE("startblock: %ld\n",stde->pps_sb); + TRACE("size: %ld\n",stde->pps_size); } /****************************************************************************** @@ -1102,7 +1102,7 @@ _ilockbytes16_addref(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::AddRef() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::AddRef() failed, hres %lx\n",hres); } static void @@ -1120,7 +1120,7 @@ _ilockbytes16_release(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::Release() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::Release() failed, hres %lx\n",hres); } static void @@ -1138,7 +1138,7 @@ _ilockbytes16_flush(SEGPTR lockbytes) { (LPVOID)args, (LPDWORD)&hres )) - ERR("CallTo16 ILockBytes16::Flush() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::Flush() failed, hres %lx\n",hres); } /****************************************************************************** @@ -1176,7 +1176,7 @@ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whe ULARGE_INTEGER *newpos) { IStream16Impl *This = impl_from_IStream16(iface); - TRACE_(relay)("(%p)->([%d.%d],%d,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); + TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); switch (whence) { case STREAM_SEEK_SET: @@ -1213,7 +1213,7 @@ HRESULT CDECL IStream16_fnRead(IStream16 *iface, void *pv, ULONG cb, ULONG *pcbR int blocknr; LPBYTE pbv = pv; - TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbRead); + TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbRead); if (!pcbRead) bytesread=&xxread; *bytesread = 0; @@ -1277,7 +1277,7 @@ HRESULT CDECL IStream16_fnWrite(IStream16 *iface, const void *pv, ULONG cb, ULON if (!pcbWrite) byteswritten=&xxwritten; *byteswritten = 0; - TRACE_(relay)("(%p)->(%p,%d,%p)\n",This,pv,cb,pcbWrite); + TRACE_(relay)("(%p)->(%p,%ld,%p)\n",This,pv,cb,pcbWrite); /* do we need to junk some blocks? */ newsize = This->offset.u.LowPart+cb; oldsize = This->stde.pps_size; @@ -1647,7 +1647,7 @@ HRESULT CDECL IStorage16_fnStat(IStorage16 *iface, STATSTG16 *pstatstg, DWORD gr DWORD len = WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, NULL, 0, NULL, NULL ); LPSTR nameA = HeapAlloc( GetProcessHeap(), 0, len ); - TRACE("(%p)->(%p,0x%08x)\n", + TRACE("(%p)->(%p,0x%08lx)\n", This,pstatstg,grfStatFlag ); WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, nameA, len, NULL, NULL ); @@ -1671,7 +1671,7 @@ HRESULT CDECL IStorage16_fnStat(IStorage16 *iface, STATSTG16 *pstatstg, DWORD gr HRESULT CDECL IStorage16_fnCommit(IStorage16 *iface, DWORD commitflags) { IStorage16Impl *This = impl_from_IStorage16(iface); - FIXME("(%p)->(0x%08x),STUB!\n", + FIXME("(%p)->(0x%08lx),STUB!\n", This,commitflags ); return S_OK; @@ -1684,7 +1684,7 @@ HRESULT CDECL IStorage16_fnCopyTo(IStorage16 *iface, DWORD ciidExclude, const II SNB16 SNB16Exclude, IStorage16 *pstgDest) { IStorage16Impl *This = impl_from_IStorage16(iface); - FIXME("IStorage16(%p)->(0x%08x,%s,%p,%p),stub!\n", + FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n", This,ciidExclude,debugstr_guid(rgiidExclude),SNB16Exclude,pstgDest ); return S_OK; @@ -1706,7 +1706,7 @@ HRESULT CDECL IStorage16_fnCreateStorage(IStorage16 *iface, LPCOLESTR16 pwcsName int nPPSEntries; READ_HEADER(&This->str); - TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n", This,pwcsName,grfMode,dwStgFormat,reserved2,ppstg ); if (grfMode & STGM_TRANSACTED) @@ -1773,7 +1773,7 @@ HRESULT CDECL IStorage16_fnCreateStream(IStorage16 *iface, LPCOLESTR16 pwcsName, BOOL ret; int nPPSEntries; - TRACE("(%p)->(%s,0x%08x,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,0x%08lx,0x%08lx,0x%08lx,%p)\n", This,pwcsName,grfMode,reserved1,reserved2,ppstm ); if (grfMode & STGM_TRANSACTED) @@ -1835,7 +1835,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, WCHAR name[33]; int newpps; - TRACE("(%p)->(%s,%p,0x%08x,%p,0x%08x,%p)\n", + TRACE("(%p)->(%s,%p,0x%08lx,%p,0x%08lx,%p)\n", This,pwcsName,pstgPrio,grfMode,snbExclude,reserved,ppstg ); if (grfMode & STGM_TRANSACTED) @@ -1877,7 +1877,7 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v WCHAR name[33]; int newpps; - TRACE("(%p)->(%s,%p,0x%08x,0x%08x,%p)\n", + TRACE("(%p)->(%s,%p,0x%08lx,0x%08lx,%p)\n", This,pwcsName,reserved1,grfMode,reserved2,ppstm ); if (grfMode & STGM_TRANSACTED) @@ -1990,13 +1990,13 @@ HRESULT WINAPI StgCreateDocFile16( IStorage16Impl* lpstg; struct storage_pps_entry stde; - TRACE("(%s,0x%08x,0x%08x,%p)\n", + TRACE("(%s,0x%08lx,0x%08lx,%p)\n", pwcsName,grfMode,reserved,ppstgOpen ); _create_istorage16(ppstgOpen); hf = CreateFileA(pwcsName,GENERIC_READ|GENERIC_WRITE,0,NULL,CREATE_NEW,0,0); if (hf==INVALID_HANDLE_VALUE) { - WARN("couldn't open file for storage:%d\n",GetLastError()); + WARN("couldn't open file for storage:%ld\n",GetLastError()); return E_FAIL; } lpstg = MapSL((SEGPTR)*ppstgOpen); @@ -2051,7 +2051,7 @@ HRESULT WINAPI StgOpenStorage16( IStorage16Impl* lpstg; struct storage_pps_entry stde; - TRACE("(%s,%p,0x%08x,%p,%d,%p)\n", + TRACE("(%s,%p,0x%08lx,%p,%ld,%p)\n", pwcsName,pstgPriority,grfMode,snbExclude,reserved,ppstgOpen ); _create_istorage16(ppstgOpen); @@ -2106,7 +2106,7 @@ HRESULT WINAPI StgIsStorageILockBytes16(SEGPTR plkbyt) (LPVOID)args, (LPDWORD)&hres )) { - ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %x\n",hres); + ERR("CallTo16 ILockBytes16::ReadAt() failed, hres %lx\n",hres); return hres; } if (memcmp(MapSL(args[3]), STORAGE_magic, sizeof(STORAGE_magic)) == 0) { @@ -2135,7 +2135,7 @@ HRESULT WINAPI StgOpenStorageOnILockBytes16( int i,ret; struct storage_pps_entry stde; - FIXME("(%x, %p, 0x%08x, %d, %x, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen); + FIXME("(%lx, %p, 0x%08lx, %d, %lx, %p)\n", plkbyt, pstgPriority, grfMode, (int)snbExclude, reserved, ppstgOpen); if ((plkbyt == 0) || (ppstgOpen == 0)) return STG_E_INVALIDPOINTER;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/stress.dll16/Makefile.in | 1 - dlls/stress.dll16/stress.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/stress.dll16/Makefile.in b/dlls/stress.dll16/Makefile.in index 76731e716d6..0c93384c33e 100644 --- a/dlls/stress.dll16/Makefile.in +++ b/dlls/stress.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = stress.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/stress.dll16/stress.c b/dlls/stress.dll16/stress.c index be292d9d58a..f3c845b988c 100644 --- a/dlls/stress.dll16/stress.c +++ b/dlls/stress.dll16/stress.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(stress); */ INT16 WINAPI AllocDiskSpace(LONG lLeft, UINT16 uDrive) { - FIXME("(%d, %d) - stub\n", + FIXME("(%d, %ld) - stub\n", uDrive, lLeft); return 1; @@ -62,7 +62,7 @@ BOOL16 WINAPI AllocGDIMem(UINT16 uLeft) */ BOOL16 WINAPI AllocMem(DWORD dwLeft) { - FIXME("(%d) - stub\n", dwLeft); + FIXME("(%ld) - stub\n", dwLeft); return TRUE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sxs/Makefile.in | 1 - dlls/sxs/cache.c | 22 +++++++++++----------- dlls/sxs/name.c | 12 ++++++------ dlls/sxs/sxs.c | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 27a5c58bdd0..867ea270f3d 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sxs.dll IMPORTS = oleaut32 ole32 IMPORTLIB = sxs diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index e4fdda8c860..02403501231 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -203,7 +203,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( unsigned int len; HRESULT hr; - TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(assembly_name), info); if (flags || (info && info->cbAssemblyInfo != sizeof(*info))) return E_INVALIDARG; @@ -272,7 +272,7 @@ static HRESULT WINAPI cache_CreateAssemblyCacheItem( IAssemblyCacheItem **item, LPCWSTR name ) { - FIXME("%p, 0x%08x, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); + FIXME("%p, 0x%08lx, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); return E_NOTIMPL; } @@ -363,7 +363,7 @@ static HRESULT parse_files( IXMLDOMDocument *doc, struct assembly *assembly ) hr = IXMLDOMNodeList_get_length( list, &len ); if (hr != S_OK) goto done; - TRACE("found %d files\n", len); + TRACE("found %ld files\n", len); if (!len) { hr = ERROR_SXS_MANIFEST_FORMAT_ERROR; @@ -530,7 +530,7 @@ static HRESULT install_policy( const WCHAR *manifest, struct assembly *assembly if (!ret) { HRESULT hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy policy manifest file 0x%08x\n", hr); + WARN("failed to copy policy manifest file 0x%08lx\n", hr); return hr; } return S_OK; @@ -619,7 +619,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy manifest file 0x%08x\n", hr); + WARN("failed to copy manifest file 0x%08lx\n", hr); return hr; } @@ -652,7 +652,7 @@ static HRESULT install_assembly( const WCHAR *manifest, struct assembly *assembl if (!ret) { hr = HRESULT_FROM_WIN32( GetLastError() ); - WARN("failed to copy file 0x%08x\n", hr); + WARN("failed to copy file 0x%08lx\n", hr); goto done; } } @@ -674,7 +674,7 @@ static HRESULT WINAPI cache_InstallAssembly( IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; - TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + TRACE("%p, 0x%08lx, %s, %p\n", iface, flags, debugstr_w(path), ref); cache_lock( cache ); init = CoInitialize( NULL ); @@ -724,7 +724,7 @@ static HRESULT uninstall_assembly( struct assembly *assembly ) lstrcatW( filename, backslashW ); lstrcatW( filename, file->name ); - if (!DeleteFileW( filename )) WARN( "failed to delete file %u\n", GetLastError() ); + if (!DeleteFileW( filename )) WARN( "failed to delete file %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, filename ); } RemoveDirectoryW( dirname ); @@ -751,7 +751,7 @@ static HRESULT WINAPI cache_UninstallAssembly( const WCHAR *arch, *name, *token, *type, *version; WCHAR *p, *path = NULL; - TRACE("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); + TRACE("%p, 0x%08lx, %s, %p, %p\n", iface, flags, debugstr_w(assembly_name), ref, disp); if (ref) { @@ -790,7 +790,7 @@ static HRESULT WINAPI cache_UninstallAssembly( if ((hr = load_manifest( doc, path )) != S_OK) goto done; if ((hr = parse_assembly( doc, &assembly )) != S_OK) goto done; - if (!DeleteFileW( path )) WARN( "unable to remove manifest file %u\n", GetLastError() ); + if (!DeleteFileW( path )) WARN( "unable to remove manifest file %lu\n", GetLastError() ); else if ((p = wcsrchr( path, '\\' ))) { *p = 0; @@ -827,7 +827,7 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) { struct cache *cache; - TRACE("%p, %u\n", obj, reserved); + TRACE("%p, %lu\n", obj, reserved); if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 0fab45c5018..29368b6d788 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -104,7 +104,7 @@ static HRESULT WINAPI name_SetProperty( LPVOID property, DWORD size ) { - FIXME("%p, %d, %p, %d\n", iface, id, property, size); + FIXME("%p, %ld, %p, %ld\n", iface, id, property, size); return E_NOTIMPL; } @@ -114,7 +114,7 @@ static HRESULT WINAPI name_GetProperty( LPVOID buffer, LPDWORD buflen ) { - FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + FIXME("%p, %ld, %p, %p\n", iface, id, buffer, buflen); return E_NOTIMPL; } @@ -135,7 +135,7 @@ static HRESULT WINAPI name_GetDisplayName( struct name *name = impl_from_IAssemblyName( iface ); unsigned int len; - TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + TRACE("%p, %p, %p, 0x%08lx\n", iface, buffer, buflen, flags); if (!buflen || flags) return E_INVALIDARG; @@ -169,7 +169,7 @@ static HRESULT WINAPI name_Reserved( DWORD cbReserved, LPVOID *ppReserved ) { - FIXME("%p, %s, %p, %p, %s, %s, %p, %d, %p\n", iface, + FIXME("%p, %s, %p, %p, %s, %s, %p, %ld, %p\n", iface, debugstr_guid(riid), pUnkReserved1, pUnkReserved2, debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); @@ -262,7 +262,7 @@ static HRESULT WINAPI name_IsEqual( IAssemblyName *name2, DWORD flags ) { - FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + FIXME("%p, %p, 0x%08lx\n", name1, name2, flags); return E_NOTIMPL; } @@ -368,7 +368,7 @@ HRESULT WINAPI CreateAssemblyNameObject( struct name *name; HRESULT hr; - TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + TRACE("%p, %s, 0x%08lx, %p\n", obj, debugstr_w(assembly), flags, reserved); if (!obj) return E_INVALIDARG; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 2fa4dc0262b..934aa9345c8 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -104,7 +104,7 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff char *ret_strings; ULONG_PTR cookie; - TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, + TRACE("%#lx, %s, %p, %p, %Ix, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/tapi32/Makefile.in | 1 dlls/tapi32/line.c | 148 ++++++++++++++++++++++++----------------------- dlls/tapi32/phone.c | 38 ++++++------ 3 files changed, 93 insertions(+), 94 deletions(-) diff --git a/dlls/tapi32/Makefile.in b/dlls/tapi32/Makefile.in index 51af8215c28..e8c5e58cee0 100644 --- a/dlls/tapi32/Makefile.in +++ b/dlls/tapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = tapi32.dll IMPORTLIB = tapi32 IMPORTS = advapi32 diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 0df9746084b..e7b021c8e68 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -49,7 +49,7 @@ static const char szCardsKey[] = */ DWORD WINAPI lineAccept(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) { - FIXME("(%p, %s, %d): stub.\n", hCall, lpsUserUserInfo, dwSize); + FIXME("(%p, %s, %ld): stub.\n", hCall, lpsUserUserInfo, dwSize); return 1; } @@ -85,7 +85,7 @@ DWORD WINAPI lineAddToConference(HCALL hConfCall, HCALL hConsultCall) */ DWORD WINAPI lineAnswer(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) { - FIXME("(%p, %s, %d): stub.\n", hCall, lpsUserUserInfo, dwSize); + FIXME("(%p, %s, %ld): stub.\n", hCall, lpsUserUserInfo, dwSize); return 1; } @@ -94,7 +94,7 @@ DWORD WINAPI lineAnswer(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) */ DWORD WINAPI lineBlindTransferA(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode) { - FIXME("(%p, %s, %08x): stub.\n", hCall, lpszDestAddress, dwCountryCode); + FIXME("(%p, %s, %08lx): stub.\n", hCall, lpszDestAddress, dwCountryCode); return 1; } @@ -112,7 +112,7 @@ DWORD WINAPI lineClose(HLINE hLine) */ DWORD WINAPI lineCompleteCall(HCALL hCall, LPDWORD lpdwCompletionID, DWORD dwCompletionMode, DWORD dwMessageID) { - FIXME("(%p, %p, %08x, %08x): stub.\n", hCall, lpdwCompletionID, dwCompletionMode, dwMessageID); + FIXME("(%p, %p, %08lx, %08lx): stub.\n", hCall, lpdwCompletionID, dwCompletionMode, dwMessageID); return 1; } @@ -121,7 +121,7 @@ DWORD WINAPI lineCompleteCall(HCALL hCall, LPDWORD lpdwCompletionID, DWORD dwCom */ DWORD WINAPI lineCompleteTransfer(HCALL hCall, HCALL hConsultCall, LPHCALL lphConfCall, DWORD dwTransferMode) { - FIXME("(%p, %p, %p, %08x): stub.\n", hCall, hConsultCall, lphConfCall, dwTransferMode); + FIXME("(%p, %p, %p, %08lx): stub.\n", hCall, hConsultCall, lphConfCall, dwTransferMode); return 1; } @@ -130,7 +130,7 @@ DWORD WINAPI lineCompleteTransfer(HCALL hCall, HCALL hConsultCall, LPHCALL lphCo */ DWORD WINAPI lineConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass) { - FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass); + FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass); return 0; } @@ -139,7 +139,7 @@ DWORD WINAPI lineConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDevi */ DWORD WINAPI lineConfigDialogW(DWORD dwDeviceID, HWND hwndOwner, LPCWSTR lpszDeviceClass) { - FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, hwndOwner, debugstr_w(lpszDeviceClass)); + FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, hwndOwner, debugstr_w(lpszDeviceClass)); return 0; } @@ -157,7 +157,7 @@ DWORD WINAPI lineConfigDialogEditA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpsz */ DWORD WINAPI lineConfigProvider(HWND hwndOwner, DWORD dwPermanentProviderID) { - FIXME("(%p, %08x): stub.\n", hwndOwner, dwPermanentProviderID); + FIXME("(%p, %08lx): stub.\n", hwndOwner, dwPermanentProviderID); return 0; } @@ -175,7 +175,7 @@ DWORD WINAPI lineDeallocateCall(HCALL hCall) */ DWORD WINAPI lineDevSpecific(HLINE hLine, DWORD dwAddressId, HCALL hCall, LPVOID lpParams, DWORD dwSize) { - FIXME("(%p, %08x, %p, %p, %d): stub.\n", hLine, dwAddressId, hCall, lpParams, dwSize); + FIXME("(%p, %08lx, %p, %p, %ld): stub.\n", hLine, dwAddressId, hCall, lpParams, dwSize); return 1; } @@ -184,7 +184,7 @@ DWORD WINAPI lineDevSpecific(HLINE hLine, DWORD dwAddressId, HCALL hCall, LPVOID */ DWORD WINAPI lineDevSpecificFeature(HLINE hLine, DWORD dwFeature, LPVOID lpParams, DWORD dwSize) { - FIXME("(%p, %08x, %p, %d): stub.\n", hLine, dwFeature, lpParams, dwSize); + FIXME("(%p, %08lx, %p, %ld): stub.\n", hLine, dwFeature, lpParams, dwSize); return 1; } @@ -193,7 +193,7 @@ DWORD WINAPI lineDevSpecificFeature(HLINE hLine, DWORD dwFeature, LPVOID lpParam */ DWORD WINAPI lineDialA(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode) { - FIXME("(%p, %s, %08x): stub.\n", hCall, lpszDestAddress, dwCountryCode); + FIXME("(%p, %s, %08lx): stub.\n", hCall, lpszDestAddress, dwCountryCode); return 1; } @@ -202,7 +202,7 @@ DWORD WINAPI lineDialA(HCALL hCall, LPCSTR lpszDestAddress, DWORD dwCountryCode) */ DWORD WINAPI lineDialW(HCALL hCall, LPCWSTR lpszDestAddress, DWORD dwCountryCode) { - FIXME("(%p, %s, %08x): stub.\n", hCall, debugstr_w(lpszDestAddress), dwCountryCode); + FIXME("(%p, %s, %08lx): stub.\n", hCall, debugstr_w(lpszDestAddress), dwCountryCode); return 1; } @@ -211,7 +211,7 @@ DWORD WINAPI lineDialW(HCALL hCall, LPCWSTR lpszDestAddress, DWORD dwCountryCode */ DWORD WINAPI lineDrop(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) { - FIXME("(%p, %s, %08x): stub.\n", hCall, lpsUserUserInfo, dwSize); + FIXME("(%p, %s, %08lx): stub.\n", hCall, lpsUserUserInfo, dwSize); return 1; } @@ -238,7 +238,7 @@ DWORD WINAPI lineGatherDigitsA(HCALL hCall, DWORD dwDigitModes, LPSTR lpsDigits, */ DWORD WINAPI lineGenerateDigitsA(HCALL hCall, DWORD dwDigitModes, LPCSTR lpszDigits, DWORD dwDuration) { - FIXME("(%p, %08x, %s, %d): stub.\n", hCall, dwDigitModes, lpszDigits, dwDuration); + FIXME("(%p, %08lx, %s, %ld): stub.\n", hCall, dwDigitModes, lpszDigits, dwDuration); return 0; } @@ -247,7 +247,7 @@ DWORD WINAPI lineGenerateDigitsA(HCALL hCall, DWORD dwDigitModes, LPCSTR lpszDig */ DWORD WINAPI lineGenerateTone(HCALL hCall, DWORD dwToneMode, DWORD dwDuration, DWORD dwNumTones, LPLINEGENERATETONE lpTones) { - FIXME("(%p, %08x, %d, %d, %p): stub.\n", hCall, dwToneMode, dwDuration, dwNumTones, lpTones); + FIXME("(%p, %08lx, %ld, %ld, %p): stub.\n", hCall, dwToneMode, dwDuration, dwNumTones, lpTones); return 0; } @@ -256,7 +256,7 @@ DWORD WINAPI lineGenerateTone(HCALL hCall, DWORD dwToneMode, DWORD dwDuration, D */ DWORD WINAPI lineGetAddressCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAddressID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEADDRESSCAPS lpAddressCaps) { - FIXME("(%p, %08x, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAddressID, dwAPIVersion, dwExtVersion, lpAddressCaps); + FIXME("(%p, %08lx, %08lx, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAddressID, dwAPIVersion, dwExtVersion, lpAddressCaps); return 0; } @@ -265,7 +265,7 @@ DWORD WINAPI lineGetAddressCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAd */ DWORD WINAPI lineGetAddressIDA(HLINE hLine, LPDWORD lpdwAddressID, DWORD dwAddressMode, LPCSTR lpsAddress, DWORD dwSize) { - FIXME("%p, %p, %08x, %s, %d): stub.\n", hLine, lpdwAddressID, dwAddressMode, lpsAddress, dwSize); + FIXME("%p, %p, %08lx, %s, %ld): stub.\n", hLine, lpdwAddressID, dwAddressMode, lpsAddress, dwSize); return 0; } @@ -274,7 +274,7 @@ DWORD WINAPI lineGetAddressIDA(HLINE hLine, LPDWORD lpdwAddressID, DWORD dwAddre */ DWORD WINAPI lineGetAddressStatusA(HLINE hLine, DWORD dwAddressID, LPLINEADDRESSSTATUS lpAddressStatus) { - FIXME("(%p, %08x, %p): stub.\n", hLine, dwAddressID, lpAddressStatus); + FIXME("(%p, %08lx, %p): stub.\n", hLine, dwAddressID, lpAddressStatus); return 0; } @@ -283,7 +283,7 @@ DWORD WINAPI lineGetAddressStatusA(HLINE hLine, DWORD dwAddressID, LPLINEADDRESS */ DWORD WINAPI lineGetAppPriorityA(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLINEEXTENSIONID const lpExtensionID, DWORD dwRequestMode, LPVARSTRING lpExtensionName, LPDWORD lpdwPriority) { - FIXME("(%s, %08x, %p, %08x, %p, %p): stub.\n", lpszAppFilename, dwMediaMode, lpExtensionID, dwRequestMode, lpExtensionName, lpdwPriority); + FIXME("(%s, %08lx, %p, %08lx, %p, %p): stub.\n", lpszAppFilename, dwMediaMode, lpExtensionID, dwRequestMode, lpExtensionName, lpdwPriority); return 0; } @@ -325,12 +325,12 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR char *subkey_name; if(!lpLineCountryList) { - TRACE("(%08x, %08x, %p): stub. Returning LINEERR_INVALPOINTER\n", + TRACE("(%08lx, %08lx, %p): stub. Returning LINEERR_INVALPOINTER\n", dwCountryID, dwAPIVersion, lpLineCountryList); return LINEERR_INVALPOINTER; } - TRACE("(%08x, %08x, %p(%d)): stub.\n", + TRACE("(%08lx, %08lx, %p(%ld)): stub.\n", dwCountryID, dwAPIVersion, lpLineCountryList, lpLineCountryList->dwTotalSize); @@ -466,7 +466,7 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR lpLineCountryList->dwNeededSize = dwOffset; - TRACE("%d available %d required\n", dwAvailSize, dwOffset); + TRACE("%ld available %ld required\n", dwAvailSize, dwOffset); HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); @@ -499,7 +499,7 @@ DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) HKEY hkey; if (!list) return LINEERR_INVALPOINTER; - TRACE("(%08x, %08x, %p(%d))\n", id, version, list, list->dwTotalSize); + TRACE("(%08lx, %08lx, %p(%ld))\n", id, version, list, list->dwTotalSize); if (RegOpenKeyW(HKEY_LOCAL_MACHINE, country_listW, &hkey) != ERROR_SUCCESS) return LINEERR_INIFILECORRUPT; @@ -603,7 +603,7 @@ DWORD WINAPI lineGetCountryW(DWORD id, DWORD version, LPLINECOUNTRYLIST list) } list->dwNeededSize = offset; - TRACE("%d available %d required\n", total_size, offset); + TRACE("%ld available %ld required\n", total_size, offset); HeapFree(GetProcessHeap(), 0, subkey_name); RegCloseKey(hkey); @@ -619,7 +619,7 @@ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVer static int warn_once; if(!warn_once++) - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + FIXME("(%p, %08lx, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -633,7 +633,7 @@ DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVer static int warn_once; if(!warn_once++) - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + FIXME("(%p, %08lx, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -643,7 +643,7 @@ DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVer */ DWORD WINAPI lineGetDevConfigA(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPCSTR lpszDeviceClass) { - FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, lpDeviceConfig, lpszDeviceClass); + FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, lpDeviceConfig, lpszDeviceClass); return 0; } @@ -653,7 +653,7 @@ DWORD WINAPI lineGetDevConfigA(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPC DWORD WINAPI lineGetIDW(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, LPVARSTRING lpDeviceID, LPCWSTR lpszDeviceClass) { - FIXME("(%p, %08x, %p, %08x, %p, %s): stub.\n", hLine, dwAddressID, hCall, + FIXME("(%p, %08lx, %p, %08lx, %p, %s): stub.\n", hLine, dwAddressID, hCall, dwSelect, lpDeviceID, debugstr_w(lpszDeviceClass)); return LINEERR_OPERATIONFAILED; @@ -665,7 +665,7 @@ DWORD WINAPI lineGetIDW(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSel DWORD WINAPI lineGetIDA(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, LPVARSTRING lpDeviceID, LPCSTR lpszDeviceClass) { - FIXME("(%p, %08x, %p, %08x, %p, %s): stub.\n", hLine, dwAddressID, hCall, + FIXME("(%p, %08lx, %p, %08lx, %p, %s): stub.\n", hLine, dwAddressID, hCall, dwSelect, lpDeviceID, lpszDeviceClass); return LINEERR_OPERATIONFAILED; } @@ -675,7 +675,7 @@ DWORD WINAPI lineGetIDA(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSel */ DWORD WINAPI lineGetIconA(DWORD dwDeviceID, LPCSTR lpszDeviceClass, HICON *lphIcon) { - FIXME("(%08x, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon); + FIXME("(%08lx, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon); return 0; } @@ -693,7 +693,7 @@ DWORD WINAPI lineGetLineDevStatusA(HLINE hLine, LPLINEDEVSTATUS lpLineDevStatus) */ DWORD WINAPI lineGetMessage(HLINEAPP hLineApp, LPLINEMESSAGE lpMessage, DWORD dwTimeout) { - FIXME("(%p, %p, %08x): stub.\n", hLineApp, lpMessage, dwTimeout); + FIXME("(%p, %p, %08lx): stub.\n", hLineApp, lpMessage, dwTimeout); return 0; } @@ -702,7 +702,7 @@ DWORD WINAPI lineGetMessage(HLINEAPP hLineApp, LPLINEMESSAGE lpMessage, DWORD dw */ DWORD WINAPI lineGetNewCalls(HLINE hLine, DWORD dwAddressID, DWORD dwSelect, LPLINECALLLIST lpCallList) { - FIXME("(%p, %08x, %08x, %p): stub.\n", hLine, dwAddressID, dwSelect, lpCallList); + FIXME("(%p, %08lx, %08lx, %p): stub.\n", hLine, dwAddressID, dwSelect, lpCallList); return 0; } @@ -711,7 +711,7 @@ DWORD WINAPI lineGetNewCalls(HLINE hLine, DWORD dwAddressID, DWORD dwSelect, LPL */ DWORD WINAPI lineGetNumRings(HLINE hLine, DWORD dwAddressID, LPDWORD lpdwNumRings) { - FIXME("(%p, %08x, %p): stub.\n", hLine, dwAddressID, lpdwNumRings); + FIXME("(%p, %08lx, %p): stub.\n", hLine, dwAddressID, lpdwNumRings); return 0; } @@ -720,7 +720,7 @@ DWORD WINAPI lineGetNumRings(HLINE hLine, DWORD dwAddressID, LPDWORD lpdwNumRing */ DWORD WINAPI lineGetProviderListA(DWORD dwAPIVersion, LPLINEPROVIDERLIST lpProviderList) { - FIXME("(%08x, %p): stub.\n", dwAPIVersion, lpProviderList); + FIXME("(%08lx, %p): stub.\n", dwAPIVersion, lpProviderList); return LINEERR_OPERATIONFAILED; } @@ -729,7 +729,7 @@ DWORD WINAPI lineGetProviderListA(DWORD dwAPIVersion, LPLINEPROVIDERLIST lpProvi */ DWORD WINAPI lineGetProviderListW(DWORD dwAPIVersion, LPLINEPROVIDERLIST lpProviderList) { - FIXME("(%08x, %p): stub.\n", dwAPIVersion, lpProviderList); + FIXME("(%08lx, %p): stub.\n", dwAPIVersion, lpProviderList); return LINEERR_OPERATIONFAILED; } @@ -738,7 +738,7 @@ DWORD WINAPI lineGetProviderListW(DWORD dwAPIVersion, LPLINEPROVIDERLIST lpProvi */ DWORD WINAPI lineGetRequestA(HLINEAPP hLineApp, DWORD dwRequestMode, LPVOID lpRequestBuffer) { - FIXME("%p, %08x, %p): stub.\n", hLineApp, dwRequestMode, lpRequestBuffer); + FIXME("%p, %08lx, %p): stub.\n", hLineApp, dwRequestMode, lpRequestBuffer); return 0; } @@ -756,7 +756,7 @@ DWORD WINAPI lineGetStatusMessages(HLINE hLine, LPDWORD lpdwLineStatus, LPDWORD */ DWORD WINAPI lineGetTranslateCapsW(HLINEAPP line_app, DWORD api_version, LINETRANSLATECAPS *caps) { - FIXME("(%p, %08x, %p): stub.\n", line_app, api_version, caps); + FIXME("(%p, %08lx, %p): stub.\n", line_app, api_version, caps); return LINEERR_OPERATIONFAILED; } @@ -823,7 +823,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, LPLINELOCATIONENTRY pLocEntry; LPLINECARDENTRY pCardEntry; - TRACE("(%p, %08x, %p (tot. size %d)\n", hLineApp, dwAPIVersion, + TRACE("(%p, %08lx, %p (tot. size %ld)\n", hLineApp, dwAPIVersion, lpTranslateCaps, lpTranslateCaps->dwTotalSize ); if( lpTranslateCaps->dwTotalSize < sizeof(LINETRANSLATECAPS)) return LINEERR_STRUCTURETOOSMALL; @@ -960,7 +960,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, HeapFree(GetProcessHeap(), 0, loc_key_name); HeapFree(GetProcessHeap(), 0, card_key_name); lpTranslateCaps->dwUsedSize = sizeof(LINETRANSLATECAPS); - TRACE("Insufficient space: total %d needed %d used %d\n", + TRACE("Insufficient space: total %ld needed %ld used %ld\n", lpTranslateCaps->dwTotalSize, lpTranslateCaps->dwNeededSize, lpTranslateCaps->dwUsedSize); @@ -1063,9 +1063,9 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, if(pLocEntry->dwPermanentLocationID == currentid ) lpTranslateCaps->dwCurrentPreferredCardID = pLocEntry->dwPreferredCardID; - TRACE("added: ID %d %s CountryCode %d CityCode %s CardID %d " - "LocalAccess: %s LongDistanceAccess: %s CountryID %d " - "Options %d CancelCallWait %s\n", + TRACE("added: ID %ld %s CountryCode %ld CityCode %s CardID %ld " + "LocalAccess: %s LongDistanceAccess: %s CountryID %ld " + "Options %ld CancelCallWait %s\n", pLocEntry->dwPermanentLocationID, debugstr_a( (char*)lpTranslateCaps + pLocEntry->dwLocationNameOffset), pLocEntry->dwCountryCode, @@ -1120,7 +1120,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, size_val=sizeof(DWORD); RegQueryValueExA(hsubkey, "Flags",NULL, NULL, (LPBYTE) &(pCardEntry->dwOptions), &size_val); - TRACE( "added card: ID %d name %s SameArea %s LongDistance %s International %s Options 0x%x\n", + TRACE( "added card: ID %ld name %s SameArea %s LongDistance %s International %s Options 0x%lx\n", pCardEntry->dwPermanentCardID, debugstr_a( (char*)lpTranslateCaps + pCardEntry->dwCardNameOffset), debugstr_a( (char*)lpTranslateCaps + pCardEntry->dwSameAreaRuleOffset), @@ -1137,7 +1137,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, if(hkCardLocations) RegCloseKey(hkCardLocations); HeapFree(GetProcessHeap(), 0, loc_key_name); HeapFree(GetProcessHeap(), 0, card_key_name); - TRACE(" returning success tot %d needed %d used %d\n", + TRACE(" returning success tot %ld needed %ld used %ld\n", lpTranslateCaps->dwTotalSize, lpTranslateCaps->dwNeededSize, lpTranslateCaps->dwUsedSize ); @@ -1149,7 +1149,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, */ DWORD WINAPI lineHandoffA(HCALL hCall, LPCSTR lpszFileName, DWORD dwMediaMode) { - FIXME("(%p, %s, %08x): stub.\n", hCall, lpszFileName, dwMediaMode); + FIXME("(%p, %s, %08lx): stub.\n", hCall, lpszFileName, dwMediaMode); return 0; } @@ -1203,7 +1203,7 @@ LONG WINAPI lineInitializeExW(LPHLINEAPP lphLineApp, HINSTANCE hInstance, LINECA DWORD WINAPI lineMakeCallW(HLINE hLine, LPHCALL lphCall, LPCWSTR lpszDestAddress, DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams) { - FIXME("(%p, %p, %s, %08x, %p): stub.\n", hLine, lphCall, debugstr_w(lpszDestAddress), + FIXME("(%p, %p, %s, %08lx, %p): stub.\n", hLine, lphCall, debugstr_w(lpszDestAddress), dwCountryCode, lpCallParams); return LINEERR_OPERATIONFAILED; } @@ -1214,7 +1214,7 @@ DWORD WINAPI lineMakeCallW(HLINE hLine, LPHCALL lphCall, LPCWSTR lpszDestAddress DWORD WINAPI lineMakeCallA(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, DWORD dwCountryCode, LPLINECALLPARAMS lpCallParams) { - FIXME("(%p, %p, %s, %08x, %p): stub.\n", hLine, lphCall, lpszDestAddress, + FIXME("(%p, %p, %s, %08lx, %p): stub.\n", hLine, lphCall, lpszDestAddress, dwCountryCode, lpCallParams); return LINEERR_OPERATIONFAILED; } @@ -1224,7 +1224,7 @@ DWORD WINAPI lineMakeCallA(HLINE hLine, LPHCALL lphCall, LPCSTR lpszDestAddress, */ DWORD WINAPI lineMonitorDigits(HCALL hCall, DWORD dwDigitModes) { - FIXME("(%p, %08x): stub.\n", hCall, dwDigitModes); + FIXME("(%p, %08lx): stub.\n", hCall, dwDigitModes); return 0; } @@ -1233,7 +1233,7 @@ DWORD WINAPI lineMonitorDigits(HCALL hCall, DWORD dwDigitModes) */ DWORD WINAPI lineMonitorMedia(HCALL hCall, DWORD dwMediaModes) { - FIXME("(%p, %08x): stub.\n", hCall, dwMediaModes); + FIXME("(%p, %08lx): stub.\n", hCall, dwMediaModes); return 0; } @@ -1242,7 +1242,7 @@ DWORD WINAPI lineMonitorMedia(HCALL hCall, DWORD dwMediaModes) */ DWORD WINAPI lineMonitorTones(HCALL hCall, LPLINEMONITORTONE lpToneList, DWORD dwNumEntries) { - FIXME("(%p, %p, %08x): stub.\n", hCall, lpToneList, dwNumEntries); + FIXME("(%p, %p, %08lx): stub.\n", hCall, lpToneList, dwNumEntries); return 0; } @@ -1261,7 +1261,7 @@ DWORD WINAPI lineNegotiateAPIVersion( static int warn_once; if(!warn_once++) - FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, + FIXME("(%p, %ld, %ld, %ld, %p, %p): stub.\n", hLineApp, dwDeviceID, dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); *lpdwAPIVersion = dwAPIHighVersion; return 0; @@ -1299,7 +1299,7 @@ DWORD WINAPI lineOpenA(HLINEAPP hLineApp, DWORD dwDeviceID, LPHLINE lphLine, DWO */ DWORD WINAPI lineParkA(HCALL hCall, DWORD dwParkMode, LPCSTR lpszDirAddress, LPVARSTRING lpNonDirAddress) { - FIXME("(%p, %08x, %s, %p): stub.\n", hCall, dwParkMode, lpszDirAddress, lpNonDirAddress); + FIXME("(%p, %08lx, %s, %p): stub.\n", hCall, dwParkMode, lpszDirAddress, lpNonDirAddress); return 1; } @@ -1308,7 +1308,7 @@ DWORD WINAPI lineParkA(HCALL hCall, DWORD dwParkMode, LPCSTR lpszDirAddress, LPV */ DWORD WINAPI linePickupA(HLINE hLine, DWORD dwAddressID, LPHCALL lphCall, LPCSTR lpszDestAddress, LPCSTR lpszGroupID) { - FIXME("(%p, %08x, %p, %s, %s): stub.\n", hLine, dwAddressID, lphCall, lpszDestAddress, lpszGroupID); + FIXME("(%p, %08lx, %p, %s, %s): stub.\n", hLine, dwAddressID, lphCall, lpszDestAddress, lpszGroupID); return 1; } @@ -1338,7 +1338,7 @@ DWORD WINAPI lineRedirectA( */ DWORD WINAPI lineRegisterRequestRecipient(HLINEAPP hLineApp, DWORD dwRegistrationInstance, DWORD dwRequestMode, DWORD dwEnable) { - FIXME("(%p, %08x, %08x, %08x): stub.\n", hLineApp, dwRegistrationInstance, dwRequestMode, dwEnable); + FIXME("(%p, %08lx, %08lx, %08lx): stub.\n", hLineApp, dwRegistrationInstance, dwRequestMode, dwEnable); return 1; } @@ -1365,7 +1365,7 @@ DWORD WINAPI lineRemoveFromConference(HCALL hCall) */ DWORD WINAPI lineRemoveProvider(DWORD dwPermanentProviderID, HWND hwndOwner) { - FIXME("(%08x, %p): stub.\n", dwPermanentProviderID, hwndOwner); + FIXME("(%08lx, %p): stub.\n", dwPermanentProviderID, hwndOwner); return 1; } @@ -1383,7 +1383,7 @@ DWORD WINAPI lineSecureCall(HCALL hCall) */ DWORD WINAPI lineSendUserUserInfo(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize) { - FIXME("(%p, %s, %08x): stub.\n", hCall, lpsUserUserInfo, dwSize); + FIXME("(%p, %s, %08lx): stub.\n", hCall, lpsUserUserInfo, dwSize); return 1; } @@ -1392,7 +1392,7 @@ DWORD WINAPI lineSendUserUserInfo(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwS */ DWORD WINAPI lineSetAppPriorityA(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLINEEXTENSIONID const lpExtensionID, DWORD dwRequestMode, LPCSTR lpszExtensionName, DWORD dwPriority) { - FIXME("(%s, %08x, %p, %08x, %s, %08x): stub.\n", lpszAppFilename, dwMediaMode, lpExtensionID, dwRequestMode, lpszExtensionName, dwPriority); + FIXME("(%s, %08lx, %p, %08lx, %s, %08lx): stub.\n", lpszAppFilename, dwMediaMode, lpExtensionID, dwRequestMode, lpszExtensionName, dwPriority); return 0; } @@ -1401,7 +1401,7 @@ DWORD WINAPI lineSetAppPriorityA(LPCSTR lpszAppFilename, DWORD dwMediaMode, LPLI */ DWORD WINAPI lineSetAppSpecific(HCALL hCall, DWORD dwAppSpecific) { - FIXME("(%p, %08x): stub.\n", hCall, dwAppSpecific); + FIXME("(%p, %08lx): stub.\n", hCall, dwAppSpecific); return 0; } @@ -1410,7 +1410,7 @@ DWORD WINAPI lineSetAppSpecific(HCALL hCall, DWORD dwAppSpecific) */ DWORD WINAPI lineSetCallParams(HCALL hCall, DWORD dwBearerMode, DWORD dwMinRate, DWORD dwMaxRate, LPLINEDIALPARAMS lpDialParams) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hCall, dwBearerMode, dwMinRate, dwMaxRate, lpDialParams); + FIXME("(%p, %08lx, %08lx, %08lx, %p): stub.\n", hCall, dwBearerMode, dwMinRate, dwMaxRate, lpDialParams); return 1; } @@ -1419,7 +1419,7 @@ DWORD WINAPI lineSetCallParams(HCALL hCall, DWORD dwBearerMode, DWORD dwMinRate, */ DWORD WINAPI lineSetCallPrivilege(HCALL hCall, DWORD dwCallPrivilege) { - FIXME("(%p, %08x): stub.\n", hCall, dwCallPrivilege); + FIXME("(%p, %08lx): stub.\n", hCall, dwCallPrivilege); return 0; } @@ -1428,7 +1428,7 @@ DWORD WINAPI lineSetCallPrivilege(HCALL hCall, DWORD dwCallPrivilege) */ DWORD WINAPI lineSetCurrentLocation(HLINEAPP hLineApp, DWORD dwLocation) { - FIXME("(%p, %08x): stub.\n", hLineApp, dwLocation); + FIXME("(%p, %08lx): stub.\n", hLineApp, dwLocation); return 0; } @@ -1437,7 +1437,7 @@ DWORD WINAPI lineSetCurrentLocation(HLINEAPP hLineApp, DWORD dwLocation) */ DWORD WINAPI lineSetDevConfigA(DWORD dwDeviceID, LPVOID lpDeviceConfig, DWORD dwSize, LPCSTR lpszDeviceClass) { - FIXME("(%08x, %p, %08x, %s): stub.\n", dwDeviceID, lpDeviceConfig, dwSize, lpszDeviceClass); + FIXME("(%08lx, %p, %08lx, %s): stub.\n", dwDeviceID, lpDeviceConfig, dwSize, lpszDeviceClass); return 0; } @@ -1467,7 +1467,7 @@ DWORD dwCallStateNumEntries) */ DWORD WINAPI lineSetMediaMode(HCALL hCall, DWORD dwMediaModes) { - FIXME("(%p, %08x): stub.\n", hCall, dwMediaModes); + FIXME("(%p, %08lx): stub.\n", hCall, dwMediaModes); return 0; } @@ -1476,7 +1476,7 @@ DWORD WINAPI lineSetMediaMode(HCALL hCall, DWORD dwMediaModes) */ DWORD WINAPI lineSetNumRings(HLINE hLine, DWORD dwAddressID, DWORD dwNumRings) { - FIXME("(%p, %08x, %08x): stub.\n", hLine, dwAddressID, dwNumRings); + FIXME("(%p, %08lx, %08lx): stub.\n", hLine, dwAddressID, dwNumRings); return 0; } @@ -1485,7 +1485,7 @@ DWORD WINAPI lineSetNumRings(HLINE hLine, DWORD dwAddressID, DWORD dwNumRings) */ DWORD WINAPI lineSetStatusMessages(HLINE hLine, DWORD dwLineStates, DWORD dwAddressStates) { - FIXME("(%p, %08x, %08x): stub.\n", hLine, dwLineStates, dwAddressStates); + FIXME("(%p, %08lx, %08lx): stub.\n", hLine, dwLineStates, dwAddressStates); return 0; } @@ -1494,7 +1494,7 @@ DWORD WINAPI lineSetStatusMessages(HLINE hLine, DWORD dwLineStates, DWORD dwAddr */ DWORD WINAPI lineSetTerminal(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD dwSelect, DWORD dwTerminalModes, DWORD dwTerminalID, DWORD bEnable) { - FIXME("(%p, %08x, %p, %08x, %08x, %08x, %08x): stub.\n", hLine, dwAddressID, hCall, dwSelect, dwTerminalModes, dwTerminalID, bEnable); + FIXME("(%p, %08lx, %p, %08lx, %08lx, %08lx, %08lx): stub.\n", hLine, dwAddressID, hCall, dwSelect, dwTerminalModes, dwTerminalID, bEnable); return 1; } @@ -1503,7 +1503,7 @@ DWORD WINAPI lineSetTerminal(HLINE hLine, DWORD dwAddressID, HCALL hCall, DWORD */ DWORD WINAPI lineSetTollListA(HLINEAPP hLineApp, DWORD dwDeviceID, LPCSTR lpszAddressIn, DWORD dwTollListOption) { - FIXME("(%p, %08x, %s, %08x): stub.\n", hLineApp, dwDeviceID, lpszAddressIn, dwTollListOption); + FIXME("(%p, %08lx, %s, %08lx): stub.\n", hLineApp, dwDeviceID, lpszAddressIn, dwTollListOption); return 0; } @@ -1512,7 +1512,7 @@ DWORD WINAPI lineSetTollListA(HLINEAPP hLineApp, DWORD dwDeviceID, LPCSTR lpszAd */ DWORD WINAPI lineSetupConferenceA(HCALL hCall, HLINE hLine, LPHCALL lphConfCall, LPHCALL lphConsultCall, DWORD dwNumParties, LPLINECALLPARAMS lpCallParams) { - FIXME("(%p, %p, %p, %p, %08x, %p): stub.\n", hCall, hLine, lphConfCall, lphConsultCall, dwNumParties, lpCallParams); + FIXME("(%p, %p, %p, %p, %08lx, %p): stub.\n", hCall, hLine, lphConfCall, lphConsultCall, dwNumParties, lpCallParams); return 1; } @@ -1548,7 +1548,7 @@ DWORD WINAPI lineSwapHold(HCALL hActiveCall, HCALL hHeldCall) */ DWORD WINAPI lineTranslateAddressA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, LPCSTR lpszAddressIn, DWORD dwCard, DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput) { - FIXME("(%p, %08x, %08x, %s, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, lpszAddressIn, dwCard, dwTranslateOptions, lpTranslateOutput); + FIXME("(%p, %08lx, %08lx, %s, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, lpszAddressIn, dwCard, dwTranslateOptions, lpTranslateOutput); return 0; } @@ -1559,7 +1559,7 @@ DWORD WINAPI lineTranslateAddressW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, LPCWSTR lpszAddressIn, DWORD dwCard, DWORD dwTranslateOptions, LPLINETRANSLATEOUTPUT lpTranslateOutput) { - FIXME("(%p, %08x, %08x, %s, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + FIXME("(%p, %08lx, %08lx, %s, %08lx, %08lx, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, debugstr_w(lpszAddressIn), dwCard, dwTranslateOptions, lpTranslateOutput); return 0; } @@ -1569,7 +1569,7 @@ DWORD WINAPI lineTranslateAddressW(HLINEAPP hLineApp, DWORD dwDeviceID, */ DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCSTR lpszAddressIn) { - FIXME("(%p, %08x, %08x, %p, %s): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, hwndOwner, lpszAddressIn); + FIXME("(%p, %08lx, %08lx, %p, %s): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, hwndOwner, lpszAddressIn); return 0; } @@ -1579,7 +1579,7 @@ DWORD WINAPI lineTranslateDialogA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwA DWORD WINAPI lineTranslateDialogW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, HWND hwndOwner, LPCWSTR lpszAddressIn) { - FIXME("(%p, %08x, %08x, %p, %s): stub.\n", hLineApp, dwDeviceID, + FIXME("(%p, %08lx, %08lx, %p, %s): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, hwndOwner, debugstr_w(lpszAddressIn)); return 0; } @@ -1589,7 +1589,7 @@ DWORD WINAPI lineTranslateDialogW(HLINEAPP hLineApp, DWORD dwDeviceID, */ DWORD WINAPI lineUncompleteCall(HLINE hLine, DWORD dwCompletionID) { - FIXME("(%p, %08x): stub.\n", hLine, dwCompletionID); + FIXME("(%p, %08lx): stub.\n", hLine, dwCompletionID); return 1; } @@ -1607,6 +1607,6 @@ DWORD WINAPI lineUnhold(HCALL hCall) */ DWORD WINAPI lineUnparkA(HLINE hLine, DWORD dwAddressID, LPHCALL lphCall, LPCSTR lpszDestAddress) { - FIXME("(%p, %08x, %p, %s): stub.\n", hLine, dwAddressID, lphCall, lpszDestAddress); + FIXME("(%p, %08lx, %p, %s): stub.\n", hLine, dwAddressID, lphCall, lpszDestAddress); return 1; } diff --git a/dlls/tapi32/phone.c b/dlls/tapi32/phone.c index ed40a627efb..b73f600d780 100644 --- a/dlls/tapi32/phone.c +++ b/dlls/tapi32/phone.c @@ -51,7 +51,7 @@ DWORD WINAPI phoneClose(HPHONE hPhone) */ DWORD WINAPI phoneConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDeviceClass) { - FIXME("(%08x, %p, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass); + FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, hwndOwner, lpszDeviceClass); return 0; } @@ -60,7 +60,7 @@ DWORD WINAPI phoneConfigDialogA(DWORD dwDeviceID, HWND hwndOwner, LPCSTR lpszDev */ DWORD WINAPI phoneDevSpecific(HPHONE hPhone, LPVOID lpParams, DWORD dwSize) { - FIXME("(%p, %p, %d): stub.\n", hPhone, lpParams, dwSize); + FIXME("(%p, %p, %ld): stub.\n", hPhone, lpParams, dwSize); return 1; } @@ -70,7 +70,7 @@ DWORD WINAPI phoneDevSpecific(HPHONE hPhone, LPVOID lpParams, DWORD dwSize) DWORD WINAPI phoneGetButtonInfoA(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUTTONINFO lpButtonInfo) { - FIXME("(%p, %08x, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo); + FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo); return 0; } @@ -79,7 +79,7 @@ DWORD WINAPI phoneGetButtonInfoA(HPHONE hPhone, DWORD dwButtonLampID, */ DWORD WINAPI phoneGetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dwSize) { - FIXME("(%p, %08x, %p, %d): stub.\n", hPhone, dwDataID, lpData, dwSize); + FIXME("(%p, %08lx, %p, %ld): stub.\n", hPhone, dwDataID, lpData, dwSize); return 0; } @@ -89,7 +89,7 @@ DWORD WINAPI phoneGetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dw DWORD WINAPI phoneGetDevCapsA(HPHONEAPP hPhoneApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPPHONECAPS lpPhoneCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hPhoneApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpPhoneCaps); + FIXME("(%p, %08lx, %08lx, %08lx, %p): stub.\n", hPhoneApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpPhoneCaps); /* call TSPI function here ! */ return 0; } @@ -108,7 +108,7 @@ DWORD WINAPI phoneGetDisplay(HPHONE hPhone, LPVARSTRING lpDisplay) */ DWORD WINAPI phoneGetGain(HPHONE hPhone, DWORD dwHookSwitchDev, LPDWORD lpdwGain) { - FIXME("(%p, %08x, %p): stub.\n", hPhone, dwHookSwitchDev, lpdwGain); + FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwHookSwitchDev, lpdwGain); /* call TSPI function here ! */ return 0; } @@ -140,7 +140,7 @@ DWORD WINAPI phoneGetIDA(HPHONE hPhone, LPVARSTRING lpDeviceID, DWORD WINAPI phoneGetIconA(DWORD dwDeviceID, LPCSTR lpszDeviceClass, HICON *lphIcon) { - FIXME("(%08x, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon); + FIXME("(%08lx, %s, %p): stub.\n", dwDeviceID, lpszDeviceClass, lphIcon); /* call TSPI function here ! */ return 0; } @@ -151,7 +151,7 @@ DWORD WINAPI phoneGetIconA(DWORD dwDeviceID, LPCSTR lpszDeviceClass, DWORD WINAPI phoneGetLamp(HPHONE hPhone, DWORD dwButtonLampID, LPDWORD lpdwLampMode) { - FIXME("(%p, %08x, %p): stub.\n", hPhone, dwButtonLampID, lpdwLampMode); + FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpdwLampMode); return 0; } @@ -160,7 +160,7 @@ DWORD WINAPI phoneGetLamp(HPHONE hPhone, DWORD dwButtonLampID, */ DWORD WINAPI phoneGetMessage(HPHONEAPP hPhoneApp, LPPHONEMESSAGE lpMessage, DWORD dwTimeout) { - FIXME("(%p, %p, %08x): stub.\n", hPhoneApp, lpMessage, dwTimeout); + FIXME("(%p, %p, %08lx): stub.\n", hPhoneApp, lpMessage, dwTimeout); return 0; } @@ -199,7 +199,7 @@ DWORD WINAPI phoneGetStatusMessages(HPHONE hPhone, LPDWORD lpdwPhoneStates, DWORD WINAPI phoneGetVolume(HPHONE hPhone, DWORD dwHookSwitchDevs, LPDWORD lpdwVolume) { - FIXME("(%p, %08x, %p): stub.\n", hPhone, dwHookSwitchDevs, lpdwVolume); + FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwHookSwitchDevs, lpdwVolume); /* call TSPI function here ! */ return 0; } @@ -269,7 +269,7 @@ DWORD WINAPI phoneOpen(HPHONEAPP hPhoneApp, DWORD dwDeviceID, LPHPHONE lphPhone, */ DWORD WINAPI phoneSetButtonInfoA(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUTTONINFO lpButtonInfo) { - FIXME("(%p, %08x, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo); + FIXME("(%p, %08lx, %p): stub.\n", hPhone, dwButtonLampID, lpButtonInfo); return 0; } @@ -278,7 +278,7 @@ DWORD WINAPI phoneSetButtonInfoA(HPHONE hPhone, DWORD dwButtonLampID, LPPHONEBUT */ DWORD WINAPI phoneSetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dwSize) { - FIXME("(%p, %08x, %p, %d): stub.\n", hPhone, dwDataID, lpData, dwSize); + FIXME("(%p, %08lx, %p, %ld): stub.\n", hPhone, dwDataID, lpData, dwSize); return 1; } @@ -287,7 +287,7 @@ DWORD WINAPI phoneSetData(HPHONE hPhone, DWORD dwDataID, LPVOID lpData, DWORD dw */ DWORD WINAPI phoneSetDisplay(HPHONE hPhone, DWORD dwRow, DWORD dwColumn, LPCSTR lpszDisplay, DWORD dwSize) { - FIXME("(%p, '%s' at %d/%d, len %d): stub.\n", hPhone, lpszDisplay, dwRow, dwColumn, dwSize); + FIXME("(%p, '%s' at %ld/%ld, len %ld): stub.\n", hPhone, lpszDisplay, dwRow, dwColumn, dwSize); return 1; } @@ -296,7 +296,7 @@ DWORD WINAPI phoneSetDisplay(HPHONE hPhone, DWORD dwRow, DWORD dwColumn, LPCSTR */ DWORD WINAPI phoneSetGain(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwGain) { - FIXME("(%p, %08x, %d): stub.\n", hPhone, dwHookSwitchDev, dwGain); + FIXME("(%p, %08lx, %ld): stub.\n", hPhone, dwHookSwitchDev, dwGain); /* call TSPI function here ! */ return 1; } @@ -306,7 +306,7 @@ DWORD WINAPI phoneSetGain(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwGain) */ DWORD WINAPI phoneSetHookSwitch(HPHONE hPhone, DWORD dwHookSwitchDevs, DWORD dwHookSwitchMode) { - FIXME("(%p, %08x, %08x): stub.\n", hPhone, dwHookSwitchDevs, dwHookSwitchMode); + FIXME("(%p, %08lx, %08lx): stub.\n", hPhone, dwHookSwitchDevs, dwHookSwitchMode); /* call TSPI function here ! */ return 1; } @@ -316,7 +316,7 @@ DWORD WINAPI phoneSetHookSwitch(HPHONE hPhone, DWORD dwHookSwitchDevs, DWORD dwH */ DWORD WINAPI phoneSetLamp(HPHONE hPhone, DWORD dwButtonLampID, DWORD lpdwLampMode) { - FIXME("(%p, %08x, %08x): stub.\n", hPhone, dwButtonLampID, lpdwLampMode); + FIXME("(%p, %08lx, %08lx): stub.\n", hPhone, dwButtonLampID, lpdwLampMode); return 1; } @@ -325,7 +325,7 @@ DWORD WINAPI phoneSetLamp(HPHONE hPhone, DWORD dwButtonLampID, DWORD lpdwLampMod */ DWORD WINAPI phoneSetRing(HPHONE hPhone, DWORD dwRingMode, DWORD dwVolume) { - FIXME("(%p, %08x, %08x): stub.\n", hPhone, dwRingMode, dwVolume); + FIXME("(%p, %08lx, %08lx): stub.\n", hPhone, dwRingMode, dwVolume); return 1; } @@ -334,7 +334,7 @@ DWORD WINAPI phoneSetRing(HPHONE hPhone, DWORD dwRingMode, DWORD dwVolume) */ DWORD WINAPI phoneSetStatusMessages(HPHONE hPhone, DWORD dwPhoneStates, DWORD dwButtonModes, DWORD dwButtonStates) { - FIXME("(%p, %08x, %08x, %08x): stub.\n", hPhone, dwPhoneStates, dwButtonModes, dwButtonStates); + FIXME("(%p, %08lx, %08lx, %08lx): stub.\n", hPhone, dwPhoneStates, dwButtonModes, dwButtonStates); /* call TSPI function here ! */ return 0; /* FIXME ? */ } @@ -344,7 +344,7 @@ DWORD WINAPI phoneSetStatusMessages(HPHONE hPhone, DWORD dwPhoneStates, DWORD dw */ DWORD WINAPI phoneSetVolume(HPHONE hPhone, DWORD dwHookSwitchDev, DWORD dwVolume) { - FIXME("(%p, %08x, %08x): stub.\n", hPhone, dwHookSwitchDev, dwVolume); + FIXME("(%p, %08lx, %08lx): stub.\n", hPhone, dwHookSwitchDev, dwVolume); /* call TSPI function here ! */ return 1; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/taskschd/Makefile.in | 1 dlls/taskschd/folder.c | 28 ++++++------- dlls/taskschd/folder_collection.c | 10 ++--- dlls/taskschd/regtask.c | 22 +++++----- dlls/taskschd/task.c | 82 +++++++++++++++++++------------------ 5 files changed, 71 insertions(+), 72 deletions(-) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in index 517b4d38c4a..4634c5bbe84 100644 --- a/dlls/taskschd/Makefile.in +++ b/dlls/taskschd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = taskschd.dll IMPORTS = oleaut32 ole32 advapi32 xmllite rpcrt4 diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 8b2630f4ec3..f7f43d9348b 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -93,21 +93,21 @@ static HRESULT WINAPI TaskFolder_GetTypeInfoCount(ITaskFolder *iface, UINT *coun static HRESULT WINAPI TaskFolder_GetTypeInfo(ITaskFolder *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI TaskFolder_GetIDsOfNames(ITaskFolder *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI TaskFolder_Invoke(ITaskFolder *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -163,12 +163,12 @@ static HRESULT WINAPI TaskFolder_GetFolders(ITaskFolder *iface, LONG flags, ITas { TaskFolder *folder = impl_from_ITaskFolder(iface); - TRACE("%p,%x,%p: stub\n", iface, flags, folders); + TRACE("%p,%lx,%p: stub\n", iface, flags, folders); if (!folders) return E_POINTER; if (flags) - FIXME("unsupported flags %x\n", flags); + FIXME("unsupported flags %lx\n", flags); return TaskFolderCollection_create(folder->path, folders); } @@ -242,12 +242,12 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON WCHAR *folder_path; HRESULT hr; - TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + TRACE("%p,%s,%lx\n", iface, debugstr_w(name), flags); if (!name || !*name) return E_ACCESSDENIED; if (flags) - FIXME("unsupported flags %x\n", flags); + FIXME("unsupported flags %lx\n", flags); folder_path = get_full_path(folder->path, name); if (!folder_path) return E_OUTOFMEMORY; @@ -280,7 +280,7 @@ static HRESULT WINAPI TaskFolder_GetTasks(ITaskFolder *iface, LONG flags, IRegis { TaskFolder *folder = impl_from_ITaskFolder(iface); - TRACE("%p,%x,%p: stub\n", iface, flags, tasks); + TRACE("%p,%lx,%p: stub\n", iface, flags, tasks); if (!tasks) return E_POINTER; @@ -293,12 +293,12 @@ static HRESULT WINAPI TaskFolder_DeleteTask(ITaskFolder *iface, BSTR name, LONG WCHAR *folder_path; HRESULT hr; - TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags); + TRACE("%p,%s,%lx\n", iface, debugstr_w(name), flags); if (!name || !*name) return E_ACCESSDENIED; if (flags) - FIXME("unsupported flags %x\n", flags); + FIXME("unsupported flags %lx\n", flags); folder_path = get_full_path(folder->path, name); if (!folder_path) return E_OUTOFMEMORY; @@ -317,7 +317,7 @@ static HRESULT WINAPI TaskFolder_RegisterTask(ITaskFolder *iface, BSTR name, BST ITaskDefinition *taskdef; HRESULT hr; - TRACE("%p,%s,%s,%x,%s,%s,%d,%s,%p\n", iface, debugstr_w(name), debugstr_w(xml), flags, + TRACE("%p,%s,%s,%lx,%s,%s,%d,%s,%p\n", iface, debugstr_w(name), debugstr_w(xml), flags, debugstr_variant(&user), debugstr_variant(&password), logon, debugstr_variant(&sddl), task); if (!xml) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); @@ -348,7 +348,7 @@ static HRESULT WINAPI TaskFolder_RegisterTaskDefinition(ITaskFolder *iface, BSTR IRegisteredTask *regtask = NULL; HRESULT hr; - FIXME("%p,%s,%p,%x,%s,%s,%d,%s,%p: stub\n", iface, debugstr_w(name), definition, flags, + FIXME("%p,%s,%p,%lx,%s,%s,%d,%s,%p: stub\n", iface, debugstr_w(name), definition, flags, debugstr_variant(&user), debugstr_variant(&password), logon, debugstr_variant(&sddl), task); if (!is_variant_null(&sddl)) @@ -372,13 +372,13 @@ static HRESULT WINAPI TaskFolder_RegisterTaskDefinition(ITaskFolder *iface, BSTR static HRESULT WINAPI TaskFolder_GetSecurityDescriptor(ITaskFolder *iface, LONG info, BSTR *sddl) { - FIXME("%p,%x,%p: stub\n", iface, info, sddl); + FIXME("%p,%lx,%p: stub\n", iface, info, sddl); return E_NOTIMPL; } static HRESULT WINAPI TaskFolder_SetSecurityDescriptor(ITaskFolder *iface, BSTR sddl, LONG flags) { - FIXME("%p,%s,%x: stub\n", iface, debugstr_w(sddl), flags); + FIXME("%p,%s,%lx: stub\n", iface, debugstr_w(sddl), flags); return E_NOTIMPL; } diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 394210db318..41e3caca33f 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -107,21 +107,21 @@ static HRESULT WINAPI folders_GetTypeInfoCount(ITaskFolderCollection *iface, UIN static HRESULT WINAPI folders_GetTypeInfo(ITaskFolderCollection *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI folders_GetIDsOfNames(ITaskFolderCollection *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI folders_Invoke(ITaskFolderCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -307,7 +307,7 @@ static HRESULT WINAPI enumvar_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); LONG i; - TRACE("%p,%u,%p,%p\n", iface, celt, var, fetched); + TRACE("%p,%lu,%p,%p\n", iface, celt, var, fetched); for (i = 0; i < celt && enumvar->pos < enumvar->folders->count; i++) { @@ -336,7 +336,7 @@ static HRESULT WINAPI enumvar_Skip(IEnumVARIANT *iface, ULONG celt) { EnumVARIANT *enumvar = impl_from_IEnumVARIANT(iface); - TRACE("%p,%u\n", iface, celt); + TRACE("%p,%lu\n", iface, celt); enumvar->pos += celt; diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 9a18fed8714..4c0c9130c5e 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -95,21 +95,21 @@ static HRESULT WINAPI regtask_GetTypeInfoCount(IRegisteredTask *iface, UINT *cou static HRESULT WINAPI regtask_GetTypeInfo(IRegisteredTask *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI regtask_GetIDsOfNames(IRegisteredTask *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI regtask_Invoke(IRegisteredTask *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -192,13 +192,13 @@ static HRESULT WINAPI regtask_Run(IRegisteredTask *iface, VARIANT params, IRunni static HRESULT WINAPI regtask_RunEx(IRegisteredTask *iface, VARIANT params, LONG flags, LONG session_id, BSTR user, IRunningTask **task) { - FIXME("%p,%s,%x,%x,%s,%p: stub\n", iface, debugstr_variant(¶ms), flags, session_id, debugstr_w(user), task); + FIXME("%p,%s,%lx,%lx,%s,%p: stub\n", iface, debugstr_variant(¶ms), flags, session_id, debugstr_w(user), task); return E_NOTIMPL; } static HRESULT WINAPI regtask_GetInstances(IRegisteredTask *iface, LONG flags, IRunningTaskCollection **tasks) { - FIXME("%p,%x,%p: stub\n", iface, flags, tasks); + FIXME("%p,%lx,%p: stub\n", iface, flags, tasks); return E_NOTIMPL; } @@ -253,19 +253,19 @@ static HRESULT WINAPI regtask_get_Xml(IRegisteredTask *iface, BSTR *xml) static HRESULT WINAPI regtask_GetSecurityDescriptor(IRegisteredTask *iface, LONG info, BSTR *sddl) { - FIXME("%p,%x,%p: stub\n", iface, info, sddl); + FIXME("%p,%lx,%p: stub\n", iface, info, sddl); return E_NOTIMPL; } static HRESULT WINAPI regtask_SetSecurityDescriptor(IRegisteredTask *iface, BSTR sddl, LONG flags) { - FIXME("%p,%s,%x: stub\n", iface, debugstr_w(sddl), flags); + FIXME("%p,%s,%lx: stub\n", iface, debugstr_w(sddl), flags); return E_NOTIMPL; } static HRESULT WINAPI regtask_Stop(IRegisteredTask *iface, LONG flags) { - FIXME("%p,%x: stub\n", iface, flags); + FIXME("%p,%lx: stub\n", iface, flags); return E_NOTIMPL; } @@ -443,21 +443,21 @@ static HRESULT WINAPI regtasks_GetTypeInfoCount(IRegisteredTaskCollection *iface static HRESULT WINAPI regtasks_GetTypeInfo(IRegisteredTaskCollection *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI regtasks_GetIDsOfNames(IRegisteredTaskCollection *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index dd7380e75ac..8c9fc9f2582 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -76,7 +76,7 @@ static ULONG WINAPI DailyTrigger_AddRef(IDailyTrigger *iface) DailyTrigger *This = impl_from_IDailyTrigger(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) DailyTrigger *This = impl_from_IDailyTrigger(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { @@ -108,7 +108,7 @@ static HRESULT WINAPI DailyTrigger_GetTypeInfoCount(IDailyTrigger *iface, UINT * static HRESULT WINAPI DailyTrigger_GetTypeInfo(IDailyTrigger *iface, UINT index, LCID lcid, ITypeInfo **info) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%u %u %p)\n", This, index, lcid, info); + FIXME("(%p)->(%u %lu %p)\n", This, index, lcid, info); return E_NOTIMPL; } @@ -116,7 +116,7 @@ static HRESULT WINAPI DailyTrigger_GetIDsOfNames(IDailyTrigger *iface, REFIID ri UINT count, LCID lcid, DISPID *dispid) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } @@ -124,7 +124,7 @@ static HRESULT WINAPI DailyTrigger_Invoke(IDailyTrigger *iface, DISPID dispid, R DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%d %s %x %x %p %p %p %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, + FIXME("(%p)->(%ld %s %lx %x %p %p %p %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -360,7 +360,7 @@ static ULONG WINAPI TriggerCollection_AddRef(ITriggerCollection *iface) trigger_collection *This = impl_from_ITriggerCollection(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -370,7 +370,7 @@ static ULONG WINAPI TriggerCollection_Release(ITriggerCollection *iface) trigger_collection *This = impl_from_ITriggerCollection(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -388,7 +388,7 @@ static HRESULT WINAPI TriggerCollection_GetTypeInfoCount(ITriggerCollection *ifa static HRESULT WINAPI TriggerCollection_GetTypeInfo(ITriggerCollection *iface, UINT index, LCID lcid, ITypeInfo **info) { trigger_collection *This = impl_from_ITriggerCollection(iface); - FIXME("(%p)->(%u %u %p)\n", This, index, lcid, info); + FIXME("(%p)->(%u %lu %p)\n", This, index, lcid, info); return E_NOTIMPL; } @@ -396,7 +396,7 @@ static HRESULT WINAPI TriggerCollection_GetIDsOfNames(ITriggerCollection *iface, UINT count, LCID lcid, DISPID *dispid) { trigger_collection *This = impl_from_ITriggerCollection(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } @@ -404,7 +404,7 @@ static HRESULT WINAPI TriggerCollection_Invoke(ITriggerCollection *iface, DISPID DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { trigger_collection *This = impl_from_ITriggerCollection(iface); - FIXME("(%p)->(%d %s %x %x %p %p %p %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, + FIXME("(%p)->(%ld %s %lx %x %p %p %p %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -419,7 +419,7 @@ static HRESULT WINAPI TriggerCollection_get_Count(ITriggerCollection *iface, LON static HRESULT WINAPI TriggerCollection_get_Item(ITriggerCollection *iface, LONG index, ITrigger **trigger) { trigger_collection *This = impl_from_ITriggerCollection(iface); - FIXME("(%p)->(%d %p)\n", This, index, trigger); + FIXME("(%p)->(%ld %p)\n", This, index, trigger); return E_NOTIMPL; } @@ -544,21 +544,21 @@ static HRESULT WINAPI RegistrationInfo_GetTypeInfoCount(IRegistrationInfo *iface static HRESULT WINAPI RegistrationInfo_GetTypeInfo(IRegistrationInfo *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI RegistrationInfo_GetIDsOfNames(IRegistrationInfo *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI RegistrationInfo_Invoke(IRegistrationInfo *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -900,21 +900,21 @@ static HRESULT WINAPI TaskSettings_GetTypeInfoCount(ITaskSettings *iface, UINT * static HRESULT WINAPI TaskSettings_GetTypeInfo(ITaskSettings *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI TaskSettings_GetIDsOfNames(ITaskSettings *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI TaskSettings_Invoke(ITaskSettings *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -1532,21 +1532,21 @@ static HRESULT WINAPI Principal_GetTypeInfoCount(IPrincipal *iface, UINT *count) static HRESULT WINAPI Principal_GetTypeInfo(IPrincipal *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI Principal_GetIDsOfNames(IPrincipal *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI Principal_Invoke(IPrincipal *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -1731,21 +1731,21 @@ static HRESULT WINAPI ExecAction_GetTypeInfoCount(IExecAction *iface, UINT *coun static HRESULT WINAPI ExecAction_GetTypeInfo(IExecAction *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI ExecAction_GetIDsOfNames(IExecAction *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI ExecAction_Invoke(IExecAction *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -1973,21 +1973,21 @@ static HRESULT WINAPI Actions_GetTypeInfoCount(IActionCollection *iface, UINT *c static HRESULT WINAPI Actions_GetTypeInfo(IActionCollection *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI Actions_GetIDsOfNames(IActionCollection *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI Actions_Invoke(IActionCollection *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -2000,7 +2000,7 @@ static HRESULT WINAPI Actions_get_Count(IActionCollection *iface, LONG *count) static HRESULT WINAPI Actions_get_Item(IActionCollection *iface, LONG index, IAction **action) { - FIXME("%p,%d,%p: stub\n", iface, index, action); + FIXME("%p,%ld,%p: stub\n", iface, index, action); return E_NOTIMPL; } @@ -2175,21 +2175,21 @@ static HRESULT WINAPI TaskDefinition_GetTypeInfoCount(ITaskDefinition *iface, UI static HRESULT WINAPI TaskDefinition_GetTypeInfo(ITaskDefinition *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI TaskDefinition_GetIDsOfNames(ITaskDefinition *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI TaskDefinition_Invoke(ITaskDefinition *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -3637,21 +3637,21 @@ static HRESULT WINAPI TaskService_GetTypeInfoCount(ITaskService *iface, UINT *co static HRESULT WINAPI TaskService_GetTypeInfo(ITaskService *iface, UINT index, LCID lcid, ITypeInfo **info) { - FIXME("%p,%u,%u,%p: stub\n", iface, index, lcid, info); + FIXME("%p,%u,%lu,%p: stub\n", iface, index, lcid, info); return E_NOTIMPL; } static HRESULT WINAPI TaskService_GetIDsOfNames(ITaskService *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("%p,%s,%p,%u,%u,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("%p,%s,%p,%u,%lu,%p: stub\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } static HRESULT WINAPI TaskService_Invoke(ITaskService *iface, DISPID dispid, REFIID riid, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("%p,%d,%s,%04x,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, + FIXME("%p,%ld,%s,%04lx,%04x,%p,%p,%p,%p: stub\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; } @@ -3672,18 +3672,18 @@ static HRESULT WINAPI TaskService_GetFolder(ITaskService *iface, BSTR path, ITas static HRESULT WINAPI TaskService_GetRunningTasks(ITaskService *iface, LONG flags, IRunningTaskCollection **tasks) { - FIXME("%p,%x,%p: stub\n", iface, flags, tasks); + FIXME("%p,%lx,%p: stub\n", iface, flags, tasks); return E_NOTIMPL; } static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITaskDefinition **definition) { - TRACE("%p,%x,%p\n", iface, flags, definition); + TRACE("%p,%lx,%p\n", iface, flags, definition); if (!definition) return E_POINTER; if (flags) - FIXME("unsupported flags %x\n", flags); + FIXME("unsupported flags %lx\n", flags); return TaskDefinition_create(definition); } @@ -3718,7 +3718,7 @@ static HRESULT start_schedsvc(void) if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, sizeof(status), &dummy)) { - WARN("failed to query scheduler status (%u)\n", GetLastError()); + WARN("failed to query scheduler status (%lu)\n", GetLastError()); break; } @@ -3734,15 +3734,15 @@ static HRESULT start_schedsvc(void) } while (status.dwCurrentState == SERVICE_START_PENDING); if (status.dwCurrentState != SERVICE_RUNNING) - WARN("scheduler failed to start %u\n", status.dwCurrentState); + WARN("scheduler failed to start %lu\n", status.dwCurrentState); } else - WARN("failed to start scheduler service (%u)\n", GetLastError()); + WARN("failed to start scheduler service (%lu)\n", GetLastError()); CloseServiceHandle(service); } else - WARN("failed to open scheduler service (%u)\n", GetLastError()); + WARN("failed to open scheduler service (%lu)\n", GetLastError()); CloseServiceHandle(scm); return hr; @@ -3803,7 +3803,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = SchRpcHighestVersion(&task_svc->version); if (hr != S_OK) return hr; - TRACE("server version %#x\n", task_svc->version); + TRACE("server version %#lx\n", task_svc->version); lstrcpyW(task_svc->comp_name, comp_name); task_svc->connected = TRUE;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/toolhelp.dll16/Makefile.in | 1 - dlls/toolhelp.dll16/toolhelp.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 7e39aa9c7cb..64d0de31528 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = toolhelp.dll16 EXTRADLLFLAGS = -m16 diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 57a95fb8d8f..1bec37c505e 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -552,7 +552,7 @@ BOOL16 WINAPI NotifyRegister16( HTASK16 htask, FARPROC16 lpfnCallback, { int i; - FIXME("(%x,%x,%x), semi-stub.\n", + FIXME("(%x,%lx,%x), semi-stub.\n", htask, (DWORD)lpfnCallback, wFlags ); if (!htask) htask = GetCurrentTask(); for (i=0;i<nrofnotifys;i++)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/traffic/Makefile.in | 1 - dlls/traffic/traffic_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/traffic/Makefile.in b/dlls/traffic/Makefile.in index bef639c0a98..633355f93ec 100644 --- a/dlls/traffic/Makefile.in +++ b/dlls/traffic/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = traffic.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/traffic/traffic_main.c b/dlls/traffic/traffic_main.c index 87646622346..c551d8bcc30 100644 --- a/dlls/traffic/traffic_main.c +++ b/dlls/traffic/traffic_main.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(traffic); ULONG WINAPI TcRegisterClient(ULONG version, HANDLE context, PTCI_CLIENT_FUNC_LIST list, PHANDLE buffer) { - FIXME("(%u %p %p %p) stub\n", version, context, list, buffer); + FIXME("(%lu %p %p %p) stub\n", version, context, list, buffer); if(buffer) *buffer = INVALID_HANDLE_VALUE; return ERROR_CALL_NOT_IMPLEMENTED; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/twain_32/Makefile.in | 1 - dlls/twain_32/dsm_ctrl.c | 2 +- dlls/twain_32/twain32_main.c | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/twain_32/Makefile.in b/dlls/twain_32/Makefile.in index 8919b82000a..c82b5a74453 100644 --- a/dlls/twain_32/Makefile.in +++ b/dlls/twain_32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = twain_32.dll IMPORTS = user32 diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index f8ec539ba85..6854093017a 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -427,7 +427,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) userselect_data param = {pOrigin, pData}; HWND parent = DSM_parent; - TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%lx ProductName=%s\n", pOrigin->SupportedGroups, wine_dbgstr_a(param.result->ProductName)); twain_autodetect(); diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 0f8ee144306..a8b11a9bbfe 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -35,7 +35,7 @@ HINSTANCE DSM_hinstance; BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) { - TRACE("%p,%x,%p\n", hinstance, reason, reserved); + TRACE("%p,%lx,%p\n", hinstance, reason, reserved); switch (reason) { @@ -158,7 +158,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); if (DG == DG_CONTROL && DAT == DAT_NULL) { @@ -199,7 +199,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, } DSM_twCC = TWCC_SUCCESS; - TRACE("Forwarding %d/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); + TRACE("Forwarding %ld/%d/%d/%p to DS.\n", DG, DAT, MSG, pData); twRC = pSource->dsEntry(pOrigin, DG, DAT, MSG, pData); TRACE("return value is %d\n", twRC); return twRC; @@ -210,7 +210,7 @@ DSM_Entry (pTW_IDENTITY pOrigin, twRC = TWAIN_SourceManagerHandler (pOrigin, DAT, MSG, pData); break; default: - FIXME("The DSM does not handle DG %d\n", DG); + FIXME("The DSM does not handle DG %ld\n", DG); DSM_twCC = TWCC_BADPROTOCOL; twRC = TWRC_FAILURE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/typelib.dll16/Makefile.in | 1 - dlls/typelib.dll16/typelib.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in index 06adb35b296..b4d39ee6601 100644 --- a/dlls/typelib.dll16/Makefile.in +++ b/dlls/typelib.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = typelib.dll16 IMPORTS = oleaut32 advapi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c index 4787010354c..41a4790a253 100644 --- a/dlls/typelib.dll16/typelib.c +++ b/dlls/typelib.dll16/typelib.c @@ -82,14 +82,14 @@ QueryPathOfRegTypeLib16( TRACE("\n"); if (HIWORD(guid)) { - sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", + sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%lx\\win16", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7], wMaj,wMin,lcid); } else { - sprintf(xguid,"<guid 0x%08x>",(DWORD)guid); - FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); + sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid); + FIXME("(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path); return E_FAIL; } plen = sizeof(pathname);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/uianimation/Makefile.in | 1 - dlls/uianimation/main.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index cac37bf3c79..e632e19bd7c 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uianimation.dll IMPORTS = uuid diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index be09256d2fa..c338d836978 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -139,7 +139,7 @@ static ULONG WINAPI animation_storyboard_AddRef( IUIAnimationStoryboard *iface ) struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -148,7 +148,7 @@ static ULONG WINAPI animation_storyboard_Release( IUIAnimationStoryboard *iface struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -359,7 +359,7 @@ static ULONG WINAPI animation_var_AddRef( IUIAnimationVariable *iface ) struct animation_var *This = impl_from_IUIAnimationVariable( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -368,7 +368,7 @@ static ULONG WINAPI animation_var_Release( IUIAnimationVariable *iface ) struct animation_var *This = impl_from_IUIAnimationVariable( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -548,7 +548,7 @@ static ULONG WINAPI manager_AddRef( IUIAnimationManager *iface ) struct manager *This = impl_from_IUIAnimationManager( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -557,7 +557,7 @@ static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) struct manager *This = impl_from_IUIAnimationManager( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { @@ -781,7 +781,7 @@ static ULONG WINAPI timer_AddRef( IUIAnimationTimer *iface ) struct timer *This = impl_from_IUIAnimationTimer( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -790,7 +790,7 @@ static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) struct timer *This = impl_from_IUIAnimationTimer( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -918,7 +918,7 @@ static ULONG WINAPI tr_factory_AddRef( IUIAnimationTransitionFactory *iface ) struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -927,7 +927,7 @@ static ULONG WINAPI tr_factory_Release( IUIAnimationTransitionFactory *iface ) struct tr_factory *This = impl_from_IUIAnimationTransitionFactory( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This ); @@ -1005,7 +1005,7 @@ static ULONG WINAPI tr_library_AddRef( IUIAnimationTransitionLibrary *iface ) struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -1014,7 +1014,7 @@ static ULONG WINAPI tr_library_Release( IUIAnimationTransitionLibrary *iface ) struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) heap_free( This );
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/uiautomationcore/Makefile.in | 1 - dlls/uiautomationcore/uia_main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 919314c16d9..f0973fdec4c 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore IMPORTS = uuid ole32 oleaut32 user32 diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index f1cf06ed4f5..c250d82a1e6 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -52,7 +52,7 @@ static ULONG WINAPI uia_object_wrapper_AddRef(IUnknown *iface) struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&wrapper->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -62,7 +62,7 @@ static ULONG WINAPI uia_object_wrapper_Release(IUnknown *iface) struct uia_object_wrapper *wrapper = impl_uia_object_wrapper_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&wrapper->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) { IUnknown_Release(wrapper->marshaler); @@ -178,7 +178,7 @@ ULONG WINAPI hwnd_host_provider_AddRef(IRawElementProviderSimple *iface) struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); ULONG refcount = InterlockedIncrement(&host_prov->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); return refcount; } @@ -188,7 +188,7 @@ ULONG WINAPI hwnd_host_provider_Release(IRawElementProviderSimple *iface) struct hwnd_host_provider *host_prov = impl_from_hwnd_host_provider(iface); ULONG refcount = InterlockedDecrement(&host_prov->refcount); - TRACE("%p, refcount %d\n", iface, refcount); + TRACE("%p, refcount %ld\n", iface, refcount); if (!refcount) heap_free(host_prov); @@ -311,7 +311,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov) { - FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov); + FIXME("(%p, %Ix, %Ix, %p) stub!\n", hwnd, wParam, lParam, elprov); return 0; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/uiribbon/Makefile.in | 1 - dlls/uiribbon/uiribbon.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index 19753ea19ed..0b9724d87a9 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = uiribbon.dll IMPORTS = uuid ole32 diff --git a/dlls/uiribbon/uiribbon.c b/dlls/uiribbon/uiribbon.c index 18cb4870f9a..38fd60cd533 100644 --- a/dlls/uiribbon/uiribbon.c +++ b/dlls/uiribbon/uiribbon.c @@ -56,7 +56,7 @@ static ULONG WINAPI UIRibbonFrameworkImpl_AddRef(IUIFramework *iface) UIRibbonFrameworkImpl *This = impl_from_IUIFramework(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %ld\n", iface, This, ref); return ref; } @@ -66,7 +66,7 @@ static ULONG WINAPI UIRibbonFrameworkImpl_Release(IUIFramework *iface) UIRibbonFrameworkImpl *This = impl_from_IUIFramework(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %ld\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/url/Makefile.in | 1 - dlls/url/url_main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/url/Makefile.in b/dlls/url/Makefile.in index 44798189827..141d0c65655 100644 --- a/dlls/url/Makefile.in +++ b/dlls/url/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = url.dll IMPORTLIB = url IMPORTS = shell32 shlwapi diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 697ce0e05df..f4f70cd7491 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -56,7 +56,7 @@ DWORD WINAPI AddMIMEFileTypesPS(VOID * unknown1, LPPROPSHEETHEADERA lppsh) */ BOOL WINAPI InetIsOffline(DWORD flags) { - FIXME("(%08x): stub!\n", flags); + FIXME("(%08lx): stub!\n", flags); return FALSE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/urlmon/Makefile.in | 2 dlls/urlmon/axinstall.c | 10 +- dlls/urlmon/bindctx.c | 36 ++++--- dlls/urlmon/binding.c | 90 +++++++++--------- dlls/urlmon/bindprot.c | 52 +++++----- dlls/urlmon/download.c | 22 ++-- dlls/urlmon/file.c | 24 ++--- dlls/urlmon/format.c | 10 +- dlls/urlmon/ftp.c | 30 +++--- dlls/urlmon/gopher.c | 22 ++-- dlls/urlmon/http.c | 72 +++++++------- dlls/urlmon/internet.c | 44 ++++----- dlls/urlmon/mimefilter.c | 28 +++--- dlls/urlmon/mk.c | 26 +++-- dlls/urlmon/protocol.c | 24 ++--- dlls/urlmon/sec_mgr.c | 110 +++++++++++----------- dlls/urlmon/session.c | 36 ++++--- dlls/urlmon/umon.c | 22 ++-- dlls/urlmon/umstream.c | 10 +- dlls/urlmon/uri.c | 226 +++++++++++++++++++++++---------------------- dlls/urlmon/urlmon_main.c | 26 +++-- dlls/urlmon/usrmarshal.c | 18 ++-- 22 files changed, 470 insertions(+), 470 deletions(-) diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in index f24a365382f..f95e7972829 100644 --- a/dlls/urlmon/Makefile.in +++ b/dlls/urlmon/Makefile.in @@ -1,7 +1,7 @@ MODULE = urlmon.dll IMPORTLIB = urlmon IMPORTS = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32 -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_URLMON_ +EXTRADEFS = -D_URLMON_ DELAYIMPORTS = advpack C_SRCS = \ diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index 2a8c2c45760..9d5e99ccc7d 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -74,7 +74,7 @@ static HRESULT extract_cab_file(install_ctx_t *ctx) hres = ExtractFilesW(ctx->cache_file, ctx->tmp_dir, 0, NULL, NULL, 0); if(FAILED(hres)) { - WARN("ExtractFilesW failed: %08x\n", hres); + WARN("ExtractFilesW failed: %08lx\n", hres); return hres; } @@ -255,7 +255,7 @@ static HRESULT install_inf_file(install_ctx_t *ctx) hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, sect_name, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); if(FAILED(hres)) { - WARN("RunSetupCommandW failed: %08x\n", hres); + WARN("RunSetupCommandW failed: %08lx\n", hres); return hres; } } @@ -264,7 +264,7 @@ static HRESULT install_inf_file(install_ctx_t *ctx) if(default_install) { hres = RunSetupCommandW(ctx->hwnd, ctx->install_file, NULL, ctx->tmp_dir, NULL, NULL, RSC_FLAG_INF, NULL); if(FAILED(hres)) { - WARN("RunSetupCommandW failed: %08x\n", hres); + WARN("RunSetupCommandW failed: %08lx\n", hres); return hres; } } @@ -474,7 +474,7 @@ static HRESULT distunit_on_stop(void *ctx, const WCHAR *cache_file, HRESULT hres { install_ctx_t *install_ctx = ctx; - TRACE("(%p %s %08x %s)\n", ctx, debugstr_w(cache_file), hresult, debugstr_w(error_str)); + TRACE("(%p %s %08lx %s)\n", ctx, debugstr_w(cache_file), hresult, debugstr_w(error_str)); if(hresult == S_OK) { hresult = install_file(install_ctx, cache_file); @@ -499,7 +499,7 @@ HRESULT WINAPI AsyncInstallDistributionUnit(const WCHAR *szDistUnit, const WCHAR install_ctx_t *ctx; HRESULT hres; - TRACE("(%s %s %s %x %x %s %p %p %x)\n", debugstr_w(szDistUnit), debugstr_w(szTYPE), debugstr_w(szExt), + TRACE("(%s %s %s %lx %lx %s %p %p %lx)\n", debugstr_w(szDistUnit), debugstr_w(szTYPE), debugstr_w(szExt), dwFileVersionMS, dwFileVersionLS, debugstr_w(szURL), pbc, pvReserved, flags); if(szDistUnit || szTYPE || szExt) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 406232467c3..bac3ca0a3ee 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -146,7 +146,7 @@ static ULONG WINAPI BindStatusCallback_AddRef(IBindStatusCallbackEx *iface) BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("(%p) ref = %ld\n", This, ref); return ref; } @@ -156,7 +156,7 @@ static ULONG WINAPI BindStatusCallback_Release(IBindStatusCallbackEx *iface) BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("(%p) ref = %ld\n", This, ref); if(!ref) { if(This->serv_prov) @@ -173,7 +173,7 @@ static HRESULT WINAPI BindStatusCallback_OnStartBinding(IBindStatusCallbackEx *i { BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); - TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); + TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind); return IBindStatusCallback_OnStartBinding(This->callback, 0xff, pbind); } @@ -191,7 +191,7 @@ static HRESULT WINAPI BindStatusCallback_OnLowResource(IBindStatusCallbackEx *if { BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); - TRACE("(%p)->(%d)\n", This, reserved); + TRACE("(%p)->(%ld)\n", This, reserved); return IBindStatusCallback_OnLowResource(This->callback, reserved); } @@ -201,7 +201,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallbackEx *iface { BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); - TRACE("%p)->(%u %u %s %s)\n", This, ulProgress, ulProgressMax, debugstr_bindstatus(ulStatusCode), + TRACE("%p)->(%lu %lu %s %s)\n", This, ulProgress, ulProgressMax, debugstr_bindstatus(ulStatusCode), debugstr_w(szStatusText)); return IBindStatusCallback_OnProgress(This->callback, ulProgress, @@ -213,7 +213,7 @@ static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallbackEx *if { BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); - TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); return IBindStatusCallback_OnStopBinding(This->callback, hresult, szError); } @@ -245,7 +245,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallbackEx * { BindStatusCallback *This = impl_from_IBindStatusCallbackEx(iface); - TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); return IBindStatusCallback_OnDataAvailable(This->callback, grfBSCF, dwSize, pformatetc, pstgmed); } @@ -393,7 +393,7 @@ static HRESULT WINAPI BSCHttpNegotiate_BeginningTransaction(IHttpNegotiate2 *ifa IHttpNegotiate *http_negotiate; HRESULT hres = S_OK; - TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + TRACE("(%p)->(%s %s %ld %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); *pszAdditionalHeaders = NULL; @@ -417,7 +417,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD IHttpNegotiate *http_negotiate; HRESULT hres = S_OK; - TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + TRACE("(%p)->(%ld %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); http_negotiate = get_callback_iface(This, &IID_IHttpNegotiate); @@ -442,7 +442,7 @@ static HRESULT WINAPI BSCHttpNegotiate_GetRootSecurityId(IHttpNegotiate2 *iface, IHttpNegotiate2 *http_negotiate2; HRESULT hres = E_FAIL; - TRACE("(%p)->(%p %p %ld)\n", This, pbSecurityId, pcbSecurityId, dwReserved); + TRACE("(%p)->(%p %p %Id)\n", This, pbSecurityId, pcbSecurityId, dwReserved); http_negotiate2 = get_callback_iface(This, &IID_IHttpNegotiate2); if(http_negotiate2) { @@ -538,7 +538,7 @@ static HRESULT WINAPI BSCInternetBindInfo_GetBindString(IInternetBindInfo *iface IInternetBindInfo *bind_info; HRESULT hres; - TRACE("(%p)->(%d %p %d %p)\n", This, string_type, strs, cnt, fetched); + TRACE("(%p)->(%ld %p %ld %p)\n", This, string_type, strs, cnt, fetched); hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetBindInfo, (void**)&bind_info); if(FAILED(hres)) @@ -619,7 +619,7 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb IBindStatusCallback *bsc, *prev = NULL; HRESULT hres; - TRACE("(%p %p %p %x)\n", pbc, pbsc, ppbscPrevious, dwReserved); + TRACE("(%p %p %p %lx)\n", pbc, pbsc, ppbscPrevious, dwReserved); if (!pbc || !pbsc) return E_INVALIDARG; @@ -737,7 +737,7 @@ static ULONG WINAPI AsyncBindCtx_AddRef(IBindCtx *iface) AsyncBindCtx *This = impl_from_IBindCtx(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -747,7 +747,7 @@ static ULONG WINAPI AsyncBindCtx_Release(IBindCtx *iface) AsyncBindCtx *This = impl_from_IBindCtx(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { IBindCtx_Release(This->bindctx); @@ -871,7 +871,7 @@ static HRESULT init_bindctx(IBindCtx *bindctx, DWORD options, HRESULT hres; if(options) - FIXME("not supported options %08x\n", options); + FIXME("not supported options %08lx\n", options); if(format) FIXME("format is not supported\n"); @@ -902,7 +902,7 @@ HRESULT WINAPI CreateAsyncBindCtx(DWORD reserved, IBindStatusCallback *callback, IBindCtx *bindctx; HRESULT hres; - TRACE("(%08x %p %p %p)\n", reserved, callback, format, pbind); + TRACE("(%08lx %p %p %p)\n", reserved, callback, format, pbind); if(!pbind || !callback) return E_INVALIDARG; @@ -934,13 +934,13 @@ HRESULT WINAPI CreateAsyncBindCtxEx(IBindCtx *ibind, DWORD options, IBindCtx *bindctx; HRESULT hres; - TRACE("(%p %08x %p %p %p %d)\n", ibind, options, callback, format, pbind, reserved); + TRACE("(%p %08lx %p %p %p %ld)\n", ibind, options, callback, format, pbind, reserved); if(!pbind) return E_INVALIDARG; if(reserved) - WARN("reserved=%d\n", reserved); + WARN("reserved=%ld\n", reserved); if(ibind) { IBindCtx_AddRef(ibind); diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index a74970033b3..59f7430eafd 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -131,15 +131,15 @@ static void dump_BINDINFO(BINDINFO *bi) TRACE("\n" "BINDINFO = {\n" - " %d, %s,\n" - " {%d, %p, %p},\n" + " %ld, %s,\n" + " {%ld, %p, %p},\n" " %s,\n" " %s,\n" " %s,\n" - " %d, %08x, %d, %d\n" - " {%d %p %x},\n" + " %ld, %08lx, %ld, %ld\n" + " {%ld %p %x},\n" " %s\n" - " %p, %d\n" + " %p, %ld\n" "}\n", bi->cbSize, debugstr_w(bi->szExtraInfo), @@ -206,7 +206,7 @@ static LPWSTR get_mime_clsid(LPCWSTR mime, CLSID *clsid) res = RegOpenKeyW(HKEY_CLASSES_ROOT, key_name, &hkey); heap_free(key_name); if(res != ERROR_SUCCESS) { - WARN("Could not open MIME key: %x\n", res); + WARN("Could not open MIME key: %lx\n", res); return NULL; } @@ -215,14 +215,14 @@ static LPWSTR get_mime_clsid(LPCWSTR mime, CLSID *clsid) res = RegQueryValueExW(hkey, L"CLSID", NULL, &type, (BYTE*)ret, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) { - WARN("Could not get CLSID: %08x\n", res); + WARN("Could not get CLSID: %08lx\n", res); heap_free(ret); return NULL; } hres = CLSIDFromString(ret, clsid); if(FAILED(hres)) { - WARN("Could not parse CLSID: %08x\n", hres); + WARN("Could not parse CLSID: %08lx\n", hres); heap_free(ret); return NULL; } @@ -237,7 +237,7 @@ static void load_doc_mon(Binding *binding, IPersistMoniker *persist) hres = CreateAsyncBindCtxEx(binding->bctx, 0, NULL, NULL, &bctx, 0); if(FAILED(hres)) { - WARN("CreateAsyncBindCtxEx failed: %08x\n", hres); + WARN("CreateAsyncBindCtxEx failed: %08lx\n", hres); return; } @@ -248,7 +248,7 @@ static void load_doc_mon(Binding *binding, IPersistMoniker *persist) IBindCtx_RevokeObjectParam(bctx, cbinding_contextW); IBindCtx_Release(bctx); if(FAILED(hres)) - FIXME("Load failed: %08x\n", hres); + FIXME("Load failed: %08lx\n", hres); } static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR clsid_str) @@ -259,7 +259,7 @@ static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR hres = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &binding->iid, (void**)&binding->obj); if(FAILED(hres)) { - WARN("CoCreateInstance failed: %08x\n", hres); + WARN("CoCreateInstance failed: %08lx\n", hres); return INET_E_CANNOT_INSTANTIATE_OBJECT; } @@ -280,7 +280,7 @@ static HRESULT create_mime_object(Binding *binding, const CLSID *clsid, LPCWSTR IPersistMoniker_Release(persist); }else { - FIXME("Could not get IPersistMoniker: %08x\n", hres); + FIXME("Could not get IPersistMoniker: %08lx\n", hres); /* FIXME: Try query IPersistFile */ } @@ -330,7 +330,7 @@ static void cache_file_available(Binding *This, const WCHAR *file_name) This->stgmed_buf->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(This->stgmed_buf->file == INVALID_HANDLE_VALUE) - WARN("CreateFile failed: %u\n", GetLastError()); + WARN("CreateFile failed: %lu\n", GetLastError()); } } @@ -362,7 +362,7 @@ static ULONG WINAPI StgMedUnk_AddRef(IUnknown *iface) stgmed_buf_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -372,7 +372,7 @@ static ULONG WINAPI StgMedUnk_Release(IUnknown *iface) stgmed_buf_t *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { if(This->file != INVALID_HANDLE_VALUE) @@ -457,7 +457,7 @@ static ULONG WINAPI ProtocolStream_AddRef(IStream *iface) ProtocolStream *This = impl_from_IStream(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -467,7 +467,7 @@ static ULONG WINAPI ProtocolStream_Release(IStream *iface) ProtocolStream *This = impl_from_IStream(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { IUnknown_Release(&This->buf->IUnknown_iface); @@ -486,7 +486,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, DWORD read = 0; HRESULT hres; - TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbRead); if(This->buf->file == INVALID_HANDLE_VALUE) { hres = This->buf->hres = IInternetProtocolEx_Read(This->buf->protocol, (PBYTE)pv, cb, &read); @@ -500,7 +500,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, if(hres == E_PENDING) return E_PENDING; else if(FAILED(hres)) - FIXME("Read failed: %08x\n", hres); + FIXME("Read failed: %08lx\n", hres); return read ? S_OK : S_FALSE; } @@ -510,7 +510,7 @@ static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv, { ProtocolStream *This = impl_from_IStream(iface); - TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbWritten); + TRACE("(%p)->(%p %ld %p)\n", This, pv, cb, pcbWritten); return STG_E_ACCESSDENIED; } @@ -522,7 +522,7 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove LARGE_INTEGER new_pos; DWORD method; - TRACE("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + TRACE("(%p)->(%ld %08lx %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); if(This->buf->file == INVALID_HANDLE_VALUE) { /* We should probably call protocol handler's Seek. */ @@ -541,12 +541,12 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove method = FILE_END; break; default: - WARN("Invalid origin %x\n", dwOrigin); + WARN("Invalid origin %lx\n", dwOrigin); return E_FAIL; } if(!SetFilePointerEx(This->buf->file, dlibMove, &new_pos, method)) { - FIXME("SetFilePointerEx failed: %u\n", GetLastError()); + FIXME("SetFilePointerEx failed: %lu\n", GetLastError()); return E_FAIL; } @@ -558,7 +558,7 @@ static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%d)\n", This, libNewSize.u.LowPart); + FIXME("(%p)->(%ld)\n", This, libNewSize.u.LowPart); return E_NOTIMPL; } @@ -566,7 +566,7 @@ static HRESULT WINAPI ProtocolStream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%p %d %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); + FIXME("(%p)->(%p %ld %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); return E_NOTIMPL; } @@ -574,7 +574,7 @@ static HRESULT WINAPI ProtocolStream_Commit(IStream *iface, DWORD grfCommitFlags { ProtocolStream *This = impl_from_IStream(iface); - TRACE("(%p)->(%08x)\n", This, grfCommitFlags); + TRACE("(%p)->(%08lx)\n", This, grfCommitFlags); return E_NOTIMPL; } @@ -592,7 +592,7 @@ static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER l ULARGE_INTEGER cb, DWORD dwLockType) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); return E_NOTIMPL; } @@ -600,7 +600,7 @@ static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ProtocolStream *This = impl_from_IStream(iface); - FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); + FIXME("(%p)->(%ld %ld %ld)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); return E_NOTIMPL; } @@ -608,7 +608,7 @@ static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg, DWORD dwStatFlag) { ProtocolStream *This = impl_from_IStream(iface); - TRACE("(%p)->(%p %08x)\n", This, pstatstg, dwStatFlag); + TRACE("(%p)->(%p %08lx)\n", This, pstatstg, dwStatFlag); if(!pstatstg) return E_FAIL; @@ -832,7 +832,7 @@ static ULONG WINAPI Binding_AddRef(IBinding *iface) Binding *This = impl_from_IBinding(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -842,7 +842,7 @@ static ULONG WINAPI Binding_Release(IBinding *iface) Binding *This = impl_from_IBinding(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { if(This->notif_hwnd) @@ -914,7 +914,7 @@ static HRESULT WINAPI Binding_Resume(IBinding *iface) static HRESULT WINAPI Binding_SetPriority(IBinding *iface, LONG nPriority) { Binding *This = impl_from_IBinding(iface); - FIXME("(%p)->(%d)\n", This, nPriority); + FIXME("(%p)->(%ld)\n", This, nPriority); return E_NOTIMPL; } @@ -1067,7 +1067,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink case BINDSTATUS_ACCEPTRANGES: break; default: - FIXME("Unhandled status code %d\n", ulStatusCode); + FIXME("Unhandled status code %ld\n", ulStatusCode); return E_NOTIMPL; }; @@ -1079,7 +1079,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; BOOL sent_begindownloaddata = FALSE; - TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); + TRACE("(%p)->(%ld %lu %lu)\n", This, bscf, progress, progress_max); if(This->download_state == END_DOWNLOAD || (This->state & BINDING_ABORTED)) { read_protocol_data(This->stgmed_buf); @@ -1149,7 +1149,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres BINDSTATUS_ENDDOWNLOADDATA, This->url); } - WARN("OnDataAvailable returned %x\n", hres); + WARN("OnDataAvailable returned %lx\n", hres); stop_binding(This, hres, NULL); return; } @@ -1164,7 +1164,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa { Binding *This = impl_from_IInternetProtocolSink(iface); - TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + TRACE("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); report_data(This, grfBSCF, ulProgress, ulProgressMax); return S_OK; @@ -1175,7 +1175,7 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i { Binding *This = impl_from_IInternetProtocolSink(iface); - TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); stop_binding(This, hrResult, szResult); @@ -1233,7 +1233,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, { Binding *This = impl_from_IInternetBindInfo(iface); - TRACE("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); + TRACE("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); switch(ulStringType) { case BINDSTRING_ACCEPT_MIMES: { @@ -1273,7 +1273,7 @@ static HRESULT WINAPI InternetBindInfo_GetBindString(IInternetBindInfo *iface, } } - FIXME("not supported string type %d\n", ulStringType); + FIXME("not supported string type %ld\n", ulStringType); return E_NOTIMPL; } @@ -1315,7 +1315,7 @@ static HRESULT WINAPI WinInetHttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD IWinInetInfo *wininet_info; HRESULT hres; - TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + TRACE("(%p)->(%lx %p %p)\n", This, dwOption, pBuffer, pcbBuffer); hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface, &IID_IWinInetInfo, (void**)&wininet_info); @@ -1334,7 +1334,7 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD d IWinInetHttpInfo *http_info; HRESULT hres; - TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + TRACE("(%p)->(%lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); hres = IInternetProtocolEx_QueryInterface(&This->protocol->IInternetProtocolEx_iface, &IID_IWinInetHttpInfo, (void**)&http_info); @@ -1503,12 +1503,12 @@ static HRESULT Binding_Create(IMoniker *mon, Binding *binding_ctx, IUri *uri, IB hres = IBindStatusCallback_GetBindInfo(ret->callback, &ret->bindf, &ret->bindinfo); if(FAILED(hres)) { - WARN("GetBindInfo failed: %08x\n", hres); + WARN("GetBindInfo failed: %08lx\n", hres); IBinding_Release(&ret->IBinding_iface); return hres; } - TRACE("bindf %08x\n", ret->bindf); + TRACE("bindf %08lx\n", ret->bindf); dump_BINDINFO(&ret->bindinfo); ret->bindf |= BINDF_FROMURLMON; @@ -1566,7 +1566,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBi hres = IBindStatusCallback_OnStartBinding(binding->callback, 0, &binding->IBinding_iface); if(FAILED(hres)) { - WARN("OnStartBinding failed: %08x\n", hres); + WARN("OnStartBinding failed: %08lx\n", hres); if(hres != E_ABORT && hres != E_NOTIMPL) hres = INET_E_DOWNLOAD_FAILURE; @@ -1587,7 +1587,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, IUri *uri, IBi &binding->IInternetProtocolSink_iface, &binding->IInternetBindInfo_iface, PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); - TRACE("start ret %08x\n", hres); + TRACE("start ret %08lx\n", hres); if(FAILED(hres) && hres != E_PENDING) { stop_binding(binding, hres, NULL); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1cf1adcb8f6..34eb5a499da 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -234,7 +234,7 @@ static void mime_available(BindProtocol *This, LPCWSTR mime, BOOL verified) hres = handle_mime_filter(This, mime_filter); IInternetProtocol_Release(mime_filter); if(FAILED(hres)) - FIXME("MIME filter failed: %08x\n", hres); + FIXME("MIME filter failed: %08lx\n", hres); } if(This->reported_mime || verified || !(This->pi & PI_MIMEVERIFICATION)) { @@ -282,7 +282,7 @@ static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocolEx *iface, RE }else if(This->protocol_unk) { HRESULT hres; hres = IUnknown_QueryInterface(This->protocol_unk, riid, ppv); - TRACE("(%p) aggregated handler returned %08x for %s\n", This, hres, debugstr_guid(riid)); + TRACE("(%p) aggregated handler returned %08lx for %s\n", This, hres, debugstr_guid(riid)); return hres; }else { WARN("not supported interface %s\n", debugstr_guid(riid)); @@ -299,7 +299,7 @@ static ULONG WINAPI BindProtocol_AddRef(IInternetProtocolEx *iface) { BindProtocol *This = impl_from_IInternetProtocolEx(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -329,7 +329,7 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocolEx *iface) BindProtocol *This = impl_from_IInternetProtocolEx(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { release_protocol_handler(This); @@ -365,7 +365,7 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU IUri *uri; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); @@ -393,7 +393,7 @@ static HRESULT WINAPI BindProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrR { BindProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return IInternetProtocol_Abort(This->protocol_handler, hrReason, dwOptions); } @@ -402,7 +402,7 @@ static HRESULT WINAPI BindProtocol_Terminate(IInternetProtocolEx *iface, DWORD d { BindProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return IInternetProtocol_Terminate(This->protocol_handler, dwOptions); } @@ -426,7 +426,7 @@ static HRESULT WINAPI BindProtocol_Read(IInternetProtocolEx *iface, void *pv, { BindProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); if(pcbRead) *pcbRead = 0; @@ -437,7 +437,7 @@ static HRESULT WINAPI BindProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { BindProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -445,7 +445,7 @@ static HRESULT WINAPI BindProtocol_LockRequest(IInternetProtocolEx *iface, DWORD { BindProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return IInternetProtocol_LockRequest(This->protocol_handler, dwOptions); } @@ -473,7 +473,7 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr LPOLESTR clsid_str; HRESULT hres; - TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved); + TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(!pUri || !pOIProtSink || !pOIBindInfo) return E_INVALIDARG; @@ -681,7 +681,7 @@ static HRESULT WINAPI ProtocolHandler_Abort(IInternetProtocol *iface, HRESULT hr { BindProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); if(This->protocol && !This->reported_result) return IInternetProtocol_Abort(This->protocol, hrReason, dwOptions); @@ -693,7 +693,7 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD { BindProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); if(!This->reported_result) return E_FAIL; @@ -747,7 +747,7 @@ static HRESULT WINAPI ProtocolHandler_Read(IInternetProtocol *iface, void *pv, ULONG read = 0; HRESULT hres = S_OK; - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); if(This->buf_size) { read = min(cb, This->buf_size); @@ -796,7 +796,7 @@ static HRESULT WINAPI ProtocolHandler_Seek(IInternetProtocol *iface, LARGE_INTEG DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { BindProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -804,7 +804,7 @@ static HRESULT WINAPI ProtocolHandler_LockRequest(IInternetProtocol *iface, DWOR { BindProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return IInternetProtocol_LockRequest(This->protocol, dwOptions); } @@ -909,7 +909,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportProgress(IInternetProtocolSink * break; default: - FIXME("unsupported ulStatusCode %u\n", status_code); + FIXME("unsupported ulStatusCode %lu\n", status_code); } return S_OK; @@ -990,7 +990,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportData(IInternetProtocolSink *ifac BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface); HRESULT hres; - TRACE("(%p)->(%x %u %u)\n", This, bscf, progress, progress_max); + TRACE("(%p)->(%lx %lu %lu)\n", This, bscf, progress, progress_max); This->bscf = bscf; This->progress = progress; @@ -1039,7 +1039,7 @@ static HRESULT WINAPI ProtocolSinkHandler_ReportResult(IInternetProtocolSink *if { BindProtocol *This = impl_from_IInternetProtocolSinkHandler(iface); - TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); if(hrResult == INET_E_REDIRECT_FAILED) { hrResult = handle_redirect(This, szResult); @@ -1097,7 +1097,7 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, hres = IInternetBindInfo_GetBindInfo(This->bind_info, grfBINDF, pbindinfo); if(FAILED(hres)) { - WARN("GetBindInfo failed: %08x\n", hres); + WARN("GetBindInfo failed: %08lx\n", hres); return hres; } @@ -1121,7 +1121,7 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, { BindProtocol *This = impl_from_IInternetBindInfo(iface); - TRACE("(%p)->(%d %p %d %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); + TRACE("(%p)->(%ld %p %ld %p)\n", This, ulStringType, ppwzStr, cEl, pcElFetched); return IInternetBindInfo_GetBindString(This->bind_info, ulStringType, ppwzStr, cEl, pcElFetched); } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LON { BindProtocol *This = impl_from_IInternetPriority(iface); - TRACE("(%p)->(%d)\n", This, nPriority); + TRACE("(%p)->(%ld)\n", This, nPriority); This->priority = nPriority; return S_OK; @@ -1233,7 +1233,7 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface TRACE("(%p)->(%p)\n", This, pProtocolData); - TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState, + TRACE("flags %lx state %lx data %p cb %lu\n", pProtocolData->grfFlags, pProtocolData->dwState, pProtocolData->pData, pProtocolData->cbData); data = heap_alloc(sizeof(PROTOCOLDATA)); @@ -1283,7 +1283,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin { BindProtocol *This = impl_from_IInternetProtocolSink(iface); - TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + TRACE("(%p)->(%lu %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); if(do_direct_notif(This)) { IInternetProtocolSink_ReportProgress(This->protocol_sink_handler, ulStatusCode, szStatusText); @@ -1323,7 +1323,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i { BindProtocol *This = impl_from_IInternetProtocolSink(iface); - TRACE("(%p)->(%x %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + TRACE("(%p)->(%lx %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); if(!This->protocol_sink) return S_OK; @@ -1370,7 +1370,7 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink { BindProtocol *This = impl_from_IInternetProtocolSink(iface); - TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + TRACE("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); if(!This->protocol_sink) return E_FAIL; diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index ca81818caaa..98c2f81b32f 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -79,7 +79,7 @@ static ULONG WINAPI DownloadBSC_AddRef(IBindStatusCallback *iface) DownloadBSC *This = impl_from_IBindStatusCallback(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("(%p) ref = %ld\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI DownloadBSC_Release(IBindStatusCallback *iface) DownloadBSC *This = impl_from_IBindStatusCallback(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref = %d\n", This, ref); + TRACE("(%p) ref = %ld\n", This, ref); if(!ref) { if(This->callback) @@ -110,7 +110,7 @@ static HRESULT WINAPI DownloadBSC_OnStartBinding(IBindStatusCallback *iface, DownloadBSC *This = impl_from_IBindStatusCallback(iface); HRESULT hres = S_OK; - TRACE("(%p)->(%d %p)\n", This, dwReserved, pbind); + TRACE("(%p)->(%ld %p)\n", This, dwReserved, pbind); if(This->callback) { hres = IBindStatusCallback_OnStartBinding(This->callback, dwReserved, pbind); @@ -133,7 +133,7 @@ static HRESULT WINAPI DownloadBSC_GetPriority(IBindStatusCallback *iface, LONG * static HRESULT WINAPI DownloadBSC_OnLowResource(IBindStatusCallback *iface, DWORD reserved) { DownloadBSC *This = impl_from_IBindStatusCallback(iface); - FIXME("(%p)->(%d)\n", This, reserved); + FIXME("(%p)->(%ld)\n", This, reserved); return E_NOTIMPL; } @@ -161,7 +161,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u DownloadBSC *This = impl_from_IBindStatusCallback(iface); HRESULT hres = S_OK; - TRACE("%p)->(%u %u %u %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, + TRACE("%p)->(%lu %lu %lu %s)\n", This, ulProgress, ulProgressMax, ulStatusCode, debugstr_w(szStatusText)); switch(ulStatusCode) { @@ -183,7 +183,7 @@ static HRESULT WINAPI DownloadBSC_OnProgress(IBindStatusCallback *iface, ULONG u break; default: - FIXME("Unsupported status %u\n", ulStatusCode); + FIXME("Unsupported status %lu\n", ulStatusCode); } return hres; @@ -195,7 +195,7 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, DownloadBSC *This = impl_from_IBindStatusCallback(iface); HRESULT hres = S_OK; - TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); + TRACE("(%p)->(%08lx %s)\n", This, hresult, debugstr_w(szError)); if(This->file_name) { if(This->cache_file) { @@ -203,7 +203,7 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, b = CopyFileW(This->cache_file, This->file_name, FALSE); if(!b) - FIXME("CopyFile failed: %u\n", GetLastError()); + FIXME("CopyFile failed: %lu\n", GetLastError()); }else { FIXME("No cache file\n"); } @@ -251,7 +251,7 @@ static HRESULT WINAPI DownloadBSC_OnDataAvailable(IBindStatusCallback *iface, { DownloadBSC *This = impl_from_IBindStatusCallback(iface); - TRACE("(%p)->(%08x %d %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); return S_OK; } @@ -433,7 +433,7 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller, LPCWSTR szURL, LPCWSTR szFi IBindCtx *bindctx; HRESULT hres; - TRACE("(%p %s %s %d %p)\n", pCaller, debugstr_w(szURL), debugstr_w(szFileName), dwReserved, lpfnCB); + TRACE("(%p %s %s %ld %p)\n", pCaller, debugstr_w(szURL), debugstr_w(szFileName), dwReserved, lpfnCB); if(pCaller) FIXME("pCaller not supported\n"); @@ -485,7 +485,7 @@ HRESULT WINAPI URLDownloadToFileA(LPUNKNOWN pCaller, LPCSTR szURL, LPCSTR szFile LPWSTR urlW, file_nameW; HRESULT hres; - TRACE("(%p %s %s %d %p)\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB); + TRACE("(%p %s %s %ld %p)\n", pCaller, debugstr_a(szURL), debugstr_a(szFileName), dwReserved, lpfnCB); urlW = heap_strdupAtoW(szURL); file_nameW = heap_strdupAtoW(szFileName); diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index f2a8d983251..a21a69da7a1 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -88,7 +88,7 @@ static ULONG WINAPI FileProtocolUnk_AddRef(IUnknown *iface) { FileProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -97,7 +97,7 @@ static ULONG WINAPI FileProtocolUnk_Release(IUnknown *iface) FileProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { if(This->file != INVALID_HANDLE_VALUE) @@ -145,7 +145,7 @@ static HRESULT WINAPI FileProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU IUri *uri; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = CreateUri(szUrl, Uri_CREATE_FILE_USE_DOS_PATH, 0, &uri); @@ -170,7 +170,7 @@ static HRESULT WINAPI FileProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrR DWORD dwOptions) { FileProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return E_NOTIMPL; } @@ -178,7 +178,7 @@ static HRESULT WINAPI FileProtocol_Terminate(IInternetProtocolEx *iface, DWORD d { FileProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return S_OK; } @@ -203,7 +203,7 @@ static HRESULT WINAPI FileProtocol_Read(IInternetProtocolEx *iface, void *pv, FileProtocol *This = impl_from_IInternetProtocolEx(iface); DWORD read = 0; - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); if (pcbRead) *pcbRead = 0; @@ -224,7 +224,7 @@ static HRESULT WINAPI FileProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { FileProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI FileProtocol_LockRequest(IInternetProtocolEx *iface, DWORD { FileProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return S_OK; } @@ -267,7 +267,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr BSTR ext; HRESULT hres; - TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, + TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(!pUri) @@ -284,7 +284,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr bindinfo.cbSize = sizeof(BINDINFO); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &grfBINDF, &bindinfo); if(FAILED(hres)) { - WARN("GetBindInfo failed: %08x\n", hres); + WARN("GetBindInfo failed: %08lx\n", hres); return hres; } @@ -305,7 +305,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr size = 0; hres = CoInternetParseIUri(pUri, PARSE_PATH_FROM_URL, 0, path, ARRAY_SIZE(path), &size, 0); if(FAILED(hres)) { - WARN("CoInternetParseIUri failed: %08x\n", hres); + WARN("CoInternetParseIUri failed: %08lx\n", hres); return report_result(pOIProtSink, hres, 0); } @@ -393,7 +393,7 @@ static HRESULT WINAPI FilePriority_SetPriority(IInternetPriority *iface, LONG nP { FileProtocol *This = impl_from_IInternetPriority(iface); - TRACE("(%p)->(%d)\n", This, nPriority); + TRACE("(%p)->(%ld)\n", This, nPriority); This->priority = nPriority; return S_OK; diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index c9e528ce35a..da8aae35bf9 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -62,7 +62,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) { EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -71,7 +71,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { heap_free(This->fetc); @@ -89,7 +89,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); ULONG cnt; - TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); if(!rgelt) return E_INVALIDARG; @@ -115,7 +115,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) { EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); - TRACE("(%p)->(%d)\n", This, celt); + TRACE("(%p)->(%ld)\n", This, celt); This->it += celt; return This->it > This->fetc_cnt ? S_FALSE : S_OK; @@ -193,7 +193,7 @@ HRESULT WINAPI CreateFormatEnumerator(UINT cfmtetc, FORMATETC *rgfmtetc, */ HRESULT WINAPI RegisterFormatEnumerator(LPBC pBC, IEnumFORMATETC *pEFetc, DWORD reserved) { - TRACE("(%p %p %d)\n", pBC, pEFetc, reserved); + TRACE("(%p %p %ld)\n", pBC, pEFetc, reserved); if(reserved) WARN("reserved != 0\n"); diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 8e6ec4eaf89..93f41a90a08 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -80,7 +80,7 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, (DWORD_PTR)&This->base); if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { - WARN("InternetOpenUrl failed: %d\n", GetLastError()); + WARN("InternetOpenUrl failed: %ld\n", GetLastError()); hres = INET_E_RESOURCE_NOT_FOUND; } } @@ -103,7 +103,7 @@ static HRESULT FtpProtocol_start_downloading(Protocol *prot) if(res) This->base.content_length = size; else - WARN("FtpGetFileSize failed: %d\n", GetLastError()); + WARN("FtpGetFileSize failed: %ld\n", GetLastError()); return S_OK; } @@ -114,7 +114,7 @@ static void FtpProtocol_close_connection(Protocol *prot) static void FtpProtocol_on_error(Protocol *prot, DWORD error) { - FIXME("(%p) %d - stub\n", prot, error); + FIXME("(%p) %ld - stub\n", prot, error); } static const ProtocolVtbl AsyncProtocolVtbl = { @@ -164,7 +164,7 @@ static ULONG WINAPI FtpProtocolUnk_AddRef(IUnknown *iface) { FtpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -173,7 +173,7 @@ static ULONG WINAPI FtpProtocolUnk_Release(IUnknown *iface) FtpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { protocol_close_connection(&This->base); @@ -220,7 +220,7 @@ static HRESULT WINAPI FtpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUr IUri *uri; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = CreateUri(szUrl, 0, 0, &uri); @@ -248,7 +248,7 @@ static HRESULT WINAPI FtpProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrRe { FtpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return protocol_abort(&This->base, hrReason); } @@ -257,7 +257,7 @@ static HRESULT WINAPI FtpProtocol_Terminate(IInternetProtocolEx *iface, DWORD dw { FtpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); protocol_close_connection(&This->base); return S_OK; @@ -282,7 +282,7 @@ static HRESULT WINAPI FtpProtocol_Read(IInternetProtocolEx *iface, void *pv, { FtpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); return protocol_read(&This->base, pv, cb, pcbRead); } @@ -291,7 +291,7 @@ static HRESULT WINAPI FtpProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGER DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { FtpProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -299,7 +299,7 @@ static HRESULT WINAPI FtpProtocol_LockRequest(IInternetProtocolEx *iface, DWORD { FtpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return protocol_lock_request(&This->base); } @@ -321,7 +321,7 @@ static HRESULT WINAPI FtpProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri DWORD scheme = 0; HRESULT hres; - TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, + TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = IUri_GetScheme(pUri, &scheme); @@ -373,7 +373,7 @@ static HRESULT WINAPI FtpPriority_SetPriority(IInternetPriority *iface, LONG nPr { FtpProtocol *This = impl_from_IInternetPriority(iface); - TRACE("(%p)->(%d)\n", This, nPriority); + TRACE("(%p)->(%ld)\n", This, nPriority); This->base.priority = nPriority; return S_OK; @@ -419,7 +419,7 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti void *pBuffer, DWORD *pcbBuffer) { FtpProtocol *This = impl_from_IWinInetHttpInfo(iface); - TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + TRACE("(%p)->(%lx %p %p)\n", This, dwOption, pBuffer, pcbBuffer); if(!This->base.request) return E_FAIL; @@ -433,7 +433,7 @@ static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { FtpProtocol *This = impl_from_IWinInetHttpInfo(iface); - TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + TRACE("(%p)->(%lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); if(!This->base.request) return E_FAIL; diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index 4087ed5ace2..1f67cb542dd 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -50,7 +50,7 @@ static HRESULT GopherProtocol_open_request(Protocol *prot, IUri *uri, DWORD requ request_flags, (DWORD_PTR)&This->base); SysFreeString(url); if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { - WARN("InternetOpenUrl failed: %d\n", GetLastError()); + WARN("InternetOpenUrl failed: %ld\n", GetLastError()); return INET_E_RESOURCE_NOT_FOUND; } @@ -73,7 +73,7 @@ static void GopherProtocol_close_connection(Protocol *prot) static void GopherProtocol_on_error(Protocol *prot, DWORD error) { - FIXME("(%p) %d - stub\n", prot, error); + FIXME("(%p) %ld - stub\n", prot, error); } static const ProtocolVtbl AsyncProtocolVtbl = { @@ -121,7 +121,7 @@ static ULONG WINAPI GopherProtocol_AddRef(IInternetProtocol *iface) { GopherProtocol *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -130,7 +130,7 @@ static ULONG WINAPI GopherProtocol_Release(IInternetProtocol *iface) GopherProtocol *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { heap_free(This); @@ -149,7 +149,7 @@ static HRESULT WINAPI GopherProtocol_Start(IInternetProtocol *iface, LPCWSTR szU IUri *uri; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = CreateUri(szUrl, 0, 0, &uri); @@ -177,7 +177,7 @@ static HRESULT WINAPI GopherProtocol_Abort(IInternetProtocol *iface, HRESULT hrR { GopherProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return protocol_abort(&This->base, hrReason); } @@ -186,7 +186,7 @@ static HRESULT WINAPI GopherProtocol_Terminate(IInternetProtocol *iface, DWORD d { GopherProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); protocol_close_connection(&This->base); return S_OK; @@ -211,7 +211,7 @@ static HRESULT WINAPI GopherProtocol_Read(IInternetProtocol *iface, void *pv, { GopherProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); return protocol_read(&This->base, pv, cb, pcbRead); } @@ -220,7 +220,7 @@ static HRESULT WINAPI GopherProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGE DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { GopherProtocol *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -228,7 +228,7 @@ static HRESULT WINAPI GopherProtocol_LockRequest(IInternetProtocol *iface, DWORD { GopherProtocol *This = impl_from_IInternetProtocol(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return protocol_lock_request(&This->base); } @@ -285,7 +285,7 @@ static HRESULT WINAPI GopherPriority_SetPriority(IInternetPriority *iface, LONG { GopherProtocol *This = impl_from_IInternetPriority(iface); - TRACE("(%p)->(%d)\n", This, nPriority); + TRACE("(%p)->(%ld)\n", This, nPriority); This->base.priority = nPriority; return S_OK; diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index bee226bd474..2bc9c5be075 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -79,7 +79,7 @@ static LPWSTR query_http_info(HttpProtocol *This, DWORD option) res = HttpQueryInfoW(This->base.request, option, ret, &len, NULL); } if(!res) { - TRACE("HttpQueryInfoW(%d) failed: %08x\n", option, GetLastError()); + TRACE("HttpQueryInfoW(%ld) failed: %08lx\n", option, GetLastError()); heap_free(ret); return NULL; } @@ -93,7 +93,7 @@ static inline BOOL set_security_flag(HttpProtocol *This, DWORD flags) res = InternetSetOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); if(!res) - ERR("Failed to set security flags: %x\n", flags); + ERR("Failed to set security flags: %lx\n", flags); return res; } @@ -132,7 +132,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) DWORD res; HRESULT hres; - TRACE("(%p %u)\n", This, error); + TRACE("(%p %lu)\n", This, error); switch(error) { case ERROR_INTERNET_SEC_CERT_DATE_INVALID: @@ -167,7 +167,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) hres = IHttpSecurity_OnSecurityProblem(http_security, error); IHttpSecurity_Release(http_security); - TRACE("OnSecurityProblem returned %08x\n", hres); + TRACE("OnSecurityProblem returned %08lx\n", hres); if(hres != S_FALSE) { @@ -186,7 +186,7 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) if(res) return RPC_E_RETRY; - FIXME("Don't know how to ignore error %d\n", error); + FIXME("Don't know how to ignore error %ld\n", error); return E_ABORT; } @@ -268,7 +268,7 @@ static ULONG send_http_request(HttpProtocol *This) break; } default: - FIXME("Unsupported This->base.bind_info.stgmedData.tymed %d\n", This->base.bind_info.stgmedData.tymed); + FIXME("Unsupported This->base.bind_info.stgmedData.tymed %ld\n", This->base.bind_info.stgmedData.tymed); } } @@ -330,7 +330,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques if(FAILED(hres)) return hres; if(!This->base.connection) { - WARN("InternetConnect failed: %d\n", GetLastError()); + WARN("InternetConnect failed: %ld\n", GetLastError()); return INET_E_CANNOT_CONNECT; } @@ -351,7 +351,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques }else if(hres == S_OK) { accept_types = (const WCHAR**)accept_mimes; }else { - WARN("GetBindString BINDSTRING_ACCEPT_MIMES failed: %08x\n", hres); + WARN("GetBindString BINDSTRING_ACCEPT_MIMES failed: %08lx\n", hres); return INET_E_NO_VALID_MEDIA; } accept_mimes[num] = 0; @@ -372,21 +372,21 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques if(FAILED(hres)) return hres; if (!This->base.request) { - WARN("HttpOpenRequest failed: %d\n", GetLastError()); + WARN("HttpOpenRequest failed: %ld\n", GetLastError()); return INET_E_RESOURCE_NOT_FOUND; } hres = IInternetProtocolSink_QueryInterface(This->base.protocol_sink, &IID_IServiceProvider, (void **)&service_provider); if (hres != S_OK) { - WARN("IInternetProtocolSink_QueryInterface IID_IServiceProvider failed: %08x\n", hres); + WARN("IInternetProtocolSink_QueryInterface IID_IServiceProvider failed: %08lx\n", hres); return hres; } hres = IServiceProvider_QueryService(service_provider, &IID_IHttpNegotiate, &IID_IHttpNegotiate, (void **)&This->http_negotiate); if (hres != S_OK) { - WARN("IServiceProvider_QueryService IID_IHttpNegotiate failed: %08x\n", hres); + WARN("IServiceProvider_QueryService IID_IHttpNegotiate failed: %08lx\n", hres); IServiceProvider_Release(service_provider); return hres; } @@ -401,7 +401,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques 0, &addl_header); SysFreeString(url); if(hres != S_OK) { - WARN("IHttpNegotiate_BeginningTransaction failed: %08x\n", hres); + WARN("IHttpNegotiate_BeginningTransaction failed: %08lx\n", hres); IServiceProvider_Release(service_provider); return hres; } @@ -423,14 +423,14 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques &IID_IHttpNegotiate2, (void **)&http_negotiate2); IServiceProvider_Release(service_provider); if(hres != S_OK) { - WARN("IServiceProvider_QueryService IID_IHttpNegotiate2 failed: %08x\n", hres); + WARN("IServiceProvider_QueryService IID_IHttpNegotiate2 failed: %08lx\n", hres); /* No goto done as per native */ }else { len = ARRAY_SIZE(security_id); hres = IHttpNegotiate2_GetRootSecurityId(http_negotiate2, security_id, &len, 0); IHttpNegotiate2_Release(http_negotiate2); if (hres != S_OK) - WARN("IHttpNegotiate2_GetRootSecurityId failed: %08x\n", hres); + WARN("IHttpNegotiate2_GetRootSecurityId failed: %08lx\n", hres); } /* FIXME: Handle security_id. Native calls undocumented function IsHostInProxyBypassList. */ @@ -441,7 +441,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques if(hres == S_OK && num) { if(!InternetSetOptionW(This->base.request, INTERNET_OPTION_SECONDARY_CACHE_KEY, post_cookie, lstrlenW(post_cookie))) - WARN("InternetSetOption INTERNET_OPTION_SECONDARY_CACHE_KEY failed: %d\n", GetLastError()); + WARN("InternetSetOption INTERNET_OPTION_SECONDARY_CACHE_KEY failed: %ld\n", GetLastError()); CoTaskMemFree(post_cookie); } } @@ -449,12 +449,12 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT; res = InternetSetOptionW(This->base.request, INTERNET_OPTION_ERROR_MASK, &flags, sizeof(flags)); if(!res) - WARN("InternetSetOption(INTERNET_OPTION_ERROR_MASK) failed: %u\n", GetLastError()); + WARN("InternetSetOption(INTERNET_OPTION_ERROR_MASK) failed: %lu\n", GetLastError()); b = TRUE; res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); if(!res) - WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %u\n", GetLastError()); + WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %lu\n", GetLastError()); do { error = send_http_request(This); @@ -473,7 +473,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques } } while(hres == RPC_E_RETRY); - WARN("HttpSendRequest failed: %d\n", error); + WARN("HttpSendRequest failed: %ld\n", error); return hres; } @@ -483,7 +483,7 @@ static HRESULT HttpProtocol_end_request(Protocol *protocol) res = HttpEndRequestW(protocol->request, NULL, 0, 0); if(!res && GetLastError() != ERROR_IO_PENDING) { - FIXME("HttpEndRequest failed: %u\n", GetLastError()); + FIXME("HttpEndRequest failed: %lu\n", GetLastError()); return E_FAIL; } @@ -539,12 +539,12 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot) NULL, NULL); heap_free(response_headers); if (hres != S_OK) { - WARN("IHttpNegotiate_OnResponse failed: %08x\n", hres); + WARN("IHttpNegotiate_OnResponse failed: %08lx\n", hres); return S_OK; } } }else { - WARN("HttpQueryInfo failed: %d\n", GetLastError()); + WARN("HttpQueryInfo failed: %ld\n", GetLastError()); } ranges = query_http_info(This, HTTP_QUERY_ACCEPT_RANGES); @@ -565,7 +565,7 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot) content_type); heap_free(content_type); }else { - WARN("HttpQueryInfo failed: %d\n", GetLastError()); + WARN("HttpQueryInfo failed: %ld\n", GetLastError()); IInternetProtocolSink_ReportProgress(This->base.protocol_sink, (This->base.bindf & BINDF_FROMURLMON) ? BINDSTATUS_MIMETYPEAVAILABLE : BINDSTATUS_RAWMIMETYPE, L"text/html"); @@ -598,10 +598,10 @@ static void HttpProtocol_on_error(Protocol *prot, DWORD error) HttpProtocol *This = impl_from_Protocol(prot); HRESULT hres; - TRACE("(%p) %d\n", prot, error); + TRACE("(%p) %ld\n", prot, error); if(prot->flags & FLAG_FIRST_CONTINUE_COMPLETE) { - FIXME("Not handling error %d\n", error); + FIXME("Not handling error %ld\n", error); return; } @@ -664,7 +664,7 @@ static ULONG WINAPI HttpProtocolUnk_AddRef(IUnknown *iface) { HttpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -673,7 +673,7 @@ static ULONG WINAPI HttpProtocolUnk_Release(IUnknown *iface) HttpProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { protocol_close_connection(&This->base); @@ -720,7 +720,7 @@ static HRESULT WINAPI HttpProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szU IUri *uri; HRESULT hres; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = CreateUri(szUrl, 0, 0, &uri); @@ -748,7 +748,7 @@ static HRESULT WINAPI HttpProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrR { HttpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + TRACE("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return protocol_abort(&This->base, hrReason); } @@ -757,7 +757,7 @@ static HRESULT WINAPI HttpProtocol_Terminate(IInternetProtocolEx *iface, DWORD d { HttpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); protocol_close_connection(&This->base); return S_OK; @@ -782,7 +782,7 @@ static HRESULT WINAPI HttpProtocol_Read(IInternetProtocolEx *iface, void *pv, { HttpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); return protocol_read(&This->base, pv, cb, pcbRead); } @@ -791,7 +791,7 @@ static HRESULT WINAPI HttpProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGE DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { HttpProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -799,7 +799,7 @@ static HRESULT WINAPI HttpProtocol_LockRequest(IInternetProtocolEx *iface, DWORD { HttpProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return protocol_lock_request(&This->base); } @@ -821,7 +821,7 @@ static HRESULT WINAPI HttpProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr DWORD scheme = 0; HRESULT hres; - TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, + TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = IUri_GetScheme(pUri, &scheme); @@ -873,7 +873,7 @@ static HRESULT WINAPI HttpPriority_SetPriority(IInternetPriority *iface, LONG nP { HttpProtocol *This = impl_from_IInternetPriority(iface); - TRACE("(%p)->(%d)\n", This, nPriority); + TRACE("(%p)->(%ld)\n", This, nPriority); This->base.priority = nPriority; return S_OK; @@ -919,7 +919,7 @@ static HRESULT WINAPI HttpInfo_QueryOption(IWinInetHttpInfo *iface, DWORD dwOpti void *pBuffer, DWORD *pcbBuffer) { HttpProtocol *This = impl_from_IWinInetHttpInfo(iface); - TRACE("(%p)->(%x %p %p)\n", This, dwOption, pBuffer, pcbBuffer); + TRACE("(%p)->(%lx %p %p)\n", This, dwOption, pBuffer, pcbBuffer); if(!This->base.request) return E_FAIL; @@ -933,7 +933,7 @@ static HRESULT WINAPI HttpInfo_QueryInfo(IWinInetHttpInfo *iface, DWORD dwOption void *pBuffer, DWORD *pcbBuffer, DWORD *pdwFlags, DWORD *pdwReserved) { HttpProtocol *This = impl_from_IWinInetHttpInfo(iface); - TRACE("(%p)->(%x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); + TRACE("(%p)->(%lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuffer, pdwFlags, pdwReserved); if(!This->base.request) return E_FAIL; diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 20a11be306e..d38bba1d376 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -84,7 +84,7 @@ static HRESULT parse_schema(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, WCHAR *ptr; DWORD len = 0; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); if(flags) ERR("wrong flags\n"); @@ -113,7 +113,7 @@ static HRESULT parse_canonicalize_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD prsize = size; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -137,7 +137,7 @@ static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -157,7 +157,7 @@ static HRESULT parse_encode(LPCWSTR url, PARSEACTION action, DWORD flags, LPWSTR DWORD prsize; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -184,7 +184,7 @@ static HRESULT parse_path_from_url(LPCWSTR url, DWORD flags, LPWSTR result, DWOR DWORD prsize; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -210,7 +210,7 @@ static HRESULT parse_security_domain(LPCWSTR url, DWORD flags, LPWSTR result, IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -231,7 +231,7 @@ static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result, IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -262,7 +262,7 @@ static HRESULT parse_rootdocument(LPCWSTR url, DWORD flags, LPWSTR result, PARSEDURLW url_info; HRESULT hres; - TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + TRACE("(%s %08lx %p %ld %p)\n", debugstr_w(url), flags, result, size, rsize); protocol_info = get_protocol_info(url); @@ -326,7 +326,7 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD LPWSTR pszResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { if(dwReserved) - WARN("dwReserved = %d\n", dwReserved); + WARN("dwReserved = %ld\n", dwReserved); switch(ParseAction) { case PARSE_CANONICALIZE: @@ -364,7 +364,7 @@ HRESULT WINAPI CoInternetCombineUrl(LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD size = cchResult; HRESULT hres; - TRACE("(%s,%s,0x%08x,%p,%d,%p,%d)\n", debugstr_w(pwzBaseUrl), + TRACE("(%s,%s,0x%08lx,%p,%ld,%p,%ld)\n", debugstr_w(pwzBaseUrl), debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, pcchResult, dwReserved); @@ -395,7 +395,7 @@ HRESULT WINAPI CoInternetCompareUrl(LPCWSTR pwzUrl1, LPCWSTR pwzUrl2, DWORD dwCo IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s,%s,%08x)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + TRACE("(%s,%s,%08lx)\n", debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); protocol_info = get_protocol_info(pwzUrl1); @@ -422,7 +422,7 @@ HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption, IInternetProtocolInfo *protocol_info; HRESULT hres; - TRACE("(%s, %x, %x, %p, %x, %p, %x)\n", debugstr_w(pwzUrl), + TRACE("(%s, %x, %lx, %p, %lx, %p, %lx)\n", debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pvBuffer, cbBuffer, pcbBuffer, dwReserved); protocol_info = get_protocol_info(pwzUrl); @@ -471,7 +471,7 @@ static HRESULT set_internet_feature(INTERNETFEATURELIST feature, DWORD flags, BO return E_FAIL; if(flags & ~supported_flags) - FIXME("Unsupported flags: %08x\n", flags & ~supported_flags); + FIXME("Unsupported flags: %08lx\n", flags & ~supported_flags); if(flags & SET_FEATURE_ON_PROCESS) set_feature_on_process(feature, enable); @@ -501,7 +501,7 @@ static BOOL get_feature_from_reg(HKEY feature_control, LPCWSTR feature_name, LPC return FALSE; if(type != REG_DWORD) { - WARN("Unexpected registry value type %d (expected REG_DWORD) for %s\n", type, debugstr_w(L"*")); + WARN("Unexpected registry value type %ld (expected REG_DWORD) for %s\n", type, debugstr_w(L"*")); return FALSE; } @@ -521,7 +521,7 @@ static HRESULT load_process_feature(INTERNETFEATURELIST feature) BOOL enabled; if (!GetModuleFileNameW(NULL, module_name, ARRAY_SIZE(module_name))) { - ERR("Failed to get module file name: %u\n", GetLastError()); + ERR("Failed to get module file name: %lu\n", GetLastError()); return E_UNEXPECTED; } @@ -594,7 +594,7 @@ static HRESULT get_internet_feature(INTERNETFEATURELIST feature, DWORD flags) if(flags == GET_FEATURE_FROM_PROCESS) hres = get_feature_from_process(feature); else { - FIXME("Unsupported flags: %08x\n", flags); + FIXME("Unsupported flags: %08lx\n", flags); hres = E_NOTIMPL; } @@ -606,7 +606,7 @@ static HRESULT get_internet_feature(INTERNETFEATURELIST feature, DWORD flags) */ HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags, BOOL fEnable) { - TRACE("(%d, %08x, %x)\n", FeatureEntry, dwFlags, fEnable); + TRACE("(%d, %08lx, %x)\n", FeatureEntry, dwFlags, fEnable); return set_internet_feature(FeatureEntry, dwFlags, fEnable); } @@ -615,7 +615,7 @@ HRESULT WINAPI CoInternetSetFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWO */ HRESULT WINAPI CoInternetIsFeatureEnabled(INTERNETFEATURELIST FeatureEntry, DWORD dwFlags) { - TRACE("(%d, %08x)\n", FeatureEntry, dwFlags); + TRACE("(%d, %08lx)\n", FeatureEntry, dwFlags); return get_internet_feature(FeatureEntry, dwFlags); } @@ -628,7 +628,7 @@ HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry DWORD urlaction = 0; HRESULT hres; - TRACE("(%d %08x %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr); + TRACE("(%d %08lx %s %p)\n", FeatureEntry, dwFlags, debugstr_w(szURL), pSecMgr); if(FeatureEntry == FEATURE_MIME_SNIFFING) urlaction = URLACTION_FEATURE_MIME_SNIFFING; @@ -647,7 +647,7 @@ HRESULT WINAPI CoInternetIsFeatureEnabledForUrl(INTERNETFEATURELIST FeatureEntry case GET_FEATURE_FROM_THREAD_TRUSTED: case GET_FEATURE_FROM_THREAD_INTERNET: case GET_FEATURE_FROM_THREAD_RESTRICTED: - FIXME("unsupported flags %x\n", dwFlags); + FIXME("unsupported flags %lx\n", dwFlags); return E_NOTIMPL; case GET_FEATURE_FROM_PROCESS: @@ -676,7 +676,7 @@ HRESULT WINAPI CoInternetIsFeatureZoneElevationEnabled(LPCWSTR szFromURL, LPCWST { HRESULT hres; - TRACE("(%s %s %p %x)\n", debugstr_w(szFromURL), debugstr_w(szToURL), pSecMgr, dwFlags); + TRACE("(%s %s %p %lx)\n", debugstr_w(szFromURL), debugstr_w(szToURL), pSecMgr, dwFlags); if(!pSecMgr || !szToURL) return CoInternetIsFeatureEnabled(FEATURE_ZONE_ELEVATION, dwFlags); @@ -688,7 +688,7 @@ HRESULT WINAPI CoInternetIsFeatureZoneElevationEnabled(LPCWSTR szFromURL, LPCWST case GET_FEATURE_FROM_THREAD_TRUSTED: case GET_FEATURE_FROM_THREAD_INTERNET: case GET_FEATURE_FROM_THREAD_RESTRICTED: - FIXME("unsupported flags %x\n", dwFlags); + FIXME("unsupported flags %lx\n", dwFlags); return E_NOTIMPL; case GET_FEATURE_FROM_PROCESS: diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 6ee0da5b119..a709a42a3c5 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -65,7 +65,7 @@ static ULONG WINAPI MimeFilterProtocol_AddRef(IInternetProtocol *iface) { MimeFilter *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -74,7 +74,7 @@ static ULONG WINAPI MimeFilterProtocol_Release(IInternetProtocol *iface) MimeFilter *This = impl_from_IInternetProtocol(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { heap_free(This); @@ -90,7 +90,7 @@ static HRESULT WINAPI MimeFilterProtocol_Start(IInternetProtocol *iface, LPCWSTR DWORD grfPI, HANDLE_PTR dwReserved) { MimeFilter *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + FIXME("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); return E_NOTIMPL; } @@ -106,14 +106,14 @@ static HRESULT WINAPI MimeFilterProtocol_Abort(IInternetProtocol *iface, HRESULT DWORD dwOptions) { MimeFilter *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return E_NOTIMPL; } static HRESULT WINAPI MimeFilterProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { MimeFilter *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); + FIXME("(%p)->(%08lx)\n", This, dwOptions); return E_NOTIMPL; } @@ -135,7 +135,7 @@ static HRESULT WINAPI MimeFilterProtocol_Read(IInternetProtocol *iface, void *pv ULONG cb, ULONG *pcbRead) { MimeFilter *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + FIXME("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); return E_NOTIMPL; } @@ -143,14 +143,14 @@ static HRESULT WINAPI MimeFilterProtocol_Seek(IInternetProtocol *iface, LARGE_IN DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { MimeFilter *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } static HRESULT WINAPI MimeFilterProtocol_LockRequest(IInternetProtocol *iface, DWORD dwOptions) { MimeFilter *This = impl_from_IInternetProtocol(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); + FIXME("(%p)->(%08lx)\n", This, dwOptions); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI MimeFilterSink_ReportProgress(IInternetProtocolSink *iface ULONG ulStatusCode, LPCWSTR szStatusText) { MimeFilter *This = impl_from_IInternetProtocolSink(iface); - FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + FIXME("(%p)->(%lu %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); return E_NOTIMPL; } @@ -221,7 +221,7 @@ static HRESULT WINAPI MimeFilterSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { MimeFilter *This = impl_from_IInternetProtocolSink(iface); - FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + FIXME("(%p)->(%ld %lu %lu)\n", This, grfBSCF, ulProgress, ulProgressMax); return E_NOTIMPL; } @@ -229,7 +229,7 @@ static HRESULT WINAPI MimeFilterSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { MimeFilter *This = impl_from_IInternetProtocolSink(iface); - FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + FIXME("(%p)->(%08lx %ld %s)\n", This, hrResult, dwError, debugstr_w(szResult)); return E_NOTIMPL; } @@ -656,13 +656,13 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, DWORD cbSize, LPCWSTR pwzMimeProposed, DWORD dwMimeFlags, LPWSTR* ppwzMimeOut, DWORD dwReserved) { - TRACE("(%p,%s,%p,%d,%s,0x%x,%p,0x%x)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, + TRACE("(%p,%s,%p,%ld,%s,0x%lx,%p,0x%lx)\n", pBC, debugstr_w(pwzUrl), pBuffer, cbSize, debugstr_w(pwzMimeProposed), dwMimeFlags, ppwzMimeOut, dwReserved); if(dwMimeFlags) - WARN("dwMimeFlags=%08x\n", dwMimeFlags); + WARN("dwMimeFlags=%08lx\n", dwMimeFlags); if(dwReserved) - WARN("dwReserved=%d\n", dwReserved); + WARN("dwReserved=%ld\n", dwReserved); /* pBC seems to not be used */ diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c index 697b5f2bf8b..4fc5681209a 100644 --- a/dlls/urlmon/mk.c +++ b/dlls/urlmon/mk.c @@ -74,7 +74,7 @@ static ULONG WINAPI MkProtocolUnk_AddRef(IUnknown *iface) { MkProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -83,7 +83,7 @@ static ULONG WINAPI MkProtocolUnk_Release(IUnknown *iface) MkProtocol *This = impl_from_IUnknown(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { if(This->stream) @@ -138,7 +138,7 @@ static HRESULT WINAPI MkProtocol_Start(IInternetProtocolEx *iface, LPCWSTR szUrl HRESULT hres; IUri *uri; - TRACE("(%p)->(%s %p %p %08x %lx)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08lx %Ix)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = CreateUri(szUrl, 0, 0, &uri); @@ -163,7 +163,7 @@ static HRESULT WINAPI MkProtocol_Abort(IInternetProtocolEx *iface, HRESULT hrRea DWORD dwOptions) { MkProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%08x %08x)\n", This, hrReason, dwOptions); + FIXME("(%p)->(%08lx %08lx)\n", This, hrReason, dwOptions); return E_NOTIMPL; } @@ -171,7 +171,7 @@ static HRESULT WINAPI MkProtocol_Terminate(IInternetProtocolEx *iface, DWORD dwO { MkProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return S_OK; } @@ -195,7 +195,7 @@ static HRESULT WINAPI MkProtocol_Read(IInternetProtocolEx *iface, void *pv, { MkProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + TRACE("(%p)->(%p %lu %p)\n", This, pv, cb, pcbRead); if(!This->stream) return E_FAIL; @@ -207,7 +207,7 @@ static HRESULT WINAPI MkProtocol_Seek(IInternetProtocolEx *iface, LARGE_INTEGER DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { MkProtocol *This = impl_from_IInternetProtocolEx(iface); - FIXME("(%p)->(%d %d %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + FIXME("(%p)->(%ld %ld %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } @@ -215,7 +215,7 @@ static HRESULT WINAPI MkProtocol_LockRequest(IInternetProtocolEx *iface, DWORD d { MkProtocol *This = impl_from_IInternetProtocolEx(iface); - TRACE("(%p)->(%08x)\n", This, dwOptions); + TRACE("(%p)->(%08lx)\n", This, dwOptions); return S_OK; } @@ -244,7 +244,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, HRESULT hres; CLSID clsid; - TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, + TRACE("(%p)->(%p %p %p %08lx %p)\n", This, pUri, pOIProtSink, pOIBindInfo, grfPI, dwReserved); hres = IUri_GetScheme(pUri, &scheme); @@ -257,7 +257,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, bindinfo.cbSize = sizeof(BINDINFO); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); if(FAILED(hres)) { - WARN("GetBindInfo failed: %08x\n", hres); + WARN("GetBindInfo failed: %08lx\n", hres); return hres; } @@ -317,7 +317,7 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, heap_free(display_name); IParseDisplayName_Release(pdn); if(FAILED(hres)) { - WARN("ParseDisplayName failed: %08x\n", hres); + WARN("ParseDisplayName failed: %08lx\n", hres); return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); } @@ -329,13 +329,13 @@ static HRESULT WINAPI MkProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUri, hres = IMoniker_BindToStorage(mon, NULL /* FIXME */, NULL, &IID_IStream, (void**)&This->stream); IMoniker_Release(mon); if(FAILED(hres)) { - WARN("BindToStorage failed: %08x\n", hres); + WARN("BindToStorage failed: %08lx\n", hres); return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); } hres = IStream_Stat(This->stream, &statstg, STATFLAG_NONAME); if(FAILED(hres)) { - WARN("Stat failed: %08x\n", hres); + WARN("Stat failed: %08lx\n", hres); return report_result(pOIProtSink, hres, ERROR_INVALID_PARAMETER); } diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 2acffdc1ffe..22cb9549ebe 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -113,7 +113,7 @@ HRESULT protocol_syncbinding(Protocol *protocol) if(res) protocol->available_bytes = protocol->query_available; else - WARN("InternetQueryDataAvailable failed: %u\n", GetLastError()); + WARN("InternetQueryDataAvailable failed: %lu\n", GetLastError()); protocol->flags |= FLAG_FIRST_DATA_REPORTED|FLAG_LAST_DATA_REPORTED; IInternetProtocolSink_ReportData(protocol->protocol_sink, BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE, @@ -221,7 +221,7 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex break; default: - WARN("Unhandled Internet status callback %d\n", internet_status); + WARN("Unhandled Internet status callback %ld\n", internet_status); } } @@ -242,7 +242,7 @@ static HRESULT write_post_stream(Protocol *protocol) break; res = InternetWriteFile(protocol->request, buf, size, &written); if(!res) { - FIXME("InternetWriteFile failed: %u\n", GetLastError()); + FIXME("InternetWriteFile failed: %lu\n", GetLastError()); hres = E_FAIL; break; } @@ -277,7 +277,7 @@ static HINTERNET create_internet_session(IInternetBindInfo *bind_info) heap_free(global_user_agent); CoTaskMemFree(user_agent); if(!ret) { - WARN("InternetOpen failed: %d\n", GetLastError()); + WARN("InternetOpen failed: %ld\n", GetLastError()); return NULL; } @@ -325,7 +325,7 @@ HRESULT protocol_start(Protocol *protocol, IInternetProtocol *prot, IUri *uri, protocol->bind_info.cbSize = sizeof(BINDINFO); hres = IInternetBindInfo_GetBindInfo(bind_info, &protocol->bindf, &protocol->bind_info); if(hres != S_OK) { - WARN("GetBindInfo failed: %08x\n", hres); + WARN("GetBindInfo failed: %08lx\n", hres); return report_result(protocol, hres); } @@ -397,7 +397,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) protocol->flags &= ~FLAG_REQUEST_COMPLETE; res = InternetQueryDataAvailable(protocol->request, &protocol->query_available, 0, 0); if(res) { - TRACE("available %u bytes\n", protocol->query_available); + TRACE("available %lu bytes\n", protocol->query_available); if(!protocol->query_available) { all_data_read(protocol); return S_OK; @@ -405,7 +405,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) protocol->available_bytes = protocol->query_available; }else if(GetLastError() != ERROR_IO_PENDING) { protocol->flags |= FLAG_REQUEST_COMPLETE; - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + WARN("InternetQueryDataAvailable failed: %ld\n", GetLastError()); report_result(protocol, INET_E_DATA_NOT_AVAILABLE); return S_OK; } @@ -442,7 +442,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret res = InternetReadFile(protocol->request, ((BYTE *)buf)+read, protocol->available_bytes > size-read ? size-read : protocol->available_bytes, &len); if(!res) { - WARN("InternetReadFile failed: %d\n", GetLastError()); + WARN("InternetReadFile failed: %ld\n", GetLastError()); hres = INET_E_DOWNLOAD_FAILURE; report_result(protocol, hres); break; @@ -457,7 +457,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret protocol->current_position += len; protocol->available_bytes -= len; - TRACE("current_position %d, available_bytes %d\n", protocol->current_position, protocol->available_bytes); + TRACE("current_position %ld, available_bytes %ld\n", protocol->current_position, protocol->available_bytes); if(!protocol->available_bytes) { /* InternetQueryDataAvailable may immediately fork and perform its asynchronous @@ -469,7 +469,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret if (GetLastError() == ERROR_IO_PENDING) { hres = E_PENDING; }else { - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + WARN("InternetQueryDataAvailable failed: %ld\n", GetLastError()); hres = INET_E_DATA_NOT_AVAILABLE; report_result(protocol, hres); } @@ -498,7 +498,7 @@ HRESULT protocol_read(Protocol *protocol, void *buf, ULONG size, ULONG *read_ret HRESULT protocol_lock_request(Protocol *protocol) { if (!InternetLockRequestFile(protocol->request, &protocol->lock)) - WARN("InternetLockRequestFile failed: %d\n", GetLastError()); + WARN("InternetLockRequestFile failed: %ld\n", GetLastError()); return S_OK; } @@ -509,7 +509,7 @@ HRESULT protocol_unlock_request(Protocol *protocol) return S_OK; if(!InternetUnlockRequestFile(protocol->lock)) - WARN("InternetUnlockRequestFile failed: %d\n", GetLastError()); + WARN("InternetUnlockRequestFile failed: %ld\n", GetLastError()); protocol->lock = 0; return S_OK; diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 60672930ebc..5c79cb2b250 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -75,7 +75,7 @@ static void get_string_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPWSTR out, D } if (res) { - TRACE("%s failed: %d\n", debugstr_w(name), res); + TRACE("%s failed: %ld\n", debugstr_w(name), res); *out = '\0'; } } @@ -101,7 +101,7 @@ static void get_dword_from_reg(HKEY hcu, HKEY hklm, LPCWSTR name, LPDWORD out) } if (res) { - TRACE("%s failed: %d\n", debugstr_w(name), res); + TRACE("%s failed: %ld\n", debugstr_w(name), res); *out = 0; } } @@ -242,7 +242,7 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone) if(res == ERROR_SUCCESS) { if(type == REG_DWORD) return TRUE; - WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(schema)); + WARN("Unexpected value type %ld for value %s, expected REG_DWORD\n", type, debugstr_w(schema)); } /* Try to get the zone for the wildcard scheme. */ @@ -252,7 +252,7 @@ static BOOL get_zone_for_scheme(HKEY key, LPCWSTR schema, DWORD *zone) return FALSE; if(type != REG_DWORD) { - WARN("Unexpected value type %d for value %s, expected REG_DWORD\n", type, debugstr_w(L"*")); + WARN("Unexpected value type %ld for value %s, expected REG_DWORD\n", type, debugstr_w(L"*")); return FALSE; } @@ -278,7 +278,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain if(host_len >= domain_len && matches_domain_pattern(domain, host, TRUE, &matched)) { res = RegOpenKeyW(domains, domain, &domain_key); if(res != ERROR_SUCCESS) { - ERR("Failed to open domain key %s: %d\n", debugstr_w(domain), res); + ERR("Failed to open domain key %s: %ld\n", debugstr_w(domain), res); return E_UNEXPECTED; } @@ -294,7 +294,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain res = RegQueryInfoKeyW(domain_key, NULL, NULL, NULL, &subdomain_count, &subdomain_len, NULL, NULL, NULL, NULL, NULL, NULL); if(res != ERROR_SUCCESS) { - ERR("Unable to query info for key %s: %d\n", debugstr_w(domain), res); + ERR("Unable to query info for key %s: %ld\n", debugstr_w(domain), res); RegCloseKey(domain_key); return E_UNEXPECTED; } @@ -334,7 +334,7 @@ static HRESULT search_domain_for_zone(HKEY domains, LPCWSTR domain, DWORD domain res = RegOpenKeyW(domain_key, subdomain, &subdomain_key); if(res != ERROR_SUCCESS) { - ERR("Unable to open subdomain key %s of %s: %d\n", debugstr_w(subdomain), + ERR("Unable to open subdomain key %s of %s: %ld\n", debugstr_w(subdomain), debugstr_w(domain), res); heap_free(component); heap_free(subdomain); @@ -663,7 +663,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s }else if(res == ERROR_FILE_NOT_FOUND) { hres = E_FAIL; }else if(res != ERROR_SUCCESS) { - ERR("RegQueryValue failed: %d\n", res); + ERR("RegQueryValue failed: %ld\n", res); hres = E_UNEXPECTED; } @@ -844,7 +844,7 @@ static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManagerEx2* iface) SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n", This, refCount); + TRACE("(%p) ref=%lu\n", This, refCount); return refCount; } @@ -854,7 +854,7 @@ static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManagerEx2* iface) SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n", This, refCount); + TRACE("(%p) ref=%lu\n", This, refCount); /* destroy the object if there are no more references on it */ if (!refCount){ @@ -930,7 +930,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManagerEx2 *i SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); HRESULT hres; - TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); + TRACE("(%p)->(%s %p %08lx)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); if(This->custom_manager) { hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager, @@ -945,7 +945,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManagerEx2 *i } if(dwFlags) - FIXME("not supported flags: %08x\n", dwFlags); + FIXME("not supported flags: %08lx\n", dwFlags); return map_url_to_zone(pwszUrl, pdwZone, NULL); } @@ -955,7 +955,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManagerEx2 * { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%s %p %p %08lx)\n", iface, debugstr_w(pwszUrl), pbSecurityId, + TRACE("(%p)->(%s %p %p %08Ix)\n", iface, debugstr_w(pwszUrl), pbSecurityId, pcbSecurityId, dwReserved); if(This->custom_manager) { @@ -987,7 +987,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManagerEx DWORD zone, policy; HRESULT hres; - TRACE("(%p)->(%s %08x %p %08x %p %08x %08x %08x)\n", iface, debugstr_w(pwszUrl), dwAction, + TRACE("(%p)->(%s %08lx %p %08lx %p %08lx %08lx %08lx)\n", iface, debugstr_w(pwszUrl), dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); if(This->custom_manager) { @@ -1011,7 +1011,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManagerEx if(FAILED(hres)) return hres; - TRACE("policy %x\n", policy); + TRACE("policy %lx\n", policy); if(cbPolicy >= sizeof(DWORD)) *(DWORD*)pPolicy = policy; @@ -1025,7 +1025,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManagerEx FIXME("URLPOLICY_QUERY not implemented\n"); return E_FAIL; default: - FIXME("Not implemented policy %x\n", policy); + FIXME("Not implemented policy %lx\n", policy); } return E_FAIL; @@ -1041,7 +1041,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManagerE SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); HRESULT hres; - TRACE("(%p)->(%s %s %p %p %p %08x %08x )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), + TRACE("(%p)->(%s %s %p %p %p %08lx %08lx )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); if(This->custom_manager) { @@ -1061,7 +1061,7 @@ static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManagerEx2 SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); HRESULT hres; - TRACE("(%p)->(%08x %s %08x)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); + TRACE("(%p)->(%08lx %s %08lx)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); if(This->custom_manager) { hres = IInternetSecurityManager_SetZoneMapping(This->custom_manager, dwZone, @@ -1080,7 +1080,7 @@ static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManagerEx2 SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); HRESULT hres; - TRACE("(%p)->(%08x %p %08x)\n", iface, dwZone, ppenumString,dwFlags); + TRACE("(%p)->(%08lx %p %08lx)\n", iface, dwZone, ppenumString,dwFlags); if(This->custom_manager) { hres = IInternetSecurityManager_GetZoneMappings(This->custom_manager, dwZone, @@ -1098,7 +1098,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx(IInternetSecurityManager DWORD dwFlags, DWORD dwReserved, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%s %08x %p %d %p %d %08x %08x %p) stub\n", This, debugstr_w(pwszUrl), dwAction, pPolicy, cbPolicy, + FIXME("(%p)->(%s %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, debugstr_w(pwszUrl), dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved, pdwOutFlags); return E_NOTIMPL; } @@ -1108,7 +1108,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2 { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%p %p %08x %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); + TRACE("(%p)->(%p %p %08lx %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags); if(This->custom_manager) { HRESULT hres; @@ -1143,7 +1143,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2 } if(dwFlags) - FIXME("Unsupported flags: %08x\n", dwFlags); + FIXME("Unsupported flags: %08lx\n", dwFlags); return map_uri_to_zone(pUri, pdwZone, NULL); } @@ -1153,7 +1153,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlActionEx2(IInternetSecurityManage DWORD dwFlags, DWORD_PTR dwReserved, DWORD *pdwOutFlags) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %08x %p %d %p %d %08x %08x %p) stub\n", This, pUri, dwAction, pPolicy, + FIXME("(%p)->(%p %08lx %p %ld %p %ld %08lx %08lx %p) stub\n", This, pUri, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, (DWORD)dwReserved, pdwOutFlags); return E_NOTIMPL; } @@ -1162,7 +1162,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityIdEx2(IInternetSecurityManagerEx IUri *pUri, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - TRACE("(%p)->(%p %p %p %08x) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved); + TRACE("(%p)->(%p %p %p %08lx) stub\n", This, pUri, pbSecurityId, pcbSecurityId, (DWORD)dwReserved); if(dwReserved) FIXME("dwReserved is not supported yet\n"); @@ -1178,7 +1178,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicyEx2(IInternetSecurityManag DWORD cbContext, DWORD_PTR dwReserved) { SecManagerImpl *This = impl_from_IInternetSecurityManagerEx2(iface); - FIXME("(%p)->(%p %s %p %p %p %d %08x) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, + FIXME("(%p)->(%p %s %p %p %p %ld %08lx) stub\n", This, pUri, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, (DWORD)dwReserved); return E_NOTIMPL; } @@ -1340,7 +1340,7 @@ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManagerEx2* iface) ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(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; } @@ -1353,7 +1353,7 @@ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManagerEx2* iface) ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(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) { while (This->zonemap_count) heap_free(This->zonemaps[--This->zonemap_count]); @@ -1377,7 +1377,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManagerEx2* ifa HKEY hcu; HKEY hklm = NULL; - TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes); + TRACE("(%p)->(%ld %p)\n", This, dwZone, pZoneAttributes); if (!pZoneAttributes) return E_INVALIDARG; @@ -1388,7 +1388,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManagerEx2* ifa hr = open_zone_key(HKEY_LOCAL_MACHINE, dwZone, &hklm); if (FAILED(hr)) - TRACE("Zone %d not in HKLM\n", dwZone); + TRACE("Zone %ld not in HKLM\n", dwZone); get_string_from_reg(hcu, hklm, L"DisplayName", pZoneAttributes->szDisplayName, MAX_ZONE_PATH); get_string_from_reg(hcu, hklm, L"Description", pZoneAttributes->szDescription, MAX_ZONE_DESCRIPTION); @@ -1414,7 +1414,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneAttributes(IInternetZoneManagerEx2* ifa HRESULT hr; HKEY hcu; - TRACE("(%p)->(%d %p)\n", This, dwZone, pZoneAttributes); + TRACE("(%p)->(%ld %p)\n", This, dwZone, pZoneAttributes); if (!pZoneAttributes) return E_INVALIDARG; @@ -1458,7 +1458,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneCustomPolicy(IInternetZoneManagerEx2* i DWORD* pcbPolicy, URLZONEREG ulrZoneReg) { - FIXME("(%p)->(%08x %s %p %p %08x) stub\n", iface, dwZone, debugstr_guid(guidKey), + FIXME("(%p)->(%08lx %s %p %p %08x) stub\n", iface, dwZone, debugstr_guid(guidKey), ppPolicy, pcbPolicy, ulrZoneReg); return E_NOTIMPL; } @@ -1473,7 +1473,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneCustomPolicy(IInternetZoneManagerEx2* i DWORD cbPolicy, URLZONEREG ulrZoneReg) { - FIXME("(%p)->(%08x %s %p %08x %08x) stub\n", iface, dwZone, debugstr_guid(guidKey), + FIXME("(%p)->(%08lx %s %p %08lx %08x) stub\n", iface, dwZone, debugstr_guid(guidKey), ppPolicy, cbPolicy, ulrZoneReg); return E_NOTIMPL; } @@ -1484,7 +1484,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneCustomPolicy(IInternetZoneManagerEx2* i static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicy(IInternetZoneManagerEx2* iface, DWORD dwZone, DWORD dwAction, BYTE* pPolicy, DWORD cbPolicy, URLZONEREG urlZoneReg) { - TRACE("(%p)->(%d %08x %p %d %d)\n", iface, dwZone, dwAction, pPolicy, + TRACE("(%p)->(%ld %08lx %p %ld %d)\n", iface, dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg); if(!pPolicy) @@ -1503,7 +1503,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneActionPolicy(IInternetZoneManagerEx2* i DWORD cbPolicy, URLZONEREG urlZoneReg) { - FIXME("(%p)->(%08x %08x %p %08x %08x) stub\n", iface, dwZone, dwAction, pPolicy, + FIXME("(%p)->(%08lx %08lx %p %08lx %08x) stub\n", iface, dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg); return E_NOTIMPL; } @@ -1518,7 +1518,7 @@ static HRESULT WINAPI ZoneMgrImpl_PromptAction(IInternetZoneManagerEx2* iface, LPCWSTR pwszText, DWORD dwPromptFlags) { - FIXME("%p %08x %p %s %s %08x\n", iface, dwAction, hwndParent, + FIXME("%p %08lx %p %s %s %08lx\n", iface, dwAction, hwndParent, debugstr_w(pwszUrl), debugstr_w(pwszText), dwPromptFlags ); return E_NOTIMPL; } @@ -1532,7 +1532,7 @@ static HRESULT WINAPI ZoneMgrImpl_LogAction(IInternetZoneManagerEx2* iface, LPCWSTR pwszText, DWORD dwLogFlags) { - FIXME("(%p)->(%08x %s %s %08x) stub\n", iface, dwAction, debugstr_w(pwszUrl), + FIXME("(%p)->(%08lx %s %s %08lx) stub\n", iface, dwAction, debugstr_w(pwszUrl), debugstr_w(pwszText), dwLogFlags); return E_NOTIMPL; } @@ -1550,12 +1550,12 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManagerEx2* LPDWORD data; DWORD i; - TRACE("(%p)->(%p, %p, 0x%08x)\n", This, pdwEnum, pdwCount, dwFlags); + TRACE("(%p)->(%p, %p, 0x%08lx)\n", This, pdwEnum, pdwCount, dwFlags); if (!pdwEnum || !pdwCount || (dwFlags != 0)) return E_INVALIDARG; data = build_zonemap_from_reg(); - TRACE("found %d zones\n", data ? data[0] : -1); + TRACE("found %ld zones\n", data ? data[0] : -1); if (!data) return E_FAIL; @@ -1603,7 +1603,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManagerEx2* iface, ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD data; - TRACE("(%p)->(0x%08x, %d, %p)\n", This, dwEnum, dwIndex, pdwZone); + TRACE("(%p)->(0x%08lx, %ld, %p)\n", This, dwEnum, dwIndex, pdwZone); /* make sure, that dwEnum and dwIndex are in the valid range */ if (dwEnum < This->zonemap_count) { @@ -1626,7 +1626,7 @@ static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManagerEx2* ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD data; - TRACE("(%p)->(0x%08x)\n", This, dwEnum); + TRACE("(%p)->(0x%08lx)\n", This, dwEnum); /* make sure, that dwEnum is valid */ if (dwEnum < This->zonemap_count) { if ((data = This->zonemaps[dwEnum])) { @@ -1646,7 +1646,7 @@ static HRESULT WINAPI ZoneMgrImpl_CopyTemplatePoliciesToZone(IInternetZoneManage DWORD dwZone, DWORD dwReserved) { - FIXME("(%p)->(%08x %08x %08x) stub\n", iface, dwTemplate, dwZone, dwReserved); + FIXME("(%p)->(%08lx %08lx %08lx) stub\n", iface, dwTemplate, dwZone, dwReserved); return E_NOTIMPL; } @@ -1661,14 +1661,14 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneActionPolicyEx(IInternetZoneManagerEx2* URLZONEREG urlZoneReg, DWORD dwFlags) { - TRACE("(%p)->(%d, 0x%x, %p, %d, %d, 0x%x)\n", iface, dwZone, + TRACE("(%p)->(%ld, 0x%lx, %p, %ld, %d, 0x%lx)\n", iface, dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg, dwFlags); if(!pPolicy) return E_INVALIDARG; if (dwFlags) - FIXME("dwFlags 0x%x ignored\n", dwFlags); + FIXME("dwFlags 0x%lx ignored\n", dwFlags); return get_action_policy(dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg); } @@ -1684,7 +1684,7 @@ static HRESULT WINAPI ZoneMgrImpl_SetZoneActionPolicyEx(IInternetZoneManagerEx2* URLZONEREG urlZoneReg, DWORD dwFlags) { - FIXME("(%p)->(%d, 0x%x, %p, %d, %d, 0x%x) stub\n", iface, dwZone, dwAction, pPolicy, + FIXME("(%p)->(%ld, 0x%lx, %p, %ld, %d, 0x%lx) stub\n", iface, dwZone, dwAction, pPolicy, cbPolicy, urlZoneReg, dwFlags); return E_NOTIMPL; } @@ -1697,10 +1697,10 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributesEx(IInternetZoneManagerEx2* i ZONEATTRIBUTES* pZoneAttributes, DWORD dwFlags) { - TRACE("(%p)->(%d, %p, 0x%x)\n", iface, dwZone, pZoneAttributes, dwFlags); + TRACE("(%p)->(%ld, %p, 0x%lx)\n", iface, dwZone, pZoneAttributes, dwFlags); if (dwFlags) - FIXME("dwFlags 0x%x ignored\n", dwFlags); + FIXME("dwFlags 0x%lx ignored\n", dwFlags); return IInternetZoneManagerEx2_GetZoneAttributes(iface, dwZone, pZoneAttributes); } @@ -1715,7 +1715,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneSecurityState(IInternetZoneManagerEx2* LPDWORD pdwState, BOOL *pfPolicyEncountered) { - FIXME("(%p)->(%d, %d, %p, %p) stub\n", iface, dwZoneIndex, fRespectPolicy, + FIXME("(%p)->(%ld, %d, %p, %p) stub\n", iface, dwZoneIndex, fRespectPolicy, pdwState, pfPolicyEncountered); *pdwState = SECURITY_IE_STATE_GREEN; @@ -1806,7 +1806,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP, IInternetSecurityManager **ppSM, DWORD dwReserved ) { - TRACE("%p %p %d\n", pSP, ppSM, dwReserved ); + TRACE("%p %p %ld\n", pSP, ppSM, dwReserved ); if(pSP) FIXME("pSP not supported\n"); @@ -1819,7 +1819,7 @@ HRESULT WINAPI CoInternetCreateSecurityManager( IServiceProvider *pSP, */ HRESULT WINAPI CoInternetCreateZoneManager(IServiceProvider* pSP, IInternetZoneManager** ppZM, DWORD dwReserved) { - TRACE("(%p %p %x)\n", pSP, ppZM, dwReserved); + TRACE("(%p %p %lx)\n", pSP, ppZM, dwReserved); return ZoneMgrImpl_Construct(NULL, (void**)ppZM); } @@ -1876,7 +1876,7 @@ static HRESULT parse_security_url(const WCHAR *url, PSUACTION action, WCHAR **re CoTaskMemFree(new_url); if(hres != S_OK) { - WARN("failed: %08x\n", hres); + WARN("failed: %08lx\n", hres); CoTaskMemFree(alloc_url); return hres; } @@ -1919,7 +1919,7 @@ static HRESULT parse_security_url(const WCHAR *url, PSUACTION action, WCHAR **re } if(FAILED(hres)) { - WARN("failed %08x\n", hres); + WARN("failed %08lx\n", hres); CoTaskMemFree(alloc_url); return hres; } @@ -1944,7 +1944,7 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA WCHAR *secure_url; HRESULT hres; - TRACE("(%p,%p,%u,%u)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); + TRACE("(%p,%p,%u,%lu)\n", pwzUrl, ppwzSecUrl, psuAction, dwReserved); hres = parse_security_url(pwzUrl, psuAction, &secure_url); if(FAILED(hres)) @@ -1970,7 +1970,7 @@ HRESULT WINAPI CoInternetGetSecurityUrl(LPCWSTR pwzUrl, LPWSTR *ppwzSecUrl, PSUA hres = E_OUTOFMEMORY; CoTaskMemFree(secure_url); if(hres != S_OK) { - WARN("UrlGetPart failed: %08x\n", hres); + WARN("UrlGetPart failed: %08lx\n", hres); CoTaskMemFree(new_url); return FAILED(hres) ? hres : E_FAIL; } @@ -1993,7 +1993,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION WCHAR *ret_url; HRESULT hres; - TRACE("(%p,%p,%u,%u)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); + TRACE("(%p,%p,%u,%lu)\n", pUri, ppSecUri, psuAction, (DWORD)dwReserved); if(!pUri || !ppSecUri) return E_INVALIDARG; @@ -2029,7 +2029,7 @@ HRESULT WINAPI CoInternetGetSecurityUrlEx(IUri *pUri, IUri **ppSecUri, PSUACTION */ HRESULT WINAPI CompareSecurityIds(BYTE *secid1, DWORD size1, BYTE *secid2, DWORD size2, DWORD reserved) { - FIXME("(%p %d %p %d %x)\n", secid1, size1, secid2, size2, reserved); + FIXME("(%p %ld %p %ld %lx)\n", secid1, size1, secid2, size2, reserved); return E_NOTIMPL; } diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 0596c1df75f..052444dcec5 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -91,13 +91,13 @@ static HRESULT get_protocol_cf(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, res = RegQueryValueExW(hkey, L"CLSID", NULL, &type, (BYTE*)str_clsid, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS || type != REG_SZ) { - WARN("Could not get protocol CLSID res=%d\n", res); + WARN("Could not get protocol CLSID res=%ld\n", res); return MK_E_SYNTAX; } hres = CLSIDFromString(str_clsid, &clsid); if(FAILED(hres)) { - WARN("CLSIDFromString failed: %08x\n", hres); + WARN("CLSIDFromString failed: %08lx\n", hres); return hres; } @@ -264,7 +264,7 @@ IInternetProtocol *get_mime_filter(LPCWSTR mime) if(cf) { hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&ret); if(FAILED(hres)) { - WARN("CreateInstance failed: %08x\n", hres); + WARN("CreateInstance failed: %08lx\n", hres); return NULL; } @@ -292,13 +292,13 @@ IInternetProtocol *get_mime_filter(LPCWSTR mime) hres = CLSIDFromString(clsidw, &clsid); if(FAILED(hres)) { - WARN("CLSIDFromString failed for %s (%x)\n", debugstr_w(mime), hres); + WARN("CLSIDFromString failed for %s (%lx)\n", debugstr_w(mime), hres); return NULL; } hres = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&ret); if(FAILED(hres)) { - WARN("CoCreateInstance failed: %08x\n", hres); + WARN("CoCreateInstance failed: %08lx\n", hres); return NULL; } @@ -338,13 +338,13 @@ static HRESULT WINAPI InternetSession_RegisterNameSpace(IInternetSession *iface, IClassFactory *pCF, REFCLSID rclsid, LPCWSTR pwzProtocol, ULONG cPatterns, const LPCWSTR *ppwzPatterns, DWORD dwReserved) { - TRACE("(%p %s %s %d %p %d)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol), + TRACE("(%p %s %s %ld %p %ld)\n", pCF, debugstr_guid(rclsid), debugstr_w(pwzProtocol), cPatterns, ppwzPatterns, dwReserved); if(cPatterns || ppwzPatterns) FIXME("patterns not supported\n"); if(dwReserved) - WARN("dwReserved = %d\n", dwReserved); + WARN("dwReserved = %ld\n", dwReserved); if(!pCF || !pwzProtocol) return E_INVALIDARG; @@ -419,7 +419,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface, BindProtocol *protocol; HRESULT hres; - TRACE("(%p %s %p %p %p %08x)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk, + TRACE("(%p %s %p %p %p %08lx)\n", pBC, debugstr_w(szUrl), pUnkOuter, ppUnk, ppOInetProt, dwOption); if(pBC || pUnkOuter || ppUnk || dwOption) @@ -436,7 +436,7 @@ static HRESULT WINAPI InternetSession_CreateBinding(IInternetSession *iface, static HRESULT WINAPI InternetSession_SetSessionOption(IInternetSession *iface, DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD dwReserved) { - FIXME("(%08x %p %d %d)\n", dwOption, pBuffer, dwBufferLength, dwReserved); + FIXME("(%08lx %p %ld %ld)\n", dwOption, pBuffer, dwBufferLength, dwReserved); return E_NOTIMPL; } @@ -473,12 +473,12 @@ static IInternetSession InternetSession = { &InternetSessionVtbl }; HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, IInternetSession **ppIInternetSession, DWORD dwReserved) { - TRACE("(%d %p %d)\n", dwSessionMode, ppIInternetSession, dwReserved); + TRACE("(%ld %p %ld)\n", dwSessionMode, ppIInternetSession, dwReserved); if(dwSessionMode) - ERR("dwSessionMode=%d\n", dwSessionMode); + ERR("dwSessionMode=%ld\n", dwSessionMode); if(dwReserved) - ERR("dwReserved=%d\n", dwReserved); + ERR("dwReserved=%ld\n", dwReserved); IInternetSession_AddRef(&InternetSession); *ppIInternetSession = &InternetSession; @@ -626,10 +626,10 @@ LPWSTR get_useragent(void) HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD* pdwBufferLength, DWORD dwReserved) { - TRACE("(%x, %p, %d, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); + TRACE("(%lx, %p, %ld, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); if(dwReserved) - WARN("dwReserved = %d\n", dwReserved); + WARN("dwReserved = %ld\n", dwReserved); switch(dwOption) { case URLMON_OPTION_USERAGENT: { @@ -672,7 +672,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf return S_OK; } default: - FIXME("unsupported option %x\n", dwOption); + FIXME("unsupported option %lx\n", dwOption); } return E_INVALIDARG; @@ -684,7 +684,7 @@ HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, DWORD Reserved) { - TRACE("(%x %p %x)\n", dwOption, pBuffer, dwBufferLength); + TRACE("(%lx %p %lx)\n", dwOption, pBuffer, dwBufferLength); switch(dwOption) { case URLMON_OPTION_USERAGENT: { @@ -716,7 +716,7 @@ HRESULT WINAPI UrlMkSetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBuf break; } default: - FIXME("Unknown option %x\n", dwOption); + FIXME("Unknown option %lx\n", dwOption); return E_INVALIDARG; } @@ -732,7 +732,7 @@ HRESULT WINAPI ObtainUserAgentString(DWORD option, char *ret, DWORD *ret_size) WCHAR buf[1024]; HRESULT hres = S_OK; - TRACE("(%d %p %p)\n", option, ret, ret_size); + TRACE("(%ld %p %p)\n", option, ret, ret_size); if(!ret || !ret_size) return E_INVALIDARG; diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index 7959468ecd7..d59df7a5f26 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -86,7 +86,7 @@ static ULONG WINAPI URLMoniker_AddRef(IMoniker *iface) URLMoniker *This = impl_from_IMoniker(iface); ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%u\n",This, refCount); + TRACE("(%p) ref=%lu\n",This, refCount); return refCount; } @@ -96,7 +96,7 @@ static ULONG WINAPI URLMoniker_Release(IMoniker *iface) URLMoniker *This = impl_from_IMoniker(iface); ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%u\n",This, refCount); + TRACE("(%p) ref=%lu\n",This, refCount); if (!refCount) { if(This->uri) @@ -285,7 +285,7 @@ static HRESULT WINAPI URLMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, { URLMoniker *This = impl_from_IMoniker(iface); - TRACE("(%p,%p,%d,%p,%p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); + TRACE("(%p,%p,%ld,%p,%p)\n", This, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if(!ppmkReduced) return E_INVALIDARG; @@ -634,7 +634,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker URLMoniker *obj; HRESULT hres; - TRACE("(%p, %s, %p, %08x)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags); + TRACE("(%p, %s, %p, %08lx)\n", pmkContext, debugstr_w(szURL), ppmk, dwFlags); if (ppmk) *ppmk = NULL; @@ -643,7 +643,7 @@ HRESULT WINAPI CreateURLMonikerEx(IMoniker *pmkContext, LPCWSTR szURL, IMoniker return E_INVALIDARG; if(dwFlags >= ARRAY_SIZE(create_flags_map)) { - FIXME("Unsupported flags %x\n", dwFlags); + FIXME("Unsupported flags %lx\n", dwFlags); return E_INVALIDARG; } @@ -687,7 +687,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker ** URLMoniker *ret; HRESULT hres; - TRACE("(%p %p %p %x)\n", pmkContext, pUri, ppmk, dwFlags); + TRACE("(%p %p %p %lx)\n", pmkContext, pUri, ppmk, dwFlags); if (ppmk) *ppmk = NULL; @@ -696,7 +696,7 @@ HRESULT WINAPI CreateURLMonikerEx2(IMoniker *pmkContext, IUri *pUri, IMoniker ** return E_INVALIDARG; if(dwFlags >= ARRAY_SIZE(create_flags_map)) { - FIXME("Unsupported flags %x\n", dwFlags); + FIXME("Unsupported flags %lx\n", dwFlags); return E_INVALIDARG; } @@ -788,7 +788,7 @@ HRESULT WINAPI BindAsyncMoniker(IMoniker *pmk, DWORD grfOpt, IBindStatusCallback LPBC pbc = NULL; HRESULT hr = E_INVALIDARG; - TRACE("(%p %08x %p %s %p)\n", pmk, grfOpt, pbsc, debugstr_guid(iidResult), ppvResult); + TRACE("(%p %08lx %p %s %p)\n", pmk, grfOpt, pbsc, debugstr_guid(iidResult), ppvResult); if (pmk && ppvResult) { @@ -838,7 +838,7 @@ HRESULT WINAPI URLDownloadToCacheFileA(LPUNKNOWN lpUnkCaller, LPCSTR szURL, LPST int len; HRESULT hres; - TRACE("(%p %s %p %d %d %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName, + TRACE("(%p %s %p %ld %ld %p)\n", lpUnkCaller, debugstr_a(szURL), szFileName, dwBufLength, dwReserved, pBSC); if(szURL) { @@ -875,7 +875,7 @@ HRESULT WINAPI URLDownloadToCacheFileW(LPUNKNOWN lpUnkCaller, LPCWSTR szURL, LPW static WCHAR header[] = L"HTTP/1.0 200 OK\\r\\n\\r\\n"; - TRACE("(%p, %s, %p, %d, %d, %p)\n", lpUnkCaller, debugstr_w(szURL), + TRACE("(%p, %s, %p, %ld, %ld, %p)\n", lpUnkCaller, debugstr_w(szURL), szFileName, dwBufLength, dwReserved, pBSC); if (!szURL || !szFileName) @@ -935,7 +935,7 @@ HRESULT WINAPI HlinkSimpleNavigateToString( LPCWSTR szTarget, LPCWSTR szLocation, LPCWSTR szTargetFrameName, IUnknown *pUnk, IBindCtx *pbc, IBindStatusCallback *pbsc, DWORD grfHLNF, DWORD dwReserved) { - FIXME("%s %s %s %p %p %p %u %u partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ), + FIXME("%s %s %s %p %p %p %lu %lu partial stub\n", debugstr_w( szTarget ), debugstr_w( szLocation ), debugstr_w( szTargetFrameName ), pUnk, pbc, pbsc, grfHLNF, dwReserved); /* undocumented: 0 means HLNF_OPENINNEWWINDOW*/ diff --git a/dlls/urlmon/umstream.c b/dlls/urlmon/umstream.c index 83767548cf4..082037f2de8 100644 --- a/dlls/urlmon/umstream.c +++ b/dlls/urlmon/umstream.c @@ -263,7 +263,7 @@ HRESULT WINAPI URLOpenBlockingStreamA(LPUNKNOWN pCaller, LPCSTR szURL, int len; HRESULT hr; - TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, szURL, ppStream, dwReserved, lpfnCB); + TRACE("(%p, %s, %p, 0x%lx, %p)\n", pCaller, szURL, ppStream, dwReserved, lpfnCB); if (!szURL || !ppStream) return E_INVALIDARG; @@ -293,7 +293,7 @@ HRESULT WINAPI URLOpenBlockingStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, { ProxyBindStatusCallback blocking_bsc; - TRACE("(%p, %s, %p, 0x%x, %p)\n", pCaller, debugstr_w(szURL), ppStream, + TRACE("(%p, %s, %p, 0x%lx, %p)\n", pCaller, debugstr_w(szURL), ppStream, dwReserved, lpfnCB); if (!szURL || !ppStream) @@ -315,7 +315,7 @@ HRESULT WINAPI URLOpenStreamA(LPUNKNOWN pCaller, LPCSTR szURL, DWORD dwReserved, int len; HRESULT hr; - TRACE("(%p, %s, 0x%x, %p)\n", pCaller, szURL, dwReserved, lpfnCB); + TRACE("(%p, %s, 0x%lx, %p)\n", pCaller, szURL, dwReserved, lpfnCB); if (!szURL) return E_INVALIDARG; @@ -343,7 +343,7 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved ProxyBindStatusCallback async_bsc; IStream *pStream; - TRACE("(%p, %s, 0x%x, %p)\n", pCaller, debugstr_w(szURL), dwReserved, + TRACE("(%p, %s, 0x%lx, %p)\n", pCaller, debugstr_w(szURL), dwReserved, lpfnCB); if (!szURL) @@ -365,6 +365,6 @@ HRESULT WINAPI URLOpenStreamW(LPUNKNOWN pCaller, LPCWSTR szURL, DWORD dwReserved HRESULT WINAPI URLOpenPullStreamW(IUnknown *caller, const WCHAR *url, DWORD reserved, IBindStatusCallback *callback) { - FIXME("%p %s %u %p, stub!\n", caller, debugstr_w(url), reserved, callback); + FIXME("%p %s %lu %p, stub!\n", caller, debugstr_w(url), reserved, callback); return E_NOTIMPL; } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 91247b689b8..838f1d0619d 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -634,7 +634,7 @@ static DWORD remove_dot_segments(WCHAR *path, DWORD path_len) { } len = out - path; - TRACE("(%p %d): Path after dot segments removed %s len=%d\n", path, path_len, + TRACE("(%p %ld): Path after dot segments removed %s len=%ld\n", path, path_len, debugstr_wn(path, len), len); return len; } @@ -974,12 +974,12 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD data->scheme_len = lstrlenW(L"file"); data->has_implicit_scheme = TRUE; - TRACE("(%p %p %x): URI is an implicit file path.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI is an implicit file path.\n", ptr, data, flags); } else { /* Windows does not consider anything that can implicitly be a file * path to be a valid URI if the ALLOW_IMPLICIT_FILE_SCHEME flag is not set... */ - TRACE("(%p %p %x): URI is implicitly a file path, but, the ALLOW_IMPLICIT_FILE_SCHEME flag wasn't set.\n", + TRACE("(%p %p %lx): URI is implicitly a file path, but, the ALLOW_IMPLICIT_FILE_SCHEME flag wasn't set.\n", ptr, data, flags); return FALSE; } @@ -994,24 +994,24 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD data->scheme_len = lstrlenW(L"*"); data->has_implicit_scheme = TRUE; - TRACE("(%p %p %x): URI is an implicit wildcard scheme.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI is an implicit wildcard scheme.\n", ptr, data, flags); } else if (flags & Uri_CREATE_ALLOW_RELATIVE) { data->is_relative = TRUE; - TRACE("(%p %p %x): URI is relative.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI is relative.\n", ptr, data, flags); } else { - TRACE("(%p %p %x): Malformed URI found. Unable to deduce scheme name.\n", ptr, data, flags); + TRACE("(%p %p %lx): Malformed URI found. Unable to deduce scheme name.\n", ptr, data, flags); return FALSE; } } if(!data->is_relative) - TRACE("(%p %p %x): Found scheme=%s scheme_len=%d\n", ptr, data, flags, + TRACE("(%p %p %lx): Found scheme=%s scheme_len=%ld\n", ptr, data, flags, debugstr_wn(data->scheme, data->scheme_len), data->scheme_len); if(!parse_scheme_type(data)) return FALSE; - TRACE("(%p %p %x): Assigned %d as the URL_SCHEME.\n", ptr, data, flags, data->scheme_type); + TRACE("(%p %p %lx): Assigned %d as the URL_SCHEME.\n", ptr, data, flags, data->scheme_type); return TRUE; } @@ -1094,7 +1094,7 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { const WCHAR *start = *ptr; if(!parse_username(ptr, data, flags, 0)) { - TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI contained no userinfo.\n", ptr, data, flags); return; } @@ -1104,7 +1104,7 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { *ptr = start; data->username = NULL; data->username_len = 0; - TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI contained no userinfo.\n", ptr, data, flags); return; } } @@ -1116,16 +1116,16 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { data->password = NULL; data->password_len = 0; - TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI contained no userinfo.\n", ptr, data, flags); return; } if(data->username) - TRACE("(%p %p %x): Found username %s len=%d.\n", ptr, data, flags, + TRACE("(%p %p %lx): Found username %s len=%ld.\n", ptr, data, flags, debugstr_wn(data->username, data->username_len), data->username_len); if(data->password) - TRACE("(%p %p %x): Found password %s len=%d.\n", ptr, data, flags, + TRACE("(%p %p %lx): Found password %s len=%ld.\n", ptr, data, flags, debugstr_wn(data->password, data->password_len), data->password_len); ++(*ptr); @@ -1165,7 +1165,7 @@ static BOOL parse_port(const WCHAR **ptr, parse_data *data) { data->port_value = port; data->port_len = *ptr - data->port; - TRACE("(%p %p): Found port %s len=%d value=%u\n", ptr, data, + TRACE("(%p %p): Found port %s len=%ld value=%lu\n", ptr, data, debugstr_wn(data->port, data->port_len), data->port_len, data->port_value); return TRUE; } @@ -1219,7 +1219,7 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data) { return FALSE; } - TRACE("(%p %p): IPv4 address found. host=%s host_len=%d host_type=%d\n", + TRACE("(%p %p): IPv4 address found. host=%s host_len=%ld host_type=%d\n", ptr, data, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); return TRUE; @@ -1290,7 +1290,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD extras) { if(data->scheme_type != URL_SCHEME_UNKNOWN) { *ptr = data->host; data->host = NULL; - TRACE("(%p %p %x): Expected valid port\n", ptr, data, extras); + TRACE("(%p %p %lx): Expected valid port\n", ptr, data, extras); return FALSE; } else /* Windows gives up on trying to parse a port when it @@ -1325,7 +1325,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD extras) { if(has_start_bracket) { /* Make sure the last character of the host wasn't a ']'. */ if(*(*ptr-1) == ']') { - TRACE("(%p %p %x): Expected an IP literal inside of the host\n", ptr, data, extras); + TRACE("(%p %p %lx): Expected an IP literal inside of the host\n", ptr, data, extras); *ptr = data->host; data->host = NULL; return FALSE; @@ -1342,7 +1342,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD extras) { else data->host_type = Uri_HOST_DNS; - TRACE("(%p %p %x): Parsed reg-name. host=%s len=%d\n", ptr, data, extras, + TRACE("(%p %p %lx): Parsed reg-name. host=%s len=%ld\n", ptr, data, extras, debugstr_wn(data->host, data->host_len), data->host_len); return TRUE; } @@ -1476,7 +1476,7 @@ static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD extras) { if(!parse_ip_literal(ptr, data, extras)) { if(!parse_ipv4address(ptr, data)) { if(!parse_reg_name(ptr, data, extras)) { - TRACE("(%p %p %x): Malformed URI, Unknown host type.\n", ptr, data, extras); + TRACE("(%p %p %lx): Malformed URI, Unknown host type.\n", ptr, data, extras); return FALSE; } } @@ -1560,10 +1560,10 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f } if(data->path) - TRACE("(%p %p %x): Parsed path %s len=%d\n", ptr, data, flags, + TRACE("(%p %p %lx): Parsed path %s len=%ld\n", ptr, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); else - TRACE("(%p %p %x): The URI contained no path\n", ptr, data, flags); + TRACE("(%p %p %lx): The URI contained no path\n", ptr, data, flags); return TRUE; } @@ -1610,7 +1610,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) } if (data->path) data->path_len = *ptr - data->path; - TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, + TRACE("(%p %p %lx): Parsed opaque URI path %s len=%ld\n", ptr, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); return TRUE; } @@ -1659,7 +1659,7 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { */ if(data->scheme_type != URL_SCHEME_UNKNOWN || !(flags & Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES)) { - TRACE("(%p %p %x): Treating URI as an hierarchical URI.\n", ptr, data, flags); + TRACE("(%p %p %lx): Treating URI as an hierarchical URI.\n", ptr, data, flags); data->is_opaque = FALSE; if(data->scheme_type == URL_SCHEME_WILDCARD && !data->has_implicit_scheme) { @@ -1685,7 +1685,7 @@ static BOOL parse_hierpart(const WCHAR **ptr, parse_data *data, DWORD flags) { * URI. */ - TRACE("(%p %p %x): Treating URI as an opaque URI.\n", ptr, data, flags); + TRACE("(%p %p %lx): Treating URI as an opaque URI.\n", ptr, data, flags); data->is_opaque = TRUE; if(!parse_path_opaque(ptr, data, flags)) @@ -1705,7 +1705,7 @@ static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; if(**ptr != '?') { - TRACE("(%p %p %x): URI didn't contain a query string.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI didn't contain a query string.\n", ptr, data, flags); return TRUE; } @@ -1728,7 +1728,7 @@ static BOOL parse_query(const WCHAR **ptr, parse_data *data, DWORD flags) { data->query_len = *ptr - data->query; - TRACE("(%p %p %x): Parsed query string %s len=%d\n", ptr, data, flags, + TRACE("(%p %p %lx): Parsed query string %s len=%ld\n", ptr, data, flags, debugstr_wn(data->query, data->query_len), data->query_len); return TRUE; } @@ -1744,7 +1744,7 @@ static BOOL parse_fragment(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; if(**ptr != '#') { - TRACE("(%p %p %x): URI didn't contain a fragment.\n", ptr, data, flags); + TRACE("(%p %p %lx): URI didn't contain a fragment.\n", ptr, data, flags); return TRUE; } @@ -1767,7 +1767,7 @@ static BOOL parse_fragment(const WCHAR **ptr, parse_data *data, DWORD flags) { data->fragment_len = *ptr - data->fragment; - TRACE("(%p %p %x): Parsed fragment %s len=%d\n", ptr, data, flags, + TRACE("(%p %p %lx): Parsed fragment %s len=%ld\n", ptr, data, flags, debugstr_wn(data->fragment, data->fragment_len), data->fragment_len); return TRUE; } @@ -1784,7 +1784,7 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { ptr = data->uri; pptr = &ptr; - TRACE("(%p %x): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri)); + TRACE("(%p %lx): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri)); if(!parse_scheme(pptr, data, flags, 0)) return FALSE; @@ -1798,7 +1798,7 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { if(!parse_fragment(pptr, data, flags)) return FALSE; - TRACE("(%p %x): FINISHED PARSING URI.\n", data, flags); + TRACE("(%p %lx): FINISHED PARSING URI.\n", data, flags); return TRUE; } @@ -1932,7 +1932,7 @@ static BOOL canonicalize_userinfo(const parse_data *data, Uri *uri, DWORD flags, uri->userinfo_len = uri->canon_len - uri->userinfo_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalized userinfo, userinfo_start=%d, userinfo=%s, userinfo_split=%d userinfo_len=%d.\n", + TRACE("(%p %p %lx %d): Canonicalized userinfo, userinfo_start=%d, userinfo=%s, userinfo_split=%d userinfo_len=%ld.\n", data, uri, flags, computeOnly, uri->userinfo_start, debugstr_wn(uri->canon_uri + uri->userinfo_start, uri->userinfo_len), uri->userinfo_split, uri->userinfo_len); @@ -2047,7 +2047,7 @@ static BOOL canonicalize_reg_name(const parse_data *data, Uri *uri, uri->host_len = uri->canon_len - uri->host_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalize reg_name=%s len=%d\n", data, uri, flags, + TRACE("(%p %p %lx %d): Canonicalize reg_name=%s len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), uri->host_len); @@ -2082,7 +2082,7 @@ static BOOL canonicalize_implicit_ipv4address(const parse_data *data, Uri *uri, uri->host_type = Uri_HOST_IPV4; if(!computeOnly) - TRACE("%p %p %x %d): Canonicalized implicit IP address=%s len=%d\n", + TRACE("%p %p %lx %d): Canonicalized implicit IP address=%s len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), uri->host_len); @@ -2173,7 +2173,7 @@ static BOOL canonicalize_ipv4address(const parse_data *data, Uri *uri, DWORD fla uri->host_len = uri->canon_len - uri->host_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalized IPv4 address, ip=%s len=%d\n", + TRACE("(%p %p %lx %d): Canonicalized IPv4 address, ip=%s len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), uri->host_len); @@ -2243,7 +2243,7 @@ static BOOL canonicalize_ipv6address(const parse_data *data, Uri *uri, uri->host_len = uri->canon_len - uri->host_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalized IPv6 address %s, len=%d\n", data, uri, flags, + TRACE("(%p %p %lx %d): Canonicalized IPv6 address %s, len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->host_start, uri->host_len), uri->host_len); @@ -2290,7 +2290,7 @@ static BOOL canonicalize_host(const parse_data *data, Uri *uri, DWORD flags, BOO uri->host_type = Uri_HOST_UNKNOWN; break; default: - FIXME("(%p %p %x %d): Canonicalization for host type %d not supported.\n", data, + FIXME("(%p %p %lx %d): Canonicalization for host type %d not supported.\n", data, uri, flags, computeOnly, data->host_type); return FALSE; } @@ -2544,7 +2544,7 @@ static DWORD canonicalize_path_hierarchical(const WCHAR *path, DWORD path_len, U } if(ret_path) - TRACE("Canonicalized path %s len=%d\n", debugstr_wn(ret_path, len), len); + TRACE("Canonicalized path %s len=%ld\n", debugstr_wn(ret_path, len), len); return len; } @@ -2663,7 +2663,7 @@ static BOOL canonicalize_path_opaque(const parse_data *data, Uri *uri, DWORD fla uri->path_len = uri->canon_len - uri->path_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalized opaque URI path %s len=%d\n", data, uri, flags, computeOnly, + TRACE("(%p %p %lx %d): Canonicalized opaque URI path %s len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->path_start, uri->path_len), uri->path_len); return TRUE; } @@ -2809,7 +2809,7 @@ static BOOL canonicalize_query(const parse_data *data, Uri *uri, DWORD flags, BO uri->query_len = uri->canon_len - uri->query_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalized query string %s len=%d\n", data, uri, flags, + TRACE("(%p %p %lx %d): Canonicalized query string %s len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->query_start, uri->query_len), uri->query_len); return TRUE; @@ -2859,7 +2859,7 @@ static BOOL canonicalize_fragment(const parse_data *data, Uri *uri, DWORD flags, uri->fragment_len = uri->canon_len - uri->fragment_start; if(!computeOnly) - TRACE("(%p %p %x %d): Canonicalized fragment %s len=%d\n", data, uri, flags, + TRACE("(%p %p %lx %d): Canonicalized fragment %s len=%ld\n", data, uri, flags, computeOnly, debugstr_wn(uri->canon_uri+uri->fragment_start, uri->fragment_len), uri->fragment_len); return TRUE; @@ -2875,7 +2875,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B * URI. */ if(!data->is_relative) { - FIXME("(%p %p %x): Unable to determine the scheme type of %s.\n", data, + FIXME("(%p %p %lx): Unable to determine the scheme type of %s.\n", data, uri, flags, debugstr_w(data->uri)); return FALSE; } @@ -2892,7 +2892,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B uri->canon_uri[i + pos] = ':'; uri->scheme_start = pos; - TRACE("(%p %p %x): Canonicalized scheme=%s, len=%d.\n", data, uri, flags, + TRACE("(%p %p %lx): Canonicalized scheme=%s, len=%ld.\n", data, uri, flags, debugstr_wn(uri->canon_uri+uri->scheme_start, data->scheme_len), data->scheme_len); } @@ -2914,30 +2914,30 @@ static int compute_canonicalized_length(const parse_data *data, DWORD flags) { memset(&uri, 0, sizeof(Uri)); - TRACE("(%p %x): Beginning to compute canonicalized length for URI %s\n", data, flags, + TRACE("(%p %lx): Beginning to compute canonicalized length for URI %s\n", data, flags, debugstr_w(data->uri)); if(!canonicalize_scheme(data, &uri, flags, TRUE)) { - ERR("(%p %x): Failed to compute URI scheme length.\n", data, flags); + ERR("(%p %lx): Failed to compute URI scheme length.\n", data, flags); return -1; } if(!canonicalize_hierpart(data, &uri, flags, TRUE)) { - ERR("(%p %x): Failed to compute URI hierpart length.\n", data, flags); + ERR("(%p %lx): Failed to compute URI hierpart length.\n", data, flags); return -1; } if(!canonicalize_query(data, &uri, flags, TRUE)) { - ERR("(%p %x): Failed to compute query string length.\n", data, flags); + ERR("(%p %lx): Failed to compute query string length.\n", data, flags); return -1; } if(!canonicalize_fragment(data, &uri, flags, TRUE)) { - ERR("(%p %x): Failed to compute fragment length.\n", data, flags); + ERR("(%p %lx): Failed to compute fragment length.\n", data, flags); return -1; } - TRACE("(%p %x): Finished computing canonicalized URI length. length=%d\n", data, flags, uri.canon_len); + TRACE("(%p %lx): Finished computing canonicalized URI length. length=%ld\n", data, flags, uri.canon_len); return uri.canon_len; } @@ -2956,12 +2956,12 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->canon_uri = NULL; uri->canon_size = uri->canon_len = 0; - TRACE("(%p %p %x): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri)); + TRACE("(%p %p %lx): beginning to canonicalize URI %s.\n", data, uri, flags, debugstr_w(data->uri)); /* First try to compute the length of the URI. */ len = compute_canonicalized_length(data, flags); if(len == -1) { - ERR("(%p %p %x): Could not compute the canonicalized length of %s.\n", data, uri, flags, + ERR("(%p %p %lx): Could not compute the canonicalized length of %s.\n", data, uri, flags, debugstr_w(data->uri)); return E_INVALIDARG; } @@ -2972,24 +2972,24 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->canon_size = len; if(!canonicalize_scheme(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize the scheme of the URI.\n", data, uri, flags); + ERR("(%p %p %lx): Unable to canonicalize the scheme of the URI.\n", data, uri, flags); return E_INVALIDARG; } uri->scheme_type = data->scheme_type; if(!canonicalize_hierpart(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize the hierpart of the URI\n", data, uri, flags); + ERR("(%p %p %lx): Unable to canonicalize the hierpart of the URI\n", data, uri, flags); return E_INVALIDARG; } if(!canonicalize_query(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize query string of the URI.\n", + ERR("(%p %p %lx): Unable to canonicalize query string of the URI.\n", data, uri, flags); return E_INVALIDARG; } if(!canonicalize_fragment(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize fragment of the URI.\n", + ERR("(%p %p %lx): Unable to canonicalize fragment of the URI.\n", data, uri, flags); return E_INVALIDARG; } @@ -3010,7 +3010,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { } uri->canon_uri[uri->canon_len] = '\0'; - TRACE("(%p %p %x): finished canonicalizing the URI. uri=%s\n", data, uri, flags, debugstr_w(uri->canon_uri)); + TRACE("(%p %p %lx): finished canonicalizing the URI. uri=%s\n", data, uri, flags, debugstr_w(uri->canon_uri)); return S_OK; } @@ -3147,10 +3147,10 @@ static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, if(parse_scheme(pptr, data, flags, ALLOW_NULL_TERM_SCHEME) && data->scheme_len == expected_len) { if(data->scheme) - TRACE("(%p %p %x): Found valid scheme component %s len=%d.\n", builder, data, flags, + TRACE("(%p %p %lx): Found valid scheme component %s len=%ld.\n", builder, data, flags, debugstr_wn(data->scheme, data->scheme_len), data->scheme_len); } else { - TRACE("(%p %p %x): Invalid scheme component found %s.\n", builder, data, flags, + TRACE("(%p %p %lx): Invalid scheme component found %s.\n", builder, data, flags, debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } @@ -3183,10 +3183,10 @@ static HRESULT validate_username(const UriBuilder *builder, parse_data *data, DW pptr = &ptr; if(parse_username(pptr, data, flags, ALLOW_NULL_TERM_USER_NAME) && data->username_len == expected_len) - TRACE("(%p %p %x): Found valid username component %s len=%d.\n", builder, data, flags, + TRACE("(%p %p %lx): Found valid username component %s len=%ld.\n", builder, data, flags, debugstr_wn(data->username, data->username_len), data->username_len); else { - TRACE("(%p %p %x): Invalid username component found %s.\n", builder, data, flags, + TRACE("(%p %p %lx): Invalid username component found %s.\n", builder, data, flags, debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } @@ -3218,10 +3218,10 @@ static HRESULT validate_password(const UriBuilder *builder, parse_data *data, DW pptr = &ptr; if(parse_password(pptr, data, flags, ALLOW_NULL_TERM_PASSWORD) && data->password_len == expected_len) - TRACE("(%p %p %x): Found valid password component %s len=%d.\n", builder, data, flags, + TRACE("(%p %p %lx): Found valid password component %s len=%ld.\n", builder, data, flags, debugstr_wn(data->password, data->password_len), data->password_len); else { - TRACE("(%p %p %x): Invalid password component found %s.\n", builder, data, flags, + TRACE("(%p %p %lx): Invalid password component found %s.\n", builder, data, flags, debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } @@ -3264,7 +3264,7 @@ static HRESULT validate_host(const UriBuilder *builder, parse_data *data) { pptr = &ptr; if(parse_host(pptr, data, extras) && data->host_len == expected_len) - TRACE("(%p %p): Found valid host name %s len=%d type=%d.\n", builder, data, + TRACE("(%p %p): Found valid host name %s len=%ld type=%d.\n", builder, data, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); else { TRACE("(%p %p): Invalid host name found %s.\n", builder, data, @@ -3288,7 +3288,7 @@ static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags) } if(data->has_port) - TRACE("(%p %p %x): Using %u as port for IUri.\n", builder, data, flags, data->port_value); + TRACE("(%p %p %lx): Using %lu as port for IUri.\n", builder, data, flags, data->port_value); } static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD flags) { @@ -3322,12 +3322,12 @@ static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags); if(!valid || (check_len && expected_len != data->path_len)) { - TRACE("(%p %p %x): Invalid path component %s.\n", builder, data, flags, + TRACE("(%p %p %lx): Invalid path component %s.\n", builder, data, flags, debugstr_wn(component, expected_len) ); return INET_E_INVALID_URL; } - TRACE("(%p %p %x): Valid path component %s len=%d.\n", builder, data, flags, + TRACE("(%p %p %lx): Valid path component %s len=%ld.\n", builder, data, flags, debugstr_wn(data->path, data->path_len), data->path_len); return S_OK; @@ -3352,10 +3352,10 @@ static HRESULT validate_query(const UriBuilder *builder, parse_data *data, DWORD pptr = &ptr; if(parse_query(pptr, data, flags) && expected_len == data->query_len) - TRACE("(%p %p %x): Valid query component %s len=%d.\n", builder, data, flags, + TRACE("(%p %p %lx): Valid query component %s len=%ld.\n", builder, data, flags, debugstr_wn(data->query, data->query_len), data->query_len); else { - TRACE("(%p %p %x): Invalid query component %s.\n", builder, data, flags, + TRACE("(%p %p %lx): Invalid query component %s.\n", builder, data, flags, debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } @@ -3383,10 +3383,10 @@ static HRESULT validate_fragment(const UriBuilder *builder, parse_data *data, DW pptr = &ptr; if(parse_fragment(pptr, data, flags) && expected_len == data->fragment_len) - TRACE("(%p %p %x): Valid fragment component %s len=%d.\n", builder, data, flags, + TRACE("(%p %p %lx): Valid fragment component %s len=%ld.\n", builder, data, flags, debugstr_wn(data->fragment, data->fragment_len), data->fragment_len); else { - TRACE("(%p %p %x): Invalid fragment component %s.\n", builder, data, flags, + TRACE("(%p %p %lx): Invalid fragment component %s.\n", builder, data, flags, debugstr_wn(component, expected_len)); return INET_E_INVALID_URL; } @@ -3400,7 +3400,7 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, memset(data, 0, sizeof(parse_data)); - TRACE("(%p %p %x): Beginning to validate builder components.\n", builder, data, flags); + TRACE("(%p %p %lx): Beginning to validate builder components.\n", builder, data, flags); hr = validate_scheme_name(builder, data, flags); if(FAILED(hr)) @@ -3410,7 +3410,7 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, if(data->scheme_type == URL_SCHEME_FILE) { if((builder->password || (builder->uri && builder->uri->userinfo_split > -1)) || (builder->username || (builder->uri && builder->uri->userinfo_start > -1))) { - TRACE("(%p %p %x): File schemes can't contain a username or password.\n", + TRACE("(%p %p %lx): File schemes can't contain a username or password.\n", builder, data, flags); return INET_E_INVALID_URL; } @@ -3445,7 +3445,7 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, if(FAILED(hr)) return hr; - TRACE("(%p %p %x): Finished validating builder components.\n", builder, data, flags); + TRACE("(%p %p %lx): Finished validating builder components.\n", builder, data, flags); return S_OK; } @@ -3754,9 +3754,9 @@ static DWORD generate_raw_uri(const parse_data *data, BSTR uri, DWORD flags) { } if(uri) - TRACE("(%p %p): Generated raw uri=%s len=%d\n", data, uri, debugstr_wn(uri, length), length); + TRACE("(%p %p): Generated raw uri=%s len=%ld\n", data, uri, debugstr_wn(uri, length), length); else - TRACE("(%p %p): Computed raw uri len=%d\n", data, uri, length); + TRACE("(%p %p): Computed raw uri len=%ld\n", data, uri, length); return length; } @@ -3831,7 +3831,7 @@ static ULONG WINAPI Uri_AddRef(IUri *iface) Uri *This = impl_from_IUri(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -3841,7 +3841,7 @@ static ULONG WINAPI Uri_Release(IUri *iface) Uri *This = impl_from_IUri(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) destroy_uri_obj(This); @@ -3853,7 +3853,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST { Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags); + TRACE("(%p %s)->(%d %p %lx)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags); if(!This->create_flags) return E_UNEXPECTED; @@ -3875,7 +3875,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST /* Don't have support for flags yet. */ if(dwFlags) { - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pbstrProperty, dwFlags); return E_NOTIMPL; } @@ -4134,7 +4134,7 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST break; default: - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pbstrProperty, dwFlags); + FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pbstrProperty, dwFlags); hres = E_NOTIMPL; } @@ -4145,7 +4145,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D { Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); + TRACE("(%p %s)->(%d %p %lx)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); if(!This->create_flags) return E_UNEXPECTED; @@ -4158,7 +4158,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D /* Don't have support for flags yet. */ if(dwFlags) { - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pcchProperty, dwFlags); return E_NOTIMPL; } @@ -4270,7 +4270,7 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D hres = (This->userinfo_start > -1) ? S_OK : S_FALSE; break; default: - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pcchProperty, dwFlags); hres = E_NOTIMPL; } @@ -4282,7 +4282,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW Uri *This = impl_from_IUri(iface); HRESULT hres; - TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); + TRACE("(%p %s)->(%d %p %lx)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); if(!This->create_flags) return E_UNEXPECTED; @@ -4324,7 +4324,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW hres = S_OK; break; default: - FIXME("(%p)->(%d %p %x)\n", This, uriProp, pcchProperty, dwFlags); + FIXME("(%p)->(%d %p %lx)\n", This, uriProp, pcchProperty, dwFlags); hres = E_NOTIMPL; } @@ -4662,7 +4662,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateIUriBuilder(IUriBuilderFactory *if IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -4681,7 +4681,7 @@ static HRESULT WINAPI UriBuilderFactory_CreateInitializedIUriBuilder(IUriBuilder IUriBuilder **ppIUriBuilder) { Uri *This = impl_from_IUriBuilderFactory(iface); - TRACE("(%p)->(%08x %08x %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p)->(%08lx %08lx %p)\n", This, dwFlags, (DWORD)dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -4798,7 +4798,7 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) } This->create_flags = data->create_flags; heap_free(data); - TRACE("%x %s\n", This->create_flags, debugstr_w(This->raw_uri)); + TRACE("%lx %s\n", This->create_flags, debugstr_w(This->raw_uri)); memset(&parse, 0, sizeof(parse_data)); parse.uri = This->raw_uri; @@ -5022,7 +5022,7 @@ static HRESULT WINAPI Marshal_GetUnmarshalClass(IMarshal *iface, REFIID riid, vo DWORD dwDestContext, void *pvDestContext, DWORD mshlflags, CLSID *pCid) { Uri *This = impl_from_IMarshal(iface); - TRACE("(%p)->(%s %p %x %p %x %p)\n", This, debugstr_guid(riid), pv, + TRACE("(%p)->(%s %p %lx %p %lx %p)\n", This, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pCid); if(!pCid || (dwDestContext!=MSHCTX_LOCAL && dwDestContext!=MSHCTX_NOSHAREDMEM @@ -5046,7 +5046,7 @@ static HRESULT WINAPI Marshal_GetMarshalSizeMax(IMarshal *iface, REFIID riid, vo Uri *This = impl_from_IMarshal(iface); ULARGE_INTEGER size; HRESULT hres; - TRACE("(%p)->(%s %p %x %p %x %p)\n", This, debugstr_guid(riid), pv, + TRACE("(%p)->(%s %p %lx %p %lx %p)\n", This, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags, pSize); if(!pSize || (dwDestContext!=MSHCTX_LOCAL && dwDestContext!=MSHCTX_NOSHAREDMEM @@ -5077,7 +5077,7 @@ static HRESULT WINAPI Marshal_MarshalInterface(IMarshal *iface, IStream *pStm, R DWORD size; HRESULT hres; - TRACE("(%p)->(%p %s %p %x %p %x)\n", This, pStm, debugstr_guid(riid), pv, + TRACE("(%p)->(%p %s %p %lx %p %lx)\n", This, pStm, debugstr_guid(riid), pv, dwDestContext, pvDestContext, mshlflags); if(!pStm || mshlflags!=MSHLFLAGS_NORMAL || (dwDestContext!=MSHCTX_LOCAL @@ -5215,7 +5215,7 @@ static HRESULT WINAPI Marshal_ReleaseMarshalData(IMarshal *iface, IStream *pStm) static HRESULT WINAPI Marshal_DisconnectObject(IMarshal *iface, DWORD dwReserved) { Uri *This = impl_from_IMarshal(iface); - TRACE("(%p)->(%x)\n", This, dwReserved); + TRACE("(%p)->(%lx)\n", This, dwReserved); return S_OK; } @@ -5286,7 +5286,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU HRESULT hr; parse_data data; - TRACE("(%s %x %x %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %lx %lx %p)\n", debugstr_w(pwzURI), dwFlags, (DWORD)dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5304,7 +5304,7 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU /* Currently unsupported. */ if(dwFlags & ~supported_flags) - FIXME("Ignoring unsupported flag(s) %x\n", dwFlags & ~supported_flags); + FIXME("Ignoring unsupported flag(s) %lx\n", dwFlags & ~supported_flags); hr = Uri_Construct(NULL, (void**)&ret); if(FAILED(hr)) { @@ -5374,7 +5374,7 @@ HRESULT WINAPI CreateUriWithFragment(LPCWSTR pwzURI, LPCWSTR pwzFragment, DWORD DWORD_PTR dwReserved, IUri **ppURI) { HRESULT hres; - TRACE("(%s %s %x %x %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); + TRACE("(%s %s %lx %lx %p)\n", debugstr_w(pwzURI), debugstr_w(pwzFragment), dwFlags, (DWORD)dwReserved, ppURI); if(!ppURI) return E_INVALIDARG; @@ -5513,7 +5513,7 @@ static ULONG WINAPI UriBuilder_AddRef(IUriBuilder *iface) UriBuilder *This = impl_from_IUriBuilder(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -5523,7 +5523,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) UriBuilder *This = impl_from_IUriBuilder(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { if(This->uri) IUri_Release(&This->uri->IUri_iface); @@ -5547,11 +5547,11 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(%ld %ld %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return hr; } @@ -5563,7 +5563,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08x %d %d %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + TRACE("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); if(dwCreateFlags == -1) hr = build_uri(This, ppIUri, 0, UriBuilder_USE_ORIGINAL_FLAGS, dwAllowEncodingPropertyMask); @@ -5571,7 +5571,7 @@ static HRESULT WINAPI UriBuilder_CreateUri(IUriBuilder *iface, hr = build_uri(This, ppIUri, dwCreateFlags, 0, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08x %d %d %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + FIXME("(%p)->(0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return hr; } @@ -5584,12 +5584,12 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, { UriBuilder *This = impl_from_IUriBuilder(iface); HRESULT hr; - TRACE("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + TRACE("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); hr = build_uri(This, ppIUri, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask); if(hr == E_NOTIMPL) - FIXME("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + FIXME("(%p)->(0x%08lx 0x%08lx %ld %ld %p)\n", This, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return hr; } @@ -5807,7 +5807,7 @@ static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue static HRESULT WINAPI UriBuilder_SetPort(IUriBuilder *iface, BOOL fHasPort, DWORD dwNewValue) { UriBuilder *This = impl_from_IUriBuilder(iface); - TRACE("(%p)->(%d %d)\n", This, fHasPort, dwNewValue); + TRACE("(%p)->(%d %ld)\n", This, fHasPort, dwNewValue); This->has_port = fHasPort; This->port = dwNewValue; @@ -5851,7 +5851,7 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr Uri_HAS_USER_INFO|Uri_HAS_USER_NAME; UriBuilder *This = impl_from_IUriBuilder(iface); - TRACE("(%p)->(0x%08x)\n", This, dwPropertyMask); + TRACE("(%p)->(0x%08lx)\n", This, dwPropertyMask); if(dwPropertyMask & ~accepted_flags) return E_INVALIDARG; @@ -5932,7 +5932,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve { UriBuilder *ret; - TRACE("(%p %x %x %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + TRACE("(%p %lx %lx %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); if(!ppIUriBuilder) return E_POINTER; @@ -5962,7 +5962,7 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve } else { heap_free(ret); *ppIUriBuilder = NULL; - FIXME("(%p %x %x %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, + FIXME("(%p %lx %lx %p): Unknown IUri types not supported yet.\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); return E_NOTIMPL; } @@ -6295,7 +6295,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d HRESULT hr; IInternetProtocolInfo *info; Uri *relative, *base; - TRACE("(%p %p %x %p %x)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); + TRACE("(%p %p %lx %p %lx)\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); if(!ppCombinedUri) return E_INVALIDARG; @@ -6309,7 +6309,7 @@ HRESULT WINAPI CoInternetCombineIUri(IUri *pBaseUri, IUri *pRelativeUri, DWORD d base = get_uri_obj(pBaseUri); if(!relative || !base) { *ppCombinedUri = NULL; - FIXME("(%p %p %x %p %x) Unknown IUri types not supported yet.\n", + FIXME("(%p %p %lx %p %lx) Unknown IUri types not supported yet.\n", pBaseUri, pRelativeUri, dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); return E_NOTIMPL; } @@ -6343,7 +6343,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW HRESULT hr; IInternetProtocolInfo *info; - TRACE("(%p %s %x %p %x)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, + TRACE("(%p %s %lx %p %lx)\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); if(!ppCombinedUri) @@ -6362,7 +6362,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW base = get_uri_obj(pBaseUri); if(!base) { *ppCombinedUri = NULL; - FIXME("(%p %s %x %p %x) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), + FIXME("(%p %s %lx %p %lx) Unknown IUri's not supported yet.\n", pBaseUri, debugstr_w(pwzRelativeUrl), dwCombineFlags, ppCombinedUri, (DWORD)dwReserved); return E_NOTIMPL; } @@ -6828,7 +6828,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d Uri *uri; IInternetProtocolInfo *info; - TRACE("(%p %d %x %p %d %p %x)\n", pIUri, ParseAction, dwFlags, pwzResult, + TRACE("(%p %d %lx %p %ld %p %lx)\n", pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); if(!pcchResult) @@ -6841,7 +6841,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d if(!(uri = get_uri_obj(pIUri))) { *pcchResult = 0; - FIXME("(%p %d %x %p %d %p %x) Unknown IUri's not supported for this action.\n", + FIXME("(%p %d %lx %p %ld %p %lx) Unknown IUri's not supported for this action.\n", pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); return E_NOTIMPL; } @@ -6896,7 +6896,7 @@ HRESULT WINAPI CoInternetParseIUri(IUri *pIUri, PARSEACTION ParseAction, DWORD d default: *pcchResult = 0; hr = E_NOTIMPL; - FIXME("(%p %d %x %p %d %p %x) Partial stub.\n", pIUri, ParseAction, dwFlags, + FIXME("(%p %d %lx %p %ld %p %lx) Partial stub.\n", pIUri, ParseAction, dwFlags, pwzResult, cchResult, pcchResult, (DWORD)dwReserved); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 1af4d38ac81..b540313e586 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -149,7 +149,7 @@ static void process_detach(void) */ 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); URLMON_DllMain( hinstDLL, fdwReason, fImpLoad ); @@ -230,7 +230,7 @@ const char *debugstr_bindstatus(ULONG status) X(BINDSTATUS_DISPLAYNAMEAVAILABLE); #undef X default: - return wine_dbg_sprintf("(invalid status %u)", status); + return wine_dbg_sprintf("(invalid status %lu)", status); } } @@ -515,7 +515,7 @@ HRESULT WINAPI DllRegisterServerEx(void) */ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) { - FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved); + FIXME("(%p, %s, %ld): stub\n", pBC, debugstr_w(szURL), dwReserved); if (dwReserved || !szURL) return E_INVALIDARG; @@ -531,7 +531,7 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) HRESULT WINAPI FaultInIEFeature( HWND hwnd, uCLSSPEC * pClassSpec, QUERYCONTEXT *pQuery, DWORD flags ) { - FIXME("%p %p %p %08x\n", hwnd, pClassSpec, pQuery, flags); + FIXME("%p %p %p %08lx\n", hwnd, pClassSpec, pQuery, flags); return E_NOTIMPL; } @@ -543,7 +543,7 @@ HRESULT WINAPI CoGetClassObjectFromURL( REFCLSID rclsid, LPCWSTR szCodeURL, DWOR LPBINDCTX pBindCtx, DWORD dwClsContext, LPVOID pvReserved, REFIID riid, LPVOID *ppv ) { - FIXME("(%s %s %d %d %s %p %d %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL), + FIXME("(%s %s %ld %ld %s %p %ld %p %s %p) Stub!\n", debugstr_guid(rclsid), debugstr_w(szCodeURL), dwFileVersionMS, dwFileVersionLS, debugstr_w(szContentType), pBindCtx, dwClsContext, pvReserved, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -630,7 +630,7 @@ HRESULT WINAPI CopyStgMedium(const STGMEDIUM *src, STGMEDIUM *dst) } break; default: - FIXME("Unimplemented tymed %d\n", src->tymed); + FIXME("Unimplemented tymed %ld\n", src->tymed); } if(dst->pUnkForRelease) @@ -712,7 +712,7 @@ HRESULT WINAPI GetClassFileOrMime(LPBC pBC, LPCWSTR pszFilename, LPVOID pBuffer, DWORD cbBuffer, LPCWSTR pszMimeType, DWORD dwReserved, CLSID *pclsid) { - FIXME("(%p, %s, %p, %d, %s, 0x%08x, %p): stub\n", pBC, debugstr_w(pszFilename), pBuffer, + FIXME("(%p, %s, %p, %ld, %s, 0x%08lx, %p): stub\n", pBC, debugstr_w(pszFilename), pBuffer, cbBuffer, debugstr_w(pszMimeType), dwReserved, pclsid); return E_NOTIMPL; } @@ -768,7 +768,7 @@ BOOL WINAPI IsProtectedModeURL(const WCHAR *url) */ int WINAPI LogSqmBits(DWORD unk1, DWORD unk2) { - FIXME("stub: %d %d\n", unk1, unk2); + FIXME("stub: %ld %ld\n", unk1, unk2); return 0; } @@ -778,7 +778,7 @@ int WINAPI LogSqmBits(DWORD unk1, DWORD unk2) */ void WINAPI LogSqmUXCommandOffsetInternal(DWORD unk1, DWORD unk2, DWORD unk3, DWORD unk4) { - FIXME("stub: %d %d %d %d\n", unk1, unk2, unk3, unk4); + FIXME("stub: %ld %ld %ld %ld\n", unk1, unk2, unk3, unk4); } /*********************************************************************** @@ -787,7 +787,7 @@ void WINAPI LogSqmUXCommandOffsetInternal(DWORD unk1, DWORD unk2, DWORD unk3, DW */ int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) { - FIXME("stub: %d %d %d\n", unk1, unk2, unk3); + FIXME("stub: %ld %ld %ld\n", unk1, unk2, unk3); return 0; } @@ -797,7 +797,7 @@ int WINAPI MapUriToBrowserEmulationState(DWORD unk1, DWORD unk2, DWORD unk3) */ int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) { - FIXME("stub: %d %d\n", unk1, unk2); + FIXME("stub: %ld %ld\n", unk1, unk2); return 0; } @@ -807,7 +807,7 @@ int WINAPI MapBrowserEmulationModeToUserAgent(DWORD unk1, DWORD unk2) */ HRESULT WINAPI CoInternetGetBrowserProfile(DWORD unk) { - FIXME("%x: stub\n", unk); + FIXME("%lx: stub\n", unk); return E_NOTIMPL; } @@ -836,7 +836,7 @@ HRESULT WINAPI RegisterMediaTypes(UINT types, LPCSTR *szTypes, CLIPFORMAT *cfTyp */ BOOL WINAPI ShouldShowIntranetWarningSecband(DWORD unk) { - FIXME("%x: stub\n", unk); + FIXME("%lx: stub\n", unk); return FALSE; } diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index 9ddb130646f..f99e2049520 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -28,7 +28,7 @@ HRESULT CALLBACK IWinInetHttpInfo_QueryInfo_Proxy(IWinInetHttpInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) { - TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); + TRACE("(%p %lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); return IWinInetHttpInfo_RemoteQueryInfo_Proxy(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); } @@ -36,21 +36,21 @@ HRESULT __RPC_STUB IWinInetHttpInfo_QueryInfo_Stub(IWinInetHttpInfo* This, DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf, DWORD *pdwFlags, DWORD *pdwReserved) { - TRACE("(%p %x %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); + TRACE("(%p %lx %p %p %p %p)\n", This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); return IWinInetHttpInfo_QueryInfo(This, dwOption, pBuffer, pcbBuf, pdwFlags, pdwReserved); } HRESULT CALLBACK IWinInetInfo_QueryOption_Proxy(IWinInetInfo* This, DWORD dwOption, LPVOID pBuffer, DWORD *pcbBuf) { - TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf); + TRACE("(%p %lx %p %p)\n", This, dwOption, pBuffer, pcbBuf); return IWinInetInfo_RemoteQueryOption_Proxy(This, dwOption, pBuffer, pcbBuf); } HRESULT __RPC_STUB IWinInetInfo_QueryOption_Stub(IWinInetInfo* This, DWORD dwOption, BYTE *pBuffer, DWORD *pcbBuf) { - TRACE("(%p %x %p %p)\n", This, dwOption, pBuffer, pcbBuf); + TRACE("(%p %lx %p %p)\n", This, dwOption, pBuffer, pcbBuf); return IWinInetInfo_QueryOption(This, dwOption, pBuffer, pcbBuf); } @@ -108,7 +108,7 @@ static HRESULT marshal_stgmed(STGMEDIUM *stgmed, RemSTGMEDIUM **ret) MSHCTX_LOCAL, NULL, MSHLFLAGS_NORMAL); break; default: - FIXME("unsupported tymed %u\n", stgmed->tymed); + FIXME("unsupported tymed %lu\n", stgmed->tymed); break; } @@ -184,7 +184,7 @@ static HRESULT unmarshal_stgmed(RemSTGMEDIUM *rem_stgmed, STGMEDIUM *stgmed) hres = CoUnmarshalInterface(stream, &IID_IStream, (void**)&stgmed->u.pstm); break; default: - FIXME("unsupported tymed %u\n", stgmed->tymed); + FIXME("unsupported tymed %lu\n", stgmed->tymed); break; } @@ -227,7 +227,7 @@ static void stub_unmarshal_bindinfo(RemBINDINFO *rem_bindinfo, BINDINFO *bindinf bindinfo->cbstgmedData = rem_bindinfo->cbstgmedData; if(bindinfo->stgmedData.tymed != TYMED_NULL) - WARN("stgmed data (tymed %u) will be lost!\n", bindinfo->stgmedData.tymed); + WARN("stgmed data (tymed %lu) will be lost!\n", bindinfo->stgmedData.tymed); } static void stub_marshal_bindinfo(BINDINFO *bindinfo, RemBINDINFO *rem_bindinfo) @@ -319,7 +319,7 @@ HRESULT CALLBACK IBindStatusCallback_OnDataAvailable_Proxy( RemSTGMEDIUM *rem_stgmed; HRESULT hres; - TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + TRACE("(%p)->(%lx %lu %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); hres = marshal_stgmed(pstgmed, &rem_stgmed); if(FAILED(hres)) @@ -345,7 +345,7 @@ HRESULT __RPC_STUB IBindStatusCallback_OnDataAvailable_Stub( FORMATETC formatetc; HRESULT hres; - TRACE("(%p)->(%x %u %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); + TRACE("(%p)->(%lx %lu %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed); hres = unmarshal_stgmed(pstgmed, &stgmed); if(FAILED(hres))
participants (2)
-
Eric Pouech -
Huw Davies