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

[PATCH v2 1/5] d2d1/tests: Add more test xml.
by Ziqing Hui 13 Jun '22

13 Jun '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Add case tests and min/max inputs tests. dlls/d2d1/tests/d2d1.c | 120 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..970706bc569 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -99,6 +99,17 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_inputs_attribute = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs min='1' max='10' deadbeef='abcdef'/> \ + </Effect> \ +"; + static const WCHAR *effect_xml_without_version = L"<Effect> \ <Property name='DisplayName' type='string'/> \ @@ -170,6 +181,90 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_wrong_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='uint32' value='32'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_duplicate_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_effect = +L"<?xml version='1.0'?> \ + <effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </effect> \ +"; + +static const WCHAR *effect_xml_lower_case_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <property name='DisplayName' type='string'/> \ + <property name='Author' type='string'/> \ + <property name='Category' type='string'/> \ + <property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_lower_case_inputs = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='MinInputs' type='uint32' value='1'/> \ + <Property name='MaxInputs' type='uint32' value='2'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_min_max_inputs_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs> \ + <Property name='Min' type='uint32' value='1'/> \ + <Property name='Max' type='uint32' value='2'/> \ + </Inputs> \ + </Effect> \ +"; + + static const DWORD test_vs[] = { #if 0 @@ -10604,10 +10699,11 @@ static void test_effect_register(BOOL d3d11) } xml_tests[] = { - {effect_xml_a, S_OK}, - {effect_xml_b, S_OK}, - {effect_xml_c, S_OK}, - {effect_xml_minimum, S_OK}, + {effect_xml_a, S_OK}, + {effect_xml_b, S_OK}, + {effect_xml_c, S_OK}, + {effect_xml_minimum, S_OK}, + {effect_xml_inputs_attribute, S_OK}, {effect_xml_without_version, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, {effect_xml_without_inputs, E_INVALIDARG}, {effect_xml_without_name, E_INVALIDARG}, @@ -10615,6 +10711,13 @@ static void test_effect_register(BOOL d3d11) {effect_xml_without_category, E_INVALIDARG}, {effect_xml_without_description, E_INVALIDARG}, {effect_xml_without_type, E_INVALIDARG}, + {effect_xml_wrong_type, E_INVALIDARG}, + {effect_xml_duplicate_property, E_INVALIDARG}, + {effect_xml_lower_case_effect, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_property, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_lower_case_inputs, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, + {effect_xml_min_max_inputs_a, E_INVALIDARG}, + {effect_xml_min_max_inputs_b, HRESULT_FROM_WIN32(ERROR_NOT_FOUND)}, }; const D2D1_PROPERTY_BINDING binding[] = @@ -10926,10 +11029,11 @@ static void test_effect_properties(BOOL d3d11) } system_property_tests[] = { - {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, - {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_a, L"TestEffectA", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_b, L"TestEffectB", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_c, L"TestEffectC", effect_author, effect_category, effect_description, 1, 1}, + {effect_xml_minimum, L"", L"" ,L"", L"", 0, 0}, + {effect_xml_inputs_attribute, L"", L"" ,L"", L"", 0, 0}, }; if (!init_test_context(&ctx, d3d11)) -- 2.25.1

2 12

[tools 1/3] testbot/orm: Make the Itemref columns read-only.
by Francois Gouget 13 Jun '22

13 Jun '22

The columns used by an Itemref should be modified through the Itemref property to ensure that they remain in sync with it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch is independent from the next two. They just happen to both modify the Tasks property descriptors. --- testbot/lib/ObjectModel/CGI/FormPage.pm | 3 +- testbot/lib/ObjectModel/Item.pm | 8 ++++++ .../ObjectModel/ItemrefPropertyDescriptor.pm | 28 ++++++++++++++++++- testbot/lib/ObjectModel/PropertyDescriptor.pm | 7 +++++ testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + 10 files changed, 50 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 224bf3687..6f3449b5b 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -198,7 +198,8 @@ sub DisplayProperty($$) # type the appropriate key value would also be cumbersome so this is # currently not supported. But they can be displayed. $PropertyDescriptor->GetClass() eq "Itemref" ? "ro" : - # All other properties can displayed, + $PropertyDescriptor->GetIsReadOnly() ? "ro" : + # All other properties can be displayed, !$self->{RW} ? "ro" : # and even edited if in read-write mode... $PropertyDescriptor->GetClass() ne "Basic" ? "rw" : diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index b07b76066..11d09be67 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -270,6 +270,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Value = shift; if ($self->ValuesDiffer($Value, $self->{ColValues}{$PropertyName})) { @@ -283,6 +287,10 @@ sub AUTOLOAD { if (@_) { + if ($PropertyDescriptor->GetIsReadOnly()) + { + die "$PropertyName is read-only"; + } my $Item = shift; if (!$Item and !$self->{Itemrefs}{$PropertyName}) { diff --git a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm index 6895e801a..171d00a9e 100644 --- a/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm @@ -28,7 +28,7 @@ ObjectModel::ItemrefPropertyDescriptor - A property referencing an ObjectModel:: use Exporter 'import'; use ObjectModel::PropertyDescriptor; our @ISA = qw(ObjectModel::PropertyDescriptor); -our @EXPORT = qw(CreateItemrefPropertyDescriptor); +our @EXPORT = qw(CreateItemrefPropertyDescriptor SetupItemrefColumns); sub _initialize($$$) { @@ -78,4 +78,30 @@ sub CreateItemrefPropertyDescriptor($$$$$) return ObjectModel::ItemrefPropertyDescriptor->new($Name, $DisplayName, !1, $IsRequired, $Creator, $RefColNames); } +sub SetupItemrefColumns($) +{ + my ($PropertyDescriptors) = @_; + + my (@Itemrefs, %Properties); + foreach my $PropertyDescriptor (@$PropertyDescriptors) + { + $Properties{$PropertyDescriptor->GetName()} = $PropertyDescriptor; + if ($PropertyDescriptor->GetClass() eq "Itemref") + { + push @Itemrefs, $PropertyDescriptor; + } + } + + # Mark the Itemref columns as read-only so they are only modified + # through the Itemref. + foreach my $Itemref (@Itemrefs) + { + foreach my $ColName (@{$Itemref->GetRefColNames()}) + { + my $ColDescriptor = $Properties{$ColName}; + $ColDescriptor->{IsReadOnly} = 1; + } + } +} + 1; diff --git a/testbot/lib/ObjectModel/PropertyDescriptor.pm b/testbot/lib/ObjectModel/PropertyDescriptor.pm index f13a4b248..2f9411aa2 100644 --- a/testbot/lib/ObjectModel/PropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/PropertyDescriptor.pm @@ -86,6 +86,13 @@ sub GetIsRequired($) return $self->{IsRequired}; } +sub GetIsReadOnly($) +{ + my ($self) = @_; + + return $self->{IsReadOnly}; +} + sub GetClass($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index 5ca84e734..8594cfcdf 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -75,6 +75,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("User", "User", 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Permanent", "Permanent session", !1, 1, "B", 1), ); +SetupItemrefColumns(\@PropertyDescriptors); =pod =over 12 diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 140bd572b..7f15a9c57 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -524,6 +524,7 @@ my @PropertyDescriptors = ( CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", \&CreateSteps), ); +SetupItemrefColumns(\@PropertyDescriptors); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); =pod diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index f4768b823..32a6af44f 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -68,6 +68,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("PatchId", "Patch id", !1, 1, "N", 10), CreateItemrefPropertyDescriptor("Patch", "Submitted via patch", 1, \&CreatePatches, ["PatchId"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("PendingPatchSetEMail", "EMail of series author", 1, 1, "A", 40), CreateBasicPropertyDescriptor("PendingPatchSetVersion", "Expected version of the series", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 2533c6a01..87146b277 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -192,6 +192,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); sub CreateStepsTasks(;$$) { diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 5c5813cd9..0360e4ebc 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -363,6 +363,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Failures", !1, !1, "N", 6), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("JobId", "Job id", 1, 1, "N", 10), CreateBasicPropertyDescriptor("StepNo", "Step no", 1, 1, "N", 2), diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 90c4332c3..900f41fc5 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -61,6 +61,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("RoleName", "Role", 1, 1, "A", 20), CreateItemrefPropertyDescriptor("Role", "Role", 1, \&CreateRoles, ["RoleName"]), ); +SetupItemrefColumns(\@PropertyDescriptors); my @FlatPropertyDescriptors = ( CreateBasicPropertyDescriptor("UserName", "Username", 1, 1, "A", 40), @PropertyDescriptors -- 2.30.2

1 3

[PATCH 0/1] MR234: d2d1: Update to ID2D1DeviceContext1.
by Nikolay Sivov (＠nsivov) 13 Jun '22

13 Jun '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/234

2 1

[PATCH v2 0/5] MR232: win32u: user32 conversion
by Jacek Caban (＠jacek) 13 Jun '22

13 Jun '22

-- v2: win32u: Simplify get_text_metr_size. win32u: Move GetDialogBaseUnits implementation from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/232

4 10

[PATCH 0/3] MR230: UiaProviderFromIAccessible: Initial navigation patches.
by Connor McAdams (＠cmcadams) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/230

3 4

[PATCH 0/5] MR232: win32u: user32 conversion
by Jacek Caban (＠jacek) 13 Jun '22

13 Jun '22

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/232

3 8

[PATCH 0/2] MR231: user32/tests: Test for parent window exposure by SetWindowPos().
by Jinoh Kang (＠iamahuman) 12 Jun '22

12 Jun '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/231

3 4

[PATCH v2 1/3] shell32: Implement SHBindToFolderIDListParent.
by Mohamad Al-Jaf 12 Jun '22

12 Jun '22

Called by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- This is the code I submitted on May 3. --- dlls/shell32/pidl.c | 49 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 2 ++ 3 files changed, 52 insertions(+) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..e659427f9cd 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1285,6 +1285,55 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si return SUCCEEDED(hr); } +/************************************************************************* + * SHBindToFolderIDListParent [SHELL32.@] + */ +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + IShellFolder *psfDesktop = NULL; + HRESULT hr; + + TRACE_(shell)("%p,%p,%s\n", psf, pidl, debugstr_guid(riid)); + pdump(pidl); + + if (!pidl || !ppv) + return E_INVALIDARG; + + *ppv = NULL; + if (ppidlLast) + *ppidlLast = NULL; + + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + } + + if (_ILIsPidlSimple(pidl)) + { + /* we are on desktop level */ + hr = IShellFolder_QueryInterface(psf, riid, ppv); + } + else + { + LPITEMIDLIST pidlParent = ILClone(pidl); + ILRemoveLastID(pidlParent); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); + SHFree (pidlParent); + } + + if (psfDesktop) + IShellFolder_Release(psfDesktop); + + if (SUCCEEDED(hr) && ppidlLast) + *ppidlLast = ILFindLastID(pidl); + + TRACE_(shell)("-- ppv=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + return hr; +} + /************************************************************************* * SHBindToParent [shell version 5.0] */ diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..93f0201a991 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1639,6 +1639,8 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *); +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */ -- 2.36.1

2 4

Re: [PATCH v3 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers.
by Nikolay Sivov (＠nsivov) 11 Jun '22

11 Jun '22

Pushed an update to fix test failure on wine, with patch 2. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/212#note_1907

1 0

[PATCH 0/5] MR228: d3dx: improvements to texture creation functions
by Piotr Caban (＠piotr) 11 Jun '22

11 Jun '22

- support HRESULT parameter in D3DX10CreateTextureFrom* - implement D3DX10CreateAsyncTextureProcessor -- https://gitlab.winehq.org/wine/wine/-/merge_requests/228

2 6