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

Nikolay Sivov : winemsibuilder: Use CRT allocation functions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: f059013a419e89c343fc657323b280521703daf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f059013a419e89c343fc6573… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 3 19:20:56 2022 +0300 winemsibuilder: Use CRT allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winemsibuilder/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winemsibuilder/main.c b/programs/winemsibuilder/main.c index 3b1221860b3..3bbd0735505 100644 --- a/programs/winemsibuilder/main.c +++ b/programs/winemsibuilder/main.c @@ -77,7 +77,7 @@ static int import_tables( const WCHAR *msifile, WCHAR **tables ) if (r != ERROR_SUCCESS) return 1; len = GetCurrentDirectoryW( 0, NULL ); - if (!(dir = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + if (!(dir = malloc( (len + 1) * sizeof(WCHAR) ))) { MsiCloseHandle( hdb ); return 1; @@ -102,7 +102,7 @@ static int import_tables( const WCHAR *msifile, WCHAR **tables ) WINE_ERR( "failed to commit changes (%u)\n", r ); } - HeapFree( GetProcessHeap(), 0, dir ); + free( dir ); MsiCloseHandle( hdb ); return (r != ERROR_SUCCESS); } @@ -135,7 +135,7 @@ static WCHAR *encode_stream( const WCHAR *in ) return NULL; count += 2; - if (!(out = HeapAlloc( GetProcessHeap(), 0, count * sizeof(WCHAR) ))) return NULL; + if (!(out = malloc( count * sizeof(WCHAR) ))) return NULL; p = out; while (count--) { @@ -162,7 +162,7 @@ static WCHAR *encode_stream( const WCHAR *in ) } *p++ = c; } - HeapFree( GetProcessHeap(), 0, out ); + free( out ); return NULL; } @@ -236,7 +236,7 @@ static int add_stream( const WCHAR *msifile, const WCHAR *stream, const WCHAR *f ret = 0; done: - HeapFree( GetProcessHeap(), 0, encname ); + free( encname ); if (stm) IStream_Release( stm ); IStorage_Release( stg ); return ret;

1 0

Jacek Caban : win32u: Support undocumented SIF_RETURNPREV flag in set_scroll_info.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: c9c69dff7e9b9d9842a79f255c376f0baa3ad310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c69dff7e9b9d9842a79f25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 23:31:45 2022 +0200 win32u: Support undocumented SIF_RETURNPREV flag in set_scroll_info. --- dlls/user32/tests/scroll.c | 13 +++++++++++++ dlls/win32u/scroll.c | 9 ++++++--- include/ntuser.h | 3 +++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 20bb0dc111b..95782a47a6e 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -671,6 +671,19 @@ static void test_SetScrollInfo(void) ret = IsWindowEnabled(hScroll); ok(ret, "Unexpected enabled state.\n"); + EnableScrollBar(mainwnd, SB_CTL, ESB_ENABLE_BOTH); + + si.fMask = SIF_POS; + si.nPos = 3; + ret = SetScrollInfo(mainwnd, SB_HORZ, &si, FALSE); + ok(ret == 3, "SetScrollInfo returned %d\n", ret); + + /* undocumented flag making SetScrollInfo return previous position */ + si.fMask = SIF_POS | 0x1000; + si.nPos = 4; + ret = SetScrollInfo(mainwnd, SB_HORZ, &si, FALSE); + ok(ret == 3, "SetScrollInfo returned %d\n", ret); + DestroyWindow(hScroll); DestroyWindow(mainwnd); } diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index a51c7d3cf93..d48755cec7c 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -824,7 +824,7 @@ void track_scroll_bar( HWND hwnd, int scrollbar, POINT pt ) */ static inline BOOL validate_scroll_info( const SCROLLINFO *info ) { - return !(info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL) || + return !(info->fMask & ~(SIF_ALL | SIF_DISABLENOSCROLL | SIF_RETURNPREV) || (info->cbSize != sizeof(*info) && info->cbSize != sizeof(*info) - sizeof(info->nTrackPos))); } @@ -862,7 +862,7 @@ static int set_scroll_info( HWND hwnd, int bar, const SCROLLINFO *info, BOOL red { struct scroll_info *scroll; UINT new_flags; - int action = 0, ret; + int action = 0, ret = 0; /* handle invalid data structure */ if (!validate_scroll_info( info ) || @@ -878,6 +878,9 @@ static int set_scroll_info( HWND hwnd, int bar, const SCROLLINFO *info, BOOL red TRACE( "\n" ); } + /* undocumented flag, return previous position instead of modified */ + if (info->fMask & SIF_RETURNPREV) ret = scroll->curVal; + /* Set the page size */ if ((info->fMask & SIF_PAGE) && scroll->page != info->nPage) { @@ -970,7 +973,7 @@ static int set_scroll_info( HWND hwnd, int bar, const SCROLLINFO *info, BOOL red } done: - ret = scroll->curVal; + if (!(info->fMask & SIF_RETURNPREV)) ret = scroll->curVal; release_scroll_info_ptr( scroll ); if (action & SA_SSI_HIDE) show_scroll_bar( hwnd, bar, FALSE, FALSE ); diff --git a/include/ntuser.h b/include/ntuser.h index fecdbbbe253..34701d21533 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -269,6 +269,9 @@ struct send_message_callback_params /* NtUserScrollWindowEx flag */ #define SW_NODCCACHE 0x8000 +/* NtUserSetScrollInfo flag */ +#define SIF_RETURNPREV 0x1000 + /* NtUserInitializeClientPfnArrays parameter, not compatible with Windows */ struct user_client_procs {

1 0

Paul Gofman : server: Allow IOCTL_AFD_POLL for sockets without unix fd.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 07d3c823950ec0c5e9092a95fc1e74ccd00dd6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07d3c823950ec0c5e9092a95… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 29 17:28:38 2022 -0500 server: Allow IOCTL_AFD_POLL for sockets without unix fd. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 15 ++++++++++++--- server/sock.c | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index fe3c2ef2ff6..f84e7084a27 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -172,15 +172,17 @@ static void test_poll(void) GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET client, server, listener; OVERLAPPED overlapped = {0}; + HANDLE event, afd_handle; LPFN_ACCEPTEX pAcceptEx; struct sockaddr_in addr; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; WSABUF wsabuf; - HANDLE event; int ret, len; large_buffer = malloc(large_buffer_size); @@ -189,6 +191,11 @@ static void test_poll(void) event = CreateEventW(NULL, TRUE, FALSE, NULL); overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + RtlInitUnicodeString(&string, L"\\Device\\Afd\\deadbeef"); + InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); + ret = NtOpenFile(&afd_handle, SYNCHRONIZE, &attr, &io, 0, 0); + ok(!ret, "got %#x\n", ret); + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -246,7 +253,7 @@ static void test_poll(void) in_params->sockets[0].status = 0xdeadbeef; memset(out_params, 0, params_size); - ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + ret = NtDeviceIoControlFile(afd_handle, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(!ret, "got %#x\n", ret); ok(!io.Status, "got %#lx\n", io.Status); @@ -260,7 +267,7 @@ static void test_poll(void) NtQuerySystemTime(&now); in_params->timeout = now.QuadPart; - ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + ret = NtDeviceIoControlFile(afd_handle, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 100); @@ -899,6 +906,8 @@ static void test_poll(void) CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); + + CloseHandle(afd_handle); } struct poll_exclusive_thread_cb_ctx diff --git a/server/sock.c b/server/sock.c index 2f1b33a333d..caa68dd213b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2186,11 +2186,12 @@ static struct accept_req *alloc_accept_req( struct sock *sock, struct sock *acce static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct sock *sock = get_fd_user( fd ); - int unix_fd; + int unix_fd = -1; assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_WINE_CREATE && (unix_fd = get_unix_fd( fd )) < 0) return; + if (code != IOCTL_AFD_WINE_CREATE && code != IOCTL_AFD_POLL && (unix_fd = get_unix_fd( fd )) < 0) + return; switch(code) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 casts from bool.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: vkd3d Branch: master Commit: 3e88a46d4cdde708f6eddcb502889a704ba1882b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3e88a46d4cdde708f6eddcb… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:30 2022 +0200 vkd3d-shader/hlsl: Write SM4 casts from bool. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 33 ++++++++++++++++++++++++++++++--- tests/cast-to-float.shader_test | 2 +- tests/cast-to-int.shader_test | 4 ++-- tests/cast-to-uint.shader_test | 4 ++-- tests/hlsl-bool-cast.shader_test | 18 ++++++++++++++++++ tests/logic-operations.shader_test | 6 +++--- 6 files changed, 56 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 79027169..1edc5818 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1459,9 +1459,36 @@ static bool type_is_float(const struct hlsl_type *type) return type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF; } +static void write_sm4_cast_from_bool(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr, + const struct hlsl_ir_node *arg, uint32_t mask) +{ + struct sm4_instruction instr; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_AND; + + sm4_dst_from_node(&instr.dsts[0], &expr->node); + instr.dst_count = 1; + + sm4_src_from_node(&instr.srcs[0], arg, instr.dsts[0].writemask); + instr.srcs[1].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; + instr.srcs[1].reg.type = VKD3D_SM4_RT_IMMCONST; + instr.srcs[1].reg.dim = VKD3D_SM4_DIMENSION_SCALAR; + instr.srcs[1].reg.immconst_uint[0] = mask; + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) { + static const union + { + uint32_t u; + float f; + } one = { .f = 1.0 }; const struct hlsl_ir_node *arg1 = expr->operands[0].node; const struct hlsl_type *dst_type = expr->node.data_type; const struct hlsl_type *src_type = arg1->data_type; @@ -1488,7 +1515,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to float."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, one.u); break; case HLSL_TYPE_DOUBLE: @@ -1514,7 +1541,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to int."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, 1); break; case HLSL_TYPE_DOUBLE: @@ -1540,7 +1567,7 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); + write_sm4_cast_from_bool(ctx, buffer, expr, arg1, 1); break; case HLSL_TYPE_DOUBLE: diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test index 1844b1f3..f0910020 100644 --- a/tests/cast-to-float.shader_test +++ b/tests/cast-to-float.shader_test @@ -12,7 +12,7 @@ uniform 0 int -1 uniform 1 uint 3 uniform 2 int -2 uniform 3 float 0.5 -todo draw quad +draw quad probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-int.shader_test b/tests/cast-to-int.shader_test index ce42827b..4c5d0e2f 100644 --- a/tests/cast-to-int.shader_test +++ b/tests/cast-to-int.shader_test @@ -19,8 +19,8 @@ uniform 0 float 2.6 uniform 1 int -2 uniform 2 int -2 uniform 3 float -3.6 -todo draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/cast-to-uint.shader_test b/tests/cast-to-uint.shader_test index 8b7964ff..66f7267e 100644 --- a/tests/cast-to-uint.shader_test +++ b/tests/cast-to-uint.shader_test @@ -19,8 +19,8 @@ uniform 0 float 2.6 uniform 1 int 2 uniform 2 int -2 uniform 3 float -3.6 -todo draw quad -probe all rgba (0.5, 0.5, 0.5, 0.5) +draw quad +todo probe all rgba (0.5, 0.5, 0.5, 0.5) [pixel shader] diff --git a/tests/hlsl-bool-cast.shader_test b/tests/hlsl-bool-cast.shader_test index 8880b2f5..397cbcc0 100644 --- a/tests/hlsl-bool-cast.shader_test +++ b/tests/hlsl-bool-cast.shader_test @@ -12,3 +12,21 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (0.0, 0.0, 1.0, 1.0) + +[require] +shader model >= 4.0 + +[pixel shader] +uniform float4 x; +uniform int4 y; + +float4 main() : SV_TARGET +{ + return (float4)(bool4)x + 10.0 * (float4)(int4)(bool4)y; +} + +[test] +uniform 0 float4 0.0 0.0 2.0 4.0 +uniform 4 int4 0 1 0 10 +draw quad +probe all rgba (0.0, 10.0, 1.0, 11.0) diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 9a5cec3f..f888e831 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -61,7 +61,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -114,7 +114,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 logic not instructions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: vkd3d Branch: master Commit: 02d92c9af676d819f6c1a0bc59635c5fabf7a46b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=02d92c9af676d819f6c1a0b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:31 2022 +0200 vkd3d-shader/hlsl: Write SM4 logic not instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/logic-operations.shader_test | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1edc5818..08f9d12c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1648,6 +1648,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); break; + case HLSL_OP1_LOGIC_NOT: + assert(dst_type->base_type == HLSL_TYPE_BOOL); + write_sm4_unary_op(buffer, VKD3D_SM4_OP_NOT, &expr->node, arg1, 0); + break; + case HLSL_OP1_NEG: switch (dst_type->base_type) { diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index f888e831..87e927f4 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -22,7 +22,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -75,7 +75,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -128,7 +128,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 logic and instructions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: vkd3d Branch: master Commit: 15e4b9bafb74e45db2fdd2dbf8eabcb9ef949cf0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=15e4b9bafb74e45db2fdd2d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:32 2022 +0200 vkd3d-shader/hlsl: Write SM4 logic and instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/logic-operations.shader_test | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 08f9d12c..0829c5e9 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1846,6 +1846,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP2_LOGIC_AND: + assert(dst_type->base_type == HLSL_TYPE_BOOL); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); + break; + case HLSL_OP2_LSHIFT: assert(type_is_integer(dst_type)); assert(dst_type->base_type != HLSL_TYPE_BOOL); diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 87e927f4..032b5b23 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -35,7 +35,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -88,7 +88,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader] @@ -141,7 +141,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 0.0, 0.0, 1.0) [pixel shader]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 logic or instructions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: vkd3d Branch: master Commit: 448f856c0982b00a4c49a87ca952f9f4427f2c43 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=448f856c0982b00a4c49a87… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:33 2022 +0200 vkd3d-shader/hlsl: Write SM4 logic or instructions. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/logic-operations.shader_test | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 0829c5e9..d2857e6a 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1851,6 +1851,11 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); break; + case HLSL_OP2_LOGIC_OR: + assert(dst_type->base_type == HLSL_TYPE_BOOL); + write_sm4_binary_op(buffer, VKD3D_SM4_OP_OR, &expr->node, arg1, arg2); + break; + case HLSL_OP2_LSHIFT: assert(type_is_integer(dst_type)); assert(dst_type->base_type != HLSL_TYPE_BOOL); diff --git a/tests/logic-operations.shader_test b/tests/logic-operations.shader_test index 032b5b23..360ca03b 100644 --- a/tests/logic-operations.shader_test +++ b/tests/logic-operations.shader_test @@ -48,7 +48,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -101,7 +101,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0) [pixel shader] @@ -154,5 +154,5 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (0.0, 1.0, 1.0, 1.0)

1 0

Giovanni Mascellani : tests: Test arithmetic int operations without constant operands.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: vkd3d Branch: master Commit: 2ec6d4d3ffe453fc20bf05d2049a7ea28c767323 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2ec6d4d3ffe453fc20bf05d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jul 1 11:23:34 2022 +0200 tests: Test arithmetic int operations without constant operands. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + tests/arithmetic-int-uniform.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0cb90b2b..60db7794 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_tests = \ tests/abs.shader_test \ tests/arithmetic-float.shader_test \ tests/arithmetic-int.shader_test \ + tests/arithmetic-int-uniform.shader_test \ tests/arithmetic-uint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ diff --git a/tests/arithmetic-int-uniform.shader_test b/tests/arithmetic-int-uniform.shader_test new file mode 100644 index 00000000..ff80a9b0 --- /dev/null +++ b/tests/arithmetic-int-uniform.shader_test @@ -0,0 +1,29 @@ +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x + y, x - y, x * y, x / y); +} + +[test] +uniform 0 float4 5.0 16.0 0.0 0.0 +todo draw quad +probe all rgba (21.0, -11.0, 80.0, 0.0) + +[pixel shader] +uniform float2 a; + +float4 main() : SV_TARGET +{ + int x = a.x; + int y = a.y; + return float4(x % y, +x, -x, y / x); +} + +[test] +uniform 0 float4 5.0 16.0 0.0 0.0 +todo draw quad +probe all rgba (5.0, 5.0, -5.0, 3.0)

1 0

Francois Gouget : testbot/UpdateFailures: Tweak the save error message.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: tools Branch: master Commit: bbb85bacf5aa11cb60c602c1fa9a3787dc22a363 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bbb85bacf5aa11cb60c602c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:26 2022 +0200 testbot/UpdateFailures: Tweak the save error message. The error message already contains the name of the invalid field(s). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateFailures.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/UpdateFailures.pl b/testbot/bin/UpdateFailures.pl index f324cca2..b1c8e071 100755 --- a/testbot/bin/UpdateFailures.pl +++ b/testbot/bin/UpdateFailures.pl @@ -193,10 +193,10 @@ foreach my $FailureId (@FailureIds) } } -my ($ErrKey, $ErrProperty, $ErrMessage) = $Failures->Save(); +my ($ErrKey, $_ErrProperty, $ErrMessage) = $Failures->Save(); if ($ErrMessage) { - Error("Could not save $ErrKey because of the $ErrProperty field: $ErrMessage\n"); + Error("Could not save failure $ErrKey: $ErrMessage\n"); exit 1; }

1 0

Francois Gouget : testbot: Tweak the Failure::Validate() error message.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: tools Branch: master Commit: 77c64eb821f81b4b3db8693096ce52dbf92b5d9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=77c64eb821f81b4b3db8693… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 5 17:51:23 2022 +0200 testbot: Tweak the Failure::Validate() error message. The error message should indicate why the regular expression is invalid. Also use the field's actual display name instead of making one up. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Failures.pm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Failures.pm b/testbot/lib/WineTestBot/Failures.pm index 6190ef25..8d41bfcc 100644 --- a/testbot/lib/WineTestBot/Failures.pm +++ b/testbot/lib/WineTestBot/Failures.pm @@ -98,20 +98,21 @@ sub Validate($) { return ("TestUnit", "The test unit '". $self->TestUnit ."' contains invalid characters"); } - foreach my $Pair (["ConfigRegExp", "configuration"], - ["FailureRegExp", "failure"]) + foreach my $Field ("ConfigRegExp", "FailureRegExp") { - my ($Field, $Name) = @$Pair; my $RegExp = $self->$Field; my $ErrMessage = eval { use warnings FATAL => qw(regexp); if ($RegExp and "" =~ /$RegExp/) { - return "The $Name regular expression should not match empty strings"; + return "The regular expression should not match empty strings"; } - }; - $ErrMessage = "The $Name regular expression is invalid" if ($@); - return ($Field, $ErrMessage) if ($ErrMessage); + } || "$@"; + if ($ErrMessage) + { + my $DisplayName = $self->GetPropertyDescriptorByName($Field)->GetDisplayName(); + return ($Field, "$DisplayName: $ErrMessage"); + } } return $self->SUPER::Validate(); }

1 0