[PATCH v2 8/8] comctl32: Implement IOleWindow for SysLink.

[Esme Povirk]

From: Esme Povirk

---
 dlls/comctl32/syslink.c       | 56 +++++++++++++++++++++++++++++++++++
 dlls/comctl32/tests/syslink.c |  2 --
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 657ce6d61bf..d0bfaf164fc 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -79,6 +79,7 @@ typedef struct SYSLINK_INFO SYSLINK_INFO;
 typedef struct
 {
     IAccessible IAccessible_iface;
+    IOleWindow IOleWindow_iface;
     struct SYSLINK_INFO *infoPtr;
     LONG refcount;
 } SYSLINK_ACC;
@@ -113,6 +114,11 @@ static inline SYSLINK_ACC *impl_from_IAccessible(IAccessible *iface)
     return CONTAINING_RECORD(iface, SYSLINK_ACC, IAccessible_iface);
 }

+static inline SYSLINK_ACC *impl_from_IOleWindow(IOleWindow *iface)
+{
+    return CONTAINING_RECORD(iface, SYSLINK_ACC, IOleWindow_iface);
+}
+
 static HRESULT WINAPI Accessible_QueryInterface(IAccessible *iface, REFIID iid, void **ppv)
 {
     SYSLINK_ACC *This = impl_from_IAccessible(iface);
@@ -125,6 +131,10 @@ static HRESULT WINAPI Accessible_QueryInterface(IAccessible *iface, REFIID iid,
     {
         *ppv = &This->IAccessible_iface;
     }
+    else if (IsEqualIID(&IID_IOleWindow, iid))
+    {
+        *ppv = &This->IOleWindow_iface;
+    }
     else
     {
         *ppv = NULL;
@@ -568,6 +578,51 @@ static const IAccessibleVtbl Accessible_Vtbl = {
     Accessible_put_accValue
 };

+static HRESULT WINAPI Accessible_Window_QueryInterface(IOleWindow *iface, REFIID iid, void **ppv)
+{
+    SYSLINK_ACC *This = impl_from_IOleWindow(iface);
+    return IAccessible_QueryInterface(&This->IAccessible_iface, iid, ppv);
+}
+
+static ULONG WINAPI Accessible_Window_AddRef(IOleWindow *iface)
+{
+    SYSLINK_ACC *This = impl_from_IOleWindow(iface);
+    return IAccessible_AddRef(&This->IAccessible_iface);
+}
+
+static ULONG WINAPI Accessible_Window_Release(IOleWindow *iface)
+{
+    SYSLINK_ACC *This = impl_from_IOleWindow(iface);
+    return IAccessible_Release(&This->IAccessible_iface);
+}
+
+static HRESULT WINAPI Accessible_GetWindow(IOleWindow *iface, HWND *hwnd)
+{
+    SYSLINK_ACC *This = impl_from_IOleWindow(iface);
+
+    TRACE("%p\n", This);
+
+    if (!This->infoPtr)
+        return E_FAIL;
+
+    *hwnd = This->infoPtr->Self;
+    return S_OK;
+}
+
+static HRESULT WINAPI Accessible_ContextSensitiveHelp(IOleWindow *This, BOOL fEnterMode)
+{
+    FIXME("%p\b", This);
+    return E_NOTIMPL;
+}
+
+static const IOleWindowVtbl Accessible_Window_Vtbl = {
+    Accessible_Window_QueryInterface,
+    Accessible_Window_AddRef,
+    Accessible_Window_Release,
+    Accessible_GetWindow,
+    Accessible_ContextSensitiveHelp
+};
+
 static void Accessible_Create(SYSLINK_INFO* infoPtr)
 {
     SYSLINK_ACC *This;
@@ -576,6 +631,7 @@ static void Accessible_Create(SYSLINK_INFO* infoPtr)
     if (!This) return;

This->IAccessible_iface.lpVtbl = &Accessible_Vtbl;
+    This->IOleWindow_iface.lpVtbl = &Accessible_Window_Vtbl;
     This->infoPtr = infoPtr;
     This->refcount = 1;
     infoPtr->AccessibleImpl = This;
diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c
index a6503d13506..c25263f6f97 100644
--- a/dlls/comctl32/tests/syslink.c
+++ b/dlls/comctl32/tests/syslink.c
@@ -430,10 +430,8 @@ static void test_msaa(void)
     hr = IAccessible_accLocation(acc, &left, &top, &width, &height, varChild);
     ok(hr == S_OK, "accLocation failed, hr=%lx\n", hr);

-todo_wine {
     hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void**)&ole_window);
     ok(hr == S_OK, "QueryInterface failed, hr=%lx\n", hr);
-}

if (SUCCEEDED(hr)) {
         hr = IOleWindow_GetWindow(ole_window, &ret_hwnd);