system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-08-31 12:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

hhctrl.ocx: Fix parsing of some TOC topics that reference other files.

Browse source
This commit is contained in:
Erich Hoover 2012-02-13 11:45:29 -07:00 committed by Alexandre Julliard
parent 0872572a6d
commit 98f0be8dc3
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dlls/hhctrl.ocx/content.c
View file

@ -50,11 +50,21 @@ static void free_content_item(ContentItem *item)
}
}
static void store_param(LPWSTR *param, const char *value, int len)
{
int wlen;
wlen = MultiByteToWideChar(CP_ACP, 0, value, len, NULL, 0);
*param = heap_alloc((wlen+1)*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, value, len, *param, wlen);
(*param)[wlen] = 0;
}
static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text)
{
const char *ptr;
LPWSTR *param, merge;
int len, wlen;
int len;
ptr = get_attr(text, "name", &len);
if(!ptr) {
@ -79,10 +89,21 @@ static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const
return;
}
wlen = MultiByteToWideChar(CP_ACP, 0, ptr, len, NULL, 0);
*param = heap_alloc((wlen+1)*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, ptr, len, *param, wlen);
(*param)[wlen] = 0;
/*
* "merge" parameter data (referencing another CHM file) can be incorporated into the "local" parameter
* by specifying the filename in the format:
* MS-ITS:file.chm::/local_path.htm
*/
if(param == &item->local && strstr(ptr, "::"))
{
const char *local = strstr(ptr, "::")+2;
int local_len = len-(local-ptr);
store_param(&item->local, local, local_len);
param = &merge;
}
store_param(param, ptr, len);
if(param == &merge) {
SetChmPath(&item->merge, hhc_root->merge.chm_file, merge);