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

Julian Rüger : German translation for WWN issue 410.
by Alexandre Julliard March 3, 2022

March 3, 2022

Module: website Branch: master Commit: 7891d1a44dfc9063d73d196724ad9a3201a49f6d URL: https://source.winehq.org/git/website.git/?a=commit;h=7891d1a44dfc9063d73d1… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 17:07:08 2022 +0100 German translation for WWN issue 410. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022012802.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2022012802.xml b/news/de/2022012802.xml new file mode 100644 index 00000000..122d7706 --- /dev/null +++ b/news/de/2022012802.xml @@ -0,0 +1,18 @@ +<news> + <date>28. Januar 2021</date> + <title>World-Wine-News Ausgabe 410</title> + <body> + Die <a href="{$root}/wwn/410">WWN-Ausgabe 410</a> wurde heute veröffentlicht. + <ul> + <li><a href="{$root}/wwn/410#A Bug's Life" class="small">A Bug's Life</a></li> + <li><a href="{$root}/wwn/410#PE, WoW64, D3DX, Unicode, Kernel, C Runtime, Built-in Apps, Graphics, & Theming" class="small">PE, WoW64, D3DX, Unicode, Kernel, C-Laufzeit, Eingebaute Apps, Grafik, & Theming</a></li> + <li><a href="{$root}/wwn/410#Direct3D" class="small">Direct3D</a></li> + <li><a href="{$root}/wwn/410#Audio/Video" class="small">Audio/Video</a></li> + <li><a href="{$root}/wwn/410#Input Devices" class="small">Eingabegeräte</a></li> + <li><a href="{$root}/wwn/410#Internet and Networking" class="small">Internet und Netzwerk</a></li> + <li><a href="{$root}/wwn/410#Alternative Platforms" class="small">Alternative Plattformen</a></li> + <li><a href="{$root}/wwn/410#Development Tools" class="small">Entwicklungswerkzeuge</a></li> + <li><a href="{$root}/wwn/410#Build Infrastructure" class="small">Build-Infrastruktur</a></li> + <li><a href="{$root}/wwn/410#External Dependencies" class="small">Externe Abhängigkeiten</a></li> </ul> + </body> +</news>

1 0

Julian Rüger : German translation for release 7.1.
by Alexandre Julliard March 3, 2022

March 3, 2022

Module: website Branch: master Commit: 3316c1fb1c49177f19e994f669439aa35ffb299a URL: https://source.winehq.org/git/website.git/?a=commit;h=3316c1fb1c49177f19e99… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Mar 3 17:04:50 2022 +0100 German translation for release 7.1. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/de/2022012801.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/de/2022012801.xml b/news/de/2022012801.xml new file mode 100644 index 00000000..ef21d8ff --- /dev/null +++ b/news/de/2022012801.xml @@ -0,0 +1,18 @@ +<news> +<date>28. Januar 2022</date> +<title>Wine 7.1 freigegeben</title> +<body> +<p> Die Entwicklungsversion 7.1 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/7.1">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Vulkan-1.3-Unterstützung.</li> + <li>Einige Theming-Korrekturen.</li> + <li>WebSocket-Verbesserungen.</li> + <li>Besseres Cursor-Clipping unter MacOS.</li> + <li>Korrekturen am IDL-Compiler für C++.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +</p> +<p>Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/7.x/wine-7.1.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 March 3, 2022

March 3, 2022

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

Francois Gouget : testbot/cgi: Rename the per-item action list variables.
by Alexandre Julliard March 3, 2022

March 3, 2022

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 March 3, 2022

March 3, 2022

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: Move CallGetEscapedDisplayValue() next to its target.
by Alexandre Julliard March 3, 2022

March 3, 2022

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

Francois Gouget : testbot/cgi: Mark an unused variable as such.
by Alexandre Julliard March 3, 2022

March 3, 2022

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

Rémi Bernon : dinput/tests: Add tests for ICustomGameControllerFactory_CreateGameController.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: df0566d531b4454673eb71a0903986d215988e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df0566d531b4454673eb71a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 2 14:03:07 2022 +0100 dinput/tests: Add tests for ICustomGameControllerFactory_CreateGameController. This shows that the runtime uses COM aggregation to provide the IGameController and IGameControllerBatteryInfo implementation, while expecting the custom controller to implement several other interfaces depending on the type of provider used as a backend. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 371 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 365 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df0566d531b4454673eb…

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IGameControllerBatteryInfo interface definition.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: 1f694c7f7942b7974d88a8cbdab8381f59b6fbee URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f694c7f7942b7974d88a8cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 2 14:03:05 2022 +0100 include: Add Windows.Gaming.Input.IGameControllerBatteryInfo interface definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/classes.idl | 1 + include/Makefile.in | 1 + include/windows.devices.power.idl | 39 +++++++++++++++++++++++++++++++++++ include/windows.gaming.input.idl | 10 +++++++++ 4 files changed, 51 insertions(+) diff --git a/dlls/windows.gaming.input/classes.idl b/dlls/windows.gaming.input/classes.idl index fd52d8ebf66..ca3bd5d8dd7 100644 --- a/dlls/windows.gaming.input/classes.idl +++ b/dlls/windows.gaming.input/classes.idl @@ -32,6 +32,7 @@ import "windows.foundation.idl"; import "windows.devices.haptics.idl"; import "windows.gaming.input.forcefeedback.idl"; import "windows.system.idl"; +import "windows.devices.power.idl"; #define DO_NO_IMPORTS #include "windows.gaming.input.idl" diff --git a/include/Makefile.in b/include/Makefile.in index 2bb8cd672a7..b89225510e9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -777,6 +777,7 @@ SOURCES = \ windot11.h \ windows.devices.enumeration.idl \ windows.devices.haptics.idl \ + windows.devices.power.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ windows.gaming.input.custom.idl \ diff --git a/include/windows.devices.power.idl b/include/windows.devices.power.idl new file mode 100644 index 00000000000..4bf2599686c --- /dev/null +++ b/include/windows.devices.power.idl @@ -0,0 +1,39 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows.Devices.Power { + interface IBatteryReport; + runtimeclass BatteryReport; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass BatteryReport + { + [default] interface Windows.Devices.Power.IBatteryReport; + } +} diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 90253b3a8f6..6a5fc8af1ee 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -29,6 +29,7 @@ import "windows.foundation.idl"; import "windows.devices.haptics.idl"; import "windows.gaming.input.forcefeedback.idl"; import "windows.system.idl"; +import "windows.devices.power.idl"; #endif namespace Windows.Gaming.Input { @@ -319,6 +320,15 @@ namespace Windows.Gaming.Input { HRESULT FromGameController([in] Windows.Gaming.Input.IGameController *game_controller, [out, retval] Windows.Gaming.Input.RawGameController **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + uuid(dcecc681-3963-4da6-955d-553f3b6f6161) + ] + interface IGameControllerBatteryInfo : IInspectable + { + HRESULT TryGetBatteryReport([out, retval] Windows.Devices.Power.BatteryReport **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile),

1 0

Rémi Bernon : dinput/tests: Add tests for IGameControllerFactoryManagerStatics_RegisterCustomFactoryForHardwareId.
by Alexandre Julliard March 2, 2022

March 2, 2022

Module: wine Branch: master Commit: e1b8de1a2de1b60629e9b8f67c41843d8d8cc5d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1b8de1a2de1b60629e9b8f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 2 14:03:04 2022 +0100 dinput/tests: Add tests for IGameControllerFactoryManagerStatics_RegisterCustomFactoryForHardwareId. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 141 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 139 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 2f30cc19d9d..e8f5157d73f 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -45,7 +45,8 @@ #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" #define WIDL_using_Windows_Gaming_Input -#include "windows.gaming.input.h" +#define WIDL_using_Windows_Gaming_Input_Custom +#include "windows.gaming.input.custom.h" #define MAKE_FUNC(f) static typeof(f) *p ## f MAKE_FUNC( RoGetActivationFactory ); @@ -527,6 +528,104 @@ static const IEventHandler_RawGameControllerVtbl controller_handler_vtbl = static struct controller_handler controller_removed = {{&controller_handler_vtbl}}; static struct controller_handler controller_added = {{&controller_handler_vtbl}}; +struct custom_factory +{ + ICustomGameControllerFactory ICustomGameControllerFactory_iface; + BOOL create_controller_called; +}; + +static inline struct custom_factory *impl_from_ICustomGameControllerFactory( ICustomGameControllerFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct custom_factory, ICustomGameControllerFactory_iface ); +} + +static HRESULT WINAPI custom_factory_QueryInterface( ICustomGameControllerFactory *iface, REFIID iid, void **out ) +{ + struct custom_factory *impl = impl_from_ICustomGameControllerFactory( iface ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_ICustomGameControllerFactory )) + { + IInspectable_AddRef( (*out = &impl->ICustomGameControllerFactory_iface) ); + return S_OK; + } + + ok( 0, "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI custom_factory_AddRef( ICustomGameControllerFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI custom_factory_Release( ICustomGameControllerFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI custom_factory_GetIids( ICustomGameControllerFactory *iface, ULONG *iid_count, IID **iids ) +{ + ok( 0, "unexpected call\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI custom_factory_GetRuntimeClassName( ICustomGameControllerFactory *iface, HSTRING *class_name ) +{ + ok( 0, "unexpected call\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI custom_factory_GetTrustLevel( ICustomGameControllerFactory *iface, TrustLevel *trust_level ) +{ + ok( 0, "unexpected call\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI custom_factory_CreateGameController( ICustomGameControllerFactory *iface, IGameControllerProvider *provider, + IInspectable **value ) +{ + struct custom_factory *impl = impl_from_ICustomGameControllerFactory( iface ); + + ok( !controller_added.invoked, "controller added handler invoked\n" ); + ok( !impl->create_controller_called, "unexpected call\n" ); + impl->create_controller_called = TRUE; + + return E_NOTIMPL; +} + +static HRESULT WINAPI custom_factory_OnGameControllerAdded( ICustomGameControllerFactory *iface, IGameController *value ) +{ + ok( 0, "unexpected call\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI custom_factory_OnGameControllerRemoved( ICustomGameControllerFactory *iface, IGameController *value ) +{ + ok( 0, "unexpected call\n" ); + return E_NOTIMPL; +} + +static const struct ICustomGameControllerFactoryVtbl custom_factory_vtbl = +{ + custom_factory_QueryInterface, + custom_factory_AddRef, + custom_factory_Release, + /* IInspectable methods */ + custom_factory_GetIids, + custom_factory_GetRuntimeClassName, + custom_factory_GetTrustLevel, + /* ICustomGameControllerFactory methods */ + custom_factory_CreateGameController, + custom_factory_OnGameControllerAdded, + custom_factory_OnGameControllerRemoved, +}; + +static struct custom_factory custom_factory = {{&custom_factory_vtbl}}; + static LRESULT CALLBACK windows_gaming_input_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { if (msg == WM_DEVICECHANGE) @@ -552,6 +651,7 @@ static LRESULT CALLBACK windows_gaming_input_wndproc( HWND hwnd, UINT msg, WPARA static void test_windows_gaming_input(void) { + static const WCHAR *manager_class_name = RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager; static const WCHAR *class_name = RuntimeClass_Windows_Gaming_Input_RawGameController; DEV_BROADCAST_DEVICEINTERFACE_A iface_filter_a = { @@ -566,6 +666,10 @@ static void test_windows_gaming_input(void) .lpszClassName = L"devnotify", .lpfnWndProc = windows_gaming_input_wndproc, }; + IGameControllerFactoryManagerStatics2 *manager_statics2; + IRawGameController *raw_controller, *tmp_raw_controller; + IGameController *game_controller, *tmp_game_controller; + IGameControllerFactoryManagerStatics *manager_statics; EventRegistrationToken controller_removed_token; IVectorView_RawGameController *controller_view; EventRegistrationToken controller_added_token; @@ -594,11 +698,24 @@ static void test_windows_gaming_input(void) return; } + hr = pWindowsCreateString( manager_class_name, wcslen( manager_class_name ), &str ); + ok( hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr ); + hr = pRoGetActivationFactory( str, &IID_IGameControllerFactoryManagerStatics, (void **)&manager_statics ); + ok( hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr ); + hr = pRoGetActivationFactory( str, &IID_IGameControllerFactoryManagerStatics2, (void **)&manager_statics2 ); + ok( hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr ); + pWindowsDeleteString( str ); + controller_added.event = CreateEventW( NULL, FALSE, FALSE, NULL ); ok( !!controller_added.event, "CreateEventW failed, error %lu\n", GetLastError() ); controller_removed.event = CreateEventW( NULL, FALSE, FALSE, NULL ); ok( !!controller_removed.event, "CreateEventW failed, error %lu\n", GetLastError() ); + hr = IGameControllerFactoryManagerStatics_RegisterCustomFactoryForHardwareId( manager_statics, &custom_factory.ICustomGameControllerFactory_iface, + LOWORD(EXPECT_VIDPID), HIWORD(EXPECT_VIDPID) ); + todo_wine + ok( hr == S_OK, "RegisterCustomFactoryForHardwareId returned %#lx\n", hr ); + hr = IRawGameControllerStatics_add_RawGameControllerAdded( statics, &controller_added.IEventHandler_RawGameController_iface, &controller_added_token ); ok( hr == S_OK, "add_RawGameControllerAdded returned %#lx\n", hr ); @@ -633,6 +750,7 @@ static void test_windows_gaming_input(void) ok( controller_added.invoked, "controller added handler not invoked\n" ); ok( !controller_removed.invoked, "controller removed handler invoked\n" ); + ok( custom_factory.create_controller_called, "CreateGameController not called\n" ); hr = IVectorView_RawGameController_get_Size( controller_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); @@ -645,6 +763,23 @@ static void test_windows_gaming_input(void) hr = IVectorView_RawGameController_get_Size( controller_view, &size ); ok( hr == S_OK, "get_Size returned %#lx\n", hr ); ok( size == 1, "got size %u\n", size ); + hr = IVectorView_RawGameController_GetAt( controller_view, 0, &raw_controller ); + ok( hr == S_OK, "GetAt returned %#lx\n", hr ); + hr = IRawGameController_QueryInterface( raw_controller, &IID_IGameController, (void **)&game_controller ); + ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); + + hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_statics2, + &custom_factory.ICustomGameControllerFactory_iface, game_controller, &tmp_game_controller ); + ok( hr == S_OK, "TryGetFactoryControllerFromGameController returned %#lx\n", hr ); + ok( !tmp_game_controller, "got controller %p\n", tmp_game_controller ); + + hr = IRawGameControllerStatics_FromGameController( statics, game_controller, &tmp_raw_controller ); + ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); + ok( tmp_raw_controller == raw_controller, "got controller %p\n", tmp_raw_controller ); + IRawGameController_Release( tmp_raw_controller ); + + IGameController_Release( game_controller ); + IRawGameController_Release( raw_controller ); SetEvent( stop_event ); wait_for_events( 1, &controller_removed.event, INFINITE ); @@ -672,8 +807,10 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "remove_RawGameControllerRemoved returned %#lx\n", hr ); IVectorView_RawGameController_Release( controller_view ); - IRawGameControllerStatics_Release( statics ); + IGameControllerFactoryManagerStatics2_Release( manager_statics2 ); + IGameControllerFactoryManagerStatics_Release( manager_statics ); + IRawGameControllerStatics_Release( statics ); WaitForSingleObject( thread, INFINITE ); CloseHandle( thread ); CloseHandle( stop_event );

1 0