ole32: Respond to CLSID in pointer moniker interface query.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Respond to CLSID in pointer moniker interface query.
a7ca3518 · Nikolay Sivov · Alexandre Julliard · 8f34b9e8 · a7ca3518 · a7ca3518
Commit a7ca3518 authored Jan 31, 2020 by Nikolay Sivov Committed by Alexandre Julliard Feb 02, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

pointermoniker.c dlls/ole32/pointermoniker.c +2 -1

moniker.c dlls/ole32/tests/moniker.c +2 -7

No files found.
--- a/dlls/ole32/pointermoniker.c
+++ b/dlls/ole32/pointermoniker.c
@@ -74,7 +74,8 @@ static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker *iface, REFIID 
    if (IsEqualIID(&IID_IUnknown, riid) ||
        IsEqualIID(&IID_IPersist, riid) ||
        IsEqualIID(&IID_IPersistStream, riid) ||
-        IsEqualIID(&IID_IMoniker, riid))
+        IsEqualIID(&IID_IMoniker, riid) ||
+        IsEqualGUID(&CLSID_PointerMoniker, riid))
    {
        *ppvObject = iface;
    }

--- a/dlls/ole32/tests/moniker.c
+++ b/dlls/ole32/tests/moniker.c
@@ -2886,13 +2886,8 @@ static void test_pointer_moniker(void)
    ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr);
    hr = IMoniker_QueryInterface(moniker, &CLSID_PointerMoniker, (void **)&unknown);
-todo_wine
+    ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n");
-    ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
+    IUnknown_Release(unknown);
-    if (SUCCEEDED(hr))
-    {
-        ok(unknown == (IUnknown *)moniker, "Unexpected interface.\n");
-        IUnknown_Release(unknown);
-    }
    hr = IMoniker_QueryInterface(moniker, &IID_IMarshal, (void **)&marshal);
    ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);