- Wine-Devel - list.winehq.org

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

March 12, 2021

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

1 0

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

March 12, 2021

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

1 0

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

March 12, 2021

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

1 0

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

March 12, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

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

March 12, 2021

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

1 0

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

March 12, 2021

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

1 0

[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