Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-02 07:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32] Sync sortkey.c with Wine Staging 1.7.55. CORE-10536

Browse source 
svn path=/trunk/; revision=70161
This commit is contained in:
Amine Khaldi 2015-11-27 20:11:40 +00:00
parent 27e62279a7
commit 19bfe3af52
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/kernel32/winnls/string/sortkey.c
View file

@ -225,6 +225,8 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1
len1--; len1--;
len2--; len2--;
} }
if (len1 && !*str1) len1--;
if (len2 && !*str2) len2--;
return len1 - len2; return len1 - len2;
} }
@ -274,6 +276,8 @@ static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int le
len1--; len1--;
len2--; len2--;
} }
if (len1 && !*str1) len1--;
if (len2 && !*str2) len2--;
return len1 - len2; return len1 - len2;
} }
@ -323,23 +327,16 @@ static inline int compare_case_weights(int flags, const WCHAR *str1, int len1,
len1--; len1--;
len2--; len2--;
} }
if (len1 && !*str1) len1--;
if (len2 && !*str2) len2--;
return len1 - 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, int wine_compare_string(int flags, const WCHAR *str1, int len1,
const WCHAR *str2, int len2) const WCHAR *str2, int len2)
{ {
int ret; int ret;
len1 = real_length(str1, len1);
len2 = real_length(str2, len2);
ret = compare_unicode_weights(flags, str1, len1, str2, len2); ret = compare_unicode_weights(flags, str1, len1, str2, len2);
if (!ret) if (!ret)
{ {

2
reactos/media/doc/README.WINE
View file

@ -278,7 +278,7 @@ kernel32 -
reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 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/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/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 - msvcrt -
reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528