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

[PATCH 10/11] win32u: Move IsWindowVisible implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 15 +-------------- dlls/win32u/window.c | 21 +++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-)

1 0

[PATCH 09/11] win32u: Move IsChild implementation from win32u.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 1 - dlls/user32/win.c | 19 +------------------ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/palette.c | 2 +- dlls/win32u/window.c | 25 +++++++++++++++++++++++++ include/ntuser.h | 1 + 6 files changed, 29 insertions(+), 21 deletions(-)

1 0

[PATCH 07/11] win32u: Move NtUserGetAncestor implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

1 0

[PATCH 06/11] win32u: Move GetParent implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 34 +---------------------------- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 42 +++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 4 files changed, 44 insertions(+), 34 deletions(-)

1 0

[PATCH 03/11] win32u: Move GetWindowTextLength implementation from user32.
by Jacek Caban 08 Mar '22

08 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 29 ++--------------------------- dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 27 deletions(-)

1 0

[PATCH 02/11] user32: Use NtUserInternalGetWindowText in GetWindowText.
by Jacek Caban 08 Mar '22

08 Mar '22

Instead of get_server_window_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH v2 1/3] ntdll: Add NtAccessCheckByTypeAndAuditAlarm stub.
by Mohamad Al-Jaf 08 Mar '22

08 Mar '22

Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Add entry to ntdll/unix/loader, ntdll/ntdll.spec, and loader.c - Add entry to ntoskrnl.exe/ntoskrnl.exe.spec - Add function to wow64/security --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/security.c | 18 +++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + dlls/wow64/security.c | 34 +++++++++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + include/winnt.h | 7 ++++++ include/winternl.h | 1 + 8 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d514bca5e11..7c76f1d1d42 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -131,7 +131,7 @@ @ stdcall -syscall NtAccessCheck(ptr long long ptr ptr ptr ptr ptr) @ stdcall -syscall NtAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByType -# @ stub NtAccessCheckByTypeAndAuditAlarm +@ stdcall -syscall NtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) # @ stub NtAccessCheckByTypeResultList # @ stub NtAccessCheckByTypeResultListAndAuditAlarm # @ stub NtAccessCheckByTypeResultListAndAuditAlarmByHandle @@ -1155,7 +1155,7 @@ @ stdcall -private -syscall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall -private -syscall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm # @ stub ZwAccessCheckByType -# @ stub ZwAccessCheckByTypeAndAuditAlarm +@ stdcall -private -syscall ZwNtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm # @ stub ZwAccessCheckByTypeResultList # @ stub ZwAccessCheckByTypeResultListAndAuditAlarm # @ stub ZwAccessCheckByTypeResultListAndAuditAlarmByHandle diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eb201bd90b..4a0c70d5a2c 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -124,6 +124,7 @@ static void * const syscalls[] = NtAcceptConnectPort, NtAccessCheck, NtAccessCheckAndAuditAlarm, + NtAccessCheckByTypeAndAuditAlarm, NtAddAtom, NtAdjustGroupsToken, NtAdjustPrivilegesToken, diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 2955355353e..728ee961aa2 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -796,6 +796,24 @@ NTSTATUS WINAPI NtAccessCheckAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE ha } +/*********************************************************************** + * NtAccessCheckByTypeAndAuditAlarm (NTDLL.@) + */ +NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm( UNICODE_STRING *subsystem, HANDLE handle, + UNICODE_STRING *type_name, UNICODE_STRING *name, + PSECURITY_DESCRIPTOR descr, PSID sid, ACCESS_MASK access, + AUDIT_EVENT_TYPE type, ULONG flags, POBJECT_TYPE_LIST list, + ULONG length, GENERIC_MAPPING *mapping, BOOLEAN creation, + ACCESS_MASK *access_granted, NTSTATUS *access_status, + BOOLEAN *on_close ) +{ + FIXME( "(%s, %p, %s, %s, %p, %p, 0x%08x, %u, 0x%08x, %p, %u, %p, %d, %p, %p, %p), stub\n", + debugstr_us(subsystem), handle, debugstr_us(type_name), debugstr_us(name), descr, sid, + access, type, flags, list, length, mapping, creation, access_granted, access_status, on_close ); + return STATUS_NOT_IMPLEMENTED; +} + + /*********************************************************************** * NtQuerySecurityObject (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d445c5a5557..ff7135928cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1383,6 +1383,7 @@ @ stub WmiUpdateTrace @ stub XIPDispatch @ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm +@ stdcall -private ZwNtAccessCheckByTypeAndAuditAlarm(ptr long ptr ptr ptr ptr long long long ptr long ptr long ptr ptr ptr) NtAccessCheckByTypeAndAuditAlarm @ stub ZwAddBootEntry @ stdcall -private ZwAdjustPrivilegesToken(long long ptr long ptr ptr) NtAdjustPrivilegesToken @ stdcall -private ZwAlertThread(long) NtAlertThread diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 680f5a6ec56..ce9767c5d07 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -98,6 +98,40 @@ NTSTATUS WINAPI wow64_NtAccessCheckAndAuditAlarm( UINT *args ) } +/********************************************************************** + * wow64_NtAccessCheckByTypeAndAuditAlarm + */ +NTSTATUS WINAPI wow64_NtAccessCheckByTypeAndAuditAlarm( UINT *args ) +{ + UNICODE_STRING32 *subsystem32 = get_ptr( &args ); + HANDLE handle = get_handle( &args ); + UNICODE_STRING32 *typename32 = get_ptr( &args ); + UNICODE_STRING32 *objname32 = get_ptr( &args ); + SECURITY_DESCRIPTOR *sd32 = get_ptr( &args ); + SID *sid = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + AUDIT_EVENT_TYPE type = get_ulong( &args ); + ULONG flags = get_ulong( &args ); + OBJECT_TYPE_LIST *list = get_ptr( &args ); + ULONG length = get_ulong( &args ); + GENERIC_MAPPING *mapping = get_ptr( &args ); + BOOLEAN creation = get_ulong( &args ); + ACCESS_MASK *access_granted = get_ptr( &args ); + BOOLEAN *access_status = get_ptr( &args ); + BOOLEAN *onclose = get_ptr( &args ); + + UNICODE_STRING subsystem, typename, objname; + SECURITY_DESCRIPTOR sd; + + return NtAccessCheckByTypeAndAuditAlarm( unicode_str_32to64( &subsystem, subsystem32 ), handle, + unicode_str_32to64( &typename, typename32 ), + unicode_str_32to64( &objname, objname32 ), + secdesc_32to64( &sd, sd32 ), access, type, flags, list, + length, mapping, creation, + access_granted, access_status, onclose ); +} + + /********************************************************************** * wow64_NtAdjustGroupsToken */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 0c2ba574031..17ebde65826 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -25,6 +25,7 @@ SYSCALL_ENTRY( NtAcceptConnectPort ) \ SYSCALL_ENTRY( NtAccessCheck ) \ SYSCALL_ENTRY( NtAccessCheckAndAuditAlarm ) \ + SYSCALL_ENTRY( NtAccessCheckByTypeAndAuditAlarm ) \ SYSCALL_ENTRY( NtAddAtom ) \ SYSCALL_ENTRY( NtAdjustGroupsToken ) \ SYSCALL_ENTRY( NtAdjustPrivilegesToken ) \ diff --git a/include/winnt.h b/include/winnt.h index 079858d2f7d..939c2f8d7dd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3633,6 +3633,13 @@ typedef PVOID PACCESS_TOKEN; typedef PVOID PSECURITY_DESCRIPTOR; typedef PVOID PSID; +typedef enum _AUDIT_EVENT_TYPE { + AuditEventObjectAccess, + AuditEventDirectoryServiceAccess +} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; + +#define AUDIT_ALLOW_NO_PRIVILEGE 0x1 + typedef enum _TOKEN_ELEVATION_TYPE { TokenElevationTypeDefault = 1, TokenElevationTypeFull, diff --git a/include/winternl.h b/include/winternl.h index 6a95c4e0fdc..8e236f9d97d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3912,6 +3912,7 @@ NTSYSAPI NTSTATUS WINAPI LdrUnregisterDllNotification(void*); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); +NTSYSAPI NTSTATUS WINAPI NtAccessCheckByTypeAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,PSID,ACCESS_MASK,AUDIT_EVENT_TYPE,ULONG,POBJECT_TYPE_LIST,ULONG,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,NTSTATUS*,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtAddAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtAdjustGroupsToken(HANDLE,BOOLEAN,PTOKEN_GROUPS,ULONG,PTOKEN_GROUPS,PULONG); NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); -- 2.35.1

2 6

[PATCH vkd3d v2 1/5] tests: Split hlsl-operations into individual test units.
by Zebediah Figura 08 Mar '22

08 Mar '22

Partly to make the tests easier to navigate, and partly to allow marking some tests as SM4+. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 12 +- tests/arithmetic-float.shader_test | 25 ++ tests/arithmetic-int.shader_test | 25 ++ tests/arithmetic-uint.shader_test | 25 ++ tests/bitwise.shader_test | 129 ++++++++++ tests/hlsl-operations.shader_test | 367 ----------------------------- tests/logic-operations.shader_test | 158 +++++++++++++ 7 files changed, 372 insertions(+), 369 deletions(-) create mode 100644 tests/arithmetic-float.shader_test create mode 100644 tests/arithmetic-int.shader_test create mode 100644 tests/arithmetic-uint.shader_test create mode 100644 tests/bitwise.shader_test delete mode 100644 tests/hlsl-operations.shader_test create mode 100644 tests/logic-operations.shader_test diff --git a/Makefile.am b/Makefile.am index d4402910c..79aacfcd6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,10 @@ vkd3d_cross_tests = \ vkd3d_shader_tests = \ tests/abs.shader_test \ + tests/arithmetic-float.shader_test \ + tests/arithmetic-int.shader_test \ + tests/arithmetic-uint.shader_test \ + tests/bitwise.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -85,7 +89,6 @@ vkd3d_shader_tests = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ - tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ @@ -97,6 +100,7 @@ vkd3d_shader_tests = \ tests/hlsl-struct-semantics.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ + tests/logic-operations.shader_test \ tests/math.shader_test \ tests/pow.shader_test \ tests/preproc-if.shader_test \ @@ -309,6 +313,10 @@ 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/arithmetic-float.shader_test \ + tests/arithmetic-int.shader_test \ + tests/arithmetic-uint.shader_test \ + tests/bitwise.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -334,7 +342,6 @@ XFAIL_TESTS = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ - tests/hlsl-operations.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ @@ -342,6 +349,7 @@ XFAIL_TESTS = \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ + tests/logic-operations.shader_test \ tests/max.shader_test \ tests/sampler-offset.shader_test \ tests/trigonometry.shader_test diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test new file mode 100644 index 000000000..dcda1bcf8 --- /dev/null +++ b/tests/arithmetic-float.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.33333333) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test new file mode 100644 index 000000000..959f94033 --- /dev/null +++ b/tests/arithmetic-int.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, -10.0, 75.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0) diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test new file mode 100644 index 000000000..d73947f9f --- /dev/null +++ b/tests/arithmetic-uint.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x + y, x - y, x * y, x / y); +} + +[test] +draw quad +probe all rgba (20.0, 4294967296.0, 75.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x % y, +x, -x, y / x); +} + +[test] +draw quad +probe all rgba (5.0, 5.0, 4294967296.0, 3.0) diff --git a/tests/bitwise.shader_test b/tests/bitwise.shader_test new file mode 100644 index 000000000..679cf9cd9 --- /dev/null +++ b/tests/bitwise.shader_test @@ -0,0 +1,129 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x >> y, y >> x, x << y, y << x); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 163840.0, 480.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x & y, x | y, x ^ y, ~x); +} + +[test] +draw quad +probe all rgba (5.0, 15.0, 10.0, -6.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero & zero, zero & one, one & zero, one & one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero | zero, zero | one, one | zero, one | one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x >> y, y >> x, x << y, y << x); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 163840.0, 480.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x & y, x | y, x ^ y, ~x); +} + +[test] +draw quad +probe all rgba (5.0, 15.0, 10.0, 4294967296.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero & zero, zero & one, one & zero, one & one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero | zero, zero | one, one | zero, one | one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 0.0) diff --git a/tests/hlsl-operations.shader_test b/tests/hlsl-operations.shader_test deleted file mode 100644 index 09846b18f..000000000 --- a/tests/hlsl-operations.shader_test +++ /dev/null @@ -1,367 +0,0 @@ - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - - return float4(x + y, x - y, x * y, x / y); -} - -[test] -draw quad -probe all rgba (20.0, -10.0, 75.0, 0.33333333) - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - - return float4(x % y, +x, -x, y / x); -} - -[test] -draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - - return float4(x == y, x != y, x < y, x <= y); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float x = 5.0; - float y = 15.0; - float zero = 0.0; - - return float4(x > y, x >= y, !x, !zero); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float zero = 0.0; - float one = 1.0; - - return float4(zero && zero, zero && one, one && zero, one && one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - float zero = 0.0; - float one = 1.0; - - return float4(zero || zero, zero || one, one || zero, one || one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x + y, x - y, x * y, x / y); -} - -[test] -draw quad -probe all rgba (20.0, -10.0, 75.0, 0.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x % y, +x, -x, y / x); -} - -[test] -draw quad -probe all rgba (5.0, 5.0, -5.0, 3.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x == y, x != y, x < y, x <= y); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - int zero = 0; - - return float4(x > y, x >= y, !x, !zero); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x >> y, y >> x, x << y, y << x); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 163840.0, 480.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int x = 5; - int y = 15; - - return float4(x & y, x | y, x ^ y, ~x); -} - -[test] -draw quad -probe all rgba (5.0, 15.0, 10.0, -6.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero && zero, zero && one, one && zero, one && one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero || zero, zero || one, one || zero, one || one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero & zero, zero & one, one & zero, one & one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero | zero, zero | one, one | zero, one | one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - int zero = 0; - int one = 1; - - return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x + y, x - y, x * y, x / y); -} - -[test] -draw quad -probe all rgba (20.0, 4294967296.0, 75.0, 0.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x % y, +x, -x, y / x); -} - -[test] -draw quad -probe all rgba (5.0, 5.0, 4294967296.0, 3.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x == y, x != y, x < y, x <= y); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - uint zero = 0; - - return float4(x > y, x >= y, !x, !zero); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x >> y, y >> x, x << y, y << x); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 163840.0, 480.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint x = 5; - uint y = 15; - - return float4(x & y, x | y, x ^ y, ~x); -} - -[test] -draw quad -probe all rgba (5.0, 15.0, 10.0, 4294967296.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero && zero, zero && one, one && zero, one && one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero || zero, zero || one, one || zero, one || one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero & zero, zero & one, one & zero, one & one); -} - -[test] -draw quad -probe all rgba (0.0, 0.0, 0.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero | zero, zero | one, one | zero, one | one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 1.0) - -[pixel shader] -float4 main() : SV_TARGET -{ - uint zero = 0; - uint one = 1; - - return float4(zero ^ zero, zero ^ one, one ^ zero, one ^ one); -} - -[test] -draw quad -probe all rgba (0.0, 1.0, 1.0, 0.0) diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test new file mode 100644 index 000000000..360ca03b3 --- /dev/null +++ b/tests/logic-operations.shader_test @@ -0,0 +1,158 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 5.0; + float y = 15.0; + float zero = 0.0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float zero = 0.0; + float one = 1.0; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + float zero = 0.0; + float one = 1.0; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 5; + int y = 15; + int zero = 0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int zero = 0; + int one = 1; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + + return float4(x == y, x != y, x < y, x <= y); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 5; + uint y = 15; + uint zero = 0; + + return float4(x > y, x >= y, !x, !zero); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero && zero, zero && one, one && zero, one && one); +} + +[test] +draw quad +probe all rgba (0.0, 0.0, 0.0, 1.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + uint zero = 0; + uint one = 1; + + return float4(zero || zero, zero || one, one || zero, one || one); +} + +[test] +draw quad +probe all rgba (0.0, 1.0, 1.0, 1.0) -- 2.35.1

2 9

[PATCH 1/2] d3dcompiler: Implement d3dcompiler_shader_reflection_GetThreadGroupSize().
by Paul Gofman 08 Mar '22

08 Mar '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/d3dcompiler_43/reflection.c | 87 ++++++++++++++++++++++++-- dlls/d3dcompiler_43/tests/reflection.c | 57 +++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 91cc20cdded..1080b4dc6c8 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -50,6 +50,8 @@ enum D3DCOMPILER_SIGNATURE_ELEMENT_SIZE #define D3DCOMPILER_SHADER_TARGET_VERSION_MASK 0xffff #define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK 0xffff0000 +#define D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT 16 +#define D3DCOMPILER_SHADER_TYPE_CS 0x5 struct d3dcompiler_shader_signature { @@ -158,6 +160,9 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_partitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; + UINT thread_group_size_x; + UINT thread_group_size_y; + UINT thread_group_size_z; struct d3dcompiler_shader_signature *isgn; struct d3dcompiler_shader_signature *osgn; @@ -707,9 +712,21 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMinFeatureLeve static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetThreadGroupSize( ID3D11ShaderReflection *iface, UINT *sizex, UINT *sizey, UINT *sizez) { - FIXME("iface %p, sizex %p, sizey %p, sizez %p stub!\n", iface, sizex, sizey, sizez); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); - return 0; + TRACE("iface %p, sizex %p, sizey %p, sizez %p.\n", iface, sizex, sizey, sizez); + + if (!sizex || !sizey || !sizez) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + *sizex = reflection->thread_group_size_x; + *sizey = reflection->thread_group_size_y; + *sizez = reflection->thread_group_size_z; + + return *sizex * *sizey * *sizez; } static UINT64 STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetRequiresFlags( @@ -1754,15 +1771,78 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * return S_OK; } +#define SM4_OPCODE_MASK 0xff +#define SM4_INSTRUCTION_LENGTH_SHIFT 24 +#define SM4_INSTRUCTION_LENGTH_MASK (0x1fu << SM4_INSTRUCTION_LENGTH_SHIFT) + +enum sm4_opcode +{ + SM5_OP_DCL_THREAD_GROUP = 0x9b, +}; + static HRESULT d3dcompiler_parse_shdr(struct d3dcompiler_shader_reflection *r, const char *data, size_t data_size) { + DWORD opcode_token, opcode; + uint32_t size, shader_type; const char *ptr = data; + const uint32_t *u_ptr; + unsigned int len; r->version = read_u32(&ptr); TRACE("Shader version: %u\n", r->version); - /* todo: Check if anything else is needed from the shdr or shex blob. */ + shader_type = (r->version & D3DCOMPILER_SHADER_TARGET_SHADERTYPE_MASK) + >> D3DCOMPILER_SHADER_TARGET_SHADERTYPE_SHIFT; + + if (shader_type != D3DCOMPILER_SHADER_TYPE_CS) + { + /* todo: Check if anything else is needed from the shdr or shex blob. */ + return S_OK; + } + size = read_u32(&ptr); + TRACE("size %u.\n", size); + if (size * sizeof(DWORD) != data_size || size < 2) + { + WARN("Invalid size %u.\n", size); + return E_FAIL; + } + size -= 2; + u_ptr = (uint32_t *)ptr; + while (size) + { + opcode_token = *u_ptr; + opcode = opcode_token & SM4_OPCODE_MASK; + len = ((opcode_token & SM4_INSTRUCTION_LENGTH_MASK) >> SM4_INSTRUCTION_LENGTH_SHIFT); + if (!len) + { + if (size < 2) + { + WARN("End of byte-code, failed to read length token.\n"); + return E_FAIL; + } + len = u_ptr[1]; + } + if (!len || size < len) + { + WARN("Read invalid length %u, remaining %u.\n", len, size); + return E_FAIL; + } + if (opcode == SM5_OP_DCL_THREAD_GROUP) + { + TRACE("Found dcl_thread_group.\n"); + if (len != 4) + { + WARN("Invalid dcl_thread_group opcode length %u.\n", len); + return E_FAIL; + } + r->thread_group_size_x = u_ptr[1]; + r->thread_group_size_y = u_ptr[2]; + r->thread_group_size_z = u_ptr[3]; + } + size -= len; + u_ptr += len; + } return S_OK; } @@ -1972,7 +2052,6 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void } *reflector = object; - TRACE("Created ID3D11ShaderReflection %p\n", object); return S_OK; diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f2b7f094de6..9781f91ab2b 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -777,6 +777,7 @@ static void test_reflection_desc_ps(void) D3D_NAME expected; unsigned int i; #if D3D_COMPILER_VERSION + UINT size_x, size_y, size_z, size_total; UINT ret; #endif @@ -920,6 +921,14 @@ static void test_reflection_desc_ps(void) ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } +#if D3D_COMPILER_VERSION + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(!size_x, "Got unexpected size %u.\n", size_x); + ok(!size_y, "Got unexpected size %u.\n", size_y); + ok(!size_z, "Got unexpected size %u.\n", size_z); + ok(!size_total, "Got unexpected size %u.\n", size_total); +#endif + count = ref11->lpVtbl->Release(ref11); ok(!count, "Got unexpected count %lu.\n", count); } @@ -1186,6 +1195,53 @@ static const D3D12_SHADER_INPUT_BIND_DESC test_reflection_bound_resources_result {"c2", D3D_SIT_CBUFFER, 1, 1, 0, 0, D3D_SRV_DIMENSION_UNKNOWN, 0, 0, 1}, }; +#if D3D_COMPILER_VERSION +static void test_reflection_cs(void) +{ +/* + * fxc.exe /T cs_5_1 /Fo + */ +#if 0 +[numthreads(16, 8, 4)] +void main( uint3 DTid : SV_DispatchThreadID ) +{ +} +#endif + static const DWORD test_blob[] = + { + 0x43425844, 0x77a220d9, 0xfebd5b9c, 0x14a86e30, 0x57537394, 0x00000001, 0x00000184, 0x00000005, + 0x00000034, 0x000000a0, 0x000000b0, 0x000000c0, 0x000000e8, 0x46454452, 0x00000064, 0x00000000, + 0x00000000, 0x00000000, 0x0000003c, 0x43530501, 0x00000500, 0x0000003c, 0x25441313, 0x0000003c, + 0x00000018, 0x00000028, 0x00000028, 0x00000024, 0x0000000c, 0x00000000, 0x7263694d, 0x666f736f, + 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x31207265, 0x00312e30, + 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, + 0x58454853, 0x00000020, 0x00050051, 0x00000008, 0x0100086a, 0x0400009b, 0x00000010, 0x00000008, + 0x00000004, 0x0100003e, 0x54415453, 0x00000094, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, + }; + UINT size_x, size_y, size_z, size_total; + ID3D11ShaderReflection *ref11; + HRESULT hr; + + hr = call_reflect(test_blob, test_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + todo_wine_if(D3D_COMPILER_VERSION < 47) + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (FAILED(hr)) + return; + size_total = ref11->lpVtbl->GetThreadGroupSize(ref11, &size_x, &size_y, &size_z); + ok(size_x == 16, "Got unexpected size %u.\n", size_x); + ok(size_y == 8, "Got unexpected size %u.\n", size_y); + ok(size_z == 4, "Got unexpected size %u.\n", size_z); + ok(size_total == size_x * size_y *size_z, "Got unexpected size %u.\n", size_total); + + ref11->lpVtbl->Release(ref11); +} +#endif + static void test_reflection_bound_resources(const DWORD *blob, const D3D12_SHADER_INPUT_BIND_DESC *result, unsigned int result_count, unsigned int target_version) { @@ -2150,6 +2206,7 @@ START_TEST(reflection) #if D3D_COMPILER_VERSION test_reflection_references(); test_reflection_interfaces(); + test_reflection_cs(); #else test_d3d10_interfaces(); #endif -- 2.35.1

1 1

[PATCH v2 3/3] ncrypt/tests: Test for symmetric keys support.
by Hans Leidekker 08 Mar '22

08 Mar '22

From: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index d1bcbbcab2a..cf434054428 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -291,6 +291,13 @@ static void test_create_persisted_key(void) NCryptFinalizeKey(key, 0); NCryptFreeObject(key); + + key = 0; + ret = NCryptCreatePersistedKey(prov, &key, BCRYPT_AES_ALGORITHM, NULL, 0, 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win 7 */, "got %#lx\n", ret); + if (ret == NTE_NOT_SUPPORTED) win_skip("broken, symmetric keys not supported.\n"); + else ok(key, "got null handle\n"); + NCryptFreeObject(prov); } } -- 2.30.2

1 0