[PATCH 0/2] MR661: wshom: Support default style argument in IWshShell3::Run.

[Robert Wilhelm (＠sloper42)]

This patch allows to use WshShell.Run( cmd ) in vbscript.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53565

[PATCH 1/2] wshom: Add test for default style arg in WshShell3_Run.

[Robert Wilhelm]

From: Robert Wilhelm

---
 dlls/wshom.ocx/tests/wshom.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
index 4867843678a..fc27373f296 100644
--- a/dlls/wshom.ocx/tests/wshom.c
+++ b/dlls/wshom.ocx/tests/wshom.c
@@ -243,9 +243,21 @@ static void test_wshshell(void)
     ok(retval == 10, "Unexpected retval %d.\n", retval);
     SysFreeString(str);

+    V_VT(&arg) = VT_ERROR;
+    V_ERROR(&arg) = DISP_E_PARAMNOTFOUND;
     V_VT(&arg2) = VT_BOOL;
     V_BOOL(&arg2) = VARIANT_TRUE;

+    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);
+    todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "Unexpected retval %d.\n", retval);
+    SysFreeString(str);
+
+    V_VT(&arg) = VT_I2;
+    V_I2(&arg) = 0;
+
     retval = 0xdeadbeef;
     str = SysAllocString(L"cmd.exe /c rd /s /q c:\nosuchdir");
     hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval);

[PATCH 2/2] wshom: Support default style argument in IWshShell3::Run.

[Robert Wilhelm]

From: Robert Wilhelm

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53565
---
 dlls/wshom.ocx/shell.c       | 23 ++++++++++++++---------
 dlls/wshom.ocx/tests/wshom.c |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c
index 034f6583d54..baaf54ad1af 100644
--- a/dlls/wshom.ocx/shell.c
+++ b/dlls/wshom.ocx/shell.c
@@ -1332,9 +1332,8 @@ 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;
     HRESULT hr;
     BOOL ret;

@@ -1343,12 +1342,18 @@ 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 = 1;
+    else {
+        VARIANT s;
+        VariantInit(&s);
+        hr = VariantChangeType(&s, style, 0, VT_I4);
+        if (FAILED(hr))
+        {
+            ERR("failed to convert style argument, %#lx\n", hr);
+            return hr;
+        }
+        show = V_I4(&s);
     }

if (is_optional_argument(wait))
@@ -1371,7 +1376,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);
diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c
index fc27373f296..34a02a8d1f9 100644
--- a/dlls/wshom.ocx/tests/wshom.c
+++ b/dlls/wshom.ocx/tests/wshom.c
@@ -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);

[Nikolay Sivov (＠nsivov)]

Nikolay Sivov (@nsivov) commented about dlls/wshom.ocx/shell.c:
>  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 = 1;
> - else {

Please use existing constant name for this instead of just 1.

[Nikolay Sivov (＠nsivov)]

Nikolay Sivov (@nsivov) commented about dlls/wshom.ocx/shell.c:
> - if (FAILED(hr))
> - {
> -
>    ERR("failed to convert style argument, %#lx\n", hr);
> -
>    return hr;
> - if (is_optional_argument(style))
> -
>    show = 1;
> - else {
> -
>    VARIANT s;
> -
>    VariantInit(&s);
> -
>    hr = VariantChangeType(&s, style, 0, VT_I4);
> -
>    if (FAILED(hr))
> -
>    {
> -
>        ERR("failed to convert style argument, %#lx\n", hr);
> -
>        return hr;
> -
>    }
> -
>    show = V_I4(&s);

No need to move 's' definition here. We could reuse same variant for both 'style' and 'wait'. Error message can go too.