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

[PATCH] windows.gaming.input: Add a linefeed to a TRACE() message.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/windows.gaming.input/vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index 918262af8e1..441c13dab4c 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -459,6 +459,6 @@ HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ) impl->ref = 1; *out = &impl->IVector_IInspectable_iface; - TRACE( "created %p", *out ); + TRACE( "created %p\n", *out ); return S_OK; } -- 2.30.2

2 1

[vkd3d] vkd3d-shader/spirv: Fix the spelling of some comments.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- libs/vkd3d-shader/spirv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1bb4c404..bb5e8c6f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1,6 +1,6 @@ /* * Copyright 2017 J??zef Kucia for CodeWeavers - * Copyright 2021 Conor McCarthy for Codeweavers + * Copyright 2021 Conor McCarthy for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -7425,7 +7425,7 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 2); scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 1); - /* FIXME: Consider a single UnpackHalf2x16 intruction per 2 components. */ + /* FIXME: Consider a single UnpackHalf2x16 instruction per 2 components. */ assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { @@ -7459,7 +7459,7 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); zero_id = vkd3d_dxbc_compiler_get_constant_float(compiler, 0.0f); - /* FIXME: Consider a single PackHalf2x16 intruction per 2 components. */ + /* FIXME: Consider a single PackHalf2x16 instruction per 2 components. */ assert(dst->write_mask & VKD3DSP_WRITEMASK_ALL); for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { @@ -7802,7 +7802,7 @@ static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_c /* The OpSwitch instruction is inserted when the endswitch * instruction is processed because we do not know the number - * of case statments in advance.*/ + * of case statements in advance.*/ vkd3d_spirv_begin_function_stream_insertion(builder, cf_info->u.switch_.stream_location); vkd3d_spirv_build_op_switch(builder, cf_info->u.switch_.selector_id, cf_info->u.switch_.default_block_id, cf_info->u.switch_.case_blocks, -- 2.30.2

1 0

[PATCH] d2d1: Add D2D1Shadow effect.
by Jactry Zeng 07 Mar '22

07 Mar '22

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 2f1949c073c..e7215c4b38a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -26,6 +26,7 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a425395e64a..3ade9634069 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9908,6 +9908,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 9bd0b7012ad..d448aec162a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -20,6 +20,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cf cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Shadow, 0xc67ea361,0x1863,0x4e69,0x89,0xdb,0x69,0x5d,0x3e,0x9a,0x5b,0x6b);") typedef enum D2D1_BORDER_MODE { -- 2.34.1

2 1

[PATCH 1/4] wined3d: Add poll_in_cs field to wined3d_query().
by Jan Sikorski 07 Mar '22

07 Mar '22

Its eventual purpose is to allow for skipping the poll list mechanism by calling query_poll() in the application thread. In this patch it is only used for when we don't have a separate CS thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 6 +++++- dlls/wined3d/query.c | 21 ++++++++++----------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b150f1ae097..ce297d724f2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2312,8 +2312,12 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) poll = query->query_ops->query_issue(query, op->flags); - if (!cs->thread) + if (!query->poll_in_cs) + { + if (op->flags & WINED3DISSUE_END) + InterlockedIncrement(&query->counter_retrieved); return; + } if (poll && list_empty(&query->poll_list_entry)) { diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7b6c2325523..093b412bf18 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -143,6 +143,7 @@ static void wined3d_query_init(struct wined3d_query *query, struct wined3d_devic query->data = data; query->data_size = data_size; query->query_ops = query_ops; + query->poll_in_cs = !!device->cs->thread; list_init(&query->poll_list_entry); } @@ -469,23 +470,21 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (query->device->cs->thread) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) { - if (query->counter_main != query->counter_retrieved - || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) - { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - query->device->cs->c.ops->flush(&query->device->cs->c); - return S_FALSE; - } - if (query->buffer_object) - query->data = query->map_ptr; + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); + return S_FALSE; } - else if (!query->query_ops->query_poll(query, flags)) + else if (!query->poll_in_cs && !query->query_ops->query_poll(query, flags)) { return S_FALSE; } + if (query->buffer_object) + query->data = query->map_ptr; + if (data) memcpy(data, query->data, min(data_size, query->data_size)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e21c4e6507b..b6f2cf060d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1955,6 +1955,7 @@ struct wined3d_query GLuint buffer_object; UINT64 *map_ptr; + bool poll_in_cs; }; HRESULT wined3d_query_gl_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, -- 2.32.0

2 7

[PATCH] configure: Tweak PE tools suggestion for ARM64
by Martin Storsjö 07 Mar '22

07 Mar '22

llvm-mingw isn't strictly required - plain clang, llvm-dlltool and lld also suffice. Those tools are commonly available in distribution packages. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab3490b21cd..8fcdb15bbad 100644 --- a/configure.ac +++ b/configure.ac @@ -990,7 +990,7 @@ WINE_NOTICE_WITH(mingw,[test "x$CROSSTARGET" = "x"], [MinGW compiler not found, cross-compiling PE files won't be supported.]) case $host_cpu in - aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install llvm-mingw.]) ;; + aarch64*) test "x$CROSSTARGET" != x || AC_MSG_ERROR([PE cross-compilation is required for ARM64, please install clang/llvm-dlltool/lld, or llvm-mingw.]) ;; esac dnl **** External libraries **** -- 2.25.1

2 1

[PATCH] winebus.sys: Don't reset report descriptor when starting a collection.
by Rémi Bernon 07 Mar '22

07 Mar '22

Fixes regression introduced in 1200e9d472deaa99e80d8fd80821008e3c9021bc, incorrectly split from hid_device_begin_report_descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index d5637c0353b..3e83a05cdf6 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -83,7 +83,6 @@ static BOOL hid_device_begin_collection(struct hid_report_descriptor *desc, cons COLLECTION(1, type), }; - memset(desc, 0, sizeof(*desc)); return hid_report_descriptor_append(desc, template, sizeof(template)); } -- 2.35.1

1 0

[tools] testbot/cgi: Add a tooltip on the 'required field' asterisks.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 067d11b5bf..9ea7f0f5b2 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -305,7 +305,7 @@ sub GenerateRequired($$) if ($PropertyDescriptor->GetIsRequired()) { $self->{HasRequired} = 1; - print " <span class='Required'>*</span>"; + print " <a class='Required' title='Required field'>*</a>"; } } -- 2.30.2

1 0

[tools] testbot/cgi: Fix getting the property descriptors in FormPage::SaveProperties().
by Francois Gouget 07 Mar '22

07 Mar '22

The base form page has no Collection field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This worked because the only classes that call SaveProperties() are those that derive from ItemPage which does set the Collection field. Also FormPage::PropertyDescriptors is initialized from the collection property descriptors by ItemPage::_initialize(). --- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 43b9b59ce5..1910bf743b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -368,7 +368,7 @@ sub SaveProperties($) } } - foreach my $PropertyDescriptor (@{$self->{Collection}->GetPropertyDescriptors}) + foreach my $PropertyDescriptor (@{$self->GetPropertyDescriptors()}) { if ($PropertyDescriptor->GetClass() eq "Basic" && $PropertyDescriptor->GetType() eq "B" && -- 2.30.2

1 0

[tools] testbot/web: Don't assume that "/index.pl" is the TestBot landing page.
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- testbot/web/JobDetails.pl | 2 +- testbot/web/Login.pl | 2 +- testbot/web/Submit.pl | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 5f61466908..d38e8d96b6 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -244,7 +244,7 @@ ${ProjectName} Test Bot <div id="menu"> <ul> <li class='top'><p>Test Bot</p></li> - <li><p><a href='/index.pl'>Home</a></p></li> + <li><p><a href='/'>Home</a></p></li> EOF if (defined($PatchesMailingList)) { @@ -309,7 +309,7 @@ EOF </div> <div id='banner'> <div id='Logo'> - <a href='/index.pl'><img src='/${ProjectName}Logo.png' alt=''></a> + <a href='/'><img src='/${ProjectName}Logo.png' alt=''></a> </div> <div id='Project'> <img src='/${ProjectName}Project.png' alt=''> diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index eef7a17838..919c7a5e3b 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -52,7 +52,7 @@ sub _initialize($$$) $self->{Job} = CreateJobs()->GetItem($JobId); if (!defined $self->{Job}) { - $self->Redirect("/index.pl"); # does not return + $self->Redirect("/"); # does not return } $self->{JobId} = $JobId; diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index ef3f4cb064..d9757edb92 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -133,7 +133,7 @@ sub OnLogIn($) my $Target = $self->GetParam("Target"); if (! defined($Target) || $Target eq "" || substr($Target, 0, 1) ne "/") { - $Target = "/index.pl"; + $Target = "/"; } $self->Redirect(MakeSecureURL($Target)); # does not return exit; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9a7ac0b3e7..98d13381e0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -1329,7 +1329,7 @@ sub OnOK($) } else { - $self->Redirect("/index.pl"); # does not return + $self->Redirect("/"); # does not return } } -- 2.30.2

1 0

[tools] testbot/web: Better separate GetParam() and SetParam().
by Francois Gouget 07 Mar '22

07 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/Page.pm | 39 +++++++++++++++++++++++++---- testbot/web/Feedback.pl | 6 ++--- testbot/web/Register.pl | 4 +-- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index b91022832c..8abaaaa9d2 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -77,18 +77,47 @@ sub GetParamNames($) =head1 C<GetParam()> -This thunks to CGI::param() and thus takes the same arguments list but forces -the result to scalar context to avoid security issues. +Returns the specified parameter. +Note that unlike CGI::param() this forces the result to scalar context to +avoid security issues. + To get the list of parameter names use GetParamNames(). =back =cut -sub GetParam($@) +sub GetParam($$) { - my $self = shift; + my ($self, $Name) = @_; + + return scalar($self->{CGIObj}->param($Name)); +} + +=pod +=over 12 + +=head1 C<SetParam()> - return scalar($self->{CGIObj}->param(@_)); +Sets the specified parameter or removes it from the parameters list if the +value is undefined. + +To get the list of parameter names use GetParamNames(). + +=back +=cut + +sub SetParam($$$) +{ + my ($self, $Name, $Value) = @_; + + if (defined $Value) + { + $self->{CGIObj}->param($Name, $Value); + } + else + { + $self->{CGIObj}->delete($Name); + } } sub CGI($) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 9eba086ace..ca1ee5ed77 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -41,7 +41,7 @@ sub _initialize($$$) ); if (!$Session and $RegistrationQ) { - $self->GetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); + $self->SetParam("FeedA", "") if (!defined $self->GetParam("FeedA")); push @PropertyDescriptors, CreateBasicPropertyDescriptor("FeedA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); } @@ -51,8 +51,8 @@ sub _initialize($$$) { # Provide default values my $User = $Session->User; - $self->GetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); - $self->GetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); + $self->SetParam("Name", $User->RealName) if (!defined $self->GetParam("Name")); + $self->SetParam("EMail", $User->EMail) if (!defined $self->GetParam("EMail")); } } diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 23f57a9b64..4cfef79fc3 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -40,11 +40,11 @@ sub _initialize($$$) $self->{ExtraProperties} = []; if ($RegistrationQ) { - $self->GetParam("RegA", "") if (!defined $self->GetParam("RegA")); + $self->SetParam("RegA", "") if (!defined $self->GetParam("RegA")); push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("RegA", "Please demonstrate you are not a bot by answering this question: $RegistrationQ", !1, 1, "A", 40); } - $self->GetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); + $self->SetParam("Remarks", "") if (!defined $self->GetParam("Remarks")); push @{$self->{ExtraProperties}}, CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "textarea", 160); } -- 2.30.2

1 0