- Wine-Devel - list.winehq.org

Re: [PATCH v2 0/5] MR162: explorer: Move clipboard manager thread from display driver. - approved
by Alexandre Julliard (＠julliard) May 31, 2022

May 31, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/162

1 0

Re: [PATCH v4 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero. - approved
by Alexandre Julliard (＠julliard) May 31, 2022

May 31, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/109

1 0

Re: [PATCH v2 0/4] MR161: d2d1: Improve bitmap options handling. - approved
by Alexandre Julliard (＠julliard) May 31, 2022

May 31, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/161

1 0

[PATCH v4 0/2] MR156: Stubs for Kvaser CanKing
by Alex Henrie (＠alexhenrie) May 31, 2022

May 31, 2022

-- v4: ntoskrnl: Add KeLowerIrql stub. ntoskrnl: Add KfRaiseIrql stub. https://gitlab.winehq.org/wine/wine/-/merge_requests/156

3 3

Re: [PATCH v3 0/6] MR159: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) May 31, 2022

May 31, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/159

1 0

[PATCH 1/2] wined3d: Do not accelerate NOOVERWRITE maps if we cannot map persistently.
by Zebediah Figura May 31, 2022

May 31, 2022

I.e. if ARB_buffer_storage is not supported. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Somehow I had forgotten to protect against this... dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0d9f6953de3..05e8c112388 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5231,6 +5231,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->fences = wined3d_fence_supported(gl_info); d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); d3d_info->filling_convention_offset = gl_info->filling_convention_offset; + d3d_info->persistent_map = !!gl_info->supported[ARB_BUFFER_STORAGE]; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cd1748afe90..3b87ab63ee5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2351,6 +2351,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->feature_level = feature_level_from_caps(&shader_caps); d3d_info->subpixel_viewport = true; d3d_info->fences = true; + d3d_info->persistent_map = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 0d6550bf613..9b0d98139ce 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1008,11 +1008,13 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, * but it's safe because the client thread will wait for the * map to return, thus completely serializing this call with * other client code. */ - buffer->resource.client.addr = addr; + if (context->d3d_info->persistent_map) + buffer->resource.client.addr = addr; if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce4d7384066..9304de4e9d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -243,6 +243,7 @@ struct wined3d_d3d_info uint32_t pbo : 1; uint32_t subpixel_viewport : 1; uint32_t fences : 1; + uint32_t persistent_map : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location; -- 2.35.1

2 3

[tools] testbot/orm: Don't assume that key columns don't need conversion.
by Francois Gouget May 31, 2022

May 31, 2022

This allows using booleans and timestamps in the key columns. It also makes GetUpdateData() consistent with GetInsertData(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/DBIBackEnd.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 94e4be6b7..940d37f65 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -619,7 +619,7 @@ sub GetUpdateData($$$) { foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - push @Data, $Item->GetColValue($ColName); + push @Data, $self->ToDb($Item->GetColValue($ColName), $PropertyDescriptor); } } } @@ -663,6 +663,7 @@ sub SaveCollection($$) die "Sequence property spans multiple columns"; } + # No FromDb() conversion needed for integers $Item->PutColValue(@{$ColNames}[0], $Db->{'mysql_insertid'}); $Collection->KeyChanged($Key, $Item->GetKey()); } -- 2.30.2

1 0

[tools] testbot/build: Run make depend before rebuilding the tests.
by Francois Gouget May 31, 2022

May 31, 2022

'make buildtest' only generates the headers needed by the tests. So it's possible for a patch to introduce a dependency on a header that was not build by Reconfig. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 ++-- testbot/lib/Build/Utils.pm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 23ab68587..8502f212d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -167,8 +167,8 @@ if ($DataDir =~ /'/) my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or - !BuildWine($TaskMissions, 0, "exe32", undef, "buildtests") or - !BuildWine($TaskMissions, 0, "exe64", undef, "buildtests")) + !BuildWine($TaskMissions, 0, "exe32", undef, ["depend", "buildtests"]) or + !BuildWine($TaskMissions, 0, "exe64", undef, ["depend", "buildtests"])) { exit(1); } diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 9e73cba59..8a84f5e6a 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -330,7 +330,7 @@ our $TRY_WERROR = 2; sub BuildWine($$$$;$) { my ($TaskMissions, $Flags, $Build, $Configure, $Targets) = @_; - $Targets ||= ""; + $Targets ||= [""]; return 1 if (!$TaskMissions->{Builds}->{$Build}); # Rebuild from scratch to make sure cruft will not accumulate @@ -344,14 +344,14 @@ sub BuildWine($$$$;$) { $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". "time ../wine/configure $Configure --enable-werror && ". - "time make -j$CPUCount $Targets"); + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); LogMsg "With -Werror the $Build Wine build fails\n" if ($Rc); } if ($Rc) { $Rc = system("cd '$DataDir/wine-$Build' && set -x && ". (defined $Configure ? "time ../wine/configure $Configure && " : ""). - "time make -j$CPUCount $Targets"); + join(" && ", map { "time make -j$CPUCount $_" } @$Targets)); } if ($Rc) { -- 2.30.2

1 0

[PATCH 0/5] MR162: explorer: Move clipboard manager thread from display driver.
by Jacek Caban (＠jacek) May 31, 2022

May 31, 2022

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/162

4 7

[PATCH v3 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger May 31, 2022

May 31, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> -- v3: d3d9/tests: Extend color_fill_test. wined3d: Store clear colors in subresources. wined3d: Handle WINED3DFMT_D32_FLOAT in wined3d_format_convert_from_float. wined3d: Prepare sysmem LOCATION_CLEARED handling for non-zero colors (v2). wined3d: Add a memory_colour_fill path for clearing the entire level to zero. https://gitlab.winehq.org/wine/wine/-/merge_requests/109

5 12