February 2016 - Wine-commits

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/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

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

Józef Kucia : wined3d: Fix comment in init_format_texture_info().
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: a8585c2d8d013a1ee40995bcd3610529f6c8e689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8585c2d8d013a1ee40995bcd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 10 02:14:25 2016 +0100 wined3d: Fix comment in init_format_texture_info(). 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/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index beb104a..9f21be6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2378,7 +2378,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) continue; - /* ARB_texture_rg defines integer formats if ARB_texture_integer is also supported. */ + /* ARB_texture_rg defines integer formats if EXT_texture_integer is also supported. */ if (!gl_info->supported[EXT_TEXTURE_INTEGER] && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_INTEGER)) continue;

1 0

Józef Kucia : wined3d: Add remaining sRGB formats.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 9c98d632779862aae15e9e3a25f59065fae03386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c98d632779862aae15e9e3a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 10 02:14:26 2016 +0100 wined3d: Add remaining sRGB formats. 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/wined3d/utils.c | 14 +++++++++++++- include/wine/wined3d.h | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9f21be6..d355ee1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -85,7 +85,9 @@ static const struct wined3d_format_channels formats[] = /* Standard ARGB formats. */ {WINED3DFMT_B8G8R8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 3, 0, 0}, {WINED3DFMT_B8G8R8A8_UNORM, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, {WINED3DFMT_B8G8R8X8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_B5G6R5_UNORM, 5, 6, 5, 0, 11, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5X1_UNORM, 5, 5, 5, 0, 10, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, @@ -1414,10 +1416,13 @@ struct wined3d_format_srgb_info static const struct wined3d_format_srgb_info format_srgb_info[] = { + {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_UNORM}, {WINED3DFMT_BC2_UNORM_SRGB, WINED3DFMT_BC2_UNORM}, {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_UNORM}, - {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_UNORM}, + {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_UNORM}, }; static inline int getFmtIdx(enum wined3d_format_id format_id) @@ -3276,6 +3281,13 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B5G5R5A1_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); + FMT_TO_STR(WINED3DFMT_B8G8R8A8_TYPELESS); + FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS); + FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); + FMT_TO_STR(WINED3DFMT_BC7_UNORM); + FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); FMT_TO_STR(WINED3DFMT_INTZ); FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index df95da9..f314af3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -214,6 +214,13 @@ enum wined3d_format_id WINED3DFMT_B5G5R5A1_UNORM, WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, + WINED3DFMT_B8G8R8A8_TYPELESS, + WINED3DFMT_B8G8R8A8_UNORM_SRGB, + WINED3DFMT_B8G8R8X8_TYPELESS, + WINED3DFMT_B8G8R8X8_UNORM_SRGB, + WINED3DFMT_BC7_TYPELESS, + WINED3DFMT_BC7_UNORM, + WINED3DFMT_BC7_UNORM_SRGB, /* FOURCC formats. */ WINED3DFMT_UYVY = WINEMAKEFOURCC('U','Y','V','Y'), WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y','U','Y','2'),

1 0

Hugh McMaster : reg: Add support for the default registry value in ask_confirm().
by Alexandre Julliard 10 Feb '16

10 Feb '16

1 0

Hugh McMaster : reg: Ask the user if they want to delete the subkey, value , default value or all values.
by Alexandre Julliard 10 Feb '16

10 Feb '16

1 0

Hugh McMaster : reg/tests: Add tests for /d with no data argument.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: acf0c92943e77c2d93f18a16f98066a40eca2a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf0c92943e77c2d93f18a16f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 10 22:23:19 2016 +1100 reg/tests: Add tests for /d with no data argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index d815d89..e55e1a2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -168,6 +168,9 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); @@ -238,6 +241,9 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); verify_reg(hkey, "bin5", REG_BINARY, buffer, 0, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v bin6 /t REG_BINARY /f /d", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -248,6 +254,8 @@ static void test_add(void) else win_skip("broken reg.exe detected\n"); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 0\n", r); @@ -344,6 +352,9 @@ static void test_add(void) buffer[0]='a'; buffer[1]=0; buffer[2]=0; verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + RegCloseKey(hkey); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hans Leidekker : webservices: Implement WsFindAttribute.
by Alexandre Julliard 10 Feb '16

10 Feb '16

Module: wine Branch: master Commit: 46393a3f86ef7420df3356edacc94574901bd2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46393a3f86ef7420df3356eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 10 15:01:59 2016 +0100 webservices: Implement WsFindAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 65 +++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 89 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 149 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9391cf8..9164b4f 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1068,12 +1068,12 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } -static BOOL cmp_localname( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) { ULONG i; - if (len1 != len2) return FALSE; - for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return FALSE; } - return TRUE; + if (len1 != len2) return 1; + for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } + return 0; } struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, @@ -1088,10 +1088,10 @@ struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix if (!localname) return parent; str = parent->hdr.prefix; - if (!cmp_localname( str->bytes, str->length, prefix->bytes, prefix->length )) continue; + if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; str = parent->hdr.localName; - if (!cmp_localname( str->bytes, str->length, localname->bytes, localname->length )) continue; + if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; return parent; } @@ -1579,6 +1579,59 @@ static HRESULT read_get_attribute_text( struct reader *reader, WS_XML_UTF8_TEXT return S_OK; } +static BOOL find_attribute( struct reader *reader, const WS_XML_STRING *localname, + const WS_XML_STRING *ns, ULONG *index ) +{ + ULONG i; + WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; + + if (!localname) + { + *index = reader->current_attr; + return TRUE; + } + for (i = 0; i < elem->attributeCount; i++) + { + const WS_XML_STRING *localname2 = elem->attributes[i]->localName; + const WS_XML_STRING *ns2 = elem->attributes[i]->ns; + + if (!cmp_name( localname->bytes, localname->length, localname2->bytes, localname2->length ) && + !cmp_name( ns->bytes, ns->length, ns2->bytes, ns2->length )) + { + *index = i; + return TRUE; + } + } + return FALSE; +} + +/************************************************************************** + * WsFindAttribute [webservices.@] + */ +HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *localname, + const WS_XML_STRING *ns, BOOL required, ULONG *index, + WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %s %s %d %p %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), + required, index, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !localname || !ns || !index) return E_INVALIDARG; + + if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) + return WS_E_INVALID_OPERATION; + + if (!find_attribute( reader, localname, ns, index )) + { + if (required) return WS_E_INVALID_FORMAT; + *index = ~0u; + return S_FALSE; + } + return S_OK; +} + static HRESULT read_type_bool( struct reader *reader, WS_TYPE_MAPPING mapping, const WS_BOOL_DESCRIPTION *desc, BOOL *ret ) { diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index f9b2ea9..555226d 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1871,6 +1871,94 @@ static void test_cdata(void) WsFreeReader( reader ); } +static void test_WsFindAttribute(void) +{ + static const char test[] = "<t attr='value' attr2='value2'></t>"; + WS_XML_STRING ns = {0, NULL}, localname = {4, (BYTE *)"attr"}; + WS_XML_STRING localname2 = {5, (BYTE *)"attr2"}, localname3 = {5, (BYTE *)"attr3"}; + WS_XML_READER *reader; + ULONG index; + HRESULT hr; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, &localname, &ns, TRUE, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, &localname, NULL, TRUE, &index, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFindAttribute( reader, NULL, &ns, TRUE, &index, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !index, "got %u\n", index ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname2, &ns, TRUE, &index, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( index == 1, "got %u\n", index ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname, &ns, TRUE, &index, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( index == 0xdeadbeef, "got %u\n", index ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname3, &ns, TRUE, &index, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( index == 0xdeadbeef, "got %u\n", index ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + index = 0xdeadbeef; + hr = WsFindAttribute( reader, &localname3, &ns, FALSE, &index, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( index == ~0u, "got %u\n", index ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1890,4 +1978,5 @@ START_TEST(reader) test_WsMoveReader(); test_simple_struct_type(); test_cdata(); + test_WsFindAttribute(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index ffe8bca..5500424 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -45,7 +45,7 @@ @ stub WsFileTimeToDateTime @ stub WsFillBody @ stdcall WsFillReader(ptr long ptr ptr) -@ stub WsFindAttribute +@ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody @ stub WsFlushWriter @ stub WsFreeChannel

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