Skip to content

W
wine-winehq
Commit 89e1d294 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

shell32: Win64 printf format warning fixes.

parent 66ef2f25
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 271 deletions
dlls/shell32/Makefile.in
View file @ 89e1d294
EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT EXTRADEFS = -D_SHELL32_ -DCOM_NO_WINDOWS_H
TOPSRCDIR = @top_srcdir@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../.. TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
......
dlls/shell32/autocomplete.c
View file @ 89e1d294
...@@ -174,7 +174,7 @@ static ULONG WINAPI IAutoComplete_fnAddRef( ...@@ -174,7 +174,7 @@ static ULONG WINAPI IAutoComplete_fnAddRef(
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount - 1); TRACE("(%p)->(%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -188,7 +188,7 @@ static ULONG WINAPI IAutoComplete_fnRelease( ...@@ -188,7 +188,7 @@ static ULONG WINAPI IAutoComplete_fnRelease(
IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface; IAutoCompleteImpl *This = (IAutoCompleteImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount + 1); TRACE("(%p)->(%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE(" destroying IAutoComplete(%p)\n",This); TRACE(" destroying IAutoComplete(%p)\n",This);
...@@ -347,7 +347,7 @@ static ULONG WINAPI IAutoComplete2_fnAddRef( ...@@ -347,7 +347,7 @@ static ULONG WINAPI IAutoComplete2_fnAddRef(
{ {
IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); 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); return IAutoComplete2_AddRef((IAutoComplete*)This);
} }
...@@ -360,7 +360,7 @@ static ULONG WINAPI IAutoComplete2_fnRelease( ...@@ -360,7 +360,7 @@ static ULONG WINAPI IAutoComplete2_fnRelease(
{ {
IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); 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); return IAutoComplete_Release((IAutoComplete*)This);
} }
...@@ -425,7 +425,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( ...@@ -425,7 +425,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions(
IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface);
TRACE("(%p) -> (0x%lx)\n", This, dwFlag); TRACE("(%p) -> (0x%x)\n", This, dwFlag);
This->options = dwFlag; This->options = dwFlag;
......
dlls/shell32/brsfolder.c
View file @ 89e1d294
...@@ -132,7 +132,7 @@ static void InitializeTreeView( browse_info *info ) ...@@ -132,7 +132,7 @@ static void InitializeTreeView( browse_info *info )
IShellFolder *lpsfDesktop; IShellFolder *lpsfDesktop;
hr = SHGetDesktopFolder(&lpsfDesktop); hr = SHGetDesktopFolder(&lpsfDesktop);
if (!SUCCEEDED(hr)) { if (!SUCCEEDED(hr)) {
WARN("SHGetDesktopFolder failed! hr = %08lx\n", hr); WARN("SHGetDesktopFolder failed! hr = %08x\n", hr);
return; return;
} }
hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent);
...@@ -140,7 +140,7 @@ static void InitializeTreeView( browse_info *info ) ...@@ -140,7 +140,7 @@ static void InitializeTreeView( browse_info *info )
} }
if (!SUCCEEDED(hr)) { 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; return;
} }
...@@ -152,7 +152,7 @@ static void InitializeTreeView( browse_info *info ) ...@@ -152,7 +152,7 @@ static void InitializeTreeView( browse_info *info )
} }
if (!SUCCEEDED(hr)) { 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); IShellFolder_Release(lpsfParent);
return; return;
} }
...@@ -160,7 +160,7 @@ static void InitializeTreeView( browse_info *info ) ...@@ -160,7 +160,7 @@ static void InitializeTreeView( browse_info *info )
flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags ); flags = BrowseFlagsToSHCONTF( info->lpBrowseInfo->ulFlags );
hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren ); hr = IShellFolder_EnumObjects( lpsfRoot, info->hWnd, flags, &pEnumChildren );
if (!SUCCEEDED(hr)) { 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(lpsfParent);
IShellFolder_Release(lpsfRoot); IShellFolder_Release(lpsfRoot);
return; return;
...@@ -225,7 +225,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR ...@@ -225,7 +225,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR
BOOL bSuccess=TRUE; BOOL bSuccess=TRUE;
STRRET str; 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))) if (SUCCEEDED(IShellFolder_GetDisplayNameOf(lpsf, lpi, dwFlags, &str)))
bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi); bSuccess = StrRetToStrNW(lpFriendlyName, MAX_PATH, &str, lpi);
else else
......
dlls/shell32/changenotify.c
View file @ 89e1d294
...@@ -200,7 +200,7 @@ SHChangeNotifyRegister( ...@@ -200,7 +200,7 @@ SHChangeNotifyRegister(
item = SHAlloc(sizeof(NOTIFICATIONLIST)); 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); hwnd, fSources, wEventMask, uMsg, cItems, lpItems, item);
item->next = NULL; item->next = NULL;
...@@ -236,7 +236,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) ...@@ -236,7 +236,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify)
{ {
LPNOTIFICATIONLIST node; LPNOTIFICATIONLIST node;
TRACE("(0x%08lx)\n", hNotify); TRACE("(0x%08x)\n", hNotify);
EnterCriticalSection(&SHELL32_ChangenotifyCS); EnterCriticalSection(&SHELL32_ChangenotifyCS);
...@@ -255,7 +255,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify) ...@@ -255,7 +255,7 @@ BOOL WINAPI SHChangeNotifyDeregister(ULONG hNotify)
BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2, BOOL WINAPI SHChangeNotifyUpdateEntryList(DWORD unknown1, DWORD unknown2,
DWORD unknown3, DWORD unknown4) 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); unknown1, unknown2, unknown3, unknown4);
return -1; return -1;
...@@ -285,7 +285,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID ...@@ -285,7 +285,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID
Pidls[0] = NULL; Pidls[0] = NULL;
Pidls[1] = 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 ) ) if( ( wEventId & SHCNE_NOITEMEVENTS ) && ( dwItem1 || dwItem2 ) )
{ {
...@@ -341,10 +341,10 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID ...@@ -341,10 +341,10 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
if( Pidls[0] && SHGetPathFromIDListW(Pidls[0], 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 )) 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); EnterCriticalSection(&SHELL32_ChangenotifyCS);
...@@ -382,7 +382,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID ...@@ -382,7 +382,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID
ptr->pidlSignaled = ILClone(Pidls[0]); 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 ); wEventId ),wEventId );
ptr->wSignalledEvent |= wEventId; ptr->wSignalledEvent |= wEventId;
...@@ -392,7 +392,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID ...@@ -392,7 +392,7 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID
else else
SendMessageA(ptr->hwnd, ptr->uMsg, (WPARAM)Pidls, wEventId); 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 ); wEventId ),wEventId );
} }
...@@ -421,7 +421,7 @@ DWORD WINAPI NTSHChangeNotifyRegister( ...@@ -421,7 +421,7 @@ DWORD WINAPI NTSHChangeNotifyRegister(
int count, int count,
SHChangeNotifyEntry *idlist) 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); hwnd,events1,events2,msg,count,idlist);
return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist); return (DWORD) SHChangeNotifyRegister(hwnd, events1, events2, msg, count, idlist);
...@@ -440,7 +440,7 @@ HANDLE WINAPI SHChangeNotification_Lock( ...@@ -440,7 +440,7 @@ HANDLE WINAPI SHChangeNotification_Lock(
LPNOTIFICATIONLIST node; LPNOTIFICATIONLIST node;
LPCITEMIDLIST *idlist; 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); */ /* EnterCriticalSection(&SHELL32_ChangenotifyCS); */
...@@ -476,7 +476,7 @@ BOOL WINAPI SHChangeNotification_Unlock ( HANDLE hLock) ...@@ -476,7 +476,7 @@ BOOL WINAPI SHChangeNotification_Unlock ( HANDLE hLock)
*/ */
DWORD WINAPI NTSHChangeNotifyDeregister(ULONG x1) DWORD WINAPI NTSHChangeNotifyDeregister(ULONG x1)
{ {
FIXME("(0x%08lx):semi stub.\n",x1); FIXME("(0x%08x):semi stub.\n",x1);
return SHChangeNotifyDeregister( x1 ); return SHChangeNotifyDeregister( x1 );
} }
dlls/shell32/classes.c
View file @ 89e1d294
...@@ -479,7 +479,7 @@ BOOL HCR_GetFolderAttributes(LPCITEMIDLIST pidlFolder, LPDWORD pdwAttributes) ...@@ -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; return TRUE;
} }
dlls/shell32/clipboard.c
View file @ 89e1d294
...@@ -239,7 +239,7 @@ HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags) ...@@ -239,7 +239,7 @@ HGLOBAL RenderPREFEREDDROPEFFECT (DWORD dwFlags)
DWORD * pdwFlag; DWORD * pdwFlag;
HGLOBAL hGlobal; HGLOBAL hGlobal;
TRACE("(0x%08lx)\n", dwFlags); TRACE("(0x%08x)\n", dwFlags);
hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD)); hGlobal = GlobalAlloc(GHND|GMEM_SHARE, sizeof(DWORD));
if(!hGlobal) return hGlobal; if(!hGlobal) return hGlobal;
......
dlls/shell32/control.c
View file @ 89e1d294
...@@ -410,7 +410,7 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS ...@@ -410,7 +410,7 @@ void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdS
{ {
CPanel panel; CPanel panel;
TRACE("(%p, %p, %s, 0x%08lx)\n", TRACE("(%p, %p, %s, 0x%08x)\n",
hWnd, hInst, debugstr_w(cmd), nCmdShow); hWnd, hInst, debugstr_w(cmd), nCmdShow);
memset(&panel, 0, sizeof(panel)); memset(&panel, 0, sizeof(panel));
...@@ -443,7 +443,7 @@ void WINAPI Control_RunDLLA(HWND hWnd, HINSTANCE hInst, LPCSTR cmd, DWORD nCmdSh ...@@ -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) 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; return 0;
} }
...@@ -467,7 +467,7 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, ...@@ -467,7 +467,7 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst,
WORD args[5]; WORD args[5];
SEGPTR cmdline_seg; 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 ); proc, hwnd, inst, debugstr_a(cmdline), cmdshow );
cmdline_seg = MapLS( cmdline ); cmdline_seg = MapLS( cmdline );
...@@ -489,6 +489,6 @@ void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, ...@@ -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) 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; return 0x0deadbee;
} }
dlls/shell32/cpanelfolder.c
View file @ 89e1d294
...@@ -189,7 +189,7 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface) ...@@ -189,7 +189,7 @@ static ULONG WINAPI ISF_ControlPanel_fnAddRef(IShellFolder2 * iface)
ICPanelImpl *This = (ICPanelImpl *)iface; ICPanelImpl *This = (ICPanelImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -199,7 +199,7 @@ static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface) ...@@ -199,7 +199,7 @@ static ULONG WINAPI ISF_ControlPanel_fnRelease(IShellFolder2 * iface)
ICPanelImpl *This = (ICPanelImpl *)iface; ICPanelImpl *This = (ICPanelImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1); TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE("-- destroying IShellFolder(%p)\n", This); TRACE("-- destroying IShellFolder(%p)\n", This);
...@@ -230,7 +230,7 @@ ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface, ...@@ -230,7 +230,7 @@ ISF_ControlPanel_fnParseDisplayName(IShellFolder2 * iface,
if (pchEaten) if (pchEaten)
*pchEaten = 0; *pchEaten = 0;
TRACE("(%p)->(-- ret=0x%08lx)\n", This, hr); TRACE("(%p)->(-- ret=0x%08x)\n", This, hr);
return hr; return hr;
} }
...@@ -409,7 +409,7 @@ static BOOL CreateCPanelEnumList( ...@@ -409,7 +409,7 @@ static BOOL CreateCPanelEnumList(
WIN32_FIND_DATAA wfd; WIN32_FIND_DATAA wfd;
HANDLE hFile; HANDLE hFile;
TRACE("(%p)->(flags=0x%08lx)\n", iface, dwFlags); TRACE("(%p)->(flags=0x%08x)\n", iface, dwFlags);
/* enumerate control panel folders folders */ /* enumerate control panel folders folders */
if (dwFlags & SHCONTF_FOLDERS) if (dwFlags & SHCONTF_FOLDERS)
...@@ -456,7 +456,7 @@ ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFl ...@@ -456,7 +456,7 @@ ISF_ControlPanel_fnEnumObjects(IShellFolder2 * iface, HWND hwndOwner, DWORD dwFl
{ {
ICPanelImpl *This = (ICPanelImpl *)iface; 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(); *ppEnumIDList = IEnumIDList_Constructor();
if (*ppEnumIDList) if (*ppEnumIDList)
...@@ -557,7 +557,7 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI ...@@ -557,7 +557,7 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI
HRESULT hr = S_OK; 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); This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
if (!rgfInOut) if (!rgfInOut)
...@@ -577,7 +577,7 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI ...@@ -577,7 +577,7 @@ ISF_ControlPanel_fnGetAttributesOf(IShellFolder2 * iface, UINT cidl, LPCITEMIDLI
/* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
*rgfInOut &= ~SFGAO_VALIDATE; *rgfInOut &= ~SFGAO_VALIDATE;
TRACE("-- result=0x%08lx\n", *rgfInOut); TRACE("-- result=0x%08x\n", *rgfInOut);
return hr; return hr;
} }
...@@ -640,7 +640,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface, ...@@ -640,7 +640,7 @@ ISF_ControlPanel_fnGetUIObjectOf(IShellFolder2 * iface,
*ppvOut = pObj; *ppvOut = pObj;
} }
TRACE("(%p)->hr=0x%08lx\n", This, hr); TRACE("(%p)->hr=0x%08x\n", This, hr);
return hr; return hr;
} }
...@@ -657,7 +657,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface, ...@@ -657,7 +657,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnGetDisplayNameOf(IShellFolder2 * iface,
*szPath = '\0'; *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); pdump(pidl);
if (!pidl || !strRet) if (!pidl || !strRet)
...@@ -718,7 +718,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND h ...@@ -718,7 +718,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnSetNameOf(IShellFolder2 * iface, HWND h
LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
{ {
ICPanelImpl *This = (ICPanelImpl *)iface; 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; return E_FAIL;
} }
...@@ -846,7 +846,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_AddRef(IPersistFolder2 * iface) ...@@ -846,7 +846,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_AddRef(IPersistFolder2 * iface)
{ {
ICPanelImpl *This = impl_from_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)); return IUnknown_AddRef(_IUnknown_(This));
} }
...@@ -858,7 +858,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_Release(IPersistFolder2 * iface) ...@@ -858,7 +858,7 @@ static ULONG WINAPI ICPanel_PersistFolder2_Release(IPersistFolder2 * iface)
{ {
ICPanelImpl *This = impl_from_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)); return IUnknown_Release(_IUnknown_(This));
} }
...@@ -941,7 +941,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface( ...@@ -941,7 +941,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnQueryInterface(
{ {
ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); 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); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject);
} }
...@@ -950,7 +950,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnAddRef(IShellExecuteHookW* i ...@@ -950,7 +950,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookW_fnAddRef(IShellExecuteHookW* i
{ {
ICPanelImpl *This = impl_from_IShellExecuteHookW(iface); 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); return IUnknown_AddRef(This->pUnkOuter);
} }
...@@ -1029,7 +1029,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnQueryInterface(IShellExecuteHookA* if ...@@ -1029,7 +1029,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnQueryInterface(IShellExecuteHookA* if
{ {
ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); 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); return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject);
} }
...@@ -1038,7 +1038,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnAddRef(IShellExecuteHookA* i ...@@ -1038,7 +1038,7 @@ static ULONG STDMETHODCALLTYPE IShellExecuteHookA_fnAddRef(IShellExecuteHookA* i
{ {
ICPanelImpl *This = impl_from_IShellExecuteHookA(iface); 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); return IUnknown_AddRef(This->pUnkOuter);
} }
......
dlls/shell32/dataobject.c
View file @ 89e1d294
...@@ -82,7 +82,7 @@ static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface) ...@@ -82,7 +82,7 @@ static ULONG WINAPI IEnumFORMATETC_fnAddRef(LPENUMFORMATETC iface)
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -92,7 +92,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface) ...@@ -92,7 +92,7 @@ static ULONG WINAPI IEnumFORMATETC_fnRelease(LPENUMFORMATETC iface)
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount + 1); TRACE("(%p)->(%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
...@@ -109,7 +109,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F ...@@ -109,7 +109,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface;
UINT i; 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(!This->pFmt)return S_FALSE;
if(!rgelt) return E_INVALIDARG; if(!rgelt) return E_INVALIDARG;
...@@ -128,7 +128,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F ...@@ -128,7 +128,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnNext(LPENUMFORMATETC iface, ULONG celt, F
static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt) static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt)
{ {
IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; 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; if((This->posFmt + celt) >= This->countFmt) return S_FALSE;
This->posFmt += celt; This->posFmt += celt;
...@@ -253,7 +253,7 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface) ...@@ -253,7 +253,7 @@ static ULONG WINAPI IDataObject_fnAddRef(LPDATAOBJECT iface)
IDataObjectImpl *This = (IDataObjectImpl *)iface; IDataObjectImpl *This = (IDataObjectImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -266,7 +266,7 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface) ...@@ -266,7 +266,7 @@ static ULONG WINAPI IDataObject_fnRelease(LPDATAOBJECT iface)
IDataObjectImpl *This = (IDataObjectImpl *)iface; IDataObjectImpl *This = (IDataObjectImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount + 1); TRACE("(%p)->(%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
...@@ -337,7 +337,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC ...@@ -337,7 +337,7 @@ static HRESULT WINAPI IDataObject_fnQueryGetData(LPDATAOBJECT iface, LPFORMATETC
IDataObjectImpl *This = (IDataObjectImpl *)iface; IDataObjectImpl *This = (IDataObjectImpl *)iface;
UINT i; 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)) if(!(DVASPECT_CONTENT & pformatetc->dwAspect))
return DV_E_DVASPECT; return DV_E_DVASPECT;
......
dlls/shell32/debughlp.c
View file @ 89e1d294
...@@ -205,7 +205,7 @@ void pdump (LPCITEMIDLIST pidl) ...@@ -205,7 +205,7 @@ void pdump (LPCITEMIDLIST pidl)
if ( pData && (PT_FOLDER == type || PT_VALUE == type) ) if ( pData && (PT_FOLDER == type || PT_VALUE == type) )
dwAttrib = pData->u.file.uFileAttribs; 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, pidltemp, pidltemp->mkid.cb, type, dwAttrib,
debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName)); debugstr_a(szName), debugstr_a(szLongName), debugstr_a(szShortName));
...@@ -276,7 +276,7 @@ BOOL pcheck( LPCITEMIDLIST pidl ) ...@@ -276,7 +276,7 @@ BOOL pcheck( LPCITEMIDLIST pidl )
case PT_SHARE: case PT_SHARE:
break; break;
default: 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 ); pidl, pidltemp, pidltemp->mkid.cb,type );
dump_pidl_hex( pidltemp ); dump_pidl_hex( pidltemp );
return FALSE; return FALSE;
......
dlls/shell32/dialogs.c
View file @ 89e1d294
...@@ -66,7 +66,7 @@ BOOL WINAPI PickIconDlg( ...@@ -66,7 +66,7 @@ BOOL WINAPI PickIconDlg(
DWORD nMaxFile, DWORD nMaxFile,
LPDWORD lpdwIconIndex) LPDWORD lpdwIconIndex)
{ {
FIXME("(%p,%s,%08lx,%p):stub.\n", FIXME("(%p,%s,%08x,%p):stub.\n",
hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex); hwndOwner, lpstrFile, nMaxFile,lpdwIconIndex);
return 0xffffffff; return 0xffffffff;
} }
......
dlls/shell32/dragdrophelper.c
View file @ 89e1d294
...@@ -115,7 +115,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface) ...@@ -115,7 +115,7 @@ static ULONG WINAPI IDropTargetHelper_fnAddRef (IDropTargetHelper * iface)
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -125,7 +125,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface) ...@@ -125,7 +125,7 @@ static ULONG WINAPI IDropTargetHelper_fnRelease (IDropTargetHelper * iface)
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE("-- destroying (%p)\n", This); TRACE("-- destroying (%p)\n", This);
...@@ -143,7 +143,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter ( ...@@ -143,7 +143,7 @@ static HRESULT WINAPI IDropTargetHelper_fnDragEnter (
DWORD dwEffect) DWORD dwEffect)
{ {
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; 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; return E_NOTIMPL;
} }
...@@ -157,14 +157,14 @@ static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface) ...@@ -157,14 +157,14 @@ static HRESULT WINAPI IDropTargetHelper_fnDragLeave (IDropTargetHelper * iface)
static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect) static HRESULT WINAPI IDropTargetHelper_fnDragOver (IDropTargetHelper * iface, POINT* ppt, DWORD dwEffect)
{ {
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; 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; return E_NOTIMPL;
} }
static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) static HRESULT WINAPI IDropTargetHelper_fnDrop (IDropTargetHelper * iface, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect)
{ {
IDropTargetHelperImpl *This = (IDropTargetHelperImpl *)iface; 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; return E_NOTIMPL;
} }
......
dlls/shell32/enumidlist.c
View file @ 89e1d294
...@@ -116,7 +116,7 @@ BOOL CreateFolderEnumList( ...@@ -116,7 +116,7 @@ BOOL CreateFolderEnumList(
static const WCHAR dot[] = { '.',0 }; static const WCHAR dot[] = { '.',0 };
static const WCHAR dotdot[] = { '.','.',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; if(!lpszPath || !lpszPath[0]) return FALSE;
...@@ -246,7 +246,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef( ...@@ -246,7 +246,7 @@ static ULONG WINAPI IEnumIDList_fnAddRef(
IEnumIDListImpl *This = (IEnumIDListImpl *)iface; IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount - 1); TRACE("(%p)->(%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -259,7 +259,7 @@ static ULONG WINAPI IEnumIDList_fnRelease( ...@@ -259,7 +259,7 @@ static ULONG WINAPI IEnumIDList_fnRelease(
IEnumIDListImpl *This = (IEnumIDListImpl *)iface; IEnumIDListImpl *This = (IEnumIDListImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(%lu)\n", This, refCount + 1); TRACE("(%p)->(%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE(" destroying IEnumIDList(%p)\n",This); TRACE(" destroying IEnumIDList(%p)\n",This);
...@@ -285,7 +285,7 @@ static HRESULT WINAPI IEnumIDList_fnNext( ...@@ -285,7 +285,7 @@ static HRESULT WINAPI IEnumIDList_fnNext(
HRESULT hr = S_OK; HRESULT hr = S_OK;
LPITEMIDLIST temp; 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 /* 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) * subsystems actually use it (and so may a third party browser)
...@@ -329,7 +329,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip( ...@@ -329,7 +329,7 @@ static HRESULT WINAPI IEnumIDList_fnSkip(
DWORD dwIndex; DWORD dwIndex;
HRESULT hr = S_OK; HRESULT hr = S_OK;
TRACE("(%p)->(%lu)\n",This,celt); TRACE("(%p)->(%u)\n",This,celt);
for(dwIndex = 0; dwIndex < celt; dwIndex++) for(dwIndex = 0; dwIndex < celt; dwIndex++)
{ if(!This->mpCurrent) { if(!This->mpCurrent)
......
dlls/shell32/folders.c
View file @ 89e1d294
...@@ -138,7 +138,7 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface) ...@@ -138,7 +138,7 @@ static ULONG WINAPI IExtractIconW_fnAddRef(IExtractIconW * iface)
IExtractIconWImpl *This = (IExtractIconWImpl *)iface; IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -150,7 +150,7 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface) ...@@ -150,7 +150,7 @@ static ULONG WINAPI IExtractIconW_fnRelease(IExtractIconW * iface)
IExtractIconWImpl *This = (IExtractIconWImpl *)iface; IExtractIconWImpl *This = (IExtractIconWImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1); TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
......
dlls/shell32/pidl.c
View file @ 89e1d294
...@@ -78,7 +78,7 @@ BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR pat ...@@ -78,7 +78,7 @@ BOOL WINAPI ILGetDisplayNameExA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPSTR pat
BOOL ret = FALSE; BOOL ret = FALSE;
WCHAR wPath[MAX_PATH]; 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) if (!pidl || !path)
return FALSE; return FALSE;
...@@ -98,7 +98,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa ...@@ -98,7 +98,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
STRRET strret; STRRET strret;
DWORD flag; 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) if (!pidl || !path)
return FALSE; return FALSE;
...@@ -124,7 +124,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa ...@@ -124,7 +124,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
flag = SHGDN_INFOLDER; flag = SHGDN_INFOLDER;
break; break;
default: default:
FIXME("Unknown type parameter = %lx\n", type); FIXME("Unknown type parameter = %x\n", type);
flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR; flag = SHGDN_FORPARSING | SHGDN_FORADDRESSBAR;
break; break;
} }
...@@ -162,7 +162,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa ...@@ -162,7 +162,7 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
BOOL WINAPI ILGetDisplayNameEx(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPVOID path, DWORD type) 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()) if (SHELL_OsIsUnicode())
return ILGetDisplayNameExW(psf, pidl, path, type); return ILGetDisplayNameExW(psf, pidl, path, type);
...@@ -388,7 +388,7 @@ HRESULT WINAPI SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * at ...@@ -388,7 +388,7 @@ HRESULT WINAPI SHILCreateFromPathA(LPCSTR path, LPITEMIDLIST * ppidl, DWORD * at
{ {
WCHAR lpszDisplayName[MAX_PATH]; 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)) if (!MultiByteToWideChar(CP_ACP, 0, path, -1, lpszDisplayName, MAX_PATH))
lpszDisplayName[MAX_PATH-1] = 0; lpszDisplayName[MAX_PATH-1] = 0;
...@@ -402,7 +402,7 @@ HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * a ...@@ -402,7 +402,7 @@ HRESULT WINAPI SHILCreateFromPathW(LPCWSTR path, LPITEMIDLIST * ppidl, DWORD * a
DWORD pchEaten; DWORD pchEaten;
HRESULT ret = E_FAIL; 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))) if (SUCCEEDED (SHGetDesktopFolder(&sf)))
{ {
...@@ -441,7 +441,7 @@ HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD * ...@@ -441,7 +441,7 @@ HRESULT WINAPI SHILCreateFromPathAW (LPCVOID path, LPITEMIDLIST * ppidl, DWORD *
LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate) LPITEMIDLIST WINAPI SHCloneSpecialIDList(HWND hwndOwner, DWORD nFolder, BOOL fCreate)
{ {
LPITEMIDLIST ppidl; 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) if (fCreate)
nFolder |= CSIDL_FLAG_CREATE; nFolder |= CSIDL_FLAG_CREATE;
...@@ -1002,7 +1002,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, ...@@ -1002,7 +1002,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile,
LPBC pBC = NULL; LPBC pBC = NULL;
HRESULT ret; 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, ppidl, ppidl ? *ppidl : NULL,
prgfInOut, prgfInOut ? *prgfInOut : 0); prgfInOut, prgfInOut ? *prgfInOut : 0);
...@@ -1029,7 +1029,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile, ...@@ -1029,7 +1029,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile,
if (!SUCCEEDED(ret) && ppidl) if (!SUCCEEDED(ret) && ppidl)
*ppidl = NULL; *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; return ret;
} }
...@@ -1276,7 +1276,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath) ...@@ -1276,7 +1276,7 @@ BOOL WINAPI SHGetPathFromIDListW(LPCITEMIDLIST pidl, LPWSTR pszPath)
hr = StrRetToBufW(&strret, pidlLast, pszPath, MAX_PATH); 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); return SUCCEEDED(hr);
} }
...@@ -1320,7 +1320,7 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI ...@@ -1320,7 +1320,7 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI
if (SUCCEEDED(hr) && ppidlLast) if (SUCCEEDED(hr) && ppidlLast)
*ppidlLast = ILFindLastID(pidl); *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; return hr;
} }
...@@ -1801,7 +1801,7 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize) ...@@ -1801,7 +1801,7 @@ DWORD _ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
ERR("-- no text\n"); 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; return dwReturn;
} }
...@@ -1830,7 +1830,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize) ...@@ -1830,7 +1830,7 @@ DWORD _ILSimpleGetTextW (LPCITEMIDLIST pidl, LPWSTR szOut, UINT uOutSize)
*szOut = 0; *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; return dwReturn;
} }
......
dlls/shell32/shell32_main.c
View file @ 89e1d294
...@@ -348,7 +348,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, ...@@ -348,7 +348,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
BOOL IconNotYetLoaded=TRUE; BOOL IconNotYetLoaded=TRUE;
UINT uGilFlags = 0; 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, (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes,
psfi, psfi->dwAttributes, sizeofpsfi, flags); psfi, psfi->dwAttributes, sizeofpsfi, flags);
...@@ -617,7 +617,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, ...@@ -617,7 +617,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
SHFree(pidlLast); SHFree(pidlLast);
#ifdef MORE_DEBUG #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, psfi->hIcon, psfi->iIcon, psfi->dwAttributes,
debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret); debugstr_w(psfi->szDisplayName), debugstr_w(psfi->szTypeName), ret);
#endif #endif
...@@ -793,7 +793,7 @@ VOID WINAPI Printer_LoadIconsW(LPCWSTR wsPrinterName, HICON * pLargeIcon, HICON ...@@ -793,7 +793,7 @@ VOID WINAPI Printer_LoadIconsW(LPCWSTR wsPrinterName, HICON * pLargeIcon, HICON
BOOL WINAPI Printers_RegisterWindowW(LPCWSTR wsPrinter, DWORD dwType, BOOL WINAPI Printers_RegisterWindowW(LPCWSTR wsPrinter, DWORD dwType,
HANDLE * phClassPidl, HWND * phwnd) 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, phClassPidl, (phClassPidl != NULL) ? *(phClassPidl) : NULL,
phwnd, (phwnd != NULL) ? *(phwnd) : NULL); phwnd, (phwnd != NULL) ? *(phwnd) : NULL);
...@@ -896,7 +896,7 @@ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) ...@@ -896,7 +896,7 @@ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data)
*/ */
DWORD WINAPI SHHelpShortcuts_RunDLLA(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4) 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; return 0;
} }
...@@ -906,7 +906,7 @@ DWORD WINAPI SHHelpShortcuts_RunDLLA(DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, D ...@@ -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) 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; return 0;
} }
...@@ -1073,7 +1073,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, ...@@ -1073,7 +1073,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
*/ */
void WINAPI FreeIconList( DWORD dw ) void WINAPI FreeIconList( DWORD dw )
{ {
FIXME("%lx: stub\n",dw); FIXME("%x: stub\n",dw);
} }
...@@ -1113,7 +1113,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi) ...@@ -1113,7 +1113,7 @@ HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
WINE_FILEVERSION_BUILD, WINE_FILEVERSION_BUILD,
WINE_FILEVERSION_PLATFORMID); WINE_FILEVERSION_PLATFORMID);
} }
TRACE("%lu.%lu.%lu.%lu\n", TRACE("%u.%u.%u.%u\n",
pdvi->dwMajorVersion, pdvi->dwMinorVersion, pdvi->dwMajorVersion, pdvi->dwMinorVersion,
pdvi->dwBuildNumber, pdvi->dwPlatformID); pdvi->dwBuildNumber, pdvi->dwPlatformID);
return S_OK; return S_OK;
...@@ -1143,7 +1143,7 @@ HIMAGELIST ShellBigIconList = 0; ...@@ -1143,7 +1143,7 @@ HIMAGELIST ShellBigIconList = 0;
*/ */
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) 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) switch (fdwReason)
{ {
......
dlls/shell32/shelllink.c
View file @ 89e1d294
...@@ -280,7 +280,7 @@ static ULONG ShellLink_AddRef( IShellLinkImpl *This ) ...@@ -280,7 +280,7 @@ static ULONG ShellLink_AddRef( IShellLinkImpl *This )
{ {
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -292,7 +292,7 @@ static ULONG ShellLink_Release( IShellLinkImpl *This ) ...@@ -292,7 +292,7 @@ static ULONG ShellLink_Release( IShellLinkImpl *This )
{ {
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1); TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (refCount) if (refCount)
return refCount; return refCount;
...@@ -379,7 +379,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile ...@@ -379,7 +379,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile
HRESULT r; HRESULT r;
IStream *stm; 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 ) if( dwMode == 0 )
dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; dwMode = STGM_READ | STGM_SHARE_DENY_WRITE;
...@@ -391,7 +391,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile ...@@ -391,7 +391,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile
IStream_Release( stm ); IStream_Release( stm );
This->bDirty = FALSE; This->bDirty = FALSE;
} }
TRACE("-- returning hr %08lx\n", r); TRACE("-- returning hr %08x\n", r);
return r; return r;
} }
...@@ -628,7 +628,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data ) ...@@ -628,7 +628,7 @@ static HRESULT Stream_ReadChunk( IStream* stm, LPVOID *data )
return E_FAIL; return E_FAIL;
} }
TRACE("Read %ld bytes\n",chunk->size); TRACE("Read %d bytes\n",chunk->size);
*data = (LPVOID) chunk; *data = (LPVOID) chunk;
...@@ -707,7 +707,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, ...@@ -707,7 +707,7 @@ static HRESULT Stream_LoadLocation( IStream *stm,
if( n && (n < loc->dwTotalSize) ) if( n && (n < loc->dwTotalSize) )
*path = Stream_LoadPath( &p[n], loc->dwTotalSize - n ); *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)); volume->serial, debugstr_w(volume->label), debugstr_w(*path));
HeapFree( GetProcessHeap(), 0, p ); HeapFree( GetProcessHeap(), 0, p );
...@@ -756,11 +756,11 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str ) ...@@ -756,11 +756,11 @@ static HRESULT Stream_LoadAdvertiseInfo( IStream* stm, LPWSTR *str )
if( count != size ) if( count != size )
return E_FAIL; 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 ) 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; return E_FAIL;
} }
...@@ -1351,7 +1351,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile, ...@@ -1351,7 +1351,7 @@ static HRESULT WINAPI IShellLinkA_fnGetPath(IShellLinkA * iface, LPSTR pszFile,
{ {
IShellLinkImpl *This = (IShellLinkImpl *)iface; 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)); This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath));
if (This->sComponent || This->sProduct) if (This->sComponent || This->sProduct)
...@@ -1623,7 +1623,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA * iface, LPCSTR ...@@ -1623,7 +1623,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA * iface, LPCSTR
{ {
IShellLinkImpl *This = (IShellLinkImpl *)iface; 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); HeapFree(GetProcessHeap(), 0, This->sPathRel);
This->sPathRel = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); This->sPathRel = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel);
...@@ -1636,7 +1636,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR ...@@ -1636,7 +1636,7 @@ static HRESULT WINAPI IShellLinkA_fnResolve(IShellLinkA * iface, HWND hwnd, DWOR
{ {
IShellLinkImpl *This = (IShellLinkImpl *)iface; 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 ); return IShellLinkW_Resolve( (IShellLinkW*)&(This->lpvtblw), hwnd, fFlags );
} }
...@@ -1721,7 +1721,7 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile, ...@@ -1721,7 +1721,7 @@ static HRESULT WINAPI IShellLinkW_fnGetPath(IShellLinkW * iface, LPWSTR pszFile,
{ {
IShellLinkImpl *This = impl_from_IShellLinkW(iface); 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)); This, pszFile, cchMaxPath, pfd, fFlags, debugstr_w(This->sPath));
if (This->sComponent || This->sProduct) if (This->sComponent || This->sProduct)
...@@ -2000,7 +2000,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR ...@@ -2000,7 +2000,7 @@ static HRESULT WINAPI IShellLinkW_fnSetRelativePath(IShellLinkW * iface, LPCWSTR
{ {
IShellLinkImpl *This = impl_from_IShellLinkW(iface); 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); HeapFree(GetProcessHeap(), 0, This->sPathRel);
This->sPathRel = HeapAlloc( GetProcessHeap(), 0, This->sPathRel = HeapAlloc( GetProcessHeap(), 0,
...@@ -2020,7 +2020,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR ...@@ -2020,7 +2020,7 @@ static HRESULT WINAPI IShellLinkW_fnResolve(IShellLinkW * iface, HWND hwnd, DWOR
IShellLinkImpl *This = impl_from_IShellLinkW(iface); 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 */ /*FIXME: use IResolveShellLink interface */
...@@ -2147,7 +2147,7 @@ static BOOL ShellLink_GetVolumeInfo(LPWSTR path, volume_info *volume) ...@@ -2147,7 +2147,7 @@ static BOOL ShellLink_GetVolumeInfo(LPWSTR path, volume_info *volume)
volume->type = GetDriveTypeW(drive); volume->type = GetDriveTypeW(drive);
r = GetVolumeInformationW(drive, volume->label, label_sz, r = GetVolumeInformationW(drive, volume->label, label_sz,
&volume->serial, NULL, NULL, NULL, 0); &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)); volume->type, volume->serial, debugstr_w(volume->label));
return r; return r;
} }
...@@ -2274,7 +2274,7 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl ...@@ -2274,7 +2274,7 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl
LPVOID block = NULL; LPVOID block = NULL;
HRESULT r = E_FAIL; HRESULT r = E_FAIL;
TRACE("%p %08lx %p\n", iface, dwSig, ppDataBlock ); TRACE("%p %08x %p\n", iface, dwSig, ppDataBlock );
switch (dwSig) switch (dwSig)
{ {
...@@ -2289,10 +2289,10 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl ...@@ -2289,10 +2289,10 @@ ShellLink_CopyDataBlock( IShellLinkDataList* iface, DWORD dwSig, void** ppDataBl
case NT_FE_CONSOLE_PROPS_SIG: case NT_FE_CONSOLE_PROPS_SIG:
case EXP_SPECIAL_FOLDER_SIG: case EXP_SPECIAL_FOLDER_SIG:
case EXP_SZ_ICON_SIG: case EXP_SZ_ICON_SIG:
FIXME("valid but unhandled datablock %08lx\n", dwSig); FIXME("valid but unhandled datablock %08x\n", dwSig);
break; break;
default: default:
ERR("unknown datablock %08lx\n", dwSig); ERR("unknown datablock %08x\n", dwSig);
} }
*ppDataBlock = block; *ppDataBlock = block;
return r; return r;
......
dlls/shell32/shellole.c
View file @ 89e1d294
...@@ -195,7 +195,7 @@ HRESULT WINAPI SHCoCreateInstance( ...@@ -195,7 +195,7 @@ HRESULT WINAPI SHCoCreateInstance(
hres = E_ACCESSDENIED; hres = E_ACCESSDENIED;
goto end; goto end;
} else if (! SUCCEEDED(hres = DllGetClassObject(myclsid, &IID_IClassFactory, (LPVOID*)&pcf))) { } 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; goto end;
} }
...@@ -214,7 +214,7 @@ HRESULT WINAPI SHCoCreateInstance( ...@@ -214,7 +214,7 @@ HRESULT WINAPI SHCoCreateInstance(
end: end:
if(hres!=S_OK) 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)); hres, shdebugstr_guid(myclsid), shdebugstr_guid(refiid));
ERR("class not found in registry\n"); ERR("class not found in registry\n");
} }
...@@ -333,7 +333,7 @@ LPVOID WINAPI SHAlloc(DWORD len) ...@@ -333,7 +333,7 @@ LPVOID WINAPI SHAlloc(DWORD len)
LPVOID ret; LPVOID ret;
ret = CoTaskMemAlloc(len); ret = CoTaskMemAlloc(len);
TRACE("%lu bytes at %p\n",len, ret); TRACE("%u bytes at %p\n",len, ret);
return ret; return ret;
} }
...@@ -443,7 +443,7 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface) ...@@ -443,7 +443,7 @@ static ULONG WINAPI IDefClF_fnAddRef(LPCLASSFACTORY iface)
IDefClFImpl *This = (IDefClFImpl *)iface; IDefClFImpl *This = (IDefClFImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -455,7 +455,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface) ...@@ -455,7 +455,7 @@ static ULONG WINAPI IDefClF_fnRelease(LPCLASSFACTORY iface)
IDefClFImpl *This = (IDefClFImpl *)iface; IDefClFImpl *This = (IDefClFImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount + 1); TRACE("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
......
dlls/shell32/shellpath.c
View file @ 89e1d294
...@@ -488,7 +488,7 @@ BOOL WINAPI PathMakeUniqueNameA( ...@@ -488,7 +488,7 @@ BOOL WINAPI PathMakeUniqueNameA(
LPCSTR lpszLongName, LPCSTR lpszLongName,
LPCSTR lpszPathName) LPCSTR lpszPathName)
{ {
FIXME("%p %lu %s %s %s stub\n", FIXME("%p %u %s %s %s stub\n",
lpszBuffer, dwBuffSize, debugstr_a(lpszShortName), lpszBuffer, dwBuffSize, debugstr_a(lpszShortName),
debugstr_a(lpszLongName), debugstr_a(lpszPathName)); debugstr_a(lpszLongName), debugstr_a(lpszPathName));
return TRUE; return TRUE;
...@@ -504,7 +504,7 @@ BOOL WINAPI PathMakeUniqueNameW( ...@@ -504,7 +504,7 @@ BOOL WINAPI PathMakeUniqueNameW(
LPCWSTR lpszLongName, LPCWSTR lpszLongName,
LPCWSTR lpszPathName) LPCWSTR lpszPathName)
{ {
FIXME("%p %lu %s %s %s stub\n", FIXME("%p %u %s %s %s stub\n",
lpszBuffer, dwBuffSize, debugstr_w(lpszShortName), lpszBuffer, dwBuffSize, debugstr_w(lpszShortName),
debugstr_w(lpszLongName), debugstr_w(lpszPathName)); debugstr_w(lpszLongName), debugstr_w(lpszPathName));
return TRUE; return TRUE;
...@@ -667,7 +667,7 @@ BOOL WINAPI PathResolveA( ...@@ -667,7 +667,7 @@ BOOL WINAPI PathResolveA(
LPCSTR *alpszPaths, LPCSTR *alpszPaths,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%s,%p,0x%08lx),stub!\n", FIXME("(%s,%p,0x%08x),stub!\n",
lpszPath, *alpszPaths, dwFlags); lpszPath, *alpszPaths, dwFlags);
return 0; return 0;
} }
...@@ -680,7 +680,7 @@ BOOL WINAPI PathResolveW( ...@@ -680,7 +680,7 @@ BOOL WINAPI PathResolveW(
LPCWSTR *alpszPaths, LPCWSTR *alpszPaths,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("(%s,%p,0x%08lx),stub!\n", FIXME("(%s,%p,0x%08x),stub!\n",
debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags); debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags);
return 0; return 0;
} }
...@@ -707,7 +707,7 @@ LONG WINAPI PathProcessCommandA ( ...@@ -707,7 +707,7 @@ LONG WINAPI PathProcessCommandA (
DWORD dwBuffSize, DWORD dwBuffSize,
DWORD dwFlags) DWORD dwFlags)
{ {
FIXME("%s %p 0x%04lx 0x%04lx stub\n", FIXME("%s %p 0x%04x 0x%04x stub\n",
lpszPath, lpszBuff, dwBuffSize, dwFlags); lpszPath, lpszBuff, dwBuffSize, dwFlags);
if(!lpszPath) return -1; if(!lpszPath) return -1;
if(lpszBuff) strcpy(lpszBuff, lpszPath); if(lpszBuff) strcpy(lpszBuff, lpszPath);
...@@ -723,7 +723,7 @@ LONG WINAPI PathProcessCommandW ( ...@@ -723,7 +723,7 @@ LONG WINAPI PathProcessCommandW (
DWORD dwBuffSize, DWORD dwBuffSize,
DWORD dwFlags) 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); debugstr_w(lpszPath), lpszBuff, dwBuffSize, dwFlags);
if(!lpszPath) return -1; if(!lpszPath) return -1;
if(lpszBuff) strcpyW(lpszBuff, lpszPath); if(lpszBuff) strcpyW(lpszBuff, lpszPath);
...@@ -1226,7 +1226,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, ...@@ -1226,7 +1226,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix,
hr = E_FAIL; hr = E_FAIL;
RegCloseKey(shellFolderKey); RegCloseKey(shellFolderKey);
RegCloseKey(userShellFolderKey); RegCloseKey(userShellFolderKey);
TRACE("returning 0x%08lx\n", hr); TRACE("returning 0x%08x\n", hr);
return hr; return hr;
} }
...@@ -1300,7 +1300,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath) ...@@ -1300,7 +1300,7 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath)
strcatW(pszPath, pDefaultPath); strcatW(pszPath, pDefaultPath);
} }
} }
TRACE("returning 0x%08lx\n", hr); TRACE("returning 0x%08x\n", hr);
return hr; return hr;
} }
...@@ -1315,7 +1315,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, ...@@ -1315,7 +1315,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder,
{ {
HRESULT hr; 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])) if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
return E_INVALIDARG; return E_INVALIDARG;
...@@ -1355,7 +1355,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder, ...@@ -1355,7 +1355,7 @@ static HRESULT _SHGetCurrentVersionPath(DWORD dwFlags, BYTE folder,
RegCloseKey(hKey); 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; return hr;
} }
...@@ -1372,7 +1372,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, ...@@ -1372,7 +1372,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder,
{ {
HRESULT hr; 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])) if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
return E_INVALIDARG; return E_INVALIDARG;
...@@ -1417,7 +1417,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder, ...@@ -1417,7 +1417,7 @@ static HRESULT _SHGetUserProfilePath(HANDLE hToken, DWORD dwFlags, BYTE folder,
if (FAILED(hr)) if (FAILED(hr))
hr = _SHGetDefaultValue(folder, pszPath); 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; return hr;
} }
...@@ -1431,7 +1431,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, ...@@ -1431,7 +1431,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder,
{ {
HRESULT hr; 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])) if (folder >= sizeof(CSIDL_Data) / sizeof(CSIDL_Data[0]))
return E_INVALIDARG; return E_INVALIDARG;
...@@ -1449,7 +1449,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder, ...@@ -1449,7 +1449,7 @@ static HRESULT _SHGetAllUsersProfilePath(DWORD dwFlags, BYTE folder,
if (FAILED(hr)) if (FAILED(hr))
hr = _SHGetDefaultValue(folder, pszPath); 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; return hr;
} }
...@@ -1500,7 +1500,7 @@ static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName, ...@@ -1500,7 +1500,7 @@ static HRESULT _SHGetProfilesValue(HKEY profilesKey, LPCWSTR szValueName,
else else
hr = S_OK; 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; return hr;
} }
...@@ -1606,7 +1606,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) ...@@ -1606,7 +1606,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest)
end: end:
if (key) if (key)
RegCloseKey(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)); debugstr_w(szSrc), debugstr_w(szDest));
return hr; return hr;
} }
...@@ -1741,7 +1741,7 @@ HRESULT WINAPI SHGetFolderPathW( ...@@ -1741,7 +1741,7 @@ HRESULT WINAPI SHGetFolderPathW(
TRACE("Created missing system directory '%s'\n", debugstr_w(szBuildPath)); TRACE("Created missing system directory '%s'\n", debugstr_w(szBuildPath));
end: 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; return hr;
} }
...@@ -1847,7 +1847,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, ...@@ -1847,7 +1847,7 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken,
if (hKey) if (hKey)
RegCloseKey(hKey); RegCloseKey(hKey);
TRACE("returning 0x%08lx\n", hr); TRACE("returning 0x%08x\n", hr);
return hr; return hr;
} }
...@@ -1905,7 +1905,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault) ...@@ -1905,7 +1905,7 @@ static HRESULT _SHRegisterUserShellFolders(BOOL bDefault)
hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath, hr = _SHRegisterFolders(hRootKey, hToken, pUserShellFolderPath,
pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0])); pShellFolderPath, folders, sizeof(folders) / sizeof(folders[0]));
TRACE("returning 0x%08lx\n", hr); TRACE("returning 0x%08x\n", hr);
return hr; return hr;
} }
...@@ -1926,7 +1926,7 @@ static HRESULT _SHRegisterCommonShellFolders(void) ...@@ -1926,7 +1926,7 @@ static HRESULT _SHRegisterCommonShellFolders(void)
TRACE("\n"); TRACE("\n");
hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders, hr = _SHRegisterFolders(HKEY_LOCAL_MACHINE, NULL, szSHUserFolders,
szSHFolders, folders, sizeof(folders) / sizeof(folders[0])); szSHFolders, folders, sizeof(folders) / sizeof(folders[0]));
TRACE("returning 0x%08lx\n", hr); TRACE("returning 0x%08x\n", hr);
return hr; return hr;
} }
...@@ -2210,7 +2210,7 @@ HRESULT WINAPI SHGetFolderLocation( ...@@ -2210,7 +2210,7 @@ HRESULT WINAPI SHGetFolderLocation(
{ {
HRESULT hr = E_INVALIDARG; 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); hwndOwner, nFolder, hToken, dwReserved, ppidl);
if (!ppidl) if (!ppidl)
......
dlls/shell32/shellstring.c
View file @ 89e1d294
...@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); ...@@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) 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, dest,len,src,
(src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
(src->uType == STRRET_CSTR) ? "STRRET_CSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
...@@ -84,7 +84,7 @@ BOOL WINAPI StrRetToStrNA(LPSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST ...@@ -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) 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, dest,len,src,
(src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_WSTR) ? "STRRET_WSTR" :
(src->uType == STRRET_CSTR) ? "STRRET_CSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" :
...@@ -243,7 +243,7 @@ DWORD WINAPI CheckEscapesA( ...@@ -243,7 +243,7 @@ DWORD WINAPI CheckEscapesA(
LPWSTR wString; LPWSTR wString;
DWORD ret = 0; 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)); wString = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR));
if (wString) if (wString)
{ {
...@@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW( ...@@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW(
DWORD size = lstrlenW(string); DWORD size = lstrlenW(string);
LPWSTR s, d; 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) if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
{ {
......
dlls/shell32/shfldr_desktop.c
View file @ 89e1d294
...@@ -122,7 +122,7 @@ static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface) ...@@ -122,7 +122,7 @@ static ULONG WINAPI ISF_Desktop_fnAddRef (IShellFolder2 * iface)
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -132,7 +132,7 @@ static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface) ...@@ -132,7 +132,7 @@ static ULONG WINAPI ISF_Desktop_fnRelease (IShellFolder2 * iface)
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
...@@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, ...@@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
*ppidl = pidlTemp; *ppidl = pidlTemp;
TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr);
return hr; return hr;
} }
...@@ -266,7 +266,7 @@ static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags) ...@@ -266,7 +266,7 @@ static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags)
BOOL ret = TRUE; BOOL ret = TRUE;
WCHAR szPath[MAX_PATH]; WCHAR szPath[MAX_PATH];
TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags);
/* enumerate the root folders */ /* enumerate the root folders */
if (dwFlags & SHCONTF_FOLDERS) if (dwFlags & SHCONTF_FOLDERS)
...@@ -321,7 +321,7 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface, ...@@ -321,7 +321,7 @@ static HRESULT WINAPI ISF_Desktop_fnEnumObjects (IShellFolder2 * iface,
{ {
IGenericSFImpl *This = (IGenericSFImpl *)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); This, hwndOwner, dwFlags, ppEnumIDList);
*ppEnumIDList = IEnumIDList_Constructor(); *ppEnumIDList = IEnumIDList_Constructor();
...@@ -433,7 +433,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, ...@@ -433,7 +433,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface,
SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET | SFGAO_CANRENAME | SFGAO_CANDELETE | SFGAO_HASPROPSHEET |
SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; 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); This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
if (!rgfInOut) if (!rgfInOut)
...@@ -463,7 +463,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface, ...@@ -463,7 +463,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetAttributesOf (IShellFolder2 * iface,
/* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
*rgfInOut &= ~SFGAO_VALIDATE; *rgfInOut &= ~SFGAO_VALIDATE;
TRACE ("-- result=0x%08lx\n", *rgfInOut); TRACE ("-- result=0x%08x\n", *rgfInOut);
return hr; return hr;
} }
...@@ -545,7 +545,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface, ...@@ -545,7 +545,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetUIObjectOf (IShellFolder2 * iface,
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
*ppvOut = pObj; *ppvOut = pObj;
TRACE ("(%p)->hr=0x%08lx\n", This, hr); TRACE ("(%p)->hr=0x%08x\n", This, hr);
return hr; return hr;
} }
...@@ -562,7 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, ...@@ -562,7 +562,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface,
HRESULT hr = S_OK; HRESULT hr = S_OK;
WCHAR wszPath[MAX_PATH]; 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); pdump (pidl);
if (!strRet) if (!strRet)
...@@ -693,7 +693,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, ...@@ -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 : strRet->uType == STRRET_CSTR ? strRet->u.cStr :
debugstr_w(strRet->u.pOleStr), hr); debugstr_w(strRet->u.pOleStr), hr);
return hr; return hr;
...@@ -717,7 +717,7 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface, ...@@ -717,7 +717,7 @@ static HRESULT WINAPI ISF_Desktop_fnSetNameOf (IShellFolder2 * iface,
{ {
IGenericSFImpl *This = (IGenericSFImpl *)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); debugstr_w (lpName), dwFlags, pPidlOut);
return E_FAIL; return E_FAIL;
......
dlls/shell32/shfldr_fs.c
View file @ 89e1d294
...@@ -179,7 +179,7 @@ static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface) ...@@ -179,7 +179,7 @@ static ULONG WINAPI IUnknown_fnAddRef (IUnknown * iface)
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -189,7 +189,7 @@ static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) ...@@ -189,7 +189,7 @@ static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface)
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) { if (!refCount) {
TRACE ("-- destroying IShellFolder(%p)\n", This); TRACE ("-- destroying IShellFolder(%p)\n", This);
...@@ -283,7 +283,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface) ...@@ -283,7 +283,7 @@ static ULONG WINAPI IShellFolder_fnAddRef (IShellFolder2 * iface)
{ {
IGenericSFImpl *This = impl_from_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); return IUnknown_AddRef (This->pUnkOuter);
} }
...@@ -295,7 +295,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface) ...@@ -295,7 +295,7 @@ static ULONG WINAPI IShellFolder_fnRelease (IShellFolder2 * iface)
{ {
IGenericSFImpl *This = impl_from_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); return IUnknown_Release (This->pUnkOuter);
} }
...@@ -431,7 +431,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, ...@@ -431,7 +431,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface,
else else
*ppidl = NULL; *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; return hr;
} }
...@@ -449,7 +449,7 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner, ...@@ -449,7 +449,7 @@ IShellFolder_fnEnumObjects (IShellFolder2 * iface, HWND hwndOwner,
{ {
IGenericSFImpl *This = impl_from_IShellFolder2(iface); 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); dwFlags, ppEnumIDList);
*ppEnumIDList = IEnumIDList_Constructor(); *ppEnumIDList = IEnumIDList_Constructor();
...@@ -573,7 +573,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, ...@@ -573,7 +573,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl,
HRESULT hr = S_OK; 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); rgfInOut, rgfInOut ? *rgfInOut : 0);
if (!rgfInOut) if (!rgfInOut)
...@@ -605,7 +605,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl, ...@@ -605,7 +605,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl,
/* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
*rgfInOut &= ~SFGAO_VALIDATE; *rgfInOut &= ~SFGAO_VALIDATE;
TRACE ("-- result=0x%08lx\n", *rgfInOut); TRACE ("-- result=0x%08x\n", *rgfInOut);
return hr; return hr;
} }
...@@ -686,7 +686,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface, ...@@ -686,7 +686,7 @@ IShellFolder_fnGetUIObjectOf (IShellFolder2 * iface,
*ppvOut = pObj; *ppvOut = pObj;
} }
TRACE ("(%p)->hr=0x%08lx\n", This, hr); TRACE ("(%p)->hr=0x%08x\n", This, hr);
return hr; return hr;
} }
...@@ -776,7 +776,7 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl, ...@@ -776,7 +776,7 @@ IShellFolder_fnGetDisplayNameOf (IShellFolder2 * iface, LPCITEMIDLIST pidl,
HRESULT hr = S_OK; HRESULT hr = S_OK;
int len = 0; 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); pdump (pidl);
if (!pidl || !strRet) if (!pidl || !strRet)
...@@ -842,7 +842,7 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface, ...@@ -842,7 +842,7 @@ static HRESULT WINAPI IShellFolder_fnSetNameOf (IShellFolder2 * iface,
LPWSTR ptr; LPWSTR ptr;
BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl)); 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); debugstr_w (lpName), dwFlags, pPidlOut);
/* build source path */ /* build source path */
...@@ -1032,7 +1032,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj) ...@@ -1032,7 +1032,7 @@ ISFHelper_fnQueryInterface (ISFHelper * iface, REFIID riid, LPVOID * ppvObj)
{ {
IGenericSFImpl *This = impl_from_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_QueryInterface (This->pUnkOuter, riid, ppvObj); return IUnknown_QueryInterface (This->pUnkOuter, riid, ppvObj);
} }
...@@ -1041,7 +1041,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface) ...@@ -1041,7 +1041,7 @@ static ULONG WINAPI ISFHelper_fnAddRef (ISFHelper * iface)
{ {
IGenericSFImpl *This = impl_from_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); return IUnknown_AddRef (This->pUnkOuter);
} }
...@@ -1327,7 +1327,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface) ...@@ -1327,7 +1327,7 @@ IFSFldr_PersistFolder3_AddRef (IPersistFolder3 * iface)
{ {
IGenericSFImpl *This = impl_from_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); return IUnknown_AddRef (This->pUnkOuter);
} }
...@@ -1341,7 +1341,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface) ...@@ -1341,7 +1341,7 @@ IFSFldr_PersistFolder3_Release (IPersistFolder3 * iface)
{ {
IGenericSFImpl *This = impl_from_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); return IUnknown_Release (This->pUnkOuter);
} }
...@@ -1429,7 +1429,7 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface, ...@@ -1429,7 +1429,7 @@ IFSFldr_PersistFolder3_InitializeEx (IPersistFolder3 * iface,
TRACE ("(%p)->(%p,%p,%p)\n", This, pbc, pidlRoot, ppfti); TRACE ("(%p)->(%p,%p,%p)\n", This, pbc, pidlRoot, ppfti);
if (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), ppfti->pidlTargetFolder, debugstr_w (ppfti->szTargetParsingName),
debugstr_w (ppfti->szNetworkProvider), ppfti->dwAttributes, debugstr_w (ppfti->szNetworkProvider), ppfti->dwAttributes,
ppfti->csidl); ppfti->csidl);
......
dlls/shell32/shfldr_mycomp.c
View file @ 89e1d294
...@@ -171,7 +171,7 @@ static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface) ...@@ -171,7 +171,7 @@ static ULONG WINAPI ISF_MyComputer_fnAddRef (IShellFolder2 * iface)
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount - 1); TRACE ("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -181,7 +181,7 @@ static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface) ...@@ -181,7 +181,7 @@ static ULONG WINAPI ISF_MyComputer_fnRelease (IShellFolder2 * iface)
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE ("(%p)->(count=%lu)\n", This, refCount + 1); TRACE ("(%p)->(count=%u)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
...@@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, ...@@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface,
*ppidl = pidlTemp; *ppidl = pidlTemp;
TRACE ("(%p)->(-- ret=0x%08lx)\n", This, hr); TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr);
return hr; return hr;
} }
...@@ -265,7 +265,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags) ...@@ -265,7 +265,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags)
{ {
BOOL ret = TRUE; BOOL ret = TRUE;
TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); TRACE("(%p)->(flags=0x%08x)\n", list, dwFlags);
/* enumerate the folders */ /* enumerate the folders */
if (dwFlags & SHCONTF_FOLDERS) if (dwFlags & SHCONTF_FOLDERS)
...@@ -325,7 +325,7 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface, ...@@ -325,7 +325,7 @@ static HRESULT WINAPI ISF_MyComputer_fnEnumObjects (IShellFolder2 *iface,
{ {
IGenericSFImpl *This = (IGenericSFImpl *)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); hwndOwner, dwFlags, ppEnumIDList);
*ppEnumIDList = IEnumIDList_Constructor(); *ppEnumIDList = IEnumIDList_Constructor();
...@@ -432,7 +432,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, ...@@ -432,7 +432,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface,
IGenericSFImpl *This = (IGenericSFImpl *)iface; IGenericSFImpl *This = (IGenericSFImpl *)iface;
HRESULT hr = S_OK; 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); This, cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0);
if (!rgfInOut) if (!rgfInOut)
...@@ -463,7 +463,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface, ...@@ -463,7 +463,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface,
/* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */
*rgfInOut &= ~SFGAO_VALIDATE; *rgfInOut &= ~SFGAO_VALIDATE;
TRACE ("-- result=0x%08lx\n", *rgfInOut); TRACE ("-- result=0x%08x\n", *rgfInOut);
return hr; return hr;
} }
...@@ -542,7 +542,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface, ...@@ -542,7 +542,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetUIObjectOf (IShellFolder2 * iface,
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
*ppvOut = pObj; *ppvOut = pObj;
TRACE ("(%p)->hr=0x%08lx\n", This, hr); TRACE ("(%p)->hr=0x%08x\n", This, hr);
return hr; return hr;
} }
...@@ -557,7 +557,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, ...@@ -557,7 +557,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface,
WCHAR wszPath[MAX_PATH]; WCHAR wszPath[MAX_PATH];
HRESULT hr = S_OK; 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); pdump (pidl);
if (!strRet) if (!strRet)
...@@ -718,7 +718,7 @@ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf ( ...@@ -718,7 +718,7 @@ static HRESULT WINAPI ISF_MyComputer_fnSetNameOf (
LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut)
{ {
IGenericSFImpl *This = (IGenericSFImpl *)iface; 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); hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut);
return E_FAIL; return E_FAIL;
} }
...@@ -884,7 +884,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) ...@@ -884,7 +884,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_AddRef (IPersistFolder2 * iface)
{ {
IGenericSFImpl *This = impl_from_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)); return IUnknown_AddRef (_IUnknown_ (This));
} }
...@@ -896,7 +896,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_Release (IPersistFolder2 * iface) ...@@ -896,7 +896,7 @@ static ULONG WINAPI IMCFldr_PersistFolder2_Release (IPersistFolder2 * iface)
{ {
IGenericSFImpl *This = impl_from_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)); return IUnknown_Release (_IUnknown_ (This));
} }
......
dlls/shell32/shfldr_unixfs.c
View file @ 89e1d294
...@@ -866,7 +866,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_ParseDisplayName(IShellFolder2* i ...@@ -866,7 +866,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_ParseDisplayName(IShellFolder2* i
hr = SHBindToParent(pidlComplete, &IID_IShellFolder, (LPVOID*)&pParentSF, &pidlLast); hr = SHBindToParent(pidlComplete, &IID_IShellFolder, (LPVOID*)&pParentSF, &pidlLast);
if (FAILED(hr)) { if (FAILED(hr)) {
FIXME("SHBindToParent failed! hr = %08lx\n", hr); FIXME("SHBindToParent failed! hr = %08x\n", hr);
ILFree(pidlComplete); ILFree(pidlComplete);
return E_FAIL; return E_FAIL;
} }
...@@ -888,7 +888,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_EnumObjects(IShellFolder2* iface, ...@@ -888,7 +888,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_EnumObjects(IShellFolder2* iface,
IUnknown *newIterator; IUnknown *newIterator;
HRESULT hr; 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); iface, hwndOwner, grfFlags, ppEnumIDList);
if (!This->m_pszPath) { if (!This->m_pszPath) {
...@@ -1121,7 +1121,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i ...@@ -1121,7 +1121,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetDisplayNameOf(IShellFolder2* i
UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface); UnixFolder *This = ADJUST_THIS(UnixFolder, IShellFolder2, iface);
HRESULT hr = S_OK; 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) && if ((GET_SHGDN_FOR(uFlags) & SHGDN_FORPARSING) &&
(GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER)) (GET_SHGDN_RELATION(uFlags) != SHGDN_INFOLDER))
...@@ -1185,7 +1185,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H ...@@ -1185,7 +1185,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_SetNameOf(IShellFolder2* iface, H
LPOLESTR lpwszName; LPOLESTR lpwszName;
HRESULT hr; 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); iface, hwnd, pidl, debugstr_w(lpcwszName), uFlags, ppidlOut);
/* prepare to fail */ /* prepare to fail */
...@@ -1972,7 +1972,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_DragEnter(IDropTarget *iface, IData ...@@ -1972,7 +1972,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_DragEnter(IDropTarget *iface, IData
FORMATETC format; FORMATETC format;
STGMEDIUM medium; 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); iface, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect);
if (!pdwEffect || !pDataObject) if (!pdwEffect || !pDataObject)
...@@ -2008,7 +2008,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_DragOver(IDropTarget *iface, DWORD ...@@ -2008,7 +2008,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_DragOver(IDropTarget *iface, DWORD
{ {
UnixFolder *This = ADJUST_THIS(UnixFolder, IDropTarget, iface); 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); pt.x, pt.y, pdwEffect);
if (!pdwEffect) if (!pdwEffect)
...@@ -2037,7 +2037,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_Drop(IDropTarget *iface, IDataObjec ...@@ -2037,7 +2037,7 @@ static HRESULT WINAPI UnixFolder_IDropTarget_Drop(IDropTarget *iface, IDataObjec
STGMEDIUM medium; STGMEDIUM medium;
HRESULT hr; 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); iface, pDataObject, dwKeyState, pt.x, pt.y, pdwEffect);
InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL); InitFormatEtc(format, cfShellIDList, TYMED_HGLOBAL);
...@@ -2298,7 +2298,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Skip(IEnumIDList* iface, ...@@ -2298,7 +2298,7 @@ static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_Skip(IEnumIDList* iface,
ULONG cFetched; ULONG cFetched;
HRESULT hr; 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. */ /* Call IEnumIDList::Next and delete the resulting pidls. */
apidl = (LPITEMIDLIST*)SHAlloc(celt * sizeof(LPITEMIDLIST)); apidl = (LPITEMIDLIST*)SHAlloc(celt * sizeof(LPITEMIDLIST));
......
dlls/shell32/shlexec.c
View file @ 89e1d294
...@@ -298,7 +298,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, ...@@ -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. */ when starting app immediately before making a DDE connection. */
if (shWait) if (shWait)
if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED) if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED)
WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() ); WARN("WaitForInputIdle failed: Error %d\n", GetLastError() );
retval = 33; retval = 33;
if (psei->fMask & SEE_MASK_NOCLOSEPROCESS) if (psei->fMask & SEE_MASK_NOCLOSEPROCESS)
psei_out->hProcess = info.hProcess; psei_out->hProcess = info.hProcess;
...@@ -1070,7 +1070,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, ...@@ -1070,7 +1070,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj,
r = IContextMenu_InvokeCommand( cm, (LPCMINVOKECOMMANDINFO) &ici ); r = IContextMenu_InvokeCommand( cm, (LPCMINVOKECOMMANDINFO) &ici );
TRACE("invoke command returned %08lx\n", r ); TRACE("invoke command returned %08x\n", r );
end: end:
if ( hmenu ) if ( hmenu )
...@@ -1097,7 +1097,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC ...@@ -1097,7 +1097,7 @@ static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXEC
&IID_IShellExtInit, (LPVOID*)&obj ); &IID_IShellExtInit, (LPVOID*)&obj );
if ( FAILED( r ) ) if ( FAILED( r ) )
{ {
ERR("failed %08lx\n", r ); ERR("failed %08x\n", r );
goto end; goto end;
} }
...@@ -1211,7 +1211,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) ...@@ -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 */ /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */
memcpy(&sei_tmp, sei, sizeof(sei_tmp)); 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), 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.lpFile), debugstr_w(sei_tmp.lpParameters),
debugstr_w(sei_tmp.lpDirectory), sei_tmp.nShow, debugstr_w(sei_tmp.lpDirectory), sei_tmp.nShow,
...@@ -1259,7 +1259,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) ...@@ -1259,7 +1259,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
if (sei_tmp.fMask & unsupportedFlags) 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 */ /* process the IDList */
......
dlls/shell32/shlfolder.c
View file @ 89e1d294
...@@ -125,7 +125,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) ...@@ -125,7 +125,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut)
LPCWSTR pszTail = pszNext; LPCWSTR pszTail = pszNext;
DWORD dwCopy; 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; *pszOut = 0x0000;
...@@ -143,7 +143,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut) ...@@ -143,7 +143,7 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut)
else else
pszTail = NULL; 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; return pszTail;
} }
...@@ -178,7 +178,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, ...@@ -178,7 +178,7 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
ILFree (*pidlInOut); ILFree (*pidlInOut);
*pidlInOut = pidlTemp; *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; return hr;
} }
...@@ -240,7 +240,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, ...@@ -240,7 +240,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot,
} }
ILFree (pidlAbsolute); ILFree (pidlAbsolute);
} }
TRACE ("-- (%p) ret=0x%08lx\n", *ppvOut, hr); TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr);
return hr; return hr;
} }
...@@ -311,7 +311,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, ...@@ -311,7 +311,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot,
IShellFolder_Release (pSF); IShellFolder_Release (pSF);
} }
TRACE ("-- returning (%p) %08lx\n", *ppvOut, hr); TRACE ("-- returning (%p) %08x\n", *ppvOut, hr);
return hr; return hr;
} }
...@@ -336,7 +336,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, ...@@ -336,7 +336,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
LPITEMIDLIST pidlFirst; LPITEMIDLIST pidlFirst;
HRESULT hr = E_INVALIDARG; 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); pdump (pidl);
pidlFirst = ILCloneFirst (pidl); pidlFirst = ILCloneFirst (pidl);
...@@ -359,7 +359,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, ...@@ -359,7 +359,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
} else } else
hr = E_OUTOFMEMORY; 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; return hr;
} }
...@@ -403,11 +403,11 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO ...@@ -403,11 +403,11 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO
SFGAO_FILESYSTEM | /*0x40000000 */ SFGAO_FILESYSTEM | /*0x40000000 */
SFGAO_HASSUBFOLDER; /*0x80000000 */ SFGAO_HASSUBFOLDER; /*0x80000000 */
TRACE ("0x%08lx\n", *pdwAttributes); TRACE ("0x%08x\n", *pdwAttributes);
if (*pdwAttributes & ~dwSupportedAttr) if (*pdwAttributes & ~dwSupportedAttr)
{ {
WARN ("attributes 0x%08lx not implemented\n", (*pdwAttributes & ~dwSupportedAttr)); WARN ("attributes 0x%08x not implemented\n", (*pdwAttributes & ~dwSupportedAttr));
*pdwAttributes &= dwSupportedAttr; *pdwAttributes &= dwSupportedAttr;
} }
...@@ -484,7 +484,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO ...@@ -484,7 +484,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWO
} else { } else {
*pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANRENAME|SFGAO_CANLINK; *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; return S_OK;
} }
......
dlls/shell32/shlfsbind.c
View file @ 89e1d294
...@@ -179,7 +179,7 @@ static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface) ...@@ -179,7 +179,7 @@ static ULONG WINAPI IFileSystemBindData_fnAddRef(IFileSystemBindData *iface)
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount - 1); TRACE("(%p)->(count=%i)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -189,7 +189,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface) ...@@ -189,7 +189,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface)
IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface; IFileSystemBindDataImpl *This = (IFileSystemBindDataImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
......
dlls/shell32/shlmenu.c
View file @ 89e1d294
...@@ -90,7 +90,7 @@ static LPFMINFO FM_GetMenuInfo(HMENU hmenu) ...@@ -90,7 +90,7 @@ static LPFMINFO FM_GetMenuInfo(HMENU hmenu)
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) 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; return 0;
} }
...@@ -153,7 +153,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl) ...@@ -153,7 +153,7 @@ static int FM_InitMenuPopup(HMENU hmenu, LPCITEMIDLIST pAlternatePidl)
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) 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; return 0;
} }
...@@ -265,7 +265,7 @@ HMENU WINAPI FileMenu_Create ( ...@@ -265,7 +265,7 @@ HMENU WINAPI FileMenu_Create (
HMENU hMenu = CreatePopupMenu(); 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); crBorderColor, nBorderWidth, hBorderBmp, nSelHeight, uFlags, hMenu);
menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO)); menudata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO));
...@@ -371,7 +371,7 @@ static BOOL FileMenu_AppendItemW( ...@@ -371,7 +371,7 @@ static BOOL FileMenu_AppendItemW(
menudata = (LPFMINFO)MenuInfo.dwMenuData; menudata = (LPFMINFO)MenuInfo.dwMenuData;
if ((menudata == 0) || (MenuInfo.cbSize != sizeof(MENUINFO))) 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; return 0;
} }
...@@ -633,7 +633,7 @@ LRESULT WINAPI FileMenu_DrawItem( ...@@ -633,7 +633,7 @@ LRESULT WINAPI FileMenu_DrawItem(
Shell_GetImageList(0, &hImageList); Shell_GetImageList(0, &hImageList);
ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL); 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); SetTextColor(lpdis->hDC, clrPrevText);
SetBkColor(lpdis->hDC, clrPrevBkgnd); SetBkColor(lpdis->hDC, clrPrevBkgnd);
...@@ -794,7 +794,7 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos) ...@@ -794,7 +794,7 @@ DWORD WINAPI FileMenu_GetItemExtent (HMENU hMenu, UINT uPos)
FIXME("%p 0x%08x\n", hMenu, uPos); FIXME("%p 0x%08x\n", hMenu, uPos);
if (GetMenuItemRect(0, hMenu, uPos, &rect)) 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); rect.right, rect.left, rect.top, rect.bottom);
return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom); return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom);
} }
...@@ -828,7 +828,7 @@ void WINAPI FileMenu_AbortInitMenu (void) ...@@ -828,7 +828,7 @@ void WINAPI FileMenu_AbortInitMenu (void)
*/ */
LPVOID WINAPI SHFind_InitMenuPopup (HMENU hMenu, HWND hWndParent, DWORD w, DWORD x) 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); hMenu,hWndParent,w,x);
return NULL; /* this is supposed to be a pointer */ 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 ...@@ -867,7 +867,7 @@ HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uI
WCHAR szName[256]; WCHAR szName[256];
UINT uTemp, uIDMax = uIDAdjust; 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); hmDst, hmSrc, uInsert, uIDAdjust, uIDAdjustMax, uFlags);
if (!hmDst || !hmSrc) if (!hmDst || !hmSrc)
......
dlls/shell32/shlview.c
View file @ 89e1d294
...@@ -222,7 +222,7 @@ static HRESULT IncludeObject(IShellViewImpl * This, LPCITEMIDLIST pidl) ...@@ -222,7 +222,7 @@ static HRESULT IncludeObject(IShellViewImpl * This, LPCITEMIDLIST pidl)
{ {
TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl); TRACE("ICommDlgBrowser::IncludeObject pidl=%p\n", pidl);
ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView*)This, pidl); ret = ICommDlgBrowser_IncludeObject(This->pCommDlgBrowser, (IShellView*)This, pidl);
TRACE("--0x%08lx\n", ret); TRACE("--0x%08x\n", ret);
} }
return ret; return ret;
} }
...@@ -235,7 +235,7 @@ static HRESULT OnDefaultCommand(IShellViewImpl * This) ...@@ -235,7 +235,7 @@ static HRESULT OnDefaultCommand(IShellViewImpl * This)
{ {
TRACE("ICommDlgBrowser::OnDefaultCommand\n"); TRACE("ICommDlgBrowser::OnDefaultCommand\n");
ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView*)This); ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView*)This);
TRACE("-- returns %08lx\n", ret); TRACE("-- returns %08x\n", ret);
} }
return ret; return ret;
} }
...@@ -1197,7 +1197,7 @@ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This) ...@@ -1197,7 +1197,7 @@ static LRESULT ShellView_OnKillFocus(IShellViewImpl * This)
*/ */
static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dwCmd, HWND hwndCmd) 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) switch(dwCmdID)
{ {
...@@ -1237,7 +1237,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw ...@@ -1237,7 +1237,7 @@ static LRESULT ShellView_OnCommand(IShellViewImpl * This,DWORD dwCmdID, DWORD dw
break; break;
default: default:
TRACE("-- COMMAND 0x%04lx unhandled\n", dwCmdID); TRACE("-- COMMAND 0x%04x unhandled\n", dwCmdID);
} }
return 0; return 0;
} }
...@@ -1550,7 +1550,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn ...@@ -1550,7 +1550,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
static LRESULT ShellView_OnChange(IShellViewImpl * This, LPITEMIDLIST * Pidls, LONG wEventId) 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) switch(wEventId)
{ {
case SHCNE_MKDIR: case SHCNE_MKDIR:
...@@ -1684,7 +1684,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface) ...@@ -1684,7 +1684,7 @@ static ULONG WINAPI IShellView_fnAddRef(IShellView * iface)
IShellViewImpl *This = (IShellViewImpl *)iface; IShellViewImpl *This = (IShellViewImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -1696,7 +1696,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface) ...@@ -1696,7 +1696,7 @@ static ULONG WINAPI IShellView_fnRelease(IShellView * iface)
IShellViewImpl *This = (IShellViewImpl *)iface; IShellViewImpl *This = (IShellViewImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
...@@ -1754,7 +1754,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG ...@@ -1754,7 +1754,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG
#if 0 #if 0
IShellViewImpl *This = (IShellViewImpl *)iface; 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 #endif
if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST)) if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST))
...@@ -1843,7 +1843,7 @@ static HRESULT WINAPI IShellView_fnCreateViewWindow( ...@@ -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("(%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*/ /*set up the member variables*/
This->pShellBrowser = psb; This->pShellBrowser = psb;
...@@ -2104,14 +2104,14 @@ static HRESULT WINAPI ISVOleCmdTarget_QueryStatus( ...@@ -2104,14 +2104,14 @@ static HRESULT WINAPI ISVOleCmdTarget_QueryStatus(
UINT i; UINT i;
IShellViewImpl *This = impl_from_IOleCommandTarget(iface); 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); This, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText);
if (!prgCmds) if (!prgCmds)
return E_POINTER; return E_POINTER;
for (i = 0; i < cCmds; i++) 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; prgCmds[i].cmdf = 0;
} }
return OLECMDERR_E_UNKNOWNGROUP; return OLECMDERR_E_UNKNOWNGROUP;
...@@ -2132,7 +2132,7 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec( ...@@ -2132,7 +2132,7 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec(
{ {
IShellViewImpl *This = impl_from_IOleCommandTarget(iface); 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); This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut);
if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) && if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) &&
...@@ -2176,7 +2176,7 @@ static ULONG WINAPI ISVDropTarget_AddRef( IDropTarget *iface) ...@@ -2176,7 +2176,7 @@ static ULONG WINAPI ISVDropTarget_AddRef( IDropTarget *iface)
{ {
IShellViewImpl *This = impl_from_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); return IShellFolder_AddRef((IShellFolder*)This);
} }
...@@ -2185,7 +2185,7 @@ static ULONG WINAPI ISVDropTarget_Release( IDropTarget *iface) ...@@ -2185,7 +2185,7 @@ static ULONG WINAPI ISVDropTarget_Release( IDropTarget *iface)
{ {
IShellViewImpl *This = impl_from_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); return IShellFolder_Release((IShellFolder*)This);
} }
...@@ -2356,7 +2356,7 @@ static ULONG WINAPI ISVDropSource_AddRef( IDropSource *iface) ...@@ -2356,7 +2356,7 @@ static ULONG WINAPI ISVDropSource_AddRef( IDropSource *iface)
{ {
IShellViewImpl *This = impl_from_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); return IShellFolder_AddRef((IShellFolder*)This);
} }
...@@ -2365,7 +2365,7 @@ static ULONG WINAPI ISVDropSource_Release( IDropSource *iface) ...@@ -2365,7 +2365,7 @@ static ULONG WINAPI ISVDropSource_Release( IDropSource *iface)
{ {
IShellViewImpl *This = impl_from_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); return IShellFolder_Release((IShellFolder*)This);
} }
...@@ -2423,7 +2423,7 @@ static ULONG WINAPI ISVViewObject_AddRef( IViewObject *iface) ...@@ -2423,7 +2423,7 @@ static ULONG WINAPI ISVViewObject_AddRef( IViewObject *iface)
{ {
IShellViewImpl *This = impl_from_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); return IShellFolder_AddRef((IShellFolder*)This);
} }
...@@ -2432,7 +2432,7 @@ static ULONG WINAPI ISVViewObject_Release( IViewObject *iface) ...@@ -2432,7 +2432,7 @@ static ULONG WINAPI ISVViewObject_Release( IViewObject *iface)
{ {
IShellViewImpl *This = impl_from_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); return IShellFolder_Release((IShellFolder*)This);
} }
...@@ -2507,7 +2507,7 @@ static HRESULT WINAPI ISVViewObject_SetAdvise( ...@@ -2507,7 +2507,7 @@ static HRESULT WINAPI ISVViewObject_SetAdvise(
IShellViewImpl *This = impl_from_IViewObject(iface); 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); This, aspects, advf, pAdvSink);
/* FIXME: we set the AdviseSink, but never use it to send any advice */ /* FIXME: we set the AdviseSink, but never use it to send any advice */
......
dlls/shell32/shv_bg_cmenu.c
View file @ 89e1d294
...@@ -110,7 +110,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface) ...@@ -110,7 +110,7 @@ static ULONG WINAPI ISVBgCm_fnAddRef(IContextMenu2 *iface)
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = (BgCmImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -123,7 +123,7 @@ static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface) ...@@ -123,7 +123,7 @@ static ULONG WINAPI ISVBgCm_fnRelease(IContextMenu2 *iface)
BgCmImpl *This = (BgCmImpl *)iface; BgCmImpl *This = (BgCmImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
...@@ -180,7 +180,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( ...@@ -180,7 +180,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu(
} }
DestroyMenu(hMyMenu); DestroyMenu(hMyMenu);
TRACE("(%p)->returning 0x%lx\n",This,hr); TRACE("(%p)->returning 0x%x\n",This,hr);
return hr; return hr;
} }
......
dlls/shell32/shv_item_cmenu.c
View file @ 89e1d294
...@@ -144,7 +144,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) ...@@ -144,7 +144,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface)
ItemCmImpl *This = (ItemCmImpl *)iface; ItemCmImpl *This = (ItemCmImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
TRACE("(%p)->(count=%lu)\n", This, refCount - 1); TRACE("(%p)->(count=%u)\n", This, refCount - 1);
return refCount; return refCount;
} }
...@@ -157,7 +157,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) ...@@ -157,7 +157,7 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface)
ItemCmImpl *This = (ItemCmImpl *)iface; ItemCmImpl *This = (ItemCmImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
TRACE("(%p)->(count=%li)\n", This, refCount + 1); TRACE("(%p)->(count=%i)\n", This, refCount + 1);
if (!refCount) if (!refCount)
{ {
......
dlls/shell32/systray.c
View file @ 89e1d294
...@@ -80,7 +80,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) ...@@ -80,7 +80,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid)
HWND tray; HWND tray;
COPYDATASTRUCT cds; COPYDATASTRUCT cds;
TRACE("dwMessage = %ld\n", dwMessage); TRACE("dwMessage = %d\n", dwMessage);
tray = FindWindowExW(0, NULL, classname, NULL); tray = FindWindowExW(0, NULL, classname, NULL);
if (!tray) return FALSE; if (!tray) return FALSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment