marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wshom.ocx: Expand environment string before executing command through CreateProcessW. 

Signed-off-by: Porot Mo <porotmjp@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Porot Mo 2020-06-16 16:20:46 +08:00 committed by Alexandre Julliard
parent 15303e5401
commit 2a15390eb9
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wshom.ocx/shell.c
View File

@ -1714,6 +1714,9 @@ static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT *
static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec **ret)
{
BSTR expandedcmd;
HRESULT hr;
TRACE("(%s %p)\n", debugstr_w(command), ret);
if (!ret)
@ -1722,7 +1725,13 @@ static HRESULT WINAPI WshShell3_Exec(IWshShell3 *iface, BSTR command, IWshExec *
if (!command)
return DISP_E_EXCEPTION;
return WshExec_create(command, ret);
hr = WshShell3_ExpandEnvironmentStrings(iface, command, &expandedcmd);
if (FAILED(hr))
return hr;
hr = WshExec_create(expandedcmd, ret);
SysFreeString(expandedcmd);
return hr;
}
static HRESULT WINAPI WshShell3_get_CurrentDirectory(IWshShell3 *iface, BSTR *dir)

10
dlls/wshom.ocx/tests/wshom.c
View File

@ -327,6 +327,16 @@ static void test_wshshell(void)
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr);
SysFreeString(str);
str = SysAllocString(L"%deadbeaf% /c echo test");
hr = IWshShell3_Exec(sh3, str, &shexec);
ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr);
SysFreeString(str);
str = SysAllocString(L"%ComSpec% /c echo test");
hr = IWshShell3_Exec(sh3, str, &shexec);
ok(hr == HRESULT_FROM_WIN32(ERROR_SUCCESS), "got 0x%08x\n", hr);
SysFreeString(str);
IWshCollection_Release(coll);
IDispatch_Release(disp);
IWshShell3_Release(sh3);