commit d17d78e44b8d7c39f89cddfb7b71613e79bffee3
author David Hedberg <david.hedberg@gmail.com> Mon Aug 23 12:55:18 2010 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Aug 23 15:41:53 2010 +0200
tree 132c3190684b75945d52ffc1ee86e920b6bfc53e
parent 9c0260f2cb3e8a73e83b3a2ebdf7decfa62a6a14

shell32: Add some basic support for hosting a shellview in the ExplorerBrowser.

dlls/shell32/ebrowser.c

diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c
index 20b5363..2f77063 100644
--- a/dlls/shell32/ebrowser.c
+++ b/dlls/shell32/ebrowser.c
@@ -42,11 +42,35 @@
     BOOL destroyed;
 
     HWND hwnd_main;
+    HWND hwnd_sv;
 
     EXPLORER_BROWSER_OPTIONS eb_options;
+
+    IShellView *psv;
+    RECT sv_rc;
 } ExplorerBrowserImpl;
 
 /**************************************************************************
+ * Helper functions
+ */
+static void update_layout(ExplorerBrowserImpl *This)
+{
+    RECT rc;
+    TRACE("%p\n", This);
+
+    GetClientRect(This->hwnd_main, &rc);
+    CopyRect(&This->sv_rc, &rc);
+}
+
+static void size_panes(ExplorerBrowserImpl *This)
+{
+    MoveWindow(This->hwnd_sv,
+               This->sv_rc.left, This->sv_rc.top,
+               This->sv_rc.right - This->sv_rc.left, This->sv_rc.bottom - This->sv_rc.top,
+               TRUE);
+}
+
+/**************************************************************************
  * Main window related functions.
  */
 static LRESULT main_on_wm_create(HWND hWnd, CREATESTRUCTW *crs)
@@ -60,11 +84,22 @@
     return TRUE;
 }
 
+static LRESULT main_on_wm_size(ExplorerBrowserImpl *This)
+{
+    update_layout(This);
+    size_panes(This);
+
+    return TRUE;
+}
+
 static LRESULT CALLBACK main_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam)
 {
+    ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
+
     switch(uMessage)
     {
     case WM_CREATE:           return main_on_wm_create(hWnd, (CREATESTRUCTW*)lParam);
+    case WM_SIZE:             return main_on_wm_size(This);
     default:                  return DefWindowProcW(hWnd, uMessage, wParam, lParam);
     }
 
@@ -183,6 +218,14 @@
     ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface;
     TRACE("%p\n", This);
 
+    if(This->psv)
+    {
+        IShellView_DestroyViewWindow(This->psv);
+        IShellView_Release(This->psv);
+        This->psv = NULL;
+        This->hwnd_sv = NULL;
+    }
+
     DestroyWindow(This->hwnd_main);
     This->destroyed = TRUE;
 
@@ -325,10 +368,12 @@
                                                         REFIID riid, void **ppv)
 {
     ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)iface;
-    FIXME("stub, %p (%s, %p)\n", This, shdebugstr_guid(riid), ppv);
+    TRACE("%p (%s, %p)\n", This, shdebugstr_guid(riid), ppv);
 
-    *ppv = NULL;
-    return E_FAIL;
+    if(!This->psv)
+        return E_FAIL;
+
+    return IShellView_QueryInterface(This->psv, riid, ppv);
 }
 
 static const IExplorerBrowserVtbl vt_IExplorerBrowser =
@@ -510,9 +555,15 @@
                                                            IShellView **ppshv)
 {
     ExplorerBrowserImpl *This = impl_from_IShellBrowser(iface);
-    FIXME("stub, %p (%p)\n", This, ppshv);
+    TRACE("%p (%p)\n", This, ppshv);
 
-    return E_NOTIMPL;
+    if(!This->psv)
+        return E_FAIL;
+
+    *ppshv = This->psv;
+    IShellView_AddRef(This->psv);
+
+    return S_OK;
 }
 
 static HRESULT WINAPI IShellBrowser_fnOnViewWindowActive(IShellBrowser *iface,