shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.

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

shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.
5badc91a · Nikolay Sivov · Alexandre Julliard · 6eeb389d · 5badc91a · 5badc91a
Commit 5badc91a authored Apr 24, 2017 by Nikolay Sivov Committed by Alexandre Julliard Apr 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ebrowser.c dlls/shell32/ebrowser.c +2 -1

ebrowser.c dlls/shell32/tests/ebrowser.c +1 -1

No files found.
--- a/dlls/shell32/ebrowser.c
+++ b/dlls/shell32/ebrowser.c
@@ -782,7 +782,8 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface,
    {
        *ppvObject = &This->IExplorerBrowser_iface;
    }
-    else if(IsEqualIID(riid, &IID_IShellBrowser))
+    else if(IsEqualIID(riid, &IID_IShellBrowser) ||
+            IsEqualIID(riid, &IID_IOleWindow))
    {
        *ppvObject = &This->IShellBrowser_iface;
    }

--- a/dlls/shell32/tests/ebrowser.c
+++ b/dlls/shell32/tests/ebrowser.c
@@ -575,7 +575,7 @@ static void test_QueryInterface(void)
    test_qinterface(IID_IUnknown, S_OK);
    test_qinterface(IID_IExplorerBrowser, S_OK);
    test_qinterface(IID_IShellBrowser, S_OK);
-    todo_wine test_qinterface(IID_IOleWindow, S_OK);
+    test_qinterface(IID_IOleWindow, S_OK);
    test_qinterface(IID_ICommDlgBrowser, S_OK);
    test_qinterface(IID_ICommDlgBrowser2, S_OK);
    test_qinterface(IID_ICommDlgBrowser3, S_OK);