wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Francois Gouget : testbot/WinRun*: Simplify LogTaskError().
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: tools Branch: master Commit: 11b596f4425ff2c70da2f312529adabfe43a025d URL: https://source.winehq.org/git/tools.git/?a=commit;h=11b596f4425ff2c70da2f31… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 03:32:20 2021 +0100 testbot/WinRun*: Simplify LogTaskError(). The TestBot engine redirects stderr to testbot.log so there is no need to manually open and append to that file. This also makes the Debug() call in LogTaskError() redundant. Add the "tool:error:" prefix. This clarifies which errors come from the script, and which come from the TestBot Engine. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48658 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 14 +------------- testbot/bin/WineRunReconfig.pl | 14 +------------- testbot/bin/WineRunTask.pl | 14 +------------- testbot/bin/WineRunWineTest.pl | 12 +----------- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2764ffc..ff13052 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -178,19 +178,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2d45ed5..49e7305 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -179,19 +179,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } sub WrapUpAndExit($;$$$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3036488..6056806 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -207,19 +207,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - my $OldUMask = umask(002); - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } - umask($OldUMask); + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames; diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index bcf89bf..7892bca 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -204,17 +204,7 @@ LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; sub LogTaskError($) { my ($ErrMessage) = @_; - Debug("$Name0:error: ", $ErrMessage); - - if (open(my $ErrFile, ">>", "$TaskDir/testbot.log")) - { - print $ErrFile $ErrMessage; - close($ErrFile); - } - else - { - Error "Unable to open 'testbot.log' for writing: $!\n"; - } + print STDERR "$Name0:error: ", $ErrMessage; } my $ReportNames;

1 0

Henri Verbeet : vkd3d-shader: Implement relative addressing of tessellation control shader inputs.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: vkd3d Branch: master Commit: 0c73afd424039a88ae41fa0bcd3b549a525c2ad5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0c73afd424039a88ae41fa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 19:24:17 2021 +0100 vkd3d-shader: Implement relative addressing of tessellation control shader inputs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 153 +++++++++++++++++++++++++++++++++++++++++----- tests/d3d12.c | 2 +- 2 files changed, 138 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0c73afd424039a88ae4…

1 0

Henri Verbeet : tests: Add a test for relative addressing of tessellation control shader inputs.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: vkd3d Branch: master Commit: 88fd3b3e1b801e5bff7fdbc63b1f37b7f912b787 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=88fd3b3e1b801e5bff7fdbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 19:24:16 2021 +0100 tests: Add a test for relative addressing of tessellation control shader inputs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 250 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=88fd3b3e1b801e5bff7…

1 0

Jefferson Carpenter : msxml3: Fold in reset_output_buffer.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: 433b9081ba7c862feb947400f507228e793d7d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=433b9081ba7c862feb947400… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Feb 2 19:01:10 2021 +0000 msxml3: Fold in reset_output_buffer. Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 029e9aac0d0..ac3c0fa59c3 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -693,14 +693,6 @@ static inline HRESULT flush_output_buffer(mxwriter *This) return write_data_to_stream(This); } -/* Resets the mxwriter's output buffer by closing it, then creating a new - * output buffer using the given encoding. - */ -static inline void reset_output_buffer(mxwriter *This) -{ - close_output_buffer(This); -} - static HRESULT writer_set_property(mxwriter *writer, mxwriter_prop property, VARIANT_BOOL value) { writer->props[property] = value; @@ -927,7 +919,7 @@ static HRESULT WINAPI mxwriter_put_output(IMXWriter *iface, VARIANT dest) { if (This->dest) IStream_Release(This->dest); This->dest = NULL; - reset_output_buffer(This); + close_output_buffer(This); break; } case VT_UNKNOWN: @@ -938,7 +930,7 @@ static HRESULT WINAPI mxwriter_put_output(IMXWriter *iface, VARIANT dest) if (hr == S_OK) { /* Recreate the output buffer to make sure it's using the correct encoding. */ - reset_output_buffer(This); + close_output_buffer(This); if (This->dest) IStream_Release(This->dest); This->dest = stream; @@ -1028,7 +1020,7 @@ static HRESULT WINAPI mxwriter_put_encoding(IMXWriter *iface, BSTR encoding) This->xml_enc = enc; TRACE("got encoding %d\n", This->xml_enc); - reset_output_buffer(This); + close_output_buffer(This); return S_OK; } @@ -1229,7 +1221,7 @@ static HRESULT WINAPI SAXContentHandler_startDocument(ISAXContentHandler *iface) * be how Windows works. */ if (This->prop_changed) { - reset_output_buffer(This); + close_output_buffer(This); This->prop_changed = FALSE; }

1 0

Hans Leidekker : wbemprox: Report the real OS version.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: ba06f7a541c44343a9751cc6105211c1ef058c49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba06f7a541c44343a9751cc6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 2 14:25:20 2021 +0100 wbemprox: Report the real OS version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50580 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9ae34a50c0d..f1cf75ab380 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3514,13 +3514,13 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct { struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; - OSVERSIONINFOEXW ver; + RTL_OSVERSIONINFOEXW ver; UINT row = 0; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; ver.dwOSVersionInfoSize = sizeof(ver); - GetVersionExW( (OSVERSIONINFOW *)&ver ); + RtlGetVersion( &ver ); rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver );

1 0

Piotr Caban : msvcrt: Improve __libm_sse2_sqrt_precise implementation.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: e3772c917ef345039b8422b6e16c1c48f7834f82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3772c917ef345039b8422b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 1 20:47:24 2021 +0100 msvcrt: Improve __libm_sse2_sqrt_precise implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a4519c03607..0f41cbac468 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1165,13 +1165,14 @@ double CDECL sinh( double x ) return ret; } -static inline double CDECL ret_nan( void ) +static inline double CDECL ret_nan( BOOL update_sw ) { double x = 1.0; + if (!update_sw) return -NAN; return (x - x) / (x - x); } -BOOL sqrt_validate( double *x ) +BOOL sqrt_validate( double *x, BOOL update_sw ) { short c = _dclass(*x); @@ -1179,7 +1180,8 @@ BOOL sqrt_validate( double *x ) if (c == FP_NAN) { #ifdef __i386__ - *x = math_error(_DOMAIN, "sqrt", *x, 0, *x); + if (update_sw) + *x = math_error(_DOMAIN, "sqrt", *x, 0, *x); #else /* set signaling bit */ *(ULONGLONG*)x |= 0x8000000000000ULL; @@ -1188,14 +1190,14 @@ BOOL sqrt_validate( double *x ) } if (signbit(*x)) { - *x = math_error(_DOMAIN, "sqrt", *x, 0, ret_nan()); + *x = math_error(_DOMAIN, "sqrt", *x, 0, ret_nan(update_sw)); return FALSE; } if (c == FP_INFINITE) return FALSE; return TRUE; } -#if defined(__x86_64__) +#if defined(__x86_64__) || defined(__i386__) double CDECL sse2_sqrt(double); __ASM_GLOBAL_FUNC( sse2_sqrt, "sqrtsd %xmm0, %xmm0\n\t" @@ -1241,12 +1243,12 @@ __ASM_GLOBAL_FUNC( x87_sqrt, double CDECL sqrt( double x ) { #ifdef __x86_64__ - if (!sqrt_validate(&x)) + if (!sqrt_validate(&x, TRUE)) return x; return sse2_sqrt(x); #elif defined( __i386__ ) - if (!sqrt_validate(&x)) + if (!sqrt_validate(&x, TRUE)) return x; return x87_sqrt(x); @@ -1259,7 +1261,7 @@ double CDECL sqrt( double x ) unsigned int r,t1,s1,ix1,q1; ULONGLONG ix; - if (!sqrt_validate(&x)) + if (!sqrt_validate(&x, TRUE)) return x; ix = *(ULONGLONG*)&x; @@ -3344,12 +3346,25 @@ void __cdecl __libm_sse2_tanf(void) */ void __cdecl __libm_sse2_sqrt_precise(void) { + unsigned int cw; double d; + __asm__ __volatile__( "movq %%xmm0,%0" : "=m" (d) ); - d = sqrt( d ); - __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); -} + __control87_2(0, 0, NULL, &cw); + if (cw & _MCW_RC) + { + d = sqrt(d); + __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); + return; + } + if (!sqrt_validate(&d, FALSE)) + { + __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); + return; + } + __asm__ __volatile__( "call " __ASM_NAME( "sse2_sqrt" ) ); +} #endif /* __i386__ */ /*********************************************************************

1 0

Piotr Caban : msvcrt: Improve sqrt accuracy and performance on i386.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: ba3cc1274d2267355636e5d4eafc5ac69950859c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba3cc1274d2267355636e5d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 1 20:47:14 2021 +0100 msvcrt: Improve sqrt accuracy and performance on i386. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 32971f73543..a4519c03607 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1202,6 +1202,37 @@ __ASM_GLOBAL_FUNC( sse2_sqrt, "ret" ) #endif +#ifdef __i386__ +#define SET_X87_CW \ + "subl $4, %esp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "fnstcw (%esp)\n\t" \ + "movw (%esp), %ax\n\t" \ + "testw $0xc00, %ax\n\t" \ + "jz 1f\n\t" \ + "andw $0xf3ff, %ax\n\t" \ + "movw %ax, 2(%esp)\n\t" \ + "fldcw 2(%esp)\n\t" \ + "1:\n\t" + +#define RESET_X87_CW \ + "movw (%esp), %ax\n\t" \ + "testw $0xc00, %ax\n\t" \ + "jz 1f\n\t" \ + "fldcw (%esp)\n\t" \ + "1:\n\t" \ + "addl $4, %esp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + +double CDECL x87_sqrt(double); +__ASM_GLOBAL_FUNC( x87_sqrt, + "fldl 4(%esp)\n\t" + SET_X87_CW + "fsqrt\n\t" + RESET_X87_CW + "ret" ) +#endif + /********************************************************************* * sqrt (MSVCRT.@) * @@ -1214,6 +1245,11 @@ double CDECL sqrt( double x ) return x; return sse2_sqrt(x); +#elif defined( __i386__ ) + if (!sqrt_validate(&x)) + return x; + + return x87_sqrt(x); #else static const double tiny = 1.0e-300;

1 0

Piotr Caban : msvcrt: Imporve sqrt accuracy and performance on x86_64.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: e53c4bd50921f9eedddb316644dd7847d67e0105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e53c4bd50921f9eedddb3166… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 1 20:47:08 2021 +0100 msvcrt: Imporve sqrt accuracy and performance on x86_64. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 88 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 66fd3b5c036..32971f73543 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1165,6 +1165,43 @@ double CDECL sinh( double x ) return ret; } +static inline double CDECL ret_nan( void ) +{ + double x = 1.0; + return (x - x) / (x - x); +} + +BOOL sqrt_validate( double *x ) +{ + short c = _dclass(*x); + + if (c == FP_ZERO) return FALSE; + if (c == FP_NAN) + { +#ifdef __i386__ + *x = math_error(_DOMAIN, "sqrt", *x, 0, *x); +#else + /* set signaling bit */ + *(ULONGLONG*)x |= 0x8000000000000ULL; +#endif + return FALSE; + } + if (signbit(*x)) + { + *x = math_error(_DOMAIN, "sqrt", *x, 0, ret_nan()); + return FALSE; + } + if (c == FP_INFINITE) return FALSE; + return TRUE; +} + +#if defined(__x86_64__) +double CDECL sse2_sqrt(double); +__ASM_GLOBAL_FUNC( sse2_sqrt, + "sqrtsd %xmm0, %xmm0\n\t" + "ret" ) +#endif + /********************************************************************* * sqrt (MSVCRT.@) * @@ -1172,6 +1209,12 @@ double CDECL sinh( double x ) */ double CDECL sqrt( double x ) { +#ifdef __x86_64__ + if (!sqrt_validate(&x)) + return x; + + return sse2_sqrt(x); +#else static const double tiny = 1.0e-300; double z; @@ -1180,21 +1223,13 @@ double CDECL sqrt( double x ) unsigned int r,t1,s1,ix1,q1; ULONGLONG ix; + if (!sqrt_validate(&x)) + return x; + ix = *(ULONGLONG*)&x; ix0 = ix >> 32; ix1 = ix; - /* take care of Inf and NaN */ - if (isnan(x) || (isinf(x) && x > 0)) - return x; - - /* take care of zero */ - if (ix0 <= 0) { - if (((ix0 & ~sign) | ix1) == 0) - return x; /* sqrt(+-0) = +-0 */ - if (ix0 < 0) - return math_error(_DOMAIN, "sqrt", x, 0, (x - x) / (x - x)); - } /* normalize x */ m = ix0 >> 20; if (m == 0) { /* subnormal x */ @@ -1278,6 +1313,7 @@ double CDECL sqrt( double x ) ix <<= 32; ix |= ix1; return *(double*)&ix; +#endif } /********************************************************************* @@ -3424,6 +3460,21 @@ __int64 CDECL llrintf(float x) return unix_funcs->llrintf( x ); } +/********************************************************************* + * _dclass (MSVCR120.@) + * + * Copied from musl: src/math/__fpclassify.c + */ +short CDECL _dclass(double x) +{ + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; + if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; + return FP_NORMAL; +} + #if _MSVCR_VER>=120 /********************************************************************* @@ -3490,21 +3541,6 @@ float CDECL truncf(float x) return unix_funcs->truncf(x); } -/********************************************************************* - * _dclass (MSVCR120.@) - * - * Copied from musl: src/math/__fpclassify.c - */ -short CDECL _dclass(double x) -{ - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) return u.i << 1 ? FP_SUBNORMAL : FP_ZERO; - if (e == 0x7ff) return (u.i << 12) ? FP_NAN : FP_INFINITE; - return FP_NORMAL; -} - /********************************************************************* * _fdclass (MSVCR120.@) *

1 0

Piotr Caban : msvcr110: Copy utf16 strings in _Gettnames.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: b3fcb0f2c854311bd1604df958a6425c22c657b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3fcb0f2c854311bd1604df9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:55:33 2021 +0100 msvcr110: Copy utf16 strings in _Gettnames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50409 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 13 ++++++++++--- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/tests/locale.c | 4 ++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 5976a86963a..a68870ac77b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -171,6 +171,7 @@ static int (__cdecl *p__dpcomp)(double x, double y); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); static void* (CDECL *p__W_Gettnames)(void); +static void* (CDECL *p__Gettnames)(void); static void (CDECL *p_free)(void*); static float (CDECL *p_strtof)(const char *, char **); static int (CDECL *p__finite)(double); @@ -242,6 +243,7 @@ static BOOL init(void) p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency@details@Concurrency@@YAIXZ"); p__W_Gettnames = (void*)GetProcAddress(module, "_W_Gettnames"); + p__Gettnames = (void*)GetProcAddress(module, "_Gettnames"); p_free = (void*)GetProcAddress(module, "free"); p_strtof = (void*)GetProcAddress(module, "strtof"); p__finite = (void*)GetProcAddress(module, "_finite"); @@ -531,7 +533,7 @@ static void test__GetConcurrency(void) ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); } -static void test__W_Gettnames(void) +static void test_gettnames(void* (CDECL *p_gettnames)(void)) { static const char *str[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", @@ -557,7 +559,7 @@ static void test__W_Gettnames(void) if(!p_setlocale(LC_ALL, "english")) return; - ret = p__W_Gettnames(); + ret = p_gettnames(); size = ret->str[0]-(char*)ret; if(sizeof(void*) == 8) ok(size==0x2c0, "structure size: %x\n", size); @@ -572,6 +574,10 @@ static void test__W_Gettnames(void) ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } + + ok(ret->str[42] + strlen(ret->str[42])+1 == (char*)ret->wstr[0], + "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + ret->str[42], strlen(ret->str[42]), ret->wstr[0]); p_free(ret); p_setlocale(LC_ALL, "C"); @@ -1111,7 +1117,8 @@ START_TEST(msvcr120) test__dpcomp(); test____lc_locale_name_func(); test__GetConcurrency(); - test__W_Gettnames(); + test_gettnames(p__W_Gettnames); + test_gettnames(p__Gettnames); test__strtof(); test_remainder(); test_critical_section(); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 79a8d47d6d5..5a4a701dfc6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -804,6 +804,10 @@ void* CDECL _Gettnames(void) for(i=0; i<ARRAY_SIZE(cur->str.str); i++) size += strlen(cur->str.str[i])+1; +#if _MSVCR_VER >= 110 + for(i=0; i<ARRAY_SIZE(cur->wstr.wstr); i++) + size += (wcslen(cur->wstr.wstr[i]) + 1) * sizeof(wchar_t); +#endif ret = malloc(size); if(!ret) @@ -817,6 +821,14 @@ void* CDECL _Gettnames(void) ret->str.str[i] = &ret->data[size]; size += len; } +#if _MSVCR_VER >= 110 + for(i=0; i<ARRAY_SIZE(cur->wstr.wstr); i++) { + len = (wcslen(cur->wstr.wstr[i]) + 1) * sizeof(wchar_t); + memcpy(&ret->data[size], cur->wstr.wstr[i], len); + ret->wstr.wstr[i] = (wchar_t*)&ret->data[size]; + size += len; + } +#endif return ret; } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 176e3b5e6e4..030d65de3cb 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -733,6 +733,10 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); } + ok(ret->wstr[0] != NULL, "ret->wstr[0] = NULL\n"); + ok(ret->str[42] + strlen(ret->str[42])+1 != (char*)ret->wstr[0], + "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + ret->str[42], strlen(ret->str[42]), ret->wstr[0]); free(ret); if(!setlocale(LC_TIME, "german"))

1 0

Piotr Caban : msvcrt: Make __lc_time_data more similar to native.
by Alexandre Julliard 02 Feb '21

02 Feb '21

Module: wine Branch: master Commit: 859261f4809a47fd030b605a6e418b7ac52f0790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=859261f4809a47fd030b605a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:55:12 2021 +0100 msvcrt: Make __lc_time_data more similar to native. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 6 ++++++ dlls/msvcrt/msvcrt.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ba98d31d719..79a8d47d6d5 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -63,12 +63,14 @@ __lc_time_data cloc_time_data = MAKELCID(LANG_ENGLISH, SORT_DEFAULT), #endif 1, 0, +#if _MSVCR_VER == 0 || _MSVCR_VER >= 100 {{L"Sun", L"Mon", L"Tue", L"Wed", L"Thu", L"Fri", L"Sat", L"Sunday", L"Monday", L"Tuesday", L"Wednesday", L"Thursday", L"Friday", L"Saturday", L"Jan", L"Feb", L"Mar", L"Apr", L"May", L"Jun", L"Jul", L"Aug", L"Sep", L"Oct", L"Nov", L"Dec", L"January", L"February", L"March", L"April", L"May", L"June", L"July", L"August", L"September", L"October", L"November", L"December", L"AM", L"PM", L"MM/dd/yy", L"dddd, MMMM dd, yyyy", L"HH:mm:ss"}}, +#endif #if _MSVCR_VER >= 110 L"en-US", #endif @@ -1184,10 +1186,12 @@ static __lc_time_data* create_time_data(LCID lcid) return NULL; size += ret; +#if _MSVCR_VER == 0 || _MSVCR_VER >= 100 ret = GetLocaleInfoW(lcid, time_data[i], NULL, 0); if(!ret) return NULL; size += ret*sizeof(wchar_t); +#endif } #if _MSVCR_VER >= 110 size += LCIDToLocaleName(lcid, NULL, 0, 0)*sizeof(wchar_t); @@ -1202,11 +1206,13 @@ static __lc_time_data* create_time_data(LCID lcid) cur->str.str[i] = &cur->data[ret]; ret += GetLocaleInfoA(lcid, time_data[i], &cur->data[ret], size-ret); } +#if _MSVCR_VER == 0 || _MSVCR_VER >= 100 for(i=0; i<ARRAY_SIZE(time_data); i++) { cur->wstr.wstr[i] = (wchar_t*)&cur->data[ret]; ret += GetLocaleInfoW(lcid, time_data[i], (wchar_t*)&cur->data[ret], size-ret)*sizeof(wchar_t); } +#endif #if _MSVCR_VER >= 110 cur->locname = (wchar_t*)&cur->data[ret]; LCIDToLocaleName(lcid, (wchar_t*)&cur->data[ret], (size-ret)/sizeof(wchar_t), 0); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c360943b1f0..0a742807430 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -66,6 +66,7 @@ typedef struct __lc_time_data { #endif int unk; int refcount; +#if _MSVCR_VER == 0 || _MSVCR_VER >= 100 union { const wchar_t *wstr[43]; struct { @@ -80,6 +81,7 @@ typedef struct __lc_time_data { const wchar_t *time; } names; } wstr; +#endif #if _MSVCR_VER >= 110 const wchar_t *locname; #endif

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
92
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 February 2021