- Wine-Devel - list.winehq.org

[PATCH] dinput8/tests: Don't test value again if it wasn't touched.
by Rémi Bernon Dec. 18, 2021

Dec. 18, 2021

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 222335 Thanks, I fixed up the commit title. dlls/dinput8/tests/hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 35d72409af5..82657c2e235 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1730,7 +1730,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, 0, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status ); - ok( value == 0, "got value %x, expected %#x\n", value, 0 ); value = HidP_MaxUsageListLength( HidP_Feature + 1, 0, preparsed_data ); ok( value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0 ); -- 2.34.0

1 0

[PATCH] kernelbase: don't hardcode magic constants
by Eric Pouech Dec. 18, 2021

Dec. 18, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 0e4a3eb9b6b..12187b92e5c 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -33,6 +33,7 @@ #include "kernelbase.h" #include "wine/debug.h" +#include "wine/condrv.h" WINE_DEFAULT_DEBUG_CHANNEL(process); @@ -189,7 +190,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename RtlFreeUnicodeString( &newdirW ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; - if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = (HANDLE)1; /* KERNEL32_CONSOLE_ALLOC */ + if (flags & CREATE_NEW_CONSOLE) params->ConsoleHandle = CONSOLE_HANDLE_ALLOC; else if (!(flags & DETACHED_PROCESS)) params->ConsoleHandle = NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle; if (startup->dwFlags & STARTF_USESTDHANDLES)

1 0

Wine staging 7.0-rc2 release
by Alistair Leslie-Hughes Dec. 18, 2021

Dec. 18, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Notes: dwarf4 debug information is now the default for wine-staging. Summary since last release * Rebased to current wine 7.0-rc2 (552 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] dinput8/tests: Don'te test value again if it wasn't touched
by Michael Stefaniuc Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput8/tests/hid.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 35d72409af5..82657c2e235 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -1730,7 +1730,6 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle status = HidP_SetScaledUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, 0, preparsed_data, report, caps.InputReportByteLength ); ok( status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status ); - ok( value == 0, "got value %x, expected %#x\n", value, 0 ); value = HidP_MaxUsageListLength( HidP_Feature + 1, 0, preparsed_data ); ok( value == 0, "HidP_MaxUsageListLength(HidP_Feature + 1, 0) returned %d, expected %d\n", value, 0 ); -- 2.31.1

2 1

[PATCH vkd3d v3 06/12] vkd3d-shader/hlsl: Fix wrong conditional in compare_param_hlsl_types().
by Francisco Casas Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 82820daf..c664d5b1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -791,8 +791,7 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - && t1->sampler_dim != t2->sampler_dim) + if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) { if (t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; -- 2.25.1

2 1

[PATCH vkd3d v3 04/12] vkd3d-shader/hlsl: Add tests for Sample method with offset.
by Francisco Casas Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ tests/sampler-offset.shader_test | 51 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 tests/sampler-offset.shader_test diff --git a/Makefile.am b/Makefile.am index 20fee06d..16848f5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,6 +94,7 @@ vkd3d_shader_tests = \ tests/preproc-misc.shader_test \ tests/round.shader_test \ tests/sampler.shader_test \ + tests/sampler-offset.shader_test \ tests/saturate.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ @@ -306,6 +307,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/max.shader_test \ tests/sampler.shader_test \ + tests/sampler-offset.shader_test \ tests/texture-load.shader_test \ tests/texture-load-typed.shader_test \ tests/trigonometry.shader_test diff --git a/tests/sampler-offset.shader_test b/tests/sampler-offset.shader_test new file mode 100644 index 00000000..83900c55 --- /dev/null +++ b/tests/sampler-offset.shader_test @@ -0,0 +1,51 @@ +[sampler 0] +filter point point point +address clamp clamp clamp + +[texture 0] +size (3, 3) +0.0 0.0 0.0 0.4 0.1 0.0 0.5 0.0 0.2 0.0 0.0 0.4 +0.0 0.1 0.5 0.0 0.1 0.1 0.0 0.4 0.2 0.1 0.5 0.0 +0.0 0.2 0.0 0.4 0.1 0.2 0.5 0.0 0.2 0.2 0.0 0.4 + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.5, 0.5), int2(0, 1)); +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.5, 0.0) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.1, 0.5), int2(2, 1)); +} + +[test] +draw quad +probe all rgba (0.2, 0.2, 0.0, 0.4) + + +[pixel shader] +sampler s; +Texture2D t; + +float4 main() : sv_target +{ + return t.Sample(s, float2(0.9, 0.5), int2(-2, 1)); +} + +[test] +draw quad +probe all rgba (0.0, 0.2, 0.0, 0.4) -- 2.25.1

2 1

[PATCH 1/2] user32: Test Get/SetWindowPlacement with invalid length.
by Esme Povirk Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/user32/tests/win.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0156987f529..7ebba960951 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11965,6 +11965,17 @@ static void test_window_placement(void) GetWindowRect(hwnd, &rect); ok(EqualRect(&rect, &orig), "got window rect %s\n", wine_dbgstr_rect(&rect)); + ret = SetWindowPlacement(hwnd, &wp); + ok(ret, "failed to set window placement, error %u\n", GetLastError()); + + wp.length = 0; + SetLastError(0xdeadbeef); + ret = SetWindowPlacement(hwnd, &wp); +todo_wine { + ok(!ret, "SetWindowPlacement should have failed\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError()); +} + DestroyWindow(hwnd); } @@ -12124,7 +12135,7 @@ static void test_arrange_iconic_windows(void) static void other_process_proc(HWND hwnd) { HANDLE window_ready_event, test_done_event; - WINDOWPLACEMENT wp; + WINDOWPLACEMENT wp = {0}; DWORD ret; window_ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_opw_window"); -- 2.30.2

2 3

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Write SM4 equality instructions.
by Giovanni Mascellani Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 2458018f..37a51125 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1489,6 +1489,39 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_TYPE_BOOL: + { + switch (expr->op) + { + case HLSL_OP2_EQUAL: + { + const struct hlsl_type *src_type = arg1->data_type; + + switch (src_type->base_type) + { + case HLSL_TYPE_FLOAT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_EQ, &expr->node, arg1, arg2); + break; + + case HLSL_TYPE_BOOL: + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_IEQ, &expr->node, arg1, arg2); + break; + + default: + break; + } + break; + } + + default: + hlsl_fixme(ctx, &expr->node.loc, "SM4 bool \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + default: { struct vkd3d_string_buffer *string; -- 2.34.1

2 9

[PATCH vkd3d v3 12/12] vkd3d-shader/hlsl: Check texture dimension type on method calls.
by Francisco Casas Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 389ff057..04854577 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1837,7 +1837,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl /* Only HLSL_IR_LOAD can return an object. */ object_load = hlsl_ir_load(object); - if (!strcmp(name, "Load")) + if (!strcmp(name, "Load") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBE + && object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY) { const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); struct hlsl_ir_resource_load *load; @@ -1863,7 +1865,9 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } - else if (!strcmp(name, "Sample")) + else if (!strcmp(name, "Sample") + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMS + && object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY) { const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); const struct hlsl_type *sampler_type; @@ -1913,8 +1917,16 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl list_add_tail(instrs, &load->node.entry); return true; } - else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") - || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) + else if ((!strcmp(name, "Gather") + || !strcmp(name, "GatherRed") + || !strcmp(name, "GatherBlue") + || !strcmp(name, "GatherGreen") + || !strcmp(name, "GatherAlpha") + ) && ( + object_type->sampler_dim == HLSL_SAMPLER_DIM_2D + || object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY + || object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBE + || object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBEARRAY)) { const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); enum hlsl_resource_load_type load_type; -- 2.25.1

1 0

[PATCH vkd3d v3 11/12] vkd3d-shader/hlsl: Handle mipmap level for texture arrays in sm4 ld instruction.
by Francisco Casas Dec. 17, 2021

Dec. 17, 2021

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1b8d9c25..f5c3dd6d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1287,6 +1287,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf { struct sm4_instruction instr; unsigned int writemask; + unsigned int dim_count; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_LD; @@ -1299,23 +1300,11 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ - switch (resource_type->sampler_dim) - { - case HLSL_SAMPLER_DIM_1D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); - break; - - case HLSL_SAMPLER_DIM_2D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); - break; - - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - break; - - default: - assert(0); - } + dim_count = sampler_dim_count(resource_type->sampler_dim); + if (dim_count == 1) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + if (dim_count == 2) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, resource, resource_type); -- 2.25.1

1 0