September 2020 - Wine-Commits

Piotr Caban : msvcrt: Fix _vs{w,n}printf_c function when terminating character doesn't fit into buffer.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 8b7eedc180804cc8eb47f90cbdfc07bca2862ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7eedc180804cc8eb47f90c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 15 17:40:08 2020 +0200 msvcrt: Fix _vs{w,n}printf_c function when terminating character doesn't fit into buffer. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr110/msvcr110.spec | 8 ++++---- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 37 +++++++++++++++++++++++++++++++++++++ 8 files changed, 66 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b7eedc180804cc8eb47…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 26eedec78e50a5f264ea045a37558c41eceba653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26eedec78e50a5f264ea045a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Sep 15 21:53:58 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 95 ++++++++++++++++++++-------------------------------------------- 1 file changed, 29 insertions(+), 66 deletions(-) diff --git a/po/lt.po b/po/lt.po index cdd14909ce..e7347c9e9f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-08-26 09:41+0300\n" +"PO-Revision-Date: 2020-09-15 21:49+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10740,153 +10740,116 @@ msgstr "&Daugiau langų..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Perpildymas" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "Trūksta atminties." +msgstr "Trūksta atminties" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Šis masyvas yra fiksuotas arba laikinai užblokuotas" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Duomenų tipo neatitikimas.\n" +msgstr "Tipo neatitikimas" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Į/I įrenginio klaida.\n" +msgstr "Įrenginio Į/I klaida" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "Failas jau egzistuoja.\n" +msgstr "Failas jau egzistuoja" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "Diskas pilnas.\n" +msgstr "Diskas pilnas" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Per daug atvertų failų.\n" +msgstr "Per daug failų" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "Prieiga nesuteikta.\n" +msgstr "Prieiga nesuteikta" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Kelio/failo prieigos klaida" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "Kelias nerastas.\n" +msgstr "Kelias nerastas" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(reikšmė nenustatyta)" +msgstr "Objekto kintamasis nenustatytas" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "Netinkamas naudotojo buferis.\n" +msgstr "Netinkamas Null naudojimas" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "Nepavyko sukurti reikalingo laikinojo failo" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "Automatizavimo serveriui nepavyko sukurti objekto" +msgstr "ActiveX komponentui nepavyko sukurti objekto" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "Objektas nepalaiko šio veiksmo" +msgstr "Klasė nepalaiko Automatizavimo" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" +"Failo vardas arba klasės vardas nerastas vykdant Automatizavimo operaciją" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "Objektas nepalaiko šio veiksmo" +msgstr "Objektas nepalaiko įvardytų argumentų" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "Objektas nepalaiko šio veiksmo" +msgstr "Objektas nepalaiko dabartinės lokalės nuostatos" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "Elementas nerastas.\n" +msgstr "Įvardytas elementas nerastas" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" -msgstr "" +msgstr "Neteisingas argumentų skaičius ar neteisingas savybės priskyrimas" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Objekto klasės pažeidimas" +msgstr "Objektas nėra rinkinys" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "Nurodytas valdiklis nerastas pranešime" +msgstr "Nurodyta DLL funkcija nerasta" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" -msgstr "" +msgstr "Kintamasis naudoja Automatizavimo tipą nepalaikomą VBScript" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "Nutolęs serveris neegzistuoja arba nepasiekiamas" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Netinkama arba nepatikslinta nuoroda" #: dlls/vbscript/vbscript.rc:62 -#, fuzzy -#| msgid "Microsoft JScript compilation error" msgid "Microsoft VBScript compilation error" -msgstr "Microsoft JScript kompiliavimo klaida" +msgstr "Microsoft VBScript kompiliavimo klaida" #: dlls/vbscript/vbscript.rc:63 -#, fuzzy -#| msgid "Microsoft JScript runtime error" msgid "Microsoft VBScript runtime error" -msgstr "Microsoft JScript vykdymo klaida" +msgstr "Microsoft VBScript vykdymo klaida" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@"

1 0

Myah Caron : sapi: Add AudioOutput registry keys.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 3f3c0086cb86694ed2d267fb51ac488a85cacba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3c0086cb86694ed2d267fb… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Fri Sep 11 19:42:16 2020 +0000 sapi: Add AudioOutput registry keys. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/sapi.rgs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/sapi/sapi.rgs b/dlls/sapi/sapi.rgs index b086303968..8c5f862d6b 100644 --- a/dlls/sapi/sapi.rgs +++ b/dlls/sapi/sapi.rgs @@ -6,6 +6,14 @@ HKLM { NoRemove Speech { + NoRemove AudioOutput + { + val DefaultDefaultTokenId = s 'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Speech\AudioOutput\TokenEnums\MMAudioOut\' + NoRemove MMAudioOut + { + val CLSID = s '{AB1890A0-E91F-11D2-BB91-00C04F8EE6C0}' + } + } NoRemove Voices { }

1 0

Myah Caron : sapi: Improve GetDefaultTokenId stub.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 2e11e2f33f5cf95230e157d913fe337762081724 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e11e2f33f5cf95230e157d9… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Fri Sep 11 19:42:50 2020 +0000 sapi: Improve GetDefaultTokenId stub. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 34 ++++++++++++++++++++++++++-- 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9f6689b83f..58d69920fd 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -116,11 +116,70 @@ static void test_token_enum(void) ISpObjectTokenEnumBuilder_Release( token_enum ); } +static void test_default_token_id(void) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + LPWSTR token_id = NULL; + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size; + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, SPCAT_AUDIOOUT, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + + /* AudioOutput under windows server returns this error */ + if (hr == SPERR_NOT_FOUND) { + /* also happens if TokenEnums/Tokens is empty or doesn't exist */ + skip( "AudioOutput category not found for GetDefaultTokenId\n" ); + return; + } + + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Speech\\AudioOutput", + L"DefaultDefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultDefaultTokenId not found for AudioOutput category (%s)\n", + wine_dbgstr_w(token_id) ); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should be equal to the DefaultDefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + } + + CoTaskMemFree( token_id ); + ISpObjectTokenCategory_Release( cat ); +} + START_TEST(token) { CoInitialize( NULL ); test_data_key(); test_token_category(); test_token_enum(); + test_default_token_id(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index d2b70c95cf..21cd958282 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -489,8 +489,38 @@ static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory * static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, LPWSTR *id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + struct data_key *this_data_key; + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + FIXME( "(%p)->(%p): semi-stub\n", iface, id ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_POINTER; + + /* todo: check HKCU's DefaultTokenId before */ + + this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegGetValueW( this_data_key->key, NULL, L"DefaultDefaultTokenId", RRF_RT_REG_SZ, + NULL, &regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + return SPERR_NOT_FOUND; + } else if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + *id = CoTaskMemAlloc( regvalue_size ); + wcscpy( *id, regvalue ); + + return S_OK; } const struct ISpObjectTokenCategoryVtbl token_category_vtbl =

1 0

Jacek Caban : conhost/tests: Add ReadConsole tests.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: cc6c5f7823df717da2eeba4351348325ee91ba5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6c5f7823df717da2eeba43… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:08:18 2020 +0200 conhost/tests: Add ReadConsole tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 0d02d2af8f..369199a127 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -148,9 +148,11 @@ enum req_type REQ_CREATE_SCREEN_BUFFER, REQ_FILL_CHAR, REQ_GET_INPUT, + REQ_READ_CONSOLE, REQ_SCROLL, REQ_SET_ACTIVE, REQ_SET_CURSOR, + REQ_SET_INPUT_MODE, REQ_SET_OUTPUT_MODE, REQ_SET_TITLE, REQ_WRITE_CHARACTERS, @@ -167,6 +169,7 @@ struct pseudoconsole_req COORD coord; HANDLE handle; DWORD mode; + size_t size; struct { COORD coord; @@ -334,6 +337,18 @@ static void child_fill_character(WCHAR ch, DWORD count, int x, int y) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static void child_set_input_mode(HANDLE pipe, DWORD mode) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_SET_INPUT_MODE; + req.u.mode = mode; + ret = WriteFile(pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + static void child_set_output_mode(DWORD mode) { struct pseudoconsole_req req; @@ -346,6 +361,34 @@ static void child_set_output_mode(DWORD mode) ok(ret, "WriteFile failed: %u\n", GetLastError()); } +static void child_read_console(HANDLE pipe, size_t size) +{ + struct pseudoconsole_req req; + DWORD count; + BOOL ret; + + req.type = REQ_READ_CONSOLE; + req.u.size = size; + ret = WriteFile(pipe, &req, sizeof(req), &count, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); +} + +#define child_expect_read_result(a,b) child_expect_read_result_(__LINE__,a,b) +static void child_expect_read_result_(unsigned int line, HANDLE pipe, const WCHAR *expect) +{ + size_t exlen = wcslen(expect); + WCHAR buf[4096]; + DWORD count; + BOOL ret; + + ret = ReadFile(pipe, buf, sizeof(buf), &count, NULL); + ok_(__FILE__,line)(ret, "ReadFile failed: %u\n", GetLastError()); + ok_(__FILE__,line)(count == exlen * sizeof(WCHAR), "got %u, expected %u\n", + count, exlen * sizeof(WCHAR)); + buf[count / sizeof(WCHAR)] = 0; + ok_(__FILE__,line)(!memcmp(expect, buf, count), "unexpected data %s\n", wine_dbgstr_w(buf)); +} + static void expect_input(unsigned int event_type, INPUT_RECORD *record) { struct pseudoconsole_req req = { REQ_GET_INPUT }; @@ -954,6 +997,42 @@ static void write_console_pipe(const char *buf) ok(res, "WriteFile failed: %u\n", GetLastError()); } +static void test_read_console(void) +{ + child_set_input_mode(child_pipe, ENABLE_PROCESSED_INPUT); + + child_read_console(child_pipe, 100); + write_console_pipe("abc"); + expect_empty_output(); + child_expect_read_result(child_pipe, L"abc"); + expect_empty_output(); + + child_read_console(child_pipe, 1); + write_console_pipe("xyz"); + child_expect_read_result(child_pipe, L"x"); + child_read_console(child_pipe, 100); + child_expect_read_result(child_pipe, L"yz"); + expect_empty_output(); + + child_set_input_mode(child_pipe, ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | + ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT | ENABLE_INSERT_MODE | + ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_AUTO_POSITION); + + child_read_console(child_pipe, 100); + write_console_pipe("xyz"); + skip_hide_cursor(); + expect_output_sequence("xyz"); + skip_sequence("\x1b[?25h"); /* show cursor */ + write_console_pipe("ab\r\n"); + child_expect_read_result(child_pipe, L"xyzab\r\n"); + skip_hide_cursor(); + expect_output_sequence("ab\r\n"); + skip_sequence("\x1b[?25h"); /* show cursor */ + expect_key_input('\r', VK_RETURN, 0, FALSE); + expect_key_pressed('\n', VK_RETURN, LEFT_CTRL_PRESSED); + expect_empty_output(); +} + static void test_tty_input(void) { INPUT_RECORD ir; @@ -1101,7 +1180,6 @@ static void child_process(HANDLE pipe) case REQ_CREATE_SCREEN_BUFFER: { HANDLE handle; - DWORD count; SetLastError(0xdeadbeef); handle = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, @@ -1123,6 +1201,13 @@ static void child_process(HANDLE pipe) break; } + case REQ_READ_CONSOLE: + ret = ReadConsoleW(input, buf, req->u.size, &count, NULL ); + ok(ret, "ReadConsoleW failed: %u\n", GetLastError()); + ret = WriteFile(pipe, buf, count * sizeof(WCHAR), NULL, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + break; + case REQ_SCROLL: ret = ScrollConsoleScreenBufferW(output, &req->u.scroll.rect, NULL, req->u.scroll.dst, &req->u.scroll.fill); ok(ret, "ScrollConsoleScreenBuffer failed: %u\n", GetLastError()); @@ -1145,6 +1230,11 @@ static void child_process(HANDLE pipe) ok(ret, "SetConsoleCursorPosition failed: %u\n", GetLastError()); break; + case REQ_SET_INPUT_MODE: + ret = SetConsoleMode(input, req->u.mode); + ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + break; + case REQ_SET_OUTPUT_MODE: ret = SetConsoleMode(output, req->u.mode); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); @@ -1273,6 +1363,7 @@ static void test_pseudoconsole(void) if (!broken_version) { test_tty_output(); + test_read_console(); test_tty_input(); } else win_skip("Skipping tty output tests on broken Windows version\n");

1 0

Jacek Caban : conhost: Free screen buffer data in destroy_screen_buffer.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 67324a4284bbbea67510365a835dbc0a45409533 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67324a4284bbbea67510365a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:08:23 2020 +0200 conhost: Free screen buffer data in destroy_screen_buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 47856a943c..422a966eb2 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -223,6 +223,7 @@ static void destroy_screen_buffer( struct screen_buffer *screen_buffer ) if (screen_buffer->console->active == screen_buffer) screen_buffer->console->active = NULL; wine_rb_remove( &screen_buffer_map, &screen_buffer->entry ); + free( screen_buffer->data ); free( screen_buffer ); }

1 0

Alistair Leslie-Hughes : xactengine3_7: Return S_OK from IXACT3Cue Destroy.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 14c6933f3f5a40d219a0597107bed379f5caeb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14c6933f3f5a40d219a05971… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 15 19:45:17 2020 +1000 xactengine3_7: Return S_OK from IXACT3Cue Destroy. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index c5f96decb7..742fe86cc9 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -73,13 +73,15 @@ static HRESULT WINAPI IXACT3CueImpl_GetState(IXACT3Cue *iface, DWORD *pdwState) static HRESULT WINAPI IXACT3CueImpl_Destroy(IXACT3Cue *iface) { XACT3CueImpl *This = impl_from_IXACT3Cue(iface); - HRESULT hr; + UINT ret; TRACE("(%p)\n", iface); - hr = FACTCue_Destroy(This->fact_cue); + ret = FACTCue_Destroy(This->fact_cue); + if (ret != 0) + WARN("FACTCue_Destroy returned %d\n", ret); HeapFree(GetProcessHeap(), 0, This); - return hr; + return S_OK; } static HRESULT WINAPI IXACT3CueImpl_SetMatrixCoefficients(IXACT3Cue *iface,

1 0

Piotr Caban : d3d9: Lock wined3d mutex in d3d9_device_CreateTexture().
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: ff1a4e06241e1793ab61e1ae8f7830e4d3182c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff1a4e06241e1793ab61e1ae… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 15 12:19:29 2020 +0200 d3d9: Lock wined3d mutex in d3d9_device_CreateTexture(). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b92193d46f..fec631e0e6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1345,9 +1345,13 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, } if (set_mem) + { + wined3d_mutex_lock(); wined3d_texture_update_desc(object->wined3d_texture, 0, width, height, wined3dformat_from_d3dformat(format), WINED3D_MULTISAMPLE_NONE, 0, *shared_handle, 0); + wined3d_mutex_unlock(); + } TRACE("Created texture %p.\n", object); *texture = (IDirect3DTexture9 *)&object->IDirect3DBaseTexture9_iface;

1 0

Jacek Caban : kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and IOCTL_CONDRV_WRITE_CONSOLE.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: 2fd27f0a04a54136acc0cf138e1a6a6b7a47a1e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd27f0a04a54136acc0cf13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:07:38 2020 +0200 kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and IOCTL_CONDRV_WRITE_CONSOLE. Avoids messing last error for non-conhost consoles. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 47083b27af..55c6ce4417 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -526,6 +526,7 @@ BOOL WINAPI ReadConsoleA( HANDLE handle, LPVOID buffer, DWORD length, DWORD *ret BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved) { + IO_STATUS_BLOCK io; DWORD charsread; LPWSTR xbuf = lpBuffer; DWORD mode; @@ -541,10 +542,10 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, return FALSE; } - if (DeviceIoControl(hConsoleInput, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer, - nNumberOfCharsToRead * sizeof(WCHAR), lpNumberOfCharsRead, NULL)) + if (!NtDeviceIoControlFile(hConsoleInput, NULL, NULL, NULL, &io, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer, + nNumberOfCharsToRead * sizeof(WCHAR))) { - *lpNumberOfCharsRead /= sizeof(WCHAR); + if (lpNumberOfCharsRead) *lpNumberOfCharsRead = io.Information / sizeof(WCHAR); return TRUE; } @@ -794,6 +795,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber const WCHAR* psz = lpBuffer; CONSOLE_SCREEN_BUFFER_INFO csbi; int k, first = 0, fd; + IO_STATUS_BLOCK io; TRACE("%p %s %d %p %p\n", hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite), @@ -801,8 +803,8 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; - if (DeviceIoControl(hConsoleOutput, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, - nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0, NULL, NULL)) + if (!NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &io, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer, + nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0)) { if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite; return TRUE;

1 0

Jacek Caban : conhost/tests: Allow clear screen on console exit.
by Alexandre Julliard Sept. 15, 2020

Sept. 15, 2020

Module: wine Branch: master Commit: d36a1792259440ea88ab0a67271aa7c4e98da28a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36a1792259440ea88ab0a67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 15 17:08:03 2020 +0200 conhost/tests: Allow clear screen on console exit. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 355a4cd7c7..0d02d2af8f 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -137,9 +137,9 @@ static BOOL expect_erase_line_(unsigned line, unsigned int cnt) if (skip_sequence("\x1b[K")) return FALSE; ok(broken(1), "expected erase line\n"); sprintf(buf, "\x1b[%uX", cnt); - expect_output_sequence(buf); /* erase the rest of the line */ + expect_output_sequence_(line, cnt, buf); /* erase the rest of the line */ sprintf(buf, "\x1b[%uC", cnt); - expect_output_sequence(buf); /* move cursor to the end of the line */ + expect_output_sequence_(line, cnt, buf); /* move cursor to the end of the line */ return TRUE; } @@ -1280,6 +1280,19 @@ static void test_pseudoconsole(void) CloseHandle(child_pipe); wait_child_process(child_process); CloseHandle(child_process); + + /* native sometimes clears the screen here */ + if (skip_sequence("\x1b[25l")) + { + unsigned int i; + skip_sequence("\x1b[H"); + for (i = 0; i < 40; i++) + { + expect_output_sequence("\x1b[K"); + if (i != 39) expect_output_sequence("\r\n"); + } + skip_sequence("\x1b[H\x1b[?25h"); + } expect_empty_output(); pClosePseudoConsole(console);

1 0