wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Józef Kucia : wined3d: Recognize SM4 dcl_indexableTemp opcode.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 944ebf3dd880b16c5c27f1a49b0f322cf537c5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944ebf3dd880b16c5c27f1a49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:08:00 2016 +0200 wined3d: Recognize SM4 dcl_indexableTemp opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e070fb..5a0cdba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5232,6 +5232,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3aa9626..d22798f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8567,6 +8567,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e9a4a84..700b7c1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ "dcl_indexableTemp", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", @@ -2205,6 +2206,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } shader_addline(&buffer, "}"); } + else if (ins.handler_idx == WINED3DSIH_DCL_INDEXABLE_TEMP) + { + shader_addline(&buffer, "%s x[%u][%u], %u", shader_opcode_names[ins.handler_idx], + ins.declaration.indexable_temp.register_idx, + ins.declaration.indexable_temp.register_size, + ins.declaration.indexable_temp.component_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS) { shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b17140d..c90c2d4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -199,6 +199,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT = 0x65, WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, + WINED3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM5_OP_HS_DECLS = 0x71, @@ -576,6 +577,15 @@ static void shader_sm4_read_dcl_input_ps_siv(struct wined3d_shader_instruction * ins->declaration.register_semantic.sysval_semantic = *tokens; } +static void shader_sm4_read_dcl_indexable_temp(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->declaration.indexable_temp.register_idx = *tokens++; + ins->declaration.indexable_temp.register_size = *tokens++; + ins->declaration.indexable_temp.component_count = *tokens; +} + static void shader_sm4_read_dcl_global_flags(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -776,6 +786,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_declaration_register_semantic}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", "", shader_sm4_read_declaration_count}, + {WINED3D_SM4_OP_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INDEXABLE_TEMP, "", "", + shader_sm4_read_dcl_indexable_temp}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f89573c..8fb6f4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -577,6 +577,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, + WINED3DSIH_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_PRIMITIVE, @@ -895,6 +896,13 @@ struct wined3d_shader_src_param enum wined3d_shader_src_modifier modifiers; }; +struct wined3d_shader_indexable_temp +{ + unsigned int register_idx; + unsigned int register_size; + unsigned int component_count; +}; + struct wined3d_shader_semantic { enum wined3d_decl_usage usage; @@ -968,6 +976,7 @@ struct wined3d_shader_instruction enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; + struct wined3d_shader_indexable_temp indexable_temp; } declaration; };

1 0

Józef Kucia : wined3d: Recognize SM4 indexable temporary registers.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 50c090dc15e658c445f33e373cc074c60bf26e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c090dc15e658c445f33e373… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:59 2016 +0200 wined3d: Recognize SM4 indexable temporary registers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1085fda..e9a4a84 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1771,6 +1771,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vThreadIDInGroupFlattened"); break; + case WINED3DSPR_IDXTEMP: + shader_addline(buffer, "x"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8961dc5..b17140d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -239,6 +239,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_INDEXABLE_TEMP = 0x3, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_RESOURCE = 0x7, @@ -828,7 +829,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_INDEXABLE_TEMP */ WINED3DSPR_IDXTEMP, /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce094ca..f89573c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -392,6 +392,7 @@ enum wined3d_shader_register_type WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX, + WINED3DSPR_IDXTEMP, }; enum wined3d_data_type

1 0

Józef Kucia : wined3d: Add SV_ClipDistance semantic.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: cdd2469fca19bd5361f0c8031aaba1e4669cb675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd2469fca19bd5361f0c8031… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:58 2016 +0200 wined3d: Add SV_ClipDistance semantic. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 1 + include/wine/wined3d.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a3f53d..1085fda 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, + {WINED3D_SV_CLIP_DISTANCE, "SV_ClipDistance"}, {WINED3D_SV_VERTEX_ID, "SV_VertexID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9becd6f..da102c6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -744,6 +744,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_CLIP_DISTANCE = 2, WINED3D_SV_VERTEX_ID = 6, WINED3D_SV_PRIMITIVE_ID = 7, WINED3D_SV_INSTANCE_ID = 8,

1 0

Józef Kucia : wined3d: Introduce wined3d_buffer_drop_bo() helper function.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 0572f8ad9e4a299f56c1c6fb73f25f13f3e14360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0572f8ad9e4a299f56c1c6fb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:57 2016 +0200 wined3d: Introduce wined3d_buffer_drop_bo() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6f66b97..8adc2a1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -540,6 +540,22 @@ static void buffer_unload(struct wined3d_resource *resource) resource_unload(resource); } +static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) +{ + struct wined3d_device *device = buffer->resource.device; + + buffer->flags &= ~WINED3D_BUFFER_USE_BO; + buffer_unload(&buffer->resource); + + /* The stream source state handler might have read the memory of + * the vertex buffer already and got the memory in the vbo which + * is not valid any longer. Dirtify the stream source to force a + * reload. This happens only once per changed vertexbuffer and + * should occur rather rarely. */ + if (buffer->resource.bind_count) + device_invalidate_state(device, STATE_STREAMSRC); +} + ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); @@ -789,17 +805,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->decl_change_count > VB_MAXDECLCHANGES || (buffer->conversion_map && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC))) { - FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); - - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - - /* The stream source state handler might have read the memory of - * the vertex buffer already and got the memory in the vbo which - * is not valid any longer. Dirtify the stream source to force a - * reload. This happens only once per changed vertexbuffer and - * should occur rather rarely. */ - device_invalidate_state(device, STATE_STREAMSRC); + FIXME("Too many declaration changes or converting dynamic buffer, stopping converting.\n"); + wined3d_buffer_drop_bo(buffer); return; } @@ -824,10 +831,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS) { FIXME("Too many full buffer conversions, stopping converting.\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); + wined3d_buffer_drop_bo(buffer); return; } } @@ -938,7 +942,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN LONG count; BYTE *base; - TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); + TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture @@ -1003,17 +1007,14 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN { /* The extra copy is more expensive than not using VBOs at * all on the Nvidia Linux driver, which is the only driver - * that returns unaligned pointers + * that returns unaligned pointers. */ - TRACE("Dynamic buffer, dropping VBO\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); + TRACE("Dynamic buffer, dropping VBO.\n"); + wined3d_buffer_drop_bo(buffer); } else { - TRACE("Falling back to doublebuffered operation\n"); + TRACE("Falling back to doublebuffered operation.\n"); buffer_get_sysmem(buffer, context); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); @@ -1357,14 +1358,14 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p\n", + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", device, desc, data, parent, parent_ops, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - FIXME("Ignoring access flags (pool)\n"); + FIXME("Ignoring access flags (pool).\n"); hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, WINED3D_POOL_MANAGED, GL_ARRAY_BUFFER_ARB, data, parent, parent_ops);

1 0

André Hentschel : mshtml/tests: Allow ParseUrl to clear buffer on Win10.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 56e06d3f2e511c8eee677341489089612768d127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e06d3f2e511c8eee6773414… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:50:21 2016 +0200 mshtml/tests: Allow ParseUrl to clear buffer on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index f9803df..6376f3f 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -720,7 +720,9 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); - ok(buf[0] == '?', "buf changed\n"); + ok(buf[0] == '?' || buf[0] == '\0' /* Win10 */, + "Expected buf to be unchanged or empty, got %s\n", + wine_dbgstr_w(buf)); ok(size == sizeof(about_blank_url)/sizeof(WCHAR) || size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ "size=%d\n", size);

1 0

Piotr Caban : msvcp90/tests: Remove unneeded casts.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: c6530fee82352573e12f3dc1e3bf5edbef10807f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6530fee82352573e12f3dc1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:20 2016 +0200 msvcp90/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 8 ++++---- dlls/msvcp90/tests/string.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 0c57ca1..91c546e 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1833,7 +1833,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ @@ -1860,7 +1860,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ @@ -1890,7 +1890,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &fs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); @@ -1913,7 +1913,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wfs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 8aea30a..9d46df0 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -409,9 +409,9 @@ static void test_basic_string_char_swap(void) { strcpy(atmp1, "qwerty"); call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_char_dtor, &str1); /* str1 allocated, str2 local */ @@ -420,11 +420,11 @@ static void test_basic_string_char_swap(void) { call_func2(p_basic_string_char_ctor_cstr, &str1, atmp1); call_func2(p_basic_string_char_ctor_cstr, &str2, atmp2); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); } @@ -607,8 +607,8 @@ static void test_basic_string_char_replace(void) { ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ok(ret == &str, "str = %p ret = %p\n", ret, &str); - ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", - tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + ok(strcmp(tests[i].ret, call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char*)call_func1(p_basic_string_char_cstr, ret)); call_func1(p_basic_string_char_dtor, &str); } @@ -694,9 +694,9 @@ static void test_basic_string_wchar_swap(void) { mbstowcs(wtmp1, "qwerty", 32); call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_wchar_dtor, &str1); /* str1 allocated, str2 local */ @@ -705,11 +705,11 @@ static void test_basic_string_wchar_swap(void) { call_func2(p_basic_string_wchar_ctor_cstr, &str1, wtmp1); call_func2(p_basic_string_wchar_ctor_cstr, &str2, wtmp2); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_wchar_dtor, &str1); call_func1(p_basic_string_wchar_dtor, &str2); }

1 0

Piotr Caban : msvcp60/tests: Remove unneeded casts.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 2d4aac74089789107abe56c2685c54ee17d0e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4aac74089789107abe56c26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:13 2016 +0200 msvcp60/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 8 ++++---- dlls/msvcp60/tests/string.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index f121604..a79d51b 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1435,7 +1435,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); @@ -1460,7 +1460,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); @@ -1488,7 +1488,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &fs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); @@ -1511,7 +1511,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wfs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 2cbf025..f61ad4a 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -377,9 +377,9 @@ static void test_basic_string_char_swap(void) { strcpy(atmp1, "qwerty"); call_func3(p_basic_string_char_ctor_cstr_alloc, &str1, atmp1, &fake_allocator); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_char_dtor, &str1); /* str1 allocated, str2 local */ @@ -388,11 +388,11 @@ static void test_basic_string_char_swap(void) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str1, atmp1, &fake_allocator); call_func3(p_basic_string_char_ctor_cstr_alloc, &str2, atmp2, &fake_allocator); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); } @@ -580,8 +580,8 @@ static void test_basic_string_char_replace(void) { ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ok(ret == &str, "str = %p ret = %p\n", ret, &str); - ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", - tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + ok(strcmp(tests[i].ret, call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char*)call_func1(p_basic_string_char_cstr, ret)); call_func1(p_basic_string_char_dtor, &str); } @@ -667,9 +667,9 @@ static void test_basic_string_wchar_swap(void) { mbstowcs(wtmp1, "qwerty", 32); call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, wtmp1, &fake_allocator); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_wchar_dtor, &str1); /* str1 allocated, str2 local */ @@ -678,11 +678,11 @@ static void test_basic_string_wchar_swap(void) { call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, wtmp1, &fake_allocator); call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str2, wtmp2, &fake_allocator); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_wchar_dtor, &str1); call_func1(p_basic_string_wchar_dtor, &str2); }

1 0

Piotr Caban : msvcirt/tests: Remove unneeded casts.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 5c1b944a1c1c873c2090cbd7765a0a1ec3924f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1b944a1c1c873c2090cbd77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:06 2016 +0200 msvcirt/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 184 +++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c1b944a1c1c873c2090c…

1 0

Andrey Gusev : riched20/tests: Fix a typo in ok() messages.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 355a2162469e5efd6c622a4ebb7a73ab2f063c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a2162469e5efd6c622a4eb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:28:57 2016 +0300 riched20/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 92af700..200ce53 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8123,7 +8123,7 @@ static void test_reset_default_para_fmt( void ) SendMessageA( richedit, WM_CUT, 0, 0 ); SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); - ok( fmt.wAlignment == def_align, "got %d exppect %d\n", fmt.wAlignment, def_align ); + ok( fmt.wAlignment == def_align, "got %d expect %d\n", fmt.wAlignment, def_align ); DestroyWindow( richedit ); } @@ -8290,7 +8290,7 @@ static void test_alignment_style(void) SendMessageW(richedit, WM_CUT, 0, 0); SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); - ok(pf.wAlignment == align_mask[i], "got %d exppect %d\n", pf.wAlignment, align_mask[i]); + ok(pf.wAlignment == align_mask[i], "got %d expect %d\n", pf.wAlignment, align_mask[i]); DestroyWindow(richedit); }

1 0

Andrey Gusev : msvcp120/tests: Fix a typo in ok() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 362297c31958ef11e39e3f0e84dc396af48f3bb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362297c31958ef11e39e3f0e8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:26:35 2016 +0300 msvcp120/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 7c94906..354b2d3 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -592,7 +592,7 @@ static void test_xtime_get(void) diff = p__Xtime_diff_to_millis2(&after, &before); ok(diff >= tests[i], - "xtime_get() not functioning correctly, test: %d, expect: ge %d, got: %d\n", + "xtime_get() not functioning correctly, test: %d, expect: %d, got: %d\n", i, tests[i], diff); }

1 0

← Newer
1
2
3
4
5
6
7
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016