wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Piotr Caban : msvcrt: Use _wcsnicmp instead of strnicmpW.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 54b2a10659871032720df31ae9ca6cba2ff4acf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54b2a10659871032720df31a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:38 2020 +0200 msvcrt: Use _wcsnicmp instead of strnicmpW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index cc180e819e..ef8038d971 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -63,7 +63,7 @@ MSVCRT_wchar_t * CDECL MSVCRT__wgetenv(const MSVCRT_wchar_t *name) { MSVCRT_wchar_t *str = *environ; 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)); return pos + 1; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 868a752575..d5c227190c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1620,17 +1620,17 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st mode++; while(*mode == ' ') mode++; - if(!strncmpiW(utf8, mode, ARRAY_SIZE(utf8))) + if(!MSVCRT__wcsnicmp(utf8, mode, ARRAY_SIZE(utf8))) { *open_flags |= MSVCRT__O_U8TEXT; 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; 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; mode += ARRAY_SIZE(unicode); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c4263ccc16..ef1154ce76 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1197,6 +1197,7 @@ char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); char* __cdecl MSVCRT__itoa(int, char*, 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__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) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0)

1 0

Piotr Caban : msvcrt: Don't use strncmpiW in _wcsnicmp_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: fb071ba01f96385ae50851d8ba172ba5e52917ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb071ba01f96385ae50851d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:26 2020 +0200 msvcrt: Don't use strncmpiW in _wcsnicmp_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index cb355a0d13..59ff24e196 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -141,15 +141,29 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str /********************************************************************* * _wcsnicmp_l (MSVCRT.@) */ -INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n, MSVCRT__locale_t locale) +INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, + MSVCRT_size_t n, MSVCRT__locale_t locale) { - return strncmpiW(str1, str2, n); + MSVCRT_wchar_t c1, c2; + + if (!n) + return 0; + + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) + return MSVCRT__NLSCMPERROR; + + do + { + c1 = MSVCRT__towlower_l(*str1++, locale); + c2 = MSVCRT__towlower_l(*str2++, locale); + } while(--n && c1 && (c1 == c2)); + return c1 - c2; } /********************************************************************* * _wcsnicmp (MSVCRT.@) */ -INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, INT n) +INT CDECL MSVCRT__wcsnicmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n) { return MSVCRT__wcsnicmp_l(str1, str2, n, NULL); }

1 0

Piotr Caban : msvcrt: Don't use strncmpiW in _wcsnicoll_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 97095766ab42498e5202c99168cfe99814e113de URL: https://source.winehq.org/git/wine.git/?a=commit;h=97095766ab42498e5202c991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:20 2020 +0200 msvcrt: Don't use strncmpiW in _wcsnicoll_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 961a680ab8..cb355a0d13 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -209,7 +209,25 @@ int CDECL MSVCRT__wcsnicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncmpiW(str1, str2, count); + { + MSVCRT_wchar_t c1, c2; + + if (!count) + return 0; + + do + { + c1 = *str1++; + if (c1 >= 'A' && c1 <= 'Z') + c1 += 'a' - 'A'; + + c2 = *str2++; + if (c2 >= 'A' && c2 <= 'Z') + c2 += 'a' - 'A'; + } while(--count && c1 && (c1 == c2)); + return c1 - c2; + } + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, MSVCRT_wcsnlen(str1, count), str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL;

1 0

Piotr Caban : msvcrt: Don't use strncmpW in msvcrt_get_flags.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: c6f19b121e74935689eb9666d0d21729a713c2ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f19b121e74935689eb9666… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:14 2020 +0200 msvcrt: Don't use strncmpW in msvcrt_get_flags. 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/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6b7471a56a..868a752575 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1611,7 +1611,7 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st mode++; while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, ARRAY_SIZE(ccs)))) + if(!MSVCRT_CHECK_PMT(!MSVCRT_wcsncmp(ccs, mode, ARRAY_SIZE(ccs)))) return -1; mode += ARRAY_SIZE(ccs); while(*mode == ' ') mode++; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index dc89c6af23..c4263ccc16 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1196,6 +1196,7 @@ unsigned int __cdecl MSVCRT__get_output_format(void); char* __cdecl MSVCRT_strtok_s(char*, const char*, char**); char* __cdecl MSVCRT__itoa(int, char*, 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); /* 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)

1 0

Piotr Caban : msvcrt: Don't use strncmpW in wcsncmp.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: f20f4dee00bee16b8dd860018a98a5d9080d976b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20f4dee00bee16b8dd86001… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:23:02 2020 +0200 msvcrt: Don't use strncmpW in wcsncmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0db911fe81..961a680ab8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -413,6 +413,21 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) return str; } +/********************************************************************* + * wcsncmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n) +{ + if (!n) + return 0; + while(--n && *str1 && (*str1 == *str2)) + { + str1++; + str2++; + } + return *str1 - *str2; +} + /********************************************************************* * _wcsncoll_l (MSVCRT.@) */ @@ -427,7 +442,7 @@ int CDECL MSVCRT__wcsncoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strncmpW(str1, str2, count); + return MSVCRT_wcsncmp(str1, str2, count); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, MSVCRT_wcsnlen(str1, count), str2, MSVCRT_wcsnlen(str2, count))-CSTR_EQUAL; @@ -2643,14 +2658,6 @@ __int64 CDECL MSVCRT__wtoi64(const MSVCRT_wchar_t *str) return MSVCRT__wtoi64_l(str, NULL); } -/********************************************************************* - * wcsncmp (MSVCRT.@) - */ -int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, int n) -{ - return strncmpW(str1, str2, n); -} - /********************************************************************* * _wcsxfrm_l (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't use strcmpiW in _wcsicmp_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 1ca971a248a2d1aac6f604ce037dc34aa0fb421f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca971a248a2d1aac6f604ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:53 2020 +0200 msvcrt: Don't use strcmpiW in _wcsicmp_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 69 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b6da06ce74..0db911fe81 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -86,12 +86,48 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) return ret; } +/********************************************************************* + * _towlower_l (MSVCRT.@) + */ +int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { + if(c >= 'A' && c <= 'Z') + return c + 'a' - 'A'; + return c; + } + + return tolowerW(c); +} + +/********************************************************************* + * towlower (MSVCRT.@) + */ +int CDECL MSVCRT_towlower(MSVCRT_wint_t c) +{ + return MSVCRT__towlower_l(c, NULL); +} + INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) { + MSVCRT_wchar_t c1, c2; + if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) return MSVCRT__NLSCMPERROR; - return strcmpiW(str1, str2); + do + { + c1 = MSVCRT__towlower_l(*str1++, locale); + c2 = MSVCRT__towlower_l(*str2++, locale); + } while(c1 && (c1 == c2)); + return c1 - c2; } /********************************************************************* @@ -99,7 +135,7 @@ INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *st */ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 ) { - return strcmpiW( str1, str2 ); + return MSVCRT__wcsicmp_l(str1, str2, NULL); } /********************************************************************* @@ -2540,35 +2576,6 @@ int CDECL MSVCRT_towupper(MSVCRT_wint_t c) return MSVCRT__towupper_l(c, NULL); } -/********************************************************************* - * _towlower_l (MSVCRT.@) - */ -int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) -{ - MSVCRT_pthreadlocinfo locinfo; - - if(!locale) - locinfo = get_locinfo(); - else - locinfo = locale->locinfo; - - if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { - if(c >= 'A' && c <= 'Z') - return c + 'a' - 'A'; - return c; - } - - return tolowerW(c); -} - -/********************************************************************* - * towlower (MSVCRT.@) - */ -int CDECL MSVCRT_towlower(MSVCRT_wint_t c) -{ - return MSVCRT__towlower_l(c, NULL); -} - /********************************************************************* * wcschr (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't use strcmpiW in _wcsicoll_l.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 8fd5ef68cc1b9f55a1d25312a93b700f3aff500e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd5ef68cc1b9f55a1d25312… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:49 2020 +0200 msvcrt: Don't use strcmpiW in _wcsicoll_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 70a8d6201f..b6da06ce74 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -131,7 +131,22 @@ int CDECL MSVCRT__wcsicoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* s locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcmpiW(str1, str2); + { + MSVCRT_wchar_t c1, c2; + + do + { + c1 = *str1++; + if (c1 >= 'A' && c1 <= 'Z') + c1 += 'a' - 'A'; + + c2 = *str2++; + if (c2 >= 'A' && c2 <= 'Z') + c2 += 'a' - 'A'; + } while(c1 && (c1 == c2)); + return c1 - c2; + } + return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; }

1 0

Piotr Caban : msvcrt: Don't use strcmpW in wcscmp.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 841fbd5b141db7bed7445e95f7accd6cb393c3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=841fbd5b141db7bed7445e95… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:45 2020 +0200 msvcrt: Don't use strcmpW in wcscmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 46eb0cc080..b5b877e7ec 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4210,6 +4210,20 @@ static void test_iswdigit(void) } } +static void test_wcscmp(void) +{ + int r; + + r = wcscmp(L"a", L"z"); + ok(r == -1, "wcscmp returned %d\n", r); + + r = wcscmp(L"z", L"a"); + ok(r == 1, "wcscmp returned %d\n", r); + + r = wcscmp(L"f", L"f"); + ok(!r, "wcscmp returned %d\n", r); +} + START_TEST(string) { char mem[100]; @@ -4359,4 +4373,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_wcscmp(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 73ade3be73..70a8d6201f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1583,6 +1583,24 @@ int WINAPIV MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, return r; } +/********************************************************************* + * wcscmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) +{ + while (*str1 && (*str1 == *str2)) + { + str1++; + str2++; + } + + if (*str1 < *str2) + return -1; + if (*str1 > *str2) + return 1; + return 0; +} + /********************************************************************* * _wcscoll_l (MSVCRT.@) */ @@ -1596,7 +1614,7 @@ int CDECL MSVCRT__wcscoll_l(const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* st locinfo = locale->locinfo; if(!locinfo->lc_handle[MSVCRT_LC_COLLATE]) - return strcmpW(str1, str2); + return MSVCRT_wcscmp(str1, str2); return CompareStringW(locinfo->lc_handle[MSVCRT_LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -2668,11 +2686,3 @@ MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, { return MSVCRT__wcsxfrm_l(dest, src, len, NULL); } - -/********************************************************************* - * wcscmp (MSVCRT.@) - */ -int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) -{ - return strcmpW(str1, str2); -}

1 0

Piotr Caban : ucrtbase: Add parameters validation to _timespec32_get function.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: 2a12ccd8e8a0e72d544205e22c91e749ddb74129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a12ccd8e8a0e72d544205e2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 14 20:22:40 2020 +0200 ucrtbase: Add parameters validation to _timespec32_get function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7f565e350d..f7bb452a43 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1998,6 +1998,9 @@ int CDECL _timespec32_get(struct _timespec32 *ts, int base) { struct _timespec64 ts64; + if(!MSVCRT_CHECK_PMT(ts != NULL)) return 0; + if(base != TIME_UTC) return 0; + if(_timespec64_get(&ts64, base) != base) return 0; if(ts64.tv_sec != (MSVCRT___time32_t)ts64.tv_sec)

1 0

Paul Gofman : ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64.
by Alexandre Julliard 14 Jul '20

14 Jul '20

Module: wine Branch: master Commit: e9b3660e729929f4e09f403d526759d532df03e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9b3660e729929f4e09f403d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jul 14 19:06:36 2020 +0300 ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64. Syscall thunks break stack alignment for dispatcher. Regardless of that, it is probably better not to assume aligned stack in syscall thunk entry. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 97191ca89e..278de20522 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1497,23 +1497,25 @@ void output_syscalls( DLLSPEC *spec ) * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tjbe 1f\n" ); - output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tja 1f\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tjmp 2f\n" ); + output( "1:\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "1:\tmovq %%r10,%%rcx\n" ); + output( "2:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpopq %%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tpopq %%rsi\n" ); @@ -1523,8 +1525,8 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); - output( "\tjmp 2b\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 3b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" );

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2020