[PATCH 0/2] MR2877: uiautomationcore: A bug fix, and some header definitions.

[PATCH 1/2] include: Define the remaining missing provider interfaces.

[Connor McAdams]

From: Connor McAdams

Signed-off-by: Connor McAdams 
---
 include/uiautomationcore.idl | 133 +++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)

diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl
index 319bc7be475..4f8bc7d526d 100644
--- a/include/uiautomationcore.idl
+++ b/include/uiautomationcore.idl
@@ -234,6 +234,31 @@ library UIA
         [propget] HRESULT HostRawElementProvider([out, retval] IRawElementProviderSimple **pRetVal);
     }

+    [
+        object,
+        uuid(a0a839a9-8da1-4a82-806a-8e0d44e79f56),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IRawElementProviderSimple2 : IRawElementProviderSimple
+    {
+        HRESULT ShowContextMenu();
+    }
+
+    [
+        object,
+        uuid(fcf5d820-d7ec-4613-bdf6-42a84ce7daaf),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IRawElementProviderSimple3 : IRawElementProviderSimple2
+    {
+        HRESULT GetMetadataValue(
+                [in] int targetId,
+                [in] METADATAID metadataId,
+                [out, retval] VARIANT *returnVal);
+    }
+
     [
         object,
         uuid(f8b80ada-2c44-48d0-89be-5ff23c9cd875),
@@ -316,6 +341,114 @@ library UIA
                 [out, retval] IRawElementProviderSimple **pRetVal);
     }

+    [
+        object,
+        uuid(a407b27b-0f6d-4427-9292-473c7bf93258),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IRawElementProviderAdviseEvents : IUnknown
+    {
+        HRESULT AdviseEventAdded(
+                [in] EVENTID eventId,
+                [in] SAFEARRAY(PROPERTYID) propertyIDs);
+        HRESULT AdviseEventRemoved(
+                [in] EVENTID eventId,
+                [in] SAFEARRAY(PROPERTYID) propertyIDs);
+    }
+
+    [
+        object,
+        uuid(4fd82b78-a43e-46ac-9803-0a6969c7c183),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IProxyProviderWinEventSink : IUnknown
+    {
+        HRESULT AddAutomationPropertyChangedEvent(
+                [in] IRawElementProviderSimple *pProvider,
+                [in] PROPERTYID id,
+                [in] VARIANT newValue);
+
+        HRESULT AddAutomationEvent(
+                [in] IRawElementProviderSimple *pProvider,
+                [in] EVENTID id);
+
+        HRESULT AddStructureChangedEvent(
+                [in] IRawElementProviderSimple *pProvider,
+                [in] enum StructureChangeType structureChangeType,
+                [in] SAFEARRAY(int) runtimeId);
+    }
+
+    [
+        object,
+        uuid(89592ad4-f4e0-43d5-a3b6-bad7e111b435),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IProxyProviderWinEventHandler : IUnknown
+    {
+        HRESULT RespondToWinEvent(
+                [in] DWORD idWinEvent,
+                [in] HWND hwnd,
+                [in] LONG idObject,
+                [in] LONG idChild,
+                [in] IProxyProviderWinEventSink *pSink);
+    }
+
+    [
+        object,
+        uuid(0a2a93cc-bfad-42ac-9b2e-0991fb0d3ea0),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IRawElementProviderWindowlessSite : IUnknown
+    {
+        HRESULT GetAdjacentFragment(
+                [in] enum NavigateDirection direction,
+                [out, retval] IRawElementProviderFragment **ppParent);
+
+        HRESULT GetRuntimeIdPrefix([out, retval] SAFEARRAY(int) *pRetVal);
+    }
+
+    [
+        object,
+        uuid(33ac331b-943e-4020-b295-db37784974a3),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IAccessibleHostingElementProviders : IUnknown
+    {
+        /*
+         * FIXME: Current versions of Windows SDK use
+         * SAFEARRAY(IRawElementProviderSimple *) instead of
+         * SAFEARRAY(VARIANT). The new type is currently unsupported
+         * in widl, we should switch to it when it is.
+         */
+        HRESULT GetEmbeddedFragmentRoots([out,retval] SAFEARRAY(VARIANT) *pRetVal);
+
+        HRESULT GetObjectIdForProvider (
+                [in] IRawElementProviderSimple *pProvider,
+                [out] long *pidObject);
+    }
+
+    [
+        object,
+        uuid(24be0b07-d37d-487a-98cf-a13ed465e9b3),
+        pointer_default(unique),
+        oleautomation
+    ]
+    interface IRawElementProviderHostingAccessibles : IUnknown
+    {
+        /*
+         * FIXME: Current versions of Windows SDK use
+         * SAFEARRAY(IAccessible *) instead of
+         * SAFEARRAY(VARIANT). The new type is currently unsupported
+         * in widl, we should switch to it when it is.
+         */
+        HRESULT GetEmbeddedAccessibles([out, retval] SAFEARRAY(VARIANT) *pRetVal);
+    }
+
     [
         object,
         uuid(e44c3566-915d-4070-99c6-047bff5a08f5),

[PATCH 2/2] uiautomationcore: Don't leak parent node in conditional_navigate_uia_node.

[Connor McAdams]

From: Connor McAdams

Signed-off-by: Connor McAdams 
---
 dlls/uiautomationcore/uia_client.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c
index b62bb00b458..a2f464ae4df 100644
--- a/dlls/uiautomationcore/uia_client.c
+++ b/dlls/uiautomationcore/uia_client.c
@@ -972,7 +972,10 @@ static HRESULT conditional_navigate_uia_node(struct uia_node *node, int nav_dir,

hr = uia_condition_check(parent, cond);
             if (FAILED(hr))
+            {
+                UiaNodeRelease(parent);
                 break;
+            }

if (uia_condition_matched(hr))
             {

[PATCH 0/2] MR2877: uiautomationcore: A bug fix, and some header definitions. - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.