Francois Gouget : shell32: Add a trailing '\n' to Wine trace calls.
Alexandre Julliard
julliard at winehq.org
Thu Jul 14 13:08:18 CDT 2011
Module: wine
Branch: master
Commit: e5de59b625fc5c3273f1f7541bb6d6c815afed27
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5de59b625fc5c3273f1f7541bb6d6c815afed27
Author: Francois Gouget <fgouget at free.fr>
Date: Thu Jul 14 13:14:13 2011 +0200
shell32: Add a trailing '\n' to Wine trace calls.
---
dlls/shell32/recyclebin.c | 2 +-
dlls/shell32/tests/recyclebin.c | 4 ++--
dlls/shell32/trash.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c
index f840bf1..4be6421 100644
--- a/dlls/shell32/recyclebin.c
+++ b/dlls/shell32/recyclebin.c
@@ -173,7 +173,7 @@ static HRESULT WINAPI RecycleBinMenu_QueryContextMenu(IContextMenu2 *iface,
return E_NOTIMPL;
else{
UINT idMax = Shell_MergeMenus(hmenu,GetSubMenu(menures,0),indexMenu,idCmdFirst,idCmdLast,MM_SUBMENUSHAVEIDS);
- TRACE("Added %d id(s)",idMax-idCmdFirst);
+ TRACE("Added %d id(s)\n",idMax-idCmdFirst);
return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst+1);
}
}
diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c
index ce101a6..2fa4d3e 100644
--- a/dlls/shell32/tests/recyclebin.c
+++ b/dlls/shell32/tests/recyclebin.c
@@ -59,12 +59,12 @@ static void test_query_recyclebin(void)
CHAR buf[MAX_PATH+strlen(name)+2];
if(!pSHQueryRecycleBinA)
{
- skip("SHQueryRecycleBinA does not exist");
+ skip("SHQueryRecycleBinA does not exist\n");
return;
}
if(!pSHFileOperationA)
{
- skip("SHFileOperationA does not exist");
+ skip("SHFileOperationA does not exist\n");
return;
}
GetCurrentDirectoryA(MAX_PATH, buf);
diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c
index c64e203..3a6234a 100644
--- a/dlls/shell32/trash.c
+++ b/dlls/shell32/trash.c
@@ -553,10 +553,10 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){
WIN32_FIND_DATAW data;
char *file_path;
- TRACE("(%p)",pidl);
+ TRACE("(%p)\n",pidl);
if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix))
{
- ERR("pidl at %p is not a valid recycle bin entry",pidl);
+ ERR("pidl at %p is not a valid recycle bin entry\n",pidl);
return E_INVALIDARG;
}
TRASH_UnpackItemID(id,&data);
@@ -568,7 +568,7 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){
{
sprintf(file_path,"%s%s",home_trash->info_dir,filename);
if(unlink(file_path))
- WARN("failed to delete the trashinfo file %s",filename);
+ WARN("failed to delete the trashinfo file %s\n",filename);
}
else
WARN("could not erase %s from the trash (errno=%i)\n",filename,errno);
@@ -586,16 +586,16 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl)
const char *filename = (const char*)(id->abID+1+sizeof(WIN32_FIND_DATAW)+strlen(bucket_name)+1);
char *file_path;
- TRACE("(%p)",pidl);
+ TRACE("(%p)\n",pidl);
if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix))
{
- ERR("pidl at %p is not a valid recycle bin entry",pidl);
+ ERR("pidl at %p is not a valid recycle bin entry\n",pidl);
return E_INVALIDARG;
}
file_path = SHAlloc(max(strlen(home_trash->files_dir),strlen(home_trash->info_dir))+strlen(filename)+1);
sprintf(file_path,"%s%s",home_trash->info_dir,filename);
if(unlink(file_path))
- WARN("failed to delete the trashinfo file %s",filename);
+ WARN("failed to delete the trashinfo file %s\n",filename);
sprintf(file_path,"%s%s",home_trash->files_dir,filename);
file_path[strlen(home_trash->files_dir)+strlen(filename)-suffix_length] = '\0';
if(unlink(file_path))
More information about the wine-cvs
mailing list