commit 24c13b9f8d4eb44825ec9a5a3381b959e4da8252
author Jacek Caban <jacek@codeweavers.com> Wed Feb 28 03:47:13 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 28 14:03:44 2007 +0100
tree 587cbf789308dd72bdadd3c5672e9320d58e34ac
parent 5a01e1020d9fcd0e9cfaf80bb5d1faf608658d0e

hhctrl.ocx: Merge WBInfo to HHInfo.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index d1c60a9..8196e4e 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -43,16 +43,6 @@
 
 static const WCHAR szEmpty[] = {0};
 
-typedef struct tagHHInfo
-{
-    HH_WINTYPEW WinType;
-    CHMInfo *pCHMInfo;
-    WBInfo *pWBInfo;
-    HWND hwndTabCtrl;
-    HWND hwndSizeBar;
-    HFONT hFont;
-} HHInfo;
-
 /* Loads a string from the resource file */
 static LPWSTR HH_LoadString(DWORD dwID)
 {
@@ -68,7 +58,7 @@
     return string;
 }
 
-static BOOL NavigateToChm(WBInfo *pWBInfo, LPCWSTR file, LPCWSTR index)
+static BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index)
 {
     WCHAR buf[INTERNET_MAX_URL_LENGTH];
     WCHAR full_path[MAX_PATH];
@@ -77,7 +67,7 @@
     static const WCHAR url_format[] =
         {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0};
 
-    if (!pWBInfo->pWebBrowser2)
+    if (!info->web_browser)
         return FALSE;
 
     if(!GetFullPathNameW(file, sizeof(full_path), full_path, NULL)) {
@@ -90,7 +80,7 @@
     V_VT(&url) = VT_BSTR;
     V_BSTR(&url) = SysAllocString(buf);
 
-    IWebBrowser2_Navigate2(pWBInfo->pWebBrowser2, &url, 0, 0, 0, 0);
+    IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0);
     VariantClear(&url);
 
     return TRUE;
@@ -316,24 +306,24 @@
 
 static void TB_OnClick(HWND hWnd, DWORD dwID)
 {
-    HHInfo *pHHInfo = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
+    HHInfo *info = (HHInfo *)GetWindowLongPtrW(hWnd, GWLP_USERDATA);
 
     switch (dwID)
     {
         case IDTB_STOP:
-            WB_DoPageAction(pHHInfo->pWBInfo, WB_STOP);
+            DoPageAction(info, WB_STOP);
             break;
         case IDTB_REFRESH:
-            WB_DoPageAction(pHHInfo->pWBInfo, WB_REFRESH);
+            DoPageAction(info, WB_REFRESH);
             break;
         case IDTB_BACK:
-            WB_DoPageAction(pHHInfo->pWBInfo, WB_GOBACK);
+            DoPageAction(info, WB_GOBACK);
             break;
         case IDTB_HOME:
-            NavigateToChm(pHHInfo->pWBInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszHome);
+            NavigateToChm(info, info->pCHMInfo->szFile, info->WinType.pszHome);
             break;
         case IDTB_FORWARD:
-            WB_DoPageAction(pHHInfo->pWBInfo, WB_GOFORWARD);
+            DoPageAction(info, WB_GOFORWARD);
             break;
         case IDTB_EXPAND:
         case IDTB_CONTRACT:
@@ -580,7 +570,7 @@
     if (!hWnd)
         return FALSE;
 
-    if (!WB_EmbedBrowser(pHHInfo->pWBInfo, hWnd))
+    if (!InitWebBrowser(pHHInfo, hWnd))
         return FALSE;
 
     /* store the pointer to the HH info struct */
@@ -623,7 +613,7 @@
 
     /* Resize browser window taking the frame size into account */
     dwSize = GetSystemMetrics(SM_CXFRAME);
-    WB_ResizeBrowser(pHHInfo->pWBInfo, rc.right - dwSize, rc.bottom - dwSize);
+    ResizeWebBrowser(pHHInfo, rc.right - dwSize, rc.bottom - dwSize);
 }
 
 static LRESULT CALLBACK Help_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -795,11 +785,7 @@
     if (info->pCHMInfo)
         CloseCHM(info->pCHMInfo);
 
-    if (info->pWBInfo)
-    {
-        WB_UnEmbedBrowser(info->pWBInfo);
-        hhctrl_free(info->pWBInfo);
-    }
+    ReleaseWebBrowser(info);
 }
 
 static HHInfo *HH_OpenHH(LPWSTR filename)
@@ -812,8 +798,6 @@
         return NULL;
     }
 
-    pHHInfo->pWBInfo = hhctrl_alloc(sizeof(WBInfo));
-
     if (!CHM_LoadWinTypeFromCHM(pHHInfo->pCHMInfo, &pHHInfo->WinType)) {
         HH_Close(pHHInfo);
         return NULL;
@@ -838,7 +822,7 @@
         return -1;
     }
 
-    NavigateToChm(pHHInfo->pWBInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszFile);
+    NavigateToChm(pHHInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->WinType.pszFile);
     
     while (GetMessageW(&msg, 0, 0, 0))
     {