September 2020 - Wine-Commits

Jacek Caban : conhost/tests: Add initial tty tests.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 787df87badf606fe6589d17b9728dfe58cb524b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=787df87badf606fe6589d17b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:50:38 2020 +0200 conhost/tests: Add initial tty tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + programs/conhost/tests/Makefile.in | 6 + programs/conhost/tests/tty.c | 298 +++++++++++++++++++++++++++++++++++++ 4 files changed, 306 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=787df87badf606fe6589…

1 0

Jacek Caban : conhost: Support setting tty title in set_console_title.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 4ba7c42370e6a1de17f3a5eb72c87950f9319425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba7c42370e6a1de17f3a5eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:50:17 2020 +0200 conhost: Support setting tty title in set_console_title. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 30dedcf83f..523b1dfa94 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -76,7 +76,10 @@ struct console HANDLE tty_output; /* handle to tty output stream */ char tty_buffer[4096]; /* tty output buffer */ size_t tty_buffer_count; /* tty buffer size */ + unsigned int tty_cursor_x; /* tty cursor position */ + unsigned int tty_cursor_y; unsigned int tty_attr; /* current tty char attributes */ + int tty_cursor_visible; /* tty cursor visibility flag */ }; struct screen_buffer @@ -221,6 +224,49 @@ static void tty_write( struct console *console, const char *buffer, size_t size } } +static void *tty_alloc_buffer( struct console *console, size_t size ) +{ + void *ret; + if (console->tty_buffer_count + size > sizeof(console->tty_buffer)) return NULL; + ret = console->tty_buffer + console->tty_buffer_count; + console->tty_buffer_count += size; + return ret; +} + +static void hide_tty_cursor( struct console *console ) +{ + if (console->tty_cursor_visible) + { + tty_write( console, "\x1b[25l", 5 ); + console->tty_cursor_visible = FALSE; + } +} + +static void set_tty_cursor( struct console *console, unsigned int x, unsigned int y ) +{ + char buf[64]; + + if (console->tty_cursor_x == x && console->tty_cursor_y == y) return; + + if (!x && y == console->tty_cursor_y + 1) strcpy( buf, "\r\n" ); + else if (!x && y == console->tty_cursor_y) strcpy( buf, "\r" ); + else if (y == console->tty_cursor_y) + { + if (x + 1 == console->tty_cursor_x) strcpy( buf, "\b" ); + else if (x > console->tty_cursor_x) sprintf( buf, "\x1b[%uC", x - console->tty_cursor_x ); + else sprintf( buf, "\x1b[%uD", console->tty_cursor_x - x ); + } + else if (x || y) + { + hide_tty_cursor( console ); + sprintf( buf, "\x1b[%u;%uH", y + 1, x + 1); + } + else strcpy( buf, "\x1b[H" ); + console->tty_cursor_x = x; + console->tty_cursor_y = y; + tty_write( console, buf, strlen(buf) ); +} + static void set_tty_attr( struct console *console, unsigned int attr ) { char buf[8]; @@ -254,12 +300,31 @@ static void set_tty_attr( struct console *console, unsigned int attr ) console->tty_attr = attr; } +static void tty_sync( struct console *console ) +{ + if (!console->tty_output) return; + + if (console->active->cursor_visible) + { + set_tty_cursor( console, console->active->cursor_x, console->active->cursor_y ); + if (!console->tty_cursor_visible) + { + tty_write( console, "\x1b[?25h", 6 ); /* show cursor */ + console->tty_cursor_visible = TRUE; + } + } + else if (console->tty_cursor_visible) + hide_tty_cursor( console ); + tty_flush( console ); +} + static void init_tty_output( struct console *console ) { /* initialize tty output, but don't flush */ tty_write( console, "\x1b[2J", 4 ); /* clear screen */ set_tty_attr( console, console->active->attr ); tty_write( console, "\x1b[H", 3 ); /* move cursor to (0,0) */ + console->tty_cursor_visible = TRUE; } static NTSTATUS read_console_input( struct console *console, size_t out_size ) @@ -865,6 +930,19 @@ static NTSTATUS set_console_title( struct console *console, const WCHAR *in_titl free( console->title ); console->title = title; console->title_len = size; + + if (console->tty_output) + { + size_t len; + char *vt; + + tty_write( console, "\x1b]0;", 4 ); + len = WideCharToMultiByte( CP_UTF8, 0, console->title, size / sizeof(WCHAR), NULL, 0, NULL, NULL); + if ((vt = tty_alloc_buffer( console, len ))) + WideCharToMultiByte( CP_UTF8, 0, console->title, size / sizeof(WCHAR), vt, len, NULL, NULL ); + tty_write( console, "\x07", 1 ); + tty_sync( console ); + } return STATUS_SUCCESS; }

1 0

Jacek Caban : conhost: Initialize tty output.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 7fe03dbf21196d40ad533f6acf2e216fb48540d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe03dbf21196d40ad533f6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:49:45 2020 +0200 conhost: Initialize tty output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 114 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 97 insertions(+), 17 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index aef9b8e199..30dedcf83f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdlib.h> +#include <assert.h> + #include <ntstatus.h> #define WIN32_NO_STATUS #include <windef.h> @@ -54,23 +56,27 @@ struct font_info struct console { - HANDLE server; /* console server handle */ - unsigned int mode; /* input mode */ - struct screen_buffer *active; /* active screen buffer */ - INPUT_RECORD *records; /* input records */ - unsigned int record_count; /* number of input records */ - unsigned int record_size; /* size of input records buffer */ - size_t pending_read; /* size of pending read buffer */ - WCHAR *title; /* console title */ - size_t title_len; /* length of console title */ - struct history_line **history; /* lines history */ - unsigned int history_size; /* number of entries in history array */ - unsigned int history_index; /* number of used entries in history array */ - unsigned int history_mode; /* mode of history (non zero means remove doubled strings */ - unsigned int edition_mode; /* index to edition mode flavors */ - unsigned int input_cp; /* console input codepage */ - unsigned int output_cp; /* console output codepage */ - unsigned int win; /* window handle if backend supports it */ + HANDLE server; /* console server handle */ + unsigned int mode; /* input mode */ + struct screen_buffer *active; /* active screen buffer */ + INPUT_RECORD *records; /* input records */ + unsigned int record_count; /* number of input records */ + unsigned int record_size; /* size of input records buffer */ + size_t pending_read; /* size of pending read buffer */ + WCHAR *title; /* console title */ + size_t title_len; /* length of console title */ + struct history_line **history; /* lines history */ + unsigned int history_size; /* number of entries in history array */ + unsigned int history_index; /* number of used entries in history array */ + unsigned int history_mode; /* mode of history (non zero means remove doubled strings */ + unsigned int edition_mode; /* index to edition mode flavors */ + unsigned int input_cp; /* console input codepage */ + unsigned int output_cp; /* console output codepage */ + unsigned int win; /* window handle if backend supports it */ + HANDLE tty_output; /* handle to tty output stream */ + char tty_buffer[4096]; /* tty output buffer */ + size_t tty_buffer_count; /* tty buffer size */ + unsigned int tty_attr; /* current tty char attributes */ }; struct screen_buffer @@ -187,6 +193,75 @@ static BOOL is_active( struct screen_buffer *screen_buffer ) return screen_buffer == screen_buffer->console->active; } +static void tty_flush( struct console *console ) +{ + if (!console->tty_output || !console->tty_buffer_count) return; + TRACE("%s\n", debugstr_an(console->tty_buffer, console->tty_buffer_count)); + if (!WriteFile( console->tty_output, console->tty_buffer, console->tty_buffer_count, + NULL, NULL )) + WARN( "write failed: %u\n", GetLastError() ); + console->tty_buffer_count = 0; +} + +static void tty_write( struct console *console, const char *buffer, size_t size ) +{ + if (!size || !console->tty_output) return; + if (console->tty_buffer_count + size > sizeof(console->tty_buffer)) + tty_flush( console ); + if (console->tty_buffer_count + size <= sizeof(console->tty_buffer)) + { + memcpy( console->tty_buffer + console->tty_buffer_count, buffer, size ); + console->tty_buffer_count += size; + } + else + { + assert( !console->tty_buffer_count ); + if (!WriteFile( console->tty_output, buffer, size, NULL, NULL )) + WARN( "write failed: %u\n", GetLastError() ); + } +} + +static void set_tty_attr( struct console *console, unsigned int attr ) +{ + char buf[8]; + + if ((attr & 0x0f) != (console->tty_attr & 0x0f)) + { + if ((attr & 0x0f) != 7) + { + unsigned int n = 30; + if (attr & FOREGROUND_BLUE) n += 4; + if (attr & FOREGROUND_GREEN) n += 2; + if (attr & FOREGROUND_RED) n += 1; + if (attr & FOREGROUND_INTENSITY) n += 60; + sprintf(buf, "\x1b[%um", n); + tty_write( console, buf, strlen(buf) ); + } + else tty_write( console, "\x1b[m", 3 ); + } + + if ((attr & 0xf0) != (console->tty_attr & 0xf0) && attr != 7) + { + unsigned int n = 40; + if (attr & BACKGROUND_BLUE) n += 4; + if (attr & BACKGROUND_GREEN) n += 2; + if (attr & BACKGROUND_RED) n += 1; + if (attr & BACKGROUND_INTENSITY) n += 60; + sprintf(buf, "\x1b[%um", n); + tty_write( console, buf, strlen(buf) ); + } + + console->tty_attr = attr; +} + +static void init_tty_output( struct console *console ) +{ + /* initialize tty output, but don't flush */ + tty_write( console, "\x1b[2J", 4 ); /* clear screen */ + set_tty_attr( console, console->active->attr ); + tty_write( console, "\x1b[H", 3 ); /* move cursor to (0,0) */ +} + static NTSTATUS read_console_input( struct console *console, size_t out_size ) { size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); @@ -1199,6 +1274,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } if (!(console.active = create_screen_buffer( &console, 1, width, height ))) return 1; + if (headless) + { + console.tty_output = GetStdHandle( STD_OUTPUT_HANDLE ); + init_tty_output( &console ); + } return main_loop( &console, signal ); }

1 0

Martin Storsjo : ntdll: Don't truncate SP in arm64 handle_syscall_fault.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 5bbd8130adf9f4b0e6b45c5309484c2aaffcd8cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bbd8130adf9f4b0e6b45c53… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Sep 4 14:28:51 2020 +0300 ntdll: Don't truncate SP in arm64 handle_syscall_fault. This seems to be a copypaste typo from 0b3db9dfa28. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index ec361216d0..51cc6cbcf2 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -777,7 +777,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) REGn_sig(28, context) = frame->x28; FP_sig(context) = frame->x29; LR_sig(context) = frame->ret_addr; - SP_sig(context) = (DWORD)&frame->thunk_x29; + SP_sig(context) = (ULONG64)&frame->thunk_x29; PC_sig(context) = frame->thunk_addr; arm64_thread_data()->syscall_frame = NULL; }

1 0

Martin Storsjo : ntdll: Fix arm64 regression from "Clear the syscall frame on return".
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: d99a454a6bead9aaa5c55705d4807b416d2855a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99a454a6bead9aaa5c55705… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Sep 4 14:28:50 2020 +0300 ntdll: Fix arm64 regression from "Clear the syscall frame on return". The restoring of registers in call_user_exception_dispatcher was broken in 75e616d52b452d37cc93f492d47eba641f9741c1. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index cfe1c75b59..ec361216d0 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -700,7 +700,7 @@ __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "mov x0, x19\n\t" "mov x1, x20\n\t" "mov x2, x21\n\t" - "ldp x19, x20, [x5, #64]\n\t" /* frame->x19,x20 */ + "ldp x19, x20, [x5, #80]\n\t" /* frame->x19,x20 */ "ldp x21, x22, [x5, #96]\n\t" /* frame->x21,x22 */ "ldp x23, x24, [x5, #112]\n\t" /* frame->x23,x24 */ "ldp x25, x26, [x5, #128]\n\t" /* frame->x25,x26 */

1 0

Gabriel Ivăncescu : msscript.ocx: Return S_OK from the IActiveScriptSiteWindow::EnableModeless stub.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 59fe65b61992a76985c1e43363e959acdceca60f URL: https://source.winehq.org/git/wine.git/?a=commit;h=59fe65b61992a76985c1e433… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 3 17:50:25 2020 +0300 msscript.ocx: Return S_OK from the IActiveScriptSiteWindow::EnableModeless stub. This is needed so e.g. vbscript can display message boxes when used from the script control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 4 ++-- dlls/msscript.ocx/tests/msscript.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index a61763458b..7ddcb8f73d 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -775,9 +775,9 @@ static HRESULT WINAPI ActiveScriptSiteWindow_EnableModeless(IActiveScriptSiteWin { ScriptHost *This = impl_from_IActiveScriptSiteWindow(iface); - FIXME("(%p, %d)\n", This, enable); + FIXME("(%p, %d): stub\n", This, enable); - return E_NOTIMPL; + return S_OK; } static const IActiveScriptSiteWindowVtbl ActiveScriptSiteWindowVtbl = { diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2df85ffb40..e6d139fd75 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -2000,9 +2000,9 @@ static void test_SitehWnd(void) ok(window == hwnd, "got %p, expected %p\n", window, hwnd); hr = IActiveScriptSiteWindow_EnableModeless(site_window, FALSE); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IActiveScriptSiteWindow_EnableModeless(site_window, TRUE); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got 0x%08x\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_put_SitehWnd(sc, 0);

1 0

Jacek Caban : conhost: Support tty output in write_output.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 3038674eefd67681c187521d10a28f0460a2fd96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3038674eefd67681c187521d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 13:51:01 2020 +0200 conhost: Support tty output in write_output. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 02e3789c3e..b3aa8b4158 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -327,6 +327,45 @@ static void init_tty_output( struct console *console ) console->tty_cursor_visible = TRUE; } +static void update_output( struct screen_buffer *screen_buffer, const RECT *rect ) +{ + int x, y, size, trailing_spaces; + char_info_t *ch; + char buf[8]; + + if (!is_active( screen_buffer ) || !screen_buffer->console->tty_output) return; + TRACE( "%s\n", wine_dbgstr_rect( rect )); + + hide_tty_cursor( screen_buffer->console ); + + for (y = rect->top; y <= rect->bottom; y++) + { + for (trailing_spaces = 0; trailing_spaces < screen_buffer->width; trailing_spaces++) + { + ch = &screen_buffer->data[(y + 1) * screen_buffer->width - trailing_spaces - 1]; + if (ch->ch != ' ' || ch->attr != 7) break; + } + if (trailing_spaces < 4) trailing_spaces = 0; + + for (x = rect->left; x <= rect->right; x++) + { + ch = &screen_buffer->data[y * screen_buffer->width + x]; + set_tty_attr( screen_buffer->console, ch->attr ); + set_tty_cursor( screen_buffer->console, x, y ); + + if (x + trailing_spaces >= screen_buffer->width) + { + tty_write( screen_buffer->console, "\x1b[K", 3 ); + break; + } + + size = WideCharToMultiByte( CP_UTF8, 0, &ch->ch, 1, buf, sizeof(buf), NULL, NULL ); + tty_write( screen_buffer->console, buf, size ); + screen_buffer->console->tty_cursor_x++; + } + } +} + static NTSTATUS read_console_input( struct console *console, size_t out_size ) { size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); @@ -671,6 +710,34 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct } } + if (i && is_active( screen_buffer )) + { + RECT update_rect; + + update_rect.left = params->x; + update_rect.top = params->y; + if (params->width) + { + update_rect.bottom = min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1; + update_rect.right = min( params->x + params->width, screen_buffer->width ) - 1; + } + else + { + update_rect.bottom = params->y + (params->x + i - 1) / screen_buffer->width; + if (update_rect.bottom != params->y) + { + update_rect.left = 0; + update_rect.right = screen_buffer->width - 1; + } + else + { + update_rect.right = params->x + i - 1; + } + } + update_output( screen_buffer, &update_rect ); + tty_sync( screen_buffer->console ); + } + if (*out_size == sizeof(SMALL_RECT)) { SMALL_RECT *region;

1 0

Martin Storsjo : ntdll: Add ARM64 SEH unwind directives for assembly functions in PE builds.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 36ebdfc6b647aaaac1298a03269420fab5de5880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36ebdfc6b647aaaac1298a03… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Sep 4 10:36:06 2020 +0300 ntdll: Add ARM64 SEH unwind directives for assembly functions in PE builds. This fixes unwinding through RtlRaiseException and call_consolidate_callback in PE builds. Adjust the call_consolidate_callback function to store the whole context on the stack, and use the seh "context" opcode for unwinding to that context instead of the parent. Adjust the dwarf escape codes for reading from the context on the stack. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 83 +++++++++++++++++++++++++++++------------------ include/wine/asm.h | 10 +++++- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 40789d318c..df656d90f2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -940,9 +940,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, * else. All CFI instructions are either DW_CFA_def_cfa_expression or * DW_CFA_expression, and the expressions have the following format: * - * DW_OP_breg29; sleb128 0x10 | Load x29 + 0x10 - * DW_OP_deref | Get *(x29 + 0x10) == context - * DW_OP_plus_uconst; uleb128 <OFFSET> | Add offset to get struct member + * DW_OP_breg31; sleb128 <OFFSET> | Load x31 + struct member offset * [DW_OP_deref] | Dereference, only for CFA */ extern void * WINAPI call_consolidate_callback( CONTEXT *context, @@ -950,40 +948,60 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec, TEB *teb ); __ASM_GLOBAL_FUNC( call_consolidate_callback, - "stp x29, x30, [sp, #-0x20]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 32\n\t") - __ASM_CFI(".cfi_offset 29, -32\n\t") - __ASM_CFI(".cfi_offset 30, -24\n\t") + "stp x29, x30, [sp, #-0x30]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 48\n\t") + __ASM_CFI(".cfi_offset 29, -48\n\t") + __ASM_CFI(".cfi_offset 30, -40\n\t") + __ASM_SEH(".seh_nop\n\t") + "stp x1, x2, [sp, #0x10]\n\t" + __ASM_SEH(".seh_nop\n\t") + "str x3, [sp, #0x20]\n\t" + __ASM_SEH(".seh_nop\n\t") "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") - "str x0, [sp, 0x10]\n\t" + __ASM_SEH(".seh_nop\n\t") __ASM_CFI(".cfi_remember_state\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x07,0x8d,0x10,0x06,0x23,0x80,0x02,0x06\n\t") /* CFA */ - __ASM_CFI(".cfi_escape 0x10,0x13,0x06,0x8d,0x10,0x06,0x23,0xa0,0x01\n\t") /* x19 */ - __ASM_CFI(".cfi_escape 0x10,0x14,0x06,0x8d,0x10,0x06,0x23,0xa8,0x01\n\t") /* x20 */ - __ASM_CFI(".cfi_escape 0x10,0x15,0x06,0x8d,0x10,0x06,0x23,0xb0,0x01\n\t") /* x21 */ - __ASM_CFI(".cfi_escape 0x10,0x16,0x06,0x8d,0x10,0x06,0x23,0xb8,0x01\n\t") /* x22 */ - __ASM_CFI(".cfi_escape 0x10,0x17,0x06,0x8d,0x10,0x06,0x23,0xc0,0x01\n\t") /* x23 */ - __ASM_CFI(".cfi_escape 0x10,0x18,0x06,0x8d,0x10,0x06,0x23,0xc8,0x01\n\t") /* x24 */ - __ASM_CFI(".cfi_escape 0x10,0x19,0x06,0x8d,0x10,0x06,0x23,0xd0,0x01\n\t") /* x25 */ - __ASM_CFI(".cfi_escape 0x10,0x1a,0x06,0x8d,0x10,0x06,0x23,0xd8,0x01\n\t") /* x26 */ - __ASM_CFI(".cfi_escape 0x10,0x1b,0x06,0x8d,0x10,0x06,0x23,0xe0,0x01\n\t") /* x27 */ - __ASM_CFI(".cfi_escape 0x10,0x1c,0x06,0x8d,0x10,0x06,0x23,0xe8,0x01\n\t") /* x28 */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x06,0x8d,0x10,0x06,0x23,0xf0,0x01\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x06,0x8d,0x10,0x06,0x23,0xf8,0x01\n\t") /* x30 */ - __ASM_CFI(".cfi_escape 0x10,0x48,0x06,0x8d,0x10,0x06,0x23,0x90,0x03\n\t") /* d8 */ - __ASM_CFI(".cfi_escape 0x10,0x49,0x06,0x8d,0x10,0x06,0x23,0xa0,0x03\n\t") /* d9 */ - __ASM_CFI(".cfi_escape 0x10,0x4a,0x06,0x8d,0x10,0x06,0x23,0xb0,0x03\n\t") /* d10 */ - __ASM_CFI(".cfi_escape 0x10,0x4b,0x06,0x8d,0x10,0x06,0x23,0xc0,0x03\n\t") /* d11 */ - __ASM_CFI(".cfi_escape 0x10,0x4c,0x06,0x8d,0x10,0x06,0x23,0xd0,0x03\n\t") /* d12 */ - __ASM_CFI(".cfi_escape 0x10,0x4d,0x06,0x8d,0x10,0x06,0x23,0xe0,0x03\n\t") /* d13 */ - __ASM_CFI(".cfi_escape 0x10,0x4e,0x06,0x8d,0x10,0x06,0x23,0xf0,0x03\n\t") /* d14 */ - __ASM_CFI(".cfi_escape 0x10,0x4f,0x06,0x8d,0x10,0x06,0x23,0x80,0x04\n\t") /* d15 */ + /* Memcpy the context onto the stack */ + "sub sp, sp, #0x390\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x1, x0\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x2, #0x390\n\t" + __ASM_SEH(".seh_nop\n\t") + "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_CFI(".cfi_def_cfa 31, 0\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ + __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ + __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ + __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ + __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0xf8,0x01\n\t") /* x30 */ + __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ + __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ + __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ + __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ + __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ + __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ + __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ + __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ + __ASM_SEH(".seh_context\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldp x1, x2, [x29, #0x10]\n\t" + "ldr x18, [x29, #0x20]\n\t" "mov x0, x2\n\t" - "mov x18, x3\n\t" "blr x1\n\t" + "mov sp, x29\n\t" __ASM_CFI(".cfi_restore_state\n\t") - "ldp x29, x30, [sp], #32\n\t" + "ldp x29, x30, [sp], #48\n\t" __ASM_CFI(".cfi_restore 30\n\t") __ASM_CFI(".cfi_restore 29\n\t") __ASM_CFI(".cfi_def_cfa 31, 0\n\t") @@ -1188,6 +1206,9 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void __ASM_STDCALL_FUNC( RtlRaiseException, 4, "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ "stp x29, x30, [sp]\n\t" + __ASM_SEH(".seh_stackalloc 0x3b0\n\t") + __ASM_SEH(".seh_save_fplr 0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa x29, 944\n\t") __ASM_CFI(".cfi_offset x30, -936\n\t") __ASM_CFI(".cfi_offset x29, -944\n\t") diff --git a/include/wine/asm.h b/include/wine/asm.h index 592f638306..788e26126c 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -40,7 +40,15 @@ #endif #ifdef __SEH__ -# define __ASM_SEH(str) str +# if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) + /* Clang got support for aarch64 SEH assembly directives in Clang 12, + * before that, only .seh_startproc/.seh_endproc but nothing else was + * supported. Support for it doesn't exist in any Apple branded version + * of Clang yet. */ +# define __ASM_SEH(str) +# else +# define __ASM_SEH(str) str +# endif #else # define __ASM_SEH(str) #endif

1 0

Arkadiusz Hiler : msvcirt: Be more obvious in out-of-memory situations.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: 8749ae83c1f268d0c10996ee7af929ba132a4e8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8749ae83c1f268d0c10996ee… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Sep 4 12:46:32 2020 +0300 msvcirt: Be more obvious in out-of-memory situations. Just like in the new ifstream, if we are out of memory it's better to fail loudly with an obvious FIXME message than to leave user with half-initialized object causing ephemeral issues that are hard to debug. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 81 +++++++++++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1d7fb838f6..6bd910e9a8 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3024,11 +3024,15 @@ ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int leng TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if (mode & (OPENMODE_app|OPENMODE_ate)) - ssb->base.pptr = buffer + strlen(buffer); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; } + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + if (mode & (OPENMODE_app|OPENMODE_ate)) + ssb->base.pptr = buffer + strlen(buffer); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -3041,8 +3045,13 @@ ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) - strstreambuf_ctor(ssb); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_ctor(ssb); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -4081,11 +4090,14 @@ istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int leng TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, NULL); - istream_sb_ctor(this, &ssb->base, virt_init); - } else - istream_ctor(this, virt_init); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_buffer_ctor(ssb, buffer, length, NULL); + istream_sb_ctor(this, &ssb->base, virt_init); + base = istream_get_ios(this); base->vtable = &MSVCP_istrstream_vtable; base->delbuf = 1; @@ -4137,8 +4149,7 @@ istream* __thiscall ifstream_buffer_ctor(istream *this, filedesc fd, char *buffe TRACE("(%p %d %p %d %d)\n", this, fd, buffer, length, virt_init); - if (!fb) - { + if (!fb) { FIXME("out of memory\n"); return NULL; } @@ -4163,8 +4174,7 @@ istream* __thiscall ifstream_fd_ctor(istream *this, filedesc fd, BOOL virt_init) TRACE("(%p %d %d)\n", this, fd, virt_init); - if (!fb) - { + if (!fb) { FIXME("out of memory\n"); return NULL; } @@ -4189,8 +4199,7 @@ istream* __thiscall ifstream_open_ctor(istream *this, const char *name, ios_open TRACE("(%p %s %d %d %d)\n", this, name, mode, protection, virt_init); - if (!fb) - { + if (!fb) { FIXME("out of memory\n"); return NULL; } @@ -4500,13 +4509,17 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) - ssb->base.pptr = buffer + strlen(buffer); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + + if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) + ssb->base.pptr = buffer + strlen(buffer); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ??0strstream@@QAE(a)XZ */ @@ -4518,11 +4531,14 @@ iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) { - strstreambuf_ctor(ssb); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_ctor(ssb); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ?pcount(a)strstream@@QBEHXZ */ @@ -4567,11 +4583,14 @@ iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt TRACE("(%p %p %d)\n", this, file, virt_init); - if (stb) { - stdiobuf_file_ctor(stb, file); - return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); + if (!stb) { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_stdiostream_vtable, virt_init); + + stdiobuf_file_ctor(stb, file); + + return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); } /* ?rdbuf(a)stdiostream@@QBEPAVstdiobuf@@XZ */

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptControl::get_SitehWnd.
by Alexandre Julliard Sept. 4, 2020

Sept. 4, 2020

Module: wine Branch: master Commit: a46810c67af50843b7c6e4dcc41473e4a677b795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46810c67af50843b7c6e4dc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 3 17:50:23 2020 +0300 msscript.ocx: Implement IScriptControl::get_SitehWnd. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 9 +++++++-- dlls/msscript.ocx/tests/msscript.c | 30 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 1ff330c78a..845d501814 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -2764,8 +2764,13 @@ static HRESULT WINAPI ScriptControl_put_SitehWnd(IScriptControl *iface, LONG hwn static HRESULT WINAPI ScriptControl_get_SitehWnd(IScriptControl *iface, LONG *p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!p) return E_POINTER; + + *p = HandleToLong(This->site_hwnd); + return S_OK; } static HRESULT WINAPI ScriptControl_get_Timeout(IScriptControl *iface, LONG *p) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 8b63e979f0..8e4fa1bfcf 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -1921,20 +1921,20 @@ static void test_SitehWnd(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IScriptControl_get_SitehWnd(sc, NULL); - todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); + ok(hr == E_POINTER, "got 0x%08x\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); hr = IScriptControl_put_SitehWnd(sc, 1); ok(hr == CTL_E_INVALIDPROPERTYVALUE, "got 0x%08x\n", hr); site_hwnd = 0xdeadbeef; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); hr = IScriptControl_put_SitehWnd(sc, 0); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1949,8 +1949,8 @@ static void test_SitehWnd(void) site_hwnd = 0; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); IScriptControl_Release(sc); @@ -1989,8 +1989,8 @@ static void test_SitehWnd(void) site_hwnd = 0; hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, NULL); @@ -2008,8 +2008,8 @@ static void test_SitehWnd(void) hr = IScriptControl_put_SitehWnd(sc, 0); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!site_hwnd, "got %p\n", (HWND)(LONG_PTR)site_hwnd); window = (HWND)0xdeadbeef; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); @@ -2020,8 +2020,8 @@ static void test_SitehWnd(void) hr = IScriptControl_put_SitehWnd(sc, (LONG)(LONG_PTR)hwnd); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window); @@ -2032,8 +2032,8 @@ static void test_SitehWnd(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IScriptControl_get_SitehWnd(sc, &site_hwnd); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok((HWND)(LONG_PTR)site_hwnd == hwnd, "got %p, expected %p\n", (HWND)(LONG_PTR)site_hwnd, hwnd); window = NULL; hr = IActiveScriptSiteWindow_GetWindow(site_window, &window);

1 0