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

[PATCH] oledb32/tests: Add MSDASQL Enumerator tests
by Alistair Leslie-Hughes 18 Mar '20

18 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/database.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d9811043a8..c2b7e0598d 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1049,6 +1049,42 @@ static void test_odbc_provider(void) IDBProperties_Release(props); } +static void test_odbc_enumerator(void) +{ + HRESULT hr; + ISourcesRowset *source; + IRowset *rowset; + + hr = CoCreateInstance( &CLSID_MSDASQL_ENUMERATOR, NULL, CLSCTX_ALL, &IID_ISourcesRowset, (void **)&source); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (FAILED(hr)) + { + return; + } + + hr = ISourcesRowset_GetSourcesRowset(source, NULL, &IID_IRowset, 0, 0, (IUnknown**)&rowset); + todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + if (hr == S_OK) + { + IAccessor *accessor; + IRowsetInfo *info; + + hr = IRowset_QueryInterface(rowset, &IID_IAccessor, (void **)&accessor); + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + IAccessor_Release(accessor); + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void **)&info); + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + IRowsetInfo_Release(info); + + IRowset_Release(rowset); + } + + ISourcesRowset_Release(source); +} + START_TEST(database) { OleInitialize(NULL); @@ -1058,6 +1094,7 @@ START_TEST(database) test_initializationstring(); test_dslocator(); test_odbc_provider(); + test_odbc_enumerator(); /* row position */ test_rowposition(); -- 2.25.1

1 0

[PATCH v3 1/3] wined3d: Implement dual source blending.
by Zebediah Figura 18 Mar '20

18 Mar '20

Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++--- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..2c2ba33488 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops; -- 2.25.1

3 6

[PATCH v2 1/3] wined3d: Implement dual source blending.
by Zebediah Figura 17 Mar '20

17 Mar '20

"Implement" is somewhat debatable, as it works currently with both Mesa and NVidia blob drivers. However, we're not following the spec. Based on a patch by Michael Müller. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++--- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/state.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++++++--- 5 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9e3dfaa50..633d5176ba 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3444,6 +3444,8 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ rt_mask = ps ? ps->reg_maps.rt_mask : 1; rt_mask &= (1u << gl_info->limits.buffers) - 1; + if (state->blend_state && state->blend_state->dual_source) + rt_mask = 1; mask = rt_mask; while (mask) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4a2fbce553..2c2ba33488 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7772,7 +7772,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { const struct wined3d_shader_signature *output_signature = &shader->output_signature; - shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (args->dual_source_blend) + shader_addline(buffer, "vec4 ps_out[2];\n"); + else + shader_addline(buffer, "vec4 ps_out[%u];\n", gl_info->limits.buffers); if (output_signature->element_count) { for (i = 0; i < output_signature->element_count; ++i) @@ -7787,7 +7790,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ continue; } if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", output->semantic_idx); + else + shader_addline(buffer, "layout(location = %u) ", output->semantic_idx); + } shader_addline(buffer, "out %s4 color_out%u;\n", component_type_info[output->component_type].glsl_vector_type, output->semantic_idx); } @@ -7800,7 +7808,12 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ { i = wined3d_bit_scan(&mask); if (shader_glsl_use_explicit_attrib_location(gl_info)) - shader_addline(buffer, "layout(location = %u) ", i); + { + if (args->dual_source_blend) + shader_addline(buffer, "layout(location = 0, index = %u) ", i); + else + shader_addline(buffer, "layout(location = %u) ", i); + } shader_addline(buffer, "out vec4 color_out%u;\n", i); } } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d9ef1a96e2..3e2a756757 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4167,6 +4167,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (rtv && rtv->format->id == WINED3DFMT_A8_UNORM && !is_identity_fixup(rtv->format->color_fixup)) args->rt_alpha_swizzle |= 1u << i; } + + args->dual_source_blend = state->blend_state && state->blend_state->dual_source; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6289317936..fb55bfe0f3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,6 +74,11 @@ void * CDECL wined3d_blend_state_get_parent(const struct wined3d_blend_state *st return state->parent; } +static BOOL is_dual_source(enum wined3d_blend state) +{ + return state >= WINED3D_BLEND_SRC1COLOR && state <= WINED3D_BLEND_INVSRC1ALPHA; +} + HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, const struct wined3d_blend_state_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_blend_state **state) @@ -92,6 +97,12 @@ HRESULT CDECL wined3d_blend_state_create(struct wined3d_device *device, object->parent_ops = parent_ops; object->device = device; + object->dual_source = desc->rt[0].enable + && (is_dual_source(desc->rt[0].src) + || is_dual_source(desc->rt[0].dst) + || is_dual_source(desc->rt[0].src_alpha) + || is_dual_source(desc->rt[0].dst_alpha)); + TRACE("Created blend state %p.\n", object); *state = object; @@ -650,6 +661,7 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat GLenum src_blend, dst_blend, src_blend_alpha, dst_blend_alpha; const struct wined3d_blend_state *b = state->blend_state; const struct wined3d_format *rt_format; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -658,6 +670,13 @@ static void blend_db2(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); @@ -708,6 +727,7 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_blend_state *b = state->blend_state; + BOOL dual_source = b && b->dual_source; unsigned int i; if (b && b->desc.alpha_to_coverage) @@ -716,6 +736,13 @@ static void blend_dbb(struct wined3d_context *context, const struct wined3d_stat gl_info->gl_ops.gl.p_glDisable(GL_SAMPLE_ALPHA_TO_COVERAGE); checkGLcall("glEnable GL_SAMPLE_ALPHA_TO_COVERAGE"); + if (context->last_was_dual_source_blend != dual_source) + { + /* Dual source blending changes the location of the output varyings. */ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_dual_source_blend = dual_source; + } + if (!b || !b->desc.independent) { blend(context, state, state_id); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9240b0e455..f8ee3c6446 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1394,7 +1394,8 @@ struct ps_compile_args DWORD alpha_test_func : 3; DWORD render_offscreen : 1; DWORD rt_alpha_swizzle : 8; /* MAX_RENDER_TARGET_VIEWS, 8 */ - DWORD padding : 18; + DWORD dual_source_blend : 1; + DWORD padding : 17; }; enum fog_src_type @@ -1954,7 +1955,7 @@ struct wined3d_context DWORD last_was_ffp_blit : 1; DWORD last_was_blit : 1; DWORD last_was_ckey : 1; - DWORD namedArraysLoaded : 1; + DWORD last_was_dual_source_blend : 1; DWORD texShaderBumpMap : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD lastWasPow2Texture : 8; /* WINED3D_MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* WINED3D_MAX_TEXTURES, 8 */ @@ -1971,7 +1972,8 @@ struct wined3d_context DWORD destroyed : 1; DWORD destroy_delayed : 1; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 14; + DWORD namedArraysLoaded : 1; + DWORD padding : 13; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -3140,6 +3142,7 @@ struct wined3d_blend_state { LONG refcount; struct wined3d_blend_state_desc desc; + BOOL dual_source; void *parent; const struct wined3d_parent_ops *parent_ops; -- 2.25.1

2 3

[PATCH 4/7] dbghelp: Move elf_check_alternate implementation to module.c.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 247 +---------------------------------- dlls/dbghelp/image_private.h | 4 + dlls/dbghelp/module.c | 239 +++++++++++++++++++++++++++++++++ 3 files changed, 250 insertions(+), 240 deletions(-)

2 2

[PATCH v2 4/7] dbghelp: Move elf_check_alternate implementation to module.c.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dbghelp/elf_module.c | 247 +---------------------------------- dlls/dbghelp/image_private.h | 7 + dlls/dbghelp/module.c | 239 +++++++++++++++++++++++++++++++++ 3 files changed, 253 insertions(+), 240 deletions(-)

1 0

[PATCH] jscript: Get rid of the variable_obj parameter to exec_source.
by Jacek Caban 17 Mar '20

17 Mar '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 32 ++++++++++++++++++++++++-------- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 11 +++-------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- 5 files changed, 32 insertions(+), 21 deletions(-)

1 0

[PATCH 1/2] winex11.drv: Remove frame when non-client area is empty.
by Rémi Bernon 17 Mar '20

17 Mar '20

Several applications -Steam, Battle.net for instance- handle the WM_NCCALCSIZE message to override the non-client areas size and make the client area cover the whole window, instead of changing the styles. In winex11.drv, in decorated mode, we adjust the window rect according to the window style to hide the unwanted decorations behind the frame, but when client and window rects are equals, there's nothing to hide and the actual window styles are irrelevant and can safely be ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40930 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- There's still going to be some issues for applications that customize the non-client area sizes differently from their styles, but hopefully there's aren't many applications that do that. dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..903b036442b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -286,6 +286,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, if (!decorated_mode) return 0; + if (EqualRect( &data->window_rect, &data->client_rect )) return 0; if (IsRectEmpty( &data->window_rect )) return 0; if (data->shaped) return 0; -- 2.25.0

1 2

[PATCH 1/3] mshtml/tests: Add tests showing how toString has changed in IE9+.
by Jeff Smith 17 Mar '20

17 Mar '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/jscript/tests/api.js | 6 ++++++ dlls/mshtml/tests/es5.js | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 1a81253a02..d4aa7f4383 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -351,6 +351,12 @@ tmp = Object.prototype.toString.call(new VBArray(createArray())); ok(tmp === "[object Object]", "toString.call(new VBArray()) = " + tmp); (tmp = new Enumerator()).f = Object.prototype.toString; ok(tmp.f() === "[object Object]", "tmp.f() = " + tmp.f()); +tmp = Object.prototype.toString.call(null); +ok(tmp === "[object Object]", "toString.call(null) = " + tmp); +tmp = Object.prototype.toString.call(undefined); +ok(tmp === "[object Object]", "toString.call(undefined) = " + tmp); +tmp = Object.prototype.toString.call(); +ok(tmp === "[object Object]", "toString.call() = " + tmp); function TSTestConstr() {} TSTestConstr.prototype = { toString: function() { return "test"; } }; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7ee8cc1e03..7a5b9d57ea 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -767,6 +767,28 @@ function test_getPrototypeOf() { next_test(); } +function test_toString() { + var tmp; + + (function () { tmp = Object.prototype.toString.call(arguments); })(); + todo_wine. + ok(tmp === "[object Arguments]", "toString.call(arguments) = " + tmp); + tmp = Object.prototype.toString.call(this); + todo_wine. + ok(tmp === "[object Window]", "toString.call(null) = " + tmp); + tmp = Object.prototype.toString.call(null); + todo_wine. + ok(tmp === "[object Null]", "toString.call(null) = " + tmp); + tmp = Object.prototype.toString.call(undefined); + todo_wine. + ok(tmp === "[object Undefined]", "toString.call(undefined) = " + tmp); + tmp = Object.prototype.toString.call(); + todo_wine. + ok(tmp === "[object Undefined]", "toString.call() = " + tmp); + + next_test(); +} + function test_bind() { var f, r; var o = new Object(), o2 = new Object(); @@ -860,5 +882,6 @@ var tests = [ test_global_properties, test_string_split, test_getPrototypeOf, + test_toString, test_bind ]; -- 2.23.0

3 7

[PATCH] mshtml/tests: Remove file protocol tests from htmllocation.c.
by Jacek Caban 17 Mar '20

17 Mar '20

It's broken on modern IEs anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/htmllocation.c | 12 ------------ 1 file changed, 12 deletions(-)

1 0

[PATCH 5/5] ucrtbase/tests: Link to _o_* functions directly.
by Jacek Caban 17 Mar '20

17 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)

2 1