October 2020 - Wine-Commits

Julian Rüger : German translation for release 5.16.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 29e7d8480ef2dcd729b7279e8cf95fae3ecd3f87 URL: https://source.winehq.org/git/website.git/?a=commit;h=29e7d8480ef2dcd729b72… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:07:09 2020 +0200 German translation for release 5.16. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020082801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020082801.xml b/news/de/2020082801.xml new file mode 100644 index 00000000..a16488a1 --- /dev/null +++ b/news/de/2020082801.xml @@ -0,0 +1,15 @@ +<news> +<date>28. August 2020</date> +<title>Wine 5.16 freigegeben</title> +<body> + Die Entwicklungsversion 5.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von x86 AVX-Registern.</li> + <li>Einige ARM64-Korrekturen für macOS.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.17.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 28864993d22d47b5db2c852db31128adf43809e5 URL: https://source.winehq.org/git/website.git/?a=commit;h=28864993d22d47b5db2c8… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:08:34 2020 +0200 German translation for release 5.17. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020091101.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2020091101.xml b/news/de/2020091101.xml new file mode 100644 index 00000000..cb3e5d59 --- /dev/null +++ b/news/de/2020091101.xml @@ -0,0 +1,15 @@ +<news> +<date>11. September 2020</date> +<title>Wine 5.17 freigegeben</title> +<body> + Die Entwicklungsversion 5.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>ADVAPI32-Bibliothek nach PE konvertiert.</li> + <li>Anfänge eines NDIS-Netzwerktreibers.</li> + <li>Weitere Restrukturierung der Konsolenunterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.19.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 4276e96426fe0743a617d6304fb6a0756d9190ac URL: https://source.winehq.org/git/website.git/?a=commit;h=4276e96426fe0743a617d… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:31:29 2020 +0200 German translation for release 5.19. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020100901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020100901.xml b/news/de/2020100901.xml new file mode 100644 index 00000000..6eb8a4ba --- /dev/null +++ b/news/de/2020100901.xml @@ -0,0 +1,17 @@ +<news> +<date>9. Oktober 2020</date> +<title>Wine 5.19 freigegeben</title> +<body> + Die Entwicklungsversion 5.19 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.19">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Wine-Mono-Engine auf 5.1.1 aktualisiert, inkl. WPF-Textformatierungs-Unterstützung.</li> + <li>KERNEL32-Bibliothek nach PE konvertiert.</li> + <li>DSS-Kryptographieanbieter.</li> + <li>Fenstermodus-Unterstützung im neuen Konsolenhost.</li> + <li>Eine Anzahl an Ausnahmebehandlungs-Korrekturen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.19.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 5.18.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: ae3a9c7ed64c29347320b26f5200be0aa5efaff7 URL: https://source.winehq.org/git/website.git/?a=commit;h=ae3a9c7ed64c29347320b… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:27:19 2020 +0200 German translation for release 5.18. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020092501.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2020092501.xml b/news/de/2020092501.xml new file mode 100644 index 00000000..d1c73778 --- /dev/null +++ b/news/de/2020092501.xml @@ -0,0 +1,18 @@ +<news> +<date>25. September 2020</date> +<title>Wine 5.18 freigegeben</title> +<body> + Die Entwicklungsversion 5.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/5.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Vulkan-Shaderkompilation mit der neuen Vkd3d-Shader-Bibliothek.</li> + <li>USER32-Bibliothek nach PE konvertiert.</li> + <li>Die Konsole ist nicht länger auf die Curses-Bibliothek angewiesen.</li> + <li>Unterstützung von Anzeigemodi mit diversen Orientierungen.</li> + <li>Eine Anzahl an Syntaxkorrekturen im WIDL-Compiler.</li> + <li>Nicht-rekursive Makefiles.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/5.x/wine-5.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for vkd3d 1.2.
by Alexandre Julliard Oct. 12, 2020

Oct. 12, 2020

Module: website Branch: master Commit: 710910ecf8b0112b6209352e526171b25ce97ed7 URL: https://source.winehq.org/git/website.git/?a=commit;h=710910ecf8b0112b62093… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 12 11:17:59 2020 +0200 German translation for vkd3d 1.2. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2020092201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2020092201.xml b/news/de/2020092201.xml new file mode 100644 index 00000000..6f8a5a60 --- /dev/null +++ b/news/de/2020092201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. September 2020</date> +<title>Vkd3d 1.2 freigegeben</title> +<body> +Das Wine-Team ist stolz, die Veröffentlichung von Vkd3d 1.2, der Direct3D-zu-Vulkan-Übersetzungsbibliothek, verkünden zu können. + +Dieses Release enthält Verbesserungen, die in den <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.2:/ANNOUNCE">Release-Notes (en)</a> aufgeführt sind. +Die Höhepunkte lauten: +<ul> + <li>Verfügbarkeit von libvkd3d-shader als öffentliche Bibliothek.</li> + <li>Unterstützung von Tessellations-Shadern.</li> + <li>Version 1.1 Stammsignaturen.</li> + <li>Stream-Ausgabeunterstützung.</li> +</ul> + +Der Quelltext ist ab sofort <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz">verfügbar</a>. +</body></news>

1 0

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

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

Oct. 9, 2020

Module: wine Branch: master Commit: 6323e36f0f1b85180314027f84cb3c37140bcb70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6323e36f0f1b85180314027f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 9 17:27:29 2020 +0200 conhost: Import menus from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 118 +++++++++++++++++++------------------- po/ast.po | 114 +++++++++++++++++++------------------ po/bg.po | 120 ++++++++++++++++++++------------------- po/ca.po | 118 +++++++++++++++++++------------------- po/cs.po | 118 +++++++++++++++++++------------------- po/da.po | 118 +++++++++++++++++++------------------- po/de.po | 116 +++++++++++++++++++------------------- po/el.po | 118 +++++++++++++++++++------------------- po/en.po | 118 +++++++++++++++++++------------------- po/en_US.po | 118 +++++++++++++++++++------------------- po/eo.po | 120 ++++++++++++++++++++------------------- po/es.po | 122 ++++++++++++++++++++-------------------- po/fa.po | 118 +++++++++++++++++++------------------- po/fi.po | 114 +++++++++++++++++++------------------ po/fr.po | 118 +++++++++++++++++++------------------- po/he.po | 120 ++++++++++++++++++++------------------- po/hi.po | 114 +++++++++++++++++++------------------ po/hr.po | 114 +++++++++++++++++++------------------ po/hu.po | 120 ++++++++++++++++++++------------------- po/it.po | 122 ++++++++++++++++++++-------------------- po/ja.po | 114 +++++++++++++++++++------------------ po/ko.po | 114 +++++++++++++++++++------------------ po/lt.po | 116 +++++++++++++++++++------------------- po/ml.po | 114 +++++++++++++++++++------------------ po/nb_NO.po | 116 +++++++++++++++++++------------------- po/nl.po | 118 +++++++++++++++++++------------------- po/or.po | 114 +++++++++++++++++++------------------ po/pa.po | 114 +++++++++++++++++++------------------ po/pl.po | 114 +++++++++++++++++++------------------ po/pt_BR.po | 114 +++++++++++++++++++------------------ po/pt_PT.po | 116 +++++++++++++++++++------------------- po/rm.po | 114 +++++++++++++++++++------------------ po/ro.po | 118 +++++++++++++++++++------------------- po/ru.po | 114 +++++++++++++++++++------------------ po/si.po | 114 +++++++++++++++++++------------------ po/sk.po | 114 +++++++++++++++++++------------------ po/sl.po | 118 +++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 124 ++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 134 ++++++++++++++++++++++---------------------- po/sv.po | 118 +++++++++++++++++++------------------- po/ta.po | 114 +++++++++++++++++++------------------ po/te.po | 114 +++++++++++++++++++------------------ po/th.po | 118 +++++++++++++++++++------------------- po/tr.po | 114 +++++++++++++++++++------------------ po/uk.po | 114 +++++++++++++++++++------------------ po/wa.po | 118 +++++++++++++++++++------------------- po/wine.pot | 114 +++++++++++++++++++------------------ po/zh_CN.po | 114 +++++++++++++++++++------------------ po/zh_TW.po | 118 +++++++++++++++++++------------------- programs/conhost/conhost.h | 21 +++++++ programs/conhost/conhost.rc | 30 ++++++++++ programs/conhost/window.c | 45 +++++++++++++++ 52 files changed, 3009 insertions(+), 2815 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6323e36f0f1b85180314…

1 0

Owen Rudge : wsdapi/tests: Use wide character string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 0c723b7dec7269118236eb20a8922d5e0672ba46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c723b7dec7269118236eb20… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 13:13:57 2020 +0100 wsdapi/tests: Use wide character string literals. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 25 ++++------ dlls/wsdapi/tests/discovery.c | 98 ++++++++++++-------------------------- dlls/wsdapi/tests/msgparams.c | 6 +-- dlls/wsdapi/tests/xml.c | 106 ++++++++++++++++++------------------------ 4 files changed, 84 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c723b7dec7269118236…

1 0

Owen Rudge : wsdapi: Use wide character string literals.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 683cdf558fe003bfb13061279a5698cd3d8165f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=683cdf558fe003bfb1306127… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 1 13:13:54 2020 +0100 wsdapi: Use wide character string literals. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 137 ++++++++++++++++------------------------------------- dlls/wsdapi/xml.c | 3 +- 2 files changed, 43 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=683cdf558fe003bfb130…

1 0

Zhiyi Zhang : dxgi: Support Alt+Enter for d3d12 swapchains.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: e62b6fa12d33b7d8c79f7ed97c5025afb7c9a634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e62b6fa12d33b7d8c79f7ed9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 9 17:56:42 2020 +0800 dxgi: Support Alt+Enter for d3d12 swapchains. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 32 +++++++++++--- dlls/dxgi/tests/dxgi.c | 1 - dlls/dxgi/utils.c | 2 +- dlls/wined3d/swapchain.c | 19 ++++---- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_main.c | 99 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 5 ++- include/wine/wined3d.h | 4 +- 8 files changed, 95 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e62b6fa12d33b7d8c79f…

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs in a few of the table functions.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 1bda5913fcc709f3500ac29fcbedf0ac9fae5cd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bda5913fcc709f3500ac29f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:22 2020 +0100 riched20: Use ME_Paragraph ptrs in a few of the table functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.h | 8 ++++--- dlls/riched20/paint.c | 4 ++-- dlls/riched20/para.c | 13 ++++++++++++ dlls/riched20/table.c | 57 ++++++++++++++++++++++---------------------------- dlls/riched20/wrap.c | 9 ++++---- dlls/riched20/writer.c | 4 ++-- 7 files changed, 54 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bda5913fcc709f3500a…

1 0

Huw Davies : riched20: Move the marked paragraph list to a rbtree.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: b466eefbdfffb0b86a394c6568c8f0b4c5d4f520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b466eefbdfffb0b86a394c65… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:20 2020 +0100 riched20: Move the marked paragraph list to a rbtree. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 5 ++-- dlls/riched20/para.c | 73 +++++++------------------------------------------ dlls/riched20/wrap.c | 39 ++++++++++---------------- 4 files changed, 28 insertions(+), 90 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2fb7e3650d..e7e33c2758 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3062,7 +3062,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->bEmulateVersion10 = bEmulateVersion10; ed->styleFlags = 0; ed->exStyleFlags = 0; - ed->first_marked_para = NULL; ed->total_rows = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 2c5737f3e9..fd5c9bc3df 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -47,6 +47,7 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" +#include "wine/rbtree.h" #ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextHostVtbl itextHostStdcallVtbl DECLSPEC_HIDDEN; @@ -216,7 +217,7 @@ typedef struct tagME_Paragraph struct para_num para_num; ME_Run *eop_run; /* ptr to the end-of-para run */ struct tagME_DisplayItem *prev_para, *next_para; - struct tagME_DisplayItem *prev_marked, *next_marked; + struct wine_rb_entry marked_entry; } ME_Paragraph; typedef struct tagME_Cell /* v4.1 */ @@ -431,7 +432,6 @@ typedef struct tagME_TextEditor int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ ME_SelectionType nSelectionType; - ME_DisplayItem *first_marked_para; /* Track previous notified selection */ CHARRANGE notified_cr; @@ -445,6 +445,7 @@ typedef struct tagME_TextEditor int wheel_remain; struct list style_list; struct list reobj_list; + struct wine_rb_tree marked_paras; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 9d8693ed41..58dcfc8e71 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -35,7 +35,6 @@ static ME_DisplayItem *make_para(ME_TextEditor *editor) ME_SetDefaultParaFormat(editor, &item->member.para.fmt); item->member.para.nFlags = MEPF_REWRAP; - item->member.para.next_marked = item->member.para.prev_marked = NULL; return item; } @@ -74,74 +73,21 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) +static int para_mark_compare( const void *key, const struct wine_rb_entry *entry ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *head = editor->first_marked_para; + ME_Paragraph *para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); - if (!di->member.para.next_marked && !di->member.para.prev_marked) - { - if (di == head) - editor->first_marked_para = NULL; - } - else if (di->member.para.next_marked && di->member.para.prev_marked) - { - di->member.para.prev_marked->member.para.next_marked = di->member.para.next_marked; - di->member.para.next_marked->member.para.prev_marked = di->member.para.prev_marked; - di->member.para.prev_marked = di->member.para.next_marked = NULL; - } - else if (di->member.para.next_marked) - { - assert(di == editor->first_marked_para); - editor->first_marked_para = di->member.para.next_marked; - di->member.para.next_marked->member.para.prev_marked = NULL; - di->member.para.next_marked = NULL; - } - else - { - di->member.para.prev_marked->member.para.next_marked = NULL; - di->member.para.prev_marked = NULL; - } + return *(int *)key - para->nCharOfs; } -void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { - ME_DisplayItem *di = para_get_di( para ); - ME_DisplayItem *iter = editor->first_marked_para; + wine_rb_remove_key( &editor->marked_paras, &para->nCharOfs ); +} - if (!iter) - { - editor->first_marked_para = di; - return; - } - while (iter) - { - if (iter == di) - return; - else if (di->member.para.nCharOfs < iter->member.para.nCharOfs) - { - if (iter == editor->first_marked_para) - editor->first_marked_para = di; - di->member.para.next_marked = iter; - iter->member.para.prev_marked = di; - break; - } - else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) - { - if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) - { - if (iter->member.para.next_marked) - { - di->member.para.next_marked = iter->member.para.next_marked; - iter->member.para.next_marked->member.para.prev_marked = di; - } - di->member.para.prev_marked = iter; - iter->member.para.next_marked = di; - break; - } - } - iter = iter->member.para.next_marked; - } +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) +{ + wine_rb_put( &editor->marked_paras, &para->nCharOfs, &para->marked_entry ); } ME_Run *para_first_run( ME_Paragraph *para ) @@ -229,6 +175,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; + wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index cb17f2963b..819915d4c0 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1029,19 +1029,22 @@ static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *rep BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_Paragraph *para, *next; + struct wine_rb_entry *entry, *next_entry; ME_Context c; - int totalWidth = editor->nTotalWidth, diff = 0, prev_width; + int totalWidth = editor->nTotalWidth, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - if (!editor->first_marked_para) - return FALSE; + if (!editor->marked_paras.root) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - para = &editor->first_marked_para->member.para; - c.pt = para->pt; - while (para_get_di( para ) != editor->pBuffer->pLast) + entry = wine_rb_head( editor->marked_paras.root ); + while (entry) { + para = WINE_RB_ENTRY_VALUE( entry, ME_Paragraph, marked_entry ); + next_entry = wine_rb_next( entry ); + + c.pt = para->pt; prev_width = para->nWidth; ME_WrapTextParagraph( editor, &c, para ); if (prev_width == totalWidth && para->nWidth < totalWidth) @@ -1056,11 +1059,10 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) if (para->next_para) { - diff = c.pt.y - para->next_para->member.para.pt.y; - if (diff) + if (c.pt.y != para->next_para->member.para.pt.y) { next = para; - while (next->next_para && next != &para->next_marked->member.para && + while (next->next_para && &next->marked_entry != next_entry && next != &editor->pBuffer->pLast->member.para) { ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); @@ -1070,26 +1072,15 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) } } } - if (para->next_marked) - { - ME_Paragraph *tmp = para; - para = &para->next_marked->member.para; - para_mark_remove( editor, tmp ); - } - else - { - para_mark_remove( editor, para ); - para = &editor->pBuffer->pLast->member.para; - } - c.pt.y = para->pt.y; + entry = next_entry; } + wine_rb_clear( &editor->marked_paras, NULL, NULL ); + editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top; - editor->nTotalLength = c.pt.y; + editor->nTotalLength = editor->pBuffer->pLast->member.para.pt.y; editor->nTotalWidth = totalWidth; - editor->pBuffer->pLast->member.para.pt.x = 0; - editor->pBuffer->pLast->member.para.pt.y = c.pt.y; ME_DestroyContext(&c);

1 0

Huw Davies : riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 3a1aaf2655bf5d984b8998e554f418748f8aff0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a1aaf2655bf5d984b8998e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:19 2020 +0100 riched20: Use ME_Paragraph ptrs to iterate in WrapMarkedParagraphs(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 98 +++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c0c9c8f07e..cb17f2963b 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -913,11 +913,11 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, *repaint_end = para; } -static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) +static void adjust_para_y(ME_Paragraph *para, ME_Context *c, ME_DisplayItem *repaint_start, ME_DisplayItem *repaint_end) { - if (item->member.para.nFlags & MEPF_ROWSTART) + if (para->nFlags & MEPF_ROWSTART) { - ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); + ME_DisplayItem *cell = ME_FindItemFwd( para_get_di( para ), diCell); ME_DisplayItem *endRowPara; int borderWidth = 0; cell->member.cell.pt = c->pt; @@ -942,19 +942,19 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r if (endRowPara->member.para.fmt.dxStartIndent > 0) { int dxStartIndent = endRowPara->member.para.fmt.dxStartIndent; - cell = ME_FindItemFwd(item, diCell); + cell = ME_FindItemFwd( para_get_di( para ), diCell); cell->member.cell.pt.x += ME_twips2pointsX(c, dxStartIndent); c->pt.x = cell->member.cell.pt.x; } } - else if (item->member.para.nFlags & MEPF_ROWEND) + else if (para->nFlags & MEPF_ROWEND) { /* Set all the cells to the height of the largest cell */ ME_DisplayItem *startRowPara; int prevHeight, nHeight, bottomBorder = 0; - ME_DisplayItem *cell = ME_FindItemBack(item, diCell); - item->member.para.nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWSTART)) + ME_DisplayItem *cell = ME_FindItemBack( para_get_di( para ), diCell ); + para->nWidth = cell->member.cell.pt.x + cell->member.cell.nWidth; + if (!(para->next_para->member.para.nFlags & MEPF_ROWSTART)) { /* Last row, the bottom border is added to the height. */ cell = cell->member.cell.prev_cell; @@ -964,12 +964,12 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r cell = cell->member.cell.prev_cell; } bottomBorder = ME_twips2pointsY(c, bottomBorder); - cell = ME_FindItemBack(item, diCell); + cell = ME_FindItemBack( para_get_di( para ), diCell ); } prevHeight = cell->member.cell.nHeight; nHeight = cell->member.cell.prev_cell->member.cell.nHeight + bottomBorder; cell->member.cell.nHeight = nHeight; - item->member.para.nHeight = nHeight; + para->nHeight = nHeight; cell = cell->member.cell.prev_cell; cell->member.cell.nHeight = nHeight; while (cell->member.cell.prev_cell) @@ -986,8 +986,8 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r { /* The height of the cells has grown, so invalidate the bottom of * the cells. */ - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - cell = ME_FindItemBack(item, diCell); + ME_MarkRepaintEnd( para_get_di( para ) , &repaint_start, &repaint_end ); + cell = ME_FindItemBack( para_get_di( para ), diCell ); while (cell) { ME_MarkRepaintEnd(ME_FindItemBack(cell, diParagraph), &repaint_start, &repaint_end); @@ -995,12 +995,11 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r } } } - else if (item->member.para.pCell && - item->member.para.pCell != item->member.para.next_para->member.para.pCell) + else if (para->pCell && para->pCell != para->next_para->member.para.pCell) { /* The next paragraph is in the next cell in the table row. */ - ME_Cell *cell = &item->member.para.pCell->member.cell; - cell->nHeight = c->pt.y + item->member.para.nHeight - cell->pt.y; + ME_Cell *cell = &para->pCell->member.cell; + cell->nHeight = c->pt.y + para->nHeight - cell->pt.y; /* Propagate the largest height to the end so that it can be easily * sent back to all the cells at the end of the row. */ @@ -1010,82 +1009,79 @@ static void adjust_para_y(ME_DisplayItem *item, ME_Context *c, ME_DisplayItem *r c->pt.x = cell->pt.x + cell->nWidth; c->pt.y = cell->pt.y; cell->next_cell->member.cell.pt = c->pt; - if (!(item->member.para.next_para->member.para.nFlags & MEPF_ROWEND)) + if (!(para->next_para->member.para.nFlags & MEPF_ROWEND)) c->pt.y += cell->yTextOffset; } else { - if (item->member.para.pCell) + if (para->pCell) { /* Next paragraph in the same cell. */ - c->pt.x = item->member.para.pCell->member.cell.pt.x; + c->pt.x = para->pCell->member.cell.pt.x; } else /* Normal paragraph */ c->pt.x = 0; - c->pt.y += item->member.para.nHeight; + c->pt.y += para->nHeight; } } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { - ME_DisplayItem *item; + ME_Paragraph *para, *next; ME_Context c; int totalWidth = editor->nTotalWidth, diff = 0, prev_width; ME_DisplayItem *repaint_start = NULL, *repaint_end = NULL; - ME_Paragraph *para; if (!editor->first_marked_para) return FALSE; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - item = editor->first_marked_para; - c.pt = item->member.para.pt; - while (item != editor->pBuffer->pLast) + para = &editor->first_marked_para->member.para; + c.pt = para->pt; + while (para_get_di( para ) != editor->pBuffer->pLast) { - assert(item->type == diParagraph); - - prev_width = item->member.para.nWidth; - ME_WrapTextParagraph( editor, &c, &item->member.para ); - if (prev_width == totalWidth && item->member.para.nWidth < totalWidth) + prev_width = para->nWidth; + ME_WrapTextParagraph( editor, &c, para ); + if (prev_width == totalWidth && para->nWidth < totalWidth) totalWidth = get_total_width(editor); else - totalWidth = max(totalWidth, item->member.para.nWidth); + totalWidth = max(totalWidth, para->nWidth); - if (!item->member.para.nCharOfs) - ME_MarkRepaintEnd(item->member.para.prev_para, &repaint_start, &repaint_end); - ME_MarkRepaintEnd(item, &repaint_start, &repaint_end); - adjust_para_y(item, &c, repaint_start, repaint_end); + if (!para->nCharOfs) + ME_MarkRepaintEnd( para->prev_para, &repaint_start, &repaint_end ); + ME_MarkRepaintEnd( para_get_di( para ), &repaint_start, &repaint_end ); + adjust_para_y( para, &c, repaint_start, repaint_end ); - if (item->member.para.next_para) + if (para->next_para) { - diff = c.pt.y - item->member.para.next_para->member.para.pt.y; + diff = c.pt.y - para->next_para->member.para.pt.y; if (diff) { - para = &item->member.para; - while (para->next_para && para != &item->member.para.next_marked->member.para && - para != &editor->pBuffer->pLast->member.para) + next = para; + while (next->next_para && next != &para->next_marked->member.para && + next != &editor->pBuffer->pLast->member.para) { - ME_MarkRepaintEnd(para->next_para, &repaint_start, &repaint_end); - para->next_para->member.para.pt.y = c.pt.y; - adjust_para_y(para->next_para, &c, repaint_start, repaint_end); - para = &para->next_para->member.para; + ME_MarkRepaintEnd(next->next_para, &repaint_start, &repaint_end); + next->next_para->member.para.pt.y = c.pt.y; + adjust_para_y( &next->next_para->member.para, &c, repaint_start, repaint_end ); + next = &next->next_para->member.para; } } } - if (item->member.para.next_marked) + if (para->next_marked) { - ME_DisplayItem *rem = item; - item = item->member.para.next_marked; - para_mark_remove( editor, &rem->member.para ); + ME_Paragraph *tmp = para; + para = &para->next_marked->member.para; + para_mark_remove( editor, tmp ); } else { - para_mark_remove( editor, &item->member.para ); - item = editor->pBuffer->pLast; + para_mark_remove( editor, para ); + para = &editor->pBuffer->pLast->member.para; } - c.pt.y = item->member.para.pt.y; + c.pt.y = para->pt.y; } editor->sizeWindow.cx = c.rcView.right-c.rcView.left; editor->sizeWindow.cy = c.rcView.bottom-c.rcView.top;

1 0

Huw Davies : riched20: Pass a ME_Paragraph ptr to the marking functions.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 02cf14cf439f2100764ec3d3139721b9d0691837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02cf14cf439f2100764ec3d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:18 2020 +0100 riched20: Pass a ME_Paragraph ptr to the marking functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 2 +- dlls/riched20/editor.h | 6 +++--- dlls/riched20/para.c | 31 ++++++++++++++++--------------- dlls/riched20/run.c | 8 ++++---- dlls/riched20/undo.c | 2 +- dlls/riched20/wrap.c | 4 ++-- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 0ed34372e3..89fd9d7326 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -394,7 +394,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, c.nOffset -= nCharsToDelete; - mark_para_rewrap(editor, ME_FindItemBack(c.pRun, diParagraph)); + para_mark_rewrap( editor, &ME_FindItemBack( c.pRun, diParagraph )->member.para ); cursor = c; /* nChars is the number of characters that should be deleted from the diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index abc4592087..2fb7e3650d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2509,7 +2509,7 @@ static BOOL handle_enter(ME_TextEditor *editor) para = editor->pBuffer->pFirst->member.para.next_para; ME_SetDefaultParaFormat(editor, &para->member.para.fmt); para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 47e822c2d3..e768727251 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -208,9 +208,9 @@ void ME_SetDefaultParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_ void para_num_init( ME_Context *c, ME_Paragraph *para ) DECLSPEC_HIDDEN; void para_num_clear( struct para_num *pn ) DECLSPEC_HIDDEN; int get_total_width(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Run *para_first_run( ME_Paragraph *para ) DECLSPEC_HIDDEN; static inline ME_DisplayItem *para_get_di(ME_Paragraph *para) { diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index fb994506be..9d8693ed41 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -23,10 +23,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -void mark_para_rewrap(ME_TextEditor *editor, ME_DisplayItem *para) +void para_mark_rewrap( ME_TextEditor *editor, ME_Paragraph *para ) { - para->member.para.nFlags |= MEPF_REWRAP; - add_marked_para(editor, para); + para->nFlags |= MEPF_REWRAP; + para_mark_add( editor, para ); } static ME_DisplayItem *make_para(ME_TextEditor *editor) @@ -52,7 +52,7 @@ void destroy_para(ME_TextEditor *editor, ME_DisplayItem *item) editor->total_rows -= item->member.para.nRows; ME_DestroyString(item->member.para.text); para_num_clear( &item->member.para.para_num ); - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); ME_DestroyDisplayItem(item); } @@ -74,11 +74,11 @@ int get_total_width(ME_TextEditor *editor) return total_width; } -void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_remove( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *head = editor->first_marked_para; - assert(di->type == diParagraph); if (!di->member.para.next_marked && !di->member.para.prev_marked) { if (di == head) @@ -104,8 +104,9 @@ void remove_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } } -void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) +void para_mark_add( ME_TextEditor *editor, ME_Paragraph *para ) { + ME_DisplayItem *di = para_get_di( para ); ME_DisplayItem *iter = editor->first_marked_para; if (!iter) @@ -228,7 +229,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; - add_marked_para(editor, para); + para_mark_add( editor, &para->member.para ); ME_DestroyContext(&c); } @@ -236,7 +237,7 @@ static void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, con { while(first != last) { - mark_para_rewrap(editor, first); + para_mark_rewrap( editor, &first->member.para ); first = first->member.para.next_para; } } @@ -462,7 +463,7 @@ static void para_num_clear_list( ME_TextEditor *editor, ME_Paragraph *para, cons { do { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); para_num_clear( &para->para_num ); if (para->next_para->type != diParagraph) break; para = &para->next_para->member.para; @@ -537,7 +538,7 @@ static BOOL ME_SetParaFormat(ME_TextEditor *editor, ME_Paragraph *para, const PA if (memcmp(&copy, &para->fmt, sizeof(PARAFORMAT2))) { - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); if (((dwMask & PFM_NUMBERING) && (copy.wNumbering != para->fmt.wNumbering)) || ((dwMask & PFM_NUMBERINGSTART) && (copy.wNumberingStart != para->fmt.wNumberingStart)) || ((dwMask & PFM_NUMBERINGSTYLE) && (copy.wNumberingStyle != para->fmt.wNumberingStyle))) @@ -612,7 +613,7 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, new_para->member.para.nCharOfs = run_para->member.para.nCharOfs + ofs; new_para->member.para.nCharOfs += eol_len; new_para->member.para.nFlags = 0; - mark_para_rewrap(editor, new_para); + para_mark_rewrap( editor, &new_para->member.para ); /* FIXME initialize format style and call ME_SetParaFormat blah blah */ new_para->member.para.fmt = run_para->member.para.fmt; @@ -679,9 +680,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, /* force rewrap of the */ if (run_para->member.para.prev_para->type == diParagraph) - mark_para_rewrap(editor, run_para->member.para.prev_para); + para_mark_rewrap( editor, &run_para->member.para.prev_para->member.para ); - mark_para_rewrap(editor, new_para->member.para.prev_para); + para_mark_rewrap( editor, &new_para->member.para.prev_para->member.para ); /* we've added the end run, so we need to modify nCharOfs in the next paragraphs */ ME_PropagateCharOffset(next_para, eol_len); @@ -816,7 +817,7 @@ ME_DisplayItem *ME_JoinParagraphs(ME_TextEditor *editor, ME_DisplayItem *tp, ME_CheckCharOffsets(editor); editor->nParagraphs--; - mark_para_rewrap(editor, tp); + para_mark_rewrap( editor, &tp->member.para ); return tp; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f98288a94a..c3bc7f50b3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -247,7 +247,7 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) int i; assert(p->type == diRun && pNext->type == diRun); assert(p->member.run.nCharOfs != -1); - mark_para_rewrap(editor, ME_GetParagraph(p)); + para_mark_rewrap( editor, &ME_GetParagraph( p )->member.para ); /* Update all cursors so that they don't contain the soon deleted run */ for (i=0; i<editor->nCursors; i++) { @@ -299,7 +299,7 @@ ME_DisplayItem *ME_SplitRunSimple(ME_TextEditor *editor, ME_Cursor *cursor) editor->pCursors[i].nOffset -= nOffset; } } - mark_para_rewrap(editor, cursor->pPara); + para_mark_rewrap( editor, &cursor->pPara->member.para ); return run; } @@ -367,7 +367,7 @@ ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, ME_InsertBefore( insert_before, pDI ); TRACE("Shift length:%d\n", len); ME_PropagateCharOffset( insert_before, len ); - mark_para_rewrap( editor, para_get_di( insert_before->member.run.para ) ); + para_mark_rewrap( editor, insert_before->member.run.para ); /* Move any cursors that were at the end of the previous run to the end of the inserted run */ prev = ME_FindItemBack( pDI, diRun ); @@ -787,7 +787,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C ME_ReleaseStyle(para->para_num.style); para->para_num.style = NULL; } - mark_para_rewrap( editor, para_get_di( para ) ); + para_mark_rewrap( editor, para ); } } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 2f18fc78bb..c6b898b2dd 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -341,7 +341,7 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, struct undo_item *undo) add_undo_set_para_fmt( editor, &para->member.para ); para->member.para.fmt = undo->u.set_para_fmt.fmt; para->member.para.border = undo->u.set_para_fmt.border; - mark_para_rewrap(editor, para); + para_mark_rewrap( editor, &para->member.para ); break; } case undo_set_char_fmt: diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4853eefcab..c0c9c8f07e 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1078,11 +1078,11 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *rem = item; item = item->member.para.next_marked; - remove_marked_para(editor, rem); + para_mark_remove( editor, &rem->member.para ); } else { - remove_marked_para(editor, item); + para_mark_remove( editor, &item->member.para ); item = editor->pBuffer->pLast; } c.pt.y = item->member.para.pt.y;

1 0

Huw Davies : riched20: Don't create a display context in InvalidateParagraphRange().
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: c3e6cb5b70a99feb863a158104d8db58165079be URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3e6cb5b70a99feb863a1581… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 9 12:59:21 2020 +0100 riched20: Don't create a display context in InvalidateParagraphRange(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 819915d4c0..5ff9623e33 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1093,28 +1093,25 @@ void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) { - ME_Context c; RECT rc; int ofs; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); - rc = c.rcView; + rc = editor->rcFormat; ofs = editor->vert_si.nPos; - if (start_para) { + if (start_para) + { start_para = ME_GetOuterParagraph(start_para); last_para = ME_GetOuterParagraph(last_para); - rc.top = c.rcView.top + start_para->member.para.pt.y - ofs; + rc.top += start_para->member.para.pt.y - ofs; } else { - rc.top = c.rcView.top + editor->nTotalLength - ofs; + rc.top += editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) - rc.bottom = c.rcView.top + editor->nLastTotalLength - ofs; + rc.bottom = editor->rcFormat.top + editor->nLastTotalLength - ofs; else - rc.bottom = c.rcView.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + rc.bottom = editor->rcFormat.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); - - ME_DestroyContext(&c); }

1 0

Zhiyi Zhang : dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen.
by Alexandre Julliard Oct. 9, 2020

Oct. 9, 2020

Module: wine Branch: master Commit: 9288f310155a0eb5e1d8c56860332fcc4a075699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9288f310155a0eb5e1d8c568… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 9 17:56:53 2020 +0800 dxgi: Update swapchain containing output after Alt+Enter was used to exit fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 1 + dlls/d3d8/swapchain.c | 16 ++++++++++-- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/swapchain.c | 16 ++++++++++-- dlls/ddraw/ddraw.c | 16 ++++++++++-- dlls/ddraw/ddraw_private.h | 1 + dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 57 +++++++++++++++++++++++++++++++++++++++--- dlls/dxgi/tests/dxgi.c | 13 +++++----- dlls/wined3d/adapter_gl.c | 9 ++++--- dlls/wined3d/adapter_vk.c | 10 +++++--- dlls/wined3d/directx.c | 10 +++++--- dlls/wined3d/swapchain.c | 52 +++++++++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 4 +-- dlls/wined3d/wined3d_private.h | 16 ++++++++---- include/wine/wined3d.h | 20 ++++++++++++--- 16 files changed, 187 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9288f310155a0eb5e1d8…

1 0