wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Paul Gofman : d3dx9: Implement preshaders disassembly dump.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: b76ee0c7f8d82aba4710981417c79581264662aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76ee0c7f8d82aba471098141… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 1 14:21:23 2016 +0300 d3dx9: Implement preshaders disassembly dump. 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 | 73 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3ef818b..67b4d65 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -86,6 +86,11 @@ table_info[] = {sizeof(float), 4, PRES_VT_FLOAT } /* PRES_REGTAB_TEMP */ }; +static const char *table_symbol[] = +{ + "imm", "c", "oc", "ob", "oi", "r", "(null)", +}; + static const enum pres_reg_tables pres_regset2table[] = { PRES_REGTAB_OBCONST, /* D3DXRS_BOOL */ @@ -410,6 +415,65 @@ static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_con } } +static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *arg, int component_count) +{ + static const char *xyzw_str = "xyzw"; + unsigned int i, table; + + table = arg->table; + if (table == PRES_REGTAB_IMMED) + { + TRACE("("); + for (i = 0; i < component_count; ++i) + TRACE(i < component_count - 1 ? "%.16e, " : "%.16e", + ((double *)rs->tables[PRES_REGTAB_IMMED])[arg->offset + i]); + TRACE(")"); + } + else + { + TRACE("%s%u.", table_symbol[table], get_reg_offset(table, arg->offset)); + for (i = 0; i < component_count; ++i) + TRACE("%c", xyzw_str[(arg->offset + i) % 4]); + } +} + +static void dump_registers(struct d3dx_const_tab *ctab) +{ + unsigned int table, i; + + for (i = 0; i < ctab->input_count; ++i) + { + table = ctab->regset2table[ctab->inputs[i].RegisterSet]; + TRACE("// %-12s %s%-4u %u\n", ctab->inputs_param[i] ? ctab->inputs_param[i]->name : "(nil)", + table_symbol[table], ctab->inputs[i].RegisterIndex, ctab->inputs[i].RegisterCount); + } +} + +static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins) +{ + unsigned int i; + + TRACE(" %s ", pres_op_info[ins->op].mnem); + dump_arg(rs, &ins->output, pres_op_info[ins->op].func_all_comps ? 1 : ins->component_count); + for (i = 0; i < pres_op_info[ins->op].input_count; ++i) + { + TRACE(", "); + dump_arg(rs, &ins->inputs[i], ins->scalar_op && !i ? 1 : ins->component_count); + } + TRACE("\n"); +} + +static void dump_preshader(struct d3dx_preshader *pres) +{ + unsigned int i; + + TRACE("// Preshader registers:\n"); + dump_registers(&pres->inputs); + TRACE(" preshader\n"); + for (i = 0; i < pres->ins_count; ++i) + dump_ins(&pres->regs, &pres->ins[i]); +} + static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, unsigned int count, struct d3dx9_base_effect *base) { unsigned int *p; @@ -579,8 +643,15 @@ void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_co } if (TRACE_ON(d3dx)) + { dump_bytecode(byte_code, byte_code_size); - + dump_preshader(&peval->pres); + if (shader) + { + TRACE("// Shader registers:\n"); + dump_registers(&peval->shader_inputs); + } + } *peval_out = peval; TRACE("Created parameter evaluator %p.\n", *peval_out); return;

1 0

Paul Gofman : d3dx9: Implement preshader parsing.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 9b3e942ffcc71b0742df842f3d8e77d5640a2a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b3e942ffcc71b0742df842f3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 1 14:21:22 2016 +0300 d3dx9: Implement preshader parsing. 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/d3dx9_private.h | 54 +++- dlls/d3dx9_36/preshader.c | 587 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 635 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b3e942ffcc71b0742df8…

1 0

Alistair Leslie-Hughes : d3dx10: Add D3DX10UnsetAllDeviceObjects stub.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: e2da1a4ee1b6d6a1ae01dc8c8b98f44d5d87722a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da1a4ee1b6d6a1ae01dc8c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 1 17:44:54 2016 +1100 d3dx10: Add D3DX10UnsetAllDeviceObjects stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10core.idl | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 9edcf54..0673f6a 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -64,7 +64,7 @@ @ stub D3DX10SaveTextureToFileA(ptr ptr str) @ stub D3DX10SaveTextureToFileW(ptr ptr wstr) @ stub D3DX10SaveTextureToMemory(ptr ptr ptr long) -@ stub D3DX10UnsetAllDeviceObjects(ptr) +@ stdcall D3DX10UnsetAllDeviceObjects(ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXColorAdjustContrast(ptr ptr float) d3dx9_36.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 6637af3..fa4fa79 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -116,3 +116,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz return E_NOTIMPL; } + +HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) +{ + FIXME("device %p stub.\n", device); + + return E_NOTIMPL; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index f0d8ff6..0e2bf31 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -64,3 +64,5 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); }; + +cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);")

1 0

Hans Leidekker : webservices: Always skip comment and empty text nodes in WsReadType.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 54a6db3d9b7ae4965ad427ceee14689bf634ed12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a6db3d9b7ae4965ad427cee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:54 2016 +0200 webservices: Always skip comment and empty text nodes in WsReadType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 122 ++++++++++++++++++++++------------------ dlls/webservices/tests/reader.c | 2 +- 2 files changed, 67 insertions(+), 57 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index eb16427..8191aa5 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2541,6 +2541,57 @@ static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static BOOL is_empty_text_node( const struct node *node ) +{ + const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; + const WS_XML_UTF8_TEXT *utf8; + ULONG i; + + if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE; + if (text->text->textType != WS_XML_TEXT_TYPE_UTF8) + { + ERR( "unhandled text type %u\n", text->text->textType ); + return FALSE; + } + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + for (i = 0; i < utf8->value.length; i++) if (!read_isspace( utf8->value.bytes[i] )) return FALSE; + return TRUE; +} + +/* skips comment and empty text nodes */ +static HRESULT read_type_next_node( struct reader *reader ) +{ + for (;;) + { + HRESULT hr; + WS_XML_NODE_TYPE type; + + if ((hr = read_node( reader )) != S_OK) return hr; + type = node_type( reader->current ); + if (type == WS_XML_NODE_TYPE_COMMENT || + (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; + return S_OK; + } +} + +static HRESULT read_type_next_element_node( struct reader *reader, const WS_XML_STRING *localname, + const WS_XML_STRING *ns ) +{ + const WS_XML_ELEMENT_NODE *elem; + HRESULT hr; + BOOL found; + + if (!localname) return S_OK; /* assume reader is already correctly positioned */ + if ((hr = read_to_startelement( reader, &found )) != S_OK) return hr; + if (!found) return WS_E_INVALID_FORMAT; + + elem = &reader->current->hdr; + if (WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && + WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) return S_OK; + + return read_type_next_node( reader ); +} + static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) { switch (type) @@ -2589,7 +2640,8 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL if (size != sizeof(void *)) return E_INVALIDARG; /* wrapper element */ - if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; + if (desc->localName && ((hr = read_type_next_element_node( reader, desc->localName, desc->ns )) != S_OK)) + return hr; item_size = get_type_size( desc->type, desc->typeDescription ); if (!(buf = ws_alloc_zero( heap, item_size ))) return WS_E_QUOTA_EXCEEDED; @@ -2609,16 +2661,11 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL ws_free( heap, buf ); return hr; } - if ((hr = read_node( reader )) != S_OK) - { - ws_free( heap, buf ); - return hr; - } offset += item_size; nb_items++; } - if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; + if (desc->localName && ((hr = read_type_next_node( reader )) != S_OK)) return hr; if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount)) { @@ -2722,7 +2769,6 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES return E_NOTIMPL; } - if (hr == WS_E_INVALID_FORMAT && desc->options & WS_FIELD_OPTIONAL) { switch (option) @@ -2815,51 +2861,6 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, } } -static BOOL is_empty_text_node( const struct node *node ) -{ - const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; - const WS_XML_UTF8_TEXT *utf8; - ULONG i; - - if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE; - if (text->text->textType != WS_XML_TEXT_TYPE_UTF8) - { - ERR( "unhandled text type %u\n", text->text->textType ); - return FALSE; - } - utf8 = (const WS_XML_UTF8_TEXT *)text->text; - for (i = 0; i < utf8->value.length; i++) if (!read_isspace( utf8->value.bytes[i] )) return FALSE; - return TRUE; -} - -static HRESULT read_type_next_node( struct reader *reader, const WS_XML_STRING *localname, - const WS_XML_STRING *ns ) -{ - const WS_XML_ELEMENT_NODE *elem; - WS_XML_NODE_TYPE type; - HRESULT hr; - BOOL found; - - if (!localname) return S_OK; /* assume reader is already correctly positioned */ - if ((hr = read_to_startelement( reader, &found ) != S_OK)) return hr; - if (!found) return WS_E_INVALID_FORMAT; - - elem = &reader->current->hdr; - if (WsXmlStringEquals( localname, elem->localName, NULL ) == S_OK && - WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) return S_OK; - - for (;;) - { - if ((hr = read_node( reader ) != S_OK)) return hr; - type = node_type( reader->current ); - if (type == WS_XML_NODE_TYPE_COMMENT || - (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; - break; - } - - return S_OK; -} - static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, WS_READ_OPTION option, WS_HEAP *heap, @@ -2871,7 +2872,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP { case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: - if ((hr = read_type_next_node( reader, localname, ns )) != S_OK) return hr; + if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; break; case WS_ATTRIBUTE_TYPE_MAPPING: @@ -2948,7 +2949,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP { case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: - return read_node( reader ); + return read_type_next_node( reader ); case WS_ATTRIBUTE_TYPE_MAPPING: default: @@ -2975,7 +2976,16 @@ HRESULT WINAPI WsReadType( WS_XML_READER *handle, WS_TYPE_MAPPING mapping, WS_TY if ((hr = read_type( reader, mapping, type, NULL, NULL, desc, option, heap, value, size )) != S_OK) return hr; - if ((hr = read_node( reader )) != S_OK) return hr; + switch (mapping) + { + case WS_ELEMENT_TYPE_MAPPING: + if ((hr = read_node( reader )) != S_OK) return hr; + break; + + default: + break; + } + if (!read_end_of_data( reader )) return WS_E_INVALID_FORMAT; return S_OK; } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index b7ef0ca..7384cba 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2644,7 +2644,7 @@ static void test_complex_struct_type(void) hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); WsFreeReader( reader ); WsFreeHeap( heap );

1 0

Hans Leidekker : webservices: Reset the read position if an opening bracket is not followed by a valid name character.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: a73701aec2ef222afc04e9e7f573dd744694f951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73701aec2ef222afc04e9e7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:53 2016 +0200 webservices: Reset the read position if an opening bracket is not followed by a valid name character. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f12c118..eb16427 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -919,6 +919,11 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } +static inline void read_rewind( struct reader *reader, unsigned int count ) +{ + reader->read_pos -= count; +} + static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1179,6 +1184,11 @@ static HRESULT read_element( struct reader *reader ) if (read_cmp( reader, "<", 1 )) goto error; read_skip( reader, 1 ); + if (!read_isnamechar( read_utf8_char( reader, &skip ))) + { + read_rewind( reader, 1 ); + goto error; + } start = read_current_ptr( reader ); for (;;)

1 0

Hans Leidekker : webservices: Use addition in read_skip.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: ad2fe7e9a2fda51a242884239d76f3a2c46ee954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fe7e9a2fda51a242884239… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:52 2016 +0200 webservices: Use addition in read_skip. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d79c310..f12c118 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -915,11 +915,8 @@ static inline unsigned int read_utf8_char( struct reader *reader, unsigned int * static inline void read_skip( struct reader *reader, unsigned int count ) { - while (reader->read_pos < reader->read_size && count) - { - reader->read_pos++; - count--; - } + if (reader->read_pos + count > reader->read_size) return; + reader->read_pos += count; } static inline BOOL read_isnamechar( unsigned int ch )

1 0

Hans Leidekker : webservices: Add support for item ranges.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 92cb3bc0e24416e8edc3380d687fd1a9d72cd53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cb3bc0e24416e8edc3380d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:51 2016 +0200 webservices: Add support for item ranges. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 27 ++++++--------------------- dlls/webservices/tests/reader.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7559da0..d79c310 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2581,9 +2581,6 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL if (size != sizeof(void *)) return E_INVALIDARG; - if (desc->itemRange) - FIXME( "ignoring range (%u-%u)\n", desc->itemRange->minItemCount, desc->itemRange->maxItemCount ); - /* wrapper element */ if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; @@ -2616,29 +2613,17 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL if (desc->localName && ((hr = read_node( reader )) != S_OK)) return hr; - if (!nb_items) + if (desc->itemRange && (nb_items < desc->itemRange->minItemCount || nb_items > desc->itemRange->maxItemCount)) { + TRACE( "number of items %u out of range (%u-%u)\n", nb_items, desc->itemRange->minItemCount, + desc->itemRange->maxItemCount ); ws_free( heap, buf ); - buf = NULL; - } - - switch (option) - { - case WS_READ_REQUIRED_POINTER: - if (!nb_items) return WS_E_INVALID_FORMAT; - /* fall through */ - - case WS_READ_OPTIONAL_POINTER: - if (size != sizeof(void *)) return E_INVALIDARG; - *ret = buf; - break; - - default: - FIXME( "read option %u not supported\n", option ); - return E_NOTIMPL; + return WS_E_INVALID_FORMAT; } *count = nb_items; + *ret = buf; + return S_OK; } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 755a070..b7ef0ca 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -77,6 +77,9 @@ static const char data12[] = "<service><id>2</id></service>" "</services>"; +static const char data13[] = + "<services></services>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -2659,6 +2662,7 @@ static void test_repeating_element(void) WS_HEAP *heap; WS_STRUCT_DESCRIPTION s, s2; WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_ITEM_RANGE range; struct service { UINT32 id; @@ -2717,6 +2721,18 @@ static void test_repeating_element(void) ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); + prepare_struct_type_test( reader, data13 ); + range.minItemCount = 0; + range.maxItemCount = 1; + f.itemRange = &range; + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( test->service != NULL, "service not set\n" ); + ok( !test->service_count, "got %u\n", test->service_count ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Hans Leidekker : webservices: Pass exact size in read_type_struct_field.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: d53d073ed6e5f5affb34082d34a396819c38b558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53d073ed6e5f5affb34082d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:50 2016 +0200 webservices: Pass exact size in read_type_struct_field. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 19 +++++++++++++------ dlls/webservices/webservices_private.h | 1 - dlls/webservices/writer.c | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b61c50c..7559da0 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2579,6 +2579,8 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL ULONG item_size, nb_items = 0, nb_allocated = 1, offset = 0; char *buf; + if (size != sizeof(void *)) return E_INVALIDARG; + if (desc->itemRange) FIXME( "ignoring range (%u-%u)\n", desc->itemRange->minItemCount, desc->itemRange->maxItemCount ); @@ -2627,7 +2629,7 @@ static HRESULT read_type_repeating_element( struct reader *reader, const WS_FIEL /* fall through */ case WS_READ_OPTIONAL_POINTER: - if (size < sizeof(void *)) return E_INVALIDARG; + if (size != sizeof(void *)) return E_INVALIDARG; *ret = buf; break; @@ -2686,14 +2688,20 @@ static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) } static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, - WS_HEAP *heap, char *buf, ULONG size ) + WS_HEAP *heap, char *buf ) { char *ptr = buf + desc->offset; WS_READ_OPTION option; + ULONG size; HRESULT hr; if (!(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; + if (option == WS_READ_REQUIRED_VALUE) + size = get_type_size( desc->type, desc->typeDescription ); + else + size = sizeof(void *); + switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING: @@ -2750,7 +2758,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_STRUCT_DESCRIPTION *desc, WS_READ_OPTION option, WS_HEAP *heap, void *ret, ULONG size ) { - ULONG i, field_size; + ULONG i; HRESULT hr; char *buf; @@ -2766,7 +2774,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, { case WS_READ_REQUIRED_POINTER: case WS_READ_OPTIONAL_POINTER: - if (size < sizeof(void *)) return E_INVALIDARG; + if (size != sizeof(void *)) return E_INVALIDARG; if (!(buf = ws_alloc_zero( heap, desc->size ))) return WS_E_QUOTA_EXCEEDED; break; @@ -2782,8 +2790,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, for (i = 0; i < desc->fieldCount; i++) { - field_size = get_field_size( desc, i ); - if ((hr = read_type_struct_field( reader, desc->fields[i], heap, buf, field_size )) != S_OK) + if ((hr = read_type_struct_field( reader, desc->fields[i], heap, buf )) != S_OK) break; } diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 548da06..c286fd2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,7 +32,6 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; -ULONG get_field_size( const WS_STRUCT_DESCRIPTION *, ULONG ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8f6c6aa..e9ef7b1 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1378,7 +1378,7 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE return S_OK; } -ULONG get_field_size( const WS_STRUCT_DESCRIPTION *desc, ULONG index ) +static ULONG get_field_size( const WS_STRUCT_DESCRIPTION *desc, ULONG index ) { if (index < desc->fieldCount - 1) return desc->fields[index + 1]->offset - desc->fields[index]->offset; return desc->size - desc->fields[index]->offset;

1 0

Huw Davies : oleaut32: Fix VarDateFromStr for the case of a trailing meridiem indicator.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: b4a73f74af5bc4f7b56cbf239dda60eda11bbffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a73f74af5bc4f7b56cbf239… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 11:15:08 2016 +0100 oleaut32: Fix VarDateFromStr for the case of a trailing meridiem indicator. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 3 +++ dlls/oleaut32/vartype.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 03f43ec..7d50545 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3528,6 +3528,9 @@ static void test_VarDateFromStr(void) DFS("1-2-1970"); EXPECT_DBL(25570.0); DFS("13-1-1970"); EXPECT_DBL(25581.0); DFS("1970-1-13"); EXPECT_DBL(25581.0); + DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a non-english data string */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index bf7ebc6..fc5a025 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7668,11 +7668,13 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd /* Parse the string into our structure */ while (*strIn) { - if (dp.dwCount >= 6) - break; - if (isdigitW(*strIn)) { + if (dp.dwCount >= 6) + { + hRet = DISP_E_TYPEMISMATCH; + break; + } dp.dwValues[dp.dwCount] = strtoulW(strIn, &strIn, 10); dp.dwCount++; strIn--; @@ -7688,9 +7690,14 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd { if (i <= 25) { - dp.dwValues[dp.dwCount] = ParseDateMonths[i]; - dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); - dp.dwCount++; + if (dp.dwCount >= 6) + hRet = DISP_E_TYPEMISMATCH; + else + { + dp.dwValues[dp.dwCount] = ParseDateMonths[i]; + dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); + dp.dwCount++; + } } else if (i > 39 && i < 42) {

1 0

Daniel Lehman : ucrtbase: Return initial env snapshot in _get_initial_narrow_environment.
by Alexandre Julliard 06 Apr '16

06 Apr '16

Module: wine Branch: master Commit: 2841a05025b169c144d708fac97c6da6c4617af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2841a05025b169c144d708fac… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 20:24:21 2016 -0700 ucrtbase: Return initial env snapshot in _get_initial_narrow_environment. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 1b9ef8c..fafbc38 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -646,7 +646,7 @@ void CDECL MSVCRT___set_app_type(int app_type) */ char** CDECL _get_initial_narrow_environment(void) { - return MSVCRT___argv; + return MSVCRT___initenv; } /*********************************************************************

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
75
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 April 2016