- Wine-Devel - list.winehq.org

[PATCH 1/2] include: Add windows.ui.idl file.
by Mohamad Al-Jaf April 23, 2022

April 23, 2022

Needed by windows.media.closedcaptioning.idl. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/windows.ui.idl | 323 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 324 insertions(+) create mode 100644 include/windows.ui.idl diff --git a/include/Makefile.in b/include/Makefile.in index dff2f341568..b38475e6464 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -799,6 +799,7 @@ SOURCES = \ windows.system.idl \ windows.system.power.idl \ windows.system.userprofile.idl \ + windows.ui.idl \ windowscontracts.idl \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.ui.idl b/include/windows.ui.idl new file mode 100644 index 00000000000..4dd9c160c82 --- /dev/null +++ b/include/windows.ui.idl @@ -0,0 +1,323 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * 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 "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.UI { + typedef struct Color Color; + typedef struct WindowId WindowId; + + interface IColorHelper; + interface IColorHelperStatics; + interface IColorHelperStatics2; + interface IColors; + interface IColorsStatics; + interface IUIContentRoot; + interface IUIContext; + + runtimeclass ColorHelper; + runtimeclass Colors; + runtimeclass UIContentRoot; + runtimeclass UIContext; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.UI.Color>; + interface Windows.Foundation.Collections.IIterable<Windows.UI.WindowId>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.Color>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.WindowId>; + interface Windows.Foundation.Collections.IVectorView<Windows.UI.WindowId>; + interface Windows.Foundation.IReference<Windows.UI.Color>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct Color + { + BYTE A; + BYTE R; + BYTE G; + BYTE B; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 12.0) + ] + struct WindowId + { + UINT64 Value; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(193cfbe7-65c7-4540-ad08-6283ba76879a) + ] + interface IColorHelper : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(8504dbea-fb6a-4144-a6c2-33499c9284f5) + ] + interface IColorHelperStatics : IInspectable + { + HRESULT FromArgb([in] BYTE a, [in] BYTE r, [in] BYTE g, [in] BYTE b, [out, retval] Windows.UI.Color* returnValue); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(24d9af02-6eb0-4b94-855c-fcf0818d9a16) + ] + interface IColorHelperStatics2 : IInspectable + { + HRESULT ToDisplayName([in] Windows.UI.Color color, [out, retval] HSTRING* returnValue); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Colors), + uuid(9b8c9326-4ca6-4ce5-8994-9eff65cabdcc) + ] + interface IColors : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Colors), + uuid(cff52e04-cca6-4614-a17e-754910c84a99) + ] + interface IColorsStatics : IInspectable + { + [propget] HRESULT AliceBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT AntiqueWhite([out, retval] Windows.UI.Color* value); + [propget] HRESULT Aqua([out, retval] Windows.UI.Color* value); + [propget] HRESULT Aquamarine([out, retval] Windows.UI.Color* value); + [propget] HRESULT Azure([out, retval] Windows.UI.Color* value); + [propget] HRESULT Beige([out, retval] Windows.UI.Color* value); + [propget] HRESULT Bisque([out, retval] Windows.UI.Color* value); + [propget] HRESULT Black([out, retval] Windows.UI.Color* value); + [propget] HRESULT BlanchedAlmond([out, retval] Windows.UI.Color* value); + [propget] HRESULT Blue([out, retval] Windows.UI.Color* value); + [propget] HRESULT BlueViolet([out, retval] Windows.UI.Color* value); + [propget] HRESULT Brown([out, retval] Windows.UI.Color* value); + [propget] HRESULT BurlyWood([out, retval] Windows.UI.Color* value); + [propget] HRESULT CadetBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT Chartreuse([out, retval] Windows.UI.Color* value); + [propget] HRESULT Chocolate([out, retval] Windows.UI.Color* value); + [propget] HRESULT Coral([out, retval] Windows.UI.Color* value); + [propget] HRESULT CornflowerBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT Cornsilk([out, retval] Windows.UI.Color* value); + [propget] HRESULT Crimson([out, retval] Windows.UI.Color* value); + [propget] HRESULT Cyan([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkCyan([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkGoldenrod([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkGray([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkKhaki([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkMagenta([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkOliveGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkOrange([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkOrchid([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkRed([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkSalmon([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkSeaGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkSlateBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkSlateGray([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkTurquoise([out, retval] Windows.UI.Color* value); + [propget] HRESULT DarkViolet([out, retval] Windows.UI.Color* value); + [propget] HRESULT DeepPink([out, retval] Windows.UI.Color* value); + [propget] HRESULT DeepSkyBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT DimGray([out, retval] Windows.UI.Color* value); + [propget] HRESULT DodgerBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT Firebrick([out, retval] Windows.UI.Color* value); + [propget] HRESULT FloralWhite([out, retval] Windows.UI.Color* value); + [propget] HRESULT ForestGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT Fuchsia([out, retval] Windows.UI.Color* value); + [propget] HRESULT Gainsboro([out, retval] Windows.UI.Color* value); + [propget] HRESULT GhostWhite([out, retval] Windows.UI.Color* value); + [propget] HRESULT Gold([out, retval] Windows.UI.Color* value); + [propget] HRESULT Goldenrod([out, retval] Windows.UI.Color* value); + [propget] HRESULT Gray([out, retval] Windows.UI.Color* value); + [propget] HRESULT Green([out, retval] Windows.UI.Color* value); + [propget] HRESULT GreenYellow([out, retval] Windows.UI.Color* value); + [propget] HRESULT Honeydew([out, retval] Windows.UI.Color* value); + [propget] HRESULT HotPink([out, retval] Windows.UI.Color* value); + [propget] HRESULT IndianRed([out, retval] Windows.UI.Color* value); + [propget] HRESULT Indigo([out, retval] Windows.UI.Color* value); + [propget] HRESULT Ivory([out, retval] Windows.UI.Color* value); + [propget] HRESULT Khaki([out, retval] Windows.UI.Color* value); + [propget] HRESULT Lavender([out, retval] Windows.UI.Color* value); + [propget] HRESULT LavenderBlush([out, retval] Windows.UI.Color* value); + [propget] HRESULT LawnGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT LemonChiffon([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightCoral([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightCyan([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightGoldenrodYellow([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightGray([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightPink([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightSalmon([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightSeaGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightSkyBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightSlateGray([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightSteelBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT LightYellow([out, retval] Windows.UI.Color* value); + [propget] HRESULT Lime([out, retval] Windows.UI.Color* value); + [propget] HRESULT LimeGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT Linen([out, retval] Windows.UI.Color* value); + [propget] HRESULT Magenta([out, retval] Windows.UI.Color* value); + [propget] HRESULT Maroon([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumAquamarine([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumOrchid([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumPurple([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumSeaGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumSlateBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumSpringGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumTurquoise([out, retval] Windows.UI.Color* value); + [propget] HRESULT MediumVioletRed([out, retval] Windows.UI.Color* value); + [propget] HRESULT MidnightBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT MintCream([out, retval] Windows.UI.Color* value); + [propget] HRESULT MistyRose([out, retval] Windows.UI.Color* value); + [propget] HRESULT Moccasin([out, retval] Windows.UI.Color* value); + [propget] HRESULT NavajoWhite([out, retval] Windows.UI.Color* value); + [propget] HRESULT Navy([out, retval] Windows.UI.Color* value); + [propget] HRESULT OldLace([out, retval] Windows.UI.Color* value); + [propget] HRESULT Olive([out, retval] Windows.UI.Color* value); + [propget] HRESULT OliveDrab([out, retval] Windows.UI.Color* value); + [propget] HRESULT Orange([out, retval] Windows.UI.Color* value); + [propget] HRESULT OrangeRed([out, retval] Windows.UI.Color* value); + [propget] HRESULT Orchid([out, retval] Windows.UI.Color* value); + [propget] HRESULT PaleGoldenrod([out, retval] Windows.UI.Color* value); + [propget] HRESULT PaleGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT PaleTurquoise([out, retval] Windows.UI.Color* value); + [propget] HRESULT PaleVioletRed([out, retval] Windows.UI.Color* value); + [propget] HRESULT PapayaWhip([out, retval] Windows.UI.Color* value); + [propget] HRESULT PeachPuff([out, retval] Windows.UI.Color* value); + [propget] HRESULT Peru([out, retval] Windows.UI.Color* value); + [propget] HRESULT Pink([out, retval] Windows.UI.Color* value); + [propget] HRESULT Plum([out, retval] Windows.UI.Color* value); + [propget] HRESULT PowderBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT Purple([out, retval] Windows.UI.Color* value); + [propget] HRESULT Red([out, retval] Windows.UI.Color* value); + [propget] HRESULT RosyBrown([out, retval] Windows.UI.Color* value); + [propget] HRESULT RoyalBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT SaddleBrown([out, retval] Windows.UI.Color* value); + [propget] HRESULT Salmon([out, retval] Windows.UI.Color* value); + [propget] HRESULT SandyBrown([out, retval] Windows.UI.Color* value); + [propget] HRESULT SeaGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT SeaShell([out, retval] Windows.UI.Color* value); + [propget] HRESULT Sienna([out, retval] Windows.UI.Color* value); + [propget] HRESULT Silver([out, retval] Windows.UI.Color* value); + [propget] HRESULT SkyBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT SlateBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT SlateGray([out, retval] Windows.UI.Color* value); + [propget] HRESULT Snow([out, retval] Windows.UI.Color* value); + [propget] HRESULT SpringGreen([out, retval] Windows.UI.Color* value); + [propget] HRESULT SteelBlue([out, retval] Windows.UI.Color* value); + [propget] HRESULT Tan([out, retval] Windows.UI.Color* value); + [propget] HRESULT Teal([out, retval] Windows.UI.Color* value); + [propget] HRESULT Thistle([out, retval] Windows.UI.Color* value); + [propget] HRESULT Tomato([out, retval] Windows.UI.Color* value); + [propget] HRESULT Transparent([out, retval] Windows.UI.Color* value); + [propget] HRESULT Turquoise([out, retval] Windows.UI.Color* value); + [propget] HRESULT Violet([out, retval] Windows.UI.Color* value); + [propget] HRESULT Wheat([out, retval] Windows.UI.Color* value); + [propget] HRESULT White([out, retval] Windows.UI.Color* value); + [propget] HRESULT WhiteSmoke([out, retval] Windows.UI.Color* value); + [propget] HRESULT Yellow([out, retval] Windows.UI.Color* value); + [propget] HRESULT YellowGreen([out, retval] Windows.UI.Color* value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.UIContentRoot), + uuid(1dfcbac6-b36b-5cb9-9bc5-2b7a0eddc378) + ] + interface IUIContentRoot : IInspectable + { + [propget] HRESULT UIContext([out, retval] Windows.UI.UIContext** value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.UIContext), + uuid(bb5cfacd-5bd8-59d0-a59e-1c17a4d6d243) + ] + interface IUIContext : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.IColorHelperStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.UI.IColorHelperStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass ColorHelper + { + [default] interface Windows.UI.IColorHelper; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.IColorsStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass Colors + { + [default] interface Windows.UI.IColors; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass UIContentRoot + { + [default] interface Windows.UI.IUIContentRoot; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass UIContext + { + [default] interface Windows.UI.IUIContext; + } +} -- 2.36.0

3 5

[PATCH v2] ntdll: In NtQueryInformationToken for TokenLogonSid set the proper attribute
by Fabian Maurer April 22, 2022

April 22, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52845 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Add tests, adjust groups --- dlls/advapi32/tests/security.c | 3 +++ dlls/ntdll/unix/security.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 135a45f7727..687d307903c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1898,6 +1898,9 @@ static void test_token_attr(void) /* S-1-5-5-0-XXXXXX */ ret = IsWellKnownSid(Groups->Groups[0].Sid, WinLogonIdsSid); ok(ret, "Unknown SID\n"); + + ok(Groups->Groups[0].Attributes == SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED | SE_GROUP_LOGON_ID, + "Got %x\n", Groups->Groups[0].Attributes); } } diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..dc6662640c6 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -480,7 +480,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c { groups->GroupCount = 1; groups->Groups[0].Sid = sid; - groups->Groups[0].Attributes = 0; + groups->Groups[0].Attributes = SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED | SE_GROUP_LOGON_ID; } } SERVER_END_REQ; -- 2.36.0

1 0

[PATCH] ntdll/unix/security: In NtQueryInformationToken for TokenLogonSid set the logon group attribute
by Fabian Maurer April 22, 2022

April 22, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52845 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/unix/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..2335a52d3e6 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -480,7 +480,7 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c { groups->GroupCount = 1; groups->Groups[0].Sid = sid; - groups->Groups[0].Attributes = 0; + groups->Groups[0].Attributes = SE_GROUP_LOGON_ID; } } SERVER_END_REQ; -- 2.36.0

1 0

[PATCH vkd3d 01/12] tests: Mark individual invalid shaders as todo.
by Giovanni Mascellani April 22, 2022

April 22, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 3 --- tests/hlsl-function.shader_test | 14 ++++++------- ...lsl-return-implicit-conversion.shader_test | 10 ++++----- tests/shader_runner.c | 21 ++++++++++++++++--- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index ed881ffa..52d057c9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -317,9 +317,6 @@ tests_shader_runner_SOURCES = \ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner -XFAIL_TESTS = \ - tests/hlsl-function.shader_test \ - tests/hlsl-return-implicit-conversion.shader_test endif EXTRA_DIST += $(vkd3d_shader_tests) diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index 586f1ab7..6f11e35b 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -1,4 +1,4 @@ -[pixel shader fail] +[pixel shader fail todo] float4 func(); @@ -23,7 +23,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail] +[pixel shader fail todo] void func(inout float o) { @@ -37,7 +37,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail] +[pixel shader fail todo] void func(inout float2 o) { @@ -51,7 +51,7 @@ float4 main() : sv_target return 0; } -[pixel shader fail] +[pixel shader fail todo] void func(out float o) { @@ -65,7 +65,7 @@ float4 main() : sv_target return x; } -[pixel shader fail] +[pixel shader fail todo] void func(inout float o) { @@ -78,7 +78,7 @@ float4 main() : sv_target return x; } -[pixel shader fail] +[pixel shader fail todo] void func() { @@ -89,7 +89,7 @@ float4 main() : sv_target return func(); } -[pixel shader fail] +[pixel shader fail todo] void foo() { diff --git a/tests/hlsl-return-implicit-conversion.shader_test b/tests/hlsl-return-implicit-conversion.shader_test index 4c07cf84..38d21633 100644 --- a/tests/hlsl-return-implicit-conversion.shader_test +++ b/tests/hlsl-return-implicit-conversion.shader_test @@ -98,7 +98,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail] +[pixel shader fail todo] float3x1 func() { return float1x3(0.4, 0.3, 0.2); @@ -109,7 +109,7 @@ float4 main() : sv_target return float4(func(), 0.0); } -[pixel shader fail] +[pixel shader fail todo] float1x3 func() { return float3x1(0.4, 0.3, 0.2); @@ -165,7 +165,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail] +[pixel shader fail todo] float3x1 func() { return float4(0.4, 0.3, 0.2, 0.1); @@ -191,7 +191,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail] +[pixel shader fail todo] float3x1 func() { return float1x4(0.4, 0.3, 0.2, 0.1); @@ -217,7 +217,7 @@ float4 main() : sv_target todo draw quad probe all rgba (0.4, 0.3, 0.2, 0.0) -[pixel shader fail] +[pixel shader fail todo] float1x3 func() { return float4x1(0.4, 0.3, 0.2, 0.1); diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 8633ee9a..8804164e 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -80,6 +80,7 @@ enum parse_state STATE_REQUIRE, STATE_SAMPLER, STATE_SHADER_INVALID_PIXEL, + STATE_SHADER_INVALID_PIXEL_TODO, STATE_SHADER_PIXEL, STATE_SHADER_VERTEX, STATE_TEXTURE, @@ -642,15 +643,24 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const break; case STATE_SHADER_INVALID_PIXEL: + case STATE_SHADER_INVALID_PIXEL_TODO: { ID3D10Blob *blob = NULL, *errors = NULL; HRESULT hr; hr = D3DCompile(shader_source, strlen(shader_source), NULL, NULL, NULL, "main", "ps_4_0", 0, 0, &blob, &errors); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - ok(!blob, "Expected no compiled shader blob.\n"); - ok(!!errors, "Expected non-NULL error blob.\n"); + todo_if (state == STATE_SHADER_INVALID_PIXEL_TODO) + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + ID3D10Blob_Release(blob); + } + else + { + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + } if (errors) { if (vkd3d_test_state.debug_level) @@ -735,6 +745,10 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const { state = STATE_SHADER_INVALID_PIXEL; } + else if (!strcmp(line, "[pixel shader fail todo]\n")) + { + state = STATE_SHADER_INVALID_PIXEL_TODO; + } else if (sscanf(line, "[sampler %u]\n", &index)) { state = STATE_SAMPLER; @@ -817,6 +831,7 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const case STATE_PREPROC: case STATE_PREPROC_INVALID: case STATE_SHADER_INVALID_PIXEL: + case STATE_SHADER_INVALID_PIXEL_TODO: case STATE_SHADER_PIXEL: case STATE_SHADER_VERTEX: { -- 2.35.2

7 83

[PATCH] winex11.drv: Treat invalid icon as no icon in fetch_icon_data().
by Paul Gofman April 22, 2022

April 22, 2022

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Fixes Warhammer: End Times launcher lockup on start (semi-random). The launcher creates layered window and shows it in the main thread (while it however not yet shown as neither UpdateLayeredWindow nor SetLayeredWindowAttributes is called). Also, the main thread passes some probably not initilized icon to WM_SETICON after it fails to load the icon from application exe (which seems to be absent there). Sometimes this value is 0 (and in that case there is no issues) but sometimes it is some semi-random value which is not a valid icon handle. Then, another thread is doing UpdateLayeredWindow() while the main thread is waiting on event to be set by the UpdateLayeredWindow thread after. In the course of that, X11DRV_WindowPosChanged() calls fetch_icon_data() which deadlocks in SendMessage(WM_GETICON) as the main thread which is supposed to process window message through the queue is waiting for an event and does not process messages. It actually already tried to fetch the icon during showing the window from the main thread, but if the obtained window handle is invalid the pixmap data is NULL and the current logic in winex11.drv will be retrying fetching the icon handle with WM_GETICON each time it gets to X11DRV_WindowPosChanged(). I have made a separate program which reproduces the case in a short example: https://gist.github.com/gofman/befcc1dc8b73d751fac32783f626ea1b This case doesn't deadlock on windows but currently deadlock under Wine. Also, I noticed that (when that is a normal, not a layered window) Wine expectedly won't show the default icon for the window if invalid handle was provided while Windows seems to show it. https://gist.github.com/gofman/befcc1dc8b73d751fac32783f626ea1b dlls/winex11.drv/window.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 48500284b68..4cf771a998f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -598,6 +598,11 @@ failed: } +static HICON get_icon_info( HICON icon, ICONINFO *ii ) +{ + return icon && NtUserGetIconInfo( icon, ii, NULL, NULL, NULL, 0 ) ? icon : NULL; +} + /*********************************************************************** * fetch_icon_data */ @@ -612,21 +617,24 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_big) { - icon_big = (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ); - if (!icon_big) icon_big = (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ); - if (!icon_big) icon_big = LoadIconW( 0, (LPWSTR)IDI_WINLOGO ); + icon_big = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ), &ii ); + if (!icon_big) + icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); + if (!icon_big) + icon_big = get_icon_info( LoadIconW( 0, (LPWSTR)IDI_WINLOGO ), &ii); } if (!icon_small) { - icon_small = (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ); - if (!icon_small) icon_small = (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICONSM ); + icon_small = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ), &ii_small ); + if (!icon_small) + icon_small = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICONSM ), &ii_small ); } - if (!NtUserGetIconInfo( icon_big, &ii, NULL, NULL, NULL, 0 )) return; + if (!icon_big) return; hDC = NtGdiCreateCompatibleDC(0); bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); - if (bits && NtUserGetIconInfo( icon_small, &ii_small, NULL, NULL, NULL, 0 )) + if (bits && icon_small) { unsigned int size_small; unsigned long *bits_small, *new; -- 2.35.1

1 0

[PATCH v2 1/6] windows.media.speech/tests: Remove some tests.
by Bernhard Kölbl April 22, 2022

April 22, 2022

The tests were mostly broken, racing or inconsistent. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Remove the tests in one patch and also remove the refcount check. --- dlls/windows.media.speech/tests/speech.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 3021686b228..4f1f92ded5f 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -966,7 +966,6 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine check_refcount(&compilation_handler.IAsyncHandler_Compilation_iface, 1); todo_wine ok(!WaitForSingleObject(compilation_handler.event_finished, 1000), "Wait for event_finished failed.\n"); CloseHandle(compilation_handler.event_finished); @@ -974,10 +973,8 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, NULL); todo_wine ok(hr == E_ILLEGAL_DELEGATE_ASSIGNMENT, "Got unexpected hr %#lx.\n", hr); - handler = (void*)0xdeadbeef; hr = IAsyncOperation_SpeechRecognitionCompilationResult_get_Completed(operation, &handler); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(handler == NULL, "Handler had value %p.\n", handler); hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -996,14 +993,6 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - /* Check if AsyncInfo and AsyncOperation share the same refcount. */ - IAsyncOperation_SpeechRecognitionCompilationResult_AddRef(operation); - todo_wine check_refcount(operation, 3); - todo_wine check_refcount(info, 3); - - IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); - todo_wine check_refcount(info, 2); - id = 0xdeadbeef; hr = IAsyncInfo_get_Id(info, &id); todo_wine ok(hr == S_OK, "IAsyncInfo_get_Id failed, hr %#lx.\n", hr); @@ -1058,16 +1047,10 @@ static void test_SpeechRecognizer(void) hr = IAsyncOperation_SpeechRecognitionCompilationResult_QueryInterface(operation, &IID_IAsyncInfo, (void **)&info); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - /* This one can fail, if the async operation had already finished */ - compilation_result = (void*)0xdeadbeef; - hr = IAsyncOperation_SpeechRecognitionCompilationResult_GetResults(operation, &compilation_result); - todo_wine ok(hr == E_ILLEGAL_METHOD_CALL, "Got unexpected hr %#lx.\n", hr); - todo_wine ok(compilation_result == (void*)0xdeadbeef, "Compilation result had value %p.\n", compilation_result); - async_status = 0xdeadbeef; hr = IAsyncInfo_get_Status(info, &async_status); todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); - todo_wine ok(async_status == Started || async_status == Completed, "Status was %#x.\n", async_status); + todo_wine ok(async_status != AsyncStatus_Closed, "Status was %#x.\n", async_status); hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler2.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); -- 2.35.1

2 13

[PATCH 7/7] winex11: Directly use ntdll in X11DRV_GetICMProfile.
by Jacek Caban April 22, 2022

April 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)

2 1

[PATCH 6/7] winex11: Use a simple sdbm hash implementation in X11DRV_GetICMProfile.
by Jacek Caban April 22, 2022

April 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/graphics.c | 39 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 20 deletions(-)

2 1

[PATCH 5/7] win32u: Move EnumClipboardFormats implementation from user32.
by Jacek Caban April 22, 2022

April 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 16 +--------------- dlls/win32u/clipboard.c | 20 ++++++++++++++++++++ dlls/win32u/sysparams.c | 3 +++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 6 ++++++ 5 files changed, 31 insertions(+), 15 deletions(-)

2 1

[PATCH 4/7] win32u: Move NtUserChangeClipboardChain implementation from user32.
by Jacek Caban April 22, 2022

April 22, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 27 --------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/clipboard.c | 26 ++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ include/ntuser.h | 1 + 8 files changed, 37 insertions(+), 29 deletions(-)

2 1