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
5b7da809
Commit
5b7da809
authored
Sep 12, 2005
by
Ge van Geldorp
Committed by
Alexandre Julliard
Sep 12, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix execution of Control Panel items.
parent
8ec81f16
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
cpanelfolder.c
dlls/shell32/cpanelfolder.c
+4
-2
shlexec.c
dlls/shell32/shlexec.c
+4
-3
shlexec.c
dlls/shell32/tests/shlexec.c
+0
-2
No files found.
dlls/shell32/cpanelfolder.c
View file @
5b7da809
...
...
@@ -970,6 +970,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP
SHELLEXECUTEINFOW
sei_tmp
;
PIDLCPanelStruct
*
pcpanel
;
WCHAR
path
[
MAX_PATH
];
WCHAR
params
[
MAX_PATH
];
BOOL
ret
;
int
l
;
...
...
@@ -990,12 +991,13 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP
/* pass applet name to Control_RunDLL to distinguish between applets in one .cpl file */
path
[
l
++
]
=
'"'
;
path
[
l
++
]
=
'
'
;
path
[
l
]
=
'\0
'
;
MultiByteToWideChar
(
CP_ACP
,
0
,
pcpanel
->
szName
+
pcpanel
->
offsDispName
,
-
1
,
pa
th
+
l
,
MAX_PATH
);
MultiByteToWideChar
(
CP_ACP
,
0
,
pcpanel
->
szName
+
pcpanel
->
offsDispName
,
-
1
,
pa
rams
,
MAX_PATH
);
memcpy
(
&
sei_tmp
,
psei
,
sizeof
(
sei_tmp
));
sei_tmp
.
lpFile
=
path
;
sei_tmp
.
lpParameters
=
params
;
sei_tmp
.
fMask
&=
~
SEE_MASK_INVOKEIDLIST
;
sei_tmp
.
lpVerb
=
wCplopen
;
...
...
dlls/shell32/shlexec.c
View file @
5b7da809
...
...
@@ -1263,9 +1263,10 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun
lpFile
=
wfileName
;
strcpyW
(
wcmd
,
wszApplicationName
);
if
(
sei_tmp
.
lpParameters
[
0
])
{
strcatW
(
w
szApplicationName
,
wSpace
);
strcatW
(
w
szApplicationName
,
wszParameters
);
strcatW
(
w
cmd
,
wSpace
);
strcatW
(
w
cmd
,
wszParameters
);
}
/* We set the default to open, and that should generally work.
...
...
@@ -1273,7 +1274,7 @@ BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfun
if
(
!
sei_tmp
.
lpVerb
)
sei_tmp
.
lpVerb
=
wszOpen
;
retval
=
execfunc
(
w
szApplicationName
,
NULL
,
FALSE
,
&
sei_tmp
,
sei
);
retval
=
execfunc
(
w
cmd
,
NULL
,
FALSE
,
&
sei_tmp
,
sei
);
if
(
retval
>
32
)
return
TRUE
;
...
...
dlls/shell32/tests/shlexec.c
View file @
5b7da809
...
...
@@ -704,9 +704,7 @@ static void test_lnks()
okChildInt
(
"argcA"
,
5
);
okChildString
(
"argvA3"
,
"Open"
);
sprintf
(
filename
,
"%s
\\
test file.shlexec"
,
tmpdir
);
todo_wine
{
okChildPath
(
"argvA4"
,
filename
);
}
sprintf
(
filename
,
"%s
\\
test_shortcut_exe.lnk"
,
tmpdir
);
rc
=
shell_execute_ex
(
SEE_MASK_NOZONECHECKS
,
NULL
,
filename
,
NULL
,
NULL
);
...
...
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