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
a06f76d6
Commit
a06f76d6
authored
Mar 18, 2004
by
Martin Fuchs
Committed by
Alexandre Julliard
Mar 18, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expand environment strings in command, parameter and directory strings
of ShellExecuteExW32().
parent
b040e4bc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
shell.c
dlls/shell32/shell.c
+4
-3
shell32_main.h
dlls/shell32/shell32_main.h
+4
-2
shlexec.c
dlls/shell32/shlexec.c
+0
-0
No files found.
dlls/shell32/shell.c
View file @
a06f76d6
...
...
@@ -611,13 +611,14 @@ DWORD WINAPI RegEnumKey16( HKEY hkey, DWORD index, LPSTR name, DWORD name_len )
/*************************************************************************
* SHELL_Execute16 [Internal]
*/
static
UINT
SHELL_Execute16
(
WCHAR
*
lpCmd
,
void
*
env
,
LPSHELLEXECUTEINFOW
seiW
,
BOOL
shWait
)
static
UINT
SHELL_Execute16
(
const
WCHAR
*
lpCmd
,
void
*
env
,
BOOL
shWait
,
LPSHELLEXECUTEINFOW
psei
,
LPSHELLEXECUTEINFOW
psei_out
)
{
UINT
ret
;
char
sCmd
[
MAX_PATH
];
WideCharToMultiByte
(
CP_ACP
,
0
,
lpCmd
,
-
1
,
sCmd
,
MAX_PATH
,
NULL
,
NULL
);
ret
=
WinExec16
(
sCmd
,
seiW
->
nShow
);
seiW
->
hInstApp
=
HINSTANCE_32
(
ret
);
ret
=
WinExec16
(
sCmd
,
(
UINT16
)
psei
->
nShow
);
psei_out
->
hInstApp
=
HINSTANCE_32
(
ret
);
return
ret
;
}
...
...
dlls/shell32/shell32_main.h
View file @
a06f76d6
...
...
@@ -228,8 +228,10 @@ inline static WCHAR * __SHCloneStrAtoW(WCHAR ** target, const char * source)
#define HINSTANCE_32(h16) ((HINSTANCE)(ULONG_PTR)(h16))
#define HINSTANCE_16(h32) (LOWORD(h32))
typedef
UINT
(
*
SHELL_ExecuteW32
)(
WCHAR
*
lpCmd
,
void
*
env
,
LPSHELLEXECUTEINFOW
sei
,
BOOL
shWait
);
BOOL
WINAPI
ShellExecuteExW32
(
LPSHELLEXECUTEINFOW
sei
,
SHELL_ExecuteW32
execfunc
);
typedef
UINT
(
*
SHELL_ExecuteW32
)(
const
WCHAR
*
lpCmd
,
void
*
env
,
BOOL
shWait
,
LPSHELLEXECUTEINFOW
sei
,
LPSHELLEXECUTEINFOW
sei_out
);
BOOL
WINAPI
ShellExecuteExW32
(
LPSHELLEXECUTEINFOW
sei
,
SHELL_ExecuteW32
execfunc
);
extern
WCHAR
swShell32Name
[
MAX_PATH
];
extern
char
sShell32Name
[
MAX_PATH
];
...
...
dlls/shell32/shlexec.c
View file @
a06f76d6
This diff is collapsed.
Click to expand it.
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