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
47e4907c
Commit
47e4907c
authored
Mar 26, 2024
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wshom.ocx: Don't show a message box on ShellExecute error.
parent
568e90ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
shell.c
dlls/wshom.ocx/shell.c
+4
-3
wshom.c
dlls/wshom.ocx/tests/wshom.c
+1
-1
No files found.
dlls/wshom.ocx/shell.c
View file @
47e4907c
...
...
@@ -1374,7 +1374,8 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
cbSize
=
sizeof
(
info
);
info
.
fMask
=
waitforprocess
?
SEE_MASK_NOASYNC
|
SEE_MASK_NOCLOSEPROCESS
:
SEE_MASK_DEFAULT
;
info
.
fMask
=
SEE_MASK_FLAG_NO_UI
;
info
.
fMask
|=
waitforprocess
?
SEE_MASK_NOASYNC
|
SEE_MASK_NOCLOSEPROCESS
:
SEE_MASK_DEFAULT
;
info
.
lpFile
=
file
;
info
.
lpParameters
=
params
;
info
.
nShow
=
show
;
...
...
@@ -1384,7 +1385,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
if
(
!
ret
)
{
TRACE
(
"ShellExecute failed, %ld
\n
"
,
GetLastError
());
return
HRESULT_FROM_WIN32
(
GetLastError
()
);
*
exit_code
=
GetLastError
(
);
}
else
{
...
...
@@ -1399,8 +1400,8 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
else
*
exit_code
=
0
;
return
S_OK
;
}
return
S_OK
;
}
struct
popup_thread_param
...
...
dlls/wshom.ocx/tests/wshom.c
View file @
47e4907c
...
...
@@ -284,7 +284,7 @@ static void test_wshshell(void)
str
=
SysAllocString
(
L"
\"
cmd.exe
\"
/c rd /s /q c:
\\
nosuchdir"
);
hr
=
IWshShell3_Run
(
sh3
,
str
,
&
arg
,
&
arg2
,
&
retval
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#lx.
\n
"
,
hr
);
todo_wine
ok
(
retval
==
ERROR_FILE_NOT_FOUND
,
"Unexpected retval %d.
\n
"
,
retval
);
ok
(
retval
==
ERROR_FILE_NOT_FOUND
,
"Unexpected retval %d.
\n
"
,
retval
);
SysFreeString
(
str
);
GetSystemDirectoryW
(
path
,
ARRAY_SIZE
(
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