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

Jacek Caban : xmllite: Clear all parser values in SetInput.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 6917e2aa3ca9ac78bdce9b11e3382bce8e06fe2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6917e2aa3ca9ac78bdce9b11e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:47:05 2017 +0200 xmllite: Clear all parser values in SetInput. Not clearing namespaces was problematic for tests, but clearing other values also looks like a good idea. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e81f266..eb23f3a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2679,17 +2679,36 @@ static void reader_clear_ns(xmlreader *reader) struct ns *ns, *ns2; LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->ns, struct ns, entry) { + list_remove(&ns->entry); reader_free_strvalued(reader, &ns->prefix); reader_free_strvalued(reader, &ns->uri); reader_free(reader, ns); } LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->nsdef, struct ns, entry) { + list_remove(&ns->entry); reader_free_strvalued(reader, &ns->uri); reader_free(reader, ns); } } +static void reader_reset_parser(xmlreader *reader) +{ + reader->position.line_number = 0; + reader->position.line_position = 0; + + reader_clear_elements(reader); + reader_clear_attrs(reader); + reader_clear_ns(reader); + reader_free_strvalues(reader); + + reader->depth = 0; + reader->nodetype = XmlNodeType_None; + reader->resumestate = XmlReadResumeState_Initial; + memset(reader->resume, 0, sizeof(reader->resume)); + reader->is_empty_element = FALSE; +} + static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); @@ -2700,13 +2719,10 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (ref == 0) { IMalloc *imalloc = This->imalloc; + reader_reset_parser(This); if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_iface); if (This->resolver) IXmlResolver_Release(This->resolver); if (This->mlang) IUnknown_Release(This->mlang); - reader_clear_attrs(This); - reader_clear_ns(This); - reader_clear_elements(This); - reader_free_strvalues(This); reader_free(This, This); if (imalloc) IMalloc_Release(imalloc); } @@ -2729,13 +2745,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->input = NULL; } - This->position.line_number = 0; - This->position.line_position = 0; - reader_clear_elements(This); - This->depth = 0; - This->nodetype = XmlNodeType_None; - This->resumestate = XmlReadResumeState_Initial; - memset(This->resume, 0, sizeof(This->resume)); + reader_reset_parser(This); /* just reset current input */ if (!input) @@ -2776,7 +2786,6 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->state = XmlReadState_Initial; This->instate = XmlReadInState_Initial; } - return hr; }

1 0

Jacek Caban : xmllite/tests: Added reader_qname helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: e9913db3885045785a78418198a4801999d333c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9913db3885045785a7841819… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:38 2017 +0200 xmllite/tests: Added reader_qname helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2da5d00..497b31d 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -333,6 +333,20 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const c return str; } +#define reader_qname(a,b) _reader_qname(a,b,__LINE__) +static const WCHAR *_reader_qname(IXmlReader *reader, const char *expect, unsigned line) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "name = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -810,7 +824,6 @@ static void test_reader_depth(IXmlReader *reader, UINT depth, UINT brk, int line static void test_read_xmldeclaration(void) { - static const WCHAR xmlW[] = {'x','m','l',0}; static const struct { WCHAR name[12]; @@ -956,10 +969,7 @@ todo_wine { reader_value(reader, ""); reader_name(reader, "xml"); - val = NULL; - hr = IXmlReader_GetQualifiedName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + reader_qname(reader, "xml"); /* check attributes */ next_attribute(reader); @@ -1067,7 +1077,6 @@ static void test_read_comment(void) if (hr == S_OK) { const WCHAR *str; - UINT len; ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); @@ -1078,12 +1087,7 @@ static void test_read_comment(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); - len = 1; - str = NULL; - hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_qname(reader, ""); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL);

1 0

Jacek Caban : xmllite/tests: Added next_attribute helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 99d2d5e44c79ce5fe1a51d769b7ddc992ead5855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d2d5e44c79ce5fe1a51d769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:32 2017 +0200 xmllite/tests: Added next_attribute helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 53b975b..263a6a5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -248,6 +248,14 @@ static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_t ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); } +#define next_attribute(a) _next_attribute(__LINE__,a) +static void _next_attribute(unsigned line, IXmlReader *reader) +{ + HRESULT hr; + hr = IXmlReader_MoveToNextAttribute(reader); + ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -803,8 +811,7 @@ static void test_read_xmldeclaration(void) ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); /* check attributes */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_DEPTH(reader, 1); @@ -816,10 +823,8 @@ static void test_read_xmldeclaration(void) TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); /* try to move from last attribute */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); + next_attribute(reader); hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "got %08x\n", hr); @@ -910,8 +915,7 @@ todo_wine { ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); /* check attributes */ - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); + next_attribute(reader); type = -1; hr = IXmlReader_GetNodeType(reader, &type); @@ -1281,8 +1285,7 @@ static void test_read_public_dtd(void) ok(len == lstrlenW(pubvalW), "got %u\n", len); ok(!lstrcmpW(str, pubvalW), "got %s\n", wine_dbgstr_w(str)); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); @@ -2143,8 +2146,7 @@ static void test_prefix(void) wine_dbgstr_w(expected)); free_str(expected); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "MoveToNextAttribute() failed, %#x.\n", hr); + next_attribute(reader); hr = IXmlReader_GetNodeType(reader, &type); ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); @@ -2593,12 +2595,10 @@ static void test_reader_position(void) ok(type == XmlNodeType_Element, "got type %d\n", type); TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_READER_POSITION2(reader, 1, 6, ~0u, 34); - hr = IXmlReader_MoveToNextAttribute(reader); - ok(hr == S_OK, "got %08x\n", hr); + next_attribute(reader); TEST_READER_POSITION2(reader, 1, 24, ~0u, 34); hr = IXmlReader_MoveToElement(reader);

1 0

Jacek Caban : xmllite/tests: Added read_node helper.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 8e344469bce5d7928e83968eea1055bb9984e1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e344469bce5d7928e83968ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:45:25 2017 +0200 xmllite/tests: Added read_node helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 62 ++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 40873a4..53b975b 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -234,6 +234,20 @@ static void _set_input_string(unsigned line, IXmlReader *reader, const char *xml IStream_Release(stream); } +#define read_node(a,b) _read_node(__LINE__,a,b) +static void _read_node(unsigned line, IXmlReader *reader, XmlNodeType expected_type) +{ + XmlNodeType type; + HRESULT hr; + + hr = IXmlReader_Read(reader, &type); + if (expected_type == XmlNodeType_None) + ok_(__FILE__,line)(hr == S_FALSE, "Read returned %08x, expected S_FALSE\n", hr); + else + ok_(__FILE__,line)(hr == S_OK, "Read returned %08x\n", hr); + ok_(__FILE__,line)(type == expected_type, "read type %d, expected %d\n", type, expected_type); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -776,11 +790,8 @@ static void test_read_xmldeclaration(void) TEST_READER_POSITION(reader, 0, 0); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_XmlDeclaration, - "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_XmlDeclaration); + /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); @@ -873,10 +884,7 @@ todo_wine { hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_XmlDeclaration); TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -915,10 +923,7 @@ todo_wine { hr = IXmlReader_MoveToNextAttribute(reader); ok(hr == S_FALSE, "expected S_FALSE, got %08x\n", hr); - type = -1; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(type == XmlNodeType_Element, "expected Element, got %s\n", type_to_str(type)); + read_node(reader, XmlNodeType_Element); TEST_READER_POSITION2(reader, 1, 23, ~0u, 40); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -1193,7 +1198,6 @@ static void test_read_full(void) struct nodes_test *test = &misc_test; IXmlReader *reader; const WCHAR *value; - XmlNodeType type; ULONG len; HRESULT hr; int i; @@ -1204,16 +1208,9 @@ static void test_read_full(void) set_input_string(reader, test->xml); i = 0; - type = ~0u; do { - hr = IXmlReader_Read(reader, &type); - if (test->nodes[i].type != XmlNodeType_None) - ok(hr == S_OK, "Read returned %08x\n", hr); - else - ok(hr == S_FALSE, "Read returned %08x\n", hr); - - ok(type == test->nodes[i].type, "%d: got wrong type %d, expected %d\n", i, type, test->nodes[i].type); + read_node(reader, test->nodes[i].type); len = 0xdeadbeef; hr = IXmlReader_GetValue(reader, &value, &len); @@ -1255,10 +1252,7 @@ static void test_read_public_dtd(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + read_node(reader, XmlNodeType_DocumentType); count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); @@ -1358,10 +1352,7 @@ static void test_read_system_dtd(void) hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_DocumentType, "got type %d\n", type); + read_node(reader, XmlNodeType_DocumentType); count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); @@ -1409,10 +1400,8 @@ todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); } - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got 0x%8x\n", hr); - ok(type == XmlNodeType_Comment, "got type %d\n", type); + + read_node(reader, XmlNodeType_Comment); IStream_Release(stream); IXmlReader_Release(reader); @@ -1589,10 +1578,7 @@ static void test_read_element(void) /* start/end tag mismatch */ set_input_string(reader, "<a></b>"); - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); - ok(type == XmlNodeType_Element, "got %d\n", type); + read_node(reader, XmlNodeType_Element); type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type);

1 0

Henri Verbeet : wined3d: Pass a wined3d_rendertarget_view to surface_cpu_blt_colour_fill().
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 493502b54bfcca8f9210bfe72f0c548612848018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493502b54bfcca8f9210bfe72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:31 2017 +0200 wined3d: Pass a wined3d_rendertarget_view to surface_cpu_blt_colour_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c6f26f..e6a635f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3258,28 +3258,28 @@ release: return hr; } -static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_box *box, DWORD c) +static HRESULT surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, + const struct wined3d_box *box, const struct wined3d_color *colour) { - struct wined3d_resource *resource = &texture->resource; unsigned int x, y, w, h, bpp; struct wined3d_map_desc map; BYTE *row; + DWORD c; - TRACE("texture %p, sub_resource_idx %u, box %s, colour 0x%08x.\n", - texture, sub_resource_idx, debug_box(box), c); + TRACE("view %p, box %s, colour %s.\n", view, debug_box(box), debug_color(colour)); - if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + if (view->format_flags & WINED3DFMT_FLAG_BLOCKS) { - FIXME("Not implemented for format %s.\n", debug_d3dformat(resource->format->id)); + FIXME("Not implemented for format %s.\n", debug_d3dformat(view->format->id)); return E_NOTIMPL; } - bpp = resource->format->byte_count; + c = wined3d_format_convert_from_float(view->format, colour); + bpp = view->format->byte_count; w = box->right - box->left; h = box->bottom - box->top; - wined3d_resource_map(resource, sub_resource_idx, &map, box, 0); + wined3d_resource_map(view->resource, view->sub_resource_idx, &map, box, 0); switch (bpp) { @@ -3317,7 +3317,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsi default: FIXME("Not implemented for bpp %u.\n", bpp); - wined3d_resource_unmap(resource, sub_resource_idx); + wined3d_resource_unmap(view->resource, view->sub_resource_idx); return WINED3DERR_NOTAVAILABLE; } @@ -3327,7 +3327,7 @@ static HRESULT surface_cpu_blt_colour_fill(struct wined3d_texture *texture, unsi row += map.row_pitch; memcpy(row, map.data, w * bpp); } - wined3d_resource_unmap(resource, sub_resource_idx); + wined3d_resource_unmap(view->resource, view->sub_resource_idx); return WINED3D_OK; } @@ -3336,11 +3336,8 @@ static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d const RECT *rect, const struct wined3d_color *color) { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - DWORD c; - c = wined3d_format_convert_from_float(view->format, color); - return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), - view->sub_resource_idx, &box, c); + return surface_cpu_blt_colour_fill(view, &box, color); } static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, @@ -3349,7 +3346,6 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, { const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; - DWORD c; if (clear_flags != WINED3DCLEAR_ZBUFFER) { @@ -3357,9 +3353,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - c = wined3d_format_convert_from_float(view->format, &color); - return surface_cpu_blt_colour_fill(texture_from_resource(view->resource), - view->sub_resource_idx, &box, c); + return surface_cpu_blt_colour_fill(view, &box, &color); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op,

1 0

Jacek Caban : kernel32: Use default buffer size in CreatePipe if 0 was passed.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: e44c0f710b72606e1badb4937dc51edeb6e0804e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44c0f710b72606e1badb4937… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 30 14:02:49 2017 +0200 kernel32: Use default buffer size in CreatePipe if 0 was passed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 2 ++ dlls/kernel32/tests/pipe.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 494db9c..ee995f5 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1932,6 +1932,8 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; attr.SecurityQualityOfService = NULL; + if (!size) size = 4096; + timeout.QuadPart = (ULONGLONG)NMPWAIT_USE_DEFAULT_WAIT * -10000; /* generate a unique pipe name (system wide) */ do diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index fb6d3c0..dc4be32 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -125,6 +125,20 @@ static void _test_signaled(unsigned line, HANDLE handle) ok_(__FILE__,line)(res == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", res); } +#define test_pipe_info(a,b,c,d,e) _test_pipe_info(__LINE__,a,b,c,d,e) +static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex_out_buf_size, DWORD ex_in_buf_size, DWORD ex_max_instances) +{ + DWORD flags = 0xdeadbeef, out_buf_size = 0xdeadbeef, in_buf_size = 0xdeadbeef, max_instances = 0xdeadbeef; + BOOL res; + + res = GetNamedPipeInfo(pipe, &flags, &out_buf_size, &in_buf_size, &max_instances); + ok_(__FILE__,line)(res, "GetNamedPipeInfo failed: %x\n", res); + ok_(__FILE__,line)(flags == ex_flags, "flags = %x, expected %x\n", flags, ex_flags); + ok_(__FILE__,line)(out_buf_size == ex_out_buf_size, "out_buf_size = %x, expected %u\n", out_buf_size, ex_out_buf_size); + ok_(__FILE__,line)(in_buf_size == ex_in_buf_size, "in_buf_size = %x, expected %u\n", in_buf_size, ex_in_buf_size); + ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); +} + static void test_CreateNamedPipe(int pipemode) { HANDLE hnp; @@ -1319,6 +1333,9 @@ static void test_CreatePipe(void) pipe_attr.bInheritHandle = TRUE; pipe_attr.lpSecurityDescriptor = NULL; ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 0) != 0, "CreatePipe failed\n"); + test_pipe_info(piperead, FILE_PIPE_SERVER_END, 4096, 4096, 1); + test_pipe_info(pipewrite, 0, 4096, 4096, 1); + ok(WriteFile(pipewrite,PIPENAME,sizeof(PIPENAME), &written, NULL), "Write to anonymous pipe failed\n"); ok(written == sizeof(PIPENAME), "Write to anonymous pipe wrote %d bytes\n", written); ok(ReadFile(piperead,readbuf,sizeof(readbuf),&read, NULL), "Read from non empty pipe failed\n"); @@ -1358,6 +1375,12 @@ static void test_CreatePipe(void) ok(user_apc_ran == FALSE, "user apc ran, pipe using alertable io mode\n"); SleepEx(0, TRUE); /* get rid of apc */ + + ok(CreatePipe(&piperead, &pipewrite, &pipe_attr, 1) != 0, "CreatePipe failed\n"); + test_pipe_info(piperead, FILE_PIPE_SERVER_END, 1, 1, 1); + test_pipe_info(pipewrite, 0, 1, 1, 1); + ok(CloseHandle(pipewrite), "CloseHandle for the Write Pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); } static void test_CloseHandle(void) @@ -2250,20 +2273,6 @@ static void test_NamedPipeHandleState(void) CloseHandle(server); } -#define test_pipe_info(a,b,c,d,e) _test_pipe_info(__LINE__,a,b,c,d,e) -static void _test_pipe_info(unsigned line, HANDLE pipe, DWORD ex_flags, DWORD ex_out_buf_size, DWORD ex_in_buf_size, DWORD ex_max_instances) -{ - DWORD flags = 0xdeadbeef, out_buf_size = 0xdeadbeef, in_buf_size = 0xdeadbeef, max_instances = 0xdeadbeef; - BOOL res; - - res = GetNamedPipeInfo(pipe, &flags, &out_buf_size, &in_buf_size, &max_instances); - ok_(__FILE__,line)(res, "GetNamedPipeInfo failed: %x\n", res); - ok_(__FILE__,line)(flags == ex_flags, "flags = %x, expected %x\n", flags, ex_flags); - ok_(__FILE__,line)(out_buf_size == ex_out_buf_size, "out_buf_size = %x, expected %u\n", out_buf_size, ex_out_buf_size); - ok_(__FILE__,line)(in_buf_size == ex_in_buf_size, "in_buf_size = %x, expected %u\n", in_buf_size, ex_in_buf_size); - ok_(__FILE__,line)(max_instances == ex_max_instances, "max_instances = %x, expected %u\n", max_instances, ex_max_instances); -} - static void test_GetNamedPipeInfo(void) { HANDLE server;

1 0

Nikolay Sivov : dwrite/tests: Test glyph count for each DrawGlyphRun().
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 7371325c042f2b64a48066cf93ef07654316beea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7371325c042f2b64a48066cf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:07:01 2017 +0300 dwrite/tests: Test glyph count for each DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 99 +++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0d73716..c097e20 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -310,6 +310,7 @@ struct drawcall_entry { enum drawcall_kind kind; WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + UINT32 glyphcount; /* only meaningful for DrawGlyphRun() */ }; struct drawcall_sequence @@ -409,6 +410,28 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, else ok_(file, line) (cmp == 0, "%s: glyphrun string %s was expected, but got %s instead\n", context, wine_dbgstr_w(expected->string), wine_dbgstr_w(actual->string)); + + cmp = lstrcmpW(expected->locale, actual->locale); + if (cmp != 0 && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: glyph run locale %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->locale), wine_dbgstr_w(actual->locale)); + } + else + ok_(file, line) (cmp == 0, "%s: glyph run locale %s was expected, but got %s instead\n", + context, wine_dbgstr_w(expected->locale), wine_dbgstr_w(actual->locale)); + + if (expected->glyphcount != actual->glyphcount && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: wrong glyph count, %u was expected, but got %u instead\n", + context, expected->glyphcount, actual->glyphcount); + } + else + ok_(file, line) (expected->glyphcount == actual->glyphcount, + "%s: wrong glyph count, %u was expected, but got %u instead\n", + context, expected->glyphcount, actual->glyphcount); } else if ((expected->kind & DRAW_KINDS_MASK) == DRAW_UNDERLINE) { int cmp = lstrcmpW(expected->locale, actual->locale); @@ -579,6 +602,8 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, entry.kind = DRAW_GLYPHRUN; if (effect) entry.kind |= DRAW_EFFECT; + lstrcpyW(entry.locale, descr->localeName); + entry.glyphcount = run->glyphCount; add_call(sequences, RENDERER_ID, &entry); return S_OK; } @@ -1173,7 +1198,7 @@ static void test_GetLocaleName(void) } static const struct drawcall_entry drawellipsis_seq[] = { - { DRAW_GLYPHRUN, {0x2026, 0} }, + { DRAW_GLYPHRUN, {0x2026, 0}, {'e','n','-','u','s',0}, 1 }, { DRAW_LAST_KIND } }; @@ -1488,10 +1513,10 @@ static void test_SetInlineObject(void) /* drawing calls sequence doesn't depend on run order, instead all runs are drawn first, inline objects next and then underline/strikes */ static const struct drawcall_entry draw_seq[] = { - { DRAW_GLYPHRUN, {'s',0} }, - { DRAW_GLYPHRUN, {'r','i',0} }, - { DRAW_GLYPHRUN|DRAW_EFFECT, {'n',0} }, - { DRAW_GLYPHRUN, {'g',0} }, + { DRAW_GLYPHRUN, {'s',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'r','i',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN|DRAW_EFFECT, {'n',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'g',0}, {'r','u',0}, 1 }, { DRAW_INLINE }, { DRAW_UNDERLINE, {0}, {'r','u',0} }, { DRAW_STRIKETHROUGH }, @@ -1499,32 +1524,32 @@ static const struct drawcall_entry draw_seq[] = { }; static const struct drawcall_entry draw_seq2[] = { - { DRAW_GLYPHRUN, {'s',0} }, - { DRAW_GLYPHRUN, {'t',0} }, - { DRAW_GLYPHRUN, {'r',0} }, - { DRAW_GLYPHRUN, {'i',0} }, - { DRAW_GLYPHRUN, {'n',0} }, - { DRAW_GLYPHRUN, {'g',0} }, + { DRAW_GLYPHRUN, {'s',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'t',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'r',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'i',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'n',0}, {'r','u',0}, 1 }, + { DRAW_GLYPHRUN, {'g',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq3[] = { - { DRAW_GLYPHRUN, {0x202a,0x202c,0} }, - { DRAW_GLYPHRUN, {'a','b',0} }, + { DRAW_GLYPHRUN, {0x202a,0x202c,0}, {'r','u',0}, 0 }, + { DRAW_GLYPHRUN, {'a','b',0}, {'r','u',0}, 2 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq4[] = { - { DRAW_GLYPHRUN, {'s','t','r',0} }, - { DRAW_GLYPHRUN, {'i','n','g',0} }, + { DRAW_GLYPHRUN, {'s','t','r',0}, {'r','u',0}, 3 }, + { DRAW_GLYPHRUN, {'i','n','g',0}, {'r','u',0}, 3 }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_seq5[] = { - { DRAW_GLYPHRUN, {'s','t',0} }, - { DRAW_GLYPHRUN, {'r','i',0} }, - { DRAW_GLYPHRUN, {'n','g',0} }, + { DRAW_GLYPHRUN, {'s','t',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {'r','i',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {'n','g',0}, {'r','u',0}, 2 }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } }; @@ -1534,15 +1559,15 @@ static const struct drawcall_entry empty_seq[] = { }; static const struct drawcall_entry draw_single_run_seq[] = { - { DRAW_GLYPHRUN, {'s','t','r','i','n','g',0} }, + { DRAW_GLYPHRUN, {'s','t','r','i','n','g',0}, {'r','u',0}, 6 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draw_reordered_run_seq[] = { - { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0} }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0} }, - { DRAW_GLYPHRUN, {'7','1',0} }, - { DRAW_GLYPHRUN, {'.',0} }, + { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; @@ -1601,7 +1626,7 @@ static void test_Draw(void) flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0, 0.0); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", FALSE); + ok_sequence(sequences, RENDERER_ID, draw_seq, "draw test", TRUE); IDWriteTextLayout_Release(layout); /* with reduced width DrawGlyphRun() is called for every line */ @@ -3185,14 +3210,14 @@ static void test_SetFlowDirection(void) } static const struct drawcall_entry draweffect_seq[] = { - { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0x0300,0} }, - { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0x0300,0}, {'e','n','-','u','s',0}, 2 }, + { DRAW_GLYPHRUN, {'d',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_LAST_KIND } }; static const struct drawcall_entry draweffect2_seq[] = { - { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0} }, - { DRAW_GLYPHRUN, {'c','d',0} }, + { DRAW_GLYPHRUN|DRAW_EFFECT, {'a','e',0}, {'e','n','-','u','s',0}, 2 }, + { DRAW_GLYPHRUN, {'c','d',0}, {'e','n','-','u','s',0}, 2 }, { DRAW_LAST_KIND } }; @@ -4837,30 +4862,30 @@ static void test_SetOpticalAlignment(void) } static const struct drawcall_entry drawunderline_seq[] = { - { DRAW_GLYPHRUN, {'a','e',0x0300,0} }, /* reported runs can't mix different underline values */ - { DRAW_GLYPHRUN, {'d',0} }, + { DRAW_GLYPHRUN, {'a','e',0x0300,0}, {'e','n','-','u','s',0}, 2 }, /* reported runs can't mix different underline values */ + { DRAW_GLYPHRUN, {'d',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry drawunderline2_seq[] = { - { DRAW_GLYPHRUN, {'a',0} }, - { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_GLYPHRUN, {'e',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry drawunderline3_seq[] = { - { DRAW_GLYPHRUN, {'a',0} }, - { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','c','a',0}, 1 }, + { DRAW_GLYPHRUN, {'e',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','c','a',0} }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_LAST_KIND } }; static const struct drawcall_entry drawunderline4_seq[] = { - { DRAW_GLYPHRUN, {'a',0} }, - { DRAW_GLYPHRUN, {'e',0} }, + { DRAW_GLYPHRUN, {'a',0}, {'e','n','-','u','s',0}, 1 }, + { DRAW_GLYPHRUN, {'e',0}, {'e','n','-','u','s',0}, 1 }, { DRAW_UNDERLINE, {0}, {'e','n','-','u','s',0} }, { DRAW_STRIKETHROUGH }, { DRAW_LAST_KIND } @@ -4962,7 +4987,7 @@ todo_wine flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", FALSE); + ok_sequence(sequences, RENDERER_ID, drawunderline4_seq, "draw underline test 4", TRUE); IDWriteTextLayout_Release(layout);

1 0

Nikolay Sivov : dwrite: Allocate glyph buffer once per run rendering pass.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: 89d074a3fc063722fe45a3148ee3b55cb473d11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d074a3fc063722fe45a3148… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 30 15:07:00 2017 +0300 dwrite: Allocate glyph buffer once per run rendering pass. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e50eda8..e89d0a8 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -180,6 +180,7 @@ struct dwrite_glyphrunanalysis { UINT8 flags; RECT bounds; BYTE *bitmap; + UINT32 max_glyph_bitmap_size; }; struct dwrite_colorglyphenum { @@ -4797,6 +4798,12 @@ static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode) } } +static UINT32 get_glyph_bitmap_pitch(DWRITE_TEXTURE_TYPE type, INT width) +{ + return type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? (width + 3) / 4 * 4 : + ((width + 31) >> 5) << 2; +} + static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds) { struct dwrite_glyphbitmap glyph_bitmap; @@ -4836,10 +4843,16 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a const D2D_POINT_2F *ascenderoffset = analysis->ascenderoffsets ? analysis->ascenderoffsets + i : NULL; const D2D_POINT_2F *advance = analysis->advances + i; RECT *bbox = &glyph_bitmap.bbox; + UINT32 bitmap_size; glyph_bitmap.index = analysis->run.glyphIndices[i]; freetype_get_glyph_bbox(&glyph_bitmap); + bitmap_size = get_glyph_bitmap_pitch(analysis->texture_type, bbox->right - bbox->left) * + (bbox->bottom - bbox->top); + if (bitmap_size > analysis->max_glyph_bitmap_size) + analysis->max_glyph_bitmap_size = bitmap_size; + if (is_rtl) OffsetRect(bbox, origin.x + advance->x, origin.y + advance->y); else @@ -4899,7 +4912,7 @@ static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const REC runbounds->left - bounds->left; } -static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DWRITE_TEXTURE_TYPE type) +static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; struct dwrite_glyphbitmap glyph_bitmap; @@ -4917,11 +4930,11 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, } size = (analysis->bounds.right - analysis->bounds.left)*(analysis->bounds.bottom - analysis->bounds.top); - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) + if (analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) size *= 3; if (!(analysis->bitmap = heap_alloc_zero(size))) { WARN("Failed to allocate run bitmap, %s, type %s.\n", wine_dbgstr_rect(&analysis->bounds), - type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? "3x1" : "1x1"); + analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1 ? "3x1" : "1x1"); IDWriteFontFace4_Release(fontface); return E_OUTOFMEMORY; } @@ -4933,17 +4946,22 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, glyph_bitmap.fontface = fontface; glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); - glyph_bitmap.type = type; + glyph_bitmap.type = analysis->texture_type; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; + if (!(glyph_bitmap.buf = heap_alloc(analysis->max_glyph_bitmap_size))) { + IDWriteFontFace4_Release(fontface); + return E_OUTOFMEMORY; + } + bbox = &glyph_bitmap.bbox; for (i = 0; i < analysis->run.glyphCount; i++) { const D2D_POINT_2F *advanceoffset = analysis->advanceoffsets ? analysis->advanceoffsets + i : NULL; const D2D_POINT_2F *ascenderoffset = analysis->ascenderoffsets ? analysis->ascenderoffsets + i : NULL; const D2D_POINT_2F *advance = analysis->advances + i; + BYTE *src = glyph_bitmap.buf, *dst; int x, y, width, height; - BYTE *src, *dst; BOOL is_1bpp; glyph_bitmap.index = analysis->run.glyphIndices[i]; @@ -4958,12 +4976,8 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, width = bbox->right - bbox->left; height = bbox->bottom - bbox->top; - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) - glyph_bitmap.pitch = (width + 3) / 4 * 4; - else - glyph_bitmap.pitch = ((width + 31) >> 5) << 2; - - glyph_bitmap.buf = src = heap_alloc_zero(height * glyph_bitmap.pitch); + glyph_bitmap.pitch = get_glyph_bitmap_pitch(analysis->texture_type, width); + memset(src, 0, height * glyph_bitmap.pitch); is_1bpp = freetype_get_glyph_bitmap(&glyph_bitmap); if (is_rtl) @@ -4979,11 +4993,11 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, OffsetRect(bbox, analysis->m.dx, analysis->m.dy); /* blit to analysis bitmap */ - dst = get_pixel_ptr(analysis->bitmap, type, bbox, &analysis->bounds); + dst = get_pixel_ptr(analysis->bitmap, analysis->texture_type, bbox, &analysis->bounds); if (is_1bpp) { /* convert 1bpp to 8bpp/24bpp */ - if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) { + if (analysis->texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) { for (y = 0; y < height; y++) { for (x = 0; x < width; x++) if (src[x / 8] & masks[x % 8]) @@ -5012,11 +5026,10 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, } } - heap_free(glyph_bitmap.buf); - origin.x += advance->x; origin.y += advance->y; } + heap_free(glyph_bitmap.buf); IDWriteFontFace4_Release(fontface); @@ -5076,7 +5089,7 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi if (!(This->flags & RUNANALYSIS_BITMAP_READY)) { HRESULT hr; - if (FAILED(hr = glyphrunanalysis_render(This, type))) + if (FAILED(hr = glyphrunanalysis_render(This))) return hr; }

1 0

Józef Kucia : d3d11: Validate stream output descriptions for feature level < 11_0.
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: f1896d492acf35e330276cc171a3ba1734869615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1896d492acf35e330276cc17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:18 2017 +0200 d3d11: Validate stream output descriptions for feature level < 11_0. 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/shader.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 84d6b9f..22b8bbf 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1191,7 +1191,7 @@ static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_output_element *elements, const D3D11_SO_DECLARATION_ENTRY *entries, unsigned int entry_count, const unsigned int *buffer_strides, unsigned int buffer_stride_count, - const struct wined3d_shader_signature *os) + const struct wined3d_shader_signature *os, D3D_FEATURE_LEVEL feature_level) { unsigned int i, j, mask; @@ -1211,6 +1211,11 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Invalid stream %u.\n", f->Stream); return E_INVALIDARG; } + if (f->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) + { + WARN("Invalid stream %u for feature level %#x.\n", f->Stream, feature_level); + return E_INVALIDARG; + } if (f->Stream) { FIXME("Streams not implemented yet.\n"); @@ -1299,8 +1304,8 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (i = 0; i < D3D11_SO_STREAM_COUNT; ++i) { unsigned int current_stride[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; - BOOL has_element[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; - BOOL is_used[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; + unsigned int element_count[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; + unsigned int gap_count[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; for (j = 0; j < entry_count; ++j) { @@ -1309,19 +1314,21 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o if (e->stream_idx != i) continue; current_stride[e->output_slot] += 4 * e->component_count; - is_used[e->output_slot] = TRUE; - if (e->register_idx != WINED3D_STREAM_OUTPUT_GAP) - has_element[e->output_slot] = TRUE; + ++element_count[e->output_slot]; + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + ++gap_count[e->output_slot]; } for (j = 0; j < D3D11_SO_BUFFER_SLOT_COUNT; ++j) { - if (is_used[j] && !has_element[j]) + if (!element_count[j]) + continue; + if (element_count[j] == gap_count[j]) { WARN("Stream %u, output slot %u contains only gaps.\n", i, j); return E_INVALIDARG; } - if (buffer_stride_count && is_used[j]) + if (buffer_stride_count) { if (buffer_stride_count <= j) { @@ -1335,6 +1342,18 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o } } } + + if (!i && feature_level < D3D_FEATURE_LEVEL_11_0 && element_count[0] != entry_count) + { + for (j = 0; j < ARRAY_SIZE(element_count); ++j) + { + if (element_count[j] > 1) + { + WARN("Only one element per output slot is allowed.\n"); + return E_INVALIDARG; + } + } + } } return S_OK; @@ -1367,6 +1386,21 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Invalid rasterizer stream %u.\n", rasterizer_stream); return E_INVALIDARG; } + if (device->feature_level < D3D_FEATURE_LEVEL_11_0) + { + if (rasterizer_stream) + { + WARN("Invalid rasterizer stream %u for feature level %#x.\n", + rasterizer_stream, device->feature_level); + return E_INVALIDARG; + } + if (buffer_stride_count && buffer_stride_count != 1) + { + WARN("Invalid buffer stride count %u for feature level %#x.\n", + buffer_stride_count, device->feature_level); + return E_INVALIDARG; + } + } if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { @@ -1392,7 +1426,8 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, return E_OUTOFMEMORY; } if (FAILED(hr = wined3d_so_elements_from_d3d11_so_entries(so_desc.elements, - so_entries, so_entry_count, buffer_strides, buffer_stride_count, &desc.output_signature))) + so_entries, so_entry_count, buffer_strides, buffer_stride_count, + &desc.output_signature, device->feature_level))) { HeapFree(GetProcessHeap(), 0, so_desc.elements); shader_free_signature(&desc.input_signature);

1 0

Henri Verbeet : wined3d: Only drop WINED3D_MAP_DISCARD right before mapping the buffer object in wined3d_buffer_map ().
by Alexandre Julliard March 30, 2017

March 30, 2017

Module: wine Branch: master Commit: cd4223b0a43185c3477597e57447a6435d811657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4223b0a43185c3477597e57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 29 23:17:27 2017 +0200 wined3d: Only drop WINED3D_MAP_DISCARD right before mapping the buffer object in wined3d_buffer_map(). Dropping WINED3D_MAP_DISCARD too early means we go through the system memory path unnecessarily. Worse, as mentioned in an earlier comment, Darkstar One depends on the entire buffer being uploaded in case of WINED3D_MAP_DISCARD maps, and dropping the flag too early prevents that as well. This fixes a regression introduced by commit 15d53761a5fbfc12fc5f9974c029dace00eab33d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4e8569c..cb3cbbd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1004,14 +1004,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture - * fill rate test seems to depend on this. When we map a buffer with - * GL_MAP_INVALIDATE_BUFFER_BIT, the driver is free to discard the - * previous contents of the buffer. The r600g driver only does this when - * the buffer is currently in use, while the proprietary NVIDIA driver - * appears to do this unconditionally. */ - if (buffer->flags & WINED3D_BUFFER_DISCARD) - flags &= ~WINED3D_MAP_DISCARD; count = ++buffer->resource.map_count; if (buffer->buffer_object) @@ -1064,6 +1056,16 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI { buffer_bind(buffer, context); + /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 + * multitexture fill rate test seems to depend on this. When + * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the + * driver is free to discard the previous contents of the + * buffer. The r600g driver only does this when the buffer is + * currently in use, while the proprietary NVIDIA driver + * appears to do this unconditionally. */ + if (buffer->flags & WINED3D_BUFFER_DISCARD) + flags &= ~WINED3D_MAP_DISCARD; + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags = wined3d_resource_gl_map_flags(flags);

1 0