June 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Check for GPU access before attempting an upload blit in texture2d_blt().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 42a909b4f9bc689d08014d0727cbb44d88931efc URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a909b4f9bc689d08014d07… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:05:01 2020 +0430 wined3d: Check for GPU access before attempting an upload blit in texture2d_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 503f9f45e1..ba34938828 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1537,12 +1537,6 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ flags &= ~(WINED3D_BLT_SYNCHRONOUS | WINED3D_BLT_DO_NOT_WAIT | WINED3D_BLT_WAIT); - if (!device->d3d_initialized) - { - WARN("D3D not initialized, using CPU blit fallback.\n"); - goto cpu; - } - if (flags & ~simple_blit) { WARN_(d3d_perf)("Using CPU fallback for complex blit (%#x).\n", flags); @@ -1629,7 +1623,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST; } else if ((src_sub_resource->locations & surface_simple_locations) - && !(dst_sub_resource->locations & surface_simple_locations)) + && !(dst_sub_resource->locations & surface_simple_locations) + && (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { /* Upload */ if (scale)

1 0

Gerald Pfeifer : ntdll: Include <stdarg.h> in unix/debug.c.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: b4a868b8addebb906104fb38ded8524d2069337d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4a868b8addebb906104fb38… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jun 2 01:00:55 2020 +0200 ntdll: Include <stdarg.h> in unix/debug.c. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 12e9cdd36d..2aa6548b36 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -26,6 +26,7 @@ #include "wine/port.h" #include <assert.h> +#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Henri Verbeet : wined3d: Create WINED3D_NO3D swapchain surfaces without GPU access.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: 17a1391fb6da54bd9a8c480122ebb5e12585e544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a1391fb6da54bd9a8c4801… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:05:00 2020 +0430 wined3d: Create WINED3D_NO3D swapchain surfaces without GPU access. The main issue this addresses is that WINED3D_RESOURCE_ACCESS_GPU implies that WINED3D_LOCATION_TEXTURE_RGB makes sense as a location for the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e23da1180c..3497a4d560 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1413,7 +1413,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; texture_desc.bind_flags = 0; - texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; + else + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; if (swapchain->state.desc.flags & WINED3D_SWAPCHAIN_LOCKABLE_BACKBUFFER) texture_desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture_desc.width = swapchain->state.desc.backbuffer_width; @@ -1493,7 +1496,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc texture_desc.format = swapchain->state.desc.auto_depth_stencil_format; texture_desc.usage = 0; texture_desc.bind_flags = WINED3D_BIND_DEPTH_STENCIL; - texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (device->wined3d->flags & WINED3D_NO3D) + texture_desc.access = WINED3D_RESOURCE_ACCESS_CPU; + else + texture_desc.access = WINED3D_RESOURCE_ACCESS_GPU; if (FAILED(hr = device->device_parent->ops->create_swapchain_texture(device->device_parent, device->device_parent, &texture_desc, 0, &ds)))

1 0

Henri Verbeet : wined3d: Wait for the command stream to finish before removing the context in adapter_no3d_uninit_3d().
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: master Commit: acb79238816b5cdfd2cd42b1a0500c4f86156914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb79238816b5cdfd2cd42b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 2 04:04:59 2020 +0430 wined3d: Wait for the command stream to finish before removing the context in adapter_no3d_uninit_3d(). Like we do in adapter_gl_uninit_3d() and adapter_vk_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0b945919b9..ddce04f55d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2573,6 +2573,8 @@ static void adapter_no3d_uninit_3d(struct wined3d_device *device) context_no3d = &wined3d_device_no3d(device)->context_no3d; device->blitter->ops->blitter_destroy(device->blitter, NULL); + wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); + device_context_remove(device, context_no3d); wined3d_context_cleanup(context_no3d); }

1 0

Alexandre Julliard : Wine release 5.0.1
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: website Branch: master Commit: bd6f1e35ffbb6be16b904ad015e7fea2c63c6ae3 URL: https://source.winehq.org/git/website.git/?a=commit;h=bd6f1e35ffbb6be16b904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 15:11:33 2020 +0200 Wine release 5.0.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020060201.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/en/2020060201.xml b/news/en/2020060201.xml new file mode 100644 index 00000000..afc428de --- /dev/null +++ b/news/en/2020060201.xml @@ -0,0 +1,14 @@ +<news> +<date>June 2, 2020</date> +<title>Wine 5.0.1 Released</title> +<body> + The Wine maintenance release 5.0.1 is now available. + <a href="{$root}/announce/5.0.1">What's new</a> in this release: +<ul> + <li>Fix compilation with gcc 10</li> + <li>Add some timezones</li> + <li>Various bug fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0.1.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

Michael Stefaniuc : Release 5.0.1.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 6ed1d04b1325d4c2480907b76b8b1d5529caebab URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ed1d04b1325d4c2480907b7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon May 25 00:10:59 2020 +0200 Release 5.0.1. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 616 ++++++++++++++++++++++---------------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 229 insertions(+), 410 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ed1d04b1325d4c24809…

1 0

Tag wine-5.0.1 : Alexandre Julliard : Release 5.0.1
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: refs/tags/wine-5.0.1 Tag: 09b896d81a423bf2ea45fb9264cdb054d78fc20f URL: https://source.winehq.org/git/wine.git/?a=tag;h=09b896d81a423bf2ea45fb9264c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 2 15:09:41 2020 +0200 Release 5.0.1

1 0

Gijs Vermeulen : kernelbase: Set req->mask in SetConsoleScreenBufferInfoEx.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 515c1f7cb2bba3b3b9a0d1d13dd9c6ae648061d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=515c1f7cb2bba3b3b9a0d1d1… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 24 22:52:13 2020 +0100 kernelbase: Set req->mask in SetConsoleScreenBufferInfoEx. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e97fa67bc298c42c0ed319a3eb8b804dff693b70) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/console.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index b9843850c8..347f1d2a63 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1159,6 +1159,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, SERVER_START_REQ( set_console_output_info ) { req->handle = console_handle_unmap( handle ); + req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_POS | SET_CONSOLE_OUTPUT_INFO_SIZE | + SET_CONSOLE_OUTPUT_INFO_ATTR | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR | + SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW | SET_CONSOLE_OUTPUT_INFO_MAX_SIZE; req->width = info->dwSize.X; req->height = info->dwSize.Y; req->cursor_x = info->dwCursorPosition.X;

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 23cb4f7942939e6707d3aad1c548a6e3dd07e211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23cb4f7942939e6707d3aad1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 83d869ae69..b38b7b0a70 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Daniel Lehman : loader: Add Marquesas Standard Time Zone.
by Alexandre Julliard June 2, 2020

June 2, 2020

Module: wine Branch: stable Commit: 668fd9f4b60f710f95320b52a511d2b4a4d0371f URL: https://source.winehq.org/git/wine.git/?a=commit;h=668fd9f4b60f710f95320b52… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Mar 29 20:09:11 2020 -0700 loader: Add Marquesas Standard Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b41d5c10ad8b063558b57ab346a61559f27485a2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 6 ++ po/ar.po | 198 +++++++++++++++++++++++++++------------------------ po/ast.po | 198 +++++++++++++++++++++++++++------------------------ po/bg.po | 194 +++++++++++++++++++++++++------------------------ po/ca.po | 198 +++++++++++++++++++++++++++------------------------ po/cs.po | 198 +++++++++++++++++++++++++++------------------------ po/da.po | 198 +++++++++++++++++++++++++++------------------------ po/de.po | 198 +++++++++++++++++++++++++++------------------------ po/el.po | 194 +++++++++++++++++++++++++------------------------ po/en.po | 194 +++++++++++++++++++++++++------------------------ po/en_US.po | 194 +++++++++++++++++++++++++------------------------ po/eo.po | 198 +++++++++++++++++++++++++++------------------------ po/es.po | 198 +++++++++++++++++++++++++++------------------------ po/fa.po | 196 ++++++++++++++++++++++++++------------------------ po/fi.po | 198 +++++++++++++++++++++++++++------------------------ po/fr.po | 198 +++++++++++++++++++++++++++------------------------ po/he.po | 198 +++++++++++++++++++++++++++------------------------ po/hi.po | 194 +++++++++++++++++++++++++------------------------ po/hr.po | 198 +++++++++++++++++++++++++++------------------------ po/hu.po | 198 +++++++++++++++++++++++++++------------------------ po/it.po | 198 +++++++++++++++++++++++++++------------------------ po/ja.po | 198 +++++++++++++++++++++++++++------------------------ po/ko.po | 198 +++++++++++++++++++++++++++------------------------ po/lt.po | 198 +++++++++++++++++++++++++++------------------------ po/ml.po | 194 +++++++++++++++++++++++++------------------------ po/nb_NO.po | 198 +++++++++++++++++++++++++++------------------------ po/nl.po | 198 +++++++++++++++++++++++++++------------------------ po/or.po | 194 +++++++++++++++++++++++++------------------------ po/pa.po | 194 +++++++++++++++++++++++++------------------------ po/pl.po | 198 +++++++++++++++++++++++++++------------------------ po/pt_BR.po | 198 +++++++++++++++++++++++++++------------------------ po/pt_PT.po | 198 +++++++++++++++++++++++++++------------------------ po/rm.po | 194 +++++++++++++++++++++++++------------------------ po/ro.po | 198 +++++++++++++++++++++++++++------------------------ po/ru.po | 194 +++++++++++++++++++++++++------------------------ po/si.po | 198 +++++++++++++++++++++++++++------------------------ po/sk.po | 198 +++++++++++++++++++++++++++------------------------ po/sl.po | 198 +++++++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 197 ++++++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 197 ++++++++++++++++++++++++++------------------------ po/sv.po | 198 +++++++++++++++++++++++++++------------------------ po/ta.po | 194 +++++++++++++++++++++++++------------------------ po/te.po | 194 +++++++++++++++++++++++++------------------------ po/th.po | 196 ++++++++++++++++++++++++++------------------------ po/tr.po | 198 +++++++++++++++++++++++++++------------------------ po/uk.po | 194 +++++++++++++++++++++++++------------------------ po/wa.po | 196 ++++++++++++++++++++++++++------------------------ po/wine.pot | 194 +++++++++++++++++++++++++------------------------ po/zh_CN.po | 198 +++++++++++++++++++++++++++------------------------ po/zh_TW.po | 198 +++++++++++++++++++++++++++------------------------ 51 files changed, 5089 insertions(+), 4557 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=668fd9f4b60f710f9532…

1 0