From 89e1d2948246edc5297f5f337af77ef15fb57046 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Sat, 7 Oct 2006 20:18:14 +0200 Subject: [PATCH] shell32: Win64 printf format warning fixes. --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/autocomplete.c | 10 ++--- dlls/shell32/brsfolder.c | 10 ++--- dlls/shell32/changenotify.c | 22 +++++----- dlls/shell32/classes.c | 2 +- dlls/shell32/clipboard.c | 2 +- dlls/shell32/control.c | 8 ++-- dlls/shell32/cpanelfolder.c | 32 +++++++------- dlls/shell32/dataobject.c | 14 +++---- dlls/shell32/debughlp.c | 4 +- dlls/shell32/dialogs.c | 2 +- dlls/shell32/dragdrophelper.c | 10 ++--- dlls/shell32/enumidlist.c | 10 ++--- dlls/shell32/folders.c | 4 +- dlls/shell32/pidl.c | 26 ++++++------ dlls/shell32/shell32_main.c | 16 +++---- dlls/shell32/shelllink.c | 36 ++++++++-------- dlls/shell32/shellole.c | 10 ++--- dlls/shell32/shellord.c | 78 +++++++++++++++++------------------ dlls/shell32/shellpath.c | 42 +++++++++---------- dlls/shell32/shellstring.c | 8 ++-- dlls/shell32/shfldr_desktop.c | 22 +++++----- dlls/shell32/shfldr_fs.c | 32 +++++++------- dlls/shell32/shfldr_mycomp.c | 24 +++++------ dlls/shell32/shfldr_unixfs.c | 16 +++---- dlls/shell32/shlexec.c | 10 ++--- dlls/shell32/shlfolder.c | 20 ++++----- dlls/shell32/shlfsbind.c | 4 +- dlls/shell32/shlmenu.c | 16 +++---- dlls/shell32/shlview.c | 38 ++++++++--------- dlls/shell32/shv_bg_cmenu.c | 6 +-- dlls/shell32/shv_item_cmenu.c | 4 +- dlls/shell32/systray.c | 2 +- 33 files changed, 271 insertions(+), 271 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 69ea4f0944a..052027650bd 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT +EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 95f630457f4..2ffe0d6157e 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -174,7 +174,7 @@ static ULONG WINAPI IAutoComplete_fnAddRef( IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount - 1); + TRACE("(%p)->(%u)\n", This, refCount - 1); return refCount; } @@ -188,7 +188,7 @@ static ULONG WINAPI IAutoComplete_fnRelease( IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { TRACE(" destroying IAutoComplete(%p)\n",This); @@ -347,7 +347,7 @@ static ULONG WINAPI IAutoComplete2_fnAddRef( { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IAutoComplete2_AddRef((IAutoComplete*)This); } @@ -360,7 +360,7 @@ static ULONG WINAPI IAutoComplete2_fnRelease( { IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IAutoComplete_Release((IAutoComplete*)This); } @@ -425,7 +425,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); - TRACE("(%p) -> (0x%lx)\n", This, dwFlag); + TRACE("(%p) -> (0x%x)\n", This, dwFlag); This->options = dwFlag; diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index aa53ff0c407..666e34b2bcc 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -132,7 +132,7 @@ static void InitializeTreeView( browse_info *info ) IShellFolder *lpsfDesktop; hr = SHGetDesktopFolder(&lpsfDesktop); if (!SUCCEEDED(hr)) { - WARN("SHGetDesktopFolder failed! hr = %08lx\n", hr); + WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); return; } hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); @@ -140,7 +140,7 @@ static void InitializeTreeView( browse_info *info ) } if (!SUCCEEDED(hr)) { - WARN("Could not bind to parent shell folder! hr = %08lx\n", hr); + WARN("Could not bind to parent shell folder! hr = %08x\n", hr); return; } @@ -152,7 +152,7 @@ static void InitializeTreeView( browse_info *info ) } if (!SUCCEEDED(hr)) { - WARN("Could not bind to root shell folder! hr = %08lx\n", hr); + WARN("Could not bind to root shell folder! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); return; } @@ -160,7 +160,7 @@ static void InitializeTreeView( browse_info *info ) flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); if (!SUCCEEDED(hr)) { - WARN("Could not get child iterator! hr = %08lx\n", hr); + WARN("Could not get child iterator! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); IShellFolder_Release(lpsfRoot); return; @@ -225,7 +225,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR BOOL bSuccess=TRUE; STRRET str; - TRACE("%p %p %lx %p\n", lpsf, lpi, dwFlags, lpFriendlyName); + TRACE("%p %p %x %p\n", lpsf, lpi, dwFlags, lpFriendlyName); if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str))) bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); else diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index e257aa21e4a..6d528eeb37d 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -200,7 +200,7 @@ SHChangeNotifyRegister( item = SHAlloc(sizeof(NOTIFICATIONLIST)); - TRACE("(%p,0x%08x,0x%08lx,0x%08x,%d,%p) item=%p\n", + TRACE("(%p,0x%08x,0x%08x,0x%08x,%d,%p) item=%p\n", hwnd, fSources, wEventMask, uMsg, cItems, lpItems, item); item->next = NULL; @@ -236,7 +236,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) { LPNOTIFICATIONLIST node; - TRACE("(0x%08lx)\n", hNotify); + TRACE("(0x%08x)\n", hNotify); EnterCriticalSection(&SHELL32_ChangenotifyCS); @@ -255,7 +255,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, DWORD unknown3, DWORD unknown4) { - FIXME("(0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx)\n", + FIXME("(0x%08x, 0x%08x, 0x%08x, 0x%08x)\n", unknown1, unknown2, unknown3, unknown4); return -1; @@ -285,7 +285,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID Pidls[0] = NULL; Pidls[1] = NULL; - TRACE("(0x%08lx,0x%08x,%p,%p):stub.\n", wEventId, uFlags, dwItem1, dwItem2); + TRACE("(0x%08x,0x%08x,%p,%p):stub.\n", wEventId, uFlags, dwItem1, dwItem2); if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) ) { @@ -341,10 +341,10 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID WCHAR path[MAX_PATH]; if( Pidls[0] && SHGetPathFromIDListW(Pidls[0], path )) - TRACE("notify %08lx on item1 = %s\n", wEventId, debugstr_w(path)); + TRACE("notify %08x on item1 = %s\n", wEventId, debugstr_w(path)); if( Pidls[1] && SHGetPathFromIDListW(Pidls[1], path )) - TRACE("notify %08lx on item2 = %s\n", wEventId, debugstr_w(path)); + TRACE("notify %08x on item2 = %s\n", wEventId, debugstr_w(path)); } EnterCriticalSection(&SHELL32_ChangenotifyCS); @@ -382,7 +382,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID ptr->pidlSignaled = ILClone(Pidls[0]); - TRACE("notifying %s, event %s(%lx) before\n", NodeName( ptr ), DumpEvent( + TRACE("notifying %s, event %s(%x) before\n", NodeName( ptr ), DumpEvent( wEventId ),wEventId ); ptr->wSignalledEvent |= wEventId; @@ -392,7 +392,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID else SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); - TRACE("notifying %s, event %s(%lx) after\n", NodeName( ptr ), DumpEvent( + TRACE("notifying %s, event %s(%x) after\n", NodeName( ptr ), DumpEvent( wEventId ),wEventId ); } @@ -421,7 +421,7 @@ DWORD WINAPI NTSHChangeNotifyRegister( int count, SHChangeNotifyEntry *idlist) { - FIXME("(%p,0x%08lx,0x%08lx,0x%08lx,0x%08x,%p):semi stub.\n", + FIXME("(%p,0x%08x,0x%08x,0x%08x,0x%08x,%p):semi stub.\n", hwnd,events1,events2,msg,count,idlist); return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); @@ -440,7 +440,7 @@ HANDLE WINAPI SHChangeNotification_Lock( LPNOTIFICATIONLIST node; LPCITEMIDLIST *idlist; - TRACE("%p %08lx %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); + TRACE("%p %08x %p %p\n", hChange, dwProcessId, lppidls, lpwEventId); /* EnterCriticalSection(&SHELL32_ChangenotifyCS); */ @@ -476,7 +476,7 @@ BOOL WINAPI SHChangeNotification_Unlock ( HANDLE hLock) */ DWORD WINAPI NTSHChangeNotifyDeregister(ULONG x1) { - FIXME("(0x%08lx):semi stub.\n",x1); + FIXME("(0x%08x):semi stub.\n",x1); return SHChangeNotifyDeregister( x1 ); } diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index f6db0dc3738..3fb37dbe4de 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -479,7 +479,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) } } - TRACE("-- *pdwAttributes == 0x%08lx\n", *pdwAttributes); + TRACE("-- *pdwAttributes == 0x%08x\n", *pdwAttributes); return TRUE; } diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c index 9ba07a94a2c..bd5f488351e 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c @@ -239,7 +239,7 @@ HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags) DWORD * pdwFlag; HGLOBAL hGlobal; - TRACE("(0x%08lx)\n", dwFlags); + TRACE("(0x%08x)\n", dwFlags); hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); if(!hGlobal) return hGlobal; diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 192afc8d086..f9f6db827ef 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -410,7 +410,7 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS { CPanel panel; - TRACE("(%p, %p, %s, 0x%08lx)\n", + TRACE("(%p, %p, %s, 0x%08x)\n", hWnd, hInst, debugstr_w(cmd), nCmdShow); memset(&panel, 0, sizeof(panel)); @@ -443,7 +443,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%08lx 0x%08lx stub\n", hWnd, hModule, w, x); + FIXME("%p %p 0x%08x 0x%08x stub\n", hWnd, hModule, w, x); return 0; } @@ -467,7 +467,7 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, WORD args[5]; SEGPTR cmdline_seg; - TRACE( "proc %lx hwnd %p inst %p cmdline %s cmdshow %d\n", + TRACE( "proc %x hwnd %p inst %p cmdline %s cmdshow %d\n", proc, hwnd, inst, debugstr_a(cmdline), cmdshow ); cmdline_seg = MapLS( cmdline ); @@ -489,6 +489,6 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, */ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) { - FIXME("(%p, %p, %08lx, %08lx, %08lx, %08lx): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); + FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 7601e8d0cf5..cae69321ec7 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -189,7 +189,7 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface) ICPanelImpl *This = (ICPanelImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -199,7 +199,7 @@ static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface) ICPanelImpl *This = (ICPanelImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { TRACE("-- destroying IShellFolder(%p)\n", This); @@ -230,7 +230,7 @@ ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface, if (pchEaten) *pchEaten = 0; - TRACE("(%p)->(-- ret=0x%08lx)\n", This, hr); + TRACE("(%p)->(-- ret=0x%08x)\n", This, hr); return hr; } @@ -409,7 +409,7 @@ static BOOL CreateCPanelEnumList( WIN32_FIND_DATAA wfd; HANDLE hFile; - TRACE("(%p)->(flags=0x%08lx)\n", iface, dwFlags); + TRACE("(%p)->(flags=0x%08x)\n", iface, dwFlags); /* enumerate control panel folders folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -456,7 +456,7 @@ ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFl { ICPanelImpl *This = (ICPanelImpl *)iface; - TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); + TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); if (*ppEnumIDList) @@ -557,7 +557,7 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI HRESULT hr = S_OK; - TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", + TRACE("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -577,7 +577,7 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE("-- result=0x%08lx\n", *rgfInOut); + TRACE("-- result=0x%08x\n", *rgfInOut); return hr; } @@ -640,7 +640,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface, *ppvOut = pObj; } - TRACE("(%p)->hr=0x%08lx\n", This, hr); + TRACE("(%p)->hr=0x%08x\n", This, hr); return hr; } @@ -657,7 +657,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, *szPath = '\0'; - TRACE("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + TRACE("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump(pidl); if (!pidl || !strRet) @@ -718,7 +718,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND h LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { ICPanelImpl *This = (ICPanelImpl *)iface; - FIXME("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut); + FIXME("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w(lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -846,7 +846,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_AddRef(IPersistFolder2 * iface) { ICPanelImpl *This = impl_from_IPersistFolder2(iface); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef(_IUnknown_(This)); } @@ -858,7 +858,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_Release(IPersistFolder2 * iface) { ICPanelImpl *This = impl_from_IPersistFolder2(iface); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%u)\n", This, This->ref); return IUnknown_Release(_IUnknown_(This)); } @@ -941,7 +941,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface( { ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%u)\n", This, This->ref); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); } @@ -950,7 +950,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnAddRef(IShellExecuteHookW* i { ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef(This->pUnkOuter); } @@ -1029,7 +1029,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnQueryInterface(IShellExecuteHookA* if { ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%u)\n", This, This->ref); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); } @@ -1038,7 +1038,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnAddRef(IShellExecuteHookA* i { ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); - TRACE("(%p)->(count=%lu)\n", This, This->ref); + TRACE("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef(This->pUnkOuter); } diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 1d9c2c3f8ed..9d42868a33c 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -82,7 +82,7 @@ static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -92,7 +92,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { @@ -109,7 +109,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; UINT i; - TRACE("(%p)->(%lu,%p)\n", This, celt, rgelt); + TRACE("(%p)->(%u,%p)\n", This, celt, rgelt); if(!This->pFmt)return S_FALSE; if(!rgelt) return E_INVALIDARG; @@ -128,7 +128,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt) { IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; - TRACE("(%p)->(num=%lu)\n", This, celt); + TRACE("(%p)->(num=%u)\n", This, celt); if((This->posFmt + celt) >= This->countFmt) return S_FALSE; This->posFmt += celt; @@ -253,7 +253,7 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface) IDataObjectImpl *This = (IDataObjectImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -266,7 +266,7 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface) IDataObjectImpl *This = (IDataObjectImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { @@ -337,7 +337,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC IDataObjectImpl *This = (IDataObjectImpl *)iface; UINT i; - TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); + TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\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 56be6a2e99d..96c77ca172c 100644 --- a/dlls/shell32/debughlp.c +++ b/dlls/shell32/debughlp.c @@ -205,7 +205,7 @@ void pdump (LPCITEMIDLIST pidl) if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) dwAttrib = pData->u.file.uFileAttribs; - MESSAGE ("[%p] size=%04u type=%lx attr=0x%08lx name=%s (%s,%s)\n", + MESSAGE ("[%p] size=%04u type=%x attr=0x%08x name=%s (%s,%s)\n", pidltemp, pidltemp->mkid.cb, type, dwAttrib, debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); @@ -276,7 +276,7 @@ BOOL pcheck( LPCITEMIDLIST pidl ) case PT_SHARE: break; default: - ERR("unknown IDLIST %p [%p] size=%u type=%lx\n", + ERR("unknown IDLIST %p [%p] size=%u type=%x\n", pidl, pidltemp, pidltemp->mkid.cb,type ); dump_pidl_hex( pidltemp ); return FALSE; diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 3a49933ca1b..e5f06c6453a 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -66,7 +66,7 @@ BOOL WINAPI PickIconDlg( DWORD nMaxFile, LPDWORD lpdwIconIndex) { - FIXME("(%p,%s,%08lx,%p):stub.\n", + FIXME("(%p,%s,%08x,%p):stub.\n", hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex); return 0xffffffff; } diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 0b8ec25bd7d..9c3f236f061 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -115,7 +115,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -125,7 +125,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { TRACE("-- destroying (%p)\n", This); @@ -143,7 +143,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( DWORD dwEffect) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; - FIXME ("(%p)->(%p %p %p 0x%08lx)\n", This,hwndTarget, pDataObject, ppt, dwEffect); + FIXME ("(%p)->(%p %p %p 0x%08x)\n", This,hwndTarget, pDataObject, ppt, dwEffect); return E_NOTIMPL; } @@ -157,14 +157,14 @@ static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; - FIXME ("(%p)->(%p 0x%08lx)\n", This, ppt, dwEffect); + FIXME ("(%p)->(%p 0x%08x)\n", This, ppt, dwEffect); return E_NOTIMPL; } static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) { IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; - FIXME ("(%p)->(%p %p 0x%08lx)\n", This, pDataObject, ppt, dwEffect); + FIXME ("(%p)->(%p %p 0x%08x)\n", This, pDataObject, ppt, dwEffect); return E_NOTIMPL; } diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index ee02322621a..6356c4d68bc 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -116,7 +116,7 @@ BOOL CreateFolderEnumList( static const WCHAR dot[] = { '.',0 }; static const WCHAR dotdot[] = { '.','.',0 }; - TRACE("(%p)->(path=%s flags=0x%08lx)\n", list, debugstr_w(lpszPath), dwFlags); + TRACE("(%p)->(path=%s flags=0x%08x)\n", list, debugstr_w(lpszPath), dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; @@ -246,7 +246,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef( IEnumIDListImpl *This = (IEnumIDListImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount - 1); + TRACE("(%p)->(%u)\n", This, refCount - 1); return refCount; } @@ -259,7 +259,7 @@ static ULONG WINAPI IEnumIDList_fnRelease( IEnumIDListImpl *This = (IEnumIDListImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%lu)\n", This, refCount + 1); + TRACE("(%p)->(%u)\n", This, refCount + 1); if (!refCount) { TRACE(" destroying IEnumIDList(%p)\n",This); @@ -285,7 +285,7 @@ static HRESULT WINAPI IEnumIDList_fnNext( HRESULT hr = S_OK; LPITEMIDLIST temp; - TRACE("(%p)->(%ld,%p, %p)\n",This,celt,rgelt,pceltFetched); + TRACE("(%p)->(%d,%p, %p)\n",This,celt,rgelt,pceltFetched); /* 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) @@ -329,7 +329,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip( DWORD dwIndex; HRESULT hr = S_OK; - TRACE("(%p)->(%lu)\n",This,celt); + TRACE("(%p)->(%u)\n",This,celt); for(dwIndex = 0; dwIndex < celt; dwIndex++) { if(!This->mpCurrent) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 6ce7ab7ffae..19fb5c74be9 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -138,7 +138,7 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) IExtractIconWImpl *This = (IExtractIconWImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -150,7 +150,7 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) IExtractIconWImpl *This = (IExtractIconWImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index b5a59af764b..97cf05125b2 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -78,7 +78,7 @@ BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR pat BOOL ret = FALSE; WCHAR wPath[MAX_PATH]; - TRACE("%p %p %p %ld\n", psf, pidl, path, type); + TRACE("%p %p %p %d\n", psf, pidl, path, type); if (!pidl || !path) return FALSE; @@ -98,7 +98,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa STRRET strret; DWORD flag; - TRACE("%p %p %p %ld\n", psf, pidl, path, type); + TRACE("%p %p %p %d\n", psf, pidl, path, type); if (!pidl || !path) return FALSE; @@ -124,7 +124,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa flag = SHGDN_INFOLDER; break; default: - FIXME("Unknown type parameter = %lx\n", type); + FIXME("Unknown type parameter = %x\n", type); flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; break; } @@ -162,7 +162,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) { - TRACE_(shell)("%p %p %p %ld\n", psf, pidl, path, type); + TRACE_(shell)("%p %p %p %d\n", psf, pidl, path, type); if (SHELL_OsIsUnicode()) return ILGetDisplayNameExW(psf, pidl, path, type); @@ -388,7 +388,7 @@ HRESULT WINAPI SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * at { WCHAR lpszDisplayName[MAX_PATH]; - TRACE_(shell)("%s %p 0x%08lx\n", path, ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08x\n", path, ppidl, attributes ? *attributes : 0); if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH)) lpszDisplayName[MAX_PATH-1] = 0; @@ -402,7 +402,7 @@ HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * a DWORD pchEaten; HRESULT ret = E_FAIL; - TRACE_(shell)("%s %p 0x%08lx\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); + TRACE_(shell)("%s %p 0x%08x\n", debugstr_w(path), ppidl, attributes ? *attributes : 0); if (SUCCEEDED (SHGetDesktopFolder(&sf))) { @@ -441,7 +441,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%lx,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); + TRACE_(shell)("(hwnd=%p,csidl=0x%x,%s).\n", hwndOwner, nFolder, fCreate ? "T" : "F"); if (fCreate) nFolder |= CSIDL_FLAG_CREATE; @@ -1002,7 +1002,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, LPBC pBC = NULL; HRESULT ret; - TRACE("%s %p %d (%p)->%p (%p)->0x%lx\n", debugstr_w(path), lpFindFile, bBindCtx, + TRACE("%s %p %d (%p)->%p (%p)->0x%x\n", debugstr_w(path), lpFindFile, bBindCtx, ppidl, ppidl ? *ppidl : NULL, prgfInOut, prgfInOut ? *prgfInOut : 0); @@ -1029,7 +1029,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, if (!SUCCEEDED(ret) && ppidl) *ppidl = NULL; - TRACE("%s %p 0x%lx\n", debugstr_w(path), ppidl ? *ppidl : NULL, prgfInOut ? *prgfInOut : 0); + TRACE("%s %p 0x%x\n", debugstr_w(path), ppidl ? *ppidl : NULL, prgfInOut ? *prgfInOut : 0); return ret; } @@ -1276,7 +1276,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) hr = StrRetToBufW(&strret, pidlLast, pszPath, MAX_PATH); - TRACE_(shell)("-- %s, 0x%08lx\n",debugstr_w(pszPath), hr); + TRACE_(shell)("-- %s, 0x%08x\n",debugstr_w(pszPath), hr); return SUCCEEDED(hr); } @@ -1320,7 +1320,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%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08x\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; } @@ -1801,7 +1801,7 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) ERR("-- no text\n"); } - TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_a(szOut),dwReturn); + TRACE("-- (%p=%s 0x%08x)\n",szOut,debugstr_a(szOut),dwReturn); return dwReturn; } @@ -1830,7 +1830,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) *szOut = 0; } - TRACE("-- (%p=%s 0x%08lx)\n",szOut,debugstr_w(szOut),dwReturn); + TRACE("-- (%p=%s 0x%08x)\n",szOut,debugstr_w(szOut),dwReturn); return dwReturn; } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 641e263efb9..cd9dea9d22e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -348,7 +348,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, BOOL IconNotYetLoaded=TRUE; UINT uGilFlags = 0; - TRACE("%s fattr=0x%lx sfi=%p(attr=0x%08lx) size=0x%x flags=0x%x\n", + TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, psfi, psfi->dwAttributes, sizeofpsfi, flags); @@ -617,7 +617,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, SHFree(pidlLast); #ifdef MORE_DEBUG - TRACE ("icon=%p index=0x%08x attr=0x%08lx name=%s type=%s ret=0x%08lx\n", + TRACE ("icon=%p index=0x%08x attr=0x%08x name=%s type=%s ret=0x%08lx\n", psfi->hIcon, psfi->iIcon, psfi->dwAttributes, debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret); #endif @@ -793,7 +793,7 @@ VOID WINAPI Printer_LoadIconsW(LPCWSTR wsPrinterName, HICON * pLargeIcon, HICON BOOL WINAPI Printers_RegisterWindowW(LPCWSTR wsPrinter, DWORD dwType, HANDLE * phClassPidl, HWND * phwnd) { - FIXME("(%s, %lx, %p (%p), %p (%p)) stub!\n", debugstr_w(wsPrinter), dwType, + FIXME("(%s, %x, %p (%p), %p (%p)) stub!\n", debugstr_w(wsPrinter), dwType, phClassPidl, (phClassPidl != NULL) ? *(phClassPidl) : NULL, phwnd, (phwnd != NULL) ? *(phwnd) : NULL); @@ -896,7 +896,7 @@ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) */ DWORD WINAPI SHHelpShortcuts_RunDLLA(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4) { - FIXME("(%lx, %lx, %lx, %lx) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); + FIXME("(%x, %x, %x, %x) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); return 0; } @@ -906,7 +906,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("(%lx, %lx, %lx, %lx) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); + FIXME("(%x, %x, %x, %x) stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); return 0; } @@ -1073,7 +1073,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, */ void WINAPI FreeIconList( DWORD dw ) { - FIXME("%lx: stub\n",dw); + FIXME("%x: stub\n",dw); } @@ -1113,7 +1113,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) WINE_FILEVERSION_BUILD, WINE_FILEVERSION_PLATFORMID); } - TRACE("%lu.%lu.%lu.%lu\n", + TRACE("%u.%u.%u.%u\n", pdvi->dwMajorVersion, pdvi->dwMinorVersion, pdvi->dwBuildNumber, pdvi->dwPlatformID); return S_OK; @@ -1143,7 +1143,7 @@ HIMAGELIST ShellBigIconList = 0; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index ac0e8f8b071..a27b95755b7 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -280,7 +280,7 @@ static ULONG ShellLink_AddRef( IShellLinkImpl *This ) { ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -292,7 +292,7 @@ static ULONG ShellLink_Release( IShellLinkImpl *This ) { ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (refCount) return refCount; @@ -379,7 +379,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile HRESULT r; IStream *stm; - TRACE("(%p, %s, %lx)\n",This, debugstr_w(pszFileName), dwMode); + TRACE("(%p, %s, %x)\n",This, debugstr_w(pszFileName), dwMode); if( dwMode == 0 ) dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; @@ -391,7 +391,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile IStream_Release( stm ); This->bDirty = FALSE; } - TRACE("-- returning hr %08lx\n", r); + TRACE("-- returning hr %08x\n", r); return r; } @@ -628,7 +628,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) return E_FAIL; } - TRACE("Read %ld bytes\n",chunk->size); + TRACE("Read %d bytes\n",chunk->size); *data = (LPVOID) chunk; @@ -707,7 +707,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, if( n && (n < loc->dwTotalSize) ) *path = Stream_LoadPath( &p[n], loc->dwTotalSize - n ); - TRACE("type %ld serial %08lx name %s path %s\n", volume->type, + TRACE("type %d serial %08x name %s path %s\n", volume->type, volume->serial, debugstr_w(volume->label), debugstr_w(*path)); HeapFree( GetProcessHeap(), 0, p ); @@ -756,11 +756,11 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str ) if( count != size ) return E_FAIL; - TRACE("magic %08lx string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); + TRACE("magic %08x string = %s\n", buffer.dbh.dwSignature, debugstr_w(buffer.szwDarwinID)); if( (buffer.dbh.dwSignature&0xffff0000) != 0xa0000000 ) { - ERR("Unknown magic number %08lx in advertised shortcut\n", buffer.dbh.dwSignature); + ERR("Unknown magic number %08x in advertised shortcut\n", buffer.dbh.dwSignature); return E_FAIL; } @@ -1351,7 +1351,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile, { IShellLinkImpl *This = (IShellLinkImpl *)iface; - TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)(%s)\n", + TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); if (This->sComponent || This->sProduct) @@ -1623,7 +1623,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA * iface, LPCSTR { IShellLinkImpl *This = (IShellLinkImpl *)iface; - TRACE("(%p)->(path=%s %lx)\n",This, pszPathRel, dwReserved); + TRACE("(%p)->(path=%s %x)\n",This, pszPathRel, dwReserved); HeapFree(GetProcessHeap(), 0, This->sPathRel); This->sPathRel = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); @@ -1636,7 +1636,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR { IShellLinkImpl *This = (IShellLinkImpl *)iface; - TRACE("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags); + TRACE("(%p)->(hwnd=%p flags=%x)\n",This, hwnd, fFlags); return IShellLinkW_Resolve( (IShellLinkW*)&(This->lpvtblw), hwnd, fFlags ); } @@ -1721,7 +1721,7 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile, { IShellLinkImpl *This = impl_from_IShellLinkW(iface); - TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%lu)(%s)\n", + TRACE("(%p)->(pfile=%p len=%u find_data=%p flags=%u)(%s)\n", This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath)); if (This->sComponent || This->sProduct) @@ -2000,7 +2000,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR { IShellLinkImpl *This = impl_from_IShellLinkW(iface); - TRACE("(%p)->(path=%s %lx)\n",This, debugstr_w(pszPathRel), dwReserved); + TRACE("(%p)->(path=%s %x)\n",This, debugstr_w(pszPathRel), dwReserved); HeapFree(GetProcessHeap(), 0, This->sPathRel); This->sPathRel = HeapAlloc( GetProcessHeap(), 0, @@ -2020,7 +2020,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR IShellLinkImpl *This = impl_from_IShellLinkW(iface); - TRACE("(%p)->(hwnd=%p flags=%lx)\n",This, hwnd, fFlags); + TRACE("(%p)->(hwnd=%p flags=%x)\n",This, hwnd, fFlags); /*FIXME: use IResolveShellLink interface */ @@ -2147,7 +2147,7 @@ static BOOL ShellLink_GetVolumeInfo(LPWSTR 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 %ld serial %08lx name %s\n", r, + TRACE("r = %d type %d serial %08x name %s\n", r, volume->type, volume->serial, debugstr_w(volume->label)); return r; } @@ -2274,7 +2274,7 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl LPVOID block = NULL; HRESULT r = E_FAIL; - TRACE("%p %08lx %p\n", iface, dwSig, ppDataBlock ); + TRACE("%p %08x %p\n", iface, dwSig, ppDataBlock ); switch (dwSig) { @@ -2289,10 +2289,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 %08lx\n", dwSig); + FIXME("valid but unhandled datablock %08x\n", dwSig); break; default: - ERR("unknown datablock %08lx\n", dwSig); + ERR("unknown datablock %08x\n", dwSig); } *ppDataBlock = block; return r; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3f672ac3822..90900d1ba17 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -195,7 +195,7 @@ HRESULT WINAPI SHCoCreateInstance( hres = E_ACCESSDENIED; goto end; } else if (! SUCCEEDED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { - TRACE("GetClassObject failed 0x%08lx\n", hres); + TRACE("GetClassObject failed 0x%08x\n", hres); goto end; } @@ -214,7 +214,7 @@ HRESULT WINAPI SHCoCreateInstance( end: if(hres!=S_OK) { - ERR("failed (0x%08lx) to create CLSID:%s IID:%s\n", + ERR("failed (0x%08x) to create CLSID:%s IID:%s\n", hres, shdebugstr_guid(myclsid), shdebugstr_guid(refiid)); ERR("class not found in registry\n"); } @@ -333,7 +333,7 @@ LPVOID WINAPI SHAlloc(DWORD len) LPVOID ret; ret = CoTaskMemAlloc(len); - TRACE("%lu bytes at %p\n",len, ret); + TRACE("%u bytes at %p\n",len, ret); return ret; } @@ -443,7 +443,7 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) IDefClFImpl *This = (IDefClFImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -455,7 +455,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) IDefClFImpl *This = (IDefClFImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 124d88b45b4..ef6b7b8c431 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -104,7 +104,7 @@ DWORD WINAPI ParseFieldA( LPSTR dst, DWORD len) { - WARN("(%s,0x%08lx,%p,%ld) semi-stub.\n",debugstr_a(src),nField,dst,len); + WARN("(%s,0x%08x,%p,%d) semi-stub.\n",debugstr_a(src),nField,dst,len); if (!src || !src[0] || !dst || !len) return 0; @@ -134,7 +134,7 @@ DWORD WINAPI ParseFieldA( */ DWORD WINAPI ParseFieldW(LPCWSTR src, DWORD nField, LPWSTR dst, DWORD len) { - WARN("(%s,0x%08lx,%p,%ld) semi-stub.\n", debugstr_w(src), nField, dst, len); + WARN("(%s,0x%08x,%p,%d) semi-stub.\n", debugstr_w(src), nField, dst, len); if (!src || !src[0] || !dst || !len) return 0; @@ -183,7 +183,7 @@ BOOL WINAPI GetFileNameFromBrowse( OPENFILENAMEA ofn; BOOL ret; - TRACE("%p, %s, %ld, %s, %s, %s, %s)\n", + TRACE("%p, %s, %d, %s, %s, %s, %s)\n", hwndOwner, lpstrFile, nMaxFile, lpstrInitialDir, lpstrDefExt, lpstrFilter, lpstrTitle); @@ -220,7 +220,7 @@ VOID WINAPI SHGetSetSettings(LPSHELLSTATE lpss, DWORD dwMask, BOOL bSet) { if(bSet) { - FIXME("%p 0x%08lx TRUE\n", lpss, dwMask); + FIXME("%p 0x%08x TRUE\n", lpss, dwMask); } else { @@ -242,7 +242,7 @@ VOID WINAPI SHGetSettings(LPSHELLFLAGSTATE lpsfs, DWORD dwMask) DWORD dwData; DWORD dwDataSize = sizeof (DWORD); - TRACE("(%p 0x%08lx)\n",lpsfs,dwMask); + TRACE("(%p 0x%08x)\n",lpsfs,dwMask); if (RegCreateKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0)) @@ -330,7 +330,7 @@ BOOL WINAPI RegisterShellHook( HWND hWnd, DWORD dwType) { - FIXME("(%p,0x%08lx):stub.\n",hWnd, dwType); + FIXME("(%p,0x%08x):stub.\n",hWnd, dwType); return TRUE; } @@ -497,7 +497,7 @@ HRESULT WINAPI SHDoDragDrop( DWORD dwOKEffect, LPDWORD pdwEffect) { - FIXME("(%p %p %p 0x%08lx %p):stub.\n", + FIXME("(%p %p %p 0x%08x %p):stub.\n", hWnd, lpDataObject, lpDropSource, dwOKEffect, pdwEffect); return DoDragDrop(lpDataObject, lpDropSource, dwOKEffect, pdwEffect); } @@ -513,7 +513,7 @@ WORD WINAPI ArrangeWindows( WORD cKids, CONST HWND * lpKids) { - FIXME("(%p 0x%08lx %p 0x%04x %p):stub.\n", + FIXME("(%p 0x%08x %p 0x%04x %p):stub.\n", hwndParent, dwReserved, lpRect, cKids, lpKids); return 0; } @@ -527,7 +527,7 @@ WORD WINAPI ArrangeWindows( DWORD WINAPI SignalFileOpen (DWORD dwParam1) { - FIXME("(0x%08lx):stub.\n", dwParam1); + FIXME("(0x%08x):stub.\n", dwParam1); return 0; } @@ -703,12 +703,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=%ld, len=%ld\n", + ERR("Error policy data for \"NoRecentDocsHistory\" not formatted correctly, type=%d, len=%d\n", type, datalen); return; } - TRACE("policy value for NoRecentDocsHistory = %08lx\n", data[0]); + TRACE("policy value for NoRecentDocsHistory = %08x\n", data[0]); /* now test the actual policy value */ if ( data[0] != 0) return; @@ -868,7 +868,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=%08lx\n", + ERR("Delete for %s failed, err=%d, attr=%08x\n", old_lnk_name, err, attr); } else { @@ -877,7 +877,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) } } else { - ERR("Delete for %s failed, attr=%08lx\n", + ERR("Delete for %s failed, attr=%08x\n", old_lnk_name, attr); } } @@ -940,7 +940,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) (LPVOID *)&pPf); if(FAILED(hres)) { /* bombed */ - ERR("failed QueryInterface for IPersistFile %08lx\n", hres); + ERR("failed QueryInterface for IPersistFile %08x\n", hres); goto fail; } @@ -952,7 +952,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) } if(FAILED(hres)) { /* bombed */ - ERR("failed Set{IDList|Path} %08lx\n", hres); + ERR("failed Set{IDList|Path} %08x\n", hres); goto fail; } @@ -961,7 +961,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) hres = IShellLinkA_SetDescription(psl, desc); if(FAILED(hres)) { /* bombed */ - ERR("failed SetDescription %08lx\n", hres); + ERR("failed SetDescription %08x\n", hres); goto fail; } @@ -971,7 +971,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) hres = IPersistFile_Save(pPf, widelink, TRUE); if(FAILED(hres)) { /* bombed */ - ERR("failed IPersistFile::Save %08lx\n", hres); + ERR("failed IPersistFile::Save %08x\n", hres); IPersistFile_Release(pPf); IShellLinkA_Release(psl); goto fail; @@ -979,11 +979,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=%08lx\n", + TRACE("shortcut %s has been created, result=%08x\n", new_lnk_filepath, hres); } else { - ERR("CoCreateInstance failed, hres=%08lx\n", hres); + ERR("CoCreateInstance failed, hres=%08x\n", hres); } } @@ -1034,7 +1034,7 @@ HRESULT WINAPI SHCreateShellFolderViewEx( * */ HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) -{ FIXME("0x%08lx 0x%08lx 0x%08lx 0x%08lx stub\n",v,w,x,z); +{ FIXME("0x%08x 0x%08x 0x%08x 0x%08x stub\n",v,w,x,z); return 0; } /************************************************************************* @@ -1042,7 +1042,7 @@ HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) * */ HRESULT WINAPI SHRunControlPanel (DWORD x, DWORD z) -{ FIXME("0x%08lx 0x%08lx stub\n",x,z); +{ FIXME("0x%08x 0x%08x stub\n",x,z); return 0; } @@ -1116,7 +1116,7 @@ BOOL WINAPI DAD_DragEnter(HWND hwnd) */ BOOL WINAPI DAD_DragEnterEx(HWND hwnd, POINT p) { - FIXME("hwnd = %p (%ld,%ld)\n",hwnd,p.x,p.y); + FIXME("hwnd = %p (%d,%d)\n",hwnd,p.x,p.y); return FALSE; } /************************************************************************* @@ -1125,7 +1125,7 @@ BOOL WINAPI DAD_DragEnterEx(HWND hwnd, POINT p) */ BOOL WINAPI DAD_DragMove(POINT p) { - FIXME("(%ld,%ld)\n",p.x,p.y); + FIXME("(%d,%d)\n",p.x,p.y); return FALSE; } /************************************************************************* @@ -1312,7 +1312,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) * SetAppStartingCursor [SHELL32.99] */ HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v) -{ FIXME("hwnd=%p 0x%04lx stub\n",u,v ); +{ FIXME("hwnd=%p 0x%04x stub\n",u,v ); return 0; } @@ -1336,7 +1336,7 @@ HRESULT WINAPI SetAppStartingCursor(HWND u, DWORD v) * hack in SHCoCreateInstance) */ HRESULT WINAPI SHLoadOLE(LPARAM lParam) -{ FIXME("0x%04lx stub\n",lParam); +{ FIXME("0x%08lx stub\n",lParam); return S_OK; } /************************************************************************* @@ -1344,7 +1344,7 @@ HRESULT WINAPI SHLoadOLE(LPARAM lParam) * */ HRESULT WINAPI DriveType(DWORD u) -{ FIXME("0x%04lx stub\n",u); +{ FIXME("0x%04x stub\n",u); return 0; } /************************************************************************* @@ -1393,7 +1393,7 @@ BOOL WINAPI SHWaitForFileToOpen( DWORD dwFlags, DWORD dwTimeout) { - FIXME("%p 0x%08lx 0x%08lx stub\n", pidl, dwFlags, dwTimeout); + FIXME("%p 0x%08x 0x%08x stub\n", pidl, dwFlags, dwTimeout); return 0; } @@ -1428,7 +1428,7 @@ DWORD WINAPI RLBuildListOfPaths (void) */ HRESULT WINAPI SHValidateUNC (DWORD x, DWORD y, DWORD z) { - FIXME("0x%08lx 0x%08lx 0x%08lx stub\n",x,y,z); + FIXME("0x%08x 0x%08x 0x%08x stub\n",x,y,z); return 0; } @@ -1518,7 +1518,7 @@ DWORD WINAPI SHELL32_714(LPVOID x) */ DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c) { - FIXME("(%08lx,%08lx,%08lx)stub\n", a, b, c); + FIXME("(%08x,%08x,%08x)stub\n", a, b, c); return 0; } @@ -1527,7 +1527,7 @@ DWORD WINAPI SHAddFromPropSheetExtArray(DWORD a, DWORD b, DWORD c) */ DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c) { - FIXME("(%08lx,%s,%08lx)stub\n", a, debugstr_a(b), c); + FIXME("(%08x,%s,%08x)stub\n", a, debugstr_a(b), c); return 0; } @@ -1536,7 +1536,7 @@ DWORD WINAPI SHCreatePropSheetExtArray(DWORD a, LPCSTR b, DWORD c) */ DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d) { - FIXME("(%08lx,%08lx,%08lx,%08lx)stub\n", a, b, c, d); + FIXME("(%08x,%08x,%08x,%08x)stub\n", a, b, c, d); return 0; } @@ -1545,7 +1545,7 @@ DWORD WINAPI SHReplaceFromPropSheetExtArray(DWORD a, DWORD b, DWORD c, DWORD d) */ DWORD WINAPI SHDestroyPropSheetExtArray(DWORD a) { - FIXME("(%08lx)stub\n", a); + FIXME("(%08x)stub\n", a); return 0; } @@ -1563,7 +1563,7 @@ HRESULT WINAPI CIDLData_CreateFromIDArray( UINT i; HWND hwnd = 0; /*FIXME: who should be hwnd of owner? set to desktop */ - TRACE("(%p, %ld, %p, %p)\n", pidlFolder, cpidlFiles, lppidlFiles, ppdataObject); + TRACE("(%p, %d, %p, %p)\n", pidlFolder, cpidlFiles, lppidlFiles, ppdataObject); if (TRACE_ON(pidl)) { pdump (pidlFolder); @@ -1588,7 +1588,7 @@ HRESULT WINAPI SHCreateStdEnumFmtEtc( { IEnumFORMATETC *pef; HRESULT hRes; - TRACE("cf=%ld fe=%p pef=%p\n", cFormats, lpFormats, ppenumFormatetc); + TRACE("cf=%d fe=%p pef=%p\n", cFormats, lpFormats, ppenumFormatetc); pef = IEnumFORMATETC_Constructor(cFormats, lpFormats); if (!pef) @@ -1609,7 +1609,7 @@ HRESULT WINAPI SHELL32_256(LPDWORD lpdw0, LPDWORD lpdw1) { HRESULT ret = S_OK; - FIXME("stub %p 0x%08lx %p\n", lpdw0, lpdw0 ? *lpdw0 : 0, lpdw1); + FIXME("stub %p 0x%08x %p\n", lpdw0, lpdw0 ? *lpdw0 : 0, lpdw1); if (!lpdw0 || *lpdw0 != 0x10) ret = E_INVALIDARG; @@ -1680,7 +1680,7 @@ INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST pidlExtra) BOOL WINAPI SHObjectProperties(HWND hwnd, DWORD dwType, LPCWSTR szObject, LPCWSTR szPage) { - FIXME("%p, 0x%08lx, %s, %s - stub\n", hwnd, dwType, debugstr_w(szObject), debugstr_w(szPage)); + FIXME("%p, 0x%08x, %s, %s - stub\n", hwnd, dwType, debugstr_w(szObject), debugstr_w(szPage)); return TRUE; } @@ -1705,21 +1705,21 @@ BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR pszLinkTo, LPCWSTR pszDir, LPWSTR pszName, HRESULT WINAPI SHStartNetConnectionDialog(HWND hwnd, LPCSTR pszRemoteName, DWORD dwType) { - FIXME("%p, %s, 0x%08lx - stub\n", hwnd, debugstr_a(pszRemoteName), dwType); + FIXME("%p, %s, 0x%08x - stub\n", hwnd, debugstr_a(pszRemoteName), dwType); return S_OK; } HRESULT WINAPI SHEmptyRecycleBinA(HWND hwnd, LPCSTR pszRootPath, DWORD dwFlags) { - FIXME("%p, %s, 0x%08lx - stub\n", hwnd, debugstr_a(pszRootPath), dwFlags); + FIXME("%p, %s, 0x%08x - stub\n", hwnd, debugstr_a(pszRootPath), dwFlags); return S_OK; } HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) { - FIXME("%p, %s, 0x%08lx - stub\n", hwnd, debugstr_w(pszRootPath), dwFlags); + FIXME("%p, %s, 0x%08x - stub\n", hwnd, debugstr_w(pszRootPath), dwFlags); return S_OK; } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d239a3d7eea..2a2cc38473e 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -488,7 +488,7 @@ BOOL WINAPI PathMakeUniqueNameA( LPCSTR lpszLongName, LPCSTR lpszPathName) { - FIXME("%p %lu %s %s %s stub\n", + FIXME("%p %u %s %s %s stub\n", lpszBuffer, dwBuffSize, debugstr_a(lpszShortName), debugstr_a(lpszLongName), debugstr_a(lpszPathName)); return TRUE; @@ -504,7 +504,7 @@ BOOL WINAPI PathMakeUniqueNameW( LPCWSTR lpszLongName, LPCWSTR lpszPathName) { - FIXME("%p %lu %s %s %s stub\n", + FIXME("%p %u %s %s %s stub\n", lpszBuffer, dwBuffSize, debugstr_w(lpszShortName), debugstr_w(lpszLongName), debugstr_w(lpszPathName)); return TRUE; @@ -667,7 +667,7 @@ BOOL WINAPI PathResolveA( LPCSTR *alpszPaths, DWORD dwFlags) { - FIXME("(%s,%p,0x%08lx),stub!\n", + FIXME("(%s,%p,0x%08x),stub!\n", lpszPath, *alpszPaths, dwFlags); return 0; } @@ -680,7 +680,7 @@ BOOL WINAPI PathResolveW( LPCWSTR *alpszPaths, DWORD dwFlags) { - FIXME("(%s,%p,0x%08lx),stub!\n", + FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags); return 0; } @@ -707,7 +707,7 @@ LONG WINAPI PathProcessCommandA ( DWORD dwBuffSize, DWORD dwFlags) { - FIXME("%s %p 0x%04lx 0x%04lx stub\n", + FIXME("%s %p 0x%04x 0x%04x stub\n", lpszPath, lpszBuff, dwBuffSize, dwFlags); if(!lpszPath) return -1; if(lpszBuff) strcpy(lpszBuff, lpszPath); @@ -723,7 +723,7 @@ LONG WINAPI PathProcessCommandW ( DWORD dwBuffSize, DWORD dwFlags) { - FIXME("(%s, %p, 0x%04lx, 0x%04lx) stub\n", + FIXME("(%s, %p, 0x%04x, 0x%04x) stub\n", debugstr_w(lpszPath), lpszBuff, dwBuffSize, dwFlags); if(!lpszPath) return -1; if(lpszBuff) strcpyW(lpszBuff, lpszPath); @@ -1226,7 +1226,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, hr = E_FAIL; RegCloseKey(shellFolderKey); RegCloseKey(userShellFolderKey); - TRACE("returning 0x%08lx\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } @@ -1300,7 +1300,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) strcatW(pszPath, pDefaultPath); } } - TRACE("returning 0x%08lx\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } @@ -1315,7 +1315,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, { HRESULT hr; - TRACE("0x%08lx,0x%02x,%p\n", dwFlags, folder, pszPath); + TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; @@ -1355,7 +1355,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, RegCloseKey(hKey); } } - TRACE("returning 0x%08lx (output path is %s)\n", hr, debugstr_w(pszPath)); + TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; } @@ -1372,7 +1372,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, { HRESULT hr; - TRACE("%p,0x%08lx,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); + TRACE("%p,0x%08x,0x%02x,%p\n", hToken, dwFlags, folder, pszPath); if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; @@ -1417,7 +1417,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); } - TRACE("returning 0x%08lx (output path is %s)\n", hr, debugstr_w(pszPath)); + TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; } @@ -1431,7 +1431,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, { HRESULT hr; - TRACE("0x%08lx,0x%02x,%p\n", dwFlags, folder, pszPath); + TRACE("0x%08x,0x%02x,%p\n", dwFlags, folder, pszPath); if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0])) return E_INVALIDARG; @@ -1449,7 +1449,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, if (FAILED(hr)) hr = _SHGetDefaultValue(folder, pszPath); } - TRACE("returning 0x%08lx (output path is %s)\n", hr, debugstr_w(pszPath)); + TRACE("returning 0x%08x (output path is %s)\n", hr, debugstr_w(pszPath)); return hr; } @@ -1500,7 +1500,7 @@ static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName, else hr = S_OK; } - TRACE("returning 0x%08lx (output value is %s)\n", hr, debugstr_w(szValue)); + TRACE("returning 0x%08x (output value is %s)\n", hr, debugstr_w(szValue)); return hr; } @@ -1606,7 +1606,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) end: if (key) RegCloseKey(key); - TRACE("returning 0x%08lx (input was %s, output is %s)\n", hr, + TRACE("returning 0x%08x (input was %s, output is %s)\n", hr, debugstr_w(szSrc), debugstr_w(szDest)); return hr; } @@ -1741,7 +1741,7 @@ HRESULT WINAPI SHGetFolderPathW( TRACE("Created missing system directory '%s'\n", debugstr_w(szBuildPath)); end: - TRACE("returning 0x%08lx (final path is %s)\n", hr, debugstr_w(szBuildPath)); + TRACE("returning 0x%08x (final path is %s)\n", hr, debugstr_w(szBuildPath)); return hr; } @@ -1847,7 +1847,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, if (hKey) RegCloseKey(hKey); - TRACE("returning 0x%08lx\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } @@ -1905,7 +1905,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0])); - TRACE("returning 0x%08lx\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } @@ -1926,7 +1926,7 @@ static HRESULT _SHRegisterCommonShellFolders(void) TRACE("\n"); hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders, szSHFolders, folders, sizeof(folders) / sizeof(folders[0])); - TRACE("returning 0x%08lx\n", hr); + TRACE("returning 0x%08x\n", hr); return hr; } @@ -2210,7 +2210,7 @@ HRESULT WINAPI SHGetFolderLocation( { HRESULT hr = E_INVALIDARG; - TRACE("%p 0x%08x %p 0x%08lx %p\n", + TRACE("%p 0x%08x %p 0x%08x %p\n", hwndOwner, nFolder, hToken, dwReserved, ppidl); if (!ppidl) diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index b6be7d78e68..6ba920a1b22 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", + TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest,len,src, (src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" : @@ -84,7 +84,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%lx strret=%p(%s) pidl=%p\n", + TRACE("dest=%p len=0x%x strret=%p(%s) pidl=%p\n", dest,len,src, (src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" : @@ -243,7 +243,7 @@ DWORD WINAPI CheckEscapesA( LPWSTR wString; DWORD ret = 0; - TRACE("(%s %ld)\n", debugstr_a(string), len); + TRACE("(%s %d)\n", debugstr_a(string), len); wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR)); if (wString) { @@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW( DWORD size = lstrlenW(string); LPWSTR s, d; - TRACE("(%s %ld) stub\n", debugstr_w(string), len); + TRACE("(%s %d) stub\n", debugstr_w(string), len); if (StrPBrkW(string, strEscapedChars) && size + 2 <= len) { diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index f2be4beec93..c8be790e809 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -122,7 +122,7 @@ static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface) IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -132,7 +132,7 @@ static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface) IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { @@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, *ppidl = pidlTemp; - TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); return hr; } @@ -266,7 +266,7 @@ static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags) BOOL ret = TRUE; WCHAR szPath[MAX_PATH]; - TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -321,7 +321,7 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, { IGenericSFImpl *This = (IGenericSFImpl *)iface; - TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", + TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); @@ -433,7 +433,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%08lx))\n", + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -463,7 +463,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%08lx\n", *rgfInOut); + TRACE ("-- result=0x%08x\n", *rgfInOut); return hr; } @@ -545,7 +545,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, hr = E_OUTOFMEMORY; *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08lx\n", This, hr); + TRACE ("(%p)->hr=0x%08x\n", This, hr); return hr; } @@ -562,7 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, HRESULT hr = S_OK; WCHAR wszPath[MAX_PATH]; - TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) @@ -693,7 +693,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, } } - TRACE ("-- (%p)->(%s,0x%08lx)\n", This, + TRACE ("-- (%p)->(%s,0x%08x)\n", This, strRet->uType == STRRET_CSTR ? strRet->u.cStr : debugstr_w(strRet->u.pOleStr), hr); return hr; @@ -717,7 +717,7 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, { IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, + FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 3c05e710063..d067e8bc7e2 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -179,7 +179,7 @@ static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -189,7 +189,7 @@ static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { TRACE ("-- destroying IShellFolder(%p)\n", This); @@ -283,7 +283,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef (This->pUnkOuter); } @@ -295,7 +295,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_Release (This->pUnkOuter); } @@ -431,7 +431,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, else *ppidl = NULL; - TRACE ("(%p)->(-- pidl=%p ret=0x%08lx)\n", This, ppidl ? *ppidl : 0, hr); + TRACE ("(%p)->(-- pidl=%p ret=0x%08x)\n", This, ppidl ? *ppidl : 0, hr); return hr; } @@ -449,7 +449,7 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, { IGenericSFImpl *This = impl_from_IShellFolder2(iface); - TRACE ("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, hwndOwner, + TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); @@ -573,7 +573,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, HRESULT hr = S_OK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", This, cidl, apidl, + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -605,7 +605,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ *rgfInOut &= ~SFGAO_VALIDATE; - TRACE ("-- result=0x%08lx\n", *rgfInOut); + TRACE ("-- result=0x%08x\n", *rgfInOut); return hr; } @@ -686,7 +686,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, *ppvOut = pObj; } - TRACE ("(%p)->hr=0x%08lx\n", This, hr); + TRACE ("(%p)->hr=0x%08x\n", This, hr); return hr; } @@ -776,7 +776,7 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, HRESULT hr = S_OK; int len = 0; - TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!pidl || !strRet) @@ -842,7 +842,7 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, LPWSTR ptr; BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl)); - TRACE ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, hwndOwner, pidl, + TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); /* build source path */ @@ -1032,7 +1032,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj); } @@ -1041,7 +1041,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) { IGenericSFImpl *This = impl_from_ISFHelper(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef (This->pUnkOuter); } @@ -1327,7 +1327,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef (This->pUnkOuter); } @@ -1341,7 +1341,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) { IGenericSFImpl *This = impl_from_IPersistFolder3(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_Release (This->pUnkOuter); } @@ -1429,7 +1429,7 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, TRACE ("(%p)->(%p,%p,%p)\n", This, pbc, pidlRoot, ppfti); if (ppfti) - TRACE ("--%p %s %s 0x%08lx 0x%08x\n", + TRACE ("--%p %s %s 0x%08x 0x%08x\n", ppfti->pidlTargetFolder, debugstr_w (ppfti->szTargetParsingName), debugstr_w (ppfti->szNetworkProvider), ppfti->dwAttributes, ppfti->csidl); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index c842c7e4027..e21a231ab2d 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -171,7 +171,7 @@ static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface) IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -181,7 +181,7 @@ static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface) IGenericSFImpl *This = (IGenericSFImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); if (!refCount) { @@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, *ppidl = pidlTemp; - TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); return hr; } @@ -265,7 +265,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags) { BOOL ret = TRUE; - TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); + TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags); /* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -325,7 +325,7 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, { IGenericSFImpl *This = (IGenericSFImpl *)iface; - TRACE("(%p)->(HWND=%p flags=0x%08lx pplist=%p)\n", This, + TRACE("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, hwndOwner, dwFlags, ppEnumIDList); *ppEnumIDList = IEnumIDList_Constructor(); @@ -432,7 +432,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; - TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08lx))\n", + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); if (!rgfInOut) @@ -463,7 +463,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%08lx\n", *rgfInOut); + TRACE ("-- result=0x%08x\n", *rgfInOut); return hr; } @@ -542,7 +542,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, hr = E_OUTOFMEMORY; *ppvOut = pObj; - TRACE ("(%p)->hr=0x%08lx\n", This, hr); + TRACE ("(%p)->hr=0x%08x\n", This, hr); return hr; } @@ -557,7 +557,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, WCHAR wszPath[MAX_PATH]; HRESULT hr = S_OK; - TRACE ("(%p)->(pidl=%p,0x%08lx,%p)\n", This, pidl, dwFlags, strRet); + TRACE ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); pdump (pidl); if (!strRet) @@ -718,7 +718,7 @@ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf ( LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) { IGenericSFImpl *This = (IGenericSFImpl *)iface; - FIXME ("(%p)->(%p,pidl=%p,%s,%lu,%p)\n", This, + FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); return E_FAIL; } @@ -884,7 +884,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) { IGenericSFImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_AddRef (_IUnknown_ (This)); } @@ -896,7 +896,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_Release (IPersistFolder2 * iface) { IGenericSFImpl *This = impl_from_IPersistFolder2(iface); - TRACE ("(%p)->(count=%lu)\n", This, This->ref); + TRACE ("(%p)->(count=%u)\n", This, This->ref); return IUnknown_Release (_IUnknown_ (This)); } diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index e679f6b6842..4668afee0cf 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -866,7 +866,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_ParseDisplayName(IShellFolder2* i hr = SHBindToParent(pidlComplete, &IID_IShellFolder, (LPVOID*)&pParentSF, &pidlLast); if (FAILED(hr)) { - FIXME("SHBindToParent failed! hr = %08lx\n", hr); + FIXME("SHBindToParent failed! hr = %08x\n", hr); ILFree(pidlComplete); return E_FAIL; } @@ -888,7 +888,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_EnumObjects(IShellFolder2* iface, IUnknown *newIterator; HRESULT hr; - TRACE("(iface=%p, hwndOwner=%p, grfFlags=%08lx, ppEnumIDList=%p)\n", + TRACE("(iface=%p, hwndOwner=%p, grfFlags=%08x, ppEnumIDList=%p)\n", iface, hwndOwner, grfFlags, ppEnumIDList); if (!This->m_pszPath) { @@ -1121,7 +1121,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); HRESULT hr = S_OK; - TRACE("(iface=%p, pidl=%p, uFlags=%lx, lpName=%p)\n", iface, pidl, uFlags, lpName); + TRACE("(iface=%p, pidl=%p, uFlags=%x, lpName=%p)\n", iface, pidl, uFlags, lpName); if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) && (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)) @@ -1185,7 +1185,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H LPOLESTR lpwszName; HRESULT hr; - TRACE("(iface=%p, hwnd=%p, pidl=%p, lpcwszName=%s, uFlags=0x%08lx, ppidlOut=%p)\n", + TRACE("(iface=%p, hwnd=%p, pidl=%p, lpcwszName=%s, uFlags=0x%08x, ppidlOut=%p)\n", iface, hwnd, pidl, debugstr_w(lpcwszName), uFlags, ppidlOut); /* prepare to fail */ @@ -1972,7 +1972,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_DragEnter(IDropTarget *iface, IData FORMATETC format; STGMEDIUM medium; - TRACE("(iface=%p, pDataObject=%p, dwKeyState=%08lx, pt={.x=%ld, .y=%ld}, pdwEffect=%p)\n", + TRACE("(iface=%p, pDataObject=%p, dwKeyState=%08x, pt={.x=%d, .y=%d}, pdwEffect=%p)\n", iface, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); if (!pdwEffect || !pDataObject) @@ -2008,7 +2008,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_DragOver(IDropTarget *iface, DWORD { UnixFolder *This = ADJUST_THIS(UnixFolder, IDropTarget, iface); - TRACE("(iface=%p, dwKeyState=%08lx, pt={.x=%ld, .y=%ld}, pdwEffect=%p)\n", iface, dwKeyState, + TRACE("(iface=%p, dwKeyState=%08x, pt={.x=%d, .y=%d}, pdwEffect=%p)\n", iface, dwKeyState, pt.x, pt.y, pdwEffect); if (!pdwEffect) @@ -2037,7 +2037,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_Drop(IDropTarget *iface, IDataObjec STGMEDIUM medium; HRESULT hr; - TRACE("(iface=%p, pDataObject=%p, dwKeyState=%ld, pt={.x=%ld, .y=%ld}, pdwEffect=%p) semi-stub\n", + TRACE("(iface=%p, pDataObject=%p, dwKeyState=%d, pt={.x=%d, .y=%d}, pdwEffect=%p) semi-stub\n", iface, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect); InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); @@ -2298,7 +2298,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Skip(IEnumIDList* iface, ULONG cFetched; HRESULT hr; - TRACE("(iface=%p, celt=%ld)\n", iface, celt); + TRACE("(iface=%p, celt=%d)\n", iface, celt); /* Call IEnumIDList::Next and delete the resulting pidls. */ apidl = (LPITEMIDLIST*)SHAlloc(celt * sizeof(LPITEMIDLIST)); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f5704c3e4ec..f57cb6ec8fa 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -298,7 +298,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 %ld\n", GetLastError() ); + WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); retval = 33; if (psei->fMask & SEE_MASK_NOCLOSEPROCESS) psei_out->hProcess = info.hProcess; @@ -1070,7 +1070,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, r = IContextMenu_InvokeCommand( cm, (LPCMINVOKECOMMANDINFO) &ici ); - TRACE("invoke command returned %08lx\n", r ); + TRACE("invoke command returned %08x\n", r ); end: if ( hmenu ) @@ -1097,7 +1097,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC &IID_IShellExtInit, (LPVOID*)&obj ); if ( FAILED( r ) ) { - ERR("failed %08lx\n", r ); + ERR("failed %08x\n", r ); goto end; } @@ -1211,7 +1211,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ memcpy(&sei_tmp, sei, sizeof(sei_tmp)); - TRACE("mask=0x%08lx hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n", + TRACE("mask=0x%08x 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, @@ -1259,7 +1259,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) if (sei_tmp.fMask & unsupportedFlags) { - FIXME("flags ignored: 0x%08lx\n", sei_tmp.fMask & unsupportedFlags); + FIXME("flags ignored: 0x%08x\n", sei_tmp.fMask & unsupportedFlags); } /* process the IDList */ diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index f39e63b312e..6ab490806dc 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -125,7 +125,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) LPCWSTR pszTail = pszNext; DWORD dwCopy; - TRACE ("(%s %p 0x%08lx)\n", debugstr_w (pszNext), pszOut, dwOut); + TRACE ("(%s %p 0x%08x)\n", debugstr_w (pszNext), pszOut, dwOut); *pszOut = 0x0000; @@ -143,7 +143,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) else pszTail = NULL; - TRACE ("--(%s %s 0x%08lx %p)\n", debugstr_w (pszNext), debugstr_w (pszOut), dwOut, pszTail); + TRACE ("--(%s %s 0x%08x %p)\n", debugstr_w (pszNext), debugstr_w (pszOut), dwOut, pszTail); return pszTail; } @@ -178,7 +178,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, ILFree (*pidlInOut); *pidlInOut = pidlTemp; - TRACE ("-- pidl=%p ret=0x%08lx\n", pidlInOut ? *pidlInOut : NULL, hr); + TRACE ("-- pidl=%p ret=0x%08x\n", pidlInOut ? *pidlInOut : NULL, hr); return hr; } @@ -240,7 +240,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, } ILFree (pidlAbsolute); } - TRACE ("-- (%p) ret=0x%08lx\n", *ppvOut, hr); + TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); return hr; } @@ -311,7 +311,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, IShellFolder_Release (pSF); } - TRACE ("-- returning (%p) %08lx\n", *ppvOut, hr); + TRACE ("-- returning (%p) %08x\n", *ppvOut, hr); return hr; } @@ -336,7 +336,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPITEMIDLIST pidlFirst; HRESULT hr = E_INVALIDARG; - TRACE ("(%p)->(pidl=%p 0x%08lx %p 0x%08lx)\n", psf, pidl, dwFlags, szOut, dwOutLen); + TRACE ("(%p)->(pidl=%p 0x%08x %p 0x%08x)\n", psf, pidl, dwFlags, szOut, dwOutLen); pdump (pidl); pidlFirst = ILCloneFirst (pidl); @@ -359,7 +359,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, } else hr = E_OUTOFMEMORY; - TRACE ("-- ret=0x%08lx %s\n", hr, debugstr_w(szOut)); + TRACE ("-- ret=0x%08x %s\n", hr, debugstr_w(szOut)); return hr; } @@ -403,11 +403,11 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO SFGAO_FILESYSTEM | /*0x40000000 */ SFGAO_HASSUBFOLDER; /*0x80000000 */ - TRACE ("0x%08lx\n", *pdwAttributes); + TRACE ("0x%08x\n", *pdwAttributes); if (*pdwAttributes & ~dwSupportedAttr) { - WARN ("attributes 0x%08lx not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); + WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); *pdwAttributes &= dwSupportedAttr; } @@ -484,7 +484,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO } else { *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; } - TRACE ("-- 0x%08lx\n", *pdwAttributes); + TRACE ("-- 0x%08x\n", *pdwAttributes); return S_OK; } diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index c64e34f320d..a2d1299caf1 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -179,7 +179,7 @@ static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount - 1); + TRACE("(%p)->(count=%i)\n", This, refCount - 1); return refCount; } @@ -189,7 +189,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 065e3c14de5..d498e1f4a4f 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -90,7 +90,7 @@ static LPFMINFO FM_GetMenuInfo(HMENU hmenu) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); return 0; } @@ -153,7 +153,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); return 0; } @@ -265,7 +265,7 @@ HMENU WINAPI FileMenu_Create ( HMENU hMenu = CreatePopupMenu(); - TRACE("0x%08lx 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", + TRACE("0x%08x 0x%08x %p 0x%08x 0x%08x hMenu=%p\n", crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu); menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); @@ -371,7 +371,7 @@ static BOOL FileMenu_AppendItemW( menudata = (LPFMINFO)MenuInfo.dwMenuData; if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) { - ERR("menudata corrupt: %p %lu\n", menudata, MenuInfo.cbSize); + ERR("menudata corrupt: %p %u\n", menudata, MenuInfo.cbSize); return 0; } @@ -633,7 +633,7 @@ LRESULT WINAPI FileMenu_DrawItem( Shell_GetImageList(0, &hImageList); ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); - TRACE("-- 0x%04lx 0x%04lx 0x%04lx 0x%04lx\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); + TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom); SetTextColor(lpdis->hDC, clrPrevText); SetBkColor(lpdis->hDC, clrPrevBkgnd); @@ -794,7 +794,7 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos) FIXME("%p 0x%08x\n", hMenu, uPos); if (GetMenuItemRect(0, hMenu, uPos, &rect)) - { FIXME("0x%04lx 0x%04lx 0x%04lx 0x%04lx\n", + { FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n", rect.right, rect.left, rect.top, rect.bottom); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); } @@ -828,7 +828,7 @@ void WINAPI FileMenu_AbortInitMenu (void) */ LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x) { - FIXME("hmenu=%p hwnd=%p 0x%08lx 0x%08lx stub\n", + FIXME("hmenu=%p hwnd=%p 0x%08x 0x%08x stub\n", hMenu,hWndParent,w,x); return NULL; /* this is supposed to be a pointer */ } @@ -867,7 +867,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI WCHAR szName[256]; UINT uTemp, uIDMax = uIDAdjust; - TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04lx\n", + TRACE("hmenu1=%p hmenu2=%p 0x%04x 0x%04x 0x%04x 0x%04x\n", hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags); if (!hmDst || !hmSrc) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 914071be5c2..e9f035e69cf 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -222,7 +222,7 @@ static HRESULT IncludeObject(IShellViewImpl * This, LPCITEMIDLIST pidl) { TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView*)This, pidl); - TRACE("--0x%08lx\n", ret); + TRACE("--0x%08x\n", ret); } return ret; } @@ -235,7 +235,7 @@ static HRESULT OnDefaultCommand(IShellViewImpl * This) { TRACE("ICommDlgBrowser::OnDefaultCommand\n"); ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView*)This); - TRACE("-- returns %08lx\n", ret); + TRACE("-- returns %08x\n", ret); } return ret; } @@ -1197,7 +1197,7 @@ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) */ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dwCmd, HWND hwndCmd) { - TRACE("(%p)->(0x%08lx 0x%08lx %p) stub\n",This, dwCmdID, dwCmd, hwndCmd); + TRACE("(%p)->(0x%08x 0x%08x %p) stub\n",This, dwCmdID, dwCmd, hwndCmd); switch(dwCmdID) { @@ -1237,7 +1237,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw break; default: - TRACE("-- COMMAND 0x%04lx unhandled\n", dwCmdID); + TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID); } return 0; } @@ -1550,7 +1550,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn static LRESULT ShellView_OnChange(IShellViewImpl * This, LPITEMIDLIST * Pidls, LONG wEventId) { - TRACE("(%p)(%p,%p,0x%08lx)\n", This, Pidls[0], Pidls[1], wEventId); + TRACE("(%p)(%p,%p,0x%08x)\n", This, Pidls[0], Pidls[1], wEventId); switch(wEventId) { case SHCNE_MKDIR: @@ -1684,7 +1684,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface) IShellViewImpl *This = (IShellViewImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -1696,7 +1696,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface) IShellViewImpl *This = (IShellViewImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { @@ -1754,7 +1754,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG #if 0 IShellViewImpl *This = (IShellViewImpl *)iface; - FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%lx wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); + FIXME("(%p)->(%p: hwnd=%x msg=%x lp=%x wp=%x) stub\n",This,lpmsg, lpmsg->hwnd, lpmsg->message, lpmsg->lParam, lpmsg->wParam); #endif if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) @@ -1843,7 +1843,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow( TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",This, lpPrevView,lpfs, psb, prcView, phWnd); - TRACE("-- vmode=%x flags=%x left=%li top=%li right=%li bottom=%li\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); + TRACE("-- vmode=%x flags=%x left=%i top=%i right=%i bottom=%i\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); /*set up the member variables*/ This->pShellBrowser = psb; @@ -2104,14 +2104,14 @@ static HRESULT WINAPI ISVOleCmdTarget_QueryStatus( UINT i; IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(%p(%s) 0x%08lx %p %p\n", + FIXME("(%p)->(%p(%s) 0x%08x %p %p\n", This, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText); if (!prgCmds) return E_POINTER; for (i = 0; i < cCmds; i++) { - FIXME("\tprgCmds[%d].cmdID = %ld\n", i, prgCmds[i].cmdID); + FIXME("\tprgCmds[%d].cmdID = %d\n", i, prgCmds[i].cmdID); prgCmds[i].cmdf = 0; } return OLECMDERR_E_UNKNOWNGROUP; @@ -2132,7 +2132,7 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec( { IShellViewImpl *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08lx Opt:0x%08lx %p %p)\n", + FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) && @@ -2176,7 +2176,7 @@ static ULONG WINAPI ISVDropTarget_AddRef( IDropTarget *iface) { IShellViewImpl *This = impl_from_IDropTarget(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_AddRef((IShellFolder*)This); } @@ -2185,7 +2185,7 @@ static ULONG WINAPI ISVDropTarget_Release( IDropTarget *iface) { IShellViewImpl *This = impl_from_IDropTarget(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_Release((IShellFolder*)This); } @@ -2356,7 +2356,7 @@ static ULONG WINAPI ISVDropSource_AddRef( IDropSource *iface) { IShellViewImpl *This = impl_from_IDropSource(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_AddRef((IShellFolder*)This); } @@ -2365,7 +2365,7 @@ static ULONG WINAPI ISVDropSource_Release( IDropSource *iface) { IShellViewImpl *This = impl_from_IDropSource(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_Release((IShellFolder*)This); } @@ -2423,7 +2423,7 @@ static ULONG WINAPI ISVViewObject_AddRef( IViewObject *iface) { IShellViewImpl *This = impl_from_IViewObject(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_AddRef((IShellFolder*)This); } @@ -2432,7 +2432,7 @@ static ULONG WINAPI ISVViewObject_Release( IViewObject *iface) { IShellViewImpl *This = impl_from_IViewObject(iface); - TRACE("(%p)->(count=%lu)\n",This,This->ref); + TRACE("(%p)->(count=%u)\n",This,This->ref); return IShellFolder_Release((IShellFolder*)This); } @@ -2507,7 +2507,7 @@ static HRESULT WINAPI ISVViewObject_SetAdvise( IShellViewImpl *This = impl_from_IViewObject(iface); - FIXME("partial stub: %p %08lx %08lx %p\n", + FIXME("partial stub: %p %08x %08x %p\n", This, aspects, advf, pAdvSink); /* FIXME: we set the AdviseSink, but never use it to send any advice */ diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 4f2bf1e7dd9..1ac581591c9 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -110,7 +110,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) BgCmImpl *This = (BgCmImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -123,7 +123,7 @@ static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) BgCmImpl *This = (BgCmImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { @@ -180,7 +180,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( } DestroyMenu(hMyMenu); - TRACE("(%p)->returning 0x%lx\n",This,hr); + TRACE("(%p)->returning 0x%x\n",This,hr); return hr; } diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index ca2d593fcd5..0a358b96e65 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -144,7 +144,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedIncrement(&This->ref); - TRACE("(%p)->(count=%lu)\n", This, refCount - 1); + TRACE("(%p)->(count=%u)\n", This, refCount - 1); return refCount; } @@ -157,7 +157,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) ItemCmImpl *This = (ItemCmImpl *)iface; ULONG refCount = InterlockedDecrement(&This->ref); - TRACE("(%p)->(count=%li)\n", This, refCount + 1); + TRACE("(%p)->(count=%i)\n", This, refCount + 1); if (!refCount) { diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 8439e6fb46c..29078de43f9 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -80,7 +80,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) HWND tray; COPYDATASTRUCT cds; - TRACE("dwMessage = %ld\n", dwMessage); + TRACE("dwMessage = %d\n", dwMessage); tray = FindWindowExW(0, NULL, classname, NULL); if (!tray) return FALSE;