system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-18 23:33:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wshom: Support default style argument in IWshShell3::Run.

Browse source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53565
This commit is contained in:
Robert Wilhelm 2022-08-17 09:30:47 +02:00 committed by Alexandre Julliard
parent 6f7d062583
commit 98f546ed82
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1332,9 +1332,9 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params )
static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, int *exit_code)
{
SHELLEXECUTEINFOW info;
int waitforprocess;
int waitforprocess, show;
WCHAR *file, *params;
VARIANT s;
VARIANT v;
HRESULT hr;
BOOL ret;
@ -1343,25 +1343,26 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
if (!style || !wait || !exit_code)
return E_POINTER;
VariantInit(&s);
hr = VariantChangeType(&s, style, 0, VT_I4);
if (FAILED(hr))
{
ERR("failed to convert style argument, %#lx\n", hr);
return hr;
if (is_optional_argument(style))
show = SW_SHOWNORMAL;
else {
VariantInit(&v);
hr = VariantChangeType(&v, style, 0, VT_I4);
if (FAILED(hr))
return hr;
show = V_I4(&v);
}
if (is_optional_argument(wait))
waitforprocess = 0;
else {
VARIANT w;
VariantInit(&w);
hr = VariantChangeType(&w, wait, 0, VT_I4);
VariantInit(&v);
hr = VariantChangeType(&v, wait, 0, VT_I4);
if (FAILED(hr))
return hr;
waitforprocess = V_I4(&w);
waitforprocess = V_I4(&v);
}
if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY;
@ -1371,7 +1372,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style,
info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT;
info.lpFile = file;
info.lpParameters = params;
info.nShow = V_I4(&s);
info.nShow = show;
ret = ShellExecuteExW(&info);
free(file);

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

@ -251,7 +251,7 @@ static void test_wshshell(void)
retval = 0xdeadbeef;
str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir");
hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);
todo_wine 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);
SysFreeString(str);