May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Recognize SM5+ patch input primitive types.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 7b01569e4431de9e037d5ae017299061242d2d65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b01569e4431de9e037d5ae01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 15 12:05:47 2017 +0200 wined3d: Recognize SM5+ patch input primitive types. In D3D11 geometry shaders accept patches as input primitives. This is forbidden in OpenGL as specified in the ARB_tessellation_shaders spec: "we will not allow geometry shaders to receive patches in this extension. That limitation may be relaxed in a future extension." 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/device.c | 6 ++++ dlls/wined3d/shader.c | 15 ++++++---- dlls/wined3d/shader_sm4.c | 67 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 8 ++++- include/wine/wined3d.h | 1 + 6 files changed, 79 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b01569e4431de9e037d5…

1 0

Józef Kucia : wined3d: Print FIXME() for unknown SM4+ primitive types.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: c8b2452e35f9af5d434d755c03b1c257c1698531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b2452e35f9af5d434d755c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 15 12:05:46 2017 +0200 wined3d: Print FIXME() for unknown SM4+ primitive types. 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_sm4.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 37624f7..f2f229f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -593,15 +593,13 @@ static void shader_sm4_read_dcl_output_topology(struct wined3d_shader_instructio enum wined3d_sm4_output_primitive_type primitive_type; primitive_type = (opcode_token & WINED3D_SM4_PRIMITIVE_TYPE_MASK) >> WINED3D_SM4_PRIMITIVE_TYPE_SHIFT; - if (primitive_type >= sizeof(output_primitive_type_table) / sizeof(*output_primitive_type_table)) - { - FIXME("Unhandled output primitive type %#x.\n", primitive_type); + if (primitive_type >= ARRAY_SIZE(output_primitive_type_table)) ins->declaration.primitive_type = WINED3D_PT_UNDEFINED; - } else - { ins->declaration.primitive_type = output_primitive_type_table[primitive_type]; - } + + if (ins->declaration.primitive_type == WINED3D_PT_UNDEFINED) + FIXME("Unhandled output primitive type %#x.\n", primitive_type); } static void shader_sm4_read_dcl_input_primitive(struct wined3d_shader_instruction *ins, @@ -611,15 +609,13 @@ static void shader_sm4_read_dcl_input_primitive(struct wined3d_shader_instructio enum wined3d_sm4_input_primitive_type primitive_type; primitive_type = (opcode_token & WINED3D_SM4_PRIMITIVE_TYPE_MASK) >> WINED3D_SM4_PRIMITIVE_TYPE_SHIFT; - if (primitive_type >= sizeof(input_primitive_type_table) / sizeof(*input_primitive_type_table)) - { - FIXME("Unhandled input primitive type %#x.\n", primitive_type); + if (primitive_type >= ARRAY_SIZE(input_primitive_type_table)) ins->declaration.primitive_type = WINED3D_PT_UNDEFINED; - } else - { ins->declaration.primitive_type = input_primitive_type_table[primitive_type]; - } + + if (ins->declaration.primitive_type == WINED3D_PT_UNDEFINED) + FIXME("Unhandled input primitive type %#x.\n", primitive_type); } static void shader_sm4_read_declaration_count(struct wined3d_shader_instruction *ins,

1 0

Nikolay Sivov : dwrite: Fix locale data buffer length passed to GetLocaleInfoEx().
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 842e2e53141aeafa860eb3544255cb22fc963fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842e2e53141aeafa860eb3544… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 15 12:41:01 2017 +0300 dwrite: Fix locale data buffer length passed to GetLocaleInfoEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5ae16a1..ede2e6d 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -31,6 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); extern const unsigned short wine_linebreak_table[] DECLSPEC_HIDDEN; extern const unsigned short wine_scripts_table[] DECLSPEC_HIDDEN; +/* Number of characters needed for LOCALE_SNATIVEDIGITS */ +#define NATIVE_DIGITS_LEN 11 + struct dwritescript_properties { DWRITE_SCRIPT_PROPERTIES props; UINT32 scripttag; /* OpenType script tag */ @@ -1065,7 +1068,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub switch (method) { case DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL: - GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_SNATIVEDIGITS, digits, sizeof(digits)/sizeof(digits[0])); + GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_SNATIVEDIGITS, digits, NATIVE_DIGITS_LEN); break; case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: @@ -1079,7 +1082,7 @@ static DWRITE_NUMBER_SUBSTITUTION_METHOD get_number_substitutes(IDWriteNumberSub break; } } - GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_SNATIVEDIGITS, digits, sizeof(digits)/sizeof(digits[0])); + GetLocaleInfoEx(numbersubst->locale, lctype | LOCALE_SNATIVEDIGITS, digits, NATIVE_DIGITS_LEN); break; default: ; @@ -1106,8 +1109,8 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, struct scriptshaping_context context; struct scriptshaping_cache *cache = NULL; BOOL update_cluster, need_vertical; + WCHAR digits[NATIVE_DIGITS_LEN]; IDWriteFontFace1 *fontface1; - WCHAR digits[11]; WCHAR *string; UINT32 i, g; HRESULT hr = S_OK;

1 0

Sven Hesse : wined3d: Implement SM4 continuec opcode.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: a86fee5e204a0d36bd437a8073025a2177ce4225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86fee5e204a0d36bd437a807… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Sun May 14 18:54:34 2017 +0200 wined3d: Implement SM4 continuec opcode. Works just like breakc and retc. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> 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 | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b1cf639..aa17fb1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5045,6 +5045,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CONTINUE */ NULL, + /* WINED3DSIH_CONTINUEP */ NULL, /* WINED3DSIH_COUNTBITS */ NULL, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e482926..ee27d10 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4886,6 +4886,7 @@ static void shader_glsl_conditional_op(const struct wined3d_shader_instruction * switch (ins->handler_idx) { case WINED3DSIH_BREAKP: op = "break"; break; + case WINED3DSIH_CONTINUEP: op = "continue"; break; case WINED3DSIH_RETP: op = "return"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -10003,6 +10004,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CONTINUE */ shader_glsl_continue, + /* WINED3DSIH_CONTINUEP */ shader_glsl_conditional_op, /* WINED3DSIH_COUNTBITS */ shader_glsl_map2gl, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5717767..4b9aecc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -65,6 +65,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CONTINUE */ "continue", + /* WINED3DSIH_CONTINUEP */ "continuec", /* WINED3DSIH_COUNTBITS */ "countbits", /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 601a639..37624f7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -122,6 +122,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CASE = 0x06, WINED3D_SM4_OP_CONTINUE = 0x07, + WINED3D_SM4_OP_CONTINUEC = 0x08, WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DEFAULT = 0x0a, WINED3D_SM4_OP_DERIV_RTX = 0x0b, @@ -840,6 +841,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, {WINED3D_SM4_OP_CONTINUE, WINED3DSIH_CONTINUE, "", ""}, + {WINED3D_SM4_OP_CONTINUEC, WINED3DSIH_CONTINUEP, "", "u", + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38e5a45..3766648 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -690,6 +690,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CMP, WINED3DSIH_CND, WINED3DSIH_CONTINUE, + WINED3DSIH_CONTINUEP, WINED3DSIH_COUNTBITS, WINED3DSIH_CRS, WINED3DSIH_CUT,

1 0

Hans Leidekker : webservices: Implement WS_XML_WRITER_PROPERTY_BUFFERS.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 87522d67cfdeac45ffe25e4ad0a7dbade811f612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87522d67cfdeac45ffe25e4ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:24 2017 +0200 webservices: Implement WS_XML_WRITER_PROPERTY_BUFFERS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 14 +++++++++----- dlls/webservices/writer.c | 13 +++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 0d5fa2a..4dfa1db 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1969,6 +1969,7 @@ static void test_WsCopyNode(void) WS_XML_WRITER *writer; WS_XML_READER *reader; WS_XML_BUFFER *buffer; + WS_BUFFERS bufs; WS_HEAP *heap; HRESULT hr; @@ -2049,20 +2050,23 @@ static void test_WsCopyNode(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_BOF, "got %u\n", node->nodeType ); - hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); - ok( hr == S_OK, "got %08x\n", hr ); - - hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCopyNode( writer, reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output_buffer( buffer, "<v/>", __LINE__ ); + check_output( writer, "<v/>", __LINE__ ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + memset( &bufs, 0, sizeof(bufs) ); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFERS, &bufs, sizeof(bufs), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( bufs.bufferCount == 1, "got %u\n", bufs.bufferCount ); + ok( bufs.buffers != NULL, "buffers not set\n" ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b9ddb39..421b79d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -293,6 +293,19 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT } break; } + case WS_XML_WRITER_PROPERTY_BUFFERS: + if (writer->output_buf->bytes.length) + { + WS_BUFFERS *buffers = buf; + if (size != sizeof(*buffers)) hr = E_INVALIDARG; + else + { + buffers->bufferCount = 1; + buffers->buffers = &writer->output_buf->bytes; + } + break; + } + /* fall through */ default: hr = prop_get( writer->prop, writer->prop_count, id, buf, size ); }

1 0

Hans Leidekker : webservices: Fix duplicating attributes.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: eaf2cd11aef7696bf1ec3f854ade8641b38fbb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf2cd11aef7696bf1ec3f854… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 15 09:59:22 2017 +0200 webservices: Fix duplicating attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 85a6dc9..4e7211f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -151,16 +151,28 @@ void destroy_nodes( struct node *node ) static WS_XML_ATTRIBUTE *dup_attribute( const WS_XML_ATTRIBUTE *src ) { WS_XML_ATTRIBUTE *dst; - const WS_XML_STRING *prefix = (src->prefix && src->prefix->length) ? src->prefix : NULL; + const WS_XML_STRING *prefix = src->prefix; const WS_XML_STRING *localname = src->localName; const WS_XML_STRING *ns = src->localName; + const WS_XML_TEXT *text = src->value; if (!(dst = heap_alloc( sizeof(*dst) ))) return NULL; dst->singleQuote = src->singleQuote; dst->isXmlNs = src->isXmlNs; - if (prefix && !(dst->prefix = alloc_xml_string( prefix->bytes, prefix->length ))) goto error; - if (localname && !(dst->localName = alloc_xml_string( localname->bytes, localname->length ))) goto error; - if (ns && !(dst->ns = alloc_xml_string( ns->bytes, ns->length ))) goto error; + + if (!prefix) dst->prefix = NULL; + else if (!(dst->prefix = alloc_xml_string( prefix->bytes, prefix->length ))) goto error; + if (!(dst->localName = alloc_xml_string( localname->bytes, localname->length ))) goto error; + if (!(dst->ns = alloc_xml_string( ns->bytes, ns->length ))) goto error; + + if (text) + { + WS_XML_UTF8_TEXT *utf8; + const WS_XML_UTF8_TEXT *utf8_src = (const WS_XML_UTF8_TEXT *)text; + if (!(utf8 = alloc_utf8_text( utf8_src->value.bytes, utf8_src->value.length ))) goto error; + dst->value = &utf8->text; + } + return dst; error: @@ -223,7 +235,7 @@ static struct node *dup_text_node( const WS_XML_TEXT_NODE *src ) if (src->text) { WS_XML_UTF8_TEXT *utf8; - const WS_XML_UTF8_TEXT *utf8_src = (WS_XML_UTF8_TEXT *)src->text; + const WS_XML_UTF8_TEXT *utf8_src = (const WS_XML_UTF8_TEXT *)src->text; if (!(utf8 = alloc_utf8_text( utf8_src->value.bytes, utf8_src->value.length ))) { free_node( node );

1 0

Nikolay Sivov : dwrite/tests: Fix rendering mode variable type (Coverity).
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 74a9894819df4323be60e9c397a0d5c41a3b7592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a9894819df4323be60e9c39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 15 07:09:56 2017 +0300 dwrite/tests: Fix rendering mode variable type (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f1fef78..35be12e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5917,8 +5917,8 @@ static void test_GetRecommendedRenderingMode(void) mode1 = IDWriteRenderingParams3_GetRenderingMode1(params3); ok(mode1 == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED, "got %d\n", mode1); - mode1 = IDWriteRenderingParams3_GetRenderingMode(params3); - ok(mode1 == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC, "got %d\n", mode1); + mode = IDWriteRenderingParams3_GetRenderingMode(params3); + ok(mode == DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, "got %d\n", mode); hr = IDWriteRenderingParams3_QueryInterface(params3, &IID_IDWriteRenderingParams, (void**)&params); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Paul Gofman : d3dx9/tests: Add more tests for out of bounds array selector.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: be12c5bc4f189901541fdca41da267f8a0ef873d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be12c5bc4f189901541fdca41… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 12 15:24:12 2017 +0300 d3dx9/tests: Add more tests for out of bounds array selector. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 49 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index a1cdfc2..7991b80 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4695,6 +4695,11 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4703,13 +4708,51 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) effect->lpVtbl->EndPass(effect); + /* Second try reports success and selects array element used previously. + * Probably array index is not recomputed and previous index value is used. */ hr = effect->lpVtbl->BeginPass(effect, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_compare_shader(device, 2, TRUE); + /* Confirm that array element selected is the previous good one and does not depend + * on computed (out of bound) index value. */ + ivect[2] = 1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader(device, 1, FALSE); hr = effect->lpVtbl->EndPass(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); + ivect[2] = 3; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine + ok(hr == E_FAIL, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader(device, 1, TRUE); + + /* End and begin effect again to ensure it will not trigger array + * index recompute and error return from BeginPass. */ + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + test_effect_preshader_compare_shader(device, 1, TRUE); + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4730,7 +4773,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->BeginPass(effect, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_compare_shader(device, 2, TRUE); + test_effect_preshader_compare_shader(device, 1, TRUE); hr = effect->lpVtbl->EndPass(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4773,7 +4816,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->CommitChanges(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr); - test_effect_preshader_compare_shader(device, 1, FALSE); + test_effect_preshader_compare_shader(device, 1, TRUE); hr = effect->lpVtbl->EndPass(effect); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Józef Kucia : d3d11/tests: Remove dead assignments.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 5105be59861879b5edbbf25095149154bf27d987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5105be59861879b5edbbf2509… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 15 12:05:43 2017 +0200 d3d11/tests: Remove dead assignments. 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/d3d11/tests/d3d11.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8008893..5b85845 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2507,7 +2507,6 @@ static void test_create_buffer(void) buffer = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, 1024, NULL); hr = check_interface(buffer, &IID_ID3D10Buffer, TRUE, TRUE); /* Not available on all Windows versions. */ ID3D11Buffer_Release(buffer); - if (FAILED(hr)) { win_skip("Buffers do not implement ID3D10Buffer.\n"); @@ -4323,8 +4322,8 @@ static void test_create_blend_state(void) } /* Not available on all Windows versions. */ - hr = check_interface(blend_state1, &IID_ID3D10BlendState, TRUE, TRUE); - hr = check_interface(blend_state1, &IID_ID3D10BlendState1, TRUE, TRUE); + check_interface(blend_state1, &IID_ID3D10BlendState, TRUE, TRUE); + check_interface(blend_state1, &IID_ID3D10BlendState1, TRUE, TRUE); refcount = ID3D11BlendState_Release(blend_state1); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); @@ -4434,7 +4433,7 @@ static void test_create_depthstencil_state(void) ID3D11Device_Release(tmp); /* Not available on all Windows versions. */ - hr = check_interface(ds_state1, &IID_ID3D10DepthStencilState, TRUE, TRUE); + check_interface(ds_state1, &IID_ID3D10DepthStencilState, TRUE, TRUE); refcount = ID3D11DepthStencilState_Release(ds_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Alexandre Julliard : configure: Make warning messages consistent.
by Alexandre Julliard May 15, 2017

May 15, 2017

Module: wine Branch: master Commit: 7cc41589a9dd0677c6fa38949d1d7e416c48fe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc41589a9dd0677c6fa38949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 15 19:57:51 2017 +0200 configure: Make warning messages consistent. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 68717e9..15f618d 100755 --- a/configure +++ b/configure @@ -11741,7 +11741,7 @@ if test "x$ac_cv_func_gnutls_hash" = xyes; then : _ACEOF else - as_fn_append wine_notices "|libgnutls ${notice_platform}development files too old, no bcrypt hash support." + as_fn_append wine_notices "|libgnutls ${notice_platform}development files too old, bcrypt hashes won't be supported." fi done @@ -12872,9 +12872,9 @@ test -z "$GSTREAMER_LIBS" || GSTREAMER_LIBS=`echo " $GSTREAMER_LIBS" | sed 's/ - fi if test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ; then : case "x$with_gstreamer" in - x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled" ;; + x) as_fn_append wine_notices "|gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported." ;; xno) ;; - *) as_fn_error $? "gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled + *) as_fn_error $? "gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported. This is an error since --with-gstreamer was requested." "$LINENO" 5 ;; esac @@ -13930,9 +13930,9 @@ fi fi if test "x$ac_cv_lib_openal" != xyes; then : case "x$with_openal" in - x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported" ;; + x) as_fn_append wine_notices "|libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported." ;; xno) ;; - *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported + *) as_fn_error $? "libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported. This is an error since --with-openal was requested." "$LINENO" 5 ;; esac enable_openal32=${enable_openal32:-no} @@ -13971,7 +13971,7 @@ $as_echo "$ac_cv_have_openalsoft" >&6; } fi if test "x$ac_cv_have_openalsoft" != xyes then - as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported" + as_fn_append wine_notices "|openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported." enable_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no} diff --git a/configure.ac b/configure.ac index 74be5f0..2e76d5a 100644 --- a/configure.ac +++ b/configure.ac @@ -1266,7 +1266,7 @@ then #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[[libgnutls\$-deb0\$\\{0,1\\}]]) WINE_CHECK_LIB_FUNCS(gnutls_hash,[$GNUTLS_LIBS],, - [WINE_NOTICE([libgnutls ${notice_platform}development files too old, no bcrypt hash support.])])])], + [WINE_NOTICE([libgnutls ${notice_platform}development files too old, bcrypt hashes won't be supported.])])])], [GNUTLS_CFLAGS=""])]) fi WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"], @@ -1481,7 +1481,7 @@ then WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, gstreamer support disabled]) + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x **** @@ -1657,7 +1657,7 @@ then AC_DEFINE_UNQUOTED(HAVE_OPENAL,1,[Define to 1 if OpenAL is available])],,) fi WINE_NOTICE_WITH(openal,[test "x$ac_cv_lib_openal" != xyes], - [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported], + [libopenal ${notice_platform}development files not found (or too old), OpenAL won't be supported.], [enable_openal32]) dnl **** Check for openal-soft **** @@ -1672,7 +1672,7 @@ LPALCRENDERSAMPLESSOFT x;]])],[ac_cv_have_openalsoft=yes],[ac_cv_have_openalsoft fi if test "x$ac_cv_have_openalsoft" != xyes then - WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported]) + WINE_NOTICE([openal-soft ${notice_platform}development files not found (or too old), XAudio2 won't be supported.]) enable_x3daudio1_0=${enable_x3daudio1_0:-no} enable_x3daudio1_1=${enable_x3daudio1_1:-no} enable_x3daudio1_2=${enable_x3daudio1_2:-no}

1 0