wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Hans Leidekker : webservices: Implement WsWriteQualifiedName.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 992da703397758445f4190f24dfa2c2ea684fb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992da703397758445f4190f24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:47 2017 +0200 webservices: Implement WsWriteQualifiedName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 79 ++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 84 +++++++++++++++++++++++++++++++++++++++ include/webservices.h | 2 + 4 files changed, 166 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 8cd9762..3d01245 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3036,6 +3036,84 @@ static void test_repeating_element(void) WsFreeWriter( writer ); } +static const WS_XML_STRING *init_xmlstring( const char *src, WS_XML_STRING *str ) +{ + if (!src) return NULL; + str->length = strlen( src ); + str->bytes = (BYTE *)src; + return str; +} + +static void test_WsWriteQualifiedName(void) +{ + WS_XML_STRING prefix = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, ns = {2, (BYTE *)"ns"}; + WS_XML_WRITER *writer; + HRESULT hr; + ULONG i; + static const struct + { + const char *prefix; + const char *localname; + const char *ns; + HRESULT hr; + const char *result; + } tests[] = + { + { NULL, NULL, NULL, E_INVALIDARG, NULL }, + { NULL, "t2", NULL, E_INVALIDARG, NULL }, + { "p2", "t2", NULL, S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { NULL, "t2", "ns2", WS_E_INVALID_FORMAT, NULL }, + { NULL, "t2", "ns", S_OK, "<p:t xmlns:p=\"ns\">p:t2" }, + { "p2", "t2", "ns2", S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { "p2", "t2", "ns", S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { "p", "t", NULL, S_OK, "<p:t xmlns:p=\"ns\">p:t" }, + { NULL, "t", "ns", S_OK, "<p:t xmlns:p=\"ns\">p:t" }, + { "p2", "", "", S_OK, "<p:t xmlns:p=\"ns\">p2:" }, + { "p2", "", "ns2", S_OK, "<p:t xmlns:p=\"ns\">p2:" }, + { "p2", "t2", "", S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { "", "t2", "", S_OK, "<p:t xmlns:p=\"ns\">t2" }, + { "", "", "ns2", S_OK, "<p:t xmlns:p=\"ns\">" }, + { "", "", "", S_OK, "<p:t xmlns:p=\"ns\">" }, + }; + + hr = WsWriteQualifiedName( NULL, NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + WS_XML_STRING prefix2, localname2, ns2; + const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; + + hr = set_output( writer ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + prefix_ptr = init_xmlstring( tests[i].prefix, &prefix2 ); + localname_ptr = init_xmlstring( tests[i].localname, &localname2 ); + ns_ptr = init_xmlstring( tests[i].ns, &ns2 ); + + hr = WsWriteQualifiedName( writer, prefix_ptr, localname_ptr, ns_ptr, NULL ); + ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + if (tests[i].hr == S_OK && hr == S_OK) check_output( writer, tests[i].result, __LINE__ ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3069,4 +3147,5 @@ START_TEST(writer) test_write_option(); test_datetime(); test_repeating_element(); + test_WsWriteQualifiedName(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index aa9b58f..e63b805 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -180,7 +180,7 @@ @ stdcall WsWriteMessageEnd(ptr ptr ptr ptr) @ stdcall WsWriteMessageStart(ptr ptr ptr ptr) @ stdcall WsWriteNode(ptr ptr ptr) -@ stub WsWriteQualifiedName +@ stdcall WsWriteQualifiedName(ptr ptr ptr ptr ptr) @ stdcall WsWriteStartAttribute(ptr ptr ptr ptr long ptr) @ stdcall WsWriteStartCData(ptr ptr) @ stdcall WsWriteStartElement(ptr ptr ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4c9f1a9..4fd1126 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2800,6 +2800,90 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING return hr; } +static HRESULT find_prefix( struct writer *writer, const WS_XML_STRING *ns, const WS_XML_STRING **prefix ) +{ + const struct node *node; + for (node = writer->current; node_type( node ) == WS_XML_NODE_TYPE_ELEMENT; node = node->parent) + { + const WS_XML_ELEMENT_NODE *elem = &node->hdr; + ULONG i; + for (i = 0; i < elem->attributeCount; i++) + { + if (!elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) != S_OK) continue; + *prefix = elem->attributes[i]->prefix; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; +} + +static HRESULT write_qualified_name( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) +{ + HRESULT hr; + if (prefix->length) + { + if ((hr = write_grow_buffer( writer, prefix->length + localname->length + 1 )) != S_OK) return hr; + write_bytes( writer, prefix->bytes, prefix->length ); + write_char( writer, ':' ); + } + else if ((hr = write_grow_buffer( writer, localname->length )) != S_OK) return hr; + write_bytes( writer, localname->bytes, localname->length ); + return S_OK; +} + +/************************************************************************** + * WsWriteQualifiedName [webservices.@] + */ +HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %s %s %s %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), + debugstr_xmlstr(ns), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + if (writer->state != WRITER_STATE_STARTELEMENT) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_FORMAT; + } + + if (!localname || (!prefix && !ns)) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if ((hr = write_flush( writer )) != S_OK) goto done; + if (!prefix && ((hr = find_prefix( writer, ns, &prefix )) != S_OK)) goto done; + hr = write_qualified_name( writer, prefix, localname ); + +done: + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_move_to( struct writer *writer, WS_MOVE_TO move, BOOL *found ) { BOOL success = FALSE; diff --git a/include/webservices.h b/include/webservices.h index 783a6ae..a0857f6 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1675,6 +1675,8 @@ HRESULT WINAPI WsWriteEnvelopeStart(WS_MESSAGE*, WS_XML_WRITER*, WS_MESSAGE_DONE HRESULT WINAPI WsWriteMessageStart(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteMessageEnd(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteNode(WS_XML_WRITER*, const WS_XML_NODE*, WS_ERROR*); +HRESULT WINAPI WsWriteQualifiedName(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, + const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, WS_ERROR*); HRESULT WINAPI WsWriteStartCData(WS_XML_WRITER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Support appending text with multiple WsWriteText calls.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 40b5dc95412f99bfd0322a52ee2c8d2b76a44d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b5dc95412f99bfd0322a52e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:46 2017 +0200 webservices: Support appending text with multiple WsWriteText calls. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 175 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 130 ++++++++++++++++++++++------- 2 files changed, 276 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b5dc95412f99bfd0322…

1 0

Alexandre Julliard : configure: Add a separate variable for wineloader-specific flags.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 655e5e8c70c361d43a644fb3fe3b24fd3064d092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e5e8c70c361d43a644fb3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 11:57:05 2017 +0200 configure: Add a separate variable for wineloader-specific flags. And apply the common link flags also to the wineserver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 22 ++++++++++++---------- configure.ac | 20 ++++++++++---------- loader/Makefile.in | 4 ++-- server/Makefile.in | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=655e5e8c70c361d43a644…

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 61d4ea17cb55c84bb624577d1fd7b72a02e71064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d4ea17cb55c84bb624577d1… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Apr 27 20:55:37 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b9679f7..0e83766 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -12101,10 +12101,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Kan ikke slette registerklassen \"%1\".\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Linjen \"%1\" ble ikke gjenkjent.\n" +msgstr "regedit: Linjen inneholder ugyldig syntaks.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Paul Gofman : d3dx9: Downgrade unknown DWORD FIXMEs() to WARN() messages.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 0750e758cc46bcf9bd58c208a815e74729de85f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0750e758cc46bcf9bd58c208a… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:52 2017 +0300 d3dx9: Downgrade unknown DWORD FIXMEs() to WARN() messages. 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/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a55c20b..6a5afff 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -425,11 +425,11 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) unsigned int i; DWORD d; - FIXME("Skipping %u unknown DWORDs:\n", count); + WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) { read_dword(ptr, &d); - FIXME("\t0x%08x\n", d); + WARN("\t0x%08x\n", d); } }

1 0

Paul Gofman : d3dx9: Remove unused parameter 'effect' from d3dx9_get_param_value_ptr().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: f0e9dea59c320987124fa8ab8456ce27c5731e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e9dea59c320987124fa8ab8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:51 2017 +0300 d3dx9: Remove unused parameter 'effect' from d3dx9_get_param_value_ptr(). 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/effect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c2fb1d0..a55c20b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2578,8 +2578,8 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base, return E_NOTIMPL; } -static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, - struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, +static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, + void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) { struct d3dx_parameter *param = &state->parameter; @@ -2881,7 +2881,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas TRACE("operation %u, index %u, type %u.\n", state->operation, state->index, state->type); - if (FAILED(hr = d3dx9_get_param_value_ptr(effect, pass, state, &param_value, &param, + if (FAILED(hr = d3dx9_get_param_value_ptr(pass, state, &param_value, &param, update_all, &param_dirty))) { if (hr == E_FAIL)

1 0

Paul Gofman : d3dx9: Set reg_component_count to 4 for immediate constants.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: b4cac62546ab9bc170eda1b065e143704f53c2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cac62546ab9bc170eda1b06… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 00:53:46 2017 +0200 d3dx9: Set reg_component_count to 4 for immediate constants. 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/preshader.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index a5a8bb7..b17d0b5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -155,7 +155,7 @@ static const struct } table_info[] = { - {sizeof(double), 1, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ + {sizeof(double), 4, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ {sizeof(float), 4, PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ {sizeof(BOOL), 1, PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ @@ -653,7 +653,7 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) static void dump_preshader(struct d3dx_preshader *pres) { - unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED]; + unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED] * 4; const double *immediates = pres->regs.tables[PRES_REGTAB_IMMED]; if (immediate_count) @@ -747,7 +747,14 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count; + if (const_count % table_info[PRES_REGTAB_IMMED].reg_component_count) + { + FIXME("const_count %u is not a multiple of %u.\n", const_count, + table_info[PRES_REGTAB_IMMED].reg_component_count); + return D3DXERR_INVALIDDATA; + } + pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count + / table_info[PRES_REGTAB_IMMED].reg_component_count; update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) @@ -1183,9 +1190,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper else base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset)); - /* '4' is used instead of reg_component_count, as immediate constants (which have - * reg_component_count of 1) are still indexed as 4 values according to the tests. */ - offset = base_index * 4 + opr->reg.offset + comp; + offset = base_index * table_info[table].reg_component_count + opr->reg.offset + comp; reg_index = offset / table_info[table].reg_component_count; if (reg_index >= rs->table_sizes[table])

1 0

Paul Gofman : d3dx9: Return an error for out of bounds input register in parse_preshader().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 30bc3bab3090dce8e96880fb9f0026473dc18379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30bc3bab3090dce8e96880fb9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:46 2017 +0300 d3dx9: Return an error for out of bounds input register in parse_preshader(). 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/preshader.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 0f23488..a5a8bb7 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -749,6 +749,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count; + update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); for (i = 0; i < pres->ins_count; ++i) { for (j = 0; j < pres_op_info[pres->ins[i].op].input_count; ++j) @@ -770,13 +771,17 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u table = pres->ins[i].inputs[j].index_reg.table; reg_idx = get_reg_offset(table, pres->ins[i].inputs[j].index_reg.offset); } - update_table_size(pres->regs.table_sizes, table, reg_idx); + if (reg_idx >= pres->regs.table_sizes[table]) + { + FIXME("Out of bounds register index, i %u, j %u, table %u, reg_idx %u.", + i, j, table, reg_idx); + return D3DXERR_INVALIDDATA; + } } update_table_size(pres->regs.table_sizes, pres->ins[i].output.reg.table, get_reg_offset(pres->ins[i].output.reg.table, pres->ins[i].output.reg.offset + pres->ins[i].component_count - 1)); } - update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs); if (FAILED(regstore_alloc_table(&pres->regs, PRES_REGTAB_IMMED))) return E_OUTOFMEMORY; regstore_set_values(&pres->regs, PRES_REGTAB_IMMED, dconst, 0, const_count);

1 0

Paul Gofman : d3dx9/tests: Fix test blob data corruption in test_preshader_op().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 5b38f1cf2e88a9f1af881a19b4ac2cd2dda07d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b38f1cf2e88a9f1af881a19b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 27 14:05:44 2017 +0300 d3dx9/tests: Fix test blob data corruption in test_preshader_op(). 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f7d7ba8..997c1fc 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4415,12 +4415,13 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe { unsigned int pos; unsigned int result_index; + unsigned int ins_count; } blob_position[] = { - {0, 0}, - {5549, 0}, - {5400, 2} + {0, 0, 0}, + {5549, 0, 4}, + {5400, 2, 1} }; DWORD *test_effect_blob; HRESULT hr; @@ -4436,7 +4437,7 @@ static void test_preshader_op(IDirect3DDevice9 *device, const DWORD *sample_effe test_effect_blob = HeapAlloc(GetProcessHeap(), 0, sample_effect_blob_size); memcpy(test_effect_blob, sample_effect_blob, sample_effect_blob_size); - for (i = 0; i < 4; ++i) + for (i = 0; i < blob_position[test->args_count].ins_count; ++i) test_effect_blob[op_pos + i * op_step] = test->opcode; hr = D3DXCreateEffect(device, test_effect_blob, sample_effect_blob_size,

1 0

Paul Gofman : d3dx9: Fix register index for the scalar op case in parse_preshader().
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 905421351f0cafec94fa1c0be28de23f7ea65214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905421351f0cafec94fa1c0be… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 00:10:15 2017 +0200 d3dx9: Fix register index for the scalar op case in parse_preshader(). 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/preshader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 896aca5..0f23488 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -758,9 +758,12 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (pres->ins[i].inputs[j].index_reg.table == PRES_REGTAB_COUNT) { + unsigned int last_component_index = pres->ins[i].scalar_op && !j ? 0 + : pres->ins[i].component_count - 1; + table = pres->ins[i].inputs[j].reg.table; reg_idx = get_reg_offset(table, pres->ins[i].inputs[j].reg.offset - + pres->ins[i].component_count - 1); + + last_component_index); } else {

1 0

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 April 2017