Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:42:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32] Sync CompareStringW() with Wine Staging 1.7.37. CORE-9246

Browse source 
svn path=/trunk/; revision=67986
This commit is contained in:
Amine Khaldi 2015-06-01 09:56:53 +00:00
parent a4bc0dbd76
commit 3323a3b964
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/win32/kernel32/winnls/string/lang.c
View file

@ -1759,32 +1759,39 @@ INT WINAPI FoldStringW(DWORD dwFlags, LPCWSTR src, INT srclen,
* *
* See CompareStringA. * See CompareStringA.
*/ */
INT WINAPI CompareStringW(LCID lcid, DWORD style, INT WINAPI CompareStringW(LCID lcid, DWORD flags,
LPCWSTR str1, INT len1, LPCWSTR str2, INT len2) LPCWSTR str1, INT len1, LPCWSTR str2, INT len2)
{ {
static const DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT
|NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP
|NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
static DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000;
/* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */
INT ret; INT ret;
if (!str1 || !str2) if (!str1 || !str2)
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return 0; return 0;
} }
if( style & ~(NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS| if (flags & ~supported_flags)
SORT_STRINGSORT|NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP|0x10000000) )
{ {
SetLastError(ERROR_INVALID_FLAGS); SetLastError(ERROR_INVALID_FLAGS);
return 0; return 0;
} }
/* this style is related to diacritics in Arabic, Japanese, and Hebrew */ if (flags & semistub_flags)
if (style & 0x10000000) {
WARN("Ignoring unknown style 0x10000000\n"); FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags);
semistub_flags &= ~flags;
}
if (len1 < 0) len1 = strlenW(str1); if (len1 < 0) len1 = strlenW(str1);
if (len2 < 0) len2 = strlenW(str2); if (len2 < 0) len2 = strlenW(str2);
ret = wine_compare_string(style, str1, len1, str2, len2); ret = wine_compare_string(flags, str1, len1, str2, len2);
if (ret) /* need to translate result */ if (ret) /* need to translate result */
return (ret < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN; return (ret < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN;
@ -1798,7 +1805,7 @@ INT WINAPI CompareStringW(LCID lcid, DWORD style,
* *
* PARAMS * PARAMS
* lcid [I] LCID for the comparison * lcid [I] LCID for the comparison
* style [I] Flags for the comparison (NORM_ constants from "winnls.h"). * flags [I] Flags for the comparison (NORM_ constants from "winnls.h").
* str1 [I] First string to compare * str1 [I] First string to compare
* len1 [I] Length of str1, or -1 if str1 is NUL terminated * len1 [I] Length of str1, or -1 if str1 is NUL terminated
* str2 [I] Second string to compare * str2 [I] Second string to compare