wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Jacek Caban : conhost: Terminate current read request when input when reading tty input fails.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: c6909e52543b62dfcd5b183014e6eae27b69f3fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6909e52543b62dfcd5b1830… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:32 2020 +0200 conhost: Terminate current read request when input when reading tty input fails. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a9ad38eb99..1d48194206 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1637,6 +1637,11 @@ static DWORD WINAPI tty_input( void *param ) } TRACE( "NtReadFile failed: %#x\n", status ); + + EnterCriticalSection( &console_section ); + if (console->read_ioctl) read_complete( console, status, NULL, 0, FALSE ); + LeaveCriticalSection( &console_section ); + return 0; }

1 0

Jacek Caban : conhost: Signal console in tty_input if needed.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: a33594a0483be2fe30d6cff8e523a9bb208b7240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a33594a0483be2fe30d6cff8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:26 2020 +0200 conhost: Signal console in tty_input if needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 5f6065eab5..a9ad38eb99 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -473,7 +473,7 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v status = wine_server_call( req ); } SERVER_END_REQ; - if (status) ERR( "failed: %#x\n", status ); + if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#x\n", status ); console->read_ioctl = 0; console->pending_read = 0; return status; @@ -1580,6 +1580,7 @@ static DWORD WINAPI tty_input( void *param ) char read_buf[4096]; WCHAR buf[4096]; DWORD count, i; + BOOL signaled; NTSTATUS status; event = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -1595,6 +1596,7 @@ static DWORD WINAPI tty_input( void *param ) if (status) break; EnterCriticalSection( &console_section ); + signaled = console->record_count != 0; /* FIXME: Handle partial char read */ count = MultiByteToWideChar(CP_UTF8, 0, read_buf, io.Information, buf, ARRAY_SIZE(buf)); @@ -1626,6 +1628,11 @@ static DWORD WINAPI tty_input( void *param ) } process_console_input( console ); + if (!signaled && console->record_count) + { + assert( !console->read_ioctl ); + read_complete( console, STATUS_SUCCESS, NULL, 0, TRUE ); /* signal console */ + } LeaveCriticalSection( &console_section ); }

1 0

Jacek Caban : conhost: Explicitly set tty cursor position after updating output in write_console.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: da3bd4cb4a1c9644717547e0453ccd3498a3ceb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da3bd4cb4a1c9644717547e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 21 17:05:21 2020 +0200 conhost: Explicitly set tty cursor position after updating output in write_console. This avoids absolute cursor position jumps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 422a966eb2..5f6065eab5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1876,7 +1876,10 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR if (++screen_buffer->cursor_y == screen_buffer->height) new_line( screen_buffer, &update_rect ); else if (screen_buffer->mode & ENABLE_WRAP_AT_EOL_OUTPUT) + { update_output( screen_buffer, &update_rect ); + set_tty_cursor( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); + } continue; case '\a': FIXME( "beep\n" );

1 0

Francois Gouget : conhost/tests: Fix the spelling of a comment message.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: c21a7500aecd3920db516efaecc051e2b34196dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c21a7500aecd3920db516efa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:16 2020 +0200 conhost/tests: Fix the spelling of a comment message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/tests/tty.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 369199a127..27912aa188 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -923,7 +923,7 @@ static void test_tty_output(void) expect_output_sequence("\x1b[32m"); /* foreground black */ expect_output_sequence("\x1b[1;8H"); /* set cursor */ expect_output_sequence("0"); - expect_output_sequence("\x1b[41m"); /* backgorund red */ + expect_output_sequence("\x1b[41m"); /* background red */ expect_output_sequence("1"); expect_output_sequence("\x1b[30m"); /* foreground black */ expect_output_sequence("2");

1 0

Francois Gouget : ntdll/tests: Fix the spelling of a couple of ok_() messages.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: cdfec11e42e59c497e9b1760f73b68283d568225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfec11e42e59c497e9b1760… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:11 2020 +0200 ntdll/tests: Fix the spelling of a couple of ok_() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c26cfb4a11..66dbe8089c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7437,12 +7437,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] != 0xcc) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } else if (!(flag & flags) && p[i] != 0xdd) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } }

1 0

Francois Gouget : ntdll: Fix the spelling of the arch_context_parameters variable.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: a9722145a86ce3392630d469308a9dd731e62e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9722145a86ce3392630d469… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:02 2020 +0200 ntdll: Fix the spelling of the arch_context_parameters variable. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 17bbb26f9e..a6b4b6a7ba 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -696,7 +696,7 @@ static const struct context_parameters ULONG flags_offset; const struct context_copy_range *copy_ranges; } -arch_context_paramaters[] = +arch_context_parameters[] = { {0x00100000, 0xd810005f, 0x4d0, 0x4d0, 0x20, 7, 0xf, 0x30, copy_ranges_amd64}, {0x00010000, 0xd801007f, 0x2cc, 0xcc, 0x18, 3, 0x3, 0, copy_ranges_x86}, @@ -706,10 +706,10 @@ static const struct context_parameters *context_get_parameters( ULONG context_fl { unsigned int i; - for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i) + for (i = 0; i < ARRAY_SIZE(arch_context_parameters); ++i) { - if (context_flags & arch_context_paramaters[i].arch_flag) - return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i]; + if (context_flags & arch_context_parameters[i].arch_flag) + return context_flags & ~arch_context_parameters[i].supported_flags ? NULL : &arch_context_parameters[i]; } return NULL; }

1 0

Francois Gouget : vbscript: Fix the spelling of the delimiter* variables.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 38c91043f626bd6755185bc62ae85251c9e88207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c91043f626bd6755185bc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:36:11 2020 +0200 vbscript: Fix the spelling of the delimiter* variables. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 92288fcd88..1231beee8e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2316,8 +2316,8 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimeter = NULL; - int count, max, mode, len, start, end, ret, delimeterlen = 1; + BSTR str, string, delimiter = NULL; + int count, max, mode, len, start, end, ret, delimiterlen = 1; int i,*indices = NULL, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; @@ -2342,13 +2342,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, if(args_cnt > 1) { if(V_VT(args+1) != VT_BSTR) { - hres = to_string(args+1, &delimeter); + hres = to_string(args+1, &delimiter); if(FAILED(hres)) goto error; }else { - delimeter = V_BSTR(args+1); + delimiter = V_BSTR(args+1); } - delimeterlen = SysStringLen(delimeter); + delimiterlen = SysStringLen(delimiter); } if(args_cnt > 2) { @@ -2388,9 +2388,9 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, while(1) { ret = -1; - if (delimeterlen) { + if (delimiterlen) { ret = FindStringOrdinal(FIND_FROMSTART, string + start, len - start, - delimeter ? delimeter : L" ", delimeterlen, mode); + delimiter ? delimiter : L" ", delimiterlen, mode); } if (ret == -1) { @@ -2410,7 +2410,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, indices[count++] = end; if (ret == -1 || count == max) break; - start = start + ret + delimeterlen; + start = start + ret + delimiterlen; if (start > len) break; } @@ -2443,7 +2443,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, SafeArrayDestroy(sa); goto error; } - start = indices[i]+delimeterlen; + start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa); @@ -2459,7 +2459,7 @@ error: if(V_VT(args) != VT_BSTR) SysFreeString(string); if(V_VT(args+1) != VT_BSTR) - SysFreeString(delimeter); + SysFreeString(delimiter); return hres; }

1 0

Alexandre Julliard : user32: Use wide character string literals for system parameter entries.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 6456973f0a64d326bb54da4675310caffc2588f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6456973f0a64d326bb54da46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 19:09:43 2020 +0200 user32: Use wide character string literals for system parameter entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 432 ++++++++++++++++++------------------------------ 1 file changed, 160 insertions(+), 272 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6456973f0a64d326bb54…

1 0

Alexandre Julliard : user32: Use wide character string literals.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 5ad25c293b6a7b5cd5dea43f29f6fa94d8302722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ad25c293b6a7b5cd5dea43f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 16:31:11 2020 +0200 user32: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 3 +- dlls/user32/class.c | 55 ++++++------ dlls/user32/combo.c | 25 ++---- dlls/user32/dde_client.c | 2 +- dlls/user32/dde_misc.c | 5 +- dlls/user32/dde_server.c | 10 +-- dlls/user32/defwnd.c | 3 +- dlls/user32/desktop.c | 12 +-- dlls/user32/dialog.c | 18 ++-- dlls/user32/driver.c | 26 ++---- dlls/user32/edit.c | 9 +- dlls/user32/icontitle.c | 3 +- dlls/user32/listbox.c | 19 ++-- dlls/user32/mdi.c | 10 +-- dlls/user32/menu.c | 8 +- dlls/user32/message.c | 4 +- dlls/user32/misc.c | 6 +- dlls/user32/msgbox.c | 6 +- dlls/user32/painting.c | 4 +- dlls/user32/rawinput.c | 10 +-- dlls/user32/scroll.c | 3 +- dlls/user32/spy.c | 5 +- dlls/user32/static.c | 3 +- dlls/user32/sysparams.c | 221 ++++++++++++++--------------------------------- dlls/user32/text.c | 2 +- dlls/user32/uitools.c | 3 +- dlls/user32/user_main.c | 83 ++++++------------ dlls/user32/win.c | 24 ++--- dlls/user32/winstation.c | 14 +-- dlls/user32/wsprintf.c | 7 +- 30 files changed, 198 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ad25c293b6a7b5cd5de…

1 0

Alexandre Julliard : user32: Build with msvcrt.
by Alexandre Julliard 21 Sep '20

21 Sep '20

Module: wine Branch: master Commit: 9cc92365560f19c2fd2b9796f79aa75e02381bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc92365560f19c2fd2b9796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 13:53:21 2020 +0200 user32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/user32/Makefile.in | 2 ++ dlls/user32/caret.c | 3 --- dlls/user32/class.c | 31 ++++++++++++------------- dlls/user32/clipboard.c | 8 +------ dlls/user32/combo.c | 1 - dlls/user32/cursoricon.c | 8 ++----- dlls/user32/dde_misc.c | 6 +---- dlls/user32/dde_server.c | 4 ++-- dlls/user32/defwnd.c | 14 ++++-------- dlls/user32/desktop.c | 8 +------ dlls/user32/dialog.c | 38 ++++++++++++++----------------- dlls/user32/driver.c | 12 ++++++---- dlls/user32/edit.c | 33 ++++++++++++--------------- dlls/user32/exticon.c | 5 ---- dlls/user32/focus.c | 3 --- dlls/user32/hook.c | 9 +++----- dlls/user32/icontitle.c | 10 ++------ dlls/user32/input.c | 4 ---- dlls/user32/listbox.c | 40 ++++++++++++++++---------------- dlls/user32/lstr.c | 3 --- dlls/user32/mdi.c | 14 ++++++------ dlls/user32/menu.c | 26 +++++++++------------ dlls/user32/message.c | 16 +++++-------- dlls/user32/misc.c | 3 --- dlls/user32/nonclient.c | 7 +++--- dlls/user32/painting.c | 3 --- dlls/user32/property.c | 11 ++++----- dlls/user32/rawinput.c | 5 ++-- dlls/user32/resource.c | 2 -- dlls/user32/scroll.c | 2 -- dlls/user32/spy.c | 7 +++--- dlls/user32/sysparams.c | 54 +++++++++++++++++++++----------------------- dlls/user32/text.c | 16 +++++-------- dlls/user32/uitools.c | 3 +-- dlls/user32/user_main.c | 35 ++++++++++++++-------------- dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 29 +++++++++++------------- dlls/user32/winhelp.c | 8 ++----- dlls/user32/winpos.c | 3 --- dlls/user32/winproc.c | 17 ++++++-------- dlls/user32/winstation.c | 26 ++++++++++----------- 42 files changed, 216 insertions(+), 318 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cc92365560f19c2fd2b…

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2020