Nikolay Sivov : shell32: Remove "stub" from traces.
Alexandre Julliard
julliard at winehq.org
Tue Nov 5 16:11:44 CST 2019
Module: wine
Branch: master
Commit: 539644ad63702a71080427a2be3359d6f081019c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=539644ad63702a71080427a2be3359d6f081019c
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue Nov 5 14:33:47 2019 +0300
shell32: Remove "stub" from traces.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/pidl.c | 4 ++--
dlls/shell32/shellstring.c | 2 +-
dlls/shell32/shlview.c | 19 +++++++------------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index 54fb818526..e2746deb48 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1105,7 +1105,7 @@ HRESULT WINAPI SHGetDataFromIDListA(LPSHELLFOLDER psf, LPCITEMIDLIST pidl,
LPSTR filename, shortname;
WIN32_FIND_DATAA * pfd;
- TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
+ TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len);
pdump(pidl);
if (!psf || !dest)
@@ -1163,7 +1163,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl,
LPSTR filename, shortname;
WIN32_FIND_DATAW * pfd = dest;
- TRACE_(shell)("sf=%p pidl=%p 0x%04x %p 0x%04x stub\n",psf,pidl,nFormat,dest,len);
+ TRACE_(shell)("%p, %p, %d, %p, %d.\n", psf, pidl, nFormat, dest, len);
pdump(pidl);
diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
index 956fd50871..3b70a2a94b 100644
--- a/dlls/shell32/shellstring.c
+++ b/dlls/shell32/shellstring.c
@@ -269,7 +269,7 @@ DWORD WINAPI CheckEscapesW(
DWORD size = lstrlenW(string);
LPWSTR s, d;
- TRACE("(%s %d) stub\n", debugstr_w(string), len);
+ TRACE("%s, %u.\n", debugstr_w(string), len);
if (StrPBrkW(string, strEscapedChars) && size + 2 <= len)
{
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index bcb9466315..ff1332087d 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -778,13 +778,9 @@ static HMENU ShellView_BuildFileMenu(IShellViewImpl * This)
TRACE("-- return (menu=%p)\n",hSubMenu);
return hSubMenu;
}
-/**********************************************************
-* ShellView_MergeFileMenu()
-*/
+
static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu)
{
- TRACE("(%p)->(submenu=%p) stub\n",This,hSubMenu);
-
if (hSubMenu)
{
static const WCHAR dummyW[] = {'d','u','m','m','y','4','5',0};
@@ -806,8 +802,6 @@ static void ShellView_MergeFileMenu(IShellViewImpl *This, HMENU hSubMenu)
mii.fType = MFT_STRING;
InsertMenuItemW(hSubMenu, 0, TRUE, &mii);
}
-
- TRACE("--\n");
}
/**********************************************************
@@ -989,7 +983,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL
LPCONTEXTMENU pContextMenu = NULL;
CMINVOKECOMMANDINFO cmi;
- TRACE("(%p)->(0x%08x 0x%08x 0x%08x) stub\n",This, x, y, bDefault);
+ TRACE("%p, %d, %d, %d.\n", This, x, y, bDefault);
/* look, what's selected and create a context menu object of it*/
if( ShellView_GetSelections(This) )
@@ -1230,7 +1224,7 @@ static LRESULT ShellView_OnSetFocus(IShellViewImpl * This)
*/
static LRESULT ShellView_OnKillFocus(IShellViewImpl * This)
{
- TRACE("(%p) stub\n",This);
+ TRACE("%p.\n", This);
ShellView_OnActivate(This, SVUIA_ACTIVATE_NOFOCUS);
/* Notify the ICommDlgBrowser */
@@ -1870,7 +1864,7 @@ static HRESULT WINAPI IShellView_fnUIActivate(IShellView3 *iface, UINT uState)
LRESULT lResult;
int nPartArray[1] = {-1};
- TRACE("(%p)->(state=%x) stub\n",This, uState);
+ TRACE("%p, %d.\n", This, uState);
/*don't do anything if the state isn't really changing*/
if(This->uState == uState)
@@ -2677,7 +2671,7 @@ static ULONG WINAPI FolderView_Release(IFolderView2 *iface)
static HRESULT WINAPI FolderView_GetCurrentViewMode(IFolderView2 *iface, UINT *mode)
{
IShellViewImpl *This = impl_from_IFolderView2(iface);
- TRACE("(%p)->(%p), stub\n", This, mode);
+ TRACE("%p, %p.\n", This, mode);
if(!mode)
return E_INVALIDARG;
@@ -2690,7 +2684,8 @@ static HRESULT WINAPI FolderView_SetCurrentViewMode(IFolderView2 *iface, UINT mo
{
IShellViewImpl *This = impl_from_IFolderView2(iface);
DWORD dwStyle;
- TRACE("(%p)->(%u), stub\n", This, mode);
+
+ TRACE("%p, %u.\n", This, mode);
if((mode < FVM_FIRST || mode > FVM_LAST) &&
(mode != FVM_AUTO))
More information about the wine-cvs
mailing list