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

Julian Rüger : German translation for release 6.0.3.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: website Branch: master Commit: 251aaddd9de5f59084d041081ec426c331be2a4b URL: https://source.winehq.org/git/website.git/?a=commit;h=251aaddd9de5f59084d04… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 17:12:01 2022 +0100 German translation for release 6.0.3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022022501.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2022022501.xml b/news/de/2022022501.xml new file mode 100644 index 00000000..3f1f362b --- /dev/null +++ b/news/de/2022022501.xml @@ -0,0 +1,13 @@ +<news> +<date>25. Februar 2022</date> +<title>Wine 6.0.3 freigegeben</title> +<body> +<p> Die Wartungsversion 6.0.3 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/6.0.3">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Diverse Fehlerkorrekturen</li> +</ul> +</p> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/6.0/wine-6.0.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : German translation for release 7.3.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: website Branch: master Commit: 1c4500d6aeac3b9de473ec619c20e4118b521ddb URL: https://source.winehq.org/git/website.git/?a=commit;h=1c4500d6aeac3b9de473e… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 17:15:04 2022 +0100 German translation for release 7.3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022022502.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2022022502.xml b/news/de/2022022502.xml new file mode 100644 index 00000000..8ab756f2 --- /dev/null +++ b/news/de/2022022502.xml @@ -0,0 +1,17 @@ +<news> +<date>25. Februar 2022</date> +<title>Wine 7.3 freigegeben</title> +<body> +<p> Die Entwicklungsversion 7.3 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/7.3">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Weitere Aufräumarbeiten zur 'long'-Unterstützung.</li> + <li>Korrekte Unterstützung von API-Sets.</li> + <li>Fortschritte der PE-Konversion von USER32 und WineALSA.</li> + <li>Einige HID-Joystick-Korrekturen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +</p> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.x/wine-7.3.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Julian Rüger : German translation for vkd3d release 1.3.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: website Branch: master Commit: 4aa344d9099593c9b0349ab5f84db3ace840da1a URL: https://source.winehq.org/git/website.git/?a=commit;h=4aa344d9099593c9b0349… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 17:21:11 2022 +0100 German translation for vkd3d release 1.3. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022030201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2022030201.xml b/news/de/2022030201.xml new file mode 100644 index 00000000..414769da --- /dev/null +++ b/news/de/2022030201.xml @@ -0,0 +1,16 @@ +<news> +<date>2. März 2022</date> +<title>Vkd3d 1.3 freigegeben</title> +<body> +<p>Das Wine-Team ist stolz, die Freigabe von vkd3d Version 1.3, der Direct3D-zu-Vulkan Übersetzungsbibliothek, verkünden zu können.</p> + +<p>Dieses Release enthält Verbesserungen, die in den <a href="https://source.winehq.org/git/vkd3d.git/blob_plain/vkd3d-1.3:/ANNOUNCE">Release-Notes (en)</a> aufgeführt sind. +Die Höhepunkte sind:</p> +<ul> + <li>Anfängliche Unterstützung von HLSL-Kompilierung.</li> + <li>Unterstützung von Shader-Model 5.1 Descriptor-Arrays.</li> + <li>Unterstützung der Disassemblierung von Direct3D-Shadern.</li> +</ul> + +<p>Der Quelltext ist ab sofort <a href="https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz">verfügbar</a>.</p> +</p></body></news>

1 0

Francois Gouget : testbot/cgi: Rename the per-item action list variables.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: tools Branch: master Commit: cc2428b664b74d09dbd3808811511ba4eade6679 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cc2428b664b74d09dbd3808… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 3 18:15:15 2022 +0100 testbot/cgi: Rename the per-item action list variables. Rename it to $ItemActions to avoid confusion with the global actions list ($Actions). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 54 ++++++++++++++++------ .../lib/ObjectModel/CGI/CollectionBlockForPage.pm | 8 ++-- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 8 ++-- 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index effd039..3af2a14 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -108,8 +108,8 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; print "<thead>\n"; - my $Actions = $self->CallGetItemActions(); - $self->CallGenerateHeaderRow($PropertyDescriptors, $Actions); + my $ItemActions = $self->CallGetItemActions(); + $self->CallGenerateHeaderRow($PropertyDescriptors, $ItemActions); print "</thead>\n"; print "<tbody>\n"; @@ -121,7 +121,7 @@ EOF my $Class = ($Row % 2) == 0 ? "even" : "odd"; my $Item = $self->{Collection}->GetItem($Key); $self->CallGenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, - $Class, $Actions); + $Class, $ItemActions); $Row++; } if (@$Keys == 0) @@ -132,7 +132,7 @@ EOF print "</tbody>\n"; print "</table>\n"; - if (@$Actions != 0 && @$Keys != 0) + if (@$ItemActions != 0 && @$Keys != 0) { print <<EOF; <div class='CollectionBlockActions'> @@ -153,7 +153,7 @@ document.write("<a href='javascript:void(0)' onClick='ToggleAll();'>Toggle All<\ </script> EOF print "For selected ", $self->{Collection}->GetCollectionName() . ":"; - foreach my $Action (@$Actions) + foreach my $Action (@$ItemActions) { print " <input type='submit' name='Action' value='" . $self->escapeHTML($Action) . "' />"; @@ -162,7 +162,7 @@ EOF print "</div>\n"; } - $Actions = $self->CallGetActions(); + my $Actions = $self->CallGetActions(); if (@$Actions != 0) { print "<div class='CollectionBlockActions'>\n"; @@ -231,17 +231,17 @@ sub GenerateFormEnd($) sub CallGenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - $self->GenerateHeaderRow($PropertyDescriptors, $Actions); + $self->GenerateHeaderRow($PropertyDescriptors, $ItemActions); } sub GenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; print "<tr>\n"; - if (@$Actions != 0) + if (@$ItemActions != 0) { print "<th> </th>\n"; } @@ -272,9 +272,9 @@ sub GenerateHeaderCell($$) sub CallGenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $self->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub SelName($$) @@ -287,10 +287,10 @@ sub SelName($$) sub GenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; print "<tr class='$Class'>\n"; - if (@$Actions != 0) + if (@$ItemActions != 0) { print "<td><input name='", $self->SelName($Item->GetKey()), "' type='checkbox' /></td>\n"; @@ -369,6 +369,19 @@ sub CallGetItemActions($) return $self->GetItemActions(); } +=pod +=over 12 + +=item C<GetItemActions()> + +Returns the list of per-item actions. + +This is a set of actions that is applied to each selected item in the +collection. + +=back +=cut + sub GetItemActions($) { #my ($self) = @_; @@ -382,6 +395,19 @@ sub CallGetActions($) return $self->GetActions(); } +=pod +=over 12 + +=item C<GetActions()> + +Returns the list of global actions. + +This is a set of actions that do not impact any specific item in the +collection. + +=back +=cut + sub GetActions($) { my ($self) = @_; diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index 03a4508..13ad5a8 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -54,16 +54,16 @@ sub CallGenerateHeaderCell($$) sub CallGenerateHeaderRow($$$) { - my ($self, $PropertyDescriptors, $Actions) = @_; + my ($self, $PropertyDescriptors, $ItemActions) = @_; - $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $Actions); + $self->{EnclosingPage}->GenerateHeaderRow($self, $PropertyDescriptors, $ItemActions); } sub CallGenerateDataRow($$$$$$) { - my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $self->{EnclosingPage}->GenerateDataRow($self, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub CallGenerateDataCell($$$$) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 5c48954..72bba1b 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -103,16 +103,16 @@ sub GenerateHeaderCell($$$) sub GenerateHeaderRow($$$$) { - my ($self, $CollectionBlock, $PropertyDescriptors, $Actions) = @_; + my ($self, $CollectionBlock, $PropertyDescriptors, $ItemActions) = @_; - $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $Actions); + $CollectionBlock->GenerateHeaderRow($PropertyDescriptors, $ItemActions); } sub GenerateDataRow($$$$$$$) { - my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions) = @_; + my ($self, $CollectionBlock, $Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions) = @_; - $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $Actions); + $CollectionBlock->GenerateDataRow($Item, $PropertyDescriptors, $DetailsPage, $Class, $ItemActions); } sub GenerateDataCell($$$$$)

1 0

Francois Gouget : testbot/web: Override the default form actions instead of appending.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: tools Branch: master Commit: fab2daeeb946025602af122f7ff0d024cee52c3b URL: https://source.winehq.org/git/tools.git/?a=commit;h=fab2daeeb946025602af122… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 3 18:16:32 2022 +0100 testbot/web: Override the default form actions instead of appending. Note that the parent FormPage class has no action anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Feedback.pl | 8 ++------ testbot/web/ForgotPassword.pl | 8 ++------ testbot/web/Login.pl | 5 +---- testbot/web/ResetPassword.pl | 8 ++------ testbot/web/Stats.pl | 7 ++----- testbot/web/Submit.pl | 28 +++++----------------------- testbot/web/admin/Log.pl | 8 ++------ testbot/web/admin/SpecialJobs.pl | 7 ++----- 8 files changed, 18 insertions(+), 61 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index b43397f..9eba086 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -72,12 +72,8 @@ sub GetHeaderText($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Send"; - - return $Actions; + #my ($self) = @_; + return ["Send"]; } sub OnSend($) diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 4e1c508..cc0cd45 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -58,12 +58,8 @@ sub GetHeaderText($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Reset password"; - - return $Actions; + #my ($self) = @_; + return ["Reset password"]; } sub OnResetPassword($) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 3c93dd8..ef3f4cb 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -89,10 +89,7 @@ sub GetActions($) { my ($self) = @_; - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Log in"; - - return $Actions; + return ["Log in"]; } sub OnLogIn($) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index 1e2b94d..81655e0 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -73,12 +73,8 @@ sub GetInputType($$) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Change password"; - - return $Actions; + #my ($self) = @_; + return ["Change password"]; } sub Validate($) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 803fc59..ab08697 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -394,11 +394,8 @@ sub GetDisplayValue($$) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Update"; - return $Actions; + #my ($self) = @_; + return ["Update"]; } sub OnAction($$) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 76069bb..9a7ac0b 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -913,29 +913,11 @@ sub GetActions($) { my ($self) = @_; - my $Actions = $self->SUPER::GetActions(); - if ($self->{Page} == 0) - { - push @$Actions, "OK"; - } - elsif ($self->{Page} == 1) - { - push @$Actions, "Single Page", "Next >"; - } - elsif ($self->{Page} == 2) - { - push @$Actions, "< Prev", "Next >"; - } - elsif ($self->{Page} == 3) - { - push @$Actions, "< Prev", "Submit"; - } - elsif ($self->{Page} == 4) - { - push @$Actions, "Submit"; - } - - return $Actions; + return ["Single Page", "Next >"] if ($self->{Page} == 1); + return ["< Prev", "Next >"] if ($self->{Page} == 2); + return ["< Prev", "Submit"] if ($self->{Page} == 3); + return ["Submit"] if ($self->{Page} == 4); + return ["OK"]; # Page == 0 (error case) } sub DisplayProperty($$) diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index f0ac524..cb253bd 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -64,12 +64,8 @@ sub GetHeaderText($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Download"; - - return $Actions; + #my ($self) = @_; + return ["Download"]; } sub OnDownload($) diff --git a/testbot/web/admin/SpecialJobs.pl b/testbot/web/admin/SpecialJobs.pl index c5a8f65..534336c 100644 --- a/testbot/web/admin/SpecialJobs.pl +++ b/testbot/web/admin/SpecialJobs.pl @@ -145,11 +145,8 @@ sub GenerateFields($) sub GetActions($) { - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - push @$Actions, "Submit"; - return $Actions; + #my ($self) = @_; + return ["Submit"]; }

1 0

Francois Gouget : testbot/cgi: Mark an unused variable as such.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: tools Branch: master Commit: b70e8e7ce8b690608072151d1e2120ba8e44ad1a URL: https://source.winehq.org/git/tools.git/?a=commit;h=b70e8e7ce8b690608072151… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 3 18:18:29 2022 +0100 testbot/cgi: Mark an unused variable as such. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 0ac599e..03ddea6 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -391,8 +391,7 @@ sub Save($) return !1 if (!$self->SaveProperties()); - my $ErrKey; - ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); return ! defined($self->{ErrMessage}); }

1 0

Francois Gouget : testbot/cgi: Move CallGetEscapedDisplayValue() next to its target.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: tools Branch: master Commit: 09f853f95425bb8a24de4daac70bf8be548d6766 URL: https://source.winehq.org/git/tools.git/?a=commit;h=09f853f95425bb8a24de4da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 3 18:29:25 2022 +0100 testbot/cgi: Move CallGetEscapedDisplayValue() next to its target. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 3af2a14..a5e8187 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -435,13 +435,6 @@ sub DisplayProperty($$) return $PropertyDescriptor->GetClass ne "Detailref"; } -sub CallGetEscapedDisplayValue($$$) -{ - my ($self, $Item, $PropertyDescriptor) = @_; - - return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); -} - sub CallGetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -495,6 +488,13 @@ sub GetDisplayValue($$$) return $Value; } +sub CallGetEscapedDisplayValue($$$) +{ + my ($self, $Item, $PropertyDescriptor) = @_; + + return $self->GetEscapedDisplayValue($Item, $PropertyDescriptor); +} + sub GetEscapedDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_;

1 0

Jacek Caban : user32: Use CreateAcceleratorTableW in LoadAcceleratorsW.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: ec036bc60577419c40860d3dfc2deade4fdadc08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec036bc60577419c40860d3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:05:58 2022 +0100 user32: Use CreateAcceleratorTableW in LoadAcceleratorsW. Instead of accessing accelerators object directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resource.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 912b7f95227..ce64833e413 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -54,8 +54,8 @@ struct accelerator */ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) { - struct accelerator *accel; const PE_ACCEL *pe_table; + ACCEL *table; unsigned int i; HRSRC rsrc; HACCEL handle; @@ -65,17 +65,16 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) pe_table = LoadResource( instance, rsrc ); count = SizeofResource( instance, rsrc ) / sizeof(*pe_table); if (!count) return 0; - accel = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct accelerator, table[count] )); - if (!accel) return 0; - accel->count = count; + table = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*table) ); + if (!table) return 0; for (i = 0; i < count; i++) { - accel->table[i].fVirt = pe_table[i].fVirt; - accel->table[i].key = pe_table[i].key; - accel->table[i].cmd = pe_table[i].cmd; + table[i].fVirt = pe_table[i].fVirt; + table[i].key = pe_table[i].key; + table[i].cmd = pe_table[i].cmd; } - if (!(handle = alloc_user_handle( &accel->obj, NTUSER_OBJ_ACCEL ))) - HeapFree( GetProcessHeap(), 0, accel ); + handle = CreateAcceleratorTableW( table, count ); + HeapFree( GetProcessHeap(), 0, table ); TRACE_(accel)("%p %s returning %p\n", instance, debugstr_w(name), handle ); return handle; }

1 0

Jacek Caban : user32: Use CreateAcceleratorTableW in CreateAcceleratorTableA.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: e58b561ced05410f638927540544fbe84b47906e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e58b561ced05410f63892754… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:06:17 2022 +0100 user32: Use CreateAcceleratorTableW in CreateAcceleratorTableA. Instead of accessing accelerators object directly. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/resource.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index ce64833e413..7c15e1905a5 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -152,10 +152,10 @@ INT WINAPI CopyAcceleratorTableW(HACCEL src, LPACCEL dst, INT count) /********************************************************************* * CreateAcceleratorTableA (USER32.@) */ -HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccel, INT count) +HACCEL WINAPI CreateAcceleratorTableA( ACCEL *accel, INT count ) { - struct accelerator *accel; HACCEL handle; + ACCEL *table; int i; if (count < 1) @@ -163,22 +163,21 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL lpaccel, INT count) SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - accel = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct accelerator, table[count] )); - if (!accel) return 0; - accel->count = count; + table = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*table) ); + if (!table) return 0; for (i = 0; i < count; i++) { - accel->table[i].fVirt = lpaccel[i].fVirt; - accel->table[i].cmd = lpaccel[i].cmd; - if (!(lpaccel[i].fVirt & FVIRTKEY)) + table[i].fVirt = accel[i].fVirt; + table[i].cmd = accel[i].cmd; + if (!(accel[i].fVirt & FVIRTKEY)) { - char ch = lpaccel[i].key; - MultiByteToWideChar( CP_ACP, 0, &ch, 1, &accel->table[i].key, 1 ); + char ch = accel[i].key; + MultiByteToWideChar( CP_ACP, 0, &ch, 1, &table[i].key, 1 ); } - else accel->table[i].key = lpaccel[i].key; + else table[i].key = accel[i].key; } - if (!(handle = alloc_user_handle( &accel->obj, NTUSER_OBJ_ACCEL ))) - HeapFree( GetProcessHeap(), 0, accel ); + handle = CreateAcceleratorTableW( table, count ); + HeapFree( GetProcessHeap(), 0, table ); TRACE_(accel)("returning %p\n", handle ); return handle; }

1 0

Jacek Caban : win32u: Move accelerators object implementation from user32.
by Alexandre Julliard 02 Mar '22

02 Mar '22

Module: wine Branch: master Commit: 9759ed143a12e61349de156b54d9f7a9b9155714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9759ed143a12e61349de156b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 2 15:06:33 2022 +0100 win32u: Move accelerators object implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 4 +- dlls/user32/resource.c | 95 ++------------------------------------ dlls/user32/user32.spec | 6 +-- dlls/win32u/Makefile.in | 1 + dlls/win32u/menu.c | 107 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntgdi_private.h | 1 - dlls/win32u/syscall.c | 3 ++ dlls/win32u/win32u.spec | 6 +-- dlls/win32u/win32u_private.h | 1 + dlls/wow64win/syscall.h | 3 ++ dlls/wow64win/user.c | 24 ++++++++++ include/ntuser.h | 3 ++ 12 files changed, 154 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9759ed143a12e61349de…

1 0