wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Józef Kucia : d3d11/tests: Test creation of typeless resources.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: e71f35fc725a590ef5c9d7c317829b7ad00c0d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71f35fc725a590ef5c9d7c31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 10 11:21:42 2016 +0100 d3d11/tests: Test creation of typeless resources. 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 | 103 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1410b35..0a36186 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5021,6 +5021,108 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_typeless_resource(void) +{ + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_TEXTURE3D_DESC texture3d_desc; + ID3D11Resource *resource; + ID3D11Device *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const struct + { + DXGI_FORMAT format; + D3D11_BIND_FLAG bind_flags; + D3D11_RESOURCE_DIMENSION type; + BOOL succeeds; + BOOL todo; + } + tests[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_RENDER_TARGET, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_DEPTH_STENCIL, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_RENDER_TARGET, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32G8X24_TYPELESS, D3D11_BIND_DEPTH_STENCIL, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, TRUE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE3D, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_RENDER_TARGET, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_VERTEX_BUFFER, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_INDEX_BUFFER, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, D3D11_RESOURCE_DIMENSION_TEXTURE2D, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_DEPTH_STENCIL, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + {DXGI_FORMAT_R8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_DIMENSION_TEXTURE2D, TRUE, FALSE}, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + texture2d_desc.Width = 512; + texture2d_desc.Height = 512; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 1; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_DEFAULT; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + texture3d_desc.Width = 64; + texture3d_desc.Height = 64; + texture3d_desc.Depth = 64; + texture3d_desc.MipLevels = 1; + texture3d_desc.Usage = D3D11_USAGE_DEFAULT; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + if (tests[i].type == D3D11_RESOURCE_DIMENSION_TEXTURE2D) + { + texture2d_desc.Format = tests[i].format; + texture2d_desc.BindFlags = tests[i].bind_flags; + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, NULL, (ID3D11Texture2D **)&resource); + } + else if (tests[i].type == D3D11_RESOURCE_DIMENSION_TEXTURE3D) + { + texture3d_desc.Format = tests[i].format; + texture3d_desc.BindFlags = tests[i].bind_flags; + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, (ID3D11Texture3D **)&resource); + } + else + { + trace("Test %u: Unknown resource type %#x.\n", i, tests[i].type); + continue; + } + + todo_wine_if(tests[i].todo) + ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + ID3D11Resource_Release(resource); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -5053,4 +5155,5 @@ START_TEST(d3d11) test_resource_map(); test_multisample_init(); test_check_multisample_quality_levels(); + test_create_typeless_resource(); }

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: fbc08085da8b5512204aae1c0a56909fea72be89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc08085da8b5512204aae1c0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:08 2016 +0100 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 555226d..4416a84 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1702,6 +1702,63 @@ static void test_WsMoveReader(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", elem->node.nodeType ); + hr = WsMoveReader( reader, WS_MOVE_TO_ROOT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "a", 1 ), "wrong data\n" ); + + hr = WsMoveReader( reader, WS_MOVE_TO_CHILD_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); + + hr = WsMoveReader( reader, WS_MOVE_TO_END_ELEMENT, NULL, 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", elem->node.nodeType ); + + hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "b", 1 ), "wrong data\n" ); + + hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + elem = (WS_XML_ELEMENT_NODE *)node; + ok( elem->node.nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", elem->node.nodeType ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "a", 1 ), "wrong data\n" ); + + hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, 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_BOF, "got %u\n", elem->node.nodeType ); + + hr = WsMoveReader( reader, WS_MOVE_TO_PARENT_ELEMENT, NULL, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + WsFreeReader( reader ); WsFreeWriter( writer ); WsFreeHeap( heap );

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_PARENT_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 57a7870649e819f5a408b5e737dfd6001c8fd8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a7870649e819f5a408b5e73… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:07 2016 +0100 webservices: Implement WS_MOVE_TO_PARENT_ELEMENT 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 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1979ad7..55cd4ac 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1424,6 +1424,19 @@ static BOOL move_to_end_element( struct reader *reader ) return FALSE; } +static BOOL move_to_parent_element( struct reader *reader ) +{ + struct node *parent = reader->current->parent; + + if (parent && (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT || + parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF)) + { + reader->current = parent; + return TRUE; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1457,6 +1470,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_end_element( reader ); break; + case WS_MOVE_TO_PARENT_ELEMENT: + success = move_to_parent_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_END_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 88e53782e8a48108618935f0b7539846fcd638a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e53782e8a48108618935f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:06 2016 +0100 webservices: Implement WS_MOVE_TO_END_ELEMENT 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 5b0217f..1979ad7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1405,6 +1405,25 @@ static BOOL move_to_child_element( struct reader *reader ) return FALSE; } +static BOOL move_to_end_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + + if ((ptr = list_tail( &node->children ))) + { + struct node *tail = LIST_ENTRY( ptr, struct node, entry ); + if (tail->hdr.node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT) + { + reader->current = tail; + return TRUE; + } + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1434,6 +1453,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_child_element( reader ); break; + case WS_MOVE_TO_END_ELEMENT: + success = move_to_end_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_CHILD_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 5c4a061f394314d7cdf2e309187e2a38cba4aa3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4a061f394314d7cdf2e3091… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:05 2016 +0100 webservices: Implement WS_MOVE_TO_CHILD_ELEMENT 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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 19aa1af..5b0217f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1380,6 +1380,31 @@ static BOOL move_to_prev_element( struct reader *reader ) return FALSE; } +static BOOL move_to_child_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node; + + if (!(ptr = list_head( &reader->current->children ))) return FALSE; + node = LIST_ENTRY( ptr, struct node, entry ); + if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = node; + return TRUE; + } + while ((ptr = list_next( &reader->current->children, &node->entry ))) + { + struct node *next = LIST_ENTRY( ptr, struct node, entry ); + if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = next; + return TRUE; + } + node = next; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1405,6 +1430,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_prev_element( reader ); break; + case WS_MOVE_TO_CHILD_ELEMENT: + success = move_to_child_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_PREVIOUS_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 36df4893bf8a54b1616ff53f022c221761731488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36df4893bf8a54b1616ff53f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:04 2016 +0100 webservices: Implement WS_MOVE_TO_PREVIOUS_ELEMENT 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index e613a45..19aa1af 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1362,6 +1362,24 @@ static BOOL move_to_next_element( struct reader *reader ) return FALSE; } +static BOOL move_to_prev_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + while ((ptr = list_prev( &node->parent->children, &node->entry ))) + { + struct node *prev = LIST_ENTRY( ptr, struct node, entry ); + if (prev->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = prev; + return TRUE; + } + node = prev; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1383,6 +1401,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_next_element( reader ); break; + case WS_MOVE_TO_PREVIOUS_ELEMENT: + success = move_to_prev_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_NEXT_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 9b58a3993f57c8012c71c2a188481fbfbd8105ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b58a3993f57c8012c71c2a18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:03 2016 +0100 webservices: Implement WS_MOVE_TO_NEXT_ELEMENT 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 87887ce..e613a45 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1344,6 +1344,24 @@ static BOOL move_to_root_element( struct reader *reader ) return FALSE; } +static BOOL move_to_next_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node = reader->current; + + while ((ptr = list_next( &node->parent->children, &node->entry ))) + { + struct node *next = LIST_ENTRY( ptr, struct node, entry ); + if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = next; + return TRUE; + } + node = next; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1361,6 +1379,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found success = move_to_root_element( reader ); break; + case WS_MOVE_TO_NEXT_ELEMENT: + success = move_to_next_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Implement WS_MOVE_TO_ROOT_ELEMENT in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: d2ecd8692a3d33a05e46d3bc985f6c75e8621f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ecd8692a3d33a05e46d3bc9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:02 2016 +0100 webservices: Implement WS_MOVE_TO_ROOT_ELEMENT 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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 664f183..87887ce 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1319,6 +1319,31 @@ HRESULT WINAPI WsReadToStartElement( WS_XML_READER *handle, const WS_XML_STRING return read_to_startelement( reader, found ); } +static BOOL move_to_root_element( struct reader *reader ) +{ + struct list *ptr; + struct node *node; + + if (!(ptr = list_head( &reader->root->children ))) return FALSE; + node = LIST_ENTRY( ptr, struct node, entry ); + if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = node; + return TRUE; + } + while ((ptr = list_next( &reader->root->children, &node->entry ))) + { + struct node *next = LIST_ENTRY( ptr, struct node, entry ); + if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + reader->current = next; + return TRUE; + } + node = next; + } + return FALSE; +} + static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found ) { struct list *ptr; @@ -1332,6 +1357,10 @@ static HRESULT read_move_to( struct reader *reader, WS_MOVE_TO move, BOOL *found } switch (move) { + case WS_MOVE_TO_ROOT_ELEMENT: + success = move_to_root_element( reader ); + break; + case WS_MOVE_TO_FIRST_NODE: if ((ptr = list_head( &reader->current->parent->children ))) {

1 0

Hans Leidekker : webservices: Insert an end element node for self-closing tags in the reader.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: fe65b87dac3698f1062630ef3629538368840071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe65b87dac3698f1062630ef3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:01 2016 +0100 webservices: Insert an end element node for self-closing tags 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1b3dd2f..664f183 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -387,7 +387,6 @@ enum reader_state READER_STATE_BOF, READER_STATE_STARTELEMENT, READER_STATE_STARTATTRIBUTE, - READER_STATE_STARTENDELEMENT, READER_STATE_STARTCDATA, READER_STATE_CDATA, READER_STATE_TEXT, @@ -987,8 +986,9 @@ static HRESULT read_element( struct reader *reader ) if (!read_cmp( reader, "/>", 2 )) { read_skip( reader, 2 ); - reader->current = reader->current->parent; - reader->state = READER_STATE_STARTENDELEMENT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + read_insert_node( reader, reader->current, node ); + reader->state = READER_STATE_ENDELEMENT; } else {

1 0

Hans Leidekker : webservices: Reset the attribute index in read_element.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 6449cb3b67b11a0032deb8a01ca3282f035ccb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6449cb3b67b11a0032deb8a01… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:02:00 2016 +0100 webservices: Reset the attribute index in read_element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9164b4f..1b3dd2f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -962,6 +962,7 @@ static HRESULT read_element( struct reader *reader ) hr = E_OUTOFMEMORY; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; + reader->current_attr = 0; for (;;) { read_skip_whitespace( reader ); @@ -972,6 +973,7 @@ static HRESULT read_element( struct reader *reader ) free_attribute( attr ); goto error; } + reader->current_attr++; } read_skip_whitespace( reader );

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
76
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 February 2016