October 2020 - Wine-Commits

Zebediah Figura : vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 5fb9bcdd148ed728d90a420f209cdfcc03af24ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fb9bcdd148ed728d90a420… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:03 2020 -0500 vkd3d-shader: Don't allocate an initial buffer in vkd3d_string_buffer_init(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 6 ++---- libs/vkd3d-shader/trace.c | 6 +----- libs/vkd3d-shader/vkd3d_shader_main.c | 35 ++++++++++---------------------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 3ddca1e..9977d1a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2781,8 +2781,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if (messages) *messages = NULL; - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); @@ -3346,8 +3345,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro *messages = NULL; memset(&context, 0, sizeof(context)); - if (!vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&context.message_context, VKD3D_SHADER_LOG_INFO, NULL); if (root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_0 && root_signature->version != VKD3D_SHADER_ROOT_SIGNATURE_VERSION_1_1) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index a510f3a..9b49ca1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1579,11 +1579,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code enum vkd3d_result result = VKD3D_OK; void *code; - if (!vkd3d_string_buffer_init(&buffer)) - { - ERR("Failed to initialize string buffer.\n"); - return VKD3D_ERROR; - } + vkd3d_string_buffer_init(&buffer); shader_sm4_read_header(data, &ptr, &shader_version); shader_addline(&buffer, "%s_%u_%u\n", diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 8d33859..7c3885e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -23,23 +23,9 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); -static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - buffer->buffer[0] = '\0'; - buffer->content_size = 0; -} - -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) -{ - buffer->buffer_size = 32; - if (!(buffer->buffer = vkd3d_malloc(buffer->buffer_size))) - { - ERR("Failed to allocate shader buffer memory.\n"); - return false; - } - - vkd3d_string_buffer_clear(buffer); - return true; + memset(buffer, 0, sizeof(*buffer)); } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -52,6 +38,7 @@ static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int r unsigned int new_buffer_size = buffer->buffer_size * 2; char *new_buffer; + new_buffer_size = max(new_buffer_size, 32); while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) new_buffer_size *= 2; if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) @@ -71,6 +58,9 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * va_list a; int rc; + if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32)) + return -1; + for (;;) { rem = buffer->buffer_size - buffer->content_size; @@ -118,7 +108,7 @@ static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, } } -bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) { context->log_level = log_level; @@ -126,7 +116,7 @@ bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *cont context->line = 0; context->column = 0; - return vkd3d_string_buffer_init(&context->messages); + vkd3d_string_buffer_init(&context->messages); } void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) @@ -845,8 +835,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR_OUT_OF_MEMORY; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); ret = scan_dxbc(compile_info, &message_context); @@ -947,8 +936,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, if ((ret = vkd3d_shader_validate_compile_info(compile_info)) < 0) return ret; - if (!vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, compile_info->log_level, compile_info->source_name); switch (compile_info->source_type) { @@ -1050,8 +1038,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, if (messages) *messages = NULL; - if (!vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL)) - return VKD3D_ERROR; + vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO, NULL); ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 98b5fbc..5ae5724 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -836,7 +836,7 @@ struct vkd3d_string_buffer enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; -bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN; struct vkd3d_shader_message_context @@ -850,7 +850,7 @@ struct vkd3d_shader_message_context void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) DECLSPEC_HIDDEN; -bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, +void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context, const char *function) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 0072fb213a9b4ee7647b68db760a5b27d89e2abd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0072fb213a9b4ee7647b68d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:01 2020 -0500 vkd3d-shader: Pass the output pointer to vkd3d_shader_message_context_copy_messages(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 20 +++++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 93e7eaf..3ddca1e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2786,7 +2786,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, ret = parse_dxbc(dxbc->code, dxbc->size, &message_context, rts0_handler, root_signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); @@ -3390,7 +3390,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_shader_versioned_ro done: vkd3d_shader_message_context_trace_messages(&context.message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&context.message_context))) + if (!vkd3d_shader_message_context_copy_messages(&context.message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&context.message_context); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c2fe2c8..d3d86ed 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -140,14 +140,20 @@ void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_mess vkd3d_string_buffer_trace_(&context->messages, function); } -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, char **out) { char *messages; - if ((messages = vkd3d_malloc(context->messages.content_size + 1))) - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + if (!out) + return true; - return messages; + *out = NULL; + + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) + return false; + memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + *out = messages; + return true; } void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, @@ -842,7 +848,7 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = scan_dxbc(compile_info, &message_context); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -956,7 +962,7 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, } vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); return ret; @@ -1046,7 +1052,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature); vkd3d_shader_message_context_trace_messages(&message_context); - if (messages && !(*messages = vkd3d_shader_message_context_copy_messages(&message_context))) + if (!vkd3d_shader_message_context_copy_messages(&message_context, messages)) ret = VKD3D_ERROR_OUT_OF_MEMORY; vkd3d_shader_message_context_cleanup(&message_context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f88ea69..98b5fbc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -848,7 +848,8 @@ struct vkd3d_shader_message_context }; void vkd3d_shader_message_context_cleanup(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; -char *vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context) DECLSPEC_HIDDEN; +bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_context *context, + char **out) DECLSPEC_HIDDEN; bool vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level, const char *source_name) DECLSPEC_HIDDEN; void vkd3d_shader_message_context_trace_messages_(const struct vkd3d_shader_message_context *context,

1 0

Zebediah Figura : vkd3d-shader: Return NULL from vkd3d_shader_message_context_copy_messages() if there are no messages to copy.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: vkd3d Branch: master Commit: 05cf9a54043eb5138ac503ef205427458435760f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=05cf9a54043eb5138ac503e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Oct 9 01:14:02 2020 -0500 vkd3d-shader: Return NULL from vkd3d_shader_message_context_copy_messages() if there are no messages to copy. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 3 +++ tests/shader_runner_d3d12.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index d3d86ed..8d33859 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -149,6 +149,9 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont *out = NULL; + if (!context->messages.content_size) + return true; + if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) return false; memcpy(messages, context->messages.buffer, context->messages.content_size + 1); diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index df7076c..787e90a 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -335,6 +335,8 @@ START_TEST(shader_runner_d3d12) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!blob, "Expected no compiled shader blob.\n"); ok(!!errors, "Expected non-NULL error blob.\n"); + if (!errors) + return; if (vkd3d_test_state.debug_level) trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors));

1 0

Alexandre Julliard : Wine release 5.19
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: website Branch: master Commit: 2bcb1bd8dba0ffb1e6adbfe2253981df902b3568 URL: https://source.winehq.org/git/website.git/?a=commit;h=2bcb1bd8dba0ffb1e6adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 23:01:02 2020 +0200 Wine release 5.19 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020100901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020100901.xml b/news/en/2020100901.xml new file mode 100644 index 00000000..75cd37b3 --- /dev/null +++ b/news/en/2020100901.xml @@ -0,0 +1,17 @@ +<news> +<date>October 9, 2020</date> +<title>Wine 5.19 Released</title> +<body> + The Wine development release 5.19 is now available. + <a href="{$root}/announce/5.19">What's new</a> in this release: +<ul> + <li>Wine Mono engine updated to 5.1.1, with WPF text formatting support.</li> + <li>KERNEL32 library converted to PE.</li> + <li>DSS cryptographic provider.</li> + <li>Windowing support in the new console host.</li> + <li>A number of exception handling fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 5.19.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: f7d815089580cebe2682683345272858def6358c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d815089580cebe26826833… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 22:59:08 2020 +0200 Release 5.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 886 +++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 505 insertions(+), 401 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7d815089580cebe2682…

1 0

Jacek Caban : conhost: Import menu handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 83b52b19b5324adf8782cb3b1fd23c9bbe86c8aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=83b52b19b5324adf8782cb3b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:28:12 2020 +0200 conhost: Import menu handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index a36f0469b9..8ab639f329 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1011,6 +1011,44 @@ static void copy_selection( struct console *console ) CloseClipboard(); } +static void paste_clipboard( struct console *console ) +{ + WCHAR *ptr; + HANDLE h; + + if (!OpenClipboard( console->win )) return; + h = GetClipboardData( CF_UNICODETEXT ); + if (h && (ptr = GlobalLock( h ))) + { + unsigned int i, len = GlobalSize(h) / sizeof(WCHAR); + INPUT_RECORD ir[2]; + SHORT sh; + + ir[0].EventType = KEY_EVENT; + ir[0].Event.KeyEvent.wRepeatCount = 0; + ir[0].Event.KeyEvent.dwControlKeyState = 0; + ir[0].Event.KeyEvent.bKeyDown = TRUE; + + /* generate the corresponding input records */ + for (i = 0; i < len; i++) + { + /* FIXME: the modifying keys are not generated (shift, ctrl...) */ + sh = VkKeyScanW( ptr[i] ); + ir[0].Event.KeyEvent.wVirtualKeyCode = LOBYTE(sh); + ir[0].Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW( LOBYTE(sh), 0 ); + ir[0].Event.KeyEvent.uChar.UnicodeChar = ptr[i]; + + ir[1] = ir[0]; + ir[1].Event.KeyEvent.bKeyDown = FALSE; + + write_console_input( console, ir, 2, i == len - 1 ); + } + GlobalUnlock( h ); + } + + CloseClipboard(); +} + /* handle keys while selecting an area */ static void handle_selection_key( struct console *console, BOOL down, WPARAM wparam, LPARAM lparam ) { @@ -2256,6 +2294,53 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp } break; + case WM_COMMAND: + switch (wparam) + { + case IDS_DEFAULT: + config_dialog( console, FALSE ); + break; + case IDS_PROPERTIES: + config_dialog( console, TRUE ); + break; + case IDS_MARK: + console->window->selection_start.X = console->window->selection_start.Y = 0; + console->window->selection_end.X = console->window->selection_end.Y = 0; + update_selection( console, 0 ); + console->window->in_selection = TRUE; + break; + case IDS_COPY: + if (console->window->in_selection) + { + console->window->in_selection = FALSE; + update_selection( console, 0 ); + copy_selection( console ); + } + break; + case IDS_PASTE: + paste_clipboard( console ); + break; + case IDS_SELECTALL: + console->window->selection_start.X = console->window->selection_start.Y = 0; + console->window->selection_end.X = console->active->width - 1; + console->window->selection_end.Y = console->active->height - 1; + update_selection( console, 0 ); + console->window->in_selection = TRUE; + break; + case IDS_SCROLL: + case IDS_SEARCH: + FIXME( "Unhandled yet command: %lx\n", wparam ); + break; + default: + return DefWindowProcW( hwnd, msg, wparam, lparam ); + } + break; + + case WM_INITMENUPOPUP: + if (!HIWORD(lparam)) return DefWindowProcW( hwnd, msg, wparam, lparam ); + set_menu_details( console, GetSystemMenu(console->win, FALSE) ); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); }

1 0

Jacek Caban : conhost: Import config dialog from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 627ae12d2de39695d244aead531a91d1a5fbf79d URL: https://source.winehq.org/git/wine.git/?a=commit;h=627ae12d2de39695d244aead… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:28:04 2020 +0200 conhost: Import config dialog from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 348 +++++++++--------- po/ast.po | 328 ++++++++--------- po/bg.po | 348 +++++++++--------- po/ca.po | 328 ++++++++--------- po/cs.po | 328 ++++++++--------- po/da.po | 348 +++++++++--------- po/de.po | 328 ++++++++--------- po/el.po | 344 +++++++++--------- po/en.po | 328 ++++++++--------- po/en_US.po | 328 ++++++++--------- po/eo.po | 348 +++++++++--------- po/es.po | 348 +++++++++--------- po/fa.po | 340 ++++++++--------- po/fi.po | 328 ++++++++--------- po/fr.po | 328 ++++++++--------- po/he.po | 358 +++++++++--------- po/hi.po | 330 ++++++++--------- po/hr.po | 348 +++++++++--------- po/hu.po | 348 +++++++++--------- po/it.po | 348 +++++++++--------- po/ja.po | 328 ++++++++--------- po/ko.po | 328 ++++++++--------- po/lt.po | 328 ++++++++--------- po/ml.po | 330 ++++++++--------- po/nb_NO.po | 328 ++++++++--------- po/nl.po | 348 +++++++++--------- po/or.po | 330 ++++++++--------- po/pa.po | 330 ++++++++--------- po/pl.po | 328 ++++++++--------- po/pt_BR.po | 328 ++++++++--------- po/pt_PT.po | 328 ++++++++--------- po/rm.po | 334 ++++++++--------- po/ro.po | 328 ++++++++--------- po/ru.po | 328 ++++++++--------- po/si.po | 328 ++++++++--------- po/sk.po | 344 +++++++++--------- po/sl.po | 348 +++++++++--------- po/sr_RS(a)cyrillic.po | 362 +++++++++--------- po/sr_RS(a)latin.po | 374 +++++++++---------- po/sv.po | 328 ++++++++--------- po/ta.po | 328 ++++++++--------- po/te.po | 330 ++++++++--------- po/th.po | 342 ++++++++--------- po/tr.po | 328 ++++++++--------- po/uk.po | 328 ++++++++--------- po/wa.po | 346 +++++++++--------- po/wine.pot | 328 ++++++++--------- po/zh_CN.po | 328 ++++++++--------- po/zh_TW.po | 348 +++++++++--------- programs/conhost/Makefile.in | 1 + programs/conhost/conhost.h | 39 ++ programs/conhost/conhost.rc | 82 +++++ programs/conhost/window.c | 849 +++++++++++++++++++++++++++++++++++++++++++ 53 files changed, 9267 insertions(+), 8198 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=627ae12d2de39695d244…

1 0

Tag wine-5.19 : Alexandre Julliard : Release 5.19
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: refs/tags/wine-5.19 Tag: 6467cd3f3a97132b4888a1aa28f8b5752f9d0718 URL: https://source.winehq.org/git/wine.git/?a=tag;h=6467cd3f3a97132b4888a1aa28f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 9 22:59:08 2020 +0200 Release 5.19

1 0

Jacek Caban : conhost: Import mouse event handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 91be31b28ad5ae4852d2cc3cc3bcfc3e2ee01895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91be31b28ad5ae4852d2cc3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:48 2020 +0200 conhost: Import mouse event handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 863d3e6ee1..b4891fb67d 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -840,6 +840,15 @@ static void update_console_font( struct console *console, const WCHAR *font, ERR( "Couldn't find a decent font" ); } +/* get a cell from a relative coordinate in window (takes into account the scrolling) */ +static COORD get_cell( struct console *console, LPARAM lparam ) +{ + COORD c; + c.X = console->active->win.left + (short)LOWORD(lparam) / console->active->font.width; + c.Y = console->active->win.left + (short)HIWORD(lparam) / console->active->font.height; + return c; +} + /* get the console bit mask equivalent to the VK_ status in key state */ static DWORD get_ctrl_state( BYTE *key_state) { @@ -1091,6 +1100,29 @@ static void record_key_input( struct console *console, BOOL down, WPARAM wparam, write_console_input( console, &ir, 1, TRUE ); } +static void record_mouse_input( struct console *console, COORD c, WPARAM wparam, DWORD event ) +{ + BYTE key_state[256]; + INPUT_RECORD ir; + + /* MOUSE_EVENTs shouldn't be sent unless ENABLE_MOUSE_INPUT is active */ + if (!(console->mode & ENABLE_MOUSE_INPUT)) return; + + ir.EventType = MOUSE_EVENT; + ir.Event.MouseEvent.dwMousePosition = c; + ir.Event.MouseEvent.dwButtonState = 0; + if (wparam & MK_LBUTTON) ir.Event.MouseEvent.dwButtonState |= FROM_LEFT_1ST_BUTTON_PRESSED; + if (wparam & MK_MBUTTON) ir.Event.MouseEvent.dwButtonState |= FROM_LEFT_2ND_BUTTON_PRESSED; + if (wparam & MK_RBUTTON) ir.Event.MouseEvent.dwButtonState |= RIGHTMOST_BUTTON_PRESSED; + if (wparam & MK_CONTROL) ir.Event.MouseEvent.dwButtonState |= LEFT_CTRL_PRESSED; + if (wparam & MK_SHIFT) ir.Event.MouseEvent.dwButtonState |= SHIFT_PRESSED; + if (event == MOUSE_WHEELED) ir.Event.MouseEvent.dwButtonState |= wparam & 0xFFFF0000; + ir.Event.MouseEvent.dwControlKeyState = get_ctrl_state( key_state ); + ir.Event.MouseEvent.dwEventFlags = event; + + write_console_input( console, &ir, 1, TRUE ); +} + static void apply_config( struct console *console, const struct console_config *config ) { if (console->active->width != config->sb_width || console->active->height != config->sb_height) @@ -1157,6 +1189,17 @@ static void apply_config( struct console *console, const struct console_config * update_window( console ); } +/* grays / ungrays the menu items according to their state */ +static void set_menu_details( struct console *console, HMENU menu ) +{ + EnableMenuItem( menu, IDS_COPY, MF_BYCOMMAND | + (console->window->in_selection ? MF_ENABLED : MF_GRAYED) ); + EnableMenuItem( menu, IDS_PASTE, MF_BYCOMMAND | + (IsClipboardFormatAvailable(CF_UNICODETEXT) ? MF_ENABLED : MF_GRAYED) ); + EnableMenuItem( menu, IDS_SCROLL, MF_BYCOMMAND | MF_GRAYED ); + EnableMenuItem( menu, IDS_SEARCH, MF_BYCOMMAND | MF_GRAYED ); +} + static BOOL fill_menu( HMENU menu, BOOL sep ) { HINSTANCE module = GetModuleHandleW( NULL ); @@ -1244,6 +1287,7 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp console->active->win.left * console->active->font.width, console->active->win.top * console->active->font.height, SRCCOPY ); + if (console->window->in_selection) update_selection( console, ps.hdc ); EndPaint( console->win, &ps ); break; } @@ -1261,6 +1305,108 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp record_key_input( console, msg == WM_SYSKEYDOWN, wparam, lparam ); break; + case WM_LBUTTONDOWN: + if (console->window->quick_edit || console->window->in_selection) + { + if (console->window->in_selection) + update_selection( console, 0 ); + + if (console->window->quick_edit && console->window->in_selection) + { + console->window->in_selection = FALSE; + } + else + { + console->window->selection_end = get_cell( console, lparam ); + console->window->selection_start = console->window->selection_end; + SetCapture( console->win ); + update_selection( console, 0 ); + console->window->in_selection = TRUE; + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_MOUSEMOVE: + if (console->window->quick_edit || console->window->in_selection) + { + if (GetCapture() == console->win && console->window->in_selection && + (wparam & MK_LBUTTON)) + { + move_selection( console, console->window->selection_start, + get_cell(console, lparam) ); + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, MOUSE_MOVED ); + } + break; + + case WM_LBUTTONUP: + if (console->window->quick_edit || console->window->in_selection) + { + if (GetCapture() == console->win && console->window->in_selection) + { + move_selection( console, console->window->selection_start, + get_cell(console, lparam) ); + ReleaseCapture(); + } + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_RBUTTONDOWN: + if ((wparam & (MK_CONTROL|MK_SHIFT)) == console->window->menu_mask) + { + POINT pt; + pt.x = (short)LOWORD(lparam); + pt.y = (short)HIWORD(lparam); + ClientToScreen( hwnd, &pt ); + set_menu_details( console, console->window->popup_menu ); + TrackPopupMenu( console->window->popup_menu, TPM_LEFTALIGN|TPM_TOPALIGN|TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hwnd, NULL ); + } + else + { + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + } + break; + + case WM_RBUTTONUP: + /* no need to track for rbutton up when opening the popup... the event will be + * swallowed by TrackPopupMenu */ + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + record_mouse_input( console, get_cell(console, lparam), wparam, 0 ); + break; + + case WM_LBUTTONDBLCLK: + case WM_MBUTTONDBLCLK: + case WM_RBUTTONDBLCLK: + record_mouse_input( console, get_cell(console, lparam), wparam, DOUBLE_CLICK ); + break; + + case WM_SETFOCUS: + if (console->active->cursor_visible) + { + CreateCaret( console->win, console->window->cursor_bitmap, + console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } + break; + + case WM_KILLFOCUS: + if (console->active->cursor_visible) + DestroyCaret(); + break; + default: return DefWindowProcW( hwnd, msg, wparam, lparam ); }

1 0

Jacek Caban : conhost: Import keyboard event handling from wineconsole.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 7148521305b161129c43b806d83c9a46aa42cbca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7148521305b161129c43b806… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:39 2020 +0200 conhost: Import keyboard event handling from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 +- programs/conhost/conhost.h | 2 + programs/conhost/window.c | 267 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 271 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7148521305b161129c43…

1 0