wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Piotr Caban : msvcrt: Don't use toupperW.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: a81f55093e11a12c25938dada2e3d7f0c8dfe86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a81f55093e11a12c25938dad… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:26 2020 +0200 msvcrt: Don't use toupperW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 5e84e38a00..aaf2f8a414 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -828,7 +828,7 @@ int CDECL MSVCRT__getdrive(void) WCHAR buffer[MAX_PATH]; if (GetCurrentDirectoryW( MAX_PATH, buffer ) && buffer[0] >= 'A' && buffer[0] <= 'z' && buffer[1] == ':') - return toupperW(buffer[0]) - 'A' + 1; + return MSVCRT_towupper(buffer[0]) - 'A' + 1; return 0; } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d20fa8e6a2..9c42aa5699 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3166,7 +3166,7 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ if (MSVCRT_iswalpha(*path) && path[1] == ':') - buf->st_dev = buf->st_rdev = toupperW(*path) - 'A'; /* drive num */ + buf->st_dev = buf->st_rdev = MSVCRT_towupper(*path) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7c92abc4fd..4a13501993 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1200,6 +1200,7 @@ double parse_double(MSVCRT_wchar_t (*)(void*), void (*)(void*), void*, MSVCRT_pt 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); int __cdecl MSVCRT_towlower(MSVCRT_wint_t); +int __cdecl MSVCRT_towupper(MSVCRT_wint_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) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5f1d5f8e8c..5188d4f860 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -356,8 +356,7 @@ int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, while (n--) { if (!*ptr) return 0; - /* FIXME: add locale support */ - *ptr = toupperW(*ptr); + *ptr = MSVCRT__towupper_l(*ptr, locale); ptr++; }

1 0

Piotr Caban : msvcrt: Don't use toupperW in _toupper_l.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 2a0569bbdfc4cf882ac0c949dfc9579ddf792af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0569bbdfc4cf882ac0c949… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:15 2020 +0200 msvcrt: Don't use toupperW in _toupper_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 7322ea47c2..e051c01521 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -363,8 +363,7 @@ int CDECL MSVCRT___iscsymf(int c) int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - unsigned char str[2], *p = str; - WCHAR wide, upper; + unsigned char str[2], *p = str, ret[2]; if(!locale) locinfo = get_locinfo(); @@ -382,22 +381,15 @@ int CDECL MSVCRT__toupper_l(int c, MSVCRT__locale_t locale) } *p++ = c & 255; - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) - return c; - - upper = toupperW(wide); - if(upper == wide) - return str[0] + (str[1]<<8); - - switch(WideCharToMultiByte(locinfo->lc_codepage, 0, - &upper, 1, (char*)str, 2, NULL, NULL)) { + switch(__crtLCMapStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, + (char*)str, p-str, (char*)ret, 2, locinfo->lc_codepage, 0)) + { case 0: return c; case 1: - return str[0]; + return ret[0]; default: - return str[0] + (str[1]<<8); + return ret[0] + (ret[1]<<8); } }

1 0

Piotr Caban : msvcrt: Don't use toupperW in _towupper_l.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 55c1a16259ed4190ffe07deeb4b6dfc274eb9a9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=55c1a16259ed4190ffe07dee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:10 2020 +0200 msvcrt: Don't use toupperW in _towupper_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ec59990496..5f1d5f8e8c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2604,6 +2604,7 @@ MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + MSVCRT_wchar_t ret; if(!locale) locinfo = get_locinfo(); @@ -2616,7 +2617,9 @@ int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) return c; } - return toupperW(c); + if(!LCMapStringW(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_UPPERCASE, &c, 1, &ret, 1)) + return c; + return ret; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Don't use tolowerW.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: bc47bff4a888872363005da93fe0b714493c835b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc47bff4a888872363005da9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:47:03 2020 +0200 msvcrt: Don't use tolowerW. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d5c227190c..d20fa8e6a2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3179,8 +3179,8 @@ int CDECL MSVCRT__wstat64(const MSVCRT_wchar_t* path, struct MSVCRT__stat64 * bu /* executable? */ if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ { - ULONGLONG ext = tolowerW(path[plen-1]) | (tolowerW(path[plen-2]) << 16) | - ((ULONGLONG)tolowerW(path[plen-3]) << 32); + ULONGLONG ext = MSVCRT_towlower(path[plen-1]) | (MSVCRT_towlower(path[plen-2]) << 16) | + ((ULONGLONG)MSVCRT_towlower(path[plen-3]) << 32); if (ext == WCEXE || ext == WCBAT || ext == WCCMD || ext == WCCOM) mode |= ALL_S_IEXEC; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cc4541ccee..7c92abc4fd 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1199,6 +1199,7 @@ 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); +int __cdecl MSVCRT_towlower(MSVCRT_wint_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) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f715832c26..ec59990496 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -411,7 +411,7 @@ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__loca while (n--) { if (!*ptr) return 0; - *ptr = tolowerW(*ptr); + *ptr = MSVCRT__towlower_l(*ptr, locale); ptr++; } @@ -2345,7 +2345,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && (nptr[1]=='x' || nptr[1]=='X')) { base = 16; nptr += 2; } @@ -2518,7 +2518,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } else if(*nptr == '+') nptr++; - if((base==0 || base==16) && wctoint(*nptr, 1)==0 && tolowerW(*(nptr+1))=='x') { + if((base==0 || base==16) && wctoint(*nptr, 1)==0 && (nptr[1]=='x' || nptr[1]=='X')) { base = 16; nptr += 2; }

1 0

Piotr Caban : msvcrt: Don't use tolowerW and toupperW in _setmbcp_l.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 4f5a4b83b6b5df5585770c3ac1e2d28de8fe01a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5a4b83b6b5df5585770c3a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:57 2020 +0200 msvcrt: Don't use tolowerW and toupperW in _setmbcp_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 5215eff0e3..f9868635e1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -209,7 +209,7 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) BYTE *bytes; WORD chartypes[256]; char bufA[256]; - WCHAR bufW[256]; + WCHAR bufW[256], lowW[256], upW[256]; int charcount; int ret; int i; @@ -310,6 +310,8 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) ERR("MultiByteToWideChar of chars failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); + LCMapStringW(lcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); + LCMapStringW(lcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); charcount = 0; for (i = 0; i < 256; i++) @@ -318,12 +320,12 @@ int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) if (chartypes[charcount] & C1_UPPER) { mbcinfo->mbctype[i + 1] |= _SBUP; - bufW[charcount] = tolowerW(bufW[charcount]); + bufW[charcount] = lowW[charcount]; } else if (chartypes[charcount] & C1_LOWER) { mbcinfo->mbctype[i + 1] |= _SBLOW; - bufW[charcount] = toupperW(bufW[charcount]); + bufW[charcount] = upW[charcount]; } charcount++; }

1 0

Piotr Caban : msvcrt: Don't use tolowerW in _tolower_l.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 0b35b779151d766f6741bc32d3b6d3c8d81f1cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b35b779151d766f6741bc32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:47 2020 +0200 msvcrt: Don't use tolowerW in _tolower_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 20 ++++++-------------- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 9e2d029950..7322ea47c2 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -425,8 +425,7 @@ int CDECL MSVCRT__toupper(int c) int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - unsigned char str[2], *p = str; - WCHAR wide, lower; + unsigned char str[2], *p = str, ret[2]; if(!locale) locinfo = get_locinfo(); @@ -444,22 +443,15 @@ int CDECL MSVCRT__tolower_l(int c, MSVCRT__locale_t locale) } *p++ = c & 255; - if(!MultiByteToWideChar(locinfo->lc_codepage, - MB_ERR_INVALID_CHARS, (char*)str, p-str, &wide, 1)) - return c; - - lower = tolowerW(wide); - if(lower == wide) - return str[0] + (str[1]<<8); - - switch(WideCharToMultiByte(locinfo->lc_codepage, 0, - &lower, 1, (char*)str, 2, NULL, NULL)) { + switch(__crtLCMapStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, + (char*)str, p-str, (char*)ret, 2, locinfo->lc_codepage, 0)) + { case 0: return c; case 1: - return str[0]; + return ret[0]; default: - return str[0] + (str[1]<<8); + return ret[0] + (ret[1]<<8); } } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ef1154ce76..cc4541ccee 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1130,6 +1130,7 @@ void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; +int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Piotr Caban : msvcrt: Don't use tolowerW in _towlower_l.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 7d2fafc0f889fe27959785defb936d26dddf4d32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2fafc0f889fe27959785de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:42 2020 +0200 msvcrt: Don't use tolowerW in _towlower_l. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 29cad7c44e..f715832c26 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -92,6 +92,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str ) int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; + MSVCRT_wchar_t ret; if(!locale) locinfo = get_locinfo(); @@ -104,7 +105,9 @@ int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) return c; } - return tolowerW(c); + if(!LCMapStringW(locinfo->lc_handle[MSVCRT_LC_CTYPE], LCMAP_LOWERCASE, &c, 1, &ret, 1)) + return c; + return ret; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Improve __crtLCMapStringA implementation.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 59ee87877c0767e2ac128ce7e37fe2b4b8cebb3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=59ee87877c0767e2ac128ce7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 14:46:35 2020 +0200 msvcrt: Improve __crtLCMapStringA implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index bbcaed0ae0..bde08f2117 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -713,12 +713,52 @@ int CDECL __crtLCMapStringA( LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst, int dstlen, unsigned int codepage, int xflag ) { - FIXME("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", - lcid,mapflags,src,srclen,dst,dstlen,codepage,xflag); - /* FIXME: A bit incorrect. But msvcrt itself just converts its - * arguments to wide strings and then calls LCMapStringW - */ - return LCMapStringA(lcid,mapflags,src,srclen,dst,dstlen); + WCHAR buf_in[32], *in = buf_in; + WCHAR buf_out[32], *out = buf_out; + int in_len, out_len, r; + + TRACE("(lcid %x, flags %x, %s(%d), %p(%d), %x, %d), partial stub!\n", + lcid, mapflags, src, srclen, dst, dstlen, codepage, xflag); + + in_len = MultiByteToWideChar(codepage, MB_ERR_INVALID_CHARS, src, srclen, NULL, 0); + if (!in_len) return 0; + if (in_len > ARRAY_SIZE(buf_in)) + { + in = malloc(in_len * sizeof(WCHAR)); + if (!in) return 0; + } + + r = MultiByteToWideChar(codepage, MB_ERR_INVALID_CHARS, src, srclen, in, in_len); + if (!r) goto done; + + if (mapflags & LCMAP_SORTKEY) + { + r = LCMapStringW(lcid, mapflags, in, in_len, (WCHAR*)dst, dstlen); + goto done; + } + + r = LCMapStringW(lcid, mapflags, in, in_len, NULL, 0); + if (!r) goto done; + out_len = r; + if (r > ARRAY_SIZE(buf_out)) + { + out = malloc(r * sizeof(WCHAR)); + if (!out) + { + r = 0; + goto done; + } + } + + r = LCMapStringW(lcid, mapflags, in, in_len, out, out_len); + if (!r) goto done; + + r = WideCharToMultiByte(codepage, 0, out, out_len, dst, dstlen, NULL, NULL); + +done: + if (in != buf_in) free(in); + if (out != buf_out) free(out); + return r; } /*********************************************************************

1 0

Paul Gofman : ntdll/tests: Test KiUserExceptionDispatcher with RtlUnwind on i386.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 2aa58e43a0d8589aa37f275147e5beab023b5d42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aa58e43a0d8589aa37f2751… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 16 18:36:13 2020 +0300 ntdll/tests: Test KiUserExceptionDispatcher with RtlUnwind on i386. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 88 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 44b00ad7b0..fce1de385e 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1667,6 +1667,23 @@ static void *hook_KiUserExceptionDispatcher_eip; static void *dbg_except_continue_handler_eip; static void *hook_exception_address; +static struct +{ + DWORD old_eax; + DWORD old_edx; + DWORD old_esi; + DWORD old_edi; + DWORD old_ebp; + DWORD old_esp; + DWORD new_eax; + DWORD new_edx; + DWORD new_esi; + DWORD new_edi; + DWORD new_ebp; + DWORD new_esp; +} +test_kiuserexceptiondispatcher_regs; + static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher) { @@ -1677,6 +1694,11 @@ static DWORD dbg_except_continue_handler(EXCEPTION_RECORD *rec, EXCEPTION_REGIST got_exception = 1; dbg_except_continue_handler_eip = (void *)context->Eip; ++context->Eip; + + context->Eip = (DWORD)code_mem + 0x1c; + context->Eax = 0xdeadbeef; + context->Esi = 0xdeadbeef; + pRtlUnwind(NtCurrentTeb()->Tib.ExceptionList, (void *)context->Eip, rec, (void *)0xdeadbeef); return ExceptionContinueExecution; } @@ -1701,6 +1723,7 @@ static LONG WINAPI dbg_except_continue_vectored_handler(struct _EXCEPTION_POINTE * software raised exception. */ context->Eip = (ULONG_PTR)rec->ExceptionAddress; } + return EXCEPTION_CONTINUE_EXECUTION; } @@ -1725,9 +1748,39 @@ void CDECL hook_KiUserExceptionDispatcher(EXCEPTION_RECORD *rec, CONTEXT *contex static void test_kiuserexceptiondispatcher(void) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - static const BYTE except_code[] = + static BYTE except_code[] = { + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1 */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + 0x83, 0xc1, 0x18, /* add $0x18, %ecx */ + + /* offset: 0x19 */ 0xcc, /* int3 */ + + 0x0f, 0x0b, /* ud2, illegal instruction */ + + /* offset: 0x1c */ + 0xb9, /* mov imm32, %ecx */ + /* offset: 0x1d */ + 0x00, 0x00, 0x00, 0x00, + + 0x89, 0x01, /* mov %eax, (%ecx) */ + 0x89, 0x51, 0x04, /* mov %edx, 0x4(%ecx) */ + 0x89, 0x71, 0x08, /* mov %esi, 0x8(%ecx) */ + 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ + 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ + 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ + + 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0xc3, /* ret */ }; static BYTE hook_trampoline[] = @@ -1745,6 +1798,7 @@ static void test_kiuserexceptiondispatcher(void) void *phook_trampoline = hook_trampoline; DWORD old_protect1, old_protect2; EXCEPTION_RECORD record; + void *bpt_address; BYTE *ptr; BOOL ret; @@ -1755,6 +1809,15 @@ static void test_kiuserexceptiondispatcher(void) return; } + if (!pRtlUnwind) + { + win_skip("RtlUnwind is not available.\n"); + return; + } + + *(DWORD *)(except_code + 1) = (DWORD)&test_kiuserexceptiondispatcher_regs; + *(DWORD *)(except_code + 0x1d) = (DWORD)&test_kiuserexceptiondispatcher_regs.new_eax; + *(unsigned int *)(hook_trampoline + 2) = (ULONG_PTR)&phook_KiUserExceptionDispatcher; *(unsigned int *)(hook_trampoline + 8) = (ULONG_PTR)&pKiUserExceptionDispatcher; @@ -1786,13 +1849,24 @@ static void test_kiuserexceptiondispatcher(void) ok(got_exception, "Handler was not called.\n"); ok(hook_called, "Hook was not called.\n"); - ok(hook_exception_address == code_mem || broken(!hook_exception_address) /* Win2008 */, + ok(test_kiuserexceptiondispatcher_regs.new_eax == 0xdeadbeef, "Got unexpected eax %#x.\n", + test_kiuserexceptiondispatcher_regs.new_eax); + ok(test_kiuserexceptiondispatcher_regs.new_esi == 0xdeadbeef, "Got unexpected esi %#x.\n", + test_kiuserexceptiondispatcher_regs.new_esi); + ok(test_kiuserexceptiondispatcher_regs.old_edi + == test_kiuserexceptiondispatcher_regs.new_edi, "edi does not match.\n"); + ok(test_kiuserexceptiondispatcher_regs.old_ebp + == test_kiuserexceptiondispatcher_regs.new_ebp, "ebp does not match.\n"); + + bpt_address = (BYTE *)code_mem + 0x19; + + ok(hook_exception_address == bpt_address || broken(!hook_exception_address) /* Win2008 */, "Got unexpected exception address %p, expected %p.\n", - hook_exception_address, code_mem); - ok(hook_KiUserExceptionDispatcher_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - hook_KiUserExceptionDispatcher_eip, code_mem); - ok(dbg_except_continue_handler_eip == code_mem, "Got unexpected exception address %p, expected %p.\n", - dbg_except_continue_handler_eip, code_mem); + hook_exception_address, bpt_address); + ok(hook_KiUserExceptionDispatcher_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + hook_KiUserExceptionDispatcher_eip, bpt_address); + ok(dbg_except_continue_handler_eip == bpt_address, "Got unexpected exception address %p, expected %p.\n", + dbg_except_continue_handler_eip, bpt_address); record.ExceptionCode = 0x80000003; record.ExceptionFlags = 0;

1 0

Paul Gofman : ntdll: Fix PE unwind info for %rsi, %rdi in KiUserExceptionDispatcher.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 12dba1b2ae50099de4cd857f867ebcaefe6852d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12dba1b2ae50099de4cd857f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jul 16 15:08:26 2020 +0300 ntdll: Fix PE unwind info for %rsi, %rdi in KiUserExceptionDispatcher. Fixes StarCraft crash on start. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 16 +++---- dlls/ntdll/tests/exception.c | 100 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 95 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12dba1b2ae50099de4cd…

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
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