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

hhctrl.ocx: Turn multiple index entries of the same name into a single entry.

This commit is contained in:
Erich Hoover 2012-06-25 13:46:26 -06:00 committed by Alexandre Julliard
parent 4a367c5719
commit 5874d6f1fd
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/hhctrl.ocx/index.c
View File

@ -54,6 +54,15 @@ static void fill_index_tree(HWND hwnd, IndexItem *item)
} }
} }
static void item_realloc(IndexItem *item, int num_items)
{
item->nItems = num_items;
item->items = heap_realloc(item->items, sizeof(IndexSubItem)*item->nItems);
item->items[item->nItems-1].name = NULL;
item->items[item->nItems-1].local = NULL;
item->itemFlags = 0x00;
}
/* Parse the attributes correspond to a list item, including sub-topics. /* Parse the attributes correspond to a list item, including sub-topics.
* *
* Each list item has, at minimum, a param of type "keyword" and two * Each list item has, at minimum, a param of type "keyword" and two
@ -77,13 +86,8 @@ static void parse_index_obj_node_param(IndexItem *item, const char *text, UINT c
/* Allocate a new sub-item, either on the first run or whenever a /* Allocate a new sub-item, either on the first run or whenever a
* sub-topic has filled out both the "name" and "local" params. * sub-topic has filled out both the "name" and "local" params.
*/ */
if(item->itemFlags == 0x11 && (!strncasecmp("name", ptr, len) || !strncasecmp("local", ptr, len))) { if(item->itemFlags == 0x11 && (!strncasecmp("name", ptr, len) || !strncasecmp("local", ptr, len)))
item->nItems++; item_realloc(item, item->nItems+1);
item->items = heap_realloc(item->items, sizeof(IndexSubItem)*item->nItems);
item->items[item->nItems-1].name = NULL;
item->items[item->nItems-1].local = NULL;
item->itemFlags = 0x00;
}
if(!strncasecmp("keyword", ptr, len)) { if(!strncasecmp("keyword", ptr, len)) {
param = &item->keyword; param = &item->keyword;
}else if(!item->keyword && !strncasecmp("name", ptr, len)) { }else if(!item->keyword && !strncasecmp("name", ptr, len)) {
@ -228,8 +232,19 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
TRACE("%s\n", node.buf); TRACE("%s\n", node.buf);
if(!strcasecmp(node_name.buf, "li")) { if(!strcasecmp(node_name.buf, "li")) {
item->next = parse_li(info, &stream); IndexItem *new_item;
if(item->next) {
new_item = parse_li(info, &stream);
if(new_item && item->keyword && strcmpW(new_item->keyword, item->keyword) == 0) {
int num_items = item->nItems;
item_realloc(item, num_items+1);
memcpy(&item->items[num_items], &new_item->items[0], sizeof(IndexSubItem));
heap_free(new_item->keyword);
heap_free(new_item->items);
heap_free(new_item);
} else if(new_item) {
item->next = new_item;
item->next->merge = item->merge; item->next->merge = item->merge;
item = item->next; item = item->next;
item->indentLevel = indent_level; item->indentLevel = indent_level;