[PATCH v4 0/4] MR11157: wshom.ocx: Implemented the AppActivate method

[Anders Kjersem (＠anders)]

The `SendKeys` method used by scripted UI automation is almost pointless without window activation support.

--
  v4: Detach input thread before waiting
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11157

[PATCH v4 1/4] wshom.ocx: Implement AppActivate

[Anders Kjersem]

From: Anders Kjersem <[e-mail]>

---
 dlls/wshom.ocx/shell.c | 77 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c
index 4056201a6b7..525dec7f932 100644
--- a/dlls/wshom.ocx/shell.c
+++ b/dlls/wshom.ocx/shell.c
@@ -1820,8 +1820,81 @@ static HRESULT WINAPI WshShell3_LogEvent(IWshShell3 *iface, VARIANT *Type, BSTR
 
 static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VARIANT *Wait, VARIANT_BOOL *out_Success)
 {
-    FIXME("(%s %s %p): stub\n", debugstr_variant(App), debugstr_variant(Wait), out_Success);
-    return E_NOTIMPL;
+    HRESULT hr = S_FALSE;
+    HWND hWnd = GetWindow(GetDesktopWindow(), GW_CHILD);
+    HWND hWndTarget = NULL;
+    VARIANT vTmp;
+    if (!App)
+        return E_POINTER;
+
+    V_VT(&vTmp) = VT_EMPTY;
+    if (V_VT(App) != VT_BSTR && SUCCEEDED(VariantChangeType(&vTmp, App, 0, VT_I4)) && V_I4(&vTmp))
+    {
+        DWORD pidFind = V_I4(&vTmp), pid;
+        for (; hWnd; hWnd = GetWindow(hWnd, GW_HWNDNEXT))
+        {
+            if (!GetWindowThreadProcessId(hWnd, &pid) || pid != pidFind || !IsWindowVisible(hWnd))
+                continue;
+            if (IsWindowEnabled(hWnd))
+            {
+                hWndTarget = hWnd;
+                break; // Enabled and visible, we are done
+            }
+            else if (!hWndTarget)
+            {
+                hWndTarget = hWnd; // We will accept a disabled window if we have to
+            }
+        }
+    }
+    else if (SUCCEEDED(VariantChangeType(&vTmp, App, 0, VT_BSTR)))
+    {
+        BSTR bsFind = V_BSTR(&vTmp);
+        UINT lenFind = lstrlenW(bsFind);
+        for (; hWnd && !hWndTarget && lenFind; hWnd = GetWindow(hWnd, GW_HWNDNEXT))
+        {
+            UINT cch = GetWindowTextLengthW(hWnd);
+            if (!cch)
+                continue;
+            BSTR bsBuf = SysAllocStringLen(NULL, ++cch);
+            if (!bsBuf)
+            {
+                hr = E_OUTOFMEMORY;
+                break;
+            }
+            cch = GetWindowTextW(hWnd, bsBuf, cch);
+            if (cch >= lenFind && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, bsBuf,
+                                                 lenFind, bsFind, lenFind) == CSTR_EQUAL)
+            {
+                hWndTarget = hWnd;
+            }
+            SysFreeString(bsBuf);
+        }
+        VariantClear(&vTmp);
+    }
+
+    if (hWndTarget)
+    {
+        DWORD mytid = GetCurrentThreadId(), pid;
+        DWORD othertid = GetWindowThreadProcessId(hWnd, &pid);
+        BOOL attached = AttachThreadInput(mytid, othertid, TRUE);
+        SetForegroundWindow(hWndTarget);
+        V_VT(&vTmp) = VT_EMPTY;
+        if (Wait && !is_optional_argument(Wait) &&
+            SUCCEEDED(VariantChangeType(&vTmp, Wait, 0, VT_BOOL)) && V_BOOL(&vTmp))
+        {
+            UINT wait = 2000, interval = 100;
+            for (; wait && GetForegroundWindow() != hWndTarget; wait -= interval)
+                Sleep(interval);
+        }
+        SetLastError(0);
+        hr = (SetFocus(hWndTarget) || !GetLastError()) ? S_OK : S_FALSE;
+        if (attached)
+            AttachThreadInput(mytid, othertid, FALSE);
+    }
+
+    if (out_Success)
+        *out_Success = (hr == S_OK) ? VARIANT_TRUE : VARIANT_FALSE;
+    return hr;
 }
 
 static HRESULT WINAPI WshShell3_SendKeys(IWshShell3 *iface, BSTR Keys, VARIANT *Wait)
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11157

[PATCH v4 2/4] Fixed var decl

[Anders Kjersem]

From: Anders Kjersem <[e-mail]>

---
 dlls/wshom.ocx/shell.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c
index 525dec7f932..c9192bf5d60 100644
--- a/dlls/wshom.ocx/shell.c
+++ b/dlls/wshom.ocx/shell.c
@@ -1852,10 +1852,11 @@ static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VAR
         UINT lenFind = lstrlenW(bsFind);
         for (; hWnd && !hWndTarget && lenFind; hWnd = GetWindow(hWnd, GW_HWNDNEXT))
         {
+            BSTR bsBuf;
             UINT cch = GetWindowTextLengthW(hWnd);
             if (!cch)
                 continue;
-            BSTR bsBuf = SysAllocStringLen(NULL, ++cch);
+            bsBuf = SysAllocStringLen(NULL, ++cch);
             if (!bsBuf)
             {
                 hr = E_OUTOFMEMORY;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11157

[PATCH v4 3/4] Update file shell.c

[Anders Kjersem]

From: Anders Kjersem <[e-mail]>

---
 dlls/wshom.ocx/shell.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c
index c9192bf5d60..8b435163d3c 100644
--- a/dlls/wshom.ocx/shell.c
+++ b/dlls/wshom.ocx/shell.c
@@ -1838,11 +1838,11 @@ static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VAR
             if (IsWindowEnabled(hWnd))
             {
                 hWndTarget = hWnd;
-                break; // Enabled and visible, we are done
+                break; /* Enabled and visible, we are done */
             }
             else if (!hWndTarget)
             {
-                hWndTarget = hWnd; // We will accept a disabled window if we have to
+                hWndTarget = hWnd; /* We will accept a disabled window if we have to */
             }
         }
     }
@@ -1883,7 +1883,7 @@ static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VAR
         if (Wait && !is_optional_argument(Wait) &&
             SUCCEEDED(VariantChangeType(&vTmp, Wait, 0, VT_BOOL)) && V_BOOL(&vTmp))
         {
-            UINT wait = 2000, interval = 100;
+            UINT wait = 2000, interval = 100; /* Arbitrary wait time */
             for (; wait && GetForegroundWindow() != hWndTarget; wait -= interval)
                 Sleep(interval);
         }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11157

[PATCH v4 4/4] Detach input thread before waiting

[Anders]

From: Anders <[e-mail]>

---
 dlls/wshom.ocx/shell.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c
index 8b435163d3c..879d7d39e1c 100644
--- a/dlls/wshom.ocx/shell.c
+++ b/dlls/wshom.ocx/shell.c
@@ -1879,6 +1879,10 @@ static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VAR
         DWORD othertid = GetWindowThreadProcessId(hWnd, &pid);
         BOOL attached = AttachThreadInput(mytid, othertid, TRUE);
         SetForegroundWindow(hWndTarget);
+        SetLastError(0);
+        hr = (SetFocus(hWndTarget) || !GetLastError()) ? S_OK : S_FALSE;
+        if (attached)
+            AttachThreadInput(mytid, othertid, FALSE);
         V_VT(&vTmp) = VT_EMPTY;
         if (Wait && !is_optional_argument(Wait) &&
             SUCCEEDED(VariantChangeType(&vTmp, Wait, 0, VT_BOOL)) && V_BOOL(&vTmp))
@@ -1887,10 +1891,6 @@ static HRESULT WINAPI WshShell3_AppActivate(IWshShell3 *iface, VARIANT *App, VAR
             for (; wait && GetForegroundWindow() != hWndTarget; wait -= interval)
                 Sleep(interval);
         }
-        SetLastError(0);
-        hr = (SetFocus(hWndTarget) || !GetLastError()) ? S_OK : S_FALSE;
-        if (attached)
-            AttachThreadInput(mytid, othertid, FALSE);
     }
 
     if (out_Success)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11157