March 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: d99605d714fcc947b4ba597a9975cf143f61f2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99605d714fcc947b4ba597a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 26 15:21:32 2019 +0100 urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler. Based on a patch by André Hentschel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26445 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/ftp.c | 21 ++++++++++++--------- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/url.c | 10 +++++++++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index aef4a6c..75704ce 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -66,6 +66,7 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request HINTERNET internet_session, IInternetBindInfo *bind_info) { FtpProtocol *This = impl_from_Protocol(prot); + DWORD path_size = 0; BSTR url; HRESULT hres; @@ -73,16 +74,18 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request if(FAILED(hres)) return hres; - This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, - request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, - (DWORD_PTR)&This->base); - SysFreeString(url); - if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { - WARN("InternetOpenUrl failed: %d\n", GetLastError()); - return INET_E_RESOURCE_NOT_FOUND; + hres = UrlUnescapeW(url, NULL, &path_size, URL_UNESCAPE_INPLACE); + if(SUCCEEDED(hres)) { + This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, + request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, + (DWORD_PTR)&This->base); + if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { + WARN("InternetOpenUrl failed: %d\n", GetLastError()); + hres = INET_E_RESOURCE_NOT_FOUND; + } } - - return S_OK; + SysFreeString(url); + return hres; } static HRESULT FtpProtocol_end_request(Protocol *prot) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 2eef129..7217f53 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = urlmon.dll -IMPORTS = urlmon wininet ole32 oleaut32 user32 advapi32 +IMPORTS = urlmon wininet ole32 oleaut32 shlwapi user32 advapi32 C_SRCS = \ generated.c \ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ada78c9..0f2b14e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -32,6 +32,7 @@ #include "urlmon.h" #include "wininet.h" #include "mshtml.h" +#include "shlwapi.h" #include "wine/test.h" @@ -2905,7 +2906,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/welcome.msg"; + url_a = "ftp://ftp.winehq.org/welcome%2emsg"; break; default: url_a = "winetest:test"; @@ -2969,6 +2970,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(FAILED(hres)) return; + if(protocol == FTP_TEST) + { + /* FTP url dont have any escape characters, so convert the url to what is expected */ + DWORD size = 0; + UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE); + } + hres = IMoniker_QueryInterface(mon, &IID_IBinding, (void**)&bind); ok(hres == E_NOINTERFACE, "IMoniker should not have IBinding interface\n"); if(SUCCEEDED(hres))

1 0

Józef Kucia : wined3d: Get rid of special case for shadow textures from wined3d_check_device_format ().
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 0500b3e38fbfde28cb35267e59775559e3b345df URL: https://source.winehq.org/git/wine.git/?a=commit;h=0500b3e38fbfde28cb35267e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 26 18:29:45 2019 +0100 wined3d: Get rid of special case for shadow textures from wined3d_check_device_format(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fb26d2..45e2871 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1626,13 +1626,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad allowed_bind_flags &= ~WINED3D_BIND_DEPTH_STENCIL; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_CUBE; } - else if ((bind_flags & WINED3D_BIND_DEPTH_STENCIL) - && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !adapter->gl_info.supported[ARB_SHADOW]) - { - TRACE("[FAILED] - No shadow sampler support.\n"); - return WINED3DERR_NOTAVAILABLE; - } break; case WINED3D_RTYPE_TEXTURE_3D:

1 0

Piotr Caban : ntdll: Fix _strnicmp implementation to not depend on locale.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 9b52a967b7bb1ef7c6fd404f1239e1d1c1648ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b52a967b7bb1ef7c6fd404f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:36 2019 +0100 ntdll: Fix _strnicmp implementation to not depend on locale. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 29 ++++++++++++++++++++++------- dlls/ntdll/tests/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index efae4d4..853bed6 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -258,21 +258,36 @@ INT __cdecl _memicmp( LPCSTR s1, LPCSTR s2, DWORD len ) /********************************************************************* - * _stricmp (NTDLL.@) - * _strcmpi (NTDLL.@) + * _strnicmp (NTDLL.@) */ -int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) +int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) { - return strcasecmp( str1, str2 ); + int l1, l2; + + while (n--) + { + l1 = (unsigned char)NTDLL_tolower(*str1); + l2 = (unsigned char)NTDLL_tolower(*str2); + if (l1 != l2) + { + if (sizeof(void *) > sizeof(int)) return l1 - l2; + return l1 - l2 > 0 ? 1 : -1; + } + if (!l1) return 0; + str1++; + str2++; + } + return 0; } /********************************************************************* - * _strnicmp (NTDLL.@) + * _stricmp (NTDLL.@) + * _strcmpi (NTDLL.@) */ -int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) +int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) { - return strncasecmp( str1, str2, n ); + return _strnicmp( str1, str2, -1 ); } diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 22f2359..7954508 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -64,6 +64,7 @@ static int (WINAPIV *p__snprintf)(char *, size_t, const char *, ...); static int (__cdecl *p_tolower)(int); static int (__cdecl *p_toupper)(int); +static int (__cdecl *p__strnicmp)(LPCSTR,LPCSTR,size_t); static void InitFunctionPtrs(void) { @@ -105,6 +106,7 @@ static void InitFunctionPtrs(void) p_tolower = (void *)GetProcAddress(hntdll, "tolower"); p_toupper = (void *)GetProcAddress(hntdll, "toupper"); + p__strnicmp = (void *)GetProcAddress(hntdll, "_strnicmp"); } /* if */ } @@ -1381,6 +1383,29 @@ static void test_toupper(void) } } +static void test__strnicmp(void) +{ + BOOL is_win64 = (sizeof(void *) > sizeof(int)); + int ret; + + ok(p__strnicmp != NULL, "_strnicmp is not available\n"); + + ret = p__strnicmp("a", "C", 1); + ok(ret == (is_win64 ? -2 : -1), "_strnicmp returned %d\n", ret); + ret = p__strnicmp("a", "c", 1); + ok(ret == (is_win64 ? -2 : -1), "_strnicmp returned %d\n", ret); + ret = p__strnicmp("C", "a", 1); + ok(ret == (is_win64 ? 2 : 1), "_strnicmp returned %d\n", ret); + ret = p__strnicmp("c", "a", 1); + ok(ret == (is_win64 ? 2 : 1), "_strnicmp returned %d\n", ret); + ret = p__strnicmp("ijk0", "IJK1", 3); + ok(!ret, "_strnicmp returned %d\n", ret); + ret = p__strnicmp("ijk0", "IJK1", 4); + ok(ret == -1, "_strnicmp returned %d\n", ret); + ret = p__strnicmp("ijk\0X", "IJK\0Y", 5); + ok(!ret, "_strnicmp returned %d\n", ret); +} + START_TEST(string) { InitFunctionPtrs(); @@ -1419,4 +1444,5 @@ START_TEST(string) test__snprintf(); test_tolower(); test_toupper(); + test__strnicmp(); }

1 0

Piotr Caban : ntdll: Use _stricmp instead of strcasecmp.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 3588e5abd4092e1ddf3c0a1ed876ccd865eea09e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3588e5abd4092e1ddf3c0a1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:43 2019 +0100 ntdll: Use _stricmp instead of strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 14 +++++++------- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/relay.c | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0a59947..f429349 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1200,19 +1200,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) while (isspace(*value)) value++; if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "CPU architecture")) + if (!_stricmp(line, "CPU architecture")) { if (isdigit(value[0])) info->Level = atoi(value); continue; } - if (!strcasecmp(line, "CPU revision")) + if (!_stricmp(line, "CPU revision")) { if (isdigit(value[0])) info->Revision = atoi(value); continue; } - if (!strcasecmp(line, "features")) + if (!_stricmp(line, "features")) { if (strstr(value, "vfpv3")) user_shared_data->ProcessorFeatures[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = TRUE; @@ -1268,19 +1268,19 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) while (isspace(*value)) value++; if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "CPU architecture")) + if (!_stricmp(line, "CPU architecture")) { if (isdigit(value[0])) info->Level = atoi(value); continue; } - if (!strcasecmp(line, "CPU revision")) + if (!_stricmp(line, "CPU revision")) { if (isdigit(value[0])) info->Revision = atoi(value); continue; } - if (!strcasecmp(line, "Features")) + if (!_stricmp(line, "Features")) { if (strstr(value, "crc32")) user_shared_data->ProcessorFeatures[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = TRUE; @@ -2927,7 +2927,7 @@ static ULONG mhz_from_cpuinfo(void) while ((s >= line) && isspace(*s)) s--; *(s + 1) = '\0'; value++; - if (!strcasecmp(line, "cpu MHz")) { + if (!_stricmp(line, "cpu MHz")) { sscanf(value, " %lf", &cmz); break; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 2692c43..e188907 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -257,4 +257,6 @@ extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); +/* string functions */ +int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); #endif diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index a205086..7974587 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -889,7 +889,7 @@ void RELAY_SetupDLL( HMODULE module ) data->module = module; data->base = exports->Base; len = strlen( (char *)module + exports->Name ); - if (len > 4 && !strcasecmp( (char *)module + exports->Name + len - 4, ".dll" )) len -= 4; + if (len > 4 && !_stricmp( (char *)module + exports->Name + len - 4, ".dll" )) len -= 4; len = min( len, sizeof(data->dllname) - 1 ); memcpy( data->dllname, (char *)module + exports->Name, len ); data->dllname[len] = 0; @@ -1054,7 +1054,7 @@ void SNOOP_SetupDLL(HMODULE hmod) (*dll)->nrofordinals = exports->NumberOfFunctions; strcpy( (*dll)->name, name ); p = (*dll)->name + strlen((*dll)->name) - 4; - if (p > (*dll)->name && !strcasecmp( p, ".dll" )) *p = 0; + if (p > (*dll)->name && !_stricmp( p, ".dll" )) *p = 0; size = exports->NumberOfFunctions * sizeof(SNOOP_FUN); addr = NULL;

1 0

Piotr Caban : ntdll: Use NTDLL_tolower instead of toupper.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 073bb1d0b40dc12c8c3fa8a50ec312c42ecda659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=073bb1d0b40dc12c8c3fa8a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:26:51 2019 +0100 ntdll: Use NTDLL_tolower instead of toupper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/printf.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e188907..ca04583 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -258,5 +258,6 @@ NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); void WINAPI LdrInitializeThunk(CONTEXT*,void**,ULONG_PTR,ULONG_PTR); /* string functions */ +int __cdecl NTDLL_tolower( int c ); int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ); #endif diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 8a966304..c1a0194 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -378,7 +378,7 @@ static void pf_fixup_exponent( char *buf ) { char* tmp = buf; - while (tmp[0] && toupper(tmp[0]) != 'E') + while (tmp[0] && NTDLL_tolower(tmp[0]) != 'e') tmp++; if (tmp[0] && (tmp[1] == '+' || tmp[1] == '-') && @@ -637,7 +637,7 @@ static int pf_vsnprintf( pf_output *out, const WCHAR *format, __ms_va_list valis if( pf_is_double_format( flags.Format ) ) { sprintf( x, fmt, va_arg(valist, double) ); - if (toupper(flags.Format) == 'E' || toupper(flags.Format) == 'G') + if (NTDLL_tolower(flags.Format) == 'e' || NTDLL_tolower(flags.Format) == 'g') pf_fixup_exponent( x ); } else

1 0

Piotr Caban : ntdll: Don't use toupper in RtlIsNameLegalDOS8Dot3 tests.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: a799d41687658c85871ac883e78114047378830a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a799d41687658c85871ac883… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 10:27:06 2019 +0100 ntdll: Don't use toupper in RtlIsNameLegalDOS8Dot3 tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index c8a5951..195dea3 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -240,14 +240,13 @@ static void test_RtlIsNameLegalDOS8Dot3(void) ok( spaces == test->spaces, "Wrong spaces value %d/%d for '%s'\n", spaces, test->spaces, test->path ); if (strlen(test->path) <= 12) { + STRING test_str; char str[13]; - int i; strcpy( str, test->path ); - for (i = 0; str[i]; i++) str[i] = toupper(str[i]); - ok( oem_ret.Length == strlen(test->path), "Wrong length %d/%d for '%s'\n", - oem_ret.Length, lstrlenA(test->path), test->path ); - ok( !memcmp( oem_ret.Buffer, str, oem_ret.Length ), - "Wrong string '%.*s'/'%s'\n", oem_ret.Length, oem_ret.Buffer, str ); + RtlInitString( &test_str, str ); + RtlUpperString( &test_str, &test_str ); + ok( !RtlCompareString(&oem_ret, &test_str, FALSE), + "Wrong string '%.*s'/'%s'\n", oem_ret.Length, oem_ret.Buffer, test->path ); } } }

1 0

Piotr Caban : msvcrt: Use internal tolower implementation.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 834134f284d8024524ef516644fc0262cb7fc40b URL: https://source.winehq.org/git/wine.git/?a=commit;h=834134f284d8024524ef5166… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 11:31:01 2019 +0100 msvcrt: Use internal tolower implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 5 +++-- dlls/msvcrt/mbcs.c | 6 +++--- dlls/msvcrt/string.c | 24 +++++++++++++----------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index af769dc..4fffd89 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3020,8 +3020,9 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) /* executable? */ if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ { - unsigned int ext = tolower(path[plen-1]) | (tolower(path[plen-2]) << 8) | - (tolower(path[plen-3]) << 16); + unsigned int ext = MSVCRT__tolower_l(path[plen-1], NULL) | + (MSVCRT__tolower_l(path[plen-2], NULL) << 8) | + (MSVCRT__tolower_l(path[plen-3], NULL) << 16); if (ext == EXE || ext == BAT || ext == CMD || ext == COM) mode |= ALL_S_IEXEC; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 1ea8163..4234c06 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -404,7 +404,7 @@ unsigned int CDECL _mbctolower(unsigned int c) FIXME("Handle MBC chars\n"); return c; } - return tolower(c); /* ASCII CP or SB char */ + return MSVCRT__tolower_l(c, NULL); /* ASCII CP or SB char */ } /********************************************************************* @@ -1909,7 +1909,7 @@ unsigned char* CDECL _mbslwr(unsigned char* s) *s++=c; } } - else for ( ; *s; s++) *s = tolower(*s); + else for ( ; *s; s++) *s = MSVCRT__tolower_l(*s, NULL); return ret; } @@ -1943,7 +1943,7 @@ int CDECL _mbslwr_s(unsigned char* s, MSVCRT_size_t len) *s++=c; } } - else for ( ; *s && len > 0; s++, len--) *s = tolower(*s); + else for ( ; *s && len > 0; s++, len--) *s = MSVCRT__tolower_l(*s, NULL); if (*s) { *s = '\0'; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 96f67e0..219ce50 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -362,23 +362,25 @@ static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale p++; #if _MSVCR_VER >= 140 - if(tolower(p[0]) == 'i' && tolower(p[1]) == 'n' && tolower(p[2]) == 'f') { + if(MSVCRT__tolower_l(p[0], locale) == 'i' && MSVCRT__tolower_l(p[1], locale) == 'n' + && MSVCRT__tolower_l(p[2], locale) == 'f') { if(end) *end = (char*) &p[3]; - if(tolower(p[3]) == 'i' && tolower(p[4]) == 'n' && tolower(p[5]) == 'i' && - tolower(p[6]) == 't' && tolower(p[7]) == 'y' && end) + if(MSVCRT__tolower_l(p[3], locale) == 'i' && MSVCRT__tolower_l(p[4], locale) == 'n' + && MSVCRT__tolower_l(p[5], locale) == 'i' && MSVCRT__tolower_l(p[6], locale) == 't' + && MSVCRT__tolower_l(p[7], locale) == 'y' && end) *end = (char*) &p[8]; return sign*INFINITY; } - if(tolower(p[0]) == 'n' && - tolower(p[1]) == 'a' && - tolower(p[2]) == 'n') { + if(MSVCRT__tolower_l(p[0], locale) == 'n' && + MSVCRT__tolower_l(p[1], locale) == 'a' && + MSVCRT__tolower_l(p[2], locale) == 'n') { if(end) *end = (char*) &p[3]; return NAN; } - if(p[0] == '0' && tolower(p[1]) == 'x') { + if(p[0] == '0' && MSVCRT__tolower_l(p[1], locale) == 'x') { base = 16; expcnt = 2; p += 2; @@ -963,7 +965,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolower(*(nptr+1))=='x') { + if((base==0 || base==16) && *nptr=='0' && MSVCRT__tolower_l(*(nptr+1), locale)=='x') { base = 16; nptr += 2; } @@ -976,7 +978,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR } while(*nptr) { - char cur = tolower(*nptr); + char cur = MSVCRT__tolower_l(*nptr, locale); int v; if(cur>='0' && cur<='9') { @@ -1215,7 +1217,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && *nptr=='0' && tolower(*(nptr+1))=='x') { + if((base==0 || base==16) && *nptr=='0' && MSVCRT__tolower_l(*(nptr+1), locale)=='x') { base = 16; nptr += 2; } @@ -1228,7 +1230,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b } while(*nptr) { - char cur = tolower(*nptr); + char cur = MSVCRT__tolower_l(*nptr, locale); int v; if(cur>='0' && cur<='9') {

1 0

Piotr Caban : msvcrt: Use internal toupper implementation.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 3f675c1a9d6e8acfc75f302bfb03ed70af02da4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f675c1a9d6e8acfc75f302b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 11:31:06 2019 +0100 msvcrt: Use internal toupper implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/mbcs.c | 6 +++--- dlls/msvcrt/printf.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4fffd89..cf87866 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3007,7 +3007,7 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf) as a drive letter */ if (isalpha(*path)&& (*(path+1)==':')) - buf->st_dev = buf->st_rdev = toupper(*path) - 'A'; /* drive num */ + buf->st_dev = buf->st_rdev = MSVCRT__toupper_l(*path, NULL) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 4234c06..918fff8 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -417,7 +417,7 @@ unsigned int CDECL _mbctoupper(unsigned int c) FIXME("Handle MBC chars\n"); return c; } - return toupper(c); /* ASCII CP or SB char */ + return MSVCRT__toupper_l(c, NULL); /* ASCII CP or SB char */ } /********************************************************************* @@ -1977,7 +1977,7 @@ unsigned char* CDECL _mbsupr(unsigned char* s) *s++=c; } } - else for ( ; *s; s++) *s = toupper(*s); + else for ( ; *s; s++) *s = MSVCRT__toupper_l(*s, NULL); return ret; } @@ -2011,7 +2011,7 @@ int CDECL _mbsupr_s(unsigned char* s, MSVCRT_size_t len) *s++=c; } } - else for ( ; *s && len > 0; s++, len--) *s = toupper(*s); + else for ( ; *s && len > 0; s++, len--) *s = MSVCRT__toupper_l(*s, NULL); if (*s) { *s = '\0'; diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index b42dd73..a0d7540 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -354,7 +354,7 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf, BOOL three_digit_exp) { char* tmp = buf; - while(tmp[0] && toupper(tmp[0])!='E') + while(tmp[0] && MSVCRT__toupper_l(tmp[0], NULL)!='E') tmp++; if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && @@ -664,10 +664,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API sprintf(tmp, nan_str); if (strchr("EFG", flags.Format)) for(i=0; tmp[i]; i++) - tmp[i] = toupper(tmp[i]); + tmp[i] = MSVCRT__toupper_l(tmp[i], NULL); } else { sprintf(tmp, float_fmt, val); - if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') + if(MSVCRT__toupper_l(flags.Format, NULL)=='E' || MSVCRT__toupper_l(flags.Format, NULL)=='G') FUNC_NAME(pf_fixup_exponent)(tmp, three_digit_exp); }

1 0

Piotr Caban : msvcrt: Use _stricmp instead of strcasecmp.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: 462caf8fbd51f7fe03d54c8e09f9cd5ed0ddb3ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=462caf8fbd51f7fe03d54c8e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 11:31:09 2019 +0100 msvcrt: Use _stricmp instead of strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 10 +++++----- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/string.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4282fed..1e05711 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -97,7 +97,7 @@ static void remap_synonym(char *name) unsigned int i; for (i = 0; i < ARRAY_SIZE(_country_synonyms); i += 2) { - if (!strcasecmp(_country_synonyms[i],name)) + if (!MSVCRT__stricmp(_country_synonyms[i],name)) { TRACE(":Mapping synonym %s to %s\n",name,_country_synonyms[i+1]); strcpy(name, _country_synonyms[i+1]); @@ -140,7 +140,7 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO /* Partial matches are only allowed on language/country names */ len = strlen(cmp); if(exact || len<=3) - return !strcasecmp(cmp, buff); + return !MSVCRT__stricmp(cmp, buff); else return !strncasecmp(cmp, buff, len); } @@ -264,7 +264,7 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s if(!search.search_country[0] && !search.search_codepage[0]) remap_synonym(search.search_language); - if(!strcasecmp(search.search_country, "China")) + if(!MSVCRT__stricmp(search.search_country, "China")) strcpy(search.search_country, "People's Republic of China"); EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, @@ -291,10 +291,10 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s memcpy(search.found_codepage,search.search_codepage,MAX_ELEM_LEN); else { /* Special codepage values: OEM & ANSI */ - if (!strcasecmp(search.search_codepage,"OCP")) { + if (!MSVCRT__stricmp(search.search_codepage,"OCP")) { GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, search.found_codepage, MAX_ELEM_LEN); - } else if (!strcasecmp(search.search_codepage,"ACP")) { + } else if (!MSVCRT__stricmp(search.search_codepage,"ACP")) { GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, search.found_codepage, MAX_ELEM_LEN); } else diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 918fff8..bc528f1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -123,7 +123,7 @@ static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 ) static inline int u_strcasecmp( const unsigned char *s1, const unsigned char *s2 ) { - return strcasecmp( (const char*)s1, (const char*)s2 ); + return MSVCRT__stricmp( (const char*)s1, (const char*)s2 ); } static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ed12dee..10f3dc1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1148,6 +1148,7 @@ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__towupper_l(MSVCRT_wint_t,MSVCRT__locale_t); int __cdecl MSVCRT__towlower_l(MSVCRT_wint_t,MSVCRT__locale_t); +int __cdecl MSVCRT__stricmp(const char*, const char*); int __cdecl MSVCRT__strnicmp(const char*, const char*, MSVCRT_size_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 219ce50..17eee1c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -641,7 +641,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcasecmp(str1, str2); + return MSVCRT__stricmp(str1, str2); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; }

1 0

Piotr Caban : msvcrt: Use _strnicmp instead of strncasecmp.
by Alexandre Julliard 26 Mar '19

26 Mar '19

Module: wine Branch: master Commit: f48ea297268e832c93a22fb5b92f73620c717280 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f48ea297268e832c93a22fb5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 26 11:31:13 2019 +0100 msvcrt: Use _strnicmp instead of strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/string.c | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1e05711..fc41f05 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -142,7 +142,7 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO if(exact || len<=3) return !MSVCRT__stricmp(cmp, buff); else - return !strncasecmp(cmp, buff, len); + return !MSVCRT__strnicmp(cmp, buff, len); } static BOOL CALLBACK diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index bc528f1..95b4f2b 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -133,7 +133,7 @@ static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, M static inline int u_strncasecmp( const unsigned char *s1, const unsigned char *s2, MSVCRT_size_t len ) { - return strncasecmp( (const char*)s1, (const char*)s2, len ); + return MSVCRT__strnicmp( (const char*)s1, (const char*)s2, len ); } static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 17eee1c..f9185cc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -694,7 +694,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncasecmp(str1, str2, count); + return MSVCRT__strnicmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, MSVCRT_strnlen(str1, count), str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; @@ -1960,7 +1960,6 @@ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, MSVCRT_size_t count, MSVCRT__locale_t locale) { - MSVCRT_pthreadlocinfo locinfo; int c1, c2; if(s1==NULL || s2==NULL) @@ -1969,14 +1968,6 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, if(!count) return 0; - if(!locale) - locinfo = get_locinfo(); - else - locinfo = locale->locinfo; - - if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) - return strncasecmp(s1, s2, count); - do { c1 = MSVCRT__tolower_l(*s1++, locale); c2 = MSVCRT__tolower_l(*s2++, locale);

1 0