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

Alex Henrie : ntdll: Don't call QueryRoutine if RTL_QUERY_REGISTRY_DIRECT is set.
by Alexandre Julliard June 12, 2024

June 12, 2024

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

Piotr Caban : msvcrt: Don't use custom standard streams definition.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: 6033839816018c0f91cb2cbf67a66481ddef4d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/6033839816018c0f91cb2cbf67a664… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 11 20:31:33 2024 +0200 msvcrt: Don't use custom standard streams definition. --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 56 ++++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 9 ++++----- dlls/msvcrt/scanf.c | 16 +++++++-------- dlls/msvcrt/scanf.h | 4 ++-- 5 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index cf1e7caeb06..c8db6c405da 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -302,7 +302,7 @@ void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, u DoMessageBoxW(L"Assertion failed!", text); } else - fwprintf(MSVCRT_stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line); + fwprintf(stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line); raise(SIGABRT); _exit(3); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 24cca6fb63e..2075d0b4288 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3915,7 +3915,7 @@ int CDECL _fgetc_nolock(FILE* file) */ int CDECL _fgetchar(void) { - return fgetc(MSVCRT_stdin); + return fgetc(stdin); } /********************************************************************* @@ -4047,7 +4047,7 @@ wint_t CDECL getwc(FILE* file) */ wint_t CDECL _fgetwchar(void) { - return fgetwc(MSVCRT_stdin); + return fgetwc(stdin); } /********************************************************************* @@ -4266,7 +4266,7 @@ wint_t CDECL _fputwc_nolock(wint_t wc, FILE* file) */ wint_t CDECL _fputwchar(wint_t wc) { - return fputwc(wc, MSVCRT_stdout); + return fputwc(wc, stdout); } /********************************************************************* @@ -4424,7 +4424,7 @@ int CDECL _fputc_nolock(int c, FILE* file) */ int CDECL _fputchar(int c) { - return fputc(c, MSVCRT_stdout); + return fputc(c, stdout); } /********************************************************************* @@ -4839,7 +4839,7 @@ int CDECL fputws(const wchar_t *s, FILE* file) */ int CDECL getchar(void) { - return fgetc(MSVCRT_stdin); + return fgetc(stdin); } /********************************************************************* @@ -4861,10 +4861,10 @@ char * CDECL gets_s(char *buf, size_t len) if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL; if (!MSVCRT_CHECK_PMT(len != 0)) return NULL; - _lock_file(MSVCRT_stdin); - for(cc = _fgetc_nolock(MSVCRT_stdin); + _lock_file(stdin); + for(cc = _fgetc_nolock(stdin); len != 0 && cc != EOF && cc != '\n'; - cc = _fgetc_nolock(MSVCRT_stdin)) + cc = _fgetc_nolock(stdin)) { if (cc != '\r') { @@ -4872,7 +4872,7 @@ char * CDECL gets_s(char *buf, size_t len) len--; } } - _unlock_file(MSVCRT_stdin); + _unlock_file(stdin); if (!len) { @@ -4908,14 +4908,14 @@ wchar_t* CDECL _getws(wchar_t* buf) wint_t cc; wchar_t* ws = buf; - _lock_file(MSVCRT_stdin); - for (cc = _fgetwc_nolock(MSVCRT_stdin); cc != WEOF && cc != '\n'; - cc = _fgetwc_nolock(MSVCRT_stdin)) + _lock_file(stdin); + for (cc = _fgetwc_nolock(stdin); cc != WEOF && cc != '\n'; + cc = _fgetwc_nolock(stdin)) { if (cc != '\r') *buf++ = (wchar_t)cc; } - _unlock_file(MSVCRT_stdin); + _unlock_file(stdin); if ((cc == WEOF) && (ws == buf)) { @@ -4941,7 +4941,7 @@ int CDECL putc(int c, FILE* file) */ int CDECL putchar(int c) { - return fputc(c, MSVCRT_stdout); + return fputc(c, stdout); } /********************************************************************* @@ -4952,14 +4952,14 @@ int CDECL puts(const char *s) size_t len = strlen(s); int ret; - _lock_file(MSVCRT_stdout); - if(_fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { - _unlock_file(MSVCRT_stdout); + _lock_file(stdout); + if(_fwrite_nolock(s, sizeof(*s), len, stdout) != len) { + _unlock_file(stdout); return EOF; } - ret = _fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : EOF; - _unlock_file(MSVCRT_stdout); + ret = _fwrite_nolock("\n",1,1,stdout) == 1 ? 0 : EOF; + _unlock_file(stdout); return ret; } @@ -4970,11 +4970,11 @@ int CDECL _putws(const wchar_t *s) { int ret; - _lock_file(MSVCRT_stdout); - ret = fputws(s, MSVCRT_stdout); + _lock_file(stdout); + ret = fputws(s, stdout); if(ret >= 0) - ret = _fputwc_nolock('\n', MSVCRT_stdout); - _unlock_file(MSVCRT_stdout); + ret = _fputwc_nolock('\n', stdout); + _unlock_file(stdout); return ret >= 0 ? 0 : WEOF; } @@ -5546,7 +5546,7 @@ int CDECL _vfwprintf_p(FILE* file, const wchar_t *format, va_list valist) */ int CDECL vprintf(const char *format, va_list valist) { - return vfprintf(MSVCRT_stdout,format,valist); + return vfprintf(stdout,format,valist); } /********************************************************************* @@ -5554,7 +5554,7 @@ int CDECL vprintf(const char *format, va_list valist) */ int CDECL vprintf_s(const char *format, va_list valist) { - return vfprintf_s(MSVCRT_stdout,format,valist); + return vfprintf_s(stdout,format,valist); } /********************************************************************* @@ -5562,7 +5562,7 @@ int CDECL vprintf_s(const char *format, va_list valist) */ int CDECL vwprintf(const wchar_t *format, va_list valist) { - return vfwprintf(MSVCRT_stdout,format,valist); + return vfwprintf(stdout,format,valist); } /********************************************************************* @@ -5570,7 +5570,7 @@ int CDECL vwprintf(const wchar_t *format, va_list valist) */ int CDECL vwprintf_s(const wchar_t *format, va_list valist) { - return vfwprintf_s(MSVCRT_stdout,format,valist); + return vfwprintf_s(stdout,format,valist); } /********************************************************************* @@ -5738,7 +5738,7 @@ int WINAPIV printf(const char *format, ...) va_list valist; int res; va_start(valist, format); - res = vfprintf(MSVCRT_stdout, format, valist); + res = vfprintf(stdout, format, valist); va_end(valist); return res; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d35412ee6b8..35e6e8233a1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -301,14 +301,13 @@ extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**); #define _RT_CRNL 252 #define _RT_BANNER 255 -extern FILE MSVCRT__iob[]; - #define MSVCRT_NO_CONSOLE_FD (-2) #define MSVCRT_NO_CONSOLE ((HANDLE)MSVCRT_NO_CONSOLE_FD) -#define MSVCRT_stdin (MSVCRT__iob+STDIN_FILENO) -#define MSVCRT_stdout (MSVCRT__iob+STDOUT_FILENO) -#define MSVCRT_stderr (MSVCRT__iob+STDERR_FILENO) +#if _MSVCR_VER < 140 +extern FILE MSVCRT__iob[]; +#define __acrt_iob_func(idx) (MSVCRT__iob+(idx)) +#endif /* internal file._flag flags */ #define MSVCRT__USERBUF 0x0100 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index c8bbe15f373..c77649797ed 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -211,7 +211,7 @@ int WINAPIV scanf(const char *format, ...) int res; va_start(valist, format); - res = vfscanf_l(MSVCRT_stdin, format, NULL, valist); + res = vfscanf_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -225,7 +225,7 @@ int WINAPIV _scanf_l(const char *format, _locale_t locale, ...) int res; va_start(valist, locale); - res = vfscanf_l(MSVCRT_stdin, format, locale, valist); + res = vfscanf_l(stdin, format, locale, valist); va_end(valist); return res; } @@ -239,7 +239,7 @@ int WINAPIV scanf_s(const char *format, ...) int res; va_start(valist, format); - res = vfscanf_s_l(MSVCRT_stdin, format, NULL, valist); + res = vfscanf_s_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -253,7 +253,7 @@ int WINAPIV _scanf_s_l(const char *format, _locale_t locale, ...) int res; va_start(valist, locale); - res = vfscanf_s_l(MSVCRT_stdin, format, locale, valist); + res = vfscanf_s_l(stdin, format, locale, valist); va_end(valist); return res; } @@ -325,7 +325,7 @@ int WINAPIV wscanf(const wchar_t *format, ...) int res; va_start(valist, format); - res = vfwscanf_l(MSVCRT_stdin, format, NULL, valist); + res = vfwscanf_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -340,7 +340,7 @@ int WINAPIV _wscanf_l(const wchar_t *format, int res; va_start(valist, locale); - res = vfwscanf_l(MSVCRT_stdin, format, locale, valist); + res = vfwscanf_l(stdin, format, locale, valist); va_end(valist); return res; } @@ -354,7 +354,7 @@ int WINAPIV wscanf_s(const wchar_t *format, ...) int res; va_start(valist, format); - res = vfwscanf_s_l(MSVCRT_stdin, format, NULL, valist); + res = vfwscanf_s_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -369,7 +369,7 @@ int WINAPIV _wscanf_s_l(const wchar_t *format, int res; va_start(valist, locale); - res = vfwscanf_s_l(MSVCRT_stdin, format, locale, valist); + res = vfwscanf_s_l(stdin, format, locale, valist); va_end(valist); return res; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 97ecc578760..1d7a92a9c1c 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,8 +48,8 @@ #define _STRTOD_NAME_(func) console_ ## func #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) -#define _LOCK_FILE_(file) _lock_file(MSVCRT_stdin) -#define _UNLOCK_FILE_(file) _unlock_file(MSVCRT_stdin) +#define _LOCK_FILE_(file) _lock_file(stdin) +#define _UNLOCK_FILE_(file) _unlock_file(stdin) #ifdef WIDE_SCANF #ifdef SECURE #define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, va_list ap)

1 0

Shengdun Wang : ucrtbase: Fix FILE _flag values.
by Alexandre Julliard June 12, 2024

June 12, 2024

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

Shengdun Wang : ucrtbase/tests: Add FILE structure tests.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: f19676b3210a00affd8969eec2e538e526267759 URL: https://gitlab.winehq.org/wine/wine/-/commit/f19676b3210a00affd8969eec2e538… Author: Shengdun Wang <uwgghhbcad(a)gmail.com> Date: Thu Jun 6 13:54:38 2024 +0200 ucrtbase/tests: Add FILE structure tests. --- dlls/ucrtbase/tests/file.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index 76233be3fa7..9dd5eba4fcc 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -81,7 +81,60 @@ static void test_std_stream_buffering(void) ok(DeleteFileA("std_stream_test.tmp"), "DeleteFile failed\n"); } +int CDECL _get_stream_buffer_pointers(FILE*,char***,char***,int**); +static void test_iobuf_layout(void) +{ + union + { + FILE *f; + struct + { + char* _ptr; + char* _base; + int _cnt; + int _flag; + int _file; + int _charbuf; + int _bufsiz; + char* _tmpfname; + CRITICAL_SECTION _crit; + } *iobuf; + } fp; + char *tempf, *ptr, **file_ptr, **file_base; + int cnt, r, *file_cnt; + + tempf = _tempnam(".","wne"); + fp.f = fopen(tempf, "wb"); + ok(fp.f != NULL, "fopen failed with error: %d\n", errno); + + 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->_cnt + 4 == fp.iobuf->_bufsiz, "_cnt = %d, _bufsiz = %d\n", + fp.iobuf->_cnt, fp.iobuf->_bufsiz); + + ptr = fp.iobuf->_ptr; + cnt = fp.iobuf->_cnt; + r = fprintf(fp.f, "%s", "hello"); + ok(r == 5, "fprintf returned %d\n", r); + ok(ptr + 5 == fp.iobuf->_ptr, "fp.iobuf->_ptr = %p, expected %p\n", fp.iobuf->_ptr, ptr + 5); + ok(cnt - 5 == fp.iobuf->_cnt, "fp.iobuf->_cnt = %d, expected %d\n", fp.iobuf->_cnt, cnt - 5); + ok(fp.iobuf->_ptr + fp.iobuf->_cnt == fp.iobuf->_base + fp.iobuf->_bufsiz, + "_ptr = %p, _cnt = %d, _base = %p, _bufsiz = %d\n", + fp.iobuf->_ptr, fp.iobuf->_cnt, fp.iobuf->_base, fp.iobuf->_bufsiz); + + _get_stream_buffer_pointers(fp.f, &file_base, &file_ptr, &file_cnt); + ok(file_base == &fp.iobuf->_base, "_base = %p, expected %p\n", file_base, &fp.iobuf->_base); + ok(file_ptr == &fp.iobuf->_ptr, "_ptr = %p, expected %p\n", file_ptr, &fp.iobuf->_ptr); + ok(file_cnt == &fp.iobuf->_cnt, "_cnt = %p, expected %p\n", file_cnt, &fp.iobuf->_cnt); + + fclose(fp.f); + unlink(tempf); +} + START_TEST(file) { test_std_stream_buffering(); + test_iobuf_layout(); }

1 0

Fabian Maurer : msvcrt: Fix _libm_sse2_sqrt_precise not using SSE2 sqrt.
by Alexandre Julliard June 12, 2024

June 12, 2024

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

Shengdun Wang : ucrtbase: Always use CRITICAL_SECTION for FILE locking.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: 90e59859ce9807b0dca7e5ac823bec03a82e5265 URL: https://gitlab.winehq.org/wine/wine/-/commit/90e59859ce9807b0dca7e5ac823bec… Author: Shengdun Wang <uwgghhbcad(a)gmail.com> Date: Wed Jun 12 12:25:43 2024 +0200 ucrtbase: Always use CRITICAL_SECTION for FILE locking. --- dlls/msvcrt/file.c | 78 +++++++++++++++++++++++++++++++++++----------- dlls/ucrtbase/tests/file.c | 3 ++ 2 files changed, 62 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2075d0b4288..0bf8510c5c9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -246,7 +246,34 @@ typedef struct { CRITICAL_SECTION crit; } file_crit; +#if _MSVCR_VER >= 140 +file_crit MSVCRT__iob[_IOB_ENTRIES] = { 0 }; + +static FILE* iob_get_file(int i) +{ + return &MSVCRT__iob[i].file; +} + +static CRITICAL_SECTION* file_get_cs(FILE *f) +{ + return &((file_crit*)f)->crit; +} +#else FILE MSVCRT__iob[_IOB_ENTRIES] = { { 0 } }; + +static FILE* iob_get_file(int i) +{ + return &MSVCRT__iob[i]; +} + +static CRITICAL_SECTION* file_get_cs(FILE *f) +{ + if (f < iob_get_file(0) || f >= iob_get_file(_IOB_ENTRIES)) + return &((file_crit*)f)->crit; + return NULL; +} +#endif + static file_crit* MSVCRT_fstream[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE]; static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; @@ -502,7 +529,7 @@ static inline FILE* msvcrt_get_file(int i) return NULL; if(i < _IOB_ENTRIES) - return &MSVCRT__iob[i]; + return iob_get_file(i); ret = MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE]; if(!ret) { @@ -604,10 +631,11 @@ static FILE* msvcrt_alloc_fp(void) { if (i == MSVCRT_stream_idx) { - if (file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + CRITICAL_SECTION *cs = file_get_cs(file); + if (cs) { - InitializeCriticalSectionEx(&((file_crit*)file)->crit, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); - ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); } MSVCRT_stream_idx++; } @@ -784,14 +812,22 @@ void msvcrt_init_io(void) get_ioinfo_nolock(STDOUT_FILENO)->handle, get_ioinfo_nolock(STDERR_FILENO)->handle); - memset(MSVCRT__iob,0,3*sizeof(FILE)); for (i = 0; i < 3; i++) { + FILE *f = iob_get_file(i); + CRITICAL_SECTION *cs = file_get_cs(f); + /* FILE structs for stdin/out/err are static and never deleted */ - MSVCRT__iob[i]._file = get_ioinfo_nolock(i)->handle == MSVCRT_NO_CONSOLE ? + f->_file = get_ioinfo_nolock(i)->handle == MSVCRT_NO_CONSOLE ? MSVCRT_NO_CONSOLE_FD : i; - MSVCRT__iob[i]._tmpfname = NULL; - MSVCRT__iob[i]._flag = (i == 0) ? _IOREAD : _IOWRT; + f->_tmpfname = NULL; + f->_flag = (i == 0) ? _IOREAD : _IOWRT; + + if (cs) + { + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + } } MSVCRT_stream_idx = 3; } @@ -936,7 +972,7 @@ static int msvcrt_int_to_base32_w(int num, wchar_t *str) #undef __iob_func FILE * CDECL __iob_func(void) { - return &MSVCRT__iob[0]; + return iob_get_file(0); } #if _MSVCR_VER >= 140 @@ -945,7 +981,7 @@ FILE * CDECL __iob_func(void) */ FILE * CDECL __acrt_iob_func(unsigned idx) { - return &MSVCRT__iob[idx]; + return iob_get_file(idx); } #endif @@ -1390,10 +1426,12 @@ void msvcrt_free_io(void) for(j=0; j<MSVCRT_stream_idx; j++) { FILE *file = msvcrt_get_file(j); - if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + CRITICAL_SECTION *cs = file_get_cs(file); + + if(cs) { - ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&((file_crit*)file)->crit); + cs->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(cs); } } @@ -1461,10 +1499,11 @@ __msvcrt_long CDECL _lseek(int fd, __msvcrt_long offset, int whence) */ void CDECL _lock_file(FILE *file) { - if(file>=MSVCRT__iob && file<MSVCRT__iob+_IOB_ENTRIES) - _lock(_STREAM_LOCKS+(file-MSVCRT__iob)); + CRITICAL_SECTION *cs = file_get_cs(file); + if (!cs) + _lock(_STREAM_LOCKS + (file - iob_get_file(0))); else - EnterCriticalSection(&((file_crit*)file)->crit); + EnterCriticalSection(cs); } /********************************************************************* @@ -1472,10 +1511,11 @@ void CDECL _lock_file(FILE *file) */ void CDECL _unlock_file(FILE *file) { - if(file>=MSVCRT__iob && file<MSVCRT__iob+_IOB_ENTRIES) - _unlock(_STREAM_LOCKS+(file-MSVCRT__iob)); + CRITICAL_SECTION *cs = file_get_cs(file); + if (!cs) + _unlock(_STREAM_LOCKS + (file - iob_get_file(0))); else - LeaveCriticalSection(&((file_crit*)file)->crit); + LeaveCriticalSection(cs); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index 9dd5eba4fcc..c36ea51e825 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -129,6 +129,9 @@ static void test_iobuf_layout(void) ok(file_ptr == &fp.iobuf->_ptr, "_ptr = %p, expected %p\n", file_ptr, &fp.iobuf->_ptr); ok(file_cnt == &fp.iobuf->_cnt, "_cnt = %p, expected %p\n", file_cnt, &fp.iobuf->_cnt); + ok(TryEnterCriticalSection(&fp.iobuf->_crit), "TryEnterCriticalSection section returned FALSE\n"); + LeaveCriticalSection(&fp.iobuf->_crit); + fclose(fp.f); unlink(tempf); }

1 0

Piotr Caban : ucrtbase: Fix _iobuf struct layout.
by Alexandre Julliard June 12, 2024

June 12, 2024

Module: wine Branch: master Commit: fc8121d05fc18ca827d01767ae94072b68c9a28c URL: https://gitlab.winehq.org/wine/wine/-/commit/fc8121d05fc18ca827d01767ae9407… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 11 19:25:37 2024 +0200 ucrtbase: Fix _iobuf struct layout. --- dlls/msvcrt/msvcrt.h | 17 +++++++++++++++++ include/msvcrt/corecrt_wstdio.h | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index dd7fb5895a0..d35412ee6b8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -20,6 +20,23 @@ #ifndef __WINE_MSVCRT_H #define __WINE_MSVCRT_H +#if _MSVCR_VER >= 140 +#ifndef _FILE_DEFINED +#define _FILE_DEFINED +typedef struct _iobuf +{ + char* _ptr; + char* _base; + int _cnt; + int _flag; + int _file; + int _charbuf; + int _bufsiz; + char* _tmpfname; +} FILE; +#endif +#endif + #include <errno.h> #include <stdarg.h> #include <stdint.h> diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 404f7345c8e..c5c9f180fd9 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -25,6 +25,9 @@ extern "C" { #include <pshpack8.h> typedef struct _iobuf { +#ifdef _UCRT + void *_Placeholder; +#else char* _ptr; int _cnt; char* _base; @@ -33,6 +36,7 @@ typedef struct _iobuf int _charbuf; int _bufsiz; char* _tmpfname; +#endif } FILE; #include <poppack.h> #endif /* _FILE_DEFINED */

1 0

Daniel Lehman : crypt32: Allow overriding GnuTLS debug level.
by Alexandre Julliard June 12, 2024

June 12, 2024

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

Daniel Lehman : bcrypt: Allow overriding GnuTLS debug level.
by Alexandre Julliard June 12, 2024

June 12, 2024

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 : secur32: Allow overriding GnuTLS debug level.
by Alexandre Julliard June 12, 2024

June 12, 2024

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