November 2018 - Wine-Commits

Hans Leidekker : msi: Avoid duplicate product codes in FindRelatedProducts.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: b33b8cab0dbef9571553a814c7bff501ae0a5b48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33b8cab0dbef9571553a814… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 2 11:34:58 2018 +0100 msi: Avoid duplicate product codes in FindRelatedProducts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/upgrade.c | 68 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 36d65be..034d891 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -55,45 +55,59 @@ static BOOL check_language(DWORD lang1, LPCWSTR lang2, DWORD attributes) return (lang1 == langdword); } -static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, - LPCWSTR productid) +static BOOL find_product( const WCHAR *list, const WCHAR *product ) { - LPWSTR prop; - LPWSTR newprop; - DWORD len; - UINT r; - - prop = msi_dup_property(package->db, action_property ); - if (prop) - len = strlenW(prop); - else - len = 0; + const WCHAR *p = list, *q; - /*separator*/ - len ++; + if (!list) return FALSE; + for (;;) + { + while (*p && *p != '{') p++; + if (*p != '{') return FALSE; + q = p; + while (*q && *q != '}') q++; + if (*q != '}') return FALSE; + q++; + if (q - p < strlenW( product )) return FALSE; + if (!memcmp( p, product, (q - p) * sizeof(WCHAR) )) return TRUE; + p = q + 1; + while (*p && *p != ';') p++; + if (*p != ';') break; + } - len += strlenW(productid); + return FALSE; +} - /*null*/ - len++; +static void append_productcode( MSIPACKAGE *package, const WCHAR *action_prop, const WCHAR *product ) +{ + WCHAR *prop, *newprop; + DWORD len = 0; + UINT r; - newprop = msi_alloc( len*sizeof(WCHAR) ); + prop = msi_dup_property( package->db, action_prop ); + if (find_product( prop, product )) + { + TRACE( "related product property %s already contains %s\n", debugstr_w(action_prop), debugstr_w(product) ); + msi_free( prop ); + return; + } + if (prop) len += strlenW( prop ); + len += strlenW( product ) + 2; + if (!(newprop = msi_alloc( len * sizeof(WCHAR) ))) return; if (prop) { - strcpyW(newprop,prop); - strcatW(newprop,szSemiColon); + strcpyW( newprop, prop ); + strcatW( newprop, szSemiColon ); } - else - newprop[0] = 0; - strcatW(newprop,productid); + else newprop[0] = 0; + strcatW( newprop, product ); - r = msi_set_property( package->db, action_property, newprop, -1 ); - if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) + r = msi_set_property( package->db, action_prop, newprop, -1 ); + if (r == ERROR_SUCCESS && !strcmpW( action_prop, szSourceDir )) msi_reset_source_folders( package ); - TRACE("Found Related Product... %s now %s\n", - debugstr_w(action_property), debugstr_w(newprop)); + TRACE( "related product property %s now %s\n", debugstr_w(action_prop), debugstr_w(newprop) ); msi_free( prop ); msi_free( newprop );

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in texture2d_load_texture().
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 49af0e73f72c6176e353db99c844db609c9aa720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49af0e73f72c6176e353db99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 2 13:21:14 2018 +0330 wined3d: Prefer bind flags over usage flags in texture2d_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3254b85..902611c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1525,7 +1525,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re struct wined3d_box src_box; BOOL depth; - depth = texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL; + depth = texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL; sub_resource = &texture->sub_resources[sub_resource_idx]; if (!depth && wined3d_settings.offscreen_rendering_mode != ORM_FBO

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in texture2d_load_sysmem().
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 21f44e8fa62e2e9dd32d0f5ec9f53133d903af96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21f44e8fa62e2e9dd32d0f5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 2 13:21:16 2018 +0330 wined3d: Prefer bind flags over usage flags in texture2d_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 99cc1a5..5f5c53a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1450,7 +1450,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res return TRUE; } - if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (!(texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { texture2d_read_from_framebuffer(texture, sub_resource_idx, context,

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in ffp_blitter_clear().
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 58b681e9209a941a1ec2fe3f15577b94ad92ddad URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b681e9209a941a1ec2fe3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 2 13:21:12 2018 +0330 wined3d: Prefer bind flags over usage flags in ffp_blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 133055b..cad5282 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2066,7 +2066,7 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de continue; if (ffp_blitter_use_cpu_clear(view) - || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET) + || (!(view->resource->bind_flags & WINED3D_BIND_RENDER_TARGET) && (wined3d_settings.offscreen_rendering_mode != ORM_FBO || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)))) {

1 0

Nikolay Sivov : xmllite/writer: Implement WriteDocType().
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 4c779c07bdfaf67ab8dcd63e936167d1cc574740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c779c07bdfaf67ab8dcd63e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 2 10:56:57 2018 +0300 xmllite/writer: Implement WriteDocType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 8 +-- dlls/xmllite/tests/writer.c | 110 ++++++++++++++++++++++++++++++++++++++- dlls/xmllite/writer.c | 113 +++++++++++++++++++++++++++++++++++++++-- dlls/xmllite/xmllite_private.h | 3 ++ 4 files changed, 223 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c779c07bdfaf67ab8dc…

1 0

Zebediah Figura : widl: Correctly handle conformant arrays in clear_output_vars().
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 66f46f81829bb77497ebd35ddfe368f421874a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66f46f81829bb77497ebd35d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 23:53:44 2018 -0500 widl: Correctly handle conformant arrays in clear_output_vars(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c56ef48..12424d9 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -110,7 +110,13 @@ static void clear_output_vars( const var_list_t *args ) if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_BASIC) continue; if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_ENUM) continue; } - print_proxy( "if (%s) MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name, arg->name ); + print_proxy( "if (%s) MIDL_memset( %s, 0, ", arg->name, arg->name ); + if (is_array(arg->type) && type_array_has_conformance(arg->type)) + { + write_expr( proxy, type_array_get_conformance(arg->type), 1, 1, NULL, NULL, "" ); + fprintf( proxy, " * " ); + } + fprintf( proxy, "sizeof( *%s ));\n", arg->name ); } }

1 0

Zebediah Figura : rpcrt4: Avoid reference leaks when unmarshalling [in, out] pointers.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 666bbe084e56cc97cf9be6a402fe53803473785a URL: https://source.winehq.org/git/wine.git/?a=commit;h=666bbe084e56cc97cf9be6a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 23:53:45 2018 -0500 rpcrt4: Avoid reference leaks when unmarshalling [in, out] pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_ole.c | 10 ++++++++-- dlls/rpcrt4/tests/ndr_marshall.c | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 8608691..c8026c0 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -338,19 +338,25 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + IUnknown **unk = (IUnknown **)ppMemory; LPSTREAM stream; HRESULT hr; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (!LoadCOM()) return NULL; - *(LPVOID*)ppMemory = NULL; + + /* Avoid reference leaks for [in, out] pointers. */ + if (pStubMsg->IsClient && *unk) + IUnknown_Release(*unk); + + *unk = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { ULONG size; hr = RpcStream_Create(pStubMsg, FALSE, &size, &stream); if (hr == S_OK) { if (size != 0) - hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); + hr = COM_UnmarshalInterface(stream, &IID_NULL, (void **)unk); IStream_Release(stream); } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 5da03e2..d436b42 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1327,9 +1327,7 @@ static void test_iface_ptr(void) ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); ok(!my_free_called, "free called %d\n", my_free_called); ok(server_obj.ref > 1, "got %d references\n", server_obj.ref); -todo_wine ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); -client_obj.ref = 1; hr = IPersist_GetClassID(proxy, &clsid); ok(hr == S_OK, "got hr %#x\n", hr);

1 0

Zebediah Figura : oleaut32/tests: Add some more tests for marshalling arrays.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: b6bee08366f0ea3e46b766f89acfd42f1db23304 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6bee08366f0ea3e46b766f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 2 00:15:18 2018 -0500 oleaut32/tests: Add some more tests for marshalling arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 166 ++++++++++++++++++++++++--------------- dlls/oleaut32/tests/tmarshal.idl | 22 ++++-- 2 files changed, 118 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6bee08366f0ea3e46b7…

1 0

Nikolay Sivov : xmllite/writer: Simplify single character writes.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: ea927971f2b3fa6e01c1a9dbe90e3badabad3c9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea927971f2b3fa6e01c1a9db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 2 10:56:58 2018 +0300 xmllite/writer: Simplify single character writes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 53 ++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index e1fc232..c1e2c97 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -42,11 +42,6 @@ DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, static const WCHAR closeelementW[] = {'<','/'}; static const WCHAR closetagW[] = {' ','/','>'}; static const WCHAR closepiW[] = {'?','>'}; -static const WCHAR ltW[] = {'<'}; -static const WCHAR gtW[] = {'>'}; -static const WCHAR spaceW[] = {' '}; -static const WCHAR quoteW[] = {'"'}; -static const WCHAR eqW[] = {'='}; static const WCHAR xmlnsW[] = {' ','x','m','l','n','s'}; static const WCHAR xmlnsuriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0}; @@ -492,33 +487,31 @@ static HRESULT write_output_buffer(xmlwriteroutput *output, const WCHAR *data, i return S_OK; } +static HRESULT write_output_buffer_char(xmlwriteroutput *output, WCHAR ch) +{ + return write_output_buffer(output, &ch, 1); +} + static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR *data, int len) { - write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); + write_output_buffer_char(output, '"'); if (!is_empty_string(data)) write_output_buffer(output, data, len); - write_output_buffer(output, quoteW, ARRAY_SIZE(quoteW)); + write_output_buffer_char(output, '"'); return S_OK; } -static HRESULT write_output_buffer_char(xmlwriteroutput *output, WCHAR ch) -{ - return write_output_buffer(output, &ch, 1); -} - /* TODO: test if we need to validate char range */ static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, int prefix_len, const WCHAR *local_name, int local_len) { - static const WCHAR colW[] = {':'}; - assert(prefix_len >= 0 && local_len >= 0); if (prefix_len) write_output_buffer(output, prefix, prefix_len); if (prefix_len && local_len) - write_output_buffer(output, colW, ARRAY_SIZE(colW)); + write_output_buffer_char(output, ':'); write_output_buffer(output, local_name, local_len); @@ -645,7 +638,7 @@ static void writer_output_ns(xmlwriter *writer, struct element *element) continue; write_output_qname(writer->output, xmlnsW, ARRAY_SIZE(xmlnsW), ns->prefix, ns->prefix_len); - write_output_buffer(writer->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer_char(writer->output, '='); write_output_buffer_quoted(writer->output, ns->uri, -1); } } @@ -657,7 +650,7 @@ static HRESULT writer_close_starttag(xmlwriter *writer) if (!writer->starttagopen) return S_OK; writer_output_ns(writer, LIST_ENTRY(list_head(&writer->elements), struct element, entry)); - hr = write_output_buffer(writer->output, gtW, ARRAY_SIZE(gtW)); + hr = write_output_buffer_char(writer->output, '>'); writer->starttagopen = 0; return hr; } @@ -868,9 +861,9 @@ static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *p static void write_output_attribute(xmlwriter *writer, const WCHAR *prefix, int prefix_len, const WCHAR *local, int local_len, const WCHAR *value) { - write_output_buffer(writer->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(writer->output, ' '); write_output_qname(writer->output, prefix, prefix_len, local, local_len); - write_output_buffer(writer->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer_char(writer->output, '='); write_output_buffer_quoted(writer->output, value, -1); } @@ -1138,14 +1131,14 @@ static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR comment) for (i = 0; i < len; i++) { write_output_buffer(This->output, comment + i, 1); if (comment[i] == '-' && (i + 1 < len) && comment[i+1] == '-') - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); } } else write_output_buffer(This->output, comment, len); if (len && comment[len-1] == '-') - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); } write_output_buffer(This->output, ccloseW, ARRAY_SIZE(ccloseW)); @@ -1194,7 +1187,7 @@ static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR name, LP { write_output_buffer(This->output, publicW, ARRAY_SIZE(publicW)); write_output_buffer_quoted(This->output, pubid, pubid_len); - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); write_output_buffer_quoted(This->output, sysid, -1); } else if (sysid) @@ -1269,7 +1262,7 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr write_encoding_bom(This); write_node_indent(This); - write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); + write_output_buffer_char(This->output, '<'); if (ns) write_output_qname(This->output, ns->prefix, ns->prefix_len, local_name, local_len); else @@ -1278,17 +1271,17 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr if (!ns && (prefix_len || !is_empty_string(uri))) { write_output_qname(This->output, xmlnsW, ARRAY_SIZE(xmlnsW), prefix, prefix_len); - write_output_buffer(This->output, eqW, ARRAY_SIZE(eqW)); + write_output_buffer_char(This->output, '='); write_output_buffer_quoted(This->output, uri, -1); } if (value) { - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); write_output_buffer(This->output, value, -1); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_qname(This->output, prefix, prefix_len, local_name, local_len); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); } else write_output_buffer(This->output, closetagW, ARRAY_SIZE(closetagW)); @@ -1365,7 +1358,7 @@ static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface) write_node_indent(This); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); } writer_free_element(This, element); @@ -1435,7 +1428,7 @@ static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface) /* write full end tag */ write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); write_output_buffer(This->output, element->qname, element->len); - write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); + write_output_buffer_char(This->output, '>'); writer_free_element(This, element); @@ -1538,7 +1531,7 @@ static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LP write_node_indent(This); write_output_buffer(This->output, openpiW, ARRAY_SIZE(openpiW)); write_output_buffer(This->output, name, -1); - write_output_buffer(This->output, spaceW, ARRAY_SIZE(spaceW)); + write_output_buffer_char(This->output, ' '); write_output_buffer(This->output, text, -1); write_output_buffer(This->output, closepiW, ARRAY_SIZE(closepiW)); @@ -1707,7 +1700,7 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre if (!ns && uri) writer_push_ns(This, prefix, prefix_len, uri); - write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); + write_output_buffer_char(This->output, '<'); if (ns) write_output_qname(This->output, ns->prefix, ns->prefix_len, local_name, local_len); else

1 0

Józef Kucia : d3d11/tests: Add test for SO statistics queries.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 245c1d23e2681957292212949e84507a8ac0ac91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245c1d23e268195729221294… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 1 21:11:22 2018 +0100 d3d11/tests: Add test for SO statistics queries. 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 | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 632ef4f..0174289 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5789,6 +5789,98 @@ static void test_timestamp_query(void) release_test_context(&test_context); } +static void test_so_statistics_query(void) +{ + struct d3d11_test_context test_context; + D3D11_QUERY_DATA_SO_STATISTICS data; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + unsigned int data_size; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const struct + { + D3D11_QUERY query; + D3D_FEATURE_LEVEL feature_level; + } + tests[] = + { + {D3D11_QUERY_SO_STATISTICS, D3D_FEATURE_LEVEL_10_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM2, D3D_FEATURE_LEVEL_11_0}, + {D3D11_QUERY_SO_STATISTICS_STREAM3, D3D_FEATURE_LEVEL_11_0}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (ID3D11Device_GetFeatureLevel(device) < tests[i].feature_level) + { + skip("Feature level %#x is required.\n", tests[i].feature_level); + continue; + } + + query_desc.Query = tests[i].query; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS) + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) continue; + data_size = ID3D11Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Begin(context, query); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.NumPrimitivesWritten == ~(UINT64)0, "Data was modified.\n"); + ok(data.PrimitivesStorageNeeded == ~(UINT64)0, "Data was modified.\n"); + + draw_quad(&test_context); + + ID3D11DeviceContext_End(context, query); + get_query_data(context, query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", + (unsigned int)data.NumPrimitivesWritten); + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D11DeviceContext_Begin(context, query); + draw_quad(&test_context); + ID3D11DeviceContext_End(context, query); + get_query_data(context, query, &data, sizeof(data)); + ok(!data.NumPrimitivesWritten, "Got unexpected NumPrimitivesWritten: %u.\n", + (unsigned int)data.NumPrimitivesWritten); + todo_wine_if(query_desc.Query == D3D11_QUERY_SO_STATISTICS_STREAM0) + ok(!data.PrimitivesStorageNeeded, "Got unexpected PrimitivesStorageNeeded: %u.\n", + (unsigned int)data.PrimitivesStorageNeeded); + + ID3D11Asynchronous_Release(query); + } + + release_test_context(&test_context); +} + static void test_device_removed_reason(void) { ID3D11Device *device; @@ -28691,6 +28783,7 @@ START_TEST(d3d11) queue_test(test_occlusion_query); queue_test(test_pipeline_statistics_query); queue_test(test_timestamp_query); + queue_test(test_so_statistics_query); queue_test(test_device_removed_reason); queue_test(test_private_data); queue_for_each_feature_level(test_state_refcounting);

1 0