Paul Gofman : hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
Alexandre Julliard
julliard at winehq.org
Fri Mar 27 16:14:37 CDT 2020
Module: wine
Branch: master
Commit: aa769ad4a49d694db57b79d1562912c5da85717c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa769ad4a49d694db57b79d1562912c5da85717c
Author: Paul Gofman <gofmanp at gmail.com>
Date: Fri Mar 27 13:20:34 2020 +0300
hhctrl.ocx: Use stricmp() instead of _strnicmp(..., -1).
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/hhctrl.ocx/chm.c | 2 +-
dlls/hhctrl.ocx/content.c | 12 ++++++------
dlls/hhctrl.ocx/index.c | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c
index 2d329b9d56..4d7b3a5a7f 100644
--- a/dlls/hhctrl.ocx/chm.c
+++ b/dlls/hhctrl.ocx/chm.c
@@ -595,7 +595,7 @@ WCHAR *GetDocumentTitle(CHMInfo *info, LPCWSTR document)
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)
{
document_title = strdupnAtoW(&content.buf[1], content.len-1);
diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c
index 0bf374344d..32d7d1ab98 100644
--- a/dlls/hhctrl.ocx/content.c
+++ b/dlls/hhctrl.ocx/content.c
@@ -148,9 +148,9 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, Content
TRACE("%s\n", node.buf);
- if(!_strnicmp(node_name.buf, "/object", -1))
+ if(!stricmp(node_name.buf, "/object"))
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);
strbuf_zero(&node);
@@ -195,7 +195,7 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro
TRACE("%s\n", node.buf);
- if(!_strnicmp(node_name.buf, "object", -1)) {
+ if(!stricmp(node_name.buf, "object")) {
const char *ptr;
int len;
@@ -210,10 +210,10 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_ro
if(!ret)
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);
insert_item(prev, new_item, INSERT_CHILD);
- }else if(!_strnicmp(node_name.buf, "/ul", -1)) {
+ }else if(!stricmp(node_name.buf, "/ul")) {
break;
}
@@ -245,7 +245,7 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, ContentItem *hhc_root,
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);
prev = insert_item(prev, item, INSERT_CHILD);
if(!ret)
diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c
index 54151d0821..7d1625b6e6 100644
--- a/dlls/hhctrl.ocx/index.c
+++ b/dlls/hhctrl.ocx/index.c
@@ -137,9 +137,9 @@ static IndexItem *parse_index_sitemap_object(HHInfo *info, stream_t *stream)
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);
- }else if(!_strnicmp(node_name.buf, "/object", -1)) {
+ }else if(!stricmp(node_name.buf, "/object")) {
break;
}else {
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);
- if(!_strnicmp(node_name.buf, "object", -1)) {
+ if(!stricmp(node_name.buf, "object")) {
const char *ptr;
int len;
@@ -228,7 +228,7 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
TRACE("%s\n", node.buf);
- if(!_strnicmp(node_name.buf, "li", -1)) {
+ if(!stricmp(node_name.buf, "li")) {
IndexItem *new_item;
new_item = parse_li(info, &stream);
@@ -246,9 +246,9 @@ static void parse_hhindex(HHInfo *info, IStream *str, IndexItem *item)
item = item->next;
item->indentLevel = indent_level;
}
- }else if(!_strnicmp(node_name.buf, "ul", -1)) {
+ }else if(!stricmp(node_name.buf, "ul")) {
indent_level++;
- }else if(!_strnicmp(node_name.buf, "/ul", -1)) {
+ }else if(!stricmp(node_name.buf, "/ul")) {
indent_level--;
}else {
WARN("Unhandled tag! %s\n", node_name.buf);
More information about the wine-cvs
mailing list