ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hhctrl.ocx: Open a specific topic when requested.

This commit is contained in:
Erich Hoover 2011-09-27 20:02:11 -06:00 committed by Alexandre Julliard
parent 973237996b
commit f1b7bb4eaa
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/hhctrl.ocx/hhctrl.c
View File

@ -166,15 +166,17 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
NMHDR nmhdr; NMHDR nmhdr;
const WCHAR *index = NULL; const WCHAR *index = NULL;
int tab_index = TAB_CONTENTS; int tab_index = TAB_CONTENTS;
const WCHAR *default_index = NULL;
if (!filename) if (!filename)
return NULL; return NULL;
if (!resolve_filename(filename, fullname, MAX_PATH, &index, NULL)) if (!resolve_filename(filename, fullname, MAX_PATH, &default_index, NULL))
{ {
WARN("can't find %s\n", debugstr_w(filename)); WARN("can't find %s\n", debugstr_w(filename));
return 0; return 0;
} }
index = default_index;
info = CreateHelpViewer(fullname); info = CreateHelpViewer(fullname);
if(!info) if(!info)
@ -183,10 +185,20 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
if(!index) if(!index)
index = info->WinType.pszFile; index = info->WinType.pszFile;
/* called to load a specified topic */
switch(command)
{
case HH_DISPLAY_TOPIC:
case HH_DISPLAY_TOC:
if (data)
index = (const WCHAR *)data;
break;
}
res = NavigateToChm(info, info->pCHMInfo->szFile, index); res = NavigateToChm(info, info->pCHMInfo->szFile, index);
if (index != info->WinType.pszFile) if (default_index)
heap_free((WCHAR*)index); heap_free((WCHAR*)default_index);
if(!res) if(!res)
{ {
@ -199,8 +211,6 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat
case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOPIC:
case HH_DISPLAY_TOC: case HH_DISPLAY_TOC:
tab_index = TAB_CONTENTS; tab_index = TAB_CONTENTS;
if (data)
FIXME("Should jump to topic '%s'.\n", debugstr_w((WCHAR *)data));
break; break;
case HH_DISPLAY_INDEX: case HH_DISPLAY_INDEX:
tab_index = TAB_INDEX; tab_index = TAB_INDEX;