Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
e5de59b6
Commit
e5de59b6
authored
Jul 14, 2011
by
Francois Gouget
Committed by
Alexandre Julliard
Jul 14, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Add a trailing '\n' to Wine trace calls.
parent
ec23aeb5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
recyclebin.c
dlls/shell32/recyclebin.c
+1
-1
recyclebin.c
dlls/shell32/tests/recyclebin.c
+2
-2
trash.c
dlls/shell32/trash.c
+6
-6
No files found.
dlls/shell32/recyclebin.c
View file @
e5de59b6
...
...
@@ -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
);
}
}
...
...
dlls/shell32/tests/recyclebin.c
View file @
e5de59b6
...
...
@@ -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
);
...
...
dlls/shell32/trash.c
View file @
e5de59b6
...
...
@@ -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
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment