ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Add a trailing '\n' to Wine trace calls.

This commit is contained in:
Francois Gouget 2011-07-14 13:14:13 +02:00 committed by Alexandre Julliard
parent ec23aeb58e
commit e5de59b625
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/recyclebin.c
View File

@ -173,7 +173,7 @@ static HRESULT WINAPI RecycleBinMenu_QueryContextMenu(IContextMenu2 *iface,
return E_NOTIMPL; return E_NOTIMPL;
else{ else{
UINT idMax = Shell_MergeMenus(hmenu,GetSubMenu(menures,0),indexMenu,idCmdFirst,idCmdLast,MM_SUBMENUSHAVEIDS); 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); return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst+1);
} }
} }

4
dlls/shell32/tests/recyclebin.c
View File

@ -59,12 +59,12 @@ static void test_query_recyclebin(void)
CHAR buf[MAX_PATH+strlen(name)+2]; CHAR buf[MAX_PATH+strlen(name)+2];
if(!pSHQueryRecycleBinA) if(!pSHQueryRecycleBinA)
{ {
skip("SHQueryRecycleBinA does not exist"); skip("SHQueryRecycleBinA does not exist\n");
return; return;
} }
if(!pSHFileOperationA) if(!pSHFileOperationA)
{ {
skip("SHFileOperationA does not exist"); skip("SHFileOperationA does not exist\n");
return; return;
} }
GetCurrentDirectoryA(MAX_PATH, buf); GetCurrentDirectoryA(MAX_PATH, buf);

12
dlls/shell32/trash.c
View File

@ -553,10 +553,10 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){
WIN32_FIND_DATAW data; WIN32_FIND_DATAW data;
char *file_path; char *file_path;
TRACE("(%p)",pidl); TRACE("(%p)\n",pidl);
if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix)) 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; return E_INVALIDARG;
} }
TRASH_UnpackItemID(id,&data); TRASH_UnpackItemID(id,&data);
@ -568,7 +568,7 @@ HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl){
{ {
sprintf(file_path,"%s%s",home_trash->info_dir,filename); sprintf(file_path,"%s%s",home_trash->info_dir,filename);
if(unlink(file_path)) if(unlink(file_path))
WARN("failed to delete the trashinfo file %s",filename); WARN("failed to delete the trashinfo file %s\n",filename);
} }
else else
WARN("could not erase %s from the trash (errno=%i)\n",filename,errno); 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); const char *filename = (const char*)(id->abID+1+sizeof(WIN32_FIND_DATAW)+strlen(bucket_name)+1);
char *file_path; char *file_path;
TRACE("(%p)",pidl); TRACE("(%p)\n",pidl);
if(strcmp(filename+strlen(filename)-suffix_length,trashinfo_suffix)) 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; return E_INVALIDARG;
} }
file_path = SHAlloc(max(strlen(home_trash->files_dir),strlen(home_trash->info_dir))+strlen(filename)+1); 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); sprintf(file_path,"%s%s",home_trash->info_dir,filename);
if(unlink(file_path)) 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); sprintf(file_path,"%s%s",home_trash->files_dir,filename);
file_path[strlen(home_trash->files_dir)+strlen(filename)-suffix_length] = '\0'; file_path[strlen(home_trash->files_dir)+strlen(filename)-suffix_length] = '\0';
if(unlink(file_path)) if(unlink(file_path))