January 2024 - Wine-Commits

Francisco Casas : tests/shader-runner: Support reading multiple model range args for qualifiers.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 79de3ec766138a0396289cf56b8bdd354835a02c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/79de3ec766138a0396289cf56b8bd… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Nov 10 18:37:40 2023 -0300 tests/shader-runner: Support reading multiple model range args for qualifiers. We can now pass (sm<4) and (sm>=4) to "fail" and "todo" qualifiers, and we can use multiple of these qualifier arguments using "&" for AND and "|" for OR. examples: todo(sm>=4 & sm<6) todo(sm<4 | sm>6) parenthesis are not supported. Adding additional model ranges for the tests, if we need them, should be easier now, since they only have to be added to the "valid_args" array. --- tests/shader_runner.c | 184 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 139 insertions(+), 45 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index bac3a8f2..0bf5e09f 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -94,40 +94,139 @@ enum parse_state STATE_TEST, }; -static bool match_string(const char *line, const char *token, const char **const rest) +static bool check_qualifier_args_conjunction(const char *line, + const char **const rest, enum shader_model sm) { - size_t len = strlen(token); + bool holds = true; + unsigned int i; - while (isspace(*line)) - ++line; + static const struct + { + const char *text; + enum shader_model sm_min, sm_max; + } + valid_args[] = + { + {"sm>=4", SHADER_MODEL_4_0, SHADER_MODEL_6_0}, + {"sm>=6", SHADER_MODEL_6_0, SHADER_MODEL_6_0}, + {"sm<4", SHADER_MODEL_2_0, SHADER_MODEL_4_0 - 1}, + {"sm<6", SHADER_MODEL_2_0, SHADER_MODEL_6_0 - 1}, + }; - if (strncmp(line, token, len) || !isspace(line[len])) - return false; + while (*line != ')' && *line != '|') + { + bool match = false; + + while (isspace(*line)) + ++line; + + for (i = 0; i < ARRAY_SIZE(valid_args); ++i) + { + const char *option_text = valid_args[i].text; + + if (!strncmp(line, option_text, strlen(option_text))) + { + line += strlen(option_text); + if (sm < valid_args[i].sm_min) + holds = false; + if (sm > valid_args[i].sm_max) + holds = false; + + match = true; + break; + } + } + + while (isspace(*line)) + ++line; + + if (match && *line == '&') + { + ++line; + } + else if (*line != ')' && *line != '|') + { + fatal_error("Invalid qualifier argument '%s'.\n", line); + } + } + + assert(*line == ')' || *line == '|'); if (rest) + *rest = line; + + return holds; +} + +static bool check_qualifier_args(const char *line, const char **const rest, enum shader_model sm) +{ + bool first = true; + bool holds = false; + + assert(*line == '('); + ++line; + + while (*line != ')') { - *rest = line + len; - while (isspace(**rest)) - ++*rest; + if (!first && *line == '|') + ++line; + first = false; + + holds = check_qualifier_args_conjunction(line, &line, sm) || holds; } - return true; + + assert(*line == ')'); + if (rest) + *rest = line + 1; + + return holds; } -static bool match_directive_substring(const char *line, const char *token, const char **const rest) +static bool match_string_generic(const char *line, const char *token, const char **const rest, + bool exclude_bracket, bool allow_qualifier_args, enum shader_model sm) { size_t len = strlen(token); + bool holds = true; - while (isspace(*line) || *line == ']') + while (isspace(*line) || (exclude_bracket && *line == ']')) ++line; - if (strncmp(line, token, len) || !(isspace(line[len]) || line[len] == ']')) + if (strncmp(line, token, len) || !(isspace(line[len]) || line[len] == '(' + || (exclude_bracket && line[len] == ']'))) return false; + line += len; + + if (allow_qualifier_args && *line == '(') + holds = check_qualifier_args(line, &line, sm); + if (rest) { - *rest = line + len; + *rest = line; while (isspace(**rest)) ++*rest; } - return true; + return holds; +} + +static bool match_string_with_args(const char *line, const char *token, const char **const rest, + enum shader_model sm) +{ + return match_string_generic(line, token, rest, false, true, sm); +} + +static bool match_string(const char *line, const char *token, const char **const rest) +{ + return match_string_generic(line, token, rest, false, false, 0); +} + +static bool match_directive_substring_with_args(const char *line, const char *token, + const char **const rest, enum shader_model sm) +{ + return match_string_generic(line, token, rest, true, true, sm); +} + +static bool match_directive_substring(const char *line, const char *token, const char **const rest) +{ + return match_string_generic(line, token, rest, true, false, 0); } static void parse_require_directive(struct shader_runner *runner, const char *line) @@ -548,12 +647,10 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) runner->is_todo = false; - if (match_string(line, "todo", &line)) + if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + { runner->is_todo = true; - else if (match_string(line, "todo(sm<6)", &line)) - runner->is_todo = runner->minimum_shader_model < SHADER_MODEL_6_0; - else if (match_string(line, "todo(sm>=6)", &line)) - runner->is_todo = runner->minimum_shader_model >= SHADER_MODEL_6_0; + } if (match_string(line, "dispatch", &line)) { @@ -1068,45 +1165,42 @@ static void compile_shader(struct shader_runner *runner, IDxcCompiler3 *dxc_comp } } +static enum parse_state get_parse_state_todo(enum parse_state state) +{ + if (state == STATE_SHADER_COMPUTE) + return STATE_SHADER_COMPUTE_TODO; + else if (state == STATE_SHADER_PIXEL) + return STATE_SHADER_PIXEL_TODO; + else if (state == STATE_SHADER_VERTEX) + return STATE_SHADER_VERTEX_TODO; + else + return STATE_SHADER_EFFECT_TODO; +} + static enum parse_state read_shader_directive(struct shader_runner *runner, enum parse_state state, const char *line, const char *src, HRESULT *expect_hr) { while (*src && *src != ']') { - /* 'todo' is not meaningful when dxcompiler is in use, so it has no '(sm<6) qualifier. */ - if (match_directive_substring(src, "todo", &src)) + const char *src_start = src; + + if (match_directive_substring_with_args(src, "todo", &src, runner->minimum_shader_model)) { + /* 'todo' is not meaningful when dxcompiler is in use. */ if (runner->minimum_shader_model >= SHADER_MODEL_6_0) continue; - if (state == STATE_SHADER_COMPUTE) - state = STATE_SHADER_COMPUTE_TODO; - else if (state == STATE_SHADER_PIXEL) - state = STATE_SHADER_PIXEL_TODO; - else if (state == STATE_SHADER_VERTEX) - state = STATE_SHADER_VERTEX_TODO; - else - state = STATE_SHADER_EFFECT_TODO; + state = get_parse_state_todo(state); } - else if (match_directive_substring(src, "fail", &src)) + else if (match_directive_substring_with_args(src, "fail", &src, runner->minimum_shader_model)) { *expect_hr = E_FAIL; } - else if (match_directive_substring(src, "fail(sm<6)", &src)) - { - if (runner->minimum_shader_model < SHADER_MODEL_6_0) - *expect_hr = E_FAIL; - } - else if (match_directive_substring(src, "fail(sm>=6)", &src)) - { - if (runner->minimum_shader_model >= SHADER_MODEL_6_0) - *expect_hr = E_FAIL; - } - else if (match_directive_substring(src, "notimpl(sm<6)", &src)) + else if (match_directive_substring_with_args(src, "notimpl", &src, runner->minimum_shader_model)) { - if (runner->minimum_shader_model < SHADER_MODEL_6_0) - *expect_hr = E_NOTIMPL; + *expect_hr = E_NOTIMPL; } - else + + if (src == src_start) { fatal_error("Malformed line '%s'.\n", line); }

1 0

Francisco Casas : tests: Use the vulkan runner to run SM1 compilation tests.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 1c7351342523e6b2d805a97542641da5e272adc2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c7351342523e6b2d805a97542641… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 15 17:41:33 2023 -0300 tests: Use the vulkan runner to run SM1 compilation tests. At the current moment this is a little odd because for SM1 [test] directives are skipped, and the [shader] directives are not executed by the shader_runner_vulkan.c:compile_shader() but by the general shader_runner.c:compile_shader(). So in principle it is a little weird that we go through the vulkan runner. But fret not, because in the future we plan to make the parser agnostic to the language of the tests, so we will get rid of the general shader_runner.c:compile_shader() function and instead call a runner->compile_shader() function, defined for each runner. Granted, most of these may call a generic implementation that uses native compiler in Windows, and vkd3d-shader on Linux, but it would be more conceptually correct. --- tests/hlsl/abs.shader_test | 4 +- tests/hlsl/any.shader_test | 24 +++---- tests/hlsl/arithmetic-float-uniform.shader_test | 16 ++--- tests/hlsl/arithmetic-int-uniform.shader_test | 32 ++++----- tests/hlsl/arithmetic-int.shader_test | 2 + tests/hlsl/ceil.shader_test | 4 +- tests/hlsl/cf-cond-types.shader_test | 6 +- tests/hlsl/combined-samplers.shader_test | 4 +- tests/hlsl/conditional.shader_test | 16 ++--- tests/hlsl/ddxddy.shader_test | 16 ++--- tests/hlsl/discard.shader_test | 6 +- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/dot.shader_test | 4 +- tests/hlsl/entry-point-semantics.shader_test | 6 +- tests/hlsl/expr-indexing.shader_test | 14 ++-- tests/hlsl/float-comparison.shader_test | 4 +- tests/hlsl/floor.shader_test | 4 +- tests/hlsl/fmod.shader_test | 12 ++-- tests/hlsl/for.shader_test | 9 +-- tests/hlsl/function-return.shader_test | 50 +++++++------- tests/hlsl/fwidth.shader_test | 2 +- tests/hlsl/half.shader_test | 4 +- tests/hlsl/hard-copy-prop.shader_test | 19 +++--- tests/hlsl/initializer-implicit-array.shader_test | 2 +- tests/hlsl/length.shader_test | 2 +- tests/hlsl/lit.shader_test | 12 ++-- tests/hlsl/loop.shader_test | 28 ++++---- tests/hlsl/matrix-indexing.shader_test | 8 +-- tests/hlsl/non-const-indexing.shader_test | 52 +++++++-------- tests/hlsl/normalize.shader_test | 2 +- tests/hlsl/reflect.shader_test | 4 +- tests/hlsl/return.shader_test | 79 +++++++++++------------ tests/hlsl/round.shader_test | 8 +-- tests/hlsl/sample-bias.shader_test | 8 +-- tests/hlsl/sample-level.shader_test | 16 ++--- tests/hlsl/sampler.shader_test | 8 +-- tests/hlsl/saturate.shader_test | 4 +- tests/hlsl/sign.shader_test | 22 +++---- tests/hlsl/smoothstep.shader_test | 4 +- tests/hlsl/static-initializer.shader_test | 9 +-- tests/hlsl/step.shader_test | 4 +- tests/hlsl/ternary.shader_test | 23 ++++--- tests/hlsl/trigonometry.shader_test | 16 ++--- tests/hlsl/trunc.shader_test | 10 +-- tests/hlsl/vector-indexing-uniform.shader_test | 4 +- tests/shader_runner.c | 13 ++-- tests/shader_runner_vulkan.c | 22 +++++-- 47 files changed, 313 insertions(+), 307 deletions(-)

1 0

Francisco Casas : tests/shader-runner: Call each runner only once.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 671f4ec2b25caaafa25e8b833a3cc759a19ed9e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/671f4ec2b25caaafa25e8b833a3cc… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Dec 14 03:08:41 2023 -0300 tests/shader-runner: Call each runner only once. If the runners require multiple calls to run_shader_tests() for different shader model ranges, these are moved inside the sole runner call. For the same reason, the trace() messages are also moved inside the runner calls. --- tests/shader_runner.c | 31 ++++++++++--------------------- tests/shader_runner.h | 3 +-- tests/shader_runner_d3d11.c | 8 ++++++++ tests/shader_runner_d3d12.c | 22 ++++++++++++++++++---- tests/shader_runner_d3d9.c | 8 ++++++++ tests/shader_runner_gl.c | 2 ++ tests/shader_runner_vulkan.c | 1 + 7 files changed, 48 insertions(+), 27 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 0bf5e09f..80d5dfe7 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1711,61 +1711,50 @@ START_TEST(shader_runner) #if defined(VKD3D_CROSSTEST) trace("Running tests from a Windows cross build\n"); - trace("Compiling shaders with d3dcompiler_47.dll and executing with d3d9.dll\n"); run_shader_tests_d3d9(); - trace("Compiling shaders with d3dcompiler_47.dll and executing with d3d11.dll\n"); run_shader_tests_d3d11(); - trace("Compiling shaders with d3dcompiler_47.dll and executing with d3d12.dll\n"); - run_shader_tests_d3d12(NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1); + run_shader_tests_d3d12(NULL); print_dll_version("d3dcompiler_47.dll"); print_dll_version("dxgi.dll"); print_dll_version("d3d9.dll"); print_dll_version("d3d11.dll"); print_dll_version("d3d12.dll"); + #elif defined(_WIN32) trace("Running tests from a Windows non-cross build\n"); - trace("Compiling shaders with vkd3d-shader and executing with d3d9.dll\n"); run_shader_tests_d3d9(); - trace("Compiling shaders with vkd3d-shader and executing with d3d11.dll\n"); run_shader_tests_d3d11(); - trace("Compiling shaders with vkd3d-shader and executing with vkd3d\n"); - run_shader_tests_d3d12(NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1); + dxc_compiler = dxcompiler_create(); + run_shader_tests_d3d12(dxc_compiler); - if ((dxc_compiler = dxcompiler_create())) + if (dxc_compiler) { - trace("Compiling shaders with dxcompiler and executing with vkd3d\n"); - run_shader_tests_d3d12(dxc_compiler, SHADER_MODEL_6_0, SHADER_MODEL_6_0); IDxcCompiler3_Release(dxc_compiler); print_dll_version(SONAME_LIBDXCOMPILER); } - print_dll_version("d3d9.dll"); print_dll_version("d3d11.dll"); + #else trace("Running tests from a Unix build\n"); # ifdef HAVE_OPENGL - trace("Compiling shaders with vkd3d-shader and executing with OpenGL\n"); run_shader_tests_gl(); # endif - trace("Compiling shaders with vkd3d-shader and executing with Vulkan\n"); run_shader_tests_vulkan(); - trace("Compiling shaders with vkd3d-shader and executing with vkd3d\n"); - run_shader_tests_d3d12(NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1); + dxc_compiler = dxcompiler_create(); + run_shader_tests_d3d12(dxc_compiler); - if ((dxc_compiler = dxcompiler_create())) - { - trace("Compiling shaders with dxcompiler and executing with vkd3d\n"); - run_shader_tests_d3d12(dxc_compiler, SHADER_MODEL_6_0, SHADER_MODEL_6_0); + if (dxc_compiler) IDxcCompiler3_Release(dxc_compiler); - } + #endif } diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 16343947..a17fa485 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -179,5 +179,4 @@ void run_shader_tests_d3d11(void); void run_shader_tests_gl(void); void run_shader_tests_vulkan(void); #endif -void run_shader_tests_d3d12(void *dxc_compiler, enum shader_model minimum_shader_model, - enum shader_model maximum_shader_model); +void run_shader_tests_d3d12(void *dxc_compiler); diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 1a62b20c..1e22d44e 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -32,6 +32,12 @@ #include "shader_runner.h" #include "vkd3d_test.h" +#ifdef VKD3D_CROSSTEST +static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; +#else +static const char HLSL_COMPILER[] = "vkd3d-shader"; +#endif + static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, @@ -757,6 +763,8 @@ void run_shader_tests_d3d11(void) struct d3d11_shader_runner runner; HMODULE dxgi_module, d3d11_module; + trace("Compiling SM4-SM5 shaders with %s and executing with d3d11.dll\n", HLSL_COMPILER); + d3d11_module = LoadLibraryA("d3d11.dll"); dxgi_module = LoadLibraryA("dxgi.dll"); if (d3d11_module && dxgi_module) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index d6b80d9e..c151b85b 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -25,6 +25,14 @@ #include "shader_runner.h" #include "dxcompiler.h" +#ifdef VKD3D_CROSSTEST +static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; +static const char SHADER_RUNNER[] = "d3d12.dll"; +#else +static const char HLSL_COMPILER[] = "vkd3d-shader"; +static const char SHADER_RUNNER[] = "vkd3d"; +#endif + struct d3d12_resource { struct resource r; @@ -586,8 +594,7 @@ static const struct shader_runner_ops d3d12_runner_ops = .release_readback = d3d12_runner_release_readback, }; -void run_shader_tests_d3d12(void *dxc_compiler, enum shader_model minimum_shader_model, - enum shader_model maximum_shader_model) +void run_shader_tests_d3d12(void *dxc_compiler) { static const struct test_context_desc desc = { @@ -627,10 +634,17 @@ void run_shader_tests_d3d12(void *dxc_compiler, enum shader_model minimum_shader hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS1, &runner.options1, sizeof(runner.options1)); ok(hr == S_OK, "Failed to check feature options1 support, hr %#x.\n", hr); - if (maximum_shader_model >= SHADER_MODEL_6_0) + + trace("Compiling SM4-SM5 shaders with %s and executing with %s\n", HLSL_COMPILER, SHADER_RUNNER); + run_shader_tests(&runner.r, &d3d12_runner_ops, dxc_compiler, SHADER_MODEL_4_0, SHADER_MODEL_5_1); + + if (dxc_compiler) + { trace("Int64ShaderOps: %u.\n", runner.options1.Int64ShaderOps); - run_shader_tests(&runner.r, &d3d12_runner_ops, dxc_compiler, minimum_shader_model, maximum_shader_model); + trace("Compiling SM6 shaders with dxcompiler and executing with %s\n", SHADER_RUNNER); + run_shader_tests(&runner.r, &d3d12_runner_ops, dxc_compiler, SHADER_MODEL_6_0, SHADER_MODEL_6_0); + } ID3D12GraphicsCommandList_Release(runner.compute_list); ID3D12CommandAllocator_Release(runner.compute_allocator); diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index 0b33c1c5..3440e89c 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -27,6 +27,12 @@ #include "shader_runner.h" #include "vkd3d_test.h" +#ifdef VKD3D_CROSSTEST +static const char HLSL_COMPILER[] = "d3dcompiler47.dll"; +#else +static const char HLSL_COMPILER[] = "vkd3d-shader"; +#endif + struct d3d9_resource { struct resource r; @@ -534,6 +540,8 @@ void run_shader_tests_d3d9(void) struct d3d9_shader_runner runner; HMODULE d3d9_module; + trace("Compiling SM2-SM3 shaders with %s and executing with d3d9.dll\n", HLSL_COMPILER); + d3d9_module = LoadLibraryA("d3d9.dll"); if (d3d9_module) { diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index 9a3dd710..a898d021 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -996,6 +996,8 @@ void run_shader_tests_gl(void) vkd3d_test_name = "shader_runner_gl"; if (!gl_runner_init(&runner)) goto done; + + trace("Compiling SM4-SM5 shaders with vkd3d-shader and executing with OpenGL\n"); run_shader_tests(&runner.r, &gl_runner_ops, NULL, SHADER_MODEL_4_0, SHADER_MODEL_5_1); gl_runner_cleanup(&runner); done: diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index bb6b3a30..d435a5d3 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1420,6 +1420,7 @@ void run_shader_tests_vulkan(void) if (!init_vulkan_runner(&runner)) return; + trace("Compiling SM2-SM5 shaders with vkd3d-shader and executing with Vulkan\n"); run_shader_tests(&runner.r, &vulkan_runner_ops, NULL, SHADER_MODEL_2_0, SHADER_MODEL_5_1); cleanup_vulkan_runner(&runner);

1 0

Francisco Casas : vkd3d-shader/d3dbc: Emit fixme for HLSL_RESOURCE_SAMPLE_LOD.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 7e75ac63a18c314e6a900e0f31dc645fe2fb6be0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e75ac63a18c314e6a900e0f31dc6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 8 17:40:09 2024 -0300 vkd3d-shader/d3dbc: Emit fixme for HLSL_RESOURCE_SAMPLE_LOD. Currently, HLSL_RESOURCE_SAMPLE_LOD is not implemented for d3dbc, but we are incorrectly writting a texld instruction to handle it. This causes SM1 tests with the vulkan backend (in following patches) to fail if VKD3D_SHADER_CONFIG="force_validation" is enabled. For now a fixme is emited in these cases. --- libs/vkd3d-shader/d3dbc.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 035095d5..4ba001ea 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2345,8 +2345,6 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ sm1_instr = (struct sm1_instruction) { - .opcode = D3DSIO_TEX, - .dst.type = D3DSPR_TEMP, .dst.reg = instr->reg.id, .dst.writemask = instr->reg.writemask, @@ -2362,8 +2360,22 @@ static void write_sm1_resource_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_ .src_count = 2, }; - if (load->load_type == HLSL_RESOURCE_SAMPLE_PROJ) - sm1_instr.opcode |= VKD3DSI_TEXLD_PROJECT << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT; + + switch (load->load_type) + { + case HLSL_RESOURCE_SAMPLE: + sm1_instr.opcode = D3DSIO_TEX; + break; + + case HLSL_RESOURCE_SAMPLE_PROJ: + sm1_instr.opcode = D3DSIO_TEX; + sm1_instr.opcode |= VKD3DSI_TEXLD_PROJECT << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT; + break; + + default: + hlsl_fixme(ctx, &instr->loc, "Resource load type %u\n", load->load_type); + return; + } assert(instr->reg.allocated);

1 0

Tyson Whitehead : dinput: Implement DIPROP_AUTOCENTER.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 9dc1ddf801d9db287eb6e7dc13036efde38bd88e URL: https://gitlab.winehq.org/wine/wine/-/commit/9dc1ddf801d9db287eb6e7dc13036e… Author: Tyson Whitehead <twhitehead(a)gmail.com> Date: Fri Jan 12 23:20:42 2024 -0500 dinput: Implement DIPROP_AUTOCENTER. Autocenter is a default effect playing on the device following power up or reset. It is disabled by stopping all effects. On at least some devices (all?) it is a spring effect playing in slot 1. Capturing Windows USB packets reveals it dinput acquire does (1) a reset (this enabled autocenter) and, if autocenter is disabled, (2) a stop all effects (this disabled autocenter). This logic works regardless of whether autocenter is a spring effect playing in slot 1 or not. It does mean autocenter can only be set when the device is not acquired. Testing on Windows reveals setting autocenter properties while acquired returns DIERR_ACQUIRED even if the device is exclusively acquired, so this is consistent. --- dlls/dinput/device.c | 5 ++--- dlls/dinput/joystick_hid.c | 7 ++++++- dlls/dinput/tests/force_feedback.c | 1 - dlls/winebus.sys/bus_sdl.c | 4 ++++ dlls/winebus.sys/bus_udev.c | 20 ++++++++++++++++++++ 5 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 427d3895700..bb2feb0e8da 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -899,7 +899,7 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con switch (LOWORD( guid )) { case (DWORD_PTR)DIPROP_AUTOCENTER: - if (impl->status == STATUS_ACQUIRED && !is_exclusively_acquired( impl )) return DIERR_ACQUIRED; + if (impl->status == STATUS_ACQUIRED) return DIERR_ACQUIRED; break; case (DWORD_PTR)DIPROP_AXISMODE: case (DWORD_PTR)DIPROP_BUFFERSIZE: @@ -1290,8 +1290,6 @@ static HRESULT dinput_device_set_property( IDirectInputDevice8W *iface, const GU { const DIPROPDWORD *value = (const DIPROPDWORD *)header; if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; - - FIXME( "DIPROP_AUTOCENTER stub!\n" ); impl->autocenter = value->dwData; return DI_OK; } @@ -2131,6 +2129,7 @@ void dinput_device_init( struct dinput_device *device, const struct dinput_devic device->caps.dwSize = sizeof(DIDEVCAPS); device->caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; device->device_gain = 10000; + device->autocenter = DIPROPAUTOCENTER_ON; device->force_feedback_state = DIGFFS_STOPPED | DIGFFS_EMPTY; InitializeCriticalSection( &device->crit ); dinput_internal_addref( (device->dinput = dinput) ); diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3320ac92a1c..367d6356195 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1072,7 +1072,12 @@ static HRESULT hid_joystick_send_force_feedback_command( IDirectInputDevice8W *i if (status != HIDP_STATUS_SUCCESS) return status; if (!WriteFile( impl->device, report_buf, report_len, NULL, NULL )) return DIERR_INPUTLOST; - if (!unacquire && command == DISFFC_RESET) hid_joystick_send_device_gain( iface, impl->base.device_gain ); + if (!unacquire && command == DISFFC_RESET) + { + if (impl->base.autocenter == DIPROPAUTOCENTER_OFF) + hid_joystick_send_force_feedback_command( iface, DISFFC_STOPALL, FALSE ); + hid_joystick_send_device_gain( iface, impl->base.device_gain ); + } return DI_OK; } diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index 69060c0706c..841f627d842 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -2222,7 +2222,6 @@ static BOOL test_force_feedback_joystick( DWORD version ) .report_len = 2, .report_buf = {1, 0x02}, .broken_id = 8, /* Win8 sends them in the reverse order */ - .todo = TRUE, }, { .code = IOCTL_HID_WRITE_REPORT, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index ed9d3aed4bd..7b43df82f83 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -105,6 +105,7 @@ MAKE_FUNCPTR(SDL_HapticRumbleStop); MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticSetGain); +MAKE_FUNCPTR(SDL_HapticSetAutocenter); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_HapticStopEffect); MAKE_FUNCPTR(SDL_HapticUnpause); @@ -550,6 +551,7 @@ static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, US return STATUS_SUCCESS; case PID_USAGE_DC_STOP_ALL_EFFECTS: pSDL_HapticStopAll(impl->sdl_haptic); + pSDL_HapticSetAutocenter(impl->sdl_haptic, 0); return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_RESET: pSDL_HapticStopAll(impl->sdl_haptic); @@ -559,6 +561,7 @@ static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, US pSDL_HapticDestroyEffect(impl->sdl_haptic, impl->effect_ids[i]); impl->effect_ids[i] = -1; } + pSDL_HapticSetAutocenter(impl->sdl_haptic, 100); return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_PAUSE: pSDL_HapticPause(impl->sdl_haptic); @@ -1121,6 +1124,7 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticRumbleSupported); LOAD_FUNCPTR(SDL_HapticRunEffect); LOAD_FUNCPTR(SDL_HapticSetGain); + LOAD_FUNCPTR(SDL_HapticSetAutocenter); LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_HapticStopEffect); LOAD_FUNCPTR(SDL_HapticUnpause); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c8620352766..f8c6ccb9060 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -929,6 +929,24 @@ static NTSTATUS lnxev_device_physical_effect_run(struct lnxev_device *impl, BYTE return STATUS_SUCCESS; } +static NTSTATUS lnxev_device_physical_device_set_autocenter(struct unix_device *iface, BYTE percent) +{ + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + struct input_event ie = + { + .type = EV_FF, + .code = FF_AUTOCENTER, + .value = 0xffff * percent / 100, + }; + + TRACE("iface %p, percent %#x.\n", iface, percent); + + if (write(impl->base.device_fd, &ie, sizeof(ie)) == -1) + WARN("write failed %d %s\n", errno, strerror(errno)); + + return STATUS_SUCCESS; +} + static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, USAGE control) { struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); @@ -972,6 +990,7 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, if (impl->effect_ids[i] < 0) continue; lnxev_device_physical_effect_run(impl, i, 0); } + lnxev_device_physical_device_set_autocenter(iface, 0); return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_RESET: for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) @@ -981,6 +1000,7 @@ static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, WARN("couldn't free effect, EVIOCRMFF ioctl failed: %d %s\n", errno, strerror(errno)); impl->effect_ids[i] = -1; } + lnxev_device_physical_device_set_autocenter(iface, 100); return STATUS_SUCCESS; case PID_USAGE_DC_DEVICE_PAUSE: WARN("device pause not supported\n");

1 0

Tyson Whitehead : dinput/tests: Update tests for DIPROP_AUTOCENTER.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 63562c05f6329c84932f727f1d1908a4d4ca2933 URL: https://gitlab.winehq.org/wine/wine/-/commit/63562c05f6329c84932f727f1d1908… Author: Tyson Whitehead <twhitehead(a)gmail.com> Date: Sat Jan 13 13:39:19 2024 -0500 dinput/tests: Update tests for DIPROP_AUTOCENTER. --- dlls/dinput/tests/driver_bus.c | 5 +- dlls/dinput/tests/force_feedback.c | 162 +++++++++++++++++++++++++------------ 2 files changed, 112 insertions(+), 55 deletions(-)

1 0

Tim Clem : winemac.drv: Detect active handwriting and panel IMEs.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: d81c4ce1ba700cca040afcf89c75c683b23e531d URL: https://gitlab.winehq.org/wine/wine/-/commit/d81c4ce1ba700cca040afcf89c75c6… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Jan 23 10:33:10 2024 -0800 winemac.drv: Detect active handwriting and panel IMEs. Allows such IMEs that process keyboard input to do so. For instance, fixes backspace and escape for handwriting methods. --- dlls/winemac.drv/cocoa_app.h | 1 - dlls/winemac.drv/cocoa_app.m | 68 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index c4c8bbd16f2..b2b8187e0b4 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -92,7 +92,6 @@ enum { CGEventSourceKeyboardType keyboardType; NSEvent* lastFlagsChanged; BOOL inputSourceIsInputMethod; - BOOL inputSourceIsInputMethodValid; uint32_t pressedKeyCodes[128 / 32]; CGFloat primaryScreenHeight; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 4e26bf1e122..de3a23a5d2d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -478,8 +478,6 @@ static NSString* WineLocalizedString(unsigned int stringID) CFRelease(lastKeyboardLayoutInputSource); lastKeyboardLayoutInputSource = inputSourceLayout; - inputSourceIsInputMethodValid = FALSE; - if (inputSourceLayout) { CFDataRef uchr; @@ -2064,24 +2062,68 @@ static NSString* WineLocalizedString(unsigned int stringID) [NSApp activate]; } + static BOOL InputSourceShouldBeIgnored(TISInputSourceRef inputSource) + { + /* Certain system utilities are technically input sources, but we + shouldn't consider them as such for our purposes. + Dictation is its own source too (com.apple.inputmethod.ironwood), but + it should receive keypresses; it cancels input on escape. */ + static CFStringRef ignoredIDs[] = { + /* The "Emoji & Symbols" palette. */ + CFSTR("com.apple.CharacterPaletteIM"), + /* The on-screen keyboard and accessibility panel. */ + CFSTR("com.apple.inputmethod.AssistiveControl"), + /* The popup for accented characters when you hold down a key. */ + CFSTR("com.apple.PressAndHold"), + }; + + CFStringRef sourceID = TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID); + for (int i = 0; i < sizeof(ignoredIDs) / sizeof(CFStringRef); i++) + { + if (CFEqual(sourceID, ignoredIDs[i])) + return YES; + } + + return NO; + } + - (BOOL) inputSourceIsInputMethod { - if (!inputSourceIsInputMethodValid) + static dispatch_once_t onceToken; + static CFDictionaryRef filterDict; + CFArrayRef enabledSources; + CFIndex i; + BOOL ret = NO; + + /* There may be multiple active ("selected") input sources, but there is + always exactly one selected keyboard input source. For instance, + handwriting methods are active simultaneously with a keyboard source. + As the name implies, TISCopyCurrentKeyboardInputSource only returns + the keyboard source, so it's not sufficient for our needs. We use + TISCreateInputSourceList instead to find all selected sources. */ + dispatch_once(&onceToken, ^{ + filterDict = CFDictionaryCreate(NULL, (const void **)&kTISPropertyInputSourceIsSelected, (const void **)&kCFBooleanTrue, 1, + &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + + }); + enabledSources = TISCreateInputSourceList(filterDict, false); + for (i = 0; i < CFArrayGetCount(enabledSources); i++) { - TISInputSourceRef inputSource = TISCopyCurrentKeyboardInputSource(); - if (inputSource) + TISInputSourceRef source = (TISInputSourceRef)CFArrayGetValueAtIndex(enabledSources, i); + CFStringRef type = TISGetInputSourceProperty(source, kTISPropertyInputSourceType); + + /* kTISTypeKeyboardLayout is for physical keyboards. Any type other + than that is an IME. */ + if (!CFEqual(type, kTISTypeKeyboardLayout) && !InputSourceShouldBeIgnored(source)) { - CFStringRef type = TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceType); - inputSourceIsInputMethod = !CFEqual(type, kTISTypeKeyboardLayout); - CFRelease(inputSource); + ret = YES; + break; } - else - inputSourceIsInputMethod = FALSE; - inputSourceIsInputMethodValid = TRUE; } - return inputSourceIsInputMethod; - } + CFRelease(enabledSources); + return ret; + } - (void) releaseMouseCapture {

1 0

Paul Gofman : ntdll: Return STATUS_DEBUGGER_INACTIVE from NtSystemDebugControl() stub.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 7bd070ae866f9c690343c82b05fcef4d0fc7de1d URL: https://gitlab.winehq.org/wine/wine/-/commit/7bd070ae866f9c690343c82b05fcef… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 8 17:54:30 2024 -0600 ntdll: Return STATUS_DEBUGGER_INACTIVE from NtSystemDebugControl() stub. --- dlls/ntdll/tests/info.c | 24 ++++++++++++++++++++++++ dlls/ntdll/unix/system.c | 3 ++- dlls/wow64/system.c | 25 ++++++++++++++++++++++++- include/winternl.h | 22 +++++++++++++++++++++- 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 68a9f165bfd..70d566df3c6 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -46,6 +46,7 @@ static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCL static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); static HANDLE (WINAPI * pDbgUiGetThreadDebugObject)(void); static void (WINAPI * pDbgUiSetThreadDebugObject)(HANDLE); +static NTSTATUS (WINAPI * pNtSystemDebugControl)(SYSDBG_COMMAND,PVOID,ULONG,PVOID,ULONG,PULONG); static BOOL is_wow64; static BOOL old_wow64; @@ -101,6 +102,7 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(DbgUiConvertStateChangeStructure); NTDLL_GET_PROC(DbgUiGetThreadDebugObject); NTDLL_GET_PROC(DbgUiSetThreadDebugObject); + NTDLL_GET_PROC(NtSystemDebugControl); if (!IsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3735,6 +3737,27 @@ static void test_ThreadIsTerminated(void) ok( status == STATUS_INVALID_HANDLE, "got %#lx.\n", status ); } +static void test_system_debug_control(void) +{ + NTSTATUS status; + int class; + + for (class = 0; class < SysDbgMaxInfoClass; ++class) + { + status = pNtSystemDebugControl( class, NULL, 0, NULL, 0, NULL ); + if (is_wow64) + { + /* Most of the calls return STATUS_NOT_IMPLEMENTED on wow64. */ + ok( status == STATUS_DEBUGGER_INACTIVE || status == STATUS_NOT_IMPLEMENTED || status == STATUS_INFO_LENGTH_MISMATCH, + "class %d, got %#lx.\n", class, status ); + } + else + { + ok( status == STATUS_DEBUGGER_INACTIVE || status == STATUS_ACCESS_DENIED, "class %d, got %#lx.\n", class, status ); + } + } +} + START_TEST(info) { char **argv; @@ -3810,4 +3833,5 @@ START_TEST(info) test_ThreadEnableAlignmentFaultFixup(); test_process_instrumentation_callback(); + test_system_debug_control(); } diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 879a5893758..e55ec9e1137 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3461,7 +3461,8 @@ NTSTATUS WINAPI NtSystemDebugControl( SYSDBG_COMMAND command, void *in_buff, ULO { FIXME( "(%d, %p, %d, %p, %d, %p), stub\n", command, in_buff, (int)in_len, out_buff, (int)out_len, retlen ); - return STATUS_NOT_IMPLEMENTED; + + return STATUS_DEBUGGER_INACTIVE; } diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 7130039e07a..b2c8eec8769 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -755,7 +755,30 @@ NTSTATUS WINAPI wow64_NtSystemDebugControl( UINT *args ) ULONG out_len = get_ulong( &args ); ULONG *retlen = get_ptr( &args ); - return NtSystemDebugControl( command, in_buf, in_len, out_buf, out_len, retlen ); + switch (command) + { + case SysDbgBreakPoint: + case SysDbgEnableKernelDebugger: + case SysDbgDisableKernelDebugger: + case SysDbgGetAutoKdEnable: + case SysDbgSetAutoKdEnable: + case SysDbgGetPrintBufferSize: + case SysDbgSetPrintBufferSize: + case SysDbgGetKdUmExceptionEnable: + case SysDbgSetKdUmExceptionEnable: + case SysDbgGetTriageDump: + case SysDbgGetKdBlockEnable: + case SysDbgSetKdBlockEnable: + case SysDbgRegisterForUmBreakInfo: + case SysDbgGetUmBreakPid: + case SysDbgClearUmBreakPid: + case SysDbgGetUmAttachPid: + case SysDbgClearUmAttachPid: + return NtSystemDebugControl( command, in_buf, in_len, out_buf, out_len, retlen ); + + default: + return STATUS_NOT_IMPLEMENTED; /* not implemented on Windows either */ + } } diff --git a/include/winternl.h b/include/winternl.h index b551e404fc9..48eac76c4d6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3603,7 +3603,27 @@ typedef enum _SYSDBG_COMMAND { SysDbgReadMsr, SysDbgWriteMsr, SysDbgReadBusData, - SysDbgWriteBusData + SysDbgWriteBusData, + SysDbgCheckLowMemory, + SysDbgEnableKernelDebugger, + SysDbgDisableKernelDebugger, + SysDbgGetAutoKdEnable, + SysDbgSetAutoKdEnable, + SysDbgGetPrintBufferSize, + SysDbgSetPrintBufferSize, + SysDbgGetKdUmExceptionEnable, + SysDbgSetKdUmExceptionEnable, + SysDbgGetTriageDump, + SysDbgGetKdBlockEnable, + SysDbgSetKdBlockEnable, + SysDbgRegisterForUmBreakInfo, + SysDbgGetUmBreakPid, + SysDbgClearUmBreakPid, + SysDbgGetUmAttachPid, + SysDbgClearUmAttachPid, + SysDbgGetLiveKernelDump, + SysDbgKdPullRemoteFile, + SysDbgMaxInfoClass } SYSDBG_COMMAND, *PSYSDBG_COMMAND; typedef struct _CPTABLEINFO

1 0

Gabriel Ivăncescu : mshtml: Implement document.lastModified.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 1571c12129756e2fd35c80a7452d791e7edc8b65 URL: https://gitlab.winehq.org/wine/wine/-/commit/1571c12129756e2fd35c80a7452d79… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jan 23 17:54:26 2024 +0200 mshtml: Implement document.lastModified. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 10 ++++++++-- dlls/mshtml/tests/dom.js | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e7eca058c23..4267b13ffab 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1086,8 +1086,14 @@ static HRESULT WINAPI HTMLDocument_get_location(IHTMLDocument2 *iface, IHTMLLoca static HRESULT WINAPI HTMLDocument_get_lastModified(IHTMLDocument2 *iface, BSTR *p) { HTMLDocumentNode *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMDocument_GetLastModified(This->dom_document, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 0cbcb95e578..325cacf4823 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -339,6 +339,12 @@ sync_test("rects", function() { ok(rects.length === 0, "rect.length = " + rects.length); }); +sync_test("document_lastModified", function() { + // actually it seems to be rounded up from about ~250ms above a sec, but be more conservative with the check + var diff = Date.parse(document.lastModified) - performance.timing.navigationStart; + ok(diff > -1000 && diff < 1000, "lastModified too far from navigationStart: " + diff); +}); + sync_test("document_owner", function() { var node;

1 0

Rémi Bernon : dinput/tests: Differentiate missing from broken HID reports.
by Alexandre Julliard Jan. 23, 2024

Jan. 23, 2024

Module: wine Branch: master Commit: 96b823c2d4ab9e5ff4b0084ffc1173085e83dde5 URL: https://gitlab.winehq.org/wine/wine/-/commit/96b823c2d4ab9e5ff4b0084ffc1173… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 19 10:14:50 2024 +0100 dinput/tests: Differentiate missing from broken HID reports. --- dlls/dinput/tests/driver_bus.c | 7 ++++--- dlls/dinput/tests/driver_hid.h | 2 +- dlls/dinput/tests/hid.c | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index e0943c35294..d4633757c4d 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -131,7 +131,7 @@ static void expect_queue_reset( struct expect_queue *queue, void *buffer, unsign while (tmp != missing_end) { winetest_push_context( "%s expect[%Id]", context, tmp - missing ); - if (tmp->broken) + if (tmp->broken_id) { todo_wine_if( tmp->todo ) win_skip( "broken (code %#lx id %u len %u)\n", tmp->code, tmp->report_id, tmp->report_len ); @@ -251,8 +251,9 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ tmp = queue->pos; while (tmp < queue->end) { + BOOL is_missing = tmp->broken_id == (BYTE)-1; if (winetest_platform_is_wine && !tmp->todo) break; - if (!winetest_platform_is_wine && !tmp->broken && !tmp->wine_only) break; + if (!winetest_platform_is_wine && !is_missing && !tmp->wine_only) break; if (tmp->code == code && tmp->report_id == id && tmp->report_len == len && (!compare_buf || RtlCompareMemory( tmp->report_buf, buf, len ) == len)) break; @@ -303,7 +304,7 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ while (tmp != missing_end) { winetest_push_context( "%s expect[%Id]", context, tmp - missing ); - if (tmp->broken) + if (tmp->broken_id) { todo_wine_if( tmp->todo ) win_skip( "broken (code %#lx id %u len %u)\n", tmp->code, tmp->report_id, tmp->report_len ); diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index ee5d26cdbf7..a824e004dfa 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -56,7 +56,7 @@ struct hid_expect DWORD ret_length; DWORD ret_status; BYTE todo; /* missing on wine */ - BYTE broken; /* missing on some win versions */ + BYTE broken_id; /* different or missing (-1) report on some win versions */ BYTE wine_only; BYTE report_id; BYTE report_len; diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index e5f6ea4640d..f5cc9c26f55 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -1048,7 +1048,7 @@ static void test_hidp_get_input( HANDLE file, int report_id, ULONG report_len, P struct hid_expect broken_expect = { .code = IOCTL_HID_GET_INPUT_REPORT, - .broken = TRUE, + .broken_id = -1, .report_len = report_len - 1, .report_buf = { @@ -1142,7 +1142,7 @@ static void test_hidp_get_feature( HANDLE file, int report_id, ULONG report_len, struct hid_expect broken_expect = { .code = IOCTL_HID_GET_FEATURE, - .broken = TRUE, + .broken_id = -1, .report_len = report_len - 1, .report_buf = { @@ -1240,7 +1240,7 @@ static void test_hidp_set_feature( HANDLE file, int report_id, ULONG report_len, struct hid_expect broken_expect = { .code = IOCTL_HID_SET_FEATURE, - .broken = TRUE, + .broken_id = -1, .report_len = report_len - 1, .report_buf = { @@ -1341,7 +1341,7 @@ static void test_hidp_set_output( HANDLE file, int report_id, ULONG report_len, struct hid_expect broken_expect = { .code = IOCTL_HID_SET_OUTPUT_REPORT, - .broken = TRUE, + .broken_id = -1, .report_len = report_len - 1, .report_buf = {0x5a,0x5a}, .ret_length = 3,

1 0