wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_texture.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 75ce5086ec34e008a01c470abac4fa196997264e URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ce5086ec34e008a01c470ab… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 13:24:26 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_texture. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 35ba504..f05fa74 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5737,6 +5737,13 @@ static void test_texture(void) 40, 30, 20, 10, 250, 210, 155, 190, }; + static const DWORD r9g9b9e5_data[] = + { + 0x80000100, 0x80020000, 0x84000000, 0x84000100, + 0x78000100, 0x78020000, 0x7c000000, 0x78020100, + 0x70000133, 0x70026600, 0x74cc0000, 0x74cc0133, + 0x6800019a, 0x68033400, 0x6e680000, 0x6e6b359a, + }; static const struct texture rgba_texture = { 4, 4, 3, 1, DXGI_FORMAT_R8G8B8A8_UNORM, @@ -5780,6 +5787,8 @@ static void test_texture(void) {{r32_float, 4 * sizeof(*r32_float)}}}; static const struct texture r32u_typeless = {4, 4, 1, 1, DXGI_FORMAT_R32_TYPELESS, {{r32_uint, 4 * sizeof(*r32_uint)}}}; + static const struct texture r9g9b9e5_texture = {4, 4, 1, 1, DXGI_FORMAT_R9G9B9E5_SHAREDEXP, + {{r9g9b9e5_data, 4 * sizeof(*r9g9b9e5_data)}}}; static const DWORD red_colors[] = { 0xff0000ff, 0xff0000ff, 0xff0000ff, 0xff0000ff, @@ -5871,6 +5880,13 @@ static void test_texture(void) 0x01000028, 0x0100001e, 0x01000014, 0x0100000a, 0x010000fa, 0x010000d2, 0x0100009b, 0x010000be, }; + static const DWORD r9g9b9e5_colors[16] = + { + 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffff00ff, + 0xff00007f, 0xff007f00, 0xff7f0000, 0xff007f7f, + 0xff00004c, 0xff004c00, 0xff4c0000, 0xff4c004c, + 0xff000033, 0xff003300, 0xff330000, 0xff333333, + }; static const DWORD zero_colors[4 * 4] = {0}; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; @@ -5906,6 +5922,7 @@ static void test_texture(void) {&ps_ld, &bc1_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc2_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_ld, &bc3_texture_srgb, POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, + {&ps_ld, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_ld, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_ld_sint8, &sint8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, sint8_colors}, @@ -5921,6 +5938,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, POINT, 8.0f, 0.0f, MIP_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, {&ps_sample, &a8_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, + {&ps_sample, &r9g9b9e5_texture, POINT, 0.0f, 0.0f, 0.0f, 0.0f, r9g9b9e5_colors}, {&ps_sample, NULL, POINT, 0.0f, 0.0f, 0.0f, 0.0f, zero_colors}, {&ps_sample, NULL, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, zero_colors}, {&ps_sample_b, &rgba_texture, POINT, 0.0f, 0.0f, MIP_MAX, 0.0f, rgba_level_0},

1 0

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 3ab8842894ef70740ad86d8e58b381c68abf268e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab8842894ef70740ad86d8e5… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:25 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture3d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 29f3e5f..35ba504 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1610,6 +1610,9 @@ static void test_create_texture3d(void) {DXGI_FORMAT_R8G8B8A8_UNORM, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Sven Hesse : d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: d7a2ad024af795a4fb8bb069ffcd0a4369a5c950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a2ad024af795a4fb8bb069f… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:24 2017 +0200 d3d10core/tests: Add R9G9B9E5_SHAREDEXP to test_create_texture2d. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b63ba87..29f3e5f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1334,6 +1334,9 @@ static void test_create_texture2d(void) FALSE, TRUE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, }; if (!(device = create_device()))

1 0

Sven Hesse : wined3d: Add support for WINED3DFMT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: f492287412dccda4e810b0a54782bd3f610a5dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=f492287412dccda4e810b0a54… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:23 2017 +0200 wined3d: Add support for WINED3DFMT_R9G9B9E5_SHAREDEXP. A format that contains 3 floating point values with a 9-bit mantissa each and a shared 5-bit exponent. Maps directly onto the RGB9_E5_EXT format available through the GL extension EXT_texture_shared_exponent. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2bdc9e2..bf7f916 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -149,6 +149,8 @@ static const struct wined3d_format_channels formats[] = /* Unsure about them, could not find a Windows driver that supports them */ {WINED3DFMT_R16, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_AL16, 0, 0, 0, 16, 0, 0, 0, 16, 4, 0, 0}, + /* DirectX 10 HDR formats */ + {WINED3DFMT_R9G9B9E5_SHAREDEXP, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, /* Typeless */ {WINED3DFMT_R32G32B32A32_TYPELESS, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, {WINED3DFMT_R32G32B32_TYPELESS, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, @@ -1675,6 +1677,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE, ARB_FRAMEBUFFER_OBJECT, NULL}, + /* DirectX 10 HDR formats */ + {WINED3DFMT_R9G9B9E5_SHAREDEXP, GL_RGB9_E5_EXT, GL_RGB9_E5_EXT, 0, + GL_RGB, GL_UNSIGNED_INT_5_9_9_9_REV_EXT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + EXT_TEXTURE_SHARED_EXPONENT, NULL}, }; struct wined3d_format_srgb_info

1 0

Sven Hesse : wined3d: Add EXT_texture_shared_exponent extension.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 741bc0511813388df6bcc8c8f0f3fa9a2bedc5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=741bc0511813388df6bcc8c8f… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Thu May 25 12:15:22 2017 +0200 wined3d: Add EXT_texture_shared_exponent extension. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 53f8232..7c6a8c0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -235,6 +235,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, + {"GL_EXT_texture_shared_exponent", EXT_TEXTURE_SHARED_EXPONENT }, {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, @@ -3823,6 +3824,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {EXT_PACKED_FLOAT, MAKEDWORD_VERSION(3, 0)}, {EXT_TEXTURE_ARRAY, MAKEDWORD_VERSION(3, 0)}, {EXT_TEXTURE_INTEGER, MAKEDWORD_VERSION(3, 0)}, + {EXT_TEXTURE_SHARED_EXPONENT, MAKEDWORD_VERSION(3, 0)}, /* We don't want to enable EXT_GPU_SHADER4: even though similar * functionality is available in core GL 3.0 / GLSL 1.30, it's different * enough that reusing the same flag for the new features hurts more diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 52fb5fd..b871812 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -167,6 +167,7 @@ enum wined3d_gl_extension EXT_TEXTURE_INTEGER, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, + EXT_TEXTURE_SHARED_EXPONENT, EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE,

1 0

Hans Leidekker : webservices/tests: Add more binary mode reading tests.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: d843845e0741d52b64774da0fbbc263f057e0ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d843845e0741d52b64774da0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:44 2017 +0200 webservices/tests: Add more binary mode reading tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 199 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d843845e0741d52b64774…

1 0

Hans Leidekker : webservices: Add support for reading comments in binary mode.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 6f65dbc04ce6f9770fe128cf398609338a6f90a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f65dbc04ce6f9770fe128cf3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:43 2017 +0200 webservices: Add support for reading comments in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/webservices/tests/reader.c | 16 ++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f0f96ea..7624eb9 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1942,7 +1942,7 @@ static HRESULT read_endelement( struct reader *reader ) } } -static HRESULT read_comment( struct reader *reader ) +static HRESULT read_comment_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; @@ -1982,6 +1982,39 @@ static HRESULT read_comment( struct reader *reader ) return S_OK; } +static HRESULT read_comment_bin( struct reader *reader ) +{ + struct node *node, *parent; + WS_XML_COMMENT_NODE *comment; + unsigned char type; + ULONG len; + HRESULT hr; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + if ((hr = read_int31( reader, &len )) != S_OK) return hr; + + if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + + if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; + comment = (WS_XML_COMMENT_NODE *)node; + if (!(comment->value.bytes = heap_alloc( len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + if ((hr = read_bytes( reader, comment->value.bytes, len )) != S_OK) + { + free_node( node ); + return E_OUTOFMEMORY; + } + comment->value.length = len; + + read_insert_node( reader, parent, node ); + reader->state = READER_STATE_COMMENT; + return S_OK; +} + static HRESULT read_startcdata( struct reader *reader ) { struct node *node, *endnode, *parent; @@ -2074,7 +2107,7 @@ static HRESULT read_node_text( struct reader *reader ) } else if (!read_cmp( reader, "</", 2 )) return read_endelement_text( reader ); else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); - else if (!read_cmp( reader, "<!--", 4 )) return read_comment( reader ); + else if (!read_cmp( reader, "<!--", 4 )) return read_comment_text( reader ); else if (!read_cmp( reader, "<", 1 )) return read_element_text( reader ); else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); else return read_text_text( reader ); @@ -2106,6 +2139,10 @@ static HRESULT read_node_bin( struct reader *reader ) { return read_endelement_bin( reader ); } + else if (type == RECORD_COMMENT) + { + return read_comment_bin( reader ); + } else if (type >= RECORD_SHORT_ELEMENT && type <= RECORD_PREFIX_ELEMENT_Z) { return read_element_bin( reader ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4af941b..4e1394c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4516,11 +4516,14 @@ static void test_binary_encoding(void) {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x01}; static const char res4[] = {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x99,0x04,'t','e','s','t'}; + static const char res200[] = + {0x02,0x07,'c','o','m','m','e','n','t'}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; const WS_XML_TEXT_NODE *text; const WS_XML_UTF8_TEXT *utf8; + const WS_XML_COMMENT_NODE *comment; WS_XML_READER *reader; HRESULT hr; @@ -4659,6 +4662,19 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* comment */ + hr = set_input_bin( reader, res200, sizeof(res200) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_COMMENT, "got %u\n", node->nodeType ); + comment = (const WS_XML_COMMENT_NODE *)node; + ok( comment->value.length == 7, "got %u\n", comment->value.length ); + ok( !memcmp( comment->value.bytes, "comment", 7 ), "wrong data\n" ); + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Add support for reading text in binary mode.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: b9953cef4e4dc4d9ce45654abbe692d995ab72c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9953cef4e4dc4d9ce45654ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:42 2017 +0200 webservices: Add support for reading text in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 117 +++++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 47 ++++++++++++++++ 2 files changed, 158 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a5e3efc..f0f96ea 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1643,7 +1643,7 @@ error: return hr; } -static HRESULT read_text( struct reader *reader ) +static HRESULT read_text_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; @@ -1685,9 +1685,58 @@ static HRESULT read_text( struct reader *reader ) return S_OK; } +static HRESULT read_text_bin( struct reader *reader ) +{ + unsigned char type; + struct node *node, *parent; + WS_XML_TEXT_NODE *text; + WS_XML_UTF8_TEXT *utf8; + ULONG len; + HRESULT hr; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + + switch (type) + { + case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: + { + unsigned char len8; + if ((hr = read_byte( reader, &len8 )) != S_OK) return hr; + len = len8; + break; + } + default: + ERR( "unhandled record type %02x\n", type ); + return WS_E_NOT_SUPPORTED; + } + + if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; + text = (WS_XML_TEXT_NODE *)node; + if (!(utf8 = alloc_utf8_text( NULL, len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + { + heap_free( utf8 ); + heap_free( node ); + return hr; + } + text->text = &utf8->text; + + read_insert_node( reader, parent, node ); + reader->state = READER_STATE_TEXT; + reader->text_conv_offset = 0; + return S_OK; +} + static HRESULT read_node_text( struct reader * ); -static HRESULT read_startelement( struct reader *reader ) +static HRESULT read_startelement_text( struct reader *reader ) { read_skip_whitespace( reader ); if (!read_cmp( reader, "/>", 2 )) @@ -1706,7 +1755,27 @@ static HRESULT read_startelement( struct reader *reader ) return WS_E_INVALID_FORMAT; } -static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) +static HRESULT read_node_bin( struct reader * ); + +static HRESULT read_startelement_bin( struct reader *reader ) +{ + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_FORMAT; + return read_node_bin( reader ); +} + +static HRESULT read_startelement( struct reader *reader ) +{ + switch (reader->input_enc) + { + case WS_XML_READER_ENCODING_TYPE_TEXT: return read_startelement_text( reader ); + case WS_XML_READER_ENCODING_TYPE_BINARY: return read_startelement_bin( reader ); + default: + ERR( "unhandled encoding %u\n", reader->input_enc ); + return WS_E_NOT_SUPPORTED; + } +} + +static HRESULT read_to_startelement_text( struct reader *reader, BOOL *found ) { HRESULT hr; @@ -1736,6 +1805,39 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } +static HRESULT read_to_startelement_bin( struct reader *reader, BOOL *found ) +{ + HRESULT hr; + + if (reader->state == READER_STATE_STARTELEMENT) + { + if (found) *found = TRUE; + return S_OK; + } + + if ((hr = read_element_bin( reader )) == S_OK && found) + { + if (reader->state == READER_STATE_STARTELEMENT) + *found = TRUE; + else + *found = FALSE; + } + + return hr; +} + +static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) +{ + switch (reader->input_enc) + { + case WS_XML_READER_ENCODING_TYPE_TEXT: return read_to_startelement_text( reader, found ); + case WS_XML_READER_ENCODING_TYPE_BINARY: return read_to_startelement_bin( reader, found ); + default: + ERR( "unhandled encoding %u\n", reader->input_enc ); + return WS_E_NOT_SUPPORTED; + } +} + static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) { ULONG i; @@ -1974,8 +2076,8 @@ static HRESULT read_node_text( struct reader *reader ) else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); else if (!read_cmp( reader, "<!--", 4 )) return read_comment( reader ); else if (!read_cmp( reader, "<", 1 )) return read_element_text( reader ); - else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement( reader ); - else return read_text( reader ); + else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); + else return read_text_text( reader ); } } @@ -2008,7 +2110,10 @@ static HRESULT read_node_bin( struct reader *reader ) { return read_element_bin( reader ); } - + else if (type >= RECORD_ZERO_TEXT && type <= RECORD_QNAME_DICTIONARY_TEXT_WITH_ENDELEMENT) + { + return read_text_bin( reader ); + } FIXME( "unhandled record type %02x\n", type ); return WS_E_NOT_SUPPORTED; } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 41cbadc..4af941b 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4514,9 +4514,13 @@ static void test_binary_encoding(void) {0x6d,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; static const char res3[] = {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x01}; + static const char res4[] = + {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x99,0x04,'t','e','s','t'}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; + const WS_XML_TEXT_NODE *text; + const WS_XML_UTF8_TEXT *utf8; WS_XML_READER *reader; HRESULT hr; @@ -4612,6 +4616,49 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* element with text */ + hr = set_input_bin( reader, res4, sizeof(res4) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); + text = (const WS_XML_TEXT_NODE *)node; + ok( text->text->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", text->text->textType ); + utf8 = (const WS_XML_UTF8_TEXT *)text->text; + ok( utf8->value.length == 4, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "test", 4 ), "wrong text\n" ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Add support for reading attributes in binary mode.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 78428d963eb742eae5c35010640d673aa94f7cf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78428d963eb742eae5c350106… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:41 2017 +0200 webservices: Add support for reading attributes in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 141 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 69 ++++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 39f0202..a5e3efc 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1221,6 +1221,11 @@ error: return hr; } +static inline BOOL is_text_type( unsigned char type ) +{ + return (type >= RECORD_ZERO_TEXT && type <= RECORD_QNAME_DICTIONARY_TEXT_WITH_ENDELEMENT); +} + static HRESULT read_int31( struct reader *reader, ULONG *len ) { unsigned char byte; @@ -1258,6 +1263,42 @@ static HRESULT read_string( struct reader *reader, WS_XML_STRING **str ) return hr; } +static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE *attr ) +{ + WS_XML_UTF8_TEXT *utf8 = NULL; + unsigned char type; + HRESULT hr; + ULONG len; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + + switch (type) + { + case RECORD_CHARS8_TEXT: + { + unsigned char len8; + if ((hr = read_byte( reader, &len8 )) != S_OK) return hr; + len = len8; + break; + } + default: + ERR( "unhandled record type %02x\n", type ); + return WS_E_NOT_SUPPORTED; + } + + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if (!len) utf8->value.bytes = (BYTE *)(utf8 + 1); /* quirk */ + if ((hr = read_bytes( reader, utf8->value.bytes, len )) != S_OK) + { + heap_free( utf8 ); + return hr; + } + + attr->value = &utf8->text; + return S_OK; +} + static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { static const WS_XML_STRING xmlns = {5, (BYTE *)"xmlns"}; @@ -1314,6 +1355,83 @@ error: return hr; } +static inline BOOL is_attribute_type( unsigned char type ) +{ + return (type >= RECORD_SHORT_ATTRIBUTE && type <= RECORD_PREFIX_ATTRIBUTE_Z); +} + +static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret ) +{ + WS_XML_ATTRIBUTE *attr; + unsigned char type = 0; + HRESULT hr; + + if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; + if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; + + if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) + { + unsigned char ch = type - RECORD_PREFIX_ATTRIBUTE_A + 'a'; + if (!(attr->prefix = alloc_xml_string( &ch, 1 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + if ((hr = read_string( reader, &attr->localName )) != S_OK) goto error; + if ((hr = read_attribute_value_bin( reader, attr )) != S_OK) goto error; + } + else + { + switch (type) + { + case RECORD_SHORT_ATTRIBUTE: + if (!(attr->prefix = alloc_xml_string( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + if ((hr = read_string( reader, &attr->localName )) != S_OK) goto error; + if ((hr = read_attribute_value_bin( reader, attr )) != S_OK) goto error; + break; + + case RECORD_ATTRIBUTE: + if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if ((hr = read_string( reader, &attr->localName )) != S_OK) goto error; + if ((hr = read_attribute_value_bin( reader, attr )) != S_OK) goto error; + break; + + case RECORD_SHORT_XMLNS_ATTRIBUTE: + if (!(attr->prefix = alloc_xml_string( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; + attr->isXmlNs = 1; + break; + + case RECORD_XMLNS_ATTRIBUTE: + if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; + if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; + attr->isXmlNs = 1; + break; + + default: + ERR( "unhandled record type %02x\n", type ); + return WS_E_NOT_SUPPORTED; + } + } + + *ret = attr; + return S_OK; + +error: + free_attribute( attr ); + return hr; +} + static inline struct node *find_parent( struct reader *reader ) { if (node_type( reader->current ) == WS_XML_NODE_TYPE_END_ELEMENT) @@ -1438,6 +1556,28 @@ static inline BOOL is_element_type( unsigned char type ) return (type >= RECORD_SHORT_ELEMENT && type <= RECORD_PREFIX_ELEMENT_Z); } +static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE *elem ) +{ + WS_XML_ATTRIBUTE *attr; + unsigned char type; + HRESULT hr; + + reader->current_attr = 0; + for (;;) + { + if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if (!is_attribute_type( type )) break; + if ((hr = read_attribute_bin( reader, &attr )) != S_OK) return hr; + if ((hr = append_attribute( elem, attr )) != S_OK) + { + free_attribute( attr ); + return hr; + } + reader->current_attr++; + } + return S_OK; +} + static HRESULT read_element_bin( struct reader *reader ) { struct node *node = NULL, *parent; @@ -1491,6 +1631,7 @@ static HRESULT read_element_bin( struct reader *reader ) goto error; } + if ((hr = read_attributes_bin( reader, elem )) != S_OK) goto error; if ((hr = set_namespaces( reader, elem )) != S_OK) goto error; read_insert_node( reader, parent, node ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 34fe2da..41cbadc 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4510,8 +4510,13 @@ static void test_binary_encoding(void) { static const char res[] = {0x40,0x01,'t',0x01}; + static const char res2[] = + {0x6d,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; + static const char res3[] = + {0x41,0x02,'p','2',0x01,'t',0x09,0x02,'p','2',0x02,'n','s',0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; + const WS_XML_ATTRIBUTE *attr; WS_XML_READER *reader; HRESULT hr; @@ -4543,6 +4548,70 @@ static void test_binary_encoding(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* single character prefix element */ + hr = set_input_bin( reader, res2, sizeof(res2) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->prefix->length == 1, "got %u\n", elem->prefix->length ); + ok( !memcmp( elem->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + /* element */ + hr = set_input_bin( reader, res3, sizeof(res3) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( elem->prefix->length == 2, "got %u\n", elem->prefix->length ); + ok( !memcmp( elem->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 2, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p2", 2 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + WsFreeReader( reader ); }

1 0

Hans Leidekker : webservices: Add initial support for binary XML in the reader.
by Alexandre Julliard 25 May '17

25 May '17

Module: wine Branch: master Commit: 505d60f988adc4be9a735afc800d172b2e7183ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=505d60f988adc4be9a735afc8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 25 12:54:40 2017 +0200 webservices: Add initial support for binary XML in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 451 +++++++++++++++++++++++++++++++--------- dlls/webservices/tests/reader.c | 52 +++++ 2 files changed, 399 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=505d60f988adc4be9a735…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
64
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 May 2017