Merge pull request #604 from cracyc/winhelp

with help_multikey just display the first result and use the 0 index …
otya128 · Jan 21, 2020 · cd045b0 · cd045b0
2 parents 40837fd + 71c4e40
commit cd045b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/winhlp32/hlpfile.c b/winhlp32/hlpfile.c
@@ -411,7 +411,10 @@ static HLPFILE_PAGE* HLPFILE_Contents(HLPFILE *hlpfile, ULONG* relative)
 
     if (!hlpfile) return NULL;
 
-    page = HLPFILE_PageByOffset(hlpfile, hlpfile->contents_start, relative);
+    if (hlpfile->version <= 16)
+        page = HLPFILE_PageByOffset(hlpfile, hlpfile->TOMap[0], relative);
+    else
+        page = HLPFILE_PageByOffset(hlpfile, hlpfile->contents_start, relative);
     if (!page)
     {
         page = hlpfile->first_page;

diff --git a/winhlp32/winhelp.c b/winhlp32/winhelp.c
@@ -141,7 +141,7 @@ BOOL WINHELP_SearchKey(char keyfile, LPCSTR keywords, LONG type, LPCSTR topic, L
         key = strtok(NULL, ";");
     }
     if (!idn) return FALSE;
-    if ((type != 1) || (idn > 1))
+    if (type && ((type != 1) || (idn > 1)))
     {
         struct index_data idx;
         idx.hlpfile = page->file;
@@ -532,7 +532,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, WINEHELP *wh, BOOL w32)
                 break;
             }
             char *keywords = ((char *)wh + wh->ofsData);
-            if (!WINHELP_SearchKey('K', keywords, 1, NULL, NULL, Globals.active_win, hlpfile))
+            if (!WINHELP_SearchKey('K', keywords, 0, NULL, NULL, Globals.active_win, hlpfile))
             {
                 HLPFILE_FreeHlpFile(hlpfile);
                 if (!WINHELP_HasWorkingWindow()) MACRO_Exit();
@@ -558,7 +558,7 @@ static LRESULT  WINHELP_HandleCommand(HWND hSrcWnd, WINEHELP *wh, BOOL w32)
                 break;
             }
             MULTIKEYHELPA *mkhelp = (MULTIKEYHELPA *)((char *)wh + wh->ofsData);
-            if (!WINHELP_SearchKey(mkhelp->mkKeylist, mkhelp->szKeyphrase, 1, NULL, NULL, Globals.active_win, hlpfile))
+            if (!WINHELP_SearchKey(mkhelp->mkKeylist, mkhelp->szKeyphrase, 0, NULL, NULL, Globals.active_win, hlpfile))
             {
                 HLPFILE_FreeHlpFile(hlpfile);
                 if (!WINHELP_HasWorkingWindow()) MACRO_Exit();