March 2020 - Wine-devel - list.winehq.org

[tools] testbot: Improve the patch subject parsing.
by Francois Gouget 04 Mar '20

04 Mar '20

This supports a lot more subject formats and better recognizes the patch series. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48353 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 78 ++++++- testbot/lib/WineTestBot/PendingPatchSets.pm | 10 +- testbot/tests/TestPatches | 220 ++++++++++++++++++++ 3 files changed, 293 insertions(+), 15 deletions(-) create mode 100755 testbot/tests/TestPatches diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 2b52f4baff..a76c35fd48 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -113,23 +113,76 @@ sub FromSubmission($$) sub ParseSubject($) { my ($self) = @_; + my $SubjectInfo = { Domain => "", Version => 0 }; + # Extract the reply prefixes: 'Re:', 'Fw:', etc. They are similar to a patch + # version except they are incompatible with patch series. my $Title = $self->Subject; - $Title =~ s/32\/64//; - $Title =~ s/64\/32//; + if ($Title =~ s~^\s*(\w\w?:\s*)+~~) + { + $SubjectInfo->{Re} = $1; + $SubjectInfo->{Re} =~ s~\s+~ ~g; + $SubjectInfo->{Re} =~ s~\s$~~; + } + + # Get rid of 'resend' wherever it is + $Title =~ s~[[$]resend\d*[]$]~~i or + $Title =~ s~\bresend\d*\b~~i; + + # Try to extract the informal 'try N' version + if ($Title =~ s~[[$]try\s*(\d+)[]$]~~i or + $Title =~ s~\btry\s*(\d+)\b~~i or + $Title =~ s~[[$]v(\d+)[]$]~~i) + { + $SubjectInfo->{Version} = int($1); + } + + my ($Series, $IsFormal); + # If the subject is in the new [PATCH...] format, + # focus on that part to avoid false positives + if ($Title =~ s~^\[([^]]*)\]~~) + { + $IsFormal = 1; + $Series = $1; + $Series =~ s~PATCH~~i; + } + else + { + # Otherwise remove parts that may be confusing + $Series = $Title; + $Series =~ s~32/64~~g; + $Series =~ s~64/32~~g; + } + + # Extract the formal 'vN' version + if (!$SubjectInfo->{Version}) + { + if ($Series =~ s~[[$]v(\d+)[]$]~~i or + $Series =~ s~\bv(\d+)\b~~i) + { + $SubjectInfo->{Version} = int($1); + } + } - my $SubjectInfo; - if ($Title =~ s~[[$](\d+)/(\d+)[]$]~~ or - $Title =~ s~\b(\d+)/(\d+)\b~~) + # Extract the part number for patch series + if ($Series =~ s~[[$](\d+)/(\d+)[]$]~~ or + $Series =~ s~\b(\d+)/(\d+)\b~~) { $SubjectInfo->{PartNo} = int($1); $SubjectInfo->{MaxPartNo} = int($2); + if (!$IsFormal) + { + $Title =~ s~[[$]$1/$2[]$]~~ or + $Title =~ s~$1/$2~~; + } } - $Title =~ s/\[PATCH[^]]*\]//i; - $Title =~ s/\s+/ /g; - $Title =~ s/^\s//; - $Title =~ s/\s$//; + # Extract the 'domain' which usually identifies the patch repository + $SubjectInfo->{Domain} = $1 if ($IsFormal and $Series =~ /^\s*(\w+)\s*$/); + + $Title =~ s~\s+~ ~g; + $Title =~ s~^\s~~; + $Title =~ s~\s$~~; $SubjectInfo->{Title} = $Title; return $SubjectInfo; @@ -181,7 +234,12 @@ sub Submit($$;$) my $Priority = 5; $NewJob->Priority($Priority); my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName("Remarks"); - my $Remarks = "[$PatchesMailingList] $SubjectInfo->{Title}"; + my $Remarks = "[$PatchesMailingList] "; + # Keep Re because it's similar to a version + $Remarks = "$SubjectInfo->{Re} $Remarks" if ($SubjectInfo->{Re}); + $Remarks .= "$SubjectInfo->{Domain} " if ($SubjectInfo->{Domain}); + $Remarks .= "v$SubjectInfo->{Version} " if ($SubjectInfo->{Version}); + $Remarks .= $SubjectInfo->{Title}; $NewJob->Remarks(substr($Remarks, 0, $PropertyDescriptor->GetMaxLength())); $NewJob->Patch($self); diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index cfa6dc0e59..8f5b470542 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -28,11 +28,11 @@ WineTestBot::PendingPatchSet - An object tracking a pending patchset A patchset is a set of patches that depend on each other. They are numbered so that one knows in which order to apply them. This is typically indicated by a -subject of the form '[3/5] Subject'. This means one must track which patchset -a patch belongs to so it is tested (and applied) together with the earlier -parts rather than in isolation. Furthermore the parts of the set may arrive in -the wrong order so processing of later parts must be deferred until the earlier -ones have been received. +subject of the form '[3/5] Subject' (see TestPatches for more details). +This means one must track which patchset a patch belongs to so it is tested +(and applied) together with the earlier parts rather than in isolation. +Furthermore the parts of the set may arrive in the wrong order so processing of +later parts must be deferred until the earlier ones have been received. The WineTestBot::PendingPatchSet class is where this tracking is implemented. diff --git a/testbot/tests/TestPatches b/testbot/tests/TestPatches new file mode 100755 index 0000000000..bd367071cd --- /dev/null +++ b/testbot/tests/TestPatches @@ -0,0 +1,220 @@ +#!/usr/bin/perl +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Tests the Patches subject parser. +# +# Copyright 2020 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; +use warnings; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} + +my $name0 = $0; +$name0 =~ s+^.*/++; + +use Test::More; + +use WineTestBot::Log; +use WineTestBot::Patches; + + +sub error(@) +{ + print STDERR "$name0:error: ", @_; +} + + +# +# Process the command line +# + +my $Usage; +while (@ARGV) +{ + my $arg = shift @ARGV; + if ($arg eq "--help") + { + $Usage = 0; + } + else + { + error("unexpected argument '$arg'\n"); + $Usage = 2; + } +} + +if (defined $Usage) +{ + if ($Usage) + { + error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [--help]\n"; + print "\n"; + print "Tests the Patches subject parser.\n"; + print "\n"; + print "Where:\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# The Patches tests +# + +my $TestCount; + +sub TestParseSubject() +{ + my @Tests = ( + {Subject => "Simple subject", + Title => "Simple subject"}, + {Subject => "Re: Simple reply", + Re => "Re:", + Title => "Simple reply"}, + {Subject => "Fw: Re:Re: Complex reply", + Re => "Fw: Re:Re:", + Title => "Complex reply"}, + {Subject => "First one fell into a black hole (resend)", + Title => "First one fell into a black hole"}, + {Subject => "Second try try 2", + Version => 2, + Title => "Second try"}, + {Subject => "Third time's the charm (try3)", + Version => 3, + Title => "Third time's the charm"}, + {Subject => "Still trying (v4)", + Version => 4, + Title => "Still trying"}, + + {Subject => "[PATCH] Simple patch", + Title => "Simple patch"}, + {Subject => "Re:[PATCH] Patch reply", + Title => "Patch reply"}, + {Subject => "[tools] Also a patch", + Domain => "tools", + Title => "Also a patch"}, + {Subject => "[tools resend] Resent patch", + Domain => "tools", + Title => "Resent patch"}, + + {Subject => "[PATCH v2] New patch version", + Version => 2, + Title => "New patch version"}, + {Subject => "Re: [PATCH (v2)] New patch reply", + Version => 2, + Title => "New patch reply"}, + {Subject => "Fw: [v2] New patch version", + Version => 2, + Title => "New patch version"}, + {Subject => "[wtbs v12] New patch version", + Domain => "wtbs", Version => 12, + Title => "New patch version"}, + {Subject => "[wtbs resend v12] Resent new patch version", + Domain => "wtbs", Version => 12, + Title => "Resent new patch version"}, + {Subject => "[wtbs resend (try 3)] Resent new patch version", + Domain => "wtbs", Version => 3, + Title => "Resent new patch version"}, + + {Subject => "1/2 Informal series", + PartNo => 1, MaxPartNo => 2, + Title => "Informal series"}, + {Subject => "(1/2) Parentheses series", + PartNo => 1, MaxPartNo => 2, + Title => "Parentheses series"}, + {Subject => "Re: Tail informal series 2/2", + PartNo => 2, MaxPartNo => 2, + Title => "Tail informal series"}, + {Subject => "Re: Tail bracket series [2/2]", + PartNo => 2, MaxPartNo => 2, + Title => "Tail bracket series"}, + + {Subject => "[PATCH 1/2] Formal series", + PartNo => 1, MaxPartNo => 2, + Title => "Formal series"}, + {Subject => "[1/2 PATCH] Reverse series", + PartNo => 1, MaxPartNo => 2, + Title => "Reverse series"}, + {Subject => " Fw: [ wtbs 1/2 ] Also a patch series", + Domain => "wtbs", + PartNo => 1, MaxPartNo => 2, + Title => "Also a patch series"}, + + {Subject => "[wtbs v1 1/2] First series version", + Domain => "wtbs", Version => 1, + PartNo => 1, MaxPartNo => 2, + Title => "First series version"}, + {Subject => "Re: [wtbs 10/12 v2] Second series version", + Domain => "wtbs", Version => 2, + PartNo => 10, MaxPartNo => 12, + Title => "Second series version"}, + {Subject => "Fw: [PATCH v2 wtbs 1/2] Second series version", + Domain => "wtbs", Version => 2, + PartNo => 1, MaxPartNo => 2, + Title => "Second series version"}, + {Subject => "Fw: [V2 wtbs (resend) 1/2] Second series version", + Domain => "wtbs", Version => 2, + PartNo => 1, MaxPartNo => 2, + Title => "Second series version"}, + {Subject => "Fw: [v2 not a domain 1/2] Second series version", + Version => 2, + PartNo => 1, MaxPartNo => 2, + Title => "Second series version"}, + ); + + my $Patch = CreatePatches()->Add(); + foreach my $Test (@Tests) + { + # Provide defaults for the expected results + $Test->{Domain} ||= ""; + $Test->{Version} ||= 0; + + $Patch->Subject($Test->{Subject}); + my $SubjectInfo = $Patch->ParseSubject(); + foreach my $Field ("Domain", "Version", "PartNo", "MaxPartNo", "Title") + { + is($SubjectInfo->{$Field}, $Test->{$Field}, + "Check $Field for $Test->{Subject}"); + $TestCount++; + } + } +} + + +# +# Run the test +# + +TestParseSubject(); +done_testing($TestCount); -- 2.20.1

1 0

[PATCH] [include] Add new fields for SYSTEM_PEFORMANCE_INFORMATION
by Vijay Kiran Kamuju 04 Mar '20

04 Mar '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 3/4] winegcc: Pass tool by id to build_tool_name.
by Jacek Caban 04 Mar '20

04 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 42 +++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)

3 2

[PATCH 1/5] wined3d: Stop setting the device state in wined3d_stateblock_apply().
by Zebediah Figura 04 Mar '20

04 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 215 ++++++++------------------------------ 1 file changed, 45 insertions(+), 170 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 208a1f0606..70943afdda 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -989,142 +989,83 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, struct wined3d_stateblock *device_state) { - struct wined3d_stateblock_state *state = &device_state->stateblock_state; - struct wined3d_device *device = stateblock->device; - struct wined3d_blend_state *blend_state; - struct wined3d_color colour; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; struct wined3d_range range; unsigned int i, start; - BOOL set_blend_state; DWORD map; TRACE("stateblock %p, device_state %p.\n", stateblock, device_state); if (stateblock->changed.vertexShader) - { - if (stateblock->stateblock_state.vs) - wined3d_shader_incref(stateblock->stateblock_state.vs); - if (state->vs) - wined3d_shader_decref(state->vs); - state->vs = stateblock->stateblock_state.vs; - wined3d_device_set_vertex_shader(device, stateblock->stateblock_state.vs); - } + wined3d_stateblock_set_vertex_shader(device_state, state->vs); for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(stateblock->changed.vs_consts_f, WINED3D_MAX_VS_CONSTS_F, start, &range)) break; - - memcpy(&state->vs_consts_f[range.offset], &stateblock->stateblock_state.vs_consts_f[range.offset], - sizeof(*state->vs_consts_f) * range.size); - wined3d_device_set_vs_consts_f(device, range.offset, range.size, - &stateblock->stateblock_state.vs_consts_f[range.offset]); + wined3d_stateblock_set_vs_consts_f(device_state, range.offset, range.size, &state->vs_consts_f[range.offset]); } map = stateblock->changed.vertexShaderConstantsI; for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) break; - - memcpy(&state->vs_consts_i[range.offset], &stateblock->stateblock_state.vs_consts_i[range.offset], - sizeof(*state->vs_consts_i) * range.size); - wined3d_device_set_vs_consts_i(device, range.offset, range.size, - &stateblock->stateblock_state.vs_consts_i[range.offset]); + wined3d_stateblock_set_vs_consts_i(device_state, range.offset, range.size, &state->vs_consts_i[range.offset]); } map = stateblock->changed.vertexShaderConstantsB; for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) break; - - memcpy(&state->vs_consts_b[range.offset], &stateblock->stateblock_state.vs_consts_b[range.offset], - sizeof(*state->vs_consts_b) * range.size); - wined3d_device_set_vs_consts_b(device, range.offset, range.size, - &stateblock->stateblock_state.vs_consts_b[range.offset]); + wined3d_stateblock_set_vs_consts_b(device_state, range.offset, range.size, &state->vs_consts_b[range.offset]); } if (stateblock->changed.lights) { - for (i = 0; i < ARRAY_SIZE(stateblock->stateblock_state.light_state->light_map); ++i) + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) { const struct wined3d_light_info *light; - struct wined3d_light_info *new_light; - LIST_FOR_EACH_ENTRY(light, &stateblock->stateblock_state.light_state->light_map[i], struct wined3d_light_info, entry) + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) { - if (SUCCEEDED(wined3d_light_state_set_light(state->light_state, light->OriginalIndex, - &light->OriginalParms, &new_light))) - { - wined3d_light_state_enable_light(state->light_state, &device->adapter->d3d_info, new_light, light->glIndex != -1); - } - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); + wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); } } } if (stateblock->changed.pixelShader) - { - if (stateblock->stateblock_state.ps) - wined3d_shader_incref(stateblock->stateblock_state.ps); - if (state->ps) - wined3d_shader_decref(state->ps); - state->ps = stateblock->stateblock_state.ps; - wined3d_device_set_pixel_shader(device, stateblock->stateblock_state.ps); - } + wined3d_stateblock_set_pixel_shader(device_state, state->ps); for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) break; - - memcpy(&state->ps_consts_f[range.offset], &stateblock->stateblock_state.ps_consts_f[range.offset], - sizeof(*state->ps_consts_f) * range.size); - wined3d_device_set_ps_consts_f(device, range.offset, range.size, - &stateblock->stateblock_state.ps_consts_f[range.offset]); + wined3d_stateblock_set_ps_consts_f(device_state, range.offset, range.size, &state->ps_consts_f[range.offset]); } map = stateblock->changed.pixelShaderConstantsI; for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_I, start, &range)) break; - - memcpy(&state->ps_consts_i[range.offset], &stateblock->stateblock_state.ps_consts_i[range.offset], - sizeof(*state->ps_consts_i) * range.size); - wined3d_device_set_ps_consts_i(device, range.offset, range.size, - &stateblock->stateblock_state.ps_consts_i[range.offset]); + wined3d_stateblock_set_ps_consts_i(device_state, range.offset, range.size, &state->ps_consts_i[range.offset]); } map = stateblock->changed.pixelShaderConstantsB; for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(&map, WINED3D_MAX_CONSTS_B, start, &range)) break; - - memcpy(&state->ps_consts_b[range.offset], &stateblock->stateblock_state.ps_consts_b[range.offset], - sizeof(*state->ps_consts_b) * range.size); - wined3d_device_set_ps_consts_b(device, range.offset, range.size, - &stateblock->stateblock_state.ps_consts_b[range.offset]); + wined3d_stateblock_set_ps_consts_b(device_state, range.offset, range.size, &state->ps_consts_b[range.offset]); } - if ((set_blend_state = stateblock->changed.blend_state - || wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_ADAPTIVETESS_Y))) + if (stateblock->changed.blend_state) { - blend_state = stateblock->stateblock_state.rs[WINED3D_RS_ADAPTIVETESS_Y] == WINED3DFMT_ATOC - ? device->blend_state_atoc_enabled : stateblock->stateblock_state.blend_state; - - if (blend_state) - wined3d_blend_state_incref(blend_state); if (state->blend_state) - wined3d_blend_state_decref(state->blend_state); - - state->blend_state = blend_state; - - if (wined3d_bitmap_is_set(stateblock->changed.renderState, WINED3D_RS_BLENDFACTOR)) - wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[WINED3D_RS_BLENDFACTOR]); - else - wined3d_device_get_blend_state(device, &colour); - - wined3d_device_set_blend_state(device, blend_state, &colour); + wined3d_blend_state_incref(state->blend_state); + if (device_state->stateblock_state.blend_state) + wined3d_blend_state_decref(device_state->stateblock_state.blend_state); + device_state->stateblock_state.blend_state = state->blend_state; + device_state->changed.blend_state = 1; } /* Render states. */ @@ -1132,19 +1073,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { enum wined3d_render_state rs = stateblock->contained_render_states[i]; - state->rs[rs] = stateblock->stateblock_state.rs[rs]; - if (rs != WINED3D_RS_BLENDFACTOR) - { - wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); - continue; - } - - if (!set_blend_state) - { - blend_state = wined3d_device_get_blend_state(device, &colour); - wined3d_color_from_d3dcolor(&colour, stateblock->stateblock_state.rs[rs]); - wined3d_device_set_blend_state(device, blend_state, &colour); - } + wined3d_stateblock_set_render_state(device_state, rs, state->rs[rs]); } /* Texture states. */ @@ -1153,9 +1082,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, DWORD stage = stateblock->contained_tss_states[i].stage; DWORD texture_state = stateblock->contained_tss_states[i].state; - state->texture_states[stage][texture_state] = stateblock->stateblock_state.texture_states[stage][texture_state]; - wined3d_device_set_texture_stage_state(device, stage, texture_state, - stateblock->stateblock_state.texture_states[stage][texture_state]); + wined3d_stateblock_set_texture_stage_state(device_state, stage, texture_state, + state->texture_states[stage][texture_state]); } /* Sampler states. */ @@ -1163,11 +1091,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { DWORD stage = stateblock->contained_sampler_states[i].stage; DWORD sampler_state = stateblock->contained_sampler_states[i].state; - DWORD value = stateblock->stateblock_state.sampler_states[stage][sampler_state]; - state->sampler_states[stage][sampler_state] = value; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - wined3d_device_set_sampler_state(device, stage, sampler_state, value); + wined3d_stateblock_set_sampler_state(device_state, stage, sampler_state, + state->sampler_states[stage][sampler_state]); } if (stateblock->changed.transforms) @@ -1176,113 +1103,61 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, { enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - state->transforms[transform] = stateblock->stateblock_state.transforms[transform]; - wined3d_device_set_transform(device, transform, &stateblock->stateblock_state.transforms[transform]); + wined3d_stateblock_set_transform(device_state, transform, &state->transforms[transform]); } } if (stateblock->changed.indices) { - if (stateblock->stateblock_state.index_buffer) - wined3d_buffer_incref(stateblock->stateblock_state.index_buffer); - if (state->index_buffer) - wined3d_buffer_decref(state->index_buffer); - state->index_buffer = stateblock->stateblock_state.index_buffer; - state->index_format = stateblock->stateblock_state.index_format; - state->base_vertex_index = stateblock->stateblock_state.base_vertex_index; - - wined3d_device_set_index_buffer(device, stateblock->stateblock_state.index_buffer, - stateblock->stateblock_state.index_format, 0); - wined3d_device_set_base_vertex_index(device, stateblock->stateblock_state.base_vertex_index); + wined3d_stateblock_set_index_buffer(device_state, state->index_buffer, state->index_format); + wined3d_stateblock_set_base_vertex_index(device_state, state->base_vertex_index); } - if (stateblock->changed.vertexDecl && stateblock->stateblock_state.vertex_declaration) - { - if (stateblock->stateblock_state.vertex_declaration) - wined3d_vertex_declaration_incref(stateblock->stateblock_state.vertex_declaration); - if (state->vertex_declaration) - wined3d_vertex_declaration_decref(state->vertex_declaration); - state->vertex_declaration = stateblock->stateblock_state.vertex_declaration; - wined3d_device_set_vertex_declaration(device, stateblock->stateblock_state.vertex_declaration); - } + if (stateblock->changed.vertexDecl && state->vertex_declaration) + wined3d_stateblock_set_vertex_declaration(device_state, state->vertex_declaration); if (stateblock->changed.material) - { - state->material = stateblock->stateblock_state.material; - wined3d_device_set_material(device, &stateblock->stateblock_state.material); - } + wined3d_stateblock_set_material(device_state, &state->material); if (stateblock->changed.viewport) - { - state->viewport = stateblock->stateblock_state.viewport; - - wined3d_device_set_viewports(device, 1, &stateblock->stateblock_state.viewport); - } + wined3d_stateblock_set_viewport(device_state, &state->viewport); if (stateblock->changed.scissorRect) - { - state->scissor_rect = stateblock->stateblock_state.scissor_rect; - - wined3d_device_set_scissor_rects(device, 1, &stateblock->stateblock_state.scissor_rect); - } + wined3d_stateblock_set_scissor_rect(device_state, &state->scissor_rect); map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { - unsigned int offset, stride; - - if (!(map & 1)) continue; - - if (stateblock->stateblock_state.streams[i].buffer) - wined3d_buffer_incref(stateblock->stateblock_state.streams[i].buffer); - if (state->streams[i].buffer) - wined3d_buffer_decref(state->streams[i].buffer); - state->streams[i].buffer = stateblock->stateblock_state.streams[i].buffer; - - offset = stateblock->stateblock_state.streams[i].offset; - stride = stateblock->stateblock_state.streams[i].stride; - - state->streams[i].stride = stride; - state->streams[i].offset = offset; - wined3d_device_set_stream_source(device, i, - stateblock->stateblock_state.streams[i].buffer, offset, stride); + if (map & 1) + wined3d_stateblock_set_stream_source(device_state, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); } map = stateblock->changed.streamFreq; for (i = 0; map; map >>= 1, ++i) { - if (!(map & 1)) continue; - - state->streams[i].frequency = stateblock->stateblock_state.streams[i].frequency; - state->streams[i].flags = stateblock->stateblock_state.streams[i].flags; - - wined3d_device_set_stream_source_freq(device, i, - stateblock->stateblock_state.streams[i].frequency | stateblock->stateblock_state.streams[i].flags); + if (map & 1) + wined3d_stateblock_set_stream_source_freq(device_state, i, + state->streams[i].frequency | state->streams[i].flags); } map = stateblock->changed.textures; for (i = 0; map; map >>= 1, ++i) { - DWORD stage; + DWORD stage = i; - if (!(map & 1)) continue; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - stage = i < WINED3D_MAX_FRAGMENT_SAMPLERS ? i : WINED3DVERTEXTEXTURESAMPLER0 + i - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (stateblock->stateblock_state.textures[i]) - wined3d_texture_incref(stateblock->stateblock_state.textures[i]); - if (state->textures[i]) - wined3d_texture_decref(state->textures[i]); - state->textures[i] = stateblock->stateblock_state.textures[i]; - wined3d_device_set_texture(device, stage, stateblock->stateblock_state.textures[i]); + if (map & 1) + wined3d_stateblock_set_texture(device_state, stage, state->textures[i]); } map = stateblock->changed.clipplane; for (i = 0; map; map >>= 1, ++i) { - if (!(map & 1)) continue; - - state->clip_planes[i] = stateblock->stateblock_state.clip_planes[i]; - wined3d_device_set_clip_plane(device, i, &stateblock->stateblock_state.clip_planes[i]); + if (map & 1) + wined3d_stateblock_set_clip_plane(device_state, i, &state->clip_planes[i]); } TRACE("Applied stateblock %p.\n", stateblock); -- 2.25.1

4 15

winemac: Fix leaks in macdrv_surface_destroy.
by Piotr Caban 04 Mar '20

04 Mar '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winemac.drv/surface.c | 3 +++ 1 file changed, 3 insertions(+)

2 1

[PATCH resend 1/3] user32/tests: Add new test to validate WM_CANCELMODE message.
by Rémi Bernon 04 Mar '20

04 Mar '20

The ShowWindow(SW_SHOWMINIMIZED):overlapped test shows that the message should not be sent in general. This additional test shows that we should still the message if a menu is active. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/msg.c | 69 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 423157b623d..aff4aeca24e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1926,6 +1926,41 @@ static const struct message WmSHOWNATopInvisible[] = { { 0 } }; +static const struct message WmTrackPopupMenuMinimizeWindow[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { HCBT_MINMAX, hook }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|wparam, 0 }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_GETTEXT, sent|optional }, + { WM_NCCALCSIZE, sent|wparam|optional, 1 }, + { WM_CANCELMODE, sent }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|defwinproc|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 1, 0 }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent }, + { WM_ACTIVATEAPP, sent|wparam, 0 }, + { 0 } +}; + static const struct message WmTrackPopupMenu[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -17311,6 +17346,25 @@ static void test_layered_window(void) static HMENU hpopupmenu; +static LRESULT WINAPI minimize_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + + if (ignore_message( message )) return 0; + ret = MsgCheckProc( FALSE, hwnd, message, wParam, lParam ); + + switch (message) { + case WM_ENTERIDLE: + ShowWindow(hwnd, SW_MINIMIZE); + break; + case WM_TIMER: + EndMenu(); + break; + } + + return ret; +} + static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if (ignore_message( message )) return 0; @@ -17393,6 +17447,21 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); ok(ret == TRUE, "TrackPopupMenu failed\n"); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)minimize_popup_proc); + + /* set cursor over the window, otherwise the WM_CANCELMODE message may not always be sent */ + SetCursorPos( 0, 0 ); + ShowWindow( hwnd, SW_SHOW ); + + flush_events(); + flush_sequence(); + SetTimer( hwnd, TIMER_ID, 500, NULL ); + ret = TrackPopupMenu( hpopupmenu, 0, 100,100, 0, hwnd, NULL ); + ok_sequence( WmTrackPopupMenuMinimizeWindow, "TrackPopupMenuMinimizeWindow", TRUE ); + ok( ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError() ); + KillTimer( hwnd, TIMER_ID ); + ShowWindow( hwnd, SW_RESTORE ); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); SetCapture(hwnd); -- 2.25.0

3 5

[PATCH 4/4] configure: Try using explicit target option for cross compiling.
by Jacek Caban 04 Mar '20

04 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 14 ++++++++++++++ 1 file changed, 14 insertions(+)

1 1

[PATCH 4/4] winegcc: Add support for using clang directly.
by Jacek Caban 04 Mar '20

04 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-)

2 1

[PATCH resend 1/2] user32/tests: Wait for parent thread before checking child window.
by Rémi Bernon 04 Mar '20

04 Mar '20

This test is failing from time to time. Making sure the parent thread has terminated before continuing triggers the underlying race condition, and makes the test to always fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/msg.c | 61 +++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 423157b623d..55b4fe2228b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8539,6 +8539,8 @@ static void test_paint_messages(void) struct wnd_event { HWND hwnd; + HWND child_hwnd; + HANDLE child; HANDLE grand_child; HANDLE start_event; HANDLE stop_event; @@ -8571,44 +8573,50 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) struct wnd_event *wnd_event = param; HWND hchild; MSG msg; + DWORD ret; hchild = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->child_hwnd, 0, 0, NULL); ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); SetEvent( wnd_event->start_event ); - for (;;) - { - MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_ALLINPUT); - if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - } + ret = WaitForSingleObject( wnd_event->child, 5000 ); + ok( !ret, "WaitForSingleObject returned %x, error: %u\n", ret, GetLastError() ); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + todo_wine + ok( !IsWindow( hchild ), "Child window not destroyed\n" ); + return 0; } static DWORD CALLBACK create_child_thread( void *param ) { struct wnd_event *wnd_event = param; - struct wnd_event child_event; DWORD ret, tid; MSG msg; - child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); - ok (child_event.hwnd != 0, "Failed to create child window\n"); - SetFocus( child_event.hwnd ); + wnd_event->child_hwnd = CreateWindowExA( 0, "TestWindowClass", "Test child", + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, + wnd_event->hwnd, 0, 0, NULL ); + ok (wnd_event->child_hwnd != 0, "Failed to create child windows\n"); + SetFocus( wnd_event->child_hwnd ); + + wnd_event->grand_child = CreateThread( NULL, 0, create_grand_child_thread, wnd_event, 0, &tid ); + ok( wnd_event->grand_child != 0, "CreateThread failed, error %u\n", GetLastError() ); + flush_events(); flush_sequence(); - child_event.start_event = wnd_event->start_event; - wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { - DWORD ret = MsgWaitForMultipleObjects(1, &child_event.start_event, FALSE, 1000, QS_SENDMESSAGE); + ret = MsgWaitForMultipleObjects(1, &wnd_event->start_event, FALSE, 5000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } + ok( !ret, "MsgWaitForMultipleObjects failed %x, error: %u\n", ret, GetLastError() ); + ret = WaitForSingleObject( wnd_event->stop_event, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); return 0; @@ -8742,33 +8750,38 @@ static void test_interthread_messages(void) wnd_event.hwnd = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); + + wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + + wnd_event.child = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + ok( wnd_event.child != 0, "CreateThread failed, error %u\n", GetLastError() ); + flush_events(); flush_sequence(); log_all_parent_messages++; - wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); - wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); - hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); for (;;) { - ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 1000, QS_SENDMESSAGE); + ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 5000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); /* now wait for the thread without processing messages; this shouldn't deadlock */ SetEvent( wnd_event.stop_event ); - ret = WaitForSingleObject( hThread, 5000 ); + + ret = WaitForSingleObject( wnd_event.child, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); - CloseHandle( hThread ); ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); - ok( !ret, "WaitForSingleObject failed %x\n", ret ); - CloseHandle( wnd_event.grand_child ); + ok( !ret, "WaitForSingleObject failed %x, error: %u\n", ret, GetLastError() ); + CloseHandle( wnd_event.child ); + CloseHandle( wnd_event.grand_child ); CloseHandle( wnd_event.start_event ); CloseHandle( wnd_event.stop_event ); flush_events(); - ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); + ok_sequence(WmExitThreadSeq, "destroy child on thread exit", TRUE); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); -- 2.25.0

2 3

[PATCH] msvcrt20: Use __[w]getmainargs declarations from headers.
by Jacek Caban 04 Mar '20

04 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt20/msvcrt20.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)

1 0