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

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

07 Mar '22

Module: vkd3d Branch: master Commit: b64482e7c7a6f278266bf80c7f07362e0db3e8ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b64482e7c7a6f278266bf80… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 16:20:23 2022 +0100 vkd3d-shader/spirv: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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,

1 0

Francois Gouget : testbot/web: Remove end-of-line spaces in the css file.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: tools Branch: master Commit: ff224083216bc58f78650a5450abadd331d51698 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ff224083216bc58f78650a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:45:35 2022 +0100 testbot/web: Remove end-of-line spaces in the css file. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 6d170b1..301ba71 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -123,7 +123,7 @@ A:hover position: relative; bottom: 0.5em; font-size: 0.8em; -} +} h1, h2 { @@ -145,7 +145,7 @@ h2 font-size: 14pt; } -.DetailsBody p +.DetailsBody p { text-align: center; } @@ -175,7 +175,7 @@ h2 margin-top: 2em } -.ItemBody p +.ItemBody p { text-align: center; }

1 0

Francois Gouget : testbot/cgi: !1 is really an empty string in FormPage::SaveProperties().
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: tools Branch: master Commit: aa8d29559c08cbab0b750278cd506f49c0330f34 URL: https://source.winehq.org/git/tools.git/?a=commit;h=aa8d29559c08cbab0b75027… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:46:21 2022 +0100 testbot/cgi: !1 is really an empty string in FormPage::SaveProperties(). So the point of that SaveProperty() call is that if an editable property value was not received as a form parameter it is considered to be an empty string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 43b9b59..21c8631 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -375,7 +375,7 @@ sub SaveProperties($) $self->DisplayProperty($PropertyDescriptor) eq "rw" && ! defined($self->GetParam($PropertyDescriptor->GetName()))) { - if (! $self->SaveProperty($PropertyDescriptor, !1)) + if (! $self->SaveProperty($PropertyDescriptor, "")) { return !1; }

1 0

Francois Gouget : testbot/web: Better separate GetParam() and SetParam().
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: tools Branch: master Commit: 81cc4388e64e1d0af6a7a57d46fae182e222780e URL: https://source.winehq.org/git/tools.git/?a=commit;h=81cc4388e64e1d0af6a7a57… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:47:47 2022 +0100 testbot/web: Better separate GetParam() and SetParam(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 b910228..8abaaaa 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 9eba086..ca1ee5e 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 23f57a9..4cfef79 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); }

1 0

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

07 Mar '22

Module: tools Branch: master Commit: de0ddebb90c1ff365b6bf58f43653b0957d3ed14 URL: https://source.winehq.org/git/tools.git/?a=commit;h=de0ddebb90c1ff365b6bf58… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:48:05 2022 +0100 testbot/web: Don't assume that "/index.pl" is the TestBot landing page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 8b046c8..2681ece 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)) { @@ -307,7 +307,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 eef7a17..919c7a5 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 ef3f4cb..d9757ed 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 9a7ac0b..98d1338 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 } }

1 0

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

07 Mar '22

Module: tools Branch: master Commit: 2340f4d2f23c02cf35c649412a69ceb0b0fa1294 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2340f4d2f23c02cf35c6494… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:52:04 2022 +0100 testbot/cgi: Fix getting the property descriptors in FormPage::SaveProperties(). The base form page has no Collection field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 21c8631..067d11b 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" &&

1 0

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

07 Mar '22

Module: tools Branch: master Commit: 798cc33be70ad692adc5c9fe3e4580a5eb7d7149 URL: https://source.winehq.org/git/tools.git/?a=commit;h=798cc33be70ad692adc5c9f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 7 12:52:21 2022 +0100 testbot/cgi: Add a tooltip on the 'required field' asterisks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 067d11b..9ea7f0f 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>"; } }

1 0

Eric Pouech : serialui/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 2add24bd7dfe1aea00c2852f3dfef5a406787275 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2add24bd7dfe1aea00c2852f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:59 2022 +0100 serialui/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/serialui/tests/Makefile.in | 1 - dlls/serialui/tests/confdlg.c | 64 ++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2add24bd7dfe1aea00c2…

1 0

Eric Pouech : setupapi/tests: Use correct integral type.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 0e4c108490db8d1c7b3c5d016979ace327d2c8ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4c108490db8d1c7b3c5d01… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:26:06 2022 +0100 setupapi/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/parser.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index c18063fbe38..17251fc923b 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -268,9 +268,8 @@ static void test_enum_sections(void) static const char *contents = STD_HEADER "[s1]\nfoo=bar\n[s2]\nbar=foo\n[s3]\n[strings]\na=b\n"; BOOL ret; - DWORD len; HINF hinf; - UINT err, index; + UINT err, index, len; char buffer[256]; if (!pSetupEnumInfSectionsA)

1 0

Eric Pouech : setupapi/tests: Enable compilation with long types.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: b73e3102009cc7151ab58321800aeded24c1307f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73e3102009cc7151ab58321… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:26:12 2022 +0100 setupapi/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 1 - dlls/setupapi/tests/devinst.c | 1140 ++++++++++++++++++------------------- dlls/setupapi/tests/dialog.c | 12 +- dlls/setupapi/tests/diskspace.c | 80 +-- dlls/setupapi/tests/install.c | 428 +++++++------- dlls/setupapi/tests/misc.c | 162 +++--- dlls/setupapi/tests/parser.c | 76 +-- dlls/setupapi/tests/query.c | 36 +- dlls/setupapi/tests/setupcab.c | 44 +- dlls/setupapi/tests/stringtable.c | 48 +- 10 files changed, 1013 insertions(+), 1014 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b73e3102009cc7151ab5…

1 0