[ros-diffs] [akhaldi] 70161: [KERNEL32] Sync sortkey.c with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Fri Nov 27 20:11:40 2015
New Revision: 70161

URL: http://svn.reactos.org/svn/reactos?rev=70161&view=rev
Log:
[KERNEL32] Sync sortkey.c with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c	[iso-8859-1] Fri Nov 27
20:11:40 2015
@@ -225,6 +225,8 @@
         len1--;
         len2--;
     }
+    if (len1 && !*str1) len1--;
+    if (len2 && !*str2) len2--;
     return len1 - len2;
 }
 
@@ -274,6 +276,8 @@
         len1--;
         len2--;
     }
+    if (len1 && !*str1) len1--;
+    if (len2 && !*str2) len2--;
     return len1 - len2;
 }
 
@@ -323,22 +327,15 @@
         len1--;
         len2--;
     }
+    if (len1 && !*str1) len1--;
+    if (len2 && !*str2) len2--;
     return len1 - len2;
-}
-
-static inline int real_length(const WCHAR *str, int len)
-{
-    while (len && !str[len - 1]) len--;
-    return len;
 }
 
 int wine_compare_string(int flags, const WCHAR *str1, int len1,
                         const WCHAR *str2, int len2)
 {
     int ret;
-
-    len1 = real_length(str1, len1);
-    len2 = real_length(str2, len2);
 
     ret = compare_unicode_weights(flags, str1, len1, str2, len2);
     if (!ret)

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Fri Nov 27 20:11:40 2015
@@ -278,7 +278,7 @@
   reactos/dll/win32/kernel32/winnls/string/lang.c        # Synced in r52754
   reactos/dll/win32/kernel32/winnls/string/lcformat.c    # Synced to WineStaging-1.7.55
   reactos/dll/win32/kernel32/winnls/string/nls.c         # Synced in r52754
-  reactos/dll/win32/kernel32/winnls/string/sortkey.c     # Synced to WineStaging-1.7.37
+  reactos/dll/win32/kernel32/winnls/string/sortkey.c     # Synced to WineStaging-1.7.55
 
 msvcrt -
   reactos/lib/sdk/crt/except/cpp.c              # Synced at 20080528