[PATCH 0/4] MR1599: uiautomationcore: Add UI Automation event stubs.

[Connor McAdams (＠cmcadams)]

Stub functions, no tests/implementation.

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

[PATCH 1/4] uiautomationcore: Add UiaRemoveEvent stub.

[Connor McAdams]

From: Connor McAdams <cmcadams(a)codeweavers.com>

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
 dlls/uiautomationcore/uia_client.c          | 9 +++++++++
 dlls/uiautomationcore/uiautomationcore.spec | 2 +-
 include/uiautomationcoreapi.h               | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c
index 5e2026536d5..badbf8a1618 100644
--- a/dlls/uiautomationcore/uia_client.c
+++ b/dlls/uiautomationcore/uia_client.c
@@ -3013,3 +3013,12 @@ exit:
 
     return hr;
 }
+
+/***********************************************************************
+ *          UiaRemoveEvent (uiautomationcore.@)
+ */
+HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent)
+{
+    FIXME("(%p): stub\n", huiaevent);
+    return E_NOTIMPL;
+}
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
index 0ad0cb6f437..5c33e1e926a 100644
--- a/dlls/uiautomationcore/uiautomationcore.spec
+++ b/dlls/uiautomationcore/uiautomationcore.spec
@@ -92,7 +92,7 @@
 @ stub UiaRaiseStructureChangedEvent
 #@ stub UiaRaiseTextEditTextChangedEvent
 @ stdcall UiaRegisterProviderCallback(ptr)
-@ stub UiaRemoveEvent
+@ stdcall UiaRemoveEvent(ptr)
 @ stdcall UiaReturnRawElementProvider(long long long ptr)
 @ stub UiaSetFocus
 @ stub UiaTextRangeRelease
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index efb5eb35d06..cc38354f713 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -418,6 +418,7 @@ HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct
         struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, BSTR *tree_struct);
 HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req,
         SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs);
+HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent);
 
 #ifdef __cplusplus
 }
-- 
GitLab


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

[PATCH 2/4] uiautomationcore: Add UiaEventAddWindow stub.

[Connor McAdams]

From: Connor McAdams <cmcadams(a)codeweavers.com>

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
 dlls/uiautomationcore/uia_client.c          | 9 +++++++++
 dlls/uiautomationcore/uiautomationcore.spec | 2 +-
 include/uiautomationcoreapi.h               | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c
index badbf8a1618..cc77d8ab8a4 100644
--- a/dlls/uiautomationcore/uia_client.c
+++ b/dlls/uiautomationcore/uia_client.c
@@ -3022,3 +3022,12 @@ HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent)
     FIXME("(%p): stub\n", huiaevent);
     return E_NOTIMPL;
 }
+
+/***********************************************************************
+ *          UiaEventAddWindow (uiautomationcore.@)
+ */
+HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd)
+{
+    FIXME("(%p, %p): stub\n", huiaevent, hwnd);
+    return E_NOTIMPL;
+}
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
index 5c33e1e926a..1df5dfda851 100644
--- a/dlls/uiautomationcore/uiautomationcore.spec
+++ b/dlls/uiautomationcore/uiautomationcore.spec
@@ -57,7 +57,7 @@
 @ stdcall UiaClientsAreListening()
 #@ stub UiaDisconnectAllProviders
 @ stdcall UiaDisconnectProvider(ptr)
-@ stub UiaEventAddWindow
+@ stdcall UiaEventAddWindow(ptr long)
 @ stub UiaEventRemoveWindow
 @ stdcall UiaFind(ptr ptr ptr ptr ptr ptr)
 @ stub UiaGetErrorDescription
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index cc38354f713..f5adb29393b 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -419,6 +419,7 @@ HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct
 HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req,
         SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs);
 HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent);
+HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd);
 
 #ifdef __cplusplus
 }
-- 
GitLab


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

[PATCH 3/4] uiautomationcore: Add UiaEventRemoveWindow stub.

[Connor McAdams]

From: Connor McAdams <cmcadams(a)codeweavers.com>

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
 dlls/uiautomationcore/uia_client.c          | 9 +++++++++
 dlls/uiautomationcore/uiautomationcore.spec | 2 +-
 include/uiautomationcoreapi.h               | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c
index cc77d8ab8a4..f7b3536802f 100644
--- a/dlls/uiautomationcore/uia_client.c
+++ b/dlls/uiautomationcore/uia_client.c
@@ -3031,3 +3031,12 @@ HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd)
     FIXME("(%p, %p): stub\n", huiaevent, hwnd);
     return E_NOTIMPL;
 }
+
+/***********************************************************************
+ *          UiaEventRemoveWindow (uiautomationcore.@)
+ */
+HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd)
+{
+    FIXME("(%p, %p): stub\n", huiaevent, hwnd);
+    return E_NOTIMPL;
+}
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
index 1df5dfda851..63df49980fc 100644
--- a/dlls/uiautomationcore/uiautomationcore.spec
+++ b/dlls/uiautomationcore/uiautomationcore.spec
@@ -58,7 +58,7 @@
 #@ stub UiaDisconnectAllProviders
 @ stdcall UiaDisconnectProvider(ptr)
 @ stdcall UiaEventAddWindow(ptr long)
-@ stub UiaEventRemoveWindow
+@ stdcall UiaEventRemoveWindow(ptr long)
 @ stdcall UiaFind(ptr ptr ptr ptr ptr ptr)
 @ stub UiaGetErrorDescription
 @ stub UiaGetPatternProvider
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index f5adb29393b..9902a6d68e4 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -420,6 +420,7 @@ HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, str
         SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs);
 HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent);
 HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd);
+HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd);
 
 #ifdef __cplusplus
 }
-- 
GitLab


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

[PATCH 4/4] uiautomationcore: Add UiaAddEvent stub.

[Connor McAdams]

From: Connor McAdams <cmcadams(a)codeweavers.com>

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>
---
 dlls/uiautomationcore/uia_client.c          | 11 +++++++++++
 dlls/uiautomationcore/uiautomationcore.spec |  2 +-
 include/uiautomationcoreapi.h               |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c
index f7b3536802f..14f9977a4d6 100644
--- a/dlls/uiautomationcore/uia_client.c
+++ b/dlls/uiautomationcore/uia_client.c
@@ -3014,6 +3014,17 @@ exit:
     return hr;
 }
 
+/***********************************************************************
+ *          UiaAddEvent (uiautomationcore.@)
+ */
+HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope,
+        PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent)
+{
+    FIXME("(%p, %d, %p, %#x, %p, %d, %p, %p)\n", huianode, event_id, callback, scope, prop_ids, prop_ids_count,
+            cache_req, huiaevent);
+    return E_NOTIMPL;
+}
+
 /***********************************************************************
  *          UiaRemoveEvent (uiautomationcore.@)
  */
diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec
index 63df49980fc..11ca7be7f97 100644
--- a/dlls/uiautomationcore/uiautomationcore.spec
+++ b/dlls/uiautomationcore/uiautomationcore.spec
@@ -53,7 +53,7 @@
 @ stub TransformPattern_Move
 @ stub TransformPattern_Resize
 @ stub TransformPattern_Rotate
-@ stub UiaAddEvent
+@ stdcall UiaAddEvent(ptr long ptr long ptr long ptr ptr)
 @ stdcall UiaClientsAreListening()
 #@ stub UiaDisconnectAllProviders
 @ stdcall UiaDisconnectProvider(ptr)
diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h
index 9902a6d68e4..ef94c72d162 100644
--- a/include/uiautomationcoreapi.h
+++ b/include/uiautomationcoreapi.h
@@ -393,6 +393,7 @@ struct UiaFindParams {
 };
 
 typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType);
+typedef void WINAPI UiaEventCallback(struct UiaEventArgs *pArgs,SAFEARRAY *pRequestedData,BSTR pTreeStructure);
 
 HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value);
 HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value);
@@ -418,6 +419,8 @@ HRESULT WINAPI UiaNavigate(HUIANODE huianode, enum NavigateDirection dir, struct
         struct UiaCacheRequest *cache_req, SAFEARRAY **out_req, BSTR *tree_struct);
 HRESULT WINAPI UiaFind(HUIANODE huianode, struct UiaFindParams *find_params, struct UiaCacheRequest *cache_req, SAFEARRAY **out_req,
         SAFEARRAY **out_offsets, SAFEARRAY **out_tree_structs);
+HRESULT WINAPI UiaAddEvent(HUIANODE huianode, EVENTID event_id, UiaEventCallback *callback, enum TreeScope scope,
+        PROPERTYID *prop_ids, int prop_ids_count, struct UiaCacheRequest *cache_req, HUIAEVENT *huiaevent);
 HRESULT WINAPI UiaRemoveEvent(HUIAEVENT huiaevent);
 HRESULT WINAPI UiaEventAddWindow(HUIAEVENT huiaevent, HWND hwnd);
 HRESULT WINAPI UiaEventRemoveWindow(HUIAEVENT huiaevent, HWND hwnd);
-- 
GitLab

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