hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
Signed-off-by: Paul Gofman <gofmanp@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b9b2a04fe7
commit
aa769ad4a4
|
@ -595,7 +595,7 @@ WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document)
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "title", -1)) {
|
if(!stricmp(node_name.buf, "title")) {
|
||||||
if(next_content(&stream, &content) && content.len > 1)
|
if(next_content(&stream, &content) && content.len > 1)
|
||||||
{
|
{
|
||||||
document_title = strdupnAtoW(&content.buf[1], content.len-1);
|
document_title = strdupnAtoW(&content.buf[1], content.len-1);
|
||||||
|
|
|
@ -148,9 +148,9 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "/object", -1))
|
if(!stricmp(node_name.buf, "/object"))
|
||||||
break;
|
break;
|
||||||
if(!_strnicmp(node_name.buf, "param", -1))
|
if(!stricmp(node_name.buf, "param"))
|
||||||
parse_obj_node_param(item, hhc_root, node.buf, info->pCHMInfo->codePage);
|
parse_obj_node_param(item, hhc_root, node.buf, info->pCHMInfo->codePage);
|
||||||
|
|
||||||
strbuf_zero(&node);
|
strbuf_zero(&node);
|
||||||
|
@ -195,7 +195,7 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "object", -1)) {
|
if(!stricmp(node_name.buf, "object")) {
|
||||||
const char *ptr;
|
const char *ptr;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
|
@ -210,10 +210,10 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro
|
||||||
if(!ret)
|
if(!ret)
|
||||||
ret = prev;
|
ret = prev;
|
||||||
}
|
}
|
||||||
}else if(!_strnicmp(node_name.buf, "ul", -1)) {
|
}else if(!stricmp(node_name.buf, "ul")) {
|
||||||
new_item = parse_ul(info, stream, hhc_root);
|
new_item = parse_ul(info, stream, hhc_root);
|
||||||
insert_item(prev, new_item, INSERT_CHILD);
|
insert_item(prev, new_item, INSERT_CHILD);
|
||||||
}else if(!_strnicmp(node_name.buf, "/ul", -1)) {
|
}else if(!stricmp(node_name.buf, "/ul")) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -245,7 +245,7 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, ContentItem *hhc_root,
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "ul", -1)) {
|
if(!stricmp(node_name.buf, "ul")) {
|
||||||
ContentItem *item = parse_ul(info, &stream, hhc_root);
|
ContentItem *item = parse_ul(info, &stream, hhc_root);
|
||||||
prev = insert_item(prev, item, INSERT_CHILD);
|
prev = insert_item(prev, item, INSERT_CHILD);
|
||||||
if(!ret)
|
if(!ret)
|
||||||
|
|
|
@ -137,9 +137,9 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream)
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "param", -1)) {
|
if(!stricmp(node_name.buf, "param")) {
|
||||||
parse_index_obj_node_param(item, node.buf, info->pCHMInfo->codePage);
|
parse_index_obj_node_param(item, node.buf, info->pCHMInfo->codePage);
|
||||||
}else if(!_strnicmp(node_name.buf, "/object", -1)) {
|
}else if(!stricmp(node_name.buf, "/object")) {
|
||||||
break;
|
break;
|
||||||
}else {
|
}else {
|
||||||
WARN("Unhandled tag! %s\n", node_name.buf);
|
WARN("Unhandled tag! %s\n", node_name.buf);
|
||||||
|
@ -173,7 +173,7 @@ static IndexItem *parse_li(HHInfo *info, stream_t *stream)
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "object", -1)) {
|
if(!stricmp(node_name.buf, "object")) {
|
||||||
const char *ptr;
|
const char *ptr;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
|
@ -228,7 +228,7 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
|
||||||
|
|
||||||
TRACE("%s\n", node.buf);
|
TRACE("%s\n", node.buf);
|
||||||
|
|
||||||
if(!_strnicmp(node_name.buf, "li", -1)) {
|
if(!stricmp(node_name.buf, "li")) {
|
||||||
IndexItem *new_item;
|
IndexItem *new_item;
|
||||||
|
|
||||||
new_item = parse_li(info, &stream);
|
new_item = parse_li(info, &stream);
|
||||||
|
@ -246,9 +246,9 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
|
||||||
item = item->next;
|
item = item->next;
|
||||||
item->indentLevel = indent_level;
|
item->indentLevel = indent_level;
|
||||||
}
|
}
|
||||||
}else if(!_strnicmp(node_name.buf, "ul", -1)) {
|
}else if(!stricmp(node_name.buf, "ul")) {
|
||||||
indent_level++;
|
indent_level++;
|
||||||
}else if(!_strnicmp(node_name.buf, "/ul", -1)) {
|
}else if(!stricmp(node_name.buf, "/ul")) {
|
||||||
indent_level--;
|
indent_level--;
|
||||||
}else {
|
}else {
|
||||||
WARN("Unhandled tag! %s\n", node_name.buf);
|
WARN("Unhandled tag! %s\n", node_name.buf);
|
||||||
|
|
Loading…
Reference in New Issue