commit 3e507e3ca53ff4bb1479ee74d0e78af2392b19ab
author James Hawkins <truiken@gmail.com> Tue Sep 13 10:32:47 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 13 10:32:47 2005 +0000
tree 7e3c1cf96c079d8ffa67114dc1480cf5cafd7f6c
parent 7bb00b1c20cfb4e4bbc6372279d0e2eab48fde8e

- Add the WebBrowser implementation.
- Load the default Url in the HTML Pane.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index a96182a..f52134e 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -32,6 +32,7 @@
 
 #include "resource.h"
 #include "chm.h"
+#include "webbrowser.h"
 
 /* Window type defaults */
 
@@ -45,6 +46,7 @@
 {
     HH_WINTYPEW *pHHWinType;
     CHMInfo *pCHMInfo;
+    WBInfo *pWBInfo;
     HINSTANCE hInstance;
     LPWSTR szCmdLine;
     HWND hwndTabCtrl;
@@ -387,6 +389,9 @@
     if (!hWnd)
         return FALSE;
 
+    if (!WB_EmbedBrowser(pHHInfo->pWBInfo, hwndParent))
+        return FALSE;
+
     /* store the pointer to the HH info struct */
     SetWindowLongPtrW(hWnd, GWLP_USERDATA, (LONG_PTR)pHHInfo);
 
@@ -572,6 +577,7 @@
 
     pHHInfo->pHHWinType = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HH_WINTYPEW));
     pHHInfo->pCHMInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(CHMInfo));
+    pHHInfo->pWBInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(WBInfo));
     pHHInfo->hInstance = hInstance;
     pHHInfo->szCmdLine = szCmdLine;
 
@@ -607,6 +613,21 @@
         CHM_CloseCHM(pHHInfo->pCHMInfo);
         HeapFree(GetProcessHeap(), 0, pHHInfo->pCHMInfo);
     }
+
+    if (pHHInfo->pWBInfo)
+    {
+        WB_UnEmbedBrowser(pHHInfo->pWBInfo);
+        HeapFree(GetProcessHeap(), 0, pHHInfo->pWBInfo);
+    }
+}
+
+static void HH_OpenDefaultTopic(HHInfo *pHHInfo)
+{
+    WCHAR url[MAX_PATH];
+    LPCWSTR defTopic = pHHInfo->pHHWinType->pszFile;
+
+    CHM_CreateITSUrl(pHHInfo->pCHMInfo, defTopic, url);
+    WB_Navigate(pHHInfo->pWBInfo, url);
 }
 
 static BOOL HH_OpenCHM(HHInfo *pHHInfo)
@@ -636,6 +657,8 @@
         return -1;
     }
 
+    HH_OpenDefaultTopic(pHHInfo);
+    
     while (GetMessageW(&msg, 0, 0, 0))
     {
         TranslateMessage(&msg);