Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
435ba2c6
Commit
435ba2c6
authored
Jun 29, 2022
by
Paul Gofman
Committed by
Alexandre Julliard
Jul 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Don't quote args substituted through wildcard in SHELL_ArgifyW().
Signed-off-by:
Paul Gofman
<
pgofman@codeweavers.com
>
parent
d7027336
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
10 deletions
+7
-10
shlexec.c
dlls/shell32/shlexec.c
+0
-4
shlexec.c
dlls/shell32/tests/shlexec.c
+7
-6
No files found.
dlls/shell32/shlexec.c
View file @
435ba2c6
...
...
@@ -110,8 +110,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp
if
(
*
fmt
==
'*'
)
{
used
++
;
if
(
used
<
len
)
*
res
++
=
'"'
;
while
(
*
args
)
{
used
++
;
...
...
@@ -121,8 +119,6 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp
args
++
;
}
used
++
;
if
(
used
<
len
)
*
res
++
=
'"'
;
}
else
{
...
...
dlls/shell32/tests/shlexec.c
View file @
435ba2c6
...
...
@@ -1418,11 +1418,11 @@ typedef struct
static
const
argify_tests_t
argify_tests
[]
=
{
/* Start with three simple parameters. Notice that one can reorder and
* duplicate the parameters. Also notice how %* take the raw input
* parameters string, including the trailing spaces, no matter what
*
arguments have already been used.
*/
{
"ParamsS"
,
"p2 p3
\"
p4 "
,
FALSE
,
" p2 p3
\"
p4 "
},
/* Notice that one can reorder and duplicate the parameters.
*
Also notice how %* take the raw input parameters string, including
*
the trailing spaces, no matter what arguments have already been used. *
/
{
"Params232S"
,
"p2 p3 p4 "
,
TRUE
,
" p2 p3
\"
p2
\"
\"
p2 p3 p4
\"
"
},
...
...
@@ -1567,6 +1567,7 @@ static void test_argify(void)
return
;
}
create_test_verb
(
"shlexec.shlexec"
,
"ParamsS"
,
0
,
"ParamsS %*"
);
create_test_verb
(
"shlexec.shlexec"
,
"Params232S"
,
0
,
"Params232S %2 %3
\"
%2
\"
\"
%*
\"
"
);
create_test_verb
(
"shlexec.shlexec"
,
"Params23456"
,
0
,
"Params23456
\"
%2
\"
\"
%3
\"
\"
%4
\"
\"
%5
\"
\"
%6
\"
"
);
create_test_verb
(
"shlexec.shlexec"
,
"Params23456789"
,
0
,
"Params23456789
\"
%2
\"
\"
%3
\"
\"
%4
\"
\"
%5
\"
\"
%6
\"
\"
%7
\"
\"
%8
\"
\"
%9
\"
"
);
...
...
@@ -1594,7 +1595,7 @@ static void test_argify(void)
if
(
!
cmd
)
cmd
=
"(null)"
;
todo_wine_if
(
test
->
todo
)
okShell
(
!
strcmp
(
cmd
,
test
->
cmd
)
||
broken
(
!
strcmp
(
cmd
,
bad
)),
"expected '%s', got '%s'
\n
"
,
cmd
,
test
->
cmd
);
"expected '%s', got '%s'
\n
"
,
test
->
cmd
,
cmd
);
test
++
;
}
}
...
...
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