system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

wshom.ocx: Don't show a message box on ShellExecute error.

Browse source
This commit is contained in:
Alexandre Julliard 2024-03-26 22:24:09 +01:00
parent 568e90ad11
commit 47e4907c0d
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/wshom.ocx/shell.c
View file

@ -1374,7 +1374,8 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.cbSize = 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.lpFile = file;
info.lpParameters = params; info.lpParameters = params;
info.nShow = show; info.nShow = show;
@ -1384,7 +1385,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
if (!ret) if (!ret)
{ {
TRACE("ShellExecute failed, %ld\n", GetLastError()); TRACE("ShellExecute failed, %ld\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError()); *exit_code = GetLastError();
} }
else else
{ {
@ -1399,8 +1400,8 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
else else
*exit_code = 0; *exit_code = 0;
return S_OK;
} }
return S_OK;
} }
struct popup_thread_param struct popup_thread_param

2
dlls/wshom.ocx/tests/wshom.c
View file

@ -284,7 +284,7 @@ static void test_wshshell(void)
str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir");
hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);
ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); 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); SysFreeString(str);
GetSystemDirectoryW(path, ARRAY_SIZE(path)); GetSystemDirectoryW(path, ARRAY_SIZE(path));