June 2024 - Wine-commits - list.winehq.org

Shengdun Wang : ucrtbase: Fix FILE _flag values.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 1163e399376ab74eb38a6068daba69497b6b14be URL: https://gitlab.winehq.org/wine/wine/-/commit/1163e399376ab74eb38a6068daba69… Author: Shengdun Wang <uwgghhbcad(a)gmail.com> Date: Wed Jun 12 13:01:31 2024 +0200 ucrtbase: Fix FILE _flag values. --- dlls/msvcrt/msvcrt.h | 8 ++++++++ dlls/ucrtbase/tests/file.c | 2 +- include/msvcrt/stdio.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 35e6e8233a1..e95b824f3f3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -34,6 +34,14 @@ typedef struct _iobuf int _bufsiz; char* _tmpfname; } FILE; + +#define _IOREAD 0x0001 +#define _IOWRT 0x0002 +#define _IORW 0x0004 +#define _IOEOF 0x0008 +#define _IOERR 0x0010 +#define _IOMYBUF 0x0040 +#define _IOSTRG 0x1000 #endif #endif diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index c36ea51e825..e739934de02 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -110,7 +110,7 @@ static void test_iobuf_layout(void) ok(!(fp.iobuf->_flag & 0x40), "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); r = fprintf(fp.f, "%s", "init"); ok(r == 4, "fprintf returned %d\n", r); - todo_wine ok(fp.iobuf->_flag & 0x40, "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); + ok(fp.iobuf->_flag & 0x40, "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); ok(fp.iobuf->_cnt + 4 == fp.iobuf->_bufsiz, "_cnt = %d, _bufsiz = %d\n", fp.iobuf->_cnt, fp.iobuf->_bufsiz); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 745257ea5cc..73058a7b135 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -11,6 +11,7 @@ #include <corecrt_wstdio.h> /* file._flag flags */ +#ifndef _UCRT #define _IOREAD 0x0001 #define _IOWRT 0x0002 #define _IOMYBUF 0x0008 @@ -18,6 +19,7 @@ #define _IOERR 0x0020 #define _IOSTRG 0x0040 #define _IORW 0x0080 +#endif #define STDIN_FILENO 0 #define STDOUT_FILENO 1

1 0

Fabian Maurer : msvcrt: Fix _libm_sse2_sqrt_precise not using SSE2 sqrt.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 77f3c0826aca20e247f2e82263a5e39c26738894 URL: https://gitlab.winehq.org/wine/wine/-/commit/77f3c0826aca20e247f2e82263a5e3… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed Jun 12 19:02:22 2024 +0200 msvcrt: Fix _libm_sse2_sqrt_precise not using SSE2 sqrt. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56824 --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 738d4138c99..6624696c30f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2568,7 +2568,7 @@ void __cdecl __libm_sse2_sqrt_precise(void) __asm__ __volatile__( "movq %0,%%xmm0" : : "m" (d) ); return; } - __asm__ __volatile__( "call " __ASM_NAME( "asm_sqrt" ) ); + __asm__ __volatile__( "sqrtsd %xmm0, %xmm0" ); } #endif /* __i386__ */

1 0

Alex Henrie : ntdll: Don't call QueryRoutine if RTL_QUERY_REGISTRY_DIRECT is set.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: bc097ef81a12319141e1027ecc52ab7e7cd38a66 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc097ef81a12319141e1027ecc52ab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 11 23:40:15 2024 -0600 ntdll: Don't call QueryRoutine if RTL_QUERY_REGISTRY_DIRECT is set. --- dlls/ntdll/reg.c | 11 ++++------- dlls/ntdll/tests/reg.c | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 4af8f5edb9b..37619db2032 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -285,13 +285,10 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, res = 0; dst.MaximumLength = 0; RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res); - dst.Length = 0; - dst.MaximumLength = res; - dst.Buffer = RtlAllocateHeap(GetProcessHeap(), 0, res * sizeof(WCHAR)); - RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res); - status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, dst.Buffer, - dst.Length, pContext, pQuery->EntryContext); - RtlFreeHeap(GetProcessHeap(), 0, dst.Buffer); + if (str->MaximumLength < res) + return STATUS_BUFFER_TOO_SMALL; + RtlExpandEnvironmentStrings_U(pEnvironment, &src, str, &res); + break; } case REG_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3785070c962..acb6967fc7b 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2659,11 +2659,11 @@ static struct query_reg_values_test query_reg_values_tests[] = /* DIRECT doesn't call the query routine and reads directly into a buffer */ { {{ query_routine, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_INVALID_PARAMETER, 0, WINE_TODO_RET | WINE_TODO_CALLS | WINE_TODO_NAME | WINE_TODO_TYPE | WINE_TODO_SIZE | WINE_TODO_DATA + STATUS_INVALID_PARAMETER, 0, WINE_TODO_RET | WINE_TODO_NAME | WINE_TODO_TYPE | WINE_TODO_SIZE | WINE_TODO_DATA }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"WindowsDrive", &query_reg_values_direct_str }}, - STATUS_SUCCESS, 0, WINE_CRASH, REG_SZ, L"C:" + STATUS_SUCCESS, 0, 0, REG_SZ, L"C:" }, /* DIRECT on a multi-string crashes on Windows without NOEXPAND */ /* {

1 0

Alex Henrie : ntdll: Don't call a null QueryRoutine in RtlQueryRegistryValues.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 2bc3b7f8502a7ef9293f7a1f74fdf6f7430ad03b URL: https://gitlab.winehq.org/wine/wine/-/commit/2bc3b7f8502a7ef9293f7a1f74fdf6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 11 23:40:15 2024 -0600 ntdll: Don't call a null QueryRoutine in RtlQueryRegistryValues. --- dlls/ntdll/reg.c | 4 ++-- dlls/ntdll/tests/reg.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 37619db2032..d4bf530537a 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -265,7 +265,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, memcpy(str->Buffer, pQuery->DefaultData, default_size); return STATUS_SUCCESS; } - else + else if (pQuery->QueryRoutine) { status = pQuery->QueryRoutine(pQuery->Name, pQuery->DefaultType, pQuery->DefaultData, pQuery->DefaultLength, pContext, pQuery->EntryContext); @@ -336,7 +336,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, break; } } - else + else if (pQuery->QueryRoutine) { if((pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND) || (pInfo->Type != REG_EXPAND_SZ && pInfo->Type != REG_MULTI_SZ)) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index acb6967fc7b..58cefd6ed30 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2636,7 +2636,11 @@ static struct query_reg_values_test query_reg_values_tests[] = /* Name without query routine or DIRECT */ { {{ NULL, 0, (WCHAR*)L"WindowsDrive" }}, - STATUS_SUCCESS, 0, WINE_CRASH + STATUS_SUCCESS, 0 + }, + { + {{ NULL, 0, (WCHAR*)L"I don't exist", NULL, REG_SZ, (WCHAR*)L"Some default" }}, + STATUS_SUCCESS, 0 }, /* The query routine is called for every value in current key */ {

1 0

Alex Henrie : ntdll/tests: Remove unused WINE_CRASH flag.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: af33e3922c155747d49d2958081c47fcc372cfc8 URL: https://gitlab.winehq.org/wine/wine/-/commit/af33e3922c155747d49d2958081c47… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 11 23:40:15 2024 -0600 ntdll/tests: Remove unused WINE_CRASH flag. --- dlls/ntdll/tests/reg.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 58cefd6ed30..fe36ce41a29 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2548,7 +2548,6 @@ struct query_reg_values_test WINE_TODO_TYPE = 0x80, WINE_TODO_SIZE = 0x100, WINE_TODO_DATA = 0x200, - WINE_CRASH = 0x400, } flags; ULONG expected_type; @@ -2817,12 +2816,6 @@ static void test_RtlQueryRegistryValues(void) const WCHAR *expected_data; ULONG expected_size; - if ((test->flags & WINE_CRASH) && !strcmp(winetest_platform, "wine")) - { - skip("Currently crashes on Wine\n"); - continue; - } - winetest_push_context("%u/%Iu", i, ARRAY_SIZE(query_reg_values_tests) - 1); for (query = test->query_table; query->QueryRoutine || query->Name; query++)

1 0

Hans Leidekker : winscard: Pass ATR buffer to unixlib in SCardStatusA().
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: e6f9cb1e0935a0381ea54663dc61886677d1bb5a URL: https://gitlab.winehq.org/wine/wine/-/commit/e6f9cb1e0935a0381ea54663dc6188… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 11 10:18:20 2024 +0200 winscard: Pass ATR buffer to unixlib in SCardStatusA(). --- dlls/winscard/winscard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 7e53fba45f6..8749f5ea795 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -292,7 +292,7 @@ LONG WINAPI SCardStatusA( SCARDHANDLE connect, char *names, DWORD *names_len, DW params.names_len = &names_len_utf8; params.state = &state64; params.protocol = &protocol64; - params.atr = NULL; + params.atr = atr; if (!atr_len) params.atr_len = NULL; else {

1 0

Daniel Lehman : secur32: Allow overriding GnuTLS debug level.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 34a57da5925a513a8eb1d85926939bff591b9d53 URL: https://gitlab.winehq.org/wine/wine/-/commit/34a57da5925a513a8eb1d85926939b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sat May 18 16:36:41 2024 -0700 secur32: Allow overriding GnuTLS debug level. --- dlls/secur32/schannel_gnutls.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index fc16ded7a64..1af0682b269 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -1576,7 +1576,9 @@ static NTSTATUS process_attach( void *args ) if (TRACE_ON(secur32)) { - pgnutls_global_set_log_level(4); + char *env = getenv("GNUTLS_DEBUG_LEVEL"); + int level = env ? atoi(env) : 4; + pgnutls_global_set_log_level(level); pgnutls_global_set_log_function(gnutls_log); }

1 0

Daniel Lehman : bcrypt: Allow overriding GnuTLS debug level.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 24a956e6cbfe3b6e9ef8a90d07aca6272455a13b URL: https://gitlab.winehq.org/wine/wine/-/commit/24a956e6cbfe3b6e9ef8a90d07aca6… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon May 20 20:23:17 2024 -0700 bcrypt: Allow overriding GnuTLS debug level. --- dlls/bcrypt/gnutls.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 18ef70a7722..582b868a36e 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -466,7 +466,9 @@ static NTSTATUS gnutls_process_attach( void *args ) if (TRACE_ON( bcrypt )) { - pgnutls_global_set_log_level( 4 ); + char *env = getenv("GNUTLS_DEBUG_LEVEL"); + int level = env ? atoi(env) : 4; + pgnutls_global_set_log_level(level); pgnutls_global_set_log_function( gnutls_log ); }

1 0

Daniel Lehman : crypt32: Allow overriding GnuTLS debug level.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 99511bde634a9d5c47401d53ec88ceadb1e949ae URL: https://gitlab.winehq.org/wine/wine/-/commit/99511bde634a9d5c47401d53ec88ce… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon May 20 20:23:29 2024 -0700 crypt32: Allow overriding GnuTLS debug level. --- dlls/crypt32/unixlib.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/unixlib.c b/dlls/crypt32/unixlib.c index 72770caab5f..5a255442fdf 100644 --- a/dlls/crypt32/unixlib.c +++ b/dlls/crypt32/unixlib.c @@ -130,7 +130,9 @@ static NTSTATUS process_attach( void *args ) if (TRACE_ON( crypt )) { - pgnutls_global_set_log_level( 4 ); + char *env = getenv("GNUTLS_DEBUG_LEVEL"); + int level = env ? atoi(env) : 4; + pgnutls_global_set_log_level(level); pgnutls_global_set_log_function( gnutls_log ); }

1 0

Piotr Caban : msvcp140: Use _get_stream_buffer_pointers() to access FILE internal buffers.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 98e74c7842d124aa475c8cb9e5b47a34b96e0f63 URL: https://gitlab.winehq.org/wine/wine/-/commit/98e74c7842d124aa475c8cb9e5b47a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 11 19:18:53 2024 +0200 msvcp140: Use _get_stream_buffer_pointers() to access FILE internal buffers. --- dlls/msvcp90/ios.c | 16 +++++++++++++--- dlls/msvcp90/locale.c | 1 - dlls/msvcp90/msvcp90.h | 5 +++++ dlls/msvcp90/string.c | 1 - 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index d81e6367878..1bf1a41cca4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <stdio.h> #include <limits.h> #include <share.h> @@ -3028,8 +3027,19 @@ void __thiscall basic_filebuf_char__Init(basic_filebuf_char *this, FILE *file, b basic_streambuf_char__Init_empty(&this->base); if(file) - basic_streambuf_char__Init(&this->base, &file->_base, &file->_ptr, - &file->_cnt, &file->_base, &file->_ptr, &file->_cnt); + { + char **base, **ptr; + int *cnt; + +#if _MSVCP_VER >= 140 + _get_stream_buffer_pointers(file, &base, &ptr, &cnt); +#else + base = &file->_base; + ptr = &file->_ptr; + cnt = &file->_cnt; +#endif + basic_streambuf_char__Init(&this->base, base, ptr, cnt, base, ptr, cnt); + } } /* ?_Initcvt@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@IAEXPAV?$codecvt(a)DDH@2@@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 4eaf679139c..28a0db9d3bd 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -24,7 +24,6 @@ #include "limits.h" #include "math.h" #include "mbctype.h" -#include "stdio.h" #include "wchar.h" #include "wctype.h" #include "uchar.h" diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 54c66952a60..23ce63947e5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -17,6 +17,7 @@ */ #include "stdbool.h" +#include <stdio.h> #include "stdlib.h" #include "windef.h" #include "winbase.h" @@ -736,3 +737,7 @@ void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*); void DECLSPEC_NORETURN throw_exception(const char*); void DECLSPEC_NORETURN throw_failure(const char*); void DECLSPEC_NORETURN throw_range_error(const char*); + +#if _MSVCP_VER >= 140 +int CDECL _get_stream_buffer_pointers(FILE*,char***,char***,int**); +#endif diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 3384069bd03..10fae252380 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -19,7 +19,6 @@ #include <stdarg.h> #include "msvcp90.h" -#include "stdio.h" #include "windef.h" #include "winbase.h"

1 0