Nikolay Sivov : shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: f2561f395fda36e27794ac3e6ceb402757636d0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f2561f395fda36e27794ac3e6c...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Mon Apr 24 13:21:42 2017 +0300

shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 5badc91a0fe9933f0dc60ca8a74b68cf66559b0d)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/shell32/ebrowser.c       | 3 ++-
 dlls/shell32/tests/ebrowser.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c
index bbccf88..07046502 100644
--- 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;
     }
diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c
index c04a2b4..7db5842 100644
--- 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);