April 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : tests: Mark individual test directives as todo.
by Alexandre Julliard April 15, 2022

April 15, 2022

Module: vkd3d Branch: master Commit: 98a36dfa419d9f32ec4049b4c11480346a3faf5e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=98a36dfa419d9f32ec4049b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 14 12:52:34 2022 +0200 tests: Mark individual test directives as todo. 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 | 37 +------------------- tests/arithmetic-float.shader_test | 2 +- tests/arithmetic-int.shader_test | 4 +-- tests/cast-to-float.shader_test | 2 +- tests/cast-to-half.shader_test | 2 +- tests/cast-to-int.shader_test | 2 +- tests/cast-to-uint.shader_test | 4 +-- tests/hlsl-array-dimension.shader_test | 2 +- tests/hlsl-duplicate-modifiers.shader_test | 2 +- tests/hlsl-for.shader_test | 2 +- tests/hlsl-function-cast.shader_test | 8 ++--- tests/hlsl-function-overload.shader_test | 2 +- tests/hlsl-function.shader_test | 4 +-- tests/hlsl-gather.shader_test | 2 +- tests/hlsl-initializer-flatten.shader_test | 10 +++--- .../hlsl-initializer-invalid-arg-count.shader_test | 4 +-- tests/hlsl-initializer-local-array.shader_test | 4 +-- tests/hlsl-initializer-nested.shader_test | 6 ++-- tests/hlsl-initializer-numeric.shader_test | 8 ++--- tests/hlsl-initializer-static-array.shader_test | 4 +-- tests/hlsl-initializer-struct.shader_test | 6 ++-- tests/hlsl-intrinsic-override.shader_test | 4 +-- tests/hlsl-majority-pragma.shader_test | 2 +- tests/hlsl-majority-typedef.shader_test | 2 +- tests/hlsl-mul.shader_test | 36 +++++++++---------- ...hlsl-numeric-constructor-truncation.shader_test | 2 +- tests/hlsl-numeric-types.shader_test | 4 +-- tests/hlsl-return-implicit-conversion.shader_test | 28 +++++++-------- tests/hlsl-return-void.shader_test | 2 +- tests/hlsl-shape.shader_test | 40 +++++++++++----------- tests/hlsl-static-initializer.shader_test | 2 +- tests/hlsl-storage-qualifiers.shader_test | 2 +- tests/hlsl-vector-indexing-uniform.shader_test | 2 +- tests/hlsl-vector-indexing.shader_test | 2 +- tests/logic-operations.shader_test | 24 ++++++------- tests/sampler-offset.shader_test | 6 ++-- tests/trigonometry.shader_test | 2 +- 37 files changed, 121 insertions(+), 156 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=98a36dfa419d9f32ec4…

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Fold constant division.
by Alexandre Julliard April 15, 2022

April 15, 2022

Module: vkd3d Branch: master Commit: 40b299c7276d03b1abe833649a942c74a8f9f4ac URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=40b299c7276d03b1abe8336… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Apr 14 12:52:39 2022 +0200 vkd3d-shader/hlsl: Fold constant division. This commit includes work by Francisco Casas. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(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_constant_ops.c | 67 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 + tests/arithmetic-float.shader_test | 16 ++++++++ tests/arithmetic-int.shader_test | 11 +++++- tests/arithmetic-uint.shader_test | 9 +++++ 5 files changed, 104 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 5cac4bde..9a8bc6b0 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -255,6 +255,69 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, return true; } +static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = dst->node.data_type->base_type; + unsigned int k; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (k = 0; k < dst->node.data_type->dimx; ++k) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + if (src2->value[k].f == 0) + { + hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + "Floating point division by zero"); + } + dst->value[k].f = src1->value[k].f / src2->value[k].f; + break; + + case HLSL_TYPE_DOUBLE: + if (src2->value[k].d == 0) + { + hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, + "Floating point division by zero"); + } + dst->value[k].d = src1->value[k].d / src2->value[k].d; + break; + + case HLSL_TYPE_INT: + if (src2->value[k].i == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + if (src1->value[k].i == INT_MIN && src2->value[k].i == -1) + dst->value[k].i = INT_MIN; + else + dst->value[k].i = src1->value[k].i / src2->value[k].i; + break; + + case HLSL_TYPE_UINT: + if (src2->value[k].u == 0) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Division by zero."); + return false; + } + dst->value[k].u = src1->value[k].u / src2->value[k].u; + break; + + default: + FIXME("Fold division for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type)); + return false; + } + } + return true; +} + bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -308,6 +371,10 @@ bool hlsl_fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void success = fold_nequal(ctx, res, arg1, arg2); break; + case HLSL_OP2_DIV: + success = fold_div(ctx, res, arg1, arg2); + break; + default: FIXME("Fold \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); success = false; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 21f23709..29e178cc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -117,8 +117,10 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_HLSL_INVALID_TEXEL_OFFSET = 5018, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS = 5019, VKD3D_SHADER_ERROR_HLSL_INCOMPATIBLE_PROFILE = 5020, + VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO = 5021, VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, + VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO = 5301, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index d55dc9d4..f99b9728 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -23,3 +23,19 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[require] +shader model >= 4.0 + +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 1; + float y = 0; + + return x / y; +} + +[test] +draw quad +probe all rgba (1e99, 1e99, 1e99, 1e99) diff --git a/tests/arithmetic-int.shader_test b/tests/arithmetic-int.shader_test index 5d9cc029..c85b9a3a 100644 --- a/tests/arithmetic-int.shader_test +++ b/tests/arithmetic-int.shader_test @@ -8,7 +8,7 @@ float4 main() : SV_TARGET } [test] -todo draw quad +draw quad probe all rgba (20.0, -10.0, 75.0, 0.0) [pixel shader] @@ -23,3 +23,12 @@ float4 main() : SV_TARGET [test] todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) + +[pixel shader fail] +float4 main() : SV_TARGET +{ + int x = 1; + int y = 0; + + return x / y; +} diff --git a/tests/arithmetic-uint.shader_test b/tests/arithmetic-uint.shader_test index b016dbb6..f37c881e 100644 --- a/tests/arithmetic-uint.shader_test +++ b/tests/arithmetic-uint.shader_test @@ -26,3 +26,12 @@ float4 main() : SV_TARGET [test] draw quad probe all rgba (5.0, 5.0, 4294967296.0, 3.0) + +[pixel shader fail] +float4 main() : SV_TARGET +{ + uint x = 1; + uint y = 0; + + return x / y; +}

1 0

Zebediah Figura : tests: Skip probe directives if the last render failed.
by Alexandre Julliard April 15, 2022

April 15, 2022

Module: vkd3d Branch: master Commit: 26b89cc338c88e766d032f0ee3b6c9995dad02e8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26b89cc338c88e766d032f0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 14 12:52:32 2022 +0200 tests: Skip probe directives if the last render failed. 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> --- tests/shader_runner.c | 13 +++++++++++-- tests/shader_runner.h | 4 +++- tests/shader_runner_d3d11.c | 8 +++++--- tests/shader_runner_d3d12.c | 10 +++++----- tests/shader_runner_d3d9.c | 8 +++++--- tests/shader_runner_vulkan.c | 8 +++++++- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 54b667fc..2a661122 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -382,7 +382,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (!runner->vs_source) runner->vs_source = strdup(vs_source); - runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); + runner->last_render_failed = !runner->ops->draw(runner, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST, 3); } else if (match_string(line, "draw", &line)) { @@ -401,7 +401,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) if (line == rest) fatal_error("Malformed vertex count '%s'.\n", line); - runner->ops->draw(runner, topology, vertex_count); + runner->last_render_failed = !runner->ops->draw(runner, topology, vertex_count); } else if (match_string(line, "probe all rgba", &line)) { @@ -410,6 +410,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) struct vec4 v; int ret; + if (runner->last_render_failed) + return; + ret = sscanf(line, "( %f , %f , %f , %f ) %u", &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 4) fatal_error("Malformed probe arguments '%s'.\n", line); @@ -425,6 +428,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) RECT rect; int ret; + if (runner->last_render_failed) + return; + ret = sscanf(line, "( %d , %d , %d , %d ) ( %f , %f , %f , %f ) %u", &left, &top, &right, &bottom, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 8) @@ -445,6 +451,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) RECT rect; int ret; + if (runner->last_render_failed) + return; + ret = sscanf(line, "( %u , %u ) ( %f , %f , %f , %f ) %u", &x, &y, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 6) fatal_error("Malformed probe arguments '%s'.\n", line); diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 19218ab5..2af2259a 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -98,6 +98,8 @@ struct shader_runner char *ps_source; enum shader_model minimum_shader_model; + bool last_render_failed; + uint32_t *uniforms; size_t uniform_count, uniform_capacity; @@ -118,7 +120,7 @@ struct shader_runner_ops bool (*check_requirements)(struct shader_runner *runner); struct resource *(*create_resource)(struct shader_runner *runner, const struct resource_params *params); void (*destroy_resource)(struct shader_runner *runner, struct resource *resource); - void (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); + bool (*draw)(struct shader_runner *runner, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count); void (*probe_vec4)(struct shader_runner *runner, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 93904a64..9d1ed09b 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -423,7 +423,7 @@ static void d3d11_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d11_runner_draw(struct shader_runner *r, +static bool d3d11_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d11_shader_runner *runner = d3d11_shader_runner(r); @@ -437,12 +437,12 @@ static void d3d11_runner_draw(struct shader_runner *r, HRESULT hr; if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) - return; + return false; if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) { ID3D10Blob_Release(vs_code); - return; + return false; } hr = ID3D11Device_CreateVertexShader(device, ID3D10Blob_GetBufferPointer(vs_code), @@ -536,6 +536,8 @@ static void d3d11_runner_draw(struct shader_runner *r, ID3D11VertexShader_Release(vs); if (cb) ID3D11Buffer_Release(cb); + + return true; } struct resource_readback diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index c3eb5686..b94f5ee6 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -132,7 +132,7 @@ static void d3d12_runner_destroy_resource(struct shader_runner *r, struct resour free(resource); } -static void d3d12_runner_draw(struct shader_runner *r, +static bool d3d12_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct d3d12_shader_runner *runner = d3d12_shader_runner(r); @@ -155,12 +155,12 @@ static void d3d12_runner_draw(struct shader_runner *r, size_t i; if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) - return; + return false; if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) { ID3D10Blob_Release(ps_code); - return; + return false; } root_signature_desc.NumParameters = 0; @@ -257,8 +257,6 @@ static void d3d12_runner_draw(struct shader_runner *r, ID3D10Blob_Release(vs_code); ID3D10Blob_Release(ps_code); free(input_element_descs); - if (!pso) - return; vkd3d_array_reserve((void **)&test_context->pso, &test_context->pso_capacity, test_context->pso_count + 1, sizeof(*test_context->pso)); test_context->pso[test_context->pso_count++] = pso; @@ -303,6 +301,8 @@ static void d3d12_runner_draw(struct shader_runner *r, exec_command_list(queue, command_list); wait_queue_idle(device, queue); reset_command_list(command_list, test_context->allocator); + + return true; } static void d3d12_runner_probe_vec4(struct shader_runner *r, diff --git a/tests/shader_runner_d3d9.c b/tests/shader_runner_d3d9.c index a4e8938a..f2875d42 100644 --- a/tests/shader_runner_d3d9.c +++ b/tests/shader_runner_d3d9.c @@ -308,7 +308,7 @@ static D3DDECLUSAGE vertex_decl_usage_from_name(const char *name) fatal_error("Cannot translate usage \"%s\" to a d3d9 usage.\n", name); } -static void d3d9_runner_draw(struct shader_runner *r, +static bool d3d9_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { static const D3DVERTEXELEMENT9 decl_element_end = D3DDECL_END(); @@ -323,12 +323,12 @@ static void d3d9_runner_draw(struct shader_runner *r, HRESULT hr; if (!(vs_code = compile_shader(runner->r.vs_source, "vs_2_0"))) - return; + return false; if (!(ps_code = compile_shader(runner->r.ps_source, "ps_2_0"))) { ID3D10Blob_Release(vs_code); - return; + return false; } if (runner->r.uniform_count) @@ -445,6 +445,8 @@ static void d3d9_runner_draw(struct shader_runner *r, IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(vs); IDirect3DPixelShader9_Release(ps); + + return true; } struct resource_readback diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index 9728f192..b008c8e7 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -754,7 +754,7 @@ static void bind_resources(struct vulkan_shader_runner *runner, VkPipelineBindPo /* The descriptor set will be freed by resetting the descriptor pool. */ } -static void vulkan_runner_draw(struct shader_runner *r, +static bool vulkan_runner_draw(struct shader_runner *r, D3D_PRIMITIVE_TOPOLOGY primitive_topology, unsigned int vertex_count) { struct vulkan_shader_runner *runner = vulkan_shader_runner(r); @@ -768,6 +768,7 @@ static void vulkan_runner_draw(struct shader_runner *r, VkDevice device = runner->device; VkClearRect clear_rect; VkPipeline pipeline; + bool ret = true; unsigned int i; /* Create this before compiling shaders, it will assign resource bindings. */ @@ -775,7 +776,10 @@ static void vulkan_runner_draw(struct shader_runner *r, pipeline_layout = create_pipeline_layout(runner, set_layout); if (!(pipeline = create_pipeline(runner, pipeline_layout, primitive_topology))) + { + ret = false; goto out; + } begin_command_buffer(runner); @@ -813,6 +817,8 @@ out: VK_CALL(vkDestroyPipelineLayout(device, pipeline_layout, NULL)); VK_CALL(vkDestroyDescriptorSetLayout(device, set_layout, NULL)); + + return ret; } static const struct vec4 *get_readback_vec4(const uint8_t *data, unsigned int row_pitch, unsigned int x, unsigned int y)

1 0

Zebediah Figura : tests: Introduce support for marking individual test directives as todo.
by Alexandre Julliard April 15, 2022

April 15, 2022

Module: vkd3d Branch: master Commit: c0562e2a1e9f05d7fe7e23884f8bd241062acd65 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c0562e2a1e9f05d7fe7e238… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 14 12:52:33 2022 +0200 tests: Introduce support for marking individual test directives as todo. 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> --- tests/shader_runner.c | 5 +++++ tests/shader_runner.h | 2 ++ tests/shader_runner_d3d12.c | 20 ++++++++++++-------- tests/shader_runner_vulkan.c | 13 +++++++------ 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 2a661122..a97a8ee6 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -343,6 +343,11 @@ static void set_uniforms(struct shader_runner *runner, size_t offset, size_t cou static void parse_test_directive(struct shader_runner *runner, const char *line) { + runner->is_todo = false; + + if (match_string(line, "todo", &line)) + runner->is_todo = true; + if (match_string(line, "draw quad", &line)) { struct resource_params params; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 2af2259a..9685eaa3 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -94,6 +94,8 @@ struct shader_runner { const struct shader_runner_ops *ops; + bool is_todo; + char *vs_source; char *ps_source; enum shader_model minimum_shader_model; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index b94f5ee6..1fa2a461 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -52,7 +52,7 @@ static struct d3d12_shader_runner *d3d12_shader_runner(struct shader_runner *r) return CONTAINING_RECORD(r, struct d3d12_shader_runner, r); } -static ID3D10Blob *compile_shader(const char *source, const char *type, enum shader_model shader_model) +static ID3D10Blob *compile_shader(const struct d3d12_shader_runner *runner, const char *source, const char *type) { ID3D10Blob *blob = NULL, *errors = NULL; char profile[7]; @@ -67,9 +67,9 @@ static ID3D10Blob *compile_shader(const char *source, const char *type, enum sha [SHADER_MODEL_5_1] = "5_1", }; - sprintf(profile, "%s_%s", type, shader_models[shader_model]); + sprintf(profile, "%s_%s", type, shader_models[runner->r.minimum_shader_model]); hr = D3DCompile(source, strlen(source), NULL, NULL, NULL, "main", profile, 0, 0, &blob, &errors); - ok(hr == S_OK, "Failed to compile shader, hr %#x.\n", hr); + ok(FAILED(hr) == !blob, "Got unexpected hr %#x, blob %p.\n", hr, blob); if (errors) { if (vkd3d_test_state.debug_level) @@ -154,12 +154,16 @@ static bool d3d12_runner_draw(struct shader_runner *r, HRESULT hr; size_t i; - if (!(ps_code = compile_shader(runner->r.ps_source, "ps", runner->r.minimum_shader_model))) - return false; + ps_code = compile_shader(runner, runner->r.ps_source, "ps"); + vs_code = compile_shader(runner, runner->r.vs_source, "vs"); + todo_if (runner->r.is_todo) ok(ps_code && vs_code, "Failed to compile shaders.\n"); - if (!(vs_code = compile_shader(runner->r.vs_source, "vs", runner->r.minimum_shader_model))) + if (!ps_code || !vs_code) { - ID3D10Blob_Release(ps_code); + if (ps_code) + ID3D10Blob_Release(ps_code); + if (vs_code) + ID3D10Blob_Release(vs_code); return false; } @@ -316,7 +320,7 @@ static void d3d12_runner_probe_vec4(struct shader_runner *r, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(test_context->render_target, 0, &rb, test_context->queue, test_context->list); - check_readback_data_vec4(&rb, rect, v, ulps); + todo_if (runner->r.is_todo) check_readback_data_vec4(&rb, rect, v, ulps); release_resource_readback(&rb); reset_command_list(test_context->list, test_context->allocator); transition_resource_state(test_context->list, test_context->render_target, diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index b008c8e7..4a30ea85 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -350,7 +350,6 @@ static bool compile_shader(const struct vulkan_shader_runner *runner, const char hlsl_info.profile = profile; ret = vkd3d_shader_compile(&info, dxbc, &messages); - ok(!ret, "Failed to compile shader, error %d.\n", ret); if (messages && vkd3d_test_state.debug_level) trace("%s\n", messages); vkd3d_shader_free_messages(messages); @@ -413,7 +412,6 @@ static bool compile_shader(const struct vulkan_shader_runner *runner, const char interface_info.push_constant_buffers = &push_constants; ret = vkd3d_shader_compile(&info, spirv, &messages); - ok(!ret, "Failed to compile shader, error %d.\n", ret); if (messages && vkd3d_test_state.debug_level) trace("%s\n", messages); vkd3d_shader_free_messages(messages); @@ -514,11 +512,14 @@ static VkPipeline create_pipeline(const struct vulkan_shader_runner *runner, unsigned int i, j; int ret; - if (!create_shader_stage(runner, &stage_desc[0], "vs", VK_SHADER_STAGE_VERTEX_BIT, runner->r.vs_source, &vs_dxbc)) - return VK_NULL_HANDLE; - if (!create_shader_stage(runner, &stage_desc[1], "ps", VK_SHADER_STAGE_FRAGMENT_BIT, runner->r.ps_source, NULL)) + memset(stage_desc, 0, sizeof(stage_desc)); + ret = create_shader_stage(runner, &stage_desc[0], "vs", VK_SHADER_STAGE_VERTEX_BIT, runner->r.vs_source, &vs_dxbc) + && create_shader_stage(runner, &stage_desc[1], "ps", VK_SHADER_STAGE_FRAGMENT_BIT, runner->r.ps_source, NULL); + todo_if (runner->r.is_todo) ok(ret, "Failed to compile shaders.\n"); + if (!ret) { VK_CALL(vkDestroyShaderModule(device, stage_desc[0].module, NULL)); + VK_CALL(vkDestroyShaderModule(device, stage_desc[1].module, NULL)); return VK_NULL_HANDLE; } @@ -886,7 +887,7 @@ static void vulkan_runner_probe_vec4(struct shader_runner *r, const RECT *rect, end_command_buffer(runner); VK_CALL(vkMapMemory(device, memory, 0, VK_WHOLE_SIZE, 0, &data)); - check_readback_data_vec4(data, row_pitch, rect, v, ulps); + todo_if (runner->r.is_todo) check_readback_data_vec4(data, row_pitch, rect, v, ulps); VK_CALL(vkUnmapMemory(device, memory)); VK_CALL(vkFreeMemory(device, memory, NULL));

1 0

Zebediah Figura : tests: Do not abort when an invalid shader test fails.
by Alexandre Julliard April 15, 2022

April 15, 2022

Module: vkd3d Branch: master Commit: c3a5cd7c13768d0ed7e64bd722d35cf878fdf312 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3a5cd7c13768d0ed7e64bd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Apr 14 12:52:35 2022 +0200 tests: Do not abort when an invalid shader test fails. 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> --- tests/shader_runner.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index a97a8ee6..8633ee9a 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -651,12 +651,12 @@ void run_shader_tests(struct shader_runner *runner, int argc, char **argv, const ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!blob, "Expected no compiled shader blob.\n"); ok(!!errors, "Expected non-NULL error blob.\n"); - if (!errors) - return; - - if (vkd3d_test_state.debug_level) - trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); + if (errors) + { + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } shader_source_len = 0; break;

1 0

Francisco Casas : vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer().
by Alexandre Julliard April 15, 2022

April 15, 2022

Module: vkd3d Branch: master Commit: 7cee81cf3e466258b72333e981c6c645d711139d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7cee81cf3e466258b72333e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Apr 14 12:52:36 2022 +0200 vkd3d-shader/hlsl: Remove instruction list parameter in struct_var_initializer(). Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> 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.y | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1eb7d2ee..bdcdc780 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1447,7 +1447,7 @@ static bool add_increment(struct hlsl_ctx *ctx, struct list *instrs, bool decrem return true; } -static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, +static void struct_var_initializer(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct parse_initializer *initializer) { struct hlsl_type *type = var->data_type; @@ -1459,13 +1459,9 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, "Expected %u components in initializer, but got %u.", hlsl_type_component_count(type), initializer_size(initializer)); - free_parse_initializer(initializer); return; } - list_move_tail(list, initializer->instrs); - vkd3d_free(initializer->instrs); - LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) { struct hlsl_ir_node *node = initializer->args[i]; @@ -1479,19 +1475,17 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru { if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, &node->loc))) break; - list_add_tail(list, &c->node.entry); + list_add_tail(initializer->instrs, &c->node.entry); if (!(store = hlsl_new_store(ctx, var, &c->node, node, 0, node->loc))) break; - list_add_tail(list, &store->node.entry); + list_add_tail(initializer->instrs, &store->node.entry); } else { hlsl_fixme(ctx, &node->loc, "Implicit cast in structure initializer."); } } - - vkd3d_free(initializer->args); } static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, @@ -1649,7 +1643,10 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type->type == HLSL_CLASS_STRUCT) { - struct_var_initializer(ctx, statements_list, var, &v->initializer); + struct_var_initializer(ctx, var, &v->initializer); + list_move_tail(statements_list, v->initializer.instrs); + + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; }

1 0

Cressida Silver : WWN416
by Jeremy Newman April 15, 2022

April 15, 2022

Module: website Branch: master Commit: b40bb11c8ccc012ebb826ad7260f1d72b1a81983 URL: https://source.winehq.org/git/website.git/?a=commit;h=b40bb11c8ccc012ebb826… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri Apr 15 11:39:19 2022 -0500 WWN416 --- news/en/2022041502.xml | 14 + wwn/en/wn20220415_416.xml | 753 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 767 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=b40bb11c8ccc012eb…

1 0

Gabriel Ivăncescu : jscript: Use proper error description for invalid Set 'this'.
by Alexandre Julliard April 14, 2022

April 14, 2022

1 0

Gabriel Ivăncescu : jscript: Pass the Map object to the callback when iterating.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 399f8b6f0653275ac0068b58ef08ce9d223f4adb URL: https://source.winehq.org/git/wine.git/?a=commit;h=399f8b6f0653275ac0068b58… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:42 2022 +0300 jscript: Pass the Map object to the callback when iterating. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 3 ++- dlls/mshtml/tests/documentmode.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 640bf44b5f4..dd6829d9b6d 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -179,11 +179,12 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j } LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { - jsval_t args[2], v; + jsval_t args[3], v; if(entry->deleted) continue; args[0] = entry->value; args[1] = entry->key; + args[2] = jsval_obj(&map->dispex); grab_map_entry(entry); hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, ARRAY_SIZE(args), args, &v); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 28450f721bb..ed41ac1d7a7 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -995,7 +995,7 @@ sync_test("map_obj", function() { var calls = []; i = 0; - r = s.forEach(function(value, key) { + r = s.forEach(function(value, key, map) { if(isNaN(test_keys[i])) { ok(isNaN(key), "key = " + key + " expected NaN"); ok(isNaN(value), "value = " + value + " expected NaN"); @@ -1003,6 +1003,7 @@ sync_test("map_obj", function() { ok(key === test_keys[i], "key = " + key + " expected " + test_keys[i]); ok(value === key + 1, "value = " + value); } + ok(map === s, "map = " + map); i++; }); ok(i === test_keys.length, "i = " + i);

1 0

Gabriel Ivăncescu : jscript: Implement Set on top of Map.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 58479eefead70342a0e2f206134d2da3bfac826e URL: https://source.winehq.org/git/wine.git/?a=commit;h=58479eefead70342a0e2f206… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 14 19:24:45 2022 +0300 jscript: Implement Set on top of Map. Because a Set is just a Map where key == value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 111 ++++++++++++++++++++++++++++++-------- dlls/mshtml/tests/documentmode.js | 65 ++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 1 + 3 files changed, 156 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index bdfe7b75e55..f3e8fe664c8 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -26,10 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); -typedef struct { - jsdisp_t dispex; -} SetInstance; - typedef struct { jsdisp_t dispex; struct wine_rb_tree map; @@ -105,6 +101,21 @@ static HRESULT get_map_this(jsval_t vthis, MapInstance **ret) return S_OK; } +static HRESULT get_set_this(jsval_t vthis, MapInstance **ret) +{ + jsdisp_t *jsdisp; + + if(!is_object_instance(vthis)) + return JS_E_OBJECT_EXPECTED; + if(!(jsdisp = to_jsdisp(get_object(vthis))) || !is_class(jsdisp, JSCLASS_SET)) { + WARN("not a Set object passed as 'this'\n"); + return JS_E_MAP_EXPECTED; + } + + *ret = CONTAINING_RECORD(jsdisp, MapInstance, dispex); + return S_OK; +} + static struct jsval_map_entry *get_map_entry(MapInstance *map, jsval_t key) { struct wine_rb_entry *entry; @@ -416,36 +427,91 @@ static HRESULT Map_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; + jsval_t key = argc ? argv[0] : jsval_undefined(); + MapInstance *set; + HRESULT hres; + + hres = get_set_this(vthis, &set); + if(FAILED(hres)) + return hres; + + TRACE("%p (%s)\n", set, debugstr_jsval(key)); + + return set_map_entry(set, key, key, r); } static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; + MapInstance *set; + HRESULT hres; + + hres = get_set_this(vthis, &set); + if(FAILED(hres)) + return hres; + + TRACE("%p\n", set); + + while(!list_empty(&set->entries)) { + struct jsval_map_entry *entry = LIST_ENTRY(list_head(&set->entries), struct jsval_map_entry, list_entry); + delete_map_entry(set, entry); + } + + if(r) *r = jsval_undefined(); + return S_OK; } static HRESULT Set_delete(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; + jsval_t key = argc ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *set; + HRESULT hres; + + hres = get_set_this(vthis, &set); + if(FAILED(hres)) + return hres; + + TRACE("%p (%s)\n", set, debugstr_jsval(key)); + + if((entry = get_map_entry(set, key))) delete_map_entry(set, entry); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT Set_forEach(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; + MapInstance *set; + HRESULT hres; + + hres = get_set_this(vthis, &set); + if(FAILED(hres)) + return hres; + + TRACE("%p (%s)\n", set, debugstr_jsval(argc ? argv[0] : jsval_undefined())); + + return iterate_map(set, ctx, argc, argv, r); } static HRESULT Set_has(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", debugstr_jsval(vthis)); - return E_NOTIMPL; + jsval_t key = argc ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *set; + HRESULT hres; + + hres = get_set_this(vthis, &set); + if(FAILED(hres)) + return hres; + + TRACE("%p (%s)\n", set, debugstr_jsval(key)); + + entry = get_map_entry(set, key); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT Set_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, @@ -455,7 +521,7 @@ static HRESULT Set_value(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned return E_NOTIMPL; } -static const builtin_prop_t Set_props[] = { +static const builtin_prop_t Set_prototype_props[] = { {L"add", Set_add, PROPF_METHOD|1}, {L"clear", Set_clear, PROPF_METHOD}, {L"delete" , Set_delete, PROPF_METHOD|1}, @@ -464,10 +530,10 @@ static const builtin_prop_t Set_props[] = { }; static const builtin_info_t Set_prototype_info = { - JSCLASS_SET, + JSCLASS_OBJECT, Set_value, - ARRAY_SIZE(Set_props), - Set_props, + ARRAY_SIZE(Set_prototype_props), + Set_prototype_props, NULL, NULL }; @@ -475,15 +541,16 @@ static const builtin_info_t Set_prototype_info = { static const builtin_info_t Set_info = { JSCLASS_SET, Set_value, - 0, NULL, - NULL, + ARRAY_SIZE(Map_props), + Map_props, + Map_destructor, NULL }; static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - SetInstance *set; + MapInstance *set; HRESULT hres; switch(flags) { @@ -499,6 +566,8 @@ static HRESULT Set_constructor(script_ctx_t *ctx, jsval_t vthis, WORD flags, uns if(FAILED(hres)) return hres; + wine_rb_init(&set->map, jsval_map_compare); + list_init(&set->entries); *r = jsval_obj(&set->dispex); return S_OK; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 6d06dad9fc7..74e871e47f1 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -912,6 +912,12 @@ sync_test("set_obj", function() { function test_length(name, len) { ok(Set.prototype[name].length === len, "Set.prototype." + name + " = " + Set.prototype[name].length); + try { + Set.prototype[name].call({}, 0); + ok(false, "expected exception calling Set.prototype." + name + "(object)"); + }catch(e) { + ok(e.number === 0xa13fc - 0x80000000, "Set.prototype." + name + "(object) threw " + e.number); + } } test_length("add", 1); test_length("clear", 0); @@ -924,6 +930,65 @@ sync_test("set_obj", function() { r = Object.prototype.toString.call(s); ok(r === "[object Object]", "toString returned " + r); + + r = s.has(-0); + ok(r === false, "has(-0) returned " + r); + ok(s.size === 0, "size = " + s.size); + + r = s.add(42); + ok(r === undefined, "add(42) returned " + r); + r = s.add(42); + ok(r === undefined, "add(42) returned " + r); + r = s.add(0); + ok(r === undefined, "add(0) returned " + r); + r = s.has(-0); + ok(r === false, "has(-0) returned " + r); + r = s.add(-0); + ok(r === undefined, "add(-0) returned " + r); + r = s.has(-0); + ok(r === true, "has(-0) after add returned " + r); + r = s.add("test"); + ok(r === undefined, "add(test) returned " + r); + r = s.add(13); + ok(r === undefined, "add(13) returned " + r); + r = s.add(s); + ok(r === undefined, "add(s) returned " + r); + + r = s["delete"]("test"); /* using s.delete() would break parsing in quirks mode */ + ok(r === true, "delete(test) returned " + r); + r = s["delete"]("test"); + ok(r === false, "delete(test) returned " + r); + + ok(s.size === 5, "size = " + s.size); + s.size = 100; + ok(s.size === 5, "size (after set) = " + s.size); + + var a = []; + r = s.forEach(function(value, key, obj) { + var t = s["delete"](key); + ok(t === true, "delete(" + key + ") returned " + r); + ok(value === key, "value = " + value + ", key = " + key); + ok(obj === s, "set = " + obj); + ok(this === a, "this = " + this); + a.push(value); + }, a); + ok(r === undefined, "forEach returned " + r); + ok(a.length === 5, "a.length = " + a.length); + for(var i = 0; i < a.length; i++) + ok(a[i] === [42, 0, -0, 13, s][i], "a[" + i + "] = " + a[i]); + ok(s.size === 0, "size = " + s.size); + + s = new Set(); + ok(s.size === 0, "size = " + s.size); + s.add(1); + s.add(2); + ok(s.size === 2, "size = " + s.size); + r = s.clear(); + ok(r === undefined, "clear returned " + r); + ok(s.size === 0, "size = " + s.size); + + s = new Set([1, 2, 3]); + ok(s.size === 0, "size = " + s.size); }); sync_test("map_obj", function() { diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 43a6ce77350..489220790b2 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1376,6 +1376,7 @@ sync_test("builtin_context", function() { [ "Number.toFixed", JS_E_NUMBER_EXPECTED, function(ctx) { Number.prototype.toFixed.call(ctx); } ], [ "Object.isPrototypeOf", JS_E_OBJECT_EXPECTED, function(ctx) { Object.prototype.isPrototypeOf.call(ctx, Object); } ], [ "RegExp.exec", JS_E_REGEXP_EXPECTED, function(ctx) { RegExp.prototype.exec.call(ctx, "foobar"); } ], + [ "Set.add", JS_E_OBJECT_EXPECTED, function(ctx) { Set.prototype.add.call(ctx, 5); } ], [ "String.search", JS_E_OBJECT_EXPECTED, function(ctx) { String.prototype.search.call(ctx, /foobar/g); } ], [ "String.trim", JS_E_OBJECT_EXPECTED, function(ctx) { String.prototype.trim.call(ctx); } ], [ "VBArray.dimensions", JS_E_VBARRAY_EXPECTED, function(ctx) { VBArray.prototype.dimensions.call(ctx); } ]

1 0