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

Francois Gouget : testbot/web: Add failure links to full logs on the job details page.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: tools Branch: master Commit: 7572e0373bdedb7d90f35113c7b028ee994e63e4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7572e0373bdedb7d90f3511… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 18:25:02 2022 +0200 testbot/web: Add failure links to full logs on the job details page. Long logs can make it hard to find the lines for a given failure. So add an index pointing to the first line of a given failure (identified by its bug id). Also add links to the first and last failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index efdd4d9b..6d3f13cd 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -404,9 +404,9 @@ sub GetFailureLinks($$) } @$FailureIds); } -sub GenerateFullLog($$$$) +sub GenerateFullLog($$$$$) { - my ($self, $Dir, $LogName, $HideLog) = @_; + my ($self, $Dir, $LogId, $LogName, $HideLog) = @_; my $LogInfo = LoadLogErrors("$Dir/$LogName"); if (defined $LogInfo->{BadLog}) @@ -426,7 +426,7 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my (%ErrCategory, %ErrFailures); + my (%ErrCategory, %ErrFailures, %LogBugs); foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { my $Group = $LogInfo->{ErrGroups}->{$GroupName}; @@ -437,8 +437,31 @@ sub GenerateFullLog($$$$) { $ErrCategory{$LineNo} = $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; $ErrFailures{$LineNo} = $Group->{Failures}->{$ErrIndex}; + + if ($ErrFailures{$LineNo}) + { + foreach my $FailureId (@{$ErrFailures{$LineNo}}) + { + my $Failure = $self->{Failures}->GetItem($FailureId); + $LogBugs{$Failure->BugId} ||= [$LineNo, $Failure->BugDescription]; + } + } } + $LogBugs{-1} ||= [$LineNo, ""]; + $LogBugs{9999999} = [$LineNo, ""]; + } + } + if (%LogBugs) + { + print "<p>Failures index:"; + foreach my $Label (sort { $a <=> $b } keys %LogBugs) + { + my ($LineNo, $Title) = @{$LogBugs{$Label}}; + $Label = $Label < 0 ? "First" : $Label == 9999999 ? "Last" : $Label; + $Title = " title='". $self->escapeHTML($Title) ."'" if ($Title); + print " <a href='#k${LogId}L$LineNo'$Title>$Label</a>" } + print "</p>\n"; } my $GetCategory = $LogName =~ /\.report$/ ? \&GetReportLineCategory : @@ -463,7 +486,7 @@ sub GenerateFullLog($$$$) my $Category = $ErrCategory{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { - $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; + $Html =~ s~^(.*\S)\s*\r?$~<span id='k${LogId}L$LineNo' class='log-$Category'>$1</span>~; } if ($ErrFailures{$LineNo}) { @@ -487,7 +510,10 @@ sub GenerateFullLog($$$$) # Extra groups don't have a line number next if ($Group->{LineNo}); - print "<div class='LogDllName'>$GroupName</div>\n"; + # Extra errors don't have line numbers but there should be few of them. + # So just create one id for them all so the shortcut to the first / last + # error has somewhere to go even if it's not 100% accurate. + print "<div id='k${LogId}L0' class='LogDllName'>$GroupName</div>\n"; for my $ErrIndex (0..$#{$Group->{Errors}}) { if ($IsEmpty) @@ -592,7 +618,7 @@ EOF $Url = $self->escapeHTML($Url); my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; - my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $MoreInfo->{Full}, $HideLog); + my $LogIsEmpty = $self->GenerateFullLog($TaskDir, $StepTask->GetKey(), $MoreInfo->{Full}, $HideLog); if ($LogIsEmpty) { if ($StepTask->Status eq "canceled")

1 0

Francois Gouget : testbot/web: Automatically refresh the failure bug information.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: tools Branch: master Commit: b1645e5b54a1c069665a4e090f9b2af906002480 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b1645e5b54a1c069665a4e0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 18:28:00 2022 +0200 testbot/web: Automatically refresh the failure bug information. Automatically refresh the failure bug information when the bug id is modified. Also trigger a refresh when a failure is undeleted. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48912 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 39 ++++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/Engine/Notify.pm | 20 +++++++++++++++- testbot/lib/WineTestBot/Failures.pm | 31 +++++++++++++++++++++++++ testbot/web/FailureDetails.pl | 1 - testbot/web/FailuresList.pl | 5 ++-- 5 files changed, 91 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 88852730..29dce183 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -49,6 +49,7 @@ use WineTestBot::Config; use WineTestBot::Engine::Events; use WineTestBot::Engine::Notify; use WineTestBot::Engine::Scheduler; +use WineTestBot::Failures; use WineTestBot::Jobs; use WineTestBot::Log; use WineTestBot::Patches; @@ -548,6 +549,43 @@ sub HandleGetScreenshot($) return "1" . $ImageBytes; } +sub HandleUpdateFailure($) +{ + my ($FailureId) = @_; + + # Validate FailureId + if ($FailureId !~ /^(\d+)$/) + { + LogMsg "Invalid failure id\n"; + return "0Invalid Failure Id"; + } + $FailureId = $1; + + if (!CreateFailures()->GetItem($FailureId)) + { + LogMsg "Unknown Failure $FailureId\n"; + return "0Unknown Failure $FailureId"; + } + + my $Pid = fork; + if (!defined $Pid) + { + LogMsg "Unable to fork for UpdateFailures.pl: $!\n"; + } + elsif (!$Pid) + { + # Clean up the child environment + CloseAllDBBackEnds(); + WineTestBot::Log::SetupRedirects(); + + exec("$BinDir/UpdateFailures.pl --log-only $FailureId") or + LogMsg "Unable to exec ${ProjectName}UpdateFailures.pl: $!\n"; + exit(1); + } + + return "1"; +} + my %Handlers=( "getscreenshot" => \&HandleGetScreenshot, "jobcontrol" => \&HandleJobControl, @@ -558,6 +596,7 @@ my %Handlers=( "vmstatuschange" => \&HandleVMStatusChange, "winepatchmlsubmission" => \&HandleWinePatchMLSubmission, "winepatchwebsubmission" => \&HandleWinePatchWebSubmission, + "updatefailure" => \&HandleUpdateFailure, ); sub HandleClientCmd(@) diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 82221c9e..9c180298 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -31,7 +31,8 @@ use Exporter 'import'; our $RunningInEngine; our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl RescheduleJobs VMStatusChange - WinePatchMLSubmission WinePatchWebSubmission GetScreenshot); + WinePatchMLSubmission WinePatchWebSubmission + UpdateFailure GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); use Socket; @@ -194,6 +195,23 @@ sub WinePatchWebSubmission() return substr($Reply, 1); } +sub UpdateFailure($) +{ + my ($FailureId) = @_; + + my $Reply = SendCmdReceiveReply("updatefailure $FailureId\n"); + if (length($Reply) < 1) + { + return "The Engine did not acknowledge the UpdateFailure command"; + } + if (substr($Reply, 0, 1) eq "1") + { + return (undef, substr($Reply, 1)); + } + + return (substr($Reply, 1), undef); +} + sub GetScreenshot($) { my ($VMName) = @_; diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 344af756..f0f78b6f 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -40,6 +40,8 @@ TaskFailure objects. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); +use WineTestBot::Engine::Notify; + sub Compare($$) { @@ -55,6 +57,35 @@ sub Compare($$) return $Cmp } +sub BugId($;$) +{ + my ($self, $NewBugId) = @_; + + my $CurrentBugId = $self->SUPER::BugId; + return $CurrentBugId if (!defined $NewBugId); + + if (!defined $CurrentBugId or $NewBugId ne $CurrentBugId) + { + $self->{OldBugId} = $CurrentBugId if (!defined $self->{OldBugId}); + $self->SUPER::BugId($NewBugId); + } + + return $NewBugId; +} + +sub OnSaved($) +{ + my ($self) = @_; + + $self->SUPER::OnSaved(); + if ((defined $self->{OldBugId} and $self->{OldBugId} ne $self->BugId) or + !$self->BugStatus or !$self->BugDescription) + { + UpdateFailure($self->Id); + } + delete $self->{OldBugId}; +} + sub Validate($) { my ($self) = @_; diff --git a/testbot/web/FailureDetails.pl b/testbot/web/FailureDetails.pl index ab7d1311..c510d8d4 100644 --- a/testbot/web/FailureDetails.pl +++ b/testbot/web/FailureDetails.pl @@ -206,7 +206,6 @@ sub OnAction($$) $self->{Item}->BugDescription(""); } return undef if (!$self->Save()); - # FIXME Notify the TestBot Engine so it updates the bug information exit($self->RedirectToParent()); } return $self->SUPER::OnAction($Action); diff --git a/testbot/web/FailuresList.pl b/testbot/web/FailuresList.pl index f763413f..e271ee1d 100644 --- a/testbot/web/FailuresList.pl +++ b/testbot/web/FailuresList.pl @@ -129,9 +129,9 @@ sub OnItemAction($$$) return 1 if ($Action eq "Restore" and $Failure->BugStatus ne "deleted"); my $NewStatus = $Action eq "Delete" ? "deleted" : - $Action eq "Restore" ? "unknown" : + $Action eq "Restore" ? "" : undef; - if ($NewStatus) + if (defined $NewStatus) { $Failure->BugStatus($NewStatus); my ($_ErrProperty, $ErrMessage) = $Failure->Save(); @@ -141,7 +141,6 @@ sub OnItemAction($$$) $self->{EnclosingPage}->SetError(undef, $ErrMessage); return 0; } - # FIXME Notify the TestBot Engine so it updates the bug information return 1; } }

1 0

Francois Gouget : testbot/Engine: Also handle notifications originating from the Engine.
by Alexandre Julliard 16 Jun '22

16 Jun '22

Module: tools Branch: master Commit: 9b0894ed386f24a5e415f96f8f6fe9437e550788 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9b0894ed386f24a5e415f96… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 16 18:28:05 2022 +0200 testbot/Engine: Also handle notifications originating from the Engine. In particular notifications of job status changes must be processed in order for the result emails to be sent and for the patch status to be updated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 2 +- testbot/lib/WineTestBot/Engine/Notify.pm | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 29dce183..9d836529 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -751,7 +751,7 @@ sub main() $SIG{CHLD} = \&REAPER; WineTestBot::Log::SetupRedirects(); - $WineTestBot::Engine::Notify::RunningInEngine = 1; + SetNotificationHandler(\&HandleClientCmd); LogMsg "Starting the WineTestBot Engine\n"; # Validate and adjust the configuration options diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 9c180298..78ece067 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -2,6 +2,7 @@ # Notification of WineTestBot engine # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2022 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -29,8 +30,8 @@ WineTestBot::Engine::Notify - Engine notification use Exporter 'import'; our $RunningInEngine; -our @EXPORT = qw(Shutdown PingEngine JobStatusChange JobControl - RescheduleJobs VMStatusChange +our @EXPORT = qw(SetNotificationHandler Shutdown PingEngine JobStatusChange + JobControl RescheduleJobs VMStatusChange WinePatchMLSubmission WinePatchWebSubmission UpdateFailure GetScreenshot); our @EXPORT_OK = qw($RunningInEngine); @@ -38,14 +39,21 @@ our @EXPORT_OK = qw($RunningInEngine); use Socket; use WineTestBot::Config; +my $_CmdHandler; + +sub SetNotificationHandler($) +{ + my ($Handler) = @_; + $_CmdHandler = $Handler; +} sub SendCmdReceiveReply($) { my ($Cmd) = @_; - if (defined($RunningInEngine)) + if ($_CmdHandler) { - return "1"; + return &$_CmdHandler(split ' ', $Cmd); } if (! socket(SOCK, PF_UNIX, SOCK_STREAM, 0))

1 0

Piotr Caban : d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 2e2377df21b003186d6f170c5127392a989f312d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e2377df21b003186d6f170c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 31 16:56:38 2022 +0200 d3dx10/tests: Add D3DX10CreateAsyncTextureProcessor tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 64 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 026eaf0dbb6..d8839626c3b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2003,6 +2003,69 @@ static void test_D3DX10CreateAsyncTextureInfoProcessor(void) CoUninitialize(); } +static void test_D3DX10CreateAsyncTextureProcessor(void) +{ + ID3DX10DataProcessor *dp; + ID3D10Resource *resource; + ID3D10Device *device; + HRESULT hr; + int i; + + device = create_device(); + if (!device) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + CoInitialize(NULL); + + hr = D3DX10CreateAsyncTextureProcessor(device, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureProcessor(NULL, NULL, &dp); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncTextureProcessor(device, NULL, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[0].data, 0); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Process(dp, NULL, test_image[0].size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + + hr = D3DX10CreateAsyncTextureProcessor(device, NULL, &dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataProcessor_Process(dp, (void *)test_image[i].data, test_image[i].size); + todo_wine_if(test_image[i].expected_info.MiscFlags & D3D10_RESOURCE_MISC_TEXTURECUBE) + ok(hr == S_OK || broken(hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + hr = ID3DX10DataProcessor_CreateDeviceObject(dp, (void **)&resource); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = ID3DX10DataProcessor_Destroy(dp); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + winetest_pop_context(); + } + + CoUninitialize(); + + ID3D10Device_Release(device); +} + static void test_get_image_info(void) { static const WCHAR test_resource_name[] = L"resource.data"; @@ -3498,6 +3561,7 @@ START_TEST(d3dx10) test_D3DX10CreateAsyncFileLoader(); test_D3DX10CreateAsyncResourceLoader(); test_D3DX10CreateAsyncTextureInfoProcessor(); + test_D3DX10CreateAsyncTextureProcessor(); test_get_image_info(); test_create_texture(); test_font();

1 0

Connor McAdams : include: Import IAccessible2 headers.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: ad8c61d897b2ee7d2347df4fa7f03d6b8cb0d993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad8c61d897b2ee7d2347df4f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 12:19:22 2022 -0400 include: Import IAccessible2 headers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/Makefile.in | 1 + include/wine/iaccessible2.idl | 5473 +++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 3 files changed, 5475 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad8c61d897b2ee7d2347…

1 0

Connor McAdams : ia2comproxy: Introduce new proxy stub DLL for IAccessible2.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 7d5708a18224e588ffa456996c4f9f0edee87360 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d5708a18224e588ffa45699… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 12:39:04 2022 -0400 ia2comproxy: Introduce new proxy stub DLL for IAccessible2. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/ia2comproxy/Makefile.in | 8 ++++++++ dlls/ia2comproxy/ia2_classes.idl | 30 ++++++++++++++++++++++++++++++ dlls/ia2comproxy/ia2comproxy.spec | 4 ++++ dlls/ia2comproxy/oleacc_classes.idl | 21 +++++++++++++++++++++ 6 files changed, 66 insertions(+) diff --git a/configure b/configure index faf7e0e1a8e..51a47e809e5 100755 --- a/configure +++ b/configure @@ -1120,6 +1120,7 @@ enable_hlink enable_hnetcfg enable_http_sys enable_httpapi +enable_ia2comproxy enable_iccvid enable_icmp enable_ieframe @@ -21492,6 +21493,7 @@ wine_fn_config_makefile dlls/hnetcfg/tests enable_tests wine_fn_config_makefile dlls/http.sys enable_http_sys wine_fn_config_makefile dlls/httpapi enable_httpapi wine_fn_config_makefile dlls/httpapi/tests enable_tests +wine_fn_config_makefile dlls/ia2comproxy enable_ia2comproxy wine_fn_config_makefile dlls/iccvid enable_iccvid wine_fn_config_makefile dlls/icmp enable_icmp wine_fn_config_makefile dlls/ieframe enable_ieframe diff --git a/configure.ac b/configure.ac index fbdfbb05b3b..9ad1b19164c 100644 --- a/configure.ac +++ b/configure.ac @@ -2661,6 +2661,7 @@ WINE_CONFIG_MAKEFILE(dlls/hnetcfg/tests) WINE_CONFIG_MAKEFILE(dlls/http.sys) WINE_CONFIG_MAKEFILE(dlls/httpapi) WINE_CONFIG_MAKEFILE(dlls/httpapi/tests) +WINE_CONFIG_MAKEFILE(dlls/ia2comproxy) WINE_CONFIG_MAKEFILE(dlls/iccvid) WINE_CONFIG_MAKEFILE(dlls/icmp) WINE_CONFIG_MAKEFILE(dlls/ieframe) diff --git a/dlls/ia2comproxy/Makefile.in b/dlls/ia2comproxy/Makefile.in new file mode 100644 index 00000000000..48f58a8093e --- /dev/null +++ b/dlls/ia2comproxy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = ia2comproxy.dll +IMPORTS = uuid oleacc oleaut32 ole32 rpcrt4 + +IDL_SRCS = \ + ia2_classes.idl \ + oleacc_classes.idl + +dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_DELEGATION diff --git a/dlls/ia2comproxy/ia2_classes.idl b/dlls/ia2comproxy/ia2_classes.idl new file mode 100644 index 00000000000..4102ea8119c --- /dev/null +++ b/dlls/ia2comproxy/ia2_classes.idl @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Connor McAdams 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 + */ + +#pragma makedep ident +#pragma makedep proxy +#pragma makedep register + +cpp_quote("#include \"oleacc.h\"") +#include "wine/iaccessible2.idl" + +[ + threading(both), + uuid(01c20f2b-3dd2-400f-949f-ad00bdab1d41) /* IAccessibleHyperLink */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/ia2comproxy/ia2comproxy.spec b/dlls/ia2comproxy/ia2comproxy.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/ia2comproxy/ia2comproxy.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/ia2comproxy/oleacc_classes.idl b/dlls/ia2comproxy/oleacc_classes.idl new file mode 100644 index 00000000000..6621174abbd --- /dev/null +++ b/dlls/ia2comproxy/oleacc_classes.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams 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 + */ + +#pragma makedep ident + +#include "oleacc.idl"

1 0

Connor McAdams : uiautomationcore: Add basic IAccessible2 support.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 62d76348b371e0a9f9dd3a67b801cc3c7cc4bc36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d76348b371e0a9f9dd3a67… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 13 13:04:13 2022 -0400 uiautomationcore: Add basic IAccessible2 support. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 603 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 53 +++ 2 files changed, 656 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=62d76348b371e0a9f9dd…

1 0

Andrew Eikum : include: Remove duplicate ICodecAPI::GetParameterValues function.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 712c547e0869b0caf797694137e36bacea614aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712c547e0869b0caf7976941… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 15 13:00:36 2022 -0500 include: Remove duplicate ICodecAPI::GetParameterValues function. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/icodecapi.idl | 1 - 1 file changed, 1 deletion(-) diff --git a/include/icodecapi.idl b/include/icodecapi.idl index 7954b3fc2f6..dc31daf2e2c 100644 --- a/include/icodecapi.idl +++ b/include/icodecapi.idl @@ -42,7 +42,6 @@ interface ICodecAPI : IUnknown HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); - HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value);

1 0

Jacek Caban : win32u: Move process default layout handling from user32.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 07f2cc9dda1c71a845e901f3270cc19fca9dbed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07f2cc9dda1c71a845e901f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 01:49:12 2022 +0200 win32u: Move process default layout handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/class.c | 4 ++++ dlls/user32/win.c | 20 ++++---------------- dlls/win32u/sysparams.c | 8 ++++++++ dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 1 + include/ntuser.h | 12 ++++++++++++ 6 files changed, 30 insertions(+), 16 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 620477f1b14..76e2688bb82 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -309,6 +309,8 @@ static void load_uxtheme(void) */ BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ) { + DWORD layout; + register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); register_builtin( &COMBOLBOX_builtin_class ); @@ -322,6 +324,8 @@ BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, register_builtin( &STATIC_builtin_class ); register_builtin( &IME_builtin_class ); + GetProcessDefaultLayout( &layout ); /* make sure that process layout is initialized */ + /* Load uxtheme.dll so that standard scrollbars and dialogs are hooked for theming support */ load_uxtheme(); return TRUE; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 99753791f09..9d19376fe44 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); -static DWORD process_layout = ~0u; - /*********************************************************************** * get_user_handle_ptr @@ -626,15 +624,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } - /* FIXME: move to win32u */ - if (!cs->hwndParent && className != (const WCHAR *)DESKTOP_CLASS_ATOM && - (IS_INTRESOURCE(className) || wcsicmp( className, L"Message" ))) - { - DWORD layout; - GetProcessDefaultLayout( &layout ); - if (layout & LAYOUT_RTL) cs->dwExStyle |= WS_EX_LAYOUTRTL; - } - menu = cs->hMenu; if (!menu && info.lpszMenuName && (cs->style & (WS_CHILD | WS_POPUP)) != WS_CHILD) menu = LoadMenuW( cs->hInstance, info.lpszMenuName ); @@ -1610,7 +1599,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) SetLastError( ERROR_NOACCESS ); return FALSE; } - if (process_layout == ~0u) + *layout = NtUserGetProcessDefaultLayout(); + if (*layout == ~0u) { WCHAR *str, buffer[MAX_PATH]; DWORD i, version_layout = 0; @@ -1640,9 +1630,8 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) done: HeapFree( GetProcessHeap(), 0, data ); - process_layout = version_layout; + NtUserSetProcessDefaultLayout( *layout = version_layout ); } - *layout = process_layout; return TRUE; } @@ -1654,8 +1643,7 @@ BOOL WINAPI GetProcessDefaultLayout( DWORD *layout ) */ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) { - process_layout = layout; - return TRUE; + return NtUserSetProcessDefaultLayout( layout ); } #ifdef _WIN64 diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1c1d9ddc621..d4ab352ccbd 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -360,6 +360,7 @@ union sysparam_all_entry static UINT system_dpi; static RECT work_area; +DWORD process_layout = ~0u; static HDC display_dc; static pthread_mutex_t display_dc_lock = PTHREAD_MUTEX_INITIALIZER; @@ -4714,6 +4715,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_GetInputState: return get_input_state(); + case NtUserCallNoParam_GetProcessDefaultLayout: + return process_layout; + case NtUserCallNoParam_ReleaseCapture: return release_capture(); @@ -4805,6 +4809,10 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_SetCaretBlinkTime: return set_caret_blink_time( arg ); + case NtUserCallOneParam_SetProcessDefaultLayout: + process_layout = arg; + return TRUE; + /* temporary exports */ case NtUserCallHooks: { diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d1bc382f031..23343c413dc 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -424,6 +424,7 @@ extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM /* sysparams.c */ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; +extern DWORD process_layout DECLSPEC_HIDDEN; extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN; extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN; extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 5575b9a0381..431686bdcaa 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5126,6 +5126,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, (class_name->Length != sizeof(messageW) || wcsnicmp( class_name->Buffer, messageW, ARRAYSIZE(messageW) ))) { + if (process_layout & LAYOUT_RTL) cs.dwExStyle |= WS_EX_LAYOUTRTL; parent = get_desktop_window(); } } diff --git a/include/ntuser.h b/include/ntuser.h index cf8a909493b..1f3cc2f2e7e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -725,6 +725,7 @@ enum NtUserCallNoParam_GetDesktopWindow, NtUserCallNoParam_GetDialogBaseUnits, NtUserCallNoParam_GetInputState, + NtUserCallNoParam_GetProcessDefaultLayout, NtUserCallNoParam_ReleaseCapture, /* temporary exports */ NtUserExitingThread, @@ -751,6 +752,11 @@ static inline BOOL NtUserGetInputState(void) return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); } +static inline DWORD NtUserGetProcessDefaultLayout(void) +{ + return NtUserCallNoParam( NtUserCallNoParam_GetProcessDefaultLayout ); +} + static inline BOOL NtUserReleaseCapture(void) { return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture ); @@ -780,6 +786,7 @@ enum NtUserCallOneParam_MessageBeep, NtUserCallOneParam_RealizePalette, NtUserCallOneParam_SetCaretBlinkTime, + NtUserCallOneParam_SetProcessDefaultLayout, /* temporary exports */ NtUserCallHooks, NtUserGetDeskPattern, @@ -898,6 +905,11 @@ static inline UINT NtUserRealizePalette( HDC hdc ) return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_RealizePalette ); } +static inline UINT NtUserSetProcessDefaultLayout( DWORD layout ) +{ + return NtUserCallOneParam( layout, NtUserCallOneParam_SetProcessDefaultLayout ); +} + /* NtUserCallTwoParam codes, not compatible with Windows */ enum {

1 0

Jacek Caban : win32u: Move WM_NCHITTEST implementation from user32.
by Alexandre Julliard 15 Jun '22

15 Jun '22

Module: wine Branch: master Commit: 80ef8832aa697c4e7e16f640f5e722ade6a43fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ef8832aa697c4e7e16f640… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 02:01:54 2022 +0200 win32u: Move WM_NCHITTEST implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/defwnd.c | 8 --- dlls/win32u/defwnd.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 8 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 6f2c3013aaa..8f32594fd34 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -165,14 +165,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); - case WM_NCHITTEST: - { - POINT pt; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - return NC_HandleNCHitTest( hwnd, pt ); - } - case WM_WINDOWPOSCHANGED: DEFWND_HandleWindowPosChanged( hwnd, (const WINDOWPOS *)lParam ); break; diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 3705cbf8022..6ec27fc6725 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -1621,6 +1621,175 @@ static void handle_nc_calc_size( HWND hwnd, WPARAM wparam, RECT *win_rect ) } } +static LRESULT handle_nc_hit_test( HWND hwnd, POINT pt ) +{ + RECT rect, client_rect; + DWORD style, ex_style; + + TRACE( "hwnd %p pt %d,%d\n", hwnd, pt.x, pt.y ); + + get_window_rects( hwnd, COORDS_SCREEN, &rect, &client_rect, get_thread_dpi() ); + if (!PtInRect( &rect, pt )) return HTNOWHERE; + + style = get_window_long( hwnd, GWL_STYLE ); + ex_style = get_window_long( hwnd, GWL_EXSTYLE ); + + if (PtInRect( &client_rect, pt )) return HTCLIENT; + + /* Check borders */ + if (has_thick_frame( style, ex_style )) + { + InflateRect( &rect, -get_system_metrics( SM_CXFRAME ), -get_system_metrics( SM_CYFRAME )); + if (!PtInRect( &rect, pt )) + { + /* Check top sizing border */ + if (pt.y < rect.top) + { + if (pt.x < rect.left + get_system_metrics( SM_CXSIZE )) return HTTOPLEFT; + if (pt.x >= rect.right - get_system_metrics( SM_CXSIZE )) return HTTOPRIGHT; + return HTTOP; + } + /* Check bottom sizing border */ + if (pt.y >= rect.bottom) + { + if (pt.x < rect.left + get_system_metrics( SM_CXSIZE )) return HTBOTTOMLEFT; + if (pt.x >= rect.right - get_system_metrics( SM_CXSIZE )) return HTBOTTOMRIGHT; + return HTBOTTOM; + } + /* Check left sizing border */ + if (pt.x < rect.left) + { + if (pt.y < rect.top + get_system_metrics( SM_CYSIZE )) return HTTOPLEFT; + if (pt.y >= rect.bottom - get_system_metrics( SM_CYSIZE )) return HTBOTTOMLEFT; + return HTLEFT; + } + /* Check right sizing border */ + if (pt.x >= rect.right) + { + if (pt.y < rect.top + get_system_metrics( SM_CYSIZE )) return HTTOPRIGHT; + if (pt.y >= rect.bottom-get_system_metrics( SM_CYSIZE )) return HTBOTTOMRIGHT; + return HTRIGHT; + } + } + } + else /* No thick frame */ + { + if (has_dialog_frame( style, ex_style )) + InflateRect( &rect, -get_system_metrics( SM_CXDLGFRAME ), + -get_system_metrics( SM_CYDLGFRAME )); + else if (has_thin_frame( style )) + InflateRect(&rect, -get_system_metrics( SM_CXBORDER ), + -get_system_metrics( SM_CYBORDER )); + if (!PtInRect( &rect, pt )) return HTBORDER; + } + + /* Check caption */ + if ((style & WS_CAPTION) == WS_CAPTION) + { + if (ex_style & WS_EX_TOOLWINDOW) + rect.top += get_system_metrics( SM_CYSMCAPTION ) - 1; + else + rect.top += get_system_metrics( SM_CYCAPTION ) - 1; + if (!PtInRect( &rect, pt )) + { + BOOL min_or_max_box = (style & WS_SYSMENU) && (style & (WS_MINIMIZEBOX | WS_MAXIMIZEBOX)); + if (ex_style & WS_EX_LAYOUTRTL) + { + /* Check system menu */ + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW) && + get_nc_icon_for_window( hwnd )) + { + rect.right -= get_system_metrics( SM_CYCAPTION ) - 1; + if (pt.x > rect.right) return HTSYSMENU; + } + + /* Check close button */ + if (style & WS_SYSMENU) + { + rect.left += get_system_metrics( SM_CYCAPTION ); + if (pt.x < rect.left) return HTCLOSE; + } + + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + /* Check maximize box */ + rect.left += get_system_metrics( SM_CXSIZE ); + if (pt.x < rect.left) return HTMAXBUTTON; + + /* Check minimize box */ + rect.left += get_system_metrics( SM_CXSIZE ); + if (pt.x < rect.left) return HTMINBUTTON; + } + } + else + { + /* Check system menu */ + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW) && + get_nc_icon_for_window( hwnd )) + { + rect.left += get_system_metrics( SM_CYCAPTION ) - 1; + if (pt.x < rect.left) return HTSYSMENU; + } + + /* Check close button */ + if (style & WS_SYSMENU) + { + rect.right -= get_system_metrics( SM_CYCAPTION ); + if (pt.x > rect.right) return HTCLOSE; + } + + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) + { + /* Check maximize box */ + rect.right -= get_system_metrics( SM_CXSIZE ); + if (pt.x > rect.right) return HTMAXBUTTON; + + /* Check minimize box */ + rect.right -= get_system_metrics( SM_CXSIZE ); + if (pt.x > rect.right) return HTMINBUTTON; + } + } + return HTCAPTION; + } + } + + /* Check menu bar */ + if (has_menu( hwnd, style ) && (pt.y < client_rect.top) && + (pt.x >= client_rect.left) && (pt.x < client_rect.right)) + return HTMENU; + + /* Check vertical scroll bar */ + if (ex_style & WS_EX_LAYOUTRTL) ex_style ^= WS_EX_LEFTSCROLLBAR; + if (style & WS_VSCROLL) + { + if (ex_style & WS_EX_LEFTSCROLLBAR) + client_rect.left -= get_system_metrics( SM_CXVSCROLL ); + else + client_rect.right += get_system_metrics( SM_CXVSCROLL ); + if (PtInRect( &client_rect, pt )) return HTVSCROLL; + } + + /* Check horizontal scroll bar */ + if (style & WS_HSCROLL) + { + client_rect.bottom += get_system_metrics( SM_CYHSCROLL ); + if (PtInRect( &client_rect, pt )) + { + /* Check size box */ + if ((style & WS_VSCROLL) && + ((ex_style & WS_EX_LEFTSCROLLBAR) + ? (pt.x <= client_rect.left + get_system_metrics( SM_CXVSCROLL )) + : (pt.x >= client_rect.right - get_system_metrics( SM_CXVSCROLL )))) + return HTSIZE; + return HTHSCROLL; + } + } + + /* Has to return HTNOWHERE if nothing was found + Could happen when a window has a customized non client area */ + return HTNOWHERE; +} + LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { LRESULT result = 0; @@ -1652,6 +1821,14 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, handle_nc_calc_size( hwnd, wparam, (RECT *)lparam ); break; + case WM_NCHITTEST: + { + POINT pt; + pt.x = (short)LOWORD( lparam ); + pt.y = (short)HIWORD( lparam ); + return handle_nc_hit_test( hwnd, pt ); + } + case WM_NCPAINT: return handle_nc_paint( hwnd, (HRGN)wparam );

1 0