Alexandre Julliard : msi: Use strncmpiW instead of memicmpW for strings without embedded nulls.

Alexandre Julliard julliard at winehq.org
Tue May 7 17:32:47 CDT 2019


Module: wine
Branch: master
Commit: 280d10b27715c86a5784bba8db7db1e52b1602fa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=280d10b27715c86a5784bba8db7db1e52b1602fa

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue May  7 11:31:38 2019 -0500

msi: Use strncmpiW instead of memicmpW for strings without embedded nulls.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msi/dialog.c   | 2 +-
 dlls/msi/tokenize.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 153ff21..386c2c4 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -3471,7 +3471,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr
     while (*p && isspaceW( *p )) p++;
 
     len = strlenW( p );
-    if (len > len_href && !memicmpW( p, hrefW, len_href ))
+    if (len > len_href && !strncmpiW( p, hrefW, len_href ))
     {
         p += len_href;
         while (*p && isspaceW( *p )) p++;
diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c
index d1c2da9..e429495 100644
--- a/dlls/msi/tokenize.c
+++ b/dlls/msi/tokenize.c
@@ -128,7 +128,7 @@ static int compKeyword(const void *m1, const void *m2){
   const Keyword *k1 = m1, *k2 = m2;
   int ret, len = min( k1->len, k2->len );
 
-  if ((ret = memicmpW( k1->name, k2->name, len ))) return ret;
+  if ((ret = strncmpiW( k1->name, k2->name, len ))) return ret;
   if (k1->len < k2->len) return -1;
   else if (k1->len > k2->len) return 1;
   return 0;




More information about the wine-cvs mailing list