wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Francois Gouget : schedsvc: Fix the spelling of a comment.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 33e2b134fa3d3785e26a8494c94eb9fba33f1682 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e2b134fa3d3785e26a8494… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 21 00:01:02 2021 +0200 schedsvc: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 5a34b33e039..1625b43c888 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -828,7 +828,7 @@ static BOOL create_job(const WCHAR *job_name, const AT_INFO *info) if (!write_reserved_data(hfile)) goto failed; - /* Trigegrs */ + /* Triggers */ if (!write_trigger(hfile, info)) goto failed;

1 0

Piotr Caban : msvcrt: Import cos implementation from musl.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: ef91a7c02c8431a09edb1c1954cacda8b5f8958c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef91a7c02c8431a09edb1c19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:58 2021 +0200 msvcrt: Import cos implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d89a4c7f5bc..7643f39fde7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1802,12 +1802,41 @@ static double __cos(double x, double y) /********************************************************************* * cos (MSVCRT.@) + * + * Copied from musl: src/math/cos.c */ double CDECL cos( double x ) { - double ret = unix_funcs->cos( x ); - if (!isfinite(x)) return math_error(_DOMAIN, "cos", x, 0, ret); - return ret; + double y[2]; + UINT32 ix; + unsigned n; + + ix = *(ULONGLONG*)&x >> 32; + ix &= 0x7fffffff; + + /* |x| ~< pi/4 */ + if (ix <= 0x3fe921fb) { + if (ix < 0x3e46a09e) { /* |x| < 2**-27 * sqrt(2) */ + /* raise inexact if x!=0 */ + fp_barrier(x + 0x1p120f); + return 1.0; + } + return __cos(x, 0); + } + + /* cos(Inf or NaN) is NaN */ + if (isinf(x)) return math_error(_DOMAIN, "cos", x, 0, x - x); + if (ix >= 0x7ff00000) + return x - x; + + /* argument reduction */ + n = __rem_pio2(x, y); + switch (n & 3) { + case 0: return __cos(y[0], y[1]); + case 1: return -__sin(y[0], y[1], 1); + case 2: return -__cos(y[0], y[1]); + default: return __sin(y[0], y[1], 1); + } } /*********************************************************************

1 0

Piotr Caban : msvcrt: Import sin implementation from musl.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: ceefbb76a1f814abcf6fed541a50e7bd19cdb2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceefbb76a1f814abcf6fed54… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:52 2021 +0200 msvcrt: Import sin implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 522 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 - dlls/msvcrt/unixlib.h | 1 - 3 files changed, 493 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceefbb76a1f814abcf6f…

1 0

Piotr Caban : msvcrt: Import _logbf implementation from musl.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 78fc19d67a525d78dbf89e9b9fe93082bdd2b4ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=78fc19d67a525d78dbf89e9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:44 2021 +0200 msvcrt: Import _logbf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 49 +++++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index df00f0532bb..234483da299 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -275,15 +275,38 @@ float CDECL _nextafterf( float x, float y ) return y; } +/* Copied from musl: src/math/ilogbf.c */ +static int __ilogbf(float x) +{ + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; + + if (!e) + { + u.i <<= 9; + if (u.i == 0) return FP_ILOGB0; + /* subnormal x */ + for (e = -0x7f; u.i >> 31 == 0; e--, u.i <<= 1); + return e; + } + if (e == 0xff) return u.i << 9 ? FP_ILOGBNAN : INT_MAX; + return e - 0x7f; +} + /********************************************************************* * _logbf (MSVCRT.@) + * + * Copied from musl: src/math/logbf.c */ -float CDECL _logbf( float num ) +float CDECL _logbf(float x) { - float ret = unix_funcs->logbf(num); - if (isnan(num)) return math_error(_DOMAIN, "_logbf", num, 0, ret); - if (!num) return math_error(_SING, "_logbf", num, 0, ret); - return ret; + if (!isfinite(x)) + return x * x; + if (x == 0) { + *_errno() = ERANGE; + return -1 / (x * x); + } + return __ilogbf(x); } #endif @@ -6178,23 +6201,9 @@ int CDECL ilogb(double x) /********************************************************************* * ilogbf (MSVCR120.@) - * - * Copied from musl: src/math/ilogbf.c */ int CDECL ilogbf(float x) { - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) - { - u.i <<= 9; - if (u.i == 0) return FP_ILOGB0; - /* subnormal x */ - for (e = -0x7f; u.i >> 31 == 0; e--, u.i <<= 1); - return e; - } - if (e == 0xff) return u.i << 9 ? FP_ILOGBNAN : INT_MAX; - return e - 0x7f; + return __ilogbf(x); } #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 51fe7ef6f0f..a4d570a282a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -387,14 +387,6 @@ static float CDECL unix_log2f(float x) #endif } -/********************************************************************* - * logbf - */ -static float CDECL unix_logbf( float x ) -{ - return logbf( x ); -} - /********************************************************************* * pow */ @@ -536,7 +528,6 @@ static const struct unix_funcs funcs = unix_log1pf, unix_log2, unix_log2f, - unix_logbf, unix_pow, unix_powf, unix_sin, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a0cded99e20..d4471477715 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -56,7 +56,6 @@ struct unix_funcs float (CDECL *log1pf)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); - float (CDECL *logbf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); double (CDECL *sin)(double x);

1 0

Piotr Caban : msvcrt: Import _logb implementation from musl.
by Alexandre Julliard 21 May '21

21 May '21

Module: wine Branch: master Commit: 6758acbb43b9cc59195958ce4625b00698c643a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6758acbb43b9cc59195958ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:36 2021 +0200 msvcrt: Import _logb implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 47 +++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e2161e91c4..df00f0532bb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1897,15 +1897,36 @@ __int64 CDECL _abs64( __int64 n ) return n >= 0 ? n : -n; } +/* Copied from musl: src/math/ilogb.c */ +static int __ilogb(double x) +{ + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) + { + u.i <<= 12; + if (u.i == 0) return FP_ILOGB0; + /* subnormal x */ + for (e = -0x3ff; u.i >> 63 == 0; e--, u.i <<= 1); + return e; + } + if (e == 0x7ff) return u.i << 12 ? FP_ILOGBNAN : INT_MAX; + return e - 0x3ff; +} + /********************************************************************* * _logb (MSVCRT.@) + * + * Copied from musl: src/math/logb.c */ -double CDECL _logb(double num) +double CDECL _logb(double x) { - double ret = unix_funcs->logb(num); - if (isnan(num)) return math_error(_DOMAIN, "_logb", num, 0, ret); - if (!num) return math_error(_SING, "_logb", num, 0, ret); - return ret; + if (!isfinite(x)) + return x * x; + if (x == 0) + return math_error(_SING, "_logb", x, 0, -1 / (x * x)); + return __ilogb(x); } /********************************************************************* @@ -6149,24 +6170,10 @@ double CDECL MSVCR120_creal(_Dcomplex z) /********************************************************************* * ilogb (MSVCR120.@) - * - * Copied from musl: src/math/ilogb.c */ int CDECL ilogb(double x) { - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) - { - u.i <<= 12; - if (u.i == 0) return FP_ILOGB0; - /* subnormal x */ - for (e = -0x3ff; u.i >> 63 == 0; e--, u.i <<= 1); - return e; - } - if (e == 0x7ff) return u.i << 12 ? FP_ILOGBNAN : INT_MAX; - return e - 0x3ff; + return __ilogb(x); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index fd82c5afb94..51fe7ef6f0f 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -387,14 +387,6 @@ static float CDECL unix_log2f(float x) #endif } -/********************************************************************* - * logb - */ -static double CDECL unix_logb( double x ) -{ - return logb( x ); -} - /********************************************************************* * logbf */ @@ -544,7 +536,6 @@ static const struct unix_funcs funcs = unix_log1pf, unix_log2, unix_log2f, - unix_logb, unix_logbf, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 95b4a6488de..a0cded99e20 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -56,7 +56,6 @@ struct unix_funcs float (CDECL *log1pf)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); - double (CDECL *logb)(double x); float (CDECL *logbf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y);

1 0

Piotr Caban : msvcp90: Depend on compiler to handle returning struct in _Getctype.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: dff85646517526562644c23648d11596daeb26d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff85646517526562644c236… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:26 2021 +0200 msvcp90: Depend on compiler to handle returning struct in _Getctype. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 22 ++++++++++++---------- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 6 +++--- 12 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1fc93b05438..c0a4910eb4b 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2916,7 +2916,7 @@ # extern _FXbig @ stub _GetLocaleForCP @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index aeab529d69a..33f93c9e8cf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3779,7 +3779,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0b1cb92f8ce..9dfe0b186c5 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3722,7 +3722,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index eefb9762708..e9ff7256419 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3722,7 +3722,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() msvcp120._Getcoll -@ cdecl _Getctype(ptr) msvcp120._Getctype +@ cdecl -norelay _Getctype() msvcp120._Getctype @ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index d2cb4dbed8c..343571ae401 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3650,7 +3650,7 @@ @ extern _FSnan @ cdecl _File_size(wstr) @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index de7aafa73b7..c616a10b4a4 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4275,7 +4275,7 @@ @ extern _FSnan _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d1a152ff0e3..a35949e15fb 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5062,7 +5062,7 @@ # extern _FXbig # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ extern _Hugeval @ extern _Inf diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 6176c9be2df..41c8bb01a9c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5116,7 +5116,7 @@ # extern _FXbig # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index f450286505a..020e8d26fc7 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5725,7 +5725,7 @@ @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2f6c103b2a2..ea0729cf4f9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -698,8 +698,9 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) } /* _Getctype */ -_Ctypevec* __cdecl _Getctype(_Ctypevec *ret) +_Ctypevec __cdecl _Getctype(void) { + _Ctypevec ret; short *table; #if _MSVCP_VER >= 110 wchar_t *name; @@ -708,24 +709,24 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) TRACE("\n"); - ret->page = ___lc_codepage_func(); + ret.page = ___lc_codepage_func(); #if _MSVCP_VER < 110 - ret->handle = ___lc_handle_func()[LC_COLLATE]; + ret.handle = ___lc_handle_func()[LC_COLLATE]; #else if((name = ___lc_locale_name_func()[LC_COLLATE])) { size = wcslen(name)+1; - ret->name = malloc(size*sizeof(*name)); - if(!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); - memcpy(ret->name, name, size*sizeof(*name)); + ret.name = malloc(size*sizeof(*name)); + if(!ret.name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(ret.name, name, size*sizeof(*name)); } else { - ret->name = NULL; + ret.name = NULL; } #endif - ret->delfl = TRUE; + ret.delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); memcpy(table, __pctype_func(), sizeof(short[256])); - ret->table = table; + ret.table = table; return ret; } @@ -734,7 +735,8 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) DEFINE_THISCALL_WRAPPER(_Locinfo__Getctype, 8) _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) { - return _Getctype(ret); + *ret = _Getctype(); + return ret; } /* _Getcvt */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 15b16ed7f12..1e79400e469 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6501,7 +6501,7 @@ @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 546f10f6858..40858bc5594 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -100,7 +100,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); -static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); +static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); static MSVCP__Collvec (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); @@ -584,7 +584,7 @@ static void test__Getctype(void) MSVCP__Ctypevec ret; _locale_t locale; - ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ret = p__Getctype(); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); @@ -594,7 +594,7 @@ static void test__Getctype(void) locale = p__get_current_locale(); locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; p__free_locale(locale); - ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ret = p__Getctype(); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl);

1 0

Piotr Caban : msvcp90: Depend on compiler in _Getcoll implementation if possible.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: 83cc0110f2662b5d8c3530e05de666d65d535bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cc0110f2662b5d8c3530e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:23 2021 +0200 msvcp90: Depend on compiler in _Getcoll implementation if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 13 ++++++++----- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 29 +++++++++++++---------------- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d964954dc1f..1fc93b05438 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2915,7 +2915,7 @@ @ extern _FSnan # extern _FXbig @ stub _GetLocaleForCP -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index cd2236fe389..aeab529d69a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3778,7 +3778,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 2c5e457b2fc..0b1cb92f8ce 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3721,7 +3721,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 93e172a944f..eefb9762708 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3721,7 +3721,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() msvcp120._Getcoll +@ cdecl -norelay _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype @ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 7e7ea012236..d2cb4dbed8c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3649,7 +3649,7 @@ @ stub _FSinh @ extern _FSnan @ cdecl _File_size(wstr) -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 628e5f7f59e..de7aafa73b7 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4274,7 +4274,7 @@ @ stub _FSinh @ extern _FSnan _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index c48945d9509..d1a152ff0e3 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5061,7 +5061,7 @@ @ extern _FSnan # extern _FXbig # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ extern _Hugeval diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index f9fc613b7d0..6176c9be2df 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5115,7 +5115,7 @@ @ extern _FSnan # extern _FXbig # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 74c0cac3669..f450286505a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5724,7 +5724,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index bd045333dfc..2f6c103b2a2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -669,20 +669,23 @@ static _Collvec* getcoll(_Collvec *ret) } /* _Getcoll */ -#if defined(__i386__) || _MSVCP_VER<110 +#if defined(__i386__) +/* Work around a gcc bug */ ULONGLONG __cdecl _Getcoll(void) { + C_ASSERT(sizeof(_Collvec) == sizeof(ULONGLONG)); ULONGLONG ret; - C_ASSERT(sizeof(_Collvec) <= sizeof(ULONGLONG)); - getcoll((_Collvec*)&ret); return ret; } #else -_Collvec* __cdecl _Getcoll(_Collvec *ret) +_Collvec __cdecl _Getcoll(void) { - return getcoll(ret); + _Collvec ret; + + getcoll(&ret); + return ret; } #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ff6fe952053..15b16ed7f12 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6500,7 +6500,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 9d6fe2b9bcc..546f10f6858 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -101,7 +101,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); -static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); +static MSVCP__Collvec (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); @@ -604,26 +604,23 @@ static void test__Getctype(void) static void test__Getcoll(void) { - ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); +#ifdef __i386__ + /* Workaround a gcc bug */ + ULONGLONG tmp; +#define call__Getcoll(ret) tmp = ((ULONGLONG (__cdecl*)(void))p__Getcoll)(); \ + memcpy(&ret, &tmp, sizeof(tmp)) +#else +#define call__Getcoll(ret) ret = p__Getcoll() +#endif _locale_t locale; - - union { - MSVCP__Collvec collvec; - ULONGLONG ull; - }ret; + MSVCP__Collvec ret; locale = p__get_current_locale(); locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; p__free_locale(locale); - ret.ull = 0; - p__Getcoll_arg = (void*)p__Getcoll; - p__Getcoll_arg(&ret.collvec); - ok(ret.collvec.handle == 0, "ret.handle = %x\n", ret.collvec.handle); - ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); - - ret.ull = p__Getcoll(); - ok(ret.collvec.handle == 0x7654321, "ret.collvec.handle = %x\n", ret.collvec.handle); - ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); + call__Getcoll(ret); + ok(ret.handle == 0x7654321, "ret.handle = %x\n", ret.handle); + ok(ret.page == 0, "ret.page = %x\n", ret.page); } static void test_towctrans(void)

1 0

Piotr Caban : msvcp90: Depend on compiler in _Getcvt implementation if possible.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: 24f7abafd754bb7d706f588e97532ce3169ade9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f7abafd754bb7d706f588e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:16 2021 +0200 msvcp90: Depend on compiler in _Getcvt implementation if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 38 +++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.spec | 2 +- 12 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 657cdc9f217..d964954dc1f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2917,7 +2917,7 @@ @ stub _GetLocaleForCP @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 834c4225373..cd2236fe389 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3780,7 +3780,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 633b3da8552..2c5e457b2fc 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 35e90cfa29c..495ee9dd6fb 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -209,7 +209,7 @@ static int (__cdecl *p__ismbblead)(unsigned int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); -static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); +static _Cvtvec (__cdecl *p__Getcvt)(void); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static void (CDECL *p__Do_call)(void *this); @@ -930,7 +930,7 @@ static void test__Getcvt(void) _Cvtvec cvtvec; int i; - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 0, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 1, "cvtvec.mb_max = %d\n", cvtvec.mb_max); todo_wine ok(cvtvec.unk == 1, "cvtvec.unk = %d\n", cvtvec.unk); @@ -941,7 +941,7 @@ static void test__Getcvt(void) win_skip("_Getcvt tests\n"); return; } - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); @@ -955,7 +955,7 @@ static void test__Getcvt(void) } p__setmbcp(936); - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index c35dcb2d427..93e172a944f 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype -@ cdecl -ret64 _Getcvt() msvcp120._Getcvt +@ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6ad46186cb5..7e7ea012236 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3651,7 +3651,7 @@ @ cdecl _File_size(wstr) @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index f3ed2e8b667..628e5f7f59e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4276,7 +4276,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf @ stub _LCosh diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d60e37bcff6..c48945d9509 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5063,7 +5063,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ extern _Hugeval @ extern _Inf @ stub _LCosh diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 1ccdd09825c..f9fc613b7d0 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5117,7 +5117,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index c1f409a1d78..74c0cac3669 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5726,7 +5726,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0d0af6eac34..bd045333dfc 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -735,9 +735,11 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) } /* _Getcvt */ -#if _MSVCP_VER < 110 +#if _MSVCP_VER < 110 && defined(__i386__) +/* Work around a gcc bug */ ULONGLONG __cdecl _Getcvt(void) { + C_ASSERT(sizeof(_Cvtvec) == sizeof(ULONGLONG)); union { _Cvtvec cvtvec; ULONGLONG ull; @@ -749,20 +751,32 @@ ULONGLONG __cdecl _Getcvt(void) ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; } +#elif _MSVCP_VER < 110 +_Cvtvec __cdecl _Getcvt(void) +{ + _Cvtvec ret; + + TRACE("\n"); + + ret.page = ___lc_codepage_func(); + ret.handle = ___lc_handle_func()[LC_CTYPE]; + return ret; +} #else -_Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) +_Cvtvec __cdecl _Getcvt(void) { + _Cvtvec ret; int i; TRACE("\n"); - memset(ret, 0, sizeof(*ret)); - ret->page = ___lc_codepage_func(); - ret->mb_max = ___mb_cur_max_func(); + memset(&ret, 0, sizeof(ret)); + ret.page = ___lc_codepage_func(); + ret.mb_max = ___mb_cur_max_func(); - if(ret->mb_max > 1) { + if(ret.mb_max > 1) { for(i=0; i<256; i++) - if(_ismbblead(i)) ret->isleadbyte[i/8] |= 1 << (i&7); + if(_ismbblead(i)) ret.isleadbyte[i/8] |= 1 << (i&7); } return ret; } @@ -773,14 +787,14 @@ _Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { -#if _MSVCP_VER < 110 - ULONGLONG ull = _Getcvt(); - memcpy(ret, &ull, sizeof(ull)); +#if _MSVCP_VER < 110 && defined(__i386__) + ULONGLONG cvtvec; #else _Cvtvec cvtvec; - _Getcvt(&cvtvec); - memcpy(ret, &cvtvec, sizeof(cvtvec)); #endif + + cvtvec = _Getcvt(); + memcpy(ret, &cvtvec, sizeof(cvtvec)); return ret; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 9274a24b706..ff6fe952053 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6502,7 +6502,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr)

1 0

Jacek Caban : vulkan-1/tests: Don't destroy device if it wasn't created.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: a0428db825a66a4d2e5e49a141cd54e406085ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0428db825a66a4d2e5e49a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 19 20:19:22 2021 +0200 vulkan-1/tests: Don't destroy device if it wasn't created. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 1d23c4112cf..f222c631232 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -455,7 +455,6 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ uint32_t queue_family_index; VkPresentModeKHR *modes; VkSurfaceKHR surface; - VkDevice vk_device; uint32_t count; VkRect2D rect; VkBool32 bval; @@ -506,6 +505,8 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ if (pvkGetPhysicalDevicePresentRectanglesKHR) { + VkDevice vk_device; + count = 0; vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); @@ -526,6 +527,15 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ vkDestroySurfaceKHR(vk_instance, surface, NULL); return; } + + if (0) + { + /* Causes access violation on Windows. */ + vr = vkGetDeviceGroupSurfacePresentModesKHR(vk_device, surface, &present_mode_flags); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); + } + + vkDestroyDevice(vk_device, NULL); } else { @@ -535,14 +545,6 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ win_skip("pvkGetPhysicalDevicePresentRectanglesKHR is no available.\n"); } - if (0) - { - /* Causes access violation on Windows. */ - vr = vkGetDeviceGroupSurfacePresentModesKHR(vk_device, surface, &present_mode_flags); - ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - } - - vkDestroyDevice(vk_device, NULL); vkDestroySurfaceKHR(vk_instance, surface, NULL); }

1 0

Rémi Bernon : user32/tests: Use int for wait_move_event delay type.
by Alexandre Julliard 20 May '21

20 May '21

Module: wine Branch: master Commit: ba7d543c5c1d8bf8d3cb1083ef780bc6294b7aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba7d543c5c1d8bf8d3cb1083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 20 16:36:55 2021 +0200 user32/tests: Use int for wait_move_event delay type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7eaa2c67945..469c193c1a3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12523,8 +12523,9 @@ done: static void wait_move_event(HWND hwnd, int x, int y) { MSG msg; - DWORD timeout = GetTickCount() + 500, delay; + DWORD timeout = GetTickCount() + 500; BOOL ret; + int delay; while ((delay = timeout - GetTickCount()) > 0) {

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
77
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 May 2021