comctl32: Fix lstrncmpiW() so its return value is standard and use the CSTR_XXX macros.

Francois Gouget fgouget at free.fr
Tue Jun 19 17:53:56 CDT 2012


---

In this file we only care about equality, not about the less-than or 
greater-than cases. But it's a copy/paste accident waiting to happen. 
Also the use of sizeof(WCHAR) makes no sense.

 dlls/comctl32/listview.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 27b2fd0..e1b9a71 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -559,11 +559,8 @@ static inline int textcmpWT(LPCWSTR aw, LPCWSTR bt, BOOL isW)
     
 static inline int lstrncmpiW(LPCWSTR s1, LPCWSTR s2, int n)
 {
-    int res;
-
     n = min(min(n, lstrlenW(s1)), lstrlenW(s2));
-    res = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n);
-    return res ? res - sizeof(WCHAR) : res;
+    return CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, s1, n, s2, n) - CSTR_EQUAL;
 }
 
 /******** Debugging functions *****************************************/
-- 
1.7.10



More information about the wine-patches mailing list