msvcrt: Use _wcsnicmp instead of strnicmpW.
Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
fb071ba01f
commit
54b2a10659
|
@ -63,7 +63,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wgetenv(const MSVCRT_wchar_t *name)
|
||||||
{
|
{
|
||||||
MSVCRT_wchar_t *str = *environ;
|
MSVCRT_wchar_t *str = *environ;
|
||||||
MSVCRT_wchar_t *pos = strchrW(str,'=');
|
MSVCRT_wchar_t *pos = strchrW(str,'=');
|
||||||
if (pos && ((pos - str) == length) && !strncmpiW(str,name,length))
|
if (pos && ((pos - str) == length) && !MSVCRT__wcsnicmp(str,name,length))
|
||||||
{
|
{
|
||||||
TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1));
|
TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1));
|
||||||
return pos + 1;
|
return pos + 1;
|
||||||
|
|
|
@ -1620,17 +1620,17 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st
|
||||||
mode++;
|
mode++;
|
||||||
while(*mode == ' ') mode++;
|
while(*mode == ' ') mode++;
|
||||||
|
|
||||||
if(!strncmpiW(utf8, mode, ARRAY_SIZE(utf8)))
|
if(!MSVCRT__wcsnicmp(utf8, mode, ARRAY_SIZE(utf8)))
|
||||||
{
|
{
|
||||||
*open_flags |= MSVCRT__O_U8TEXT;
|
*open_flags |= MSVCRT__O_U8TEXT;
|
||||||
mode += ARRAY_SIZE(utf8);
|
mode += ARRAY_SIZE(utf8);
|
||||||
}
|
}
|
||||||
else if(!strncmpiW(utf16le, mode, ARRAY_SIZE(utf16le)))
|
else if(!MSVCRT__wcsnicmp(utf16le, mode, ARRAY_SIZE(utf16le)))
|
||||||
{
|
{
|
||||||
*open_flags |= MSVCRT__O_U16TEXT;
|
*open_flags |= MSVCRT__O_U16TEXT;
|
||||||
mode += ARRAY_SIZE(utf16le);
|
mode += ARRAY_SIZE(utf16le);
|
||||||
}
|
}
|
||||||
else if(!strncmpiW(unicode, mode, ARRAY_SIZE(unicode)))
|
else if(!MSVCRT__wcsnicmp(unicode, mode, ARRAY_SIZE(unicode)))
|
||||||
{
|
{
|
||||||
*open_flags |= MSVCRT__O_WTEXT;
|
*open_flags |= MSVCRT__O_WTEXT;
|
||||||
mode += ARRAY_SIZE(unicode);
|
mode += ARRAY_SIZE(unicode);
|
||||||
|
|
|
@ -1197,6 +1197,7 @@ char* __cdecl MSVCRT_strtok_s(char*, const char*, char**);
|
||||||
char* __cdecl MSVCRT__itoa(int, char*, int);
|
char* __cdecl MSVCRT__itoa(int, char*, int);
|
||||||
double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*);
|
double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pthreadlocinfo, int*);
|
||||||
int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t);
|
int __cdecl MSVCRT_wcsncmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t);
|
||||||
|
int __cdecl MSVCRT__wcsnicmp(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_size_t);
|
||||||
|
|
||||||
/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd)
|
/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd)
|
||||||
* #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0)
|
* #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0)
|
||||||
|
|
Loading…
Reference in New Issue