commit 719bfaf4b0dca36cb959189f765d87445d9d14e0
author Jacek Caban <jacek@codeweavers.com> Tue Feb 06 20:47:29 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Tue Feb 06 22:07:10 2007 +0100
tree 3c9d3dc6e9f4ff6f1db037c38d60e3081d44ed79
parent f9a7886121ca25694294295245fbd76aad2d42e5

hhctrl.ocx: Use mk as default protocol and code clean up.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index 426996d..15b023d 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -28,12 +30,18 @@
 #include "commctrl.h"
 #include "htmlhelp.h"
 #include "ole2.h"
+#include "exdisp.h"
+#include "wininet.h"
+
 #include "wine/unicode.h"
+#include "wine/debug.h"
 
 #include "resource.h"
 #include "chm.h"
 #include "webbrowser.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
+
 static void Help_OnSize(HWND hWnd);
 
 /* Window type defaults */
@@ -87,6 +95,34 @@
     return string;
 }
 
+static BOOL NavigateToChm(WBInfo *pWBInfo, LPCWSTR file, LPCWSTR index)
+{
+    WCHAR buf[INTERNET_MAX_URL_LENGTH];
+    WCHAR full_path[MAX_PATH];
+    VARIANT url;
+
+    static const WCHAR url_format[] =
+        {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0};
+
+    if (!pWBInfo->pWebBrowser2)
+        return FALSE;
+
+    if(!GetFullPathNameW(file, sizeof(full_path), full_path, NULL)) {
+        WARN("GetFullPathName failed: %u\n", GetLastError());
+        return FALSE;
+    }
+
+    wsprintfW(buf, url_format, full_path, index);
+
+    V_VT(&url) = VT_BSTR;
+    V_BSTR(&url) = SysAllocString(buf);
+
+    IWebBrowser2_Navigate2(pWBInfo->pWebBrowser2, &url, 0, 0, 0, 0);
+    VariantClear(&url);
+
+    return TRUE;
+}
+
 /* Size Bar */
 
 #define SIZEBAR_WIDTH   4
@@ -321,13 +357,8 @@
             WB_DoPageAction(pHHInfo->pWBInfo, WB_GOBACK);
             break;
         case IDTB_HOME:
-        {
-            WCHAR szUrl[MAX_PATH];
-
-            CHM_CreateITSUrl(pHHInfo->pCHMInfo, pHHInfo->pHHWinType->pszHome, szUrl);
-            WB_Navigate(pHHInfo->pWBInfo, szUrl);
+            NavigateToChm(pHHInfo->pWBInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->pHHWinType->pszHome);
             break;
-        }
         case IDTB_FORWARD:
             WB_DoPageAction(pHHInfo->pWBInfo, WB_GOFORWARD);
             break;
@@ -821,15 +852,6 @@
     }
 }
 
-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)
 {
     if (!CHM_OpenCHM(pHHInfo->pCHMInfo, pHHInfo->szCmdLine))
@@ -857,7 +879,7 @@
         return -1;
     }
 
-    HH_OpenDefaultTopic(pHHInfo);
+    NavigateToChm(pHHInfo->pWBInfo, pHHInfo->pCHMInfo->szFile, pHHInfo->pHHWinType->pszFile);
     
     while (GetMessageW(&msg, 0, 0, 0))
     {