Connor McAdams : uiautomationcore: Implement UiaRemoveEvent.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 973d00db1b645af37a139a151d443c65fbefd57b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/973d00db1b645af37a139a151d443c6...

Author: Connor McAdams <cmcadams(a)codeweavers.com>
Date:   Mon May 15 13:56:05 2023 -0400

uiautomationcore: Implement UiaRemoveEvent.

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>

---

 dlls/uiautomationcore/tests/uiautomation.c | 37 +++++++++++++++++++-----------
 dlls/uiautomationcore/uia_client.c         |  9 --------
 dlls/uiautomationcore/uia_event.c          | 24 +++++++++++++++++++
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c
index 475955e251e..596104484ac 100644
--- a/dlls/uiautomationcore/tests/uiautomation.c
+++ b/dlls/uiautomationcore/tests/uiautomation.c
@@ -13807,7 +13807,7 @@ static DWORD WINAPI uia_add_event_test_thread(LPVOID param)
     CoInitializeEx(NULL, COINIT_MULTITHREADED);
 
     hr = UiaRemoveEvent(data->event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref);
     ok(Provider2.ref == 1, "Unexpected refcnt %ld\n", Provider2.ref);
     todo_wine ok(Provider2.last_call_tid == data->exp_thread_id ||
@@ -13855,7 +13855,18 @@ static void test_UiaAddEvent_args(HUIANODE node)
     ok(!!event, "event == NULL\n");
 
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+}
+
+static void test_UiaRemoveEvent_args(HUIANODE node)
+{
+    HRESULT hr;
+
+    hr = UiaRemoveEvent(NULL);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
+
+    hr = UiaRemoveEvent((HUIAEVENT)node);
+    ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
 }
 
 static void test_UiaAddEvent(void)
@@ -13896,6 +13907,7 @@ static void test_UiaAddEvent(void)
 
     /* Test valid function input arguments. */
     test_UiaAddEvent_args(node);
+    test_UiaRemoveEvent_args(node);
 
     /*
      * Raise event without any registered event handlers.
@@ -13933,10 +13945,9 @@ static void test_UiaAddEvent(void)
         ok_method_sequence(event_seq3, "event_seq3");
 
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref);
-    if (SUCCEEDED(hr))
-        ok_method_sequence(event_seq4, "event_seq4");
+    ok_method_sequence(event_seq4, "event_seq4");
 
     /*
      * Register an event on the same node again, except this time we have a
@@ -13985,10 +13996,9 @@ static void test_UiaAddEvent(void)
 
     method_sequences_enabled = TRUE;
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref);
-    if (SUCCEEDED(hr))
-        ok_method_sequence(event_seq4, "event_seq4");
+    ok_method_sequence(event_seq4, "event_seq4");
 
     /* Create an event with TreeScope_Children. */
     hr = UiaAddEvent(node, UIA_AutomationFocusChangedEventId, uia_event_callback, TreeScope_Children, NULL, 0, &cache_req,
@@ -14034,7 +14044,7 @@ static void test_UiaAddEvent(void)
     set_provider_prop_override(&Provider_child, NULL, 0);
 
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref);
 
     /* Create an event with TreeScope_Descendants. */
@@ -14054,7 +14064,7 @@ static void test_UiaAddEvent(void)
     todo_wine CHECK_CALLED(uia_event_callback);
 
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref);
 
     CoUninitialize();
@@ -14122,12 +14132,11 @@ static void test_UiaAddEvent(void)
 
     method_sequences_enabled = TRUE;
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref);
     ok(Provider_child.ref == 1, "Unexpected refcnt %ld\n", Provider_child.ref);
     ok(Provider_child2.ref == 1, "Unexpected refcnt %ld\n", Provider_child2.ref);
-    if (SUCCEEDED(hr))
-        ok_method_sequence(event_seq6, "event_seq6");
+    ok_method_sequence(event_seq6, "event_seq6");
 
     UiaNodeRelease(node);
     ok(Provider.ref == 1, "Unexpected refcnt %ld\n", Provider.ref);
@@ -14204,7 +14213,7 @@ static void test_UiaAddEvent(void)
     todo_wine CHECK_CALLED(uia_event_callback);
 
     hr = UiaRemoveEvent(event);
-    todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
+    ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);
     UiaNodeRelease(node);
 
     method_sequences_enabled = TRUE;
diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c
index c8b369fa65b..ced728428a3 100644
--- a/dlls/uiautomationcore/uia_client.c
+++ b/dlls/uiautomationcore/uia_client.c
@@ -3513,15 +3513,6 @@ exit:
     return hr;
 }
 
-/***********************************************************************
- *          UiaRemoveEvent (uiautomationcore.@)
- */
-HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent)
-{
-    FIXME("(%p): stub\n", huiaevent);
-    return E_NOTIMPL;
-}
-
 /***********************************************************************
  *          UiaEventAddWindow (uiautomationcore.@)
  */
diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c
index e1d2585c056..faeb689a3b6 100644
--- a/dlls/uiautomationcore/uia_event.c
+++ b/dlls/uiautomationcore/uia_event.c
@@ -84,6 +84,14 @@ static const IWineUiaEventVtbl uia_event_vtbl = {
     uia_event_Release,
 };
 
+static struct uia_event *unsafe_impl_from_IWineUiaEvent(IWineUiaEvent *iface)
+{
+    if (!iface || (iface->lpVtbl != &uia_event_vtbl))
+        return NULL;
+
+    return CONTAINING_RECORD(iface, struct uia_event, IWineUiaEvent_iface);
+}
+
 static HRESULT create_uia_event(struct uia_event **out_event, int event_id, int scope, UiaEventCallback *cback,
         SAFEARRAY *runtime_id)
 {
@@ -146,3 +154,19 @@ HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback
 
     return S_OK;
 }
+
+/***********************************************************************
+ *          UiaRemoveEvent (uiautomationcore.@)
+ */
+HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent)
+{
+    struct uia_event *event = unsafe_impl_from_IWineUiaEvent((IWineUiaEvent *)huiaevent);
+
+    TRACE("(%p)\n", event);
+
+    if (!event)
+        return E_INVALIDARG;
+
+    IWineUiaEvent_Release(&event->IWineUiaEvent_iface);
+    return S_OK;
+}