From 570e24a014f16dd8b5ea8d0ca45937d68276e7aa Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Fri, 18 Feb 2022 09:16:09 +0100 Subject: [PATCH] shell32: Enable compilation with long types. Signed-off-by: Eric Pouech Signed-off-by: Alexandre Julliard --- 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;