May 2021 - Wine-commits - list.winehq.org

Piotr Caban : msvcr120: Fix setting status word in fesetenv.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: cdcfba9ad9d01d02a829bbbb803f04265e37b00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdcfba9ad9d01d02a829bbbb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:19 2021 +0200 msvcr120: Fix setting status word in fesetenv. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e5c50efcf20..4281e460087 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2399,12 +2399,13 @@ int CDECL fesetenv(const fenv_t *env) case _RC_DOWN: fenv.control_word |= 0x400; break; } - fenv.status_word &= ~0x3d; - if (env->_Fe_stat & FE_INVALID) fenv.status_word |= 0x1; - if (env->_Fe_stat & FE_DIVBYZERO) fenv.status_word |= 0x4; - if (env->_Fe_stat & FE_OVERFLOW) fenv.status_word |= 0x8; - if (env->_Fe_stat & FE_UNDERFLOW) fenv.status_word |= 0x10; - if (env->_Fe_stat & FE_INEXACT) fenv.status_word |= 0x20; + fenv.status_word &= ~0x3f; + if (env->_Fe_stat & _SW_INVALID) fenv.status_word |= 0x1; + if (env->_Fe_stat & _SW_DENORMAL) fenv.status_word |= 0x2; + if (env->_Fe_stat & _SW_ZERODIVIDE) fenv.status_word |= 0x4; + if (env->_Fe_stat & _SW_OVERFLOW) fenv.status_word |= 0x8; + if (env->_Fe_stat & _SW_UNDERFLOW) fenv.status_word |= 0x10; + if (env->_Fe_stat & _SW_INEXACT) fenv.status_word |= 0x20; __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); @@ -2413,7 +2414,7 @@ int CDECL fesetenv(const fenv_t *env) { DWORD fpword; __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - fpword &= ~0x7e80; + fpword &= ~0x7ebf; if (env->_Fe_ctl & _EM_INVALID) fpword |= 0x80; if (env->_Fe_ctl & _EM_ZERODIVIDE) fpword |= 0x200; if (env->_Fe_ctl & _EM_OVERFLOW) fpword |= 0x400; @@ -2425,6 +2426,12 @@ int CDECL fesetenv(const fenv_t *env) case _RC_UP: fpword |= 0x4000; break; case _RC_DOWN: fpword |= 0x2000; break; } + if (env->_Fe_stat & _SW_INVALID) fpword |= 0x1; + if (env->_Fe_stat & _SW_DENORMAL) fpword |= 0x2; + if (env->_Fe_stat & _SW_ZERODIVIDE) fpword |= 0x4; + if (env->_Fe_stat & _SW_OVERFLOW) fpword |= 0x8; + if (env->_Fe_stat & _SW_UNDERFLOW) fpword |= 0x10; + if (env->_Fe_stat & _SW_INEXACT) fpword |= 0x20; __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); }

1 0

Piotr Caban : msvcr120: Add feupdateenv implementation.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 06f205d07850dfe4ad3850365258fe51c79bc026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06f205d07850dfe4ad385036… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:23 2021 +0200 msvcr120: Add feupdateenv implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 306bee5f50c..592a47c8d8f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2155,7 +2155,7 @@ @ cdecl fesetexceptflag(ptr long) @ cdecl fesetround(long) @ cdecl fetestexcept(long) -@ stub feupdateenv +@ cdecl feupdateenv(ptr) @ cdecl fflush(ptr) @ cdecl fgetc(ptr) @ cdecl fgetpos(ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b16d1a5b3f0..c716b426ba0 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1821,7 +1821,7 @@ @ cdecl fesetexceptflag(ptr long) msvcr120.fesetexceptflag @ cdecl fesetround(long) msvcr120.fesetround @ cdecl fetestexcept(long) msvcr120.fetestexcept -@ stub feupdateenv +@ cdecl feupdateenv(ptr) msvcr120.feupdateenv @ cdecl fflush(ptr) msvcr120.fflush @ cdecl fgetc(ptr) msvcr120.fgetc @ cdecl fgetpos(ptr ptr) msvcr120.fgetpos diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4281e460087..6f582b595cf 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2226,6 +2226,16 @@ int CDECL fegetenv(fenv_t *env) return 0; } +/********************************************************************* + * feupdateenv (MSVCR120.@) + */ +int CDECL feupdateenv(const fenv_t *env) +{ + fenv_t set = *env; + set._Fe_stat |= _statusfp(); + return fesetenv(&set); +} + /********************************************************************* * fetestexcept (MSVCR120.@) */

1 0

Piotr Caban : msvcr120: Add feupdateenv tests.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: cef4c8c38a664b27972954bc50a629b8dcdab04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef4c8c38a664b27972954bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:25 2021 +0200 msvcr120: Add feupdateenv tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 151989f8f74..e8002f6cb55 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -186,6 +186,7 @@ static int (CDECL *p_fegetexceptflag)(fexcept_t*,int); static int (CDECL *p_fesetexceptflag)(const fexcept_t*,int); static int (CDECL *p_fetestexcept)(int); static int (CDECL *p_feclearexcept)(int); +static int (CDECL *p_feupdateenv)(fenv_t*); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -265,6 +266,7 @@ static BOOL init(void) SET(p_fesetexceptflag, "fesetexceptflag"); SET(p_fetestexcept, "fetestexcept"); SET(p_feclearexcept, "feclearexcept"); + SET(p_feupdateenv, "feupdateenv"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -945,6 +947,22 @@ static void test_feenv(void) ok(!ret, "feclearexceptflag returned %x\n", ret); except = p_fetestexcept(FE_ALL_EXCEPT); ok(!except, "expected 0, got %lx\n", except); + + p__clearfp(); + except = FE_DIVBYZERO; + ret = p_fesetexceptflag(&except, FE_DIVBYZERO); + ok(!ret, "fesetexceptflag returned %x\n", ret); + ret = p_fegetenv(&env); + ok(!ret, "fegetenv returned %x\n", ret); + p__clearfp(); + except = FE_INVALID; + ret = p_fesetexceptflag(&except, FE_INVALID); + ok(!ret, "fesetexceptflag returned %x\n", ret); + ret = p_feupdateenv(&env); + ok(!ret, "feupdateenv returned %x\n", ret); + ret = _statusfp(); + ok(ret == (_EM_ZERODIVIDE | _EM_INVALID), "_statusfp returned %x\n", ret); + p__clearfp(); } static void test__wcreate_locale(void)

1 0

Piotr Caban : msvcr120: Add feraiseexcept implementation.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 0f721c2f0024c4e487e2b05d33d5673c387517a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f721c2f0024c4e487e2b05d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:28 2021 +0200 msvcr120: Add feraiseexcept implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 592a47c8d8f..3ed0aafdc3d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2149,7 +2149,7 @@ @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) -@ stub feraiseexcept +@ cdecl feraiseexcept(long) @ cdecl ferror(ptr) @ cdecl fesetenv(ptr) @ cdecl fesetexceptflag(ptr long) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c716b426ba0..8434c875107 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1815,7 +1815,7 @@ @ cdecl fegetround() msvcr120.fegetround @ stub feholdexcept @ cdecl feof(ptr) msvcr120.feof -@ stub feraiseexcept +@ cdecl feraiseexcept(long) msvcr120.feraiseexcept @ cdecl ferror(ptr) msvcr120.ferror @ cdecl fesetenv(ptr) msvcr120.fesetenv @ cdecl fesetexceptflag(ptr long) msvcr120.fesetexceptflag diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6f582b595cf..c2b9bc9675d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2261,6 +2261,18 @@ int CDECL fesetexceptflag(const fexcept_t *status, int excepts) return fesetenv(&env); } +/********************************************************************* + * feraiseexcept (MSVCR120.@) + */ +int CDECL feraiseexcept(int flags) +{ + fenv_t env; + + fegetenv(&env); + env._Fe_stat |= (flags & FE_ALL_EXCEPT); + return fesetenv(&env); +} + /********************************************************************* * feclearexcept (MSVCR120.@) */

1 0

Piotr Caban : msvcr120: Don't modify fenv_t members in math functions.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 593ddf0b6636cf4307816db5d05bfdf862bfb0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=593ddf0b6636cf4307816db5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:31 2021 +0200 msvcr120: Don't modify fenv_t members in math functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c2b9bc9675d..78d5580a0ec 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4750,12 +4750,8 @@ double CDECL acosh(double x) { if (x < 1) { - fenv_t env; - *_errno() = EDOM; - fegetenv(&env); - env._Fe_stat |= FE_INVALID; - fesetenv(&env); + feraiseexcept(FE_INVALID); return NAN; } return unix_funcs->acosh( x ); @@ -4768,12 +4764,8 @@ float CDECL acoshf(float x) { if (x < 1) { - fenv_t env; - *_errno() = EDOM; - fegetenv(&env); - env._Fe_stat |= FE_INVALID; - fesetenv(&env); + feraiseexcept(FE_INVALID); return NAN; } return unix_funcs->acoshf( x ); @@ -4787,14 +4779,9 @@ double CDECL atanh(double x) double ret; if (x > 1 || x < -1) { - fenv_t env; - *_errno() = EDOM; - /* on Linux atanh returns -NAN in this case */ - fegetenv(&env); - env._Fe_stat |= FE_INVALID; - fesetenv(&env); + feraiseexcept(FE_INVALID); return NAN; } ret = unix_funcs->atanh( x ); @@ -4811,13 +4798,8 @@ float CDECL atanhf(float x) float ret; if (x > 1 || x < -1) { - fenv_t env; - *_errno() = EDOM; - - fegetenv(&env); - env._Fe_stat |= FE_INVALID; - fesetenv(&env); + feraiseexcept(FE_INVALID); return NAN; }

1 0

Piotr Caban : msvcr120: Don't modify fenv_t members in _except1.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 29cbb60f6daaf721ac81733c023048bb6cd2660e URL: https://source.winehq.org/git/wine.git/?a=commit;h=29cbb60f6daaf721ac81733c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:34 2021 +0200 msvcr120: Don't modify fenv_t members in _except1. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 78d5580a0ec..ab5981174b4 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -4934,9 +4934,9 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, { ULONG_PTR exception_arg; DWORD exception = 0; - fenv_t env; DWORD fpword = 0; WORD operation; + int raise = 0; TRACE("(%x %x %lf %lf %x %p)\n", fpe, op, arg, res, cw, unk); @@ -4946,49 +4946,47 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, operation = op << 5; exception_arg = (ULONG_PTR)&operation; - fegetenv(&env); - if (fpe & 0x1) { /* overflow */ if ((fpe == 0x1 && (cw & 0x8)) || (fpe==0x11 && (cw & 0x28))) { /* 32-bit version also sets SW_INEXACT here */ - env._Fe_stat |= FE_OVERFLOW; - if (fpe & 0x10) env._Fe_stat |= FE_INEXACT; + raise |= FE_OVERFLOW; + if (fpe & 0x10) raise |= FE_INEXACT; res = signbit(res) ? -INFINITY : INFINITY; } else { exception = EXCEPTION_FLT_OVERFLOW; } } else if (fpe & 0x2) { /* underflow */ if ((fpe == 0x2 && (cw & 0x10)) || (fpe==0x12 && (cw & 0x30))) { - env._Fe_stat |= FE_UNDERFLOW; - if (fpe & 0x10) env._Fe_stat |= FE_INEXACT; + raise |= FE_UNDERFLOW; + if (fpe & 0x10) raise |= FE_INEXACT; res = signbit(res) ? -0.0 : 0.0; } else { exception = EXCEPTION_FLT_UNDERFLOW; } } else if (fpe & 0x4) { /* zerodivide */ if ((fpe == 0x4 && (cw & 0x4)) || (fpe==0x14 && (cw & 0x24))) { - env._Fe_stat |= FE_DIVBYZERO; - if (fpe & 0x10) env._Fe_stat |= FE_INEXACT; + raise |= FE_DIVBYZERO; + if (fpe & 0x10) raise |= FE_INEXACT; } else { exception = EXCEPTION_FLT_DIVIDE_BY_ZERO; } } else if (fpe & 0x8) { /* invalid */ if (fpe == 0x8 && (cw & 0x1)) { - env._Fe_stat |= FE_INVALID; + raise |= FE_INVALID; } else { exception = EXCEPTION_FLT_INVALID_OPERATION; } } else if (fpe & 0x10) { /* inexact */ if (fpe == 0x10 && (cw & 0x20)) { - env._Fe_stat |= FE_INEXACT; + raise |= FE_INEXACT; } else { exception = EXCEPTION_FLT_INEXACT_RESULT; } } if (exception) - env._Fe_stat = 0; - fesetenv(&env); + raise = 0; + feraiseexcept(raise); if (exception) RaiseException(exception, 0, 1, &exception_arg);

1 0

Piotr Caban : ucrtbase: Store sse and x87 status in fegetenv function family.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 1b7e93c4c29de37ea258a515bcca5ffdd18c85c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b7e93c4c29de37ea258a515… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:38 2021 +0200 ucrtbase: Store sse and x87 status in fegetenv function family. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 193 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b7e93c4c29de37ea258…

1 0

Piotr Caban : ucrtbase: Store sse and x87 exception in fexcept_t.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 90fd548d0ab00bcdd1ced37caa1d3cc5a682e366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90fd548d0ab00bcdd1ced37c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 13 18:46:41 2021 +0200 ucrtbase: Store sse and x87 exception in fexcept_t. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3792a09e526..2e827dd32c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2369,10 +2369,13 @@ int CDECL fesetexceptflag(const fexcept_t *status, int excepts) fegetenv(&env); #if _MSVCR_VER>=140 && (defined(__i386__) || defined(__x86_64__)) env._Fe_stat &= ~fenv_encode(excepts, excepts); - env._Fe_stat |= fenv_encode(*status & excepts, *status & excepts); + env._Fe_stat |= *status & fenv_encode(excepts, excepts); +#elif _MSVCR_VER>=140 + env._Fe_stat &= ~fenv_encode(0, excepts); + env._Fe_stat |= *status & fenv_encode(0, excepts); #else env._Fe_stat &= ~excepts; - env._Fe_stat |= (*status & excepts); + env._Fe_stat |= *status & excepts; #endif return fesetenv(&env); } @@ -2418,7 +2421,15 @@ int CDECL feclearexcept(int flags) */ int CDECL fegetexceptflag(fexcept_t *status, int excepts) { +#if _MSVCR_VER>=140 && defined(__i386__) + unsigned int x87, sse; + _statusfp2(&x87, &sse); + *status = fenv_encode(x87 & excepts, sse & excepts); +#elif _MSVCR_VER>=140 + *status = fenv_encode(0, _statusfp() & excepts); +#else *status = _statusfp() & excepts; +#endif return 0; } #endif

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: c1071b1a377ed04886a303e6560c2d19d99d003f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1071b1a377ed04886a303e6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 13 19:50:07 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index afadedd5dc1..203a71c0e70 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-04-30 09:04+0300\n" +"PO-Revision-Date: 2021-05-13 19:49+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14523,10 +14523,8 @@ msgid "reg: Unsupported registry data type [%1]\n" msgstr "reg: Nepalaikomas registro duomenų tipas [%1]\n" #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: Už parametro [/d] privalo būti tinkama šešioliktainė reikšmė\n" +msgstr "reg: Už parametro [/d] privalo būti tinkama skaitinė reikšmė\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" @@ -14565,10 +14563,8 @@ msgid "reg: The option [/d] must be followed by a valid string\n" msgstr "reg: Už parametro [/d] privalo būti tinkama eilutė\n" #: programs/reg/reg.rc:135 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: Nepavyko pašalinti registro rakto „%1“.\n" +msgstr "reg: Nepavyko pašalinti visų „%1“ registro reikšmių\n" #: programs/reg/reg.rc:136 msgid ""

1 0

Zhiyi Zhang : include: Add fUseStandardBidi field in SCRIPT_CONTROL.
by Alexandre Julliard 13 May '21

13 May '21

Module: wine Branch: master Commit: 7529f46a850bc43982b8c5a5a236c880049d274e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7529f46a850bc43982b8c5a5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 13 18:37:38 2021 +0800 include: Add fUseStandardBidi field in SCRIPT_CONTROL. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/usp10.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/usp10.h b/include/usp10.h index 09416aefe06..b1ff458b598 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -98,7 +98,8 @@ typedef struct tag_SCRIPT_CONTROL { DWORD fNumericOverride :1; DWORD fLegacyBidiClass :1; DWORD fMergeNeutralItems :1; - DWORD fReserved :7; + DWORD fUseStandardBidi :1; + DWORD fReserved :6; } SCRIPT_CONTROL; typedef struct {

1 0