commit 736ef403a92ae4d0598d571efdb25bbad9958391
author Jacek Caban <jacek@codeweavers.com> Wed Feb 28 03:55:39 2007 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 28 14:03:45 2007 +0100
tree 3b7b7be398d5881b7085699efcb337550f47e6ab
parent 5d011551a315ec6bb0985cd723ca0b94cb5d4b0e

hhctrl.ocx: Added HH_HELP_CONTEXT implementation.

dlls/hhctrl.ocx/help.c

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index abbc0c5..baedf88 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -57,15 +57,32 @@
     return string;
 }
 
+BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl)
+{
+    VARIANT url;
+    HRESULT hres;
+
+    V_VT(&url) = VT_BSTR;
+    V_BSTR(&url) = SysAllocString(surl);
+
+    hres = IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0);
+
+    VariantClear(&url);
+
+    return SUCCEEDED(hres);
+}
+
 BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index)
 {
     WCHAR buf[INTERNET_MAX_URL_LENGTH];
     WCHAR full_path[MAX_PATH];
-    VARIANT url;
+    LPWSTR ptr;
 
     static const WCHAR url_format[] =
         {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0};
 
+    TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index));
+
     if (!info->web_browser)
         return FALSE;
 
@@ -76,13 +93,11 @@
 
     wsprintfW(buf, url_format, full_path, index);
 
-    V_VT(&url) = VT_BSTR;
-    V_BSTR(&url) = SysAllocString(buf);
+    /* FIXME: HACK */
+    if((ptr = strchrW(buf, '#')))
+       *ptr = 0;
 
-    IWebBrowser2_Navigate2(info->web_browser, &url, 0, 0, 0, 0);
-    VariantClear(&url);
-
-    return TRUE;
+    return NavigateToUrl(info, buf);
 }
 
 /* Size Bar */