March 2021 - Wine-Devel - list.winehq.org

[PATCH 2/8] mshtml: Initialize HTMLTxtRange object with compat mode.
by Jacek Caban March 12, 2021

March 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/range.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 1/8] mshtml: Initialize HTMLOptionElementFactory object with compat mode.
by Jacek Caban March 12, 2021

March 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlselect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/2] msvcrt: Lazily initialize console handles.
by Rémi Bernon March 12, 2021

March 12, 2021

In case some application decides to call FreeConsole, the opened msvcrt console handles will still prevent conhost.exe from exiting. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/msvcrt/console.c | 88 +++++++++++++++++++++++++++---------------- dlls/msvcrt/main.c | 1 - dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 55 insertions(+), 35 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 26f7b554636..67782cc23b8 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -33,25 +33,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_CONSOLE _lock(_CONIO_LOCK) #define UNLOCK_CONSOLE _unlock(_CONIO_LOCK) -static HANDLE MSVCRT_console_in = INVALID_HANDLE_VALUE; -static HANDLE MSVCRT_console_out= INVALID_HANDLE_VALUE; +static HANDLE MSVCRT_console_in; +static HANDLE MSVCRT_console_out; static int __MSVCRT_console_buffer = EOF; static wchar_t __MSVCRT_console_buffer_w = WEOF; /* INTERNAL: Initialise console handles */ -void msvcrt_init_console(void) +static HANDLE msvcrt_input_console(void) { - TRACE(":Opening console handles\n"); - - MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, - FILE_SHARE_WRITE|FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, 0, NULL); + HANDLE console; + LOCK_CONSOLE; + if (!MSVCRT_console_in) + { + MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, + FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_in == INVALID_HANDLE_VALUE) + WARN("Input console handle initialization failed!\n"); + } + console = MSVCRT_console_in; + UNLOCK_CONSOLE; + return console; +} - if ((MSVCRT_console_in == INVALID_HANDLE_VALUE) || - (MSVCRT_console_out== INVALID_HANDLE_VALUE)) - WARN(":Console handle Initialisation FAILED!\n"); +static HANDLE msvcrt_output_console(void) +{ + HANDLE console; + LOCK_CONSOLE; + if (!MSVCRT_console_out) + { + MSVCRT_console_out = CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_out == INVALID_HANDLE_VALUE) + WARN("Output console handle initialization failed!\n"); + } + console = MSVCRT_console_out; + UNLOCK_CONSOLE; + return console; } /* INTERNAL: Free console handles */ @@ -74,7 +92,7 @@ int CDECL _cputs(const char* str) len = strlen(str); LOCK_CONSOLE; - if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleA(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -93,7 +111,7 @@ int CDECL _cputws(const wchar_t* str) len = wcslen(str); LOCK_CONSOLE; - if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleW(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -162,16 +180,17 @@ int CDECL _getch_nolock(void) } else { + HANDLE console = msvcrt_input_console(); INPUT_RECORD ir; DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(console, &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(console, 0); do { - if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputA(console, &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -197,7 +216,7 @@ int CDECL _getch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(console, mode); } return retval; } @@ -229,16 +248,17 @@ wchar_t CDECL _getwch_nolock(void) } else { + HANDLE console = msvcrt_input_console(); INPUT_RECORD ir; DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(console, &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(console, 0); do { - if (ReadConsoleInputW(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputW(console, &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -264,7 +284,7 @@ wchar_t CDECL _getwch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(console, mode); } return retval; } @@ -288,7 +308,7 @@ wchar_t CDECL _getwch(void) int CDECL _putch_nolock(int c) { DWORD count; - if (WriteConsoleA(MSVCRT_console_out, &c, 1, &count, NULL) && count == 1) + if (WriteConsoleA(msvcrt_output_console(), &c, 1, &count, NULL) && count == 1) return c; return EOF; } @@ -310,7 +330,7 @@ int CDECL _putch(int c) wchar_t CDECL _putwch_nolock(wchar_t c) { DWORD count; - if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1) + if (WriteConsoleW(msvcrt_output_console(), &c, 1, &count, NULL) && count==1) return c; return WEOF; } @@ -381,6 +401,7 @@ wchar_t CDECL _getwche(void) */ char* CDECL _cgets(char* str) { + HANDLE console = msvcrt_input_console(); char *buf = str + 2; DWORD got; DWORD conmode = 0; @@ -388,10 +409,10 @@ char* CDECL _cgets(char* str) TRACE("(%p)\n", str); str[1] = 0; /* Length */ LOCK_CONSOLE; - GetConsoleMode(MSVCRT_console_in, &conmode); - SetConsoleMode(MSVCRT_console_in, ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); + GetConsoleMode(console, &conmode); + SetConsoleMode(console, ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); - if(ReadConsoleA(MSVCRT_console_in, buf, str[0], &got, NULL)) { + if(ReadConsoleA(console, buf, str[0], &got, NULL)) { if(buf[got-2] == '\r') { buf[got-2] = 0; str[1] = got-2; @@ -409,7 +430,7 @@ char* CDECL _cgets(char* str) } else buf = NULL; - SetConsoleMode(MSVCRT_console_in, conmode); + SetConsoleMode(console, conmode); UNLOCK_CONSOLE; return buf; } @@ -472,12 +493,13 @@ int CDECL _kbhit(void) { /* FIXME: There has to be a faster way than this in Win32.. */ INPUT_RECORD *ir = NULL; + HANDLE console = msvcrt_input_console(); DWORD count = 0, i; - GetNumberOfConsoleInputEvents(MSVCRT_console_in, &count); + GetNumberOfConsoleInputEvents(console, &count); if (count && (ir = malloc(count * sizeof(INPUT_RECORD))) && - PeekConsoleInputA(MSVCRT_console_in, ir, count, &count)) + PeekConsoleInputA(console, ir, count, &count)) for(i = 0; i < count - 1; i++) { if (ir[i].EventType == KEY_EVENT && @@ -497,7 +519,7 @@ int CDECL _kbhit(void) static int puts_clbk_console_a(void *ctx, int len, const char *str) { LOCK_CONSOLE; - if(!WriteConsoleA(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleA(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; @@ -506,7 +528,7 @@ static int puts_clbk_console_a(void *ctx, int len, const char *str) static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str) { LOCK_CONSOLE; - if(!WriteConsoleW(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleW(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 0da4885c7a5..61e8479bf90 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -113,7 +113,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } msvcrt_init_math(hinstDLL); msvcrt_init_io(); - msvcrt_init_console(); msvcrt_init_args(); msvcrt_init_signals(); #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0a742807430..8f6ee08ef2a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -232,7 +232,6 @@ extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; extern void msvcrt_init_math(void*) DECLSPEC_HIDDEN; extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_console(void) DECLSPEC_HIDDEN; extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; -- 2.30.2

3 5

[PATCH v2] msvcrt: Lazily initialize console handles.
by Rémi Bernon March 12, 2021

March 12, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Remove the (UN)LOCK_CONSOLE calls and local variables. Supersedes: 201626 dlls/msvcrt/console.c | 78 ++++++++++++++++++++++++------------------- dlls/msvcrt/main.c | 1 - dlls/msvcrt/msvcrt.h | 1 - 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 26f7b554636..cd9119cf20f 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -33,25 +33,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define LOCK_CONSOLE _lock(_CONIO_LOCK) #define UNLOCK_CONSOLE _unlock(_CONIO_LOCK) -static HANDLE MSVCRT_console_in = INVALID_HANDLE_VALUE; -static HANDLE MSVCRT_console_out= INVALID_HANDLE_VALUE; +static HANDLE MSVCRT_console_in; +static HANDLE MSVCRT_console_out; static int __MSVCRT_console_buffer = EOF; static wchar_t __MSVCRT_console_buffer_w = WEOF; -/* INTERNAL: Initialise console handles */ -void msvcrt_init_console(void) +/* INTERNAL: Initialise console handles, _CONIO_LOCK must be held */ +static HANDLE msvcrt_input_console(void) { - TRACE(":Opening console handles\n"); - - MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, - FILE_SHARE_WRITE|FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, - NULL, OPEN_EXISTING, 0, NULL); + if (!MSVCRT_console_in) + { + MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, + FILE_SHARE_WRITE|FILE_SHARE_READ, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_in == INVALID_HANDLE_VALUE) + WARN("Input console handle initialization failed!\n"); + } + return MSVCRT_console_in; +} - if ((MSVCRT_console_in == INVALID_HANDLE_VALUE) || - (MSVCRT_console_out== INVALID_HANDLE_VALUE)) - WARN(":Console handle Initialisation FAILED!\n"); +static HANDLE msvcrt_output_console(void) +{ + if (!MSVCRT_console_out) + { + MSVCRT_console_out = CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + if (MSVCRT_console_out == INVALID_HANDLE_VALUE) + WARN("Output console handle initialization failed!\n"); + } + return MSVCRT_console_out; } /* INTERNAL: Free console handles */ @@ -74,7 +84,7 @@ int CDECL _cputs(const char* str) len = strlen(str); LOCK_CONSOLE; - if (WriteConsoleA(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleA(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -93,7 +103,7 @@ int CDECL _cputws(const wchar_t* str) len = wcslen(str); LOCK_CONSOLE; - if (WriteConsoleW(MSVCRT_console_out, str, len, &count, NULL) + if (WriteConsoleW(msvcrt_output_console(), str, len, &count, NULL) && count == len) retval = 0; UNLOCK_CONSOLE; @@ -166,12 +176,12 @@ int CDECL _getch_nolock(void) DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(msvcrt_input_console(), &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(msvcrt_input_console(), 0); do { - if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputA(msvcrt_input_console(), &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -197,7 +207,7 @@ int CDECL _getch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(msvcrt_input_console(), mode); } return retval; } @@ -233,12 +243,12 @@ wchar_t CDECL _getwch_nolock(void) DWORD count; DWORD mode = 0; - GetConsoleMode(MSVCRT_console_in, &mode); + GetConsoleMode(msvcrt_input_console(), &mode); if(mode) - SetConsoleMode(MSVCRT_console_in, 0); + SetConsoleMode(msvcrt_input_console(), 0); do { - if (ReadConsoleInputW(MSVCRT_console_in, &ir, 1, &count)) + if (ReadConsoleInputW(msvcrt_input_console(), &ir, 1, &count)) { /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && @@ -264,7 +274,7 @@ wchar_t CDECL _getwch_nolock(void) break; } while(1); if (mode) - SetConsoleMode(MSVCRT_console_in, mode); + SetConsoleMode(msvcrt_input_console(), mode); } return retval; } @@ -288,7 +298,7 @@ wchar_t CDECL _getwch(void) int CDECL _putch_nolock(int c) { DWORD count; - if (WriteConsoleA(MSVCRT_console_out, &c, 1, &count, NULL) && count == 1) + if (WriteConsoleA(msvcrt_output_console(), &c, 1, &count, NULL) && count == 1) return c; return EOF; } @@ -310,7 +320,7 @@ int CDECL _putch(int c) wchar_t CDECL _putwch_nolock(wchar_t c) { DWORD count; - if (WriteConsoleW(MSVCRT_console_out, &c, 1, &count, NULL) && count==1) + if (WriteConsoleW(msvcrt_output_console(), &c, 1, &count, NULL) && count==1) return c; return WEOF; } @@ -388,10 +398,10 @@ char* CDECL _cgets(char* str) TRACE("(%p)\n", str); str[1] = 0; /* Length */ LOCK_CONSOLE; - GetConsoleMode(MSVCRT_console_in, &conmode); - SetConsoleMode(MSVCRT_console_in, ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); + GetConsoleMode(msvcrt_input_console(), &conmode); + SetConsoleMode(msvcrt_input_console(), ENABLE_LINE_INPUT|ENABLE_ECHO_INPUT|ENABLE_PROCESSED_INPUT); - if(ReadConsoleA(MSVCRT_console_in, buf, str[0], &got, NULL)) { + if(ReadConsoleA(msvcrt_input_console(), buf, str[0], &got, NULL)) { if(buf[got-2] == '\r') { buf[got-2] = 0; str[1] = got-2; @@ -409,7 +419,7 @@ char* CDECL _cgets(char* str) } else buf = NULL; - SetConsoleMode(MSVCRT_console_in, conmode); + SetConsoleMode(msvcrt_input_console(), conmode); UNLOCK_CONSOLE; return buf; } @@ -474,10 +484,10 @@ int CDECL _kbhit(void) INPUT_RECORD *ir = NULL; DWORD count = 0, i; - GetNumberOfConsoleInputEvents(MSVCRT_console_in, &count); + GetNumberOfConsoleInputEvents(msvcrt_input_console(), &count); if (count && (ir = malloc(count * sizeof(INPUT_RECORD))) && - PeekConsoleInputA(MSVCRT_console_in, ir, count, &count)) + PeekConsoleInputA(msvcrt_input_console(), ir, count, &count)) for(i = 0; i < count - 1; i++) { if (ir[i].EventType == KEY_EVENT && @@ -497,7 +507,7 @@ int CDECL _kbhit(void) static int puts_clbk_console_a(void *ctx, int len, const char *str) { LOCK_CONSOLE; - if(!WriteConsoleA(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleA(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; @@ -506,7 +516,7 @@ static int puts_clbk_console_a(void *ctx, int len, const char *str) static int puts_clbk_console_w(void *ctx, int len, const wchar_t *str) { LOCK_CONSOLE; - if(!WriteConsoleW(MSVCRT_console_out, str, len, NULL, NULL)) + if(!WriteConsoleW(msvcrt_output_console(), str, len, NULL, NULL)) len = -1; UNLOCK_CONSOLE; return len; diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 0da4885c7a5..61e8479bf90 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -113,7 +113,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } msvcrt_init_math(hinstDLL); msvcrt_init_io(); - msvcrt_init_console(); msvcrt_init_args(); msvcrt_init_signals(); #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0a742807430..8f6ee08ef2a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -232,7 +232,6 @@ extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; extern void msvcrt_init_math(void*) DECLSPEC_HIDDEN; extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; -extern void msvcrt_init_console(void) DECLSPEC_HIDDEN; extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; -- 2.30.2

2 1

[PATCH v2 1/4] msvcr120: Add fetestexcept.
by Daniel Lehman March 12, 2021

March 12, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: - use _statusfp() - improved tests --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 33 ++++++++++++++++++- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 8 +++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 1 + 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 74d682b33bf..66c2d8cc264 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -95,7 +95,7 @@ @ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag @ cdecl fesetround(long) ucrtbase.fesetround -@ stub fetestexcept +@ cdecl fetestexcept(long) ucrtbase.fetestexcept @ cdecl perror(str) ucrtbase.perror @ cdecl quick_exit(long) ucrtbase.quick_exit @ cdecl raise(long) ucrtbase.raise diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e1c7705166..27ae5a930f6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2154,7 +2154,7 @@ @ cdecl fesetenv(ptr) @ stub fesetexceptflag @ cdecl fesetround(long) -@ stub fetestexcept +@ cdecl fetestexcept(long) @ stub feupdateenv @ cdecl fflush(ptr) @ cdecl fgetc(ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8ef2be3520..537e9077402 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fetestexcept)(int); 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); @@ -257,6 +258,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fetestexcept, "fetestexcept"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -788,8 +790,17 @@ static void test_critical_section(void) static void test_feenv(void) { + static const int tests[] = { + 0, + FE_INEXACT, + FE_UNDERFLOW, + FE_OVERFLOW, + FE_DIVBYZERO, + FE_INVALID, + FE_ALL_EXCEPT, + }; fenv_t env, env2; - int ret; + int i, ret, flags; p__clearfp(); @@ -807,6 +818,26 @@ static void test_feenv(void) ok(!ret, "fesetenv returned %x\n", ret); ret = p_fegetround(); ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(!ret, "fetestexcept returned %x\n", ret); + + flags = 0; + for(i=0; i<ARRAY_SIZE(tests); i++) { + ret = p_fegetenv(&env); + ok(!ret, "Test %d: fegetenv returned %x\n", i, ret); + env._Fe_stat |= tests[i]; + ret = p_fesetenv(&env); + ok(!ret, "Test %d: fesetenv returned %x\n", i, ret); + + ret = p_fetestexcept(tests[i]); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + + flags |= tests[i]; + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); + } + p__clearfp(); } static void test__wcreate_locale(void) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05b8a97a084..daee644d965 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1820,7 +1820,7 @@ @ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag @ cdecl fesetround(long) msvcr120.fesetround -@ stub fetestexcept +@ cdecl fetestexcept(long) msvcr120.fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) msvcr120.fflush @ cdecl fgetc(ptr) msvcr120.fgetc diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d6b0d9422e7..6c1d665c843 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2214,6 +2214,14 @@ int CDECL fegetenv(fenv_t *env) env->_Fe_stat = _statusfp(); return 0; } + +/********************************************************************* + * fetestexcept (MSVCR120.@) + */ +int CDECL fetestexcept(int flags) +{ + return _statusfp() & flags; +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0a8d74521f5..d40df5e0efc 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2296,7 +2296,7 @@ @ cdecl fesetenv(ptr) @ stub fesetexceptflag @ cdecl fesetround(long) -@ stub fetestexcept +@ cdecl fetestexcept(long) @ cdecl fflush(ptr) @ cdecl fgetc(ptr) @ cdecl fgetpos(ptr ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 92b341bd46b..3dcbcf0b8fe 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -34,6 +34,7 @@ _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); +_ACRTIMP int __cdecl fetestexcept(int); #ifdef __cplusplus } -- 2.25.1

2 7

[PATCH 1/5] dwrite/tests: Remove tests failing on Win10 20H2.
by Nikolay Sivov March 12, 2021

March 12, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d0940c3b145..4b31c331872 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2460,11 +2460,6 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(coll2 == collection, "got %p, was %p\n", coll2, collection); - IDWriteFontCollection_Release(coll2); - factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2652,10 +2647,8 @@ todo_wine hr = IDWriteFactory6_GetSystemFontCollection(factory6, FALSE, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &collection2); ok(hr == S_OK, "Failed to get collection, hr %#x.\n", hr); - ok(collection == (IDWriteFontCollection *)collection2, "Unexpected instance.\n"); IDWriteFontCollection2_Release(collection2); } - IDWriteFactory6_Release(factory6); } else -- 2.30.1

1 4

[PATCH] reg: Stop parsing REG_SZ values containing NUL character sequences
by Hugh McMaster March 12, 2021

March 12, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/import.c | 3 +-- programs/reg/tests/import.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index f7f87939e23..7ad7b35d5dc 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -324,8 +324,7 @@ static BOOL unescape_string(WCHAR *str, WCHAR **unparsed) str[val_idx] = '\r'; break; case '0': - str[val_idx] = '\0'; - break; + return FALSE; case '\\': case '"': str[val_idx] = str[str_idx]; diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index f8e7e4b7acb..06f9cb05f6c 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -1600,12 +1600,12 @@ static void test_import(void) "\"Wine70e\"=\"Value3\\0Value4\"\n" "\"Wine70f\"=\"\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine70a"); - todo_wine verify_reg_nonexist(hkey, "Wine70b"); - todo_wine verify_reg_nonexist(hkey, "Wine70c"); - todo_wine verify_reg_nonexist(hkey, "Wine70d"); - todo_wine verify_reg_nonexist(hkey, "Wine70e"); - todo_wine verify_reg_nonexist(hkey, "Wine70f"); + verify_reg_nonexist(hkey, "Wine70a"); + verify_reg_nonexist(hkey, "Wine70b"); + verify_reg_nonexist(hkey, "Wine70c"); + verify_reg_nonexist(hkey, "Wine70d"); + verify_reg_nonexist(hkey, "Wine70e"); + verify_reg_nonexist(hkey, "Wine70f"); /* Test forward and back slashes */ test_import_str("REGEDIT4\n\n" @@ -3149,12 +3149,12 @@ static void test_unicode_import(void) "\"Wine70e\"=\"Value3\\0Value4\"\n" "\"Wine70f\"=\"\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine70a"); - todo_wine verify_reg_nonexist(hkey, "Wine70b"); - todo_wine verify_reg_nonexist(hkey, "Wine70c"); - todo_wine verify_reg_nonexist(hkey, "Wine70d"); - todo_wine verify_reg_nonexist(hkey, "Wine70e"); - todo_wine verify_reg_nonexist(hkey, "Wine70f"); + verify_reg_nonexist(hkey, "Wine70a"); + verify_reg_nonexist(hkey, "Wine70b"); + verify_reg_nonexist(hkey, "Wine70c"); + verify_reg_nonexist(hkey, "Wine70d"); + verify_reg_nonexist(hkey, "Wine70e"); + verify_reg_nonexist(hkey, "Wine70f"); /* Test forward and back slashes */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" -- 2.30.2

1 0

[PATCH vkd3d] build: Enable -Winit-self.
by Zebediah Figura March 12, 2021

March 12, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index b7902b63..2005c763 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) + VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) -- 2.30.1

3 2

[PATCH vkd3d 1/5] vkd3d-shader: Don't use assignment instructions as sources.
by Zebediah Figura March 12, 2021

March 12, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ce4bd626..a9c9dd02 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1261,6 +1261,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in { struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; + struct hlsl_ir_expr *copy; DWORD writemask = 0; lhs_type = lhs->data_type; @@ -1321,7 +1322,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in lhs = lhs_inner; } - init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, lhs->loc); assign->writemask = writemask; assign->lhs.var = hlsl_ir_load(lhs)->src.var; hlsl_src_from_node(&assign->lhs.offset, hlsl_ir_load(lhs)->src.offset.node); @@ -1337,7 +1338,14 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in hlsl_src_from_node(&assign->rhs, rhs); list_add_tail(instrs, &assign->node.entry); - return &assign->node; + /* Don't use the instruction itself as a source, as this makes structure + * splitting easier. Instead copy it here. Since we retrieve sources from + * the last instruction in the list, we do need to copy. Use a cast + * instruction to the same type as a makeshift identity expression. */ + if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + return NULL; + list_add_tail(instrs, &copy->node.entry); + return &copy->node; } static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, -- 2.30.1

4 15

[PATCH] regedit: Stop parsing REG_SZ values containing NUL character sequences
by Hugh McMaster March 12, 2021

March 12, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regproc.c | 3 +-- programs/regedit/tests/regedit.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 727f39f6158..5bb991865e6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -402,8 +402,7 @@ static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) str[val_idx] = '\r'; break; case '0': - str[val_idx] = '\0'; - break; + return FALSE; case '\\': case '"': str[val_idx] = str[str_idx]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9b431fa6f38..7d2c9416bcc 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1694,12 +1694,12 @@ static void test_invalid_import(void) "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" "\"Wine33e\"=\"Value3\\0Value4\"\n" "\"Wine33f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); - todo_wine verify_reg_nonexist(hkey, "Wine33f"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -2205,12 +2205,12 @@ static void test_invalid_import_unicode(void) "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" "\"Wine33e\"=\"Value3\\0Value4\"\n" "\"Wine33f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); - todo_wine verify_reg_nonexist(hkey, "Wine33f"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); -- 2.30.2

1 0