August 2016 - Wine-commits - list.winehq.org

Jacek Caban : wined3d: Removed no longer needed wine_rb_init error handling.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 249b494cce4e281628c43b4855c4dd2584af23dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=249b494cce4e281628c43b485… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:44 2016 +0200 wined3d: Removed no longer needed wine_rb_init error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 24 +++--------------------- dlls/wined3d/ati_fragment_shader.c | 8 +------- dlls/wined3d/device.c | 6 +----- dlls/wined3d/glsl_shader.c | 22 +++------------------- 4 files changed, 8 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c206745..e45f1c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4993,14 +4993,7 @@ static HRESULT shader_arb_alloc(struct wined3d_device *device, const struct wine memset(priv->pshader_const_dirty, 1, sizeof(*priv->pshader_const_dirty) * d3d_info->limits.ps_uniform_count); - if (wine_rb_init(&priv->signature_tree, &sig_tree_functions) == -1) - { - ERR("RB tree init failed\n"); - fragment_pipe->free_private(device); - vertex_pipe->vp_free(device); - HeapFree(GetProcessHeap(), 0, priv); - return E_OUTOFMEMORY; - } + wine_rb_init(&priv->signature_tree, &sig_tree_functions); priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; @@ -5884,13 +5877,7 @@ static void *arbfp_alloc(const struct wined3d_shader_backend_ops *shader_backend else if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) return NULL; - if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - if (priv != shader_priv) - HeapFree(GetProcessHeap(), 0, priv); - return NULL; - } + wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions); priv->use_arbfp_fixed_func = TRUE; return priv; @@ -7080,12 +7067,7 @@ static HRESULT arbfp_blit_alloc(struct wined3d_device *device) if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) return E_OUTOFMEMORY; - if (wine_rb_init(&priv->shaders, &wined3d_arbfp_blit_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, priv); - return E_OUTOFMEMORY; - } + wine_rb_init(&priv->shaders, &wined3d_arbfp_blit_rb_functions); device->blit_priv = priv; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 6a71c24..e5f65c6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1323,13 +1323,7 @@ static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) return NULL; - if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, priv); - return NULL; - } - + wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions); return priv; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3f163a6..5b80814 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5089,11 +5089,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, fragment_pipeline = adapter->fragment_pipe; - if (wine_rb_init(&device->samplers, &wined3d_sampler_rb_functions) == -1) - { - ERR("Failed to initialize sampler rbtree.\n"); - return E_OUTOFMEMORY; - } + wine_rb_init(&device->samplers, &wined3d_sampler_rb_functions); if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ccb027..a5ec999 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8483,11 +8483,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win goto fail; } - if (wine_rb_init(&priv->program_lookup, &wined3d_glsl_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - goto fail; - } + wine_rb_init(&priv->program_lookup, &wined3d_glsl_program_rb_functions); priv->next_constant_version = 1; priv->vertex_pipe = vertex_pipe; @@ -8921,13 +8917,7 @@ static void *glsl_vertex_pipe_vp_alloc(const struct wined3d_shader_backend_ops * if (shader_backend == &glsl_shader_backend) { priv = shader_priv; - - if (wine_rb_init(&priv->ffp_vertex_shaders, &wined3d_ffp_vertex_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - return NULL; - } - + wine_rb_init(&priv->ffp_vertex_shaders, &wined3d_ffp_vertex_program_rb_functions); return priv; } @@ -9447,13 +9437,7 @@ static void *glsl_fragment_pipe_alloc(const struct wined3d_shader_backend_ops *s if (shader_backend == &glsl_shader_backend) { priv = shader_priv; - - if (wine_rb_init(&priv->ffp_fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) - { - ERR("Failed to initialize rbtree.\n"); - return NULL; - } - + wine_rb_init(&priv->ffp_fragment_shaders, &wined3d_ffp_frag_program_rb_functions); return priv; }

1 0

Huw Davies : comctl32/tests: Move the cursor off the parent window to avoid mouse messages.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 53b703d468697d2598afa2119491b2042ec905c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b703d468697d2598afa2119… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 31 11:18:41 2016 +0100 comctl32/tests: Move the cursor off the parent window to avoid mouse messages. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/syslink.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 918b774..fb5a2d1 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -192,6 +192,7 @@ START_TEST(syslink) BOOL rc; HWND hWndSysLink; LONG oldstyle; + POINT orig_pos; if (!load_v6_module(&ctx_cookie, &hCtx)) return; @@ -214,6 +215,10 @@ START_TEST(syslink) return; } + /* Move the cursor off the parent window */ + GetCursorPos(&orig_pos); + SetCursorPos(400, 400); + init_msg_sequences(sequences, NUM_MSG_SEQUENCE); /* Create parent window */ @@ -251,4 +256,5 @@ START_TEST(syslink) DestroyWindow(hWndSysLink); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx); + SetCursorPos(orig_pos.x, orig_pos.y); }

1 0

Huw Davies : comctl32/tests: Restore the cursor position after moving it.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 31963d7da4a81d76a15d44cab4237ef099123e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31963d7da4a81d76a15d44cab… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 31 11:18:42 2016 +0100 comctl32/tests: Restore the cursor position after moving it. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 3 +++ dlls/comctl32/tests/tooltips.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ec87e3b..5e69414 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5765,6 +5765,7 @@ static void test_oneclickactivate(void) HWND hwnd, fg; RECT rect; INT r; + POINT orig_pos; hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); @@ -5791,6 +5792,7 @@ static void test_oneclickactivate(void) ok(r == 0, "should not fail\n"); GetWindowRect(hwnd, &rect); + GetCursorPos(&orig_pos); SetCursorPos(rect.left+5, rect.top+5); flush_events(); r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0); @@ -5810,6 +5812,7 @@ static void test_oneclickactivate(void) expect(1, r); DestroyWindow(hwnd); + SetCursorPos(orig_pos.x, orig_pos.y); } static void test_callback_mask(void) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 3d5ca9a..72bfc95 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -152,6 +152,7 @@ static void test_customdraw(void) { DWORD iterationNumber; WNDCLASSA wc; LRESULT lResult; + POINT orig_pos; /* Create a class to use the custom draw wndproc */ wc.style = CS_HREDRAW | CS_VREDRAW; @@ -166,6 +167,8 @@ static void test_customdraw(void) { wc.lpfnWndProc = custom_draw_wnd_proc; RegisterClassA(&wc); + GetCursorPos(&orig_pos); + for (iterationNumber = 0; iterationNumber < sizeof(expectedResults)/sizeof(expectedResults[0]); iterationNumber++) { @@ -238,7 +241,7 @@ static void test_customdraw(void) { DestroyWindow(parent); } - + SetCursorPos(orig_pos.x, orig_pos.y); } static const CHAR testcallbackA[] = "callback";

1 0

Hans Leidekker : webservices: Store standard headers in an XML buffer.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: f3d6591155b87539b1969c91d22943d560b97ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d6591155b87539b1969c91d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:27 2016 +0200 webservices: Store standard headers in an XML buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 314 ++++++++++++++++++++++++++++++------------------- 1 file changed, 194 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3d6591155b87539b1969…

1 0

Hans Leidekker : webservices: Implement WsAddCustomHeader.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 147cd6b35b094b03bed3c3351bdc9a911638a10f URL: http://source.winehq.org/git/wine.git/?a=commit;h=147cd6b35b094b03bed3c3351… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:28 2016 +0200 webservices: Implement WsAddCustomHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 81 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/msg.c | 67 ++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 149 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 67b157e..ffe19f9 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -881,3 +881,84 @@ HRESULT WINAPI WsRemoveMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *na return S_OK; } + +static HRESULT write_custom_header( WS_XML_WRITER *writer, const WS_XML_STRING *name, const WS_XML_STRING *ns, + WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, + ULONG size ) +{ + HRESULT hr; + if ((hr = WsWriteStartElement( writer, NULL, name, ns, NULL )) != S_OK) return hr; + if ((hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, type, desc, option, value, size, + NULL )) != S_OK) return hr; + return WsWriteEndElement( writer, NULL ); +} + +static HRESULT build_custom_header( WS_HEAP *heap, const WS_XML_STRING *name, const WS_XML_STRING *ns, + WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, + ULONG size, struct header **ret ) +{ + struct header *header; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buf; + HRESULT hr; + + if (!(header = alloc_header( 0, FALSE, name, ns ))) return E_OUTOFMEMORY; + + if ((hr = WsCreateWriter( NULL, 0, &writer, NULL )) != S_OK) goto done; + if ((hr = WsCreateXmlBuffer( heap, NULL, 0, &buf, NULL )) != S_OK) goto done; + if ((hr = WsSetOutputToBuffer( writer, buf, NULL, 0, NULL )) != S_OK) goto done; + if ((hr = write_custom_header( writer, name, ns, type, desc, option, value, size )) != S_OK) goto done; + + header->u.buf = buf; + +done: + if (hr != S_OK) free_header( header ); + else *ret = header; + WsFreeWriter( writer ); + return hr; +} + +/************************************************************************** + * WsAddCustomHeader [webservices.@] + */ +HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size, ULONG attrs, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + struct header *header; + BOOL found = FALSE; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %08x %p %u %08x %p\n", handle, desc, option, value, size, attrs, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !desc) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || msg->header[i]->mapped) continue; + if (WsXmlStringEquals( desc->elementLocalName, &msg->header[i]->name, NULL ) && + WsXmlStringEquals( desc->elementNs, &msg->header[i]->ns, NULL ) == S_OK) + { + found = TRUE; + break; + } + } + + if (!found) + { + if ((hr = grow_header_array( msg, msg->header_count + 1 )) != S_OK) return hr; + i = msg->header_count; + } + + if ((hr = build_custom_header( msg->heap, desc->elementLocalName, desc->elementNs, desc->type, + desc->typeDescription, option, value, size, &header )) != S_OK) return hr; + + if (!found) msg->header_count++; + else free_header( msg->header[i] ); + + msg->header[i] = header; + return write_envelope( msg ); +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 73fcfd6..a038d66 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -737,6 +737,72 @@ static void test_WsRemoveMappedHeader(void) WsFreeMessage( msg ); } +static void test_WsAddCustomHeader(void) +{ + static const char expected[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<header xmlns=\"ns\">value</header></s:Header><s:Body/></s:Envelope>"; + static const char expected2[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "</s:Header><s:Body/></s:Envelope>"; + static WS_XML_STRING header = {6, (BYTE *)"header"}, ns = {2, (BYTE *)"ns"}; + static WCHAR valueW[] = {'v','a','l','u','e',0}; + HRESULT hr; + WS_MESSAGE *msg; + WS_ELEMENT_DESCRIPTION desc; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + struct header + { + const WCHAR *value; + } test; + + hr = WsAddCustomHeader( NULL, NULL, 0, NULL, 0, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddCustomHeader( msg, NULL, 0, NULL, 0, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct header); + s.alignment = TYPE_ALIGNMENT(struct header); + s.fields = fields; + s.fieldCount = 1; + + desc.elementLocalName = &header; + desc.elementNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + hr = WsAddCustomHeader( msg, &desc, 0, NULL, 0, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + test.value = valueW; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, NULL, 0, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -750,4 +816,5 @@ START_TEST(msg) test_WsRemoveHeader(); test_WsAddMappedHeader(); test_WsRemoveMappedHeader(); + test_WsAddCustomHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index acf5167..1ac3b75 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -5,7 +5,7 @@ @ stub WsAbortServiceHost @ stub WsAbortServiceProxy @ stub WsAcceptChannel -@ stub WsAddCustomHeader +@ stdcall WsAddCustomHeader(ptr ptr long ptr long long ptr) @ stub WsAddErrorString @ stdcall WsAddMappedHeader(ptr ptr long long ptr long ptr) @ stdcall WsAddressMessage(ptr ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsRemoveCustomHeader.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 1acc1b9ee4197e746cf24997b3804a5f56f54c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acc1b9ee4197e746cf24997b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:29 2016 +0200 webservices: Implement WsRemoveCustomHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 32 ++++++++++++++++++++++ dlls/webservices/tests/msg.c | 57 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ffe19f9..a27ddbd 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -962,3 +962,35 @@ HRESULT WINAPI WsAddCustomHeader( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTI msg->header[i] = header; return write_envelope( msg ); } + +/************************************************************************** + * WsRemoveCustomHeader [webservices.@] + */ +HRESULT WINAPI WsRemoveCustomHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, const WS_XML_STRING *ns, + WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + BOOL removed = FALSE; + ULONG i; + + TRACE( "%p %s %s %p\n", handle, debugstr_xmlstr(name), debugstr_xmlstr(ns), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !name || !ns) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK && + WsXmlStringEquals( ns, &msg->header[i]->ns, NULL ) == S_OK) + { + remove_header( msg, i ); + removed = TRUE; + break; + } + } + + if (removed) return write_envelope( msg ); + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index a038d66..af7f609 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -803,6 +803,62 @@ static void test_WsAddCustomHeader(void) WsFreeMessage( msg ); } +static void test_WsRemoveCustomHeader(void) +{ + static const char expected[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<test xmlns=\"ns\">value</test></s:Header><s:Body/></s:Envelope>"; + static const char expected2[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "</s:Header><s:Body/></s:Envelope>"; + static WS_XML_STRING localname = {4, (BYTE *)"test"}, ns = {2, (BYTE *)"ns"}; + static const WS_XML_STRING value = {5, (BYTE *)"value"}; + HRESULT hr; + WS_MESSAGE *msg; + WS_ELEMENT_DESCRIPTION desc; + + hr = WsRemoveCustomHeader( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + desc.elementLocalName = &localname; + desc.elementNs = &ns; + desc.type = WS_XML_STRING_TYPE; + desc.typeDescription = NULL; + hr = WsAddCustomHeader( msg, &desc, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + hr = WsRemoveCustomHeader( msg, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveCustomHeader( msg, &localname, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + /* again */ + hr = WsRemoveCustomHeader( msg, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -817,4 +873,5 @@ START_TEST(msg) test_WsAddMappedHeader(); test_WsRemoveMappedHeader(); test_WsAddCustomHeader(); + test_WsRemoveCustomHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1ac3b75..863e926 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -127,7 +127,7 @@ @ stub WsReadXmlBufferFromBytes @ stub WsReceiveMessage @ stub WsRegisterOperationForCancel -@ stub WsRemoveCustomHeader +@ stdcall WsRemoveCustomHeader(ptr ptr ptr ptr) @ stdcall WsRemoveHeader(ptr long ptr) @ stdcall WsRemoveMappedHeader(ptr ptr ptr) @ stub WsRemoveNode

1 0

Hans Leidekker : webservices: Add a stub implementation of WsAbortServiceProxy.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 6f048bbf0dd3d33240e1a204335f4bcfe48c9c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f048bbf0dd3d33240e1a2043… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:30 2016 +0200 webservices: Add a stub implementation of WsAbortServiceProxy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 9 +++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index cd90e36..5ff07f7 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -236,6 +236,15 @@ HRESULT WINAPI WsCloseServiceProxy( WS_SERVICE_PROXY *handle, const WS_ASYNC_CON } /************************************************************************** + * WsAbortServiceProxy [webservices.@] + */ +HRESULT WINAPI WsAbortServiceProxy( WS_SERVICE_PROXY *handle, WS_ERROR *error ) +{ + FIXME( "%p %p\n", handle, error ); + return E_NOTIMPL; +} + +/************************************************************************** * WsCall [webservices.@] */ HRESULT WINAPI WsCall( WS_SERVICE_PROXY *handle, const WS_OPERATION_DESCRIPTION *desc, const void **args, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 863e926..fb9a1bc 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -3,7 +3,7 @@ @ stub WsAbortChannel @ stub WsAbortListener @ stub WsAbortServiceHost -@ stub WsAbortServiceProxy +@ stdcall WsAbortServiceProxy(ptr ptr) @ stub WsAcceptChannel @ stdcall WsAddCustomHeader(ptr ptr long ptr long long ptr) @ stub WsAddErrorString diff --git a/include/webservices.h b/include/webservices.h index 5ce7621..8e1270f 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1366,6 +1366,7 @@ struct _WS_PROXY_MESSAGE_CALLBACK_CONTEXT void *state; }; +HRESULT WINAPI WsAbortServiceProxy(WS_SERVICE_PROXY*, WS_ERROR*); HRESULT WINAPI WsAddCustomHeader(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, ULONG, WS_ERROR*); HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION,

1 0

Hans Leidekker : webservices: Ignore unimplemented struct options in the reader.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: b9d751d5420d4b03fc91c8f9089f32313642ce6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d751d5420d4b03fc91c8f90… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:31 2016 +0200 webservices: Ignore unimplemented struct options 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 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 1a51257..a05d98e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3821,12 +3821,7 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, char *buf; if (!desc) return E_INVALIDARG; - - if (desc->structOptions) - { - FIXME( "struct options %08x not supported\n", desc->structOptions ); - return E_NOTIMPL; - } + if (desc->structOptions) FIXME( "struct options %08x not supported\n", desc->structOptions ); switch (option) {

1 0

Hans Leidekker : webservices: Implement WsReadEnvelopeStart.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: a8c343552b0eda441a5941d4f525531d024f9418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c343552b0eda441a5941d4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:32 2016 +0200 webservices: Implement WsReadEnvelopeStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 52 +++++++++++++++++++++++++++++++++++ dlls/webservices/tests/msg.c | 58 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 ++ 4 files changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a27ddbd..2004c70 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -75,6 +75,7 @@ struct msg WS_XML_BUFFER *buf; WS_XML_WRITER *writer; WS_XML_WRITER *writer_body; + WS_XML_READER *reader_body; ULONG header_count; ULONG header_size; struct header **header; @@ -536,6 +537,57 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de return hr; } +static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *localname ) +{ + const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; + + if (WsGetReaderNode( reader, &node, NULL ) != S_OK) return FALSE; + if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + elem = (const WS_XML_ELEMENT_NODE *)node; + return WsXmlStringEquals( elem->localName, localname, NULL ) == S_OK; +} + +static HRESULT read_envelope_start( WS_XML_READER *reader ) +{ + static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; + HRESULT hr; + + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if (!match_current_element( reader, &envelope )) return WS_E_INVALID_FORMAT; + /* FIXME: read headers */ + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + if (!match_current_element( reader, &body )) return WS_E_INVALID_FORMAT; + return WsReadNode( reader, NULL ); +} + +/************************************************************************** + * WsReadEnvelopeStart [webservices.@] + */ +HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, WS_MESSAGE_DONE_CALLBACK cb, + void *state, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %p %p %p %p\n", handle, reader, cb, state, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (cb) + { + FIXME( "callback not supported\n" ); + return E_NOTIMPL; + } + + if (!handle || !reader) return E_INVALIDARG; + if (msg->state != WS_MESSAGE_STATE_EMPTY) return WS_E_INVALID_OPERATION; + + if ((hr = read_envelope_start( reader )) != S_OK) return hr; + + msg->reader_body = reader; + msg->state = WS_MESSAGE_STATE_READING; + return S_OK; +} + /************************************************************************** * WsInitializeMessage [webservices.@] */ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index af7f609..a31ed94 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -859,6 +859,63 @@ static void test_WsRemoveCustomHeader(void) WsFreeMessage( msg ); } +static HRESULT set_input( WS_XML_READER *reader, const char *data, ULONG size ) +{ + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}, WS_CHARSET_AUTO}; + WS_XML_READER_BUFFER_INPUT buf; + + buf.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; + buf.encodedData = (void *)data; + buf.encodedDataSize = size; + return WsSetInput( reader, &text.encoding, &buf.input, NULL, 0, NULL ); +} + +static void test_WsReadEnvelopeStart(void) +{ + static const char xml[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body/></s:Envelope>"; + WS_MESSAGE *msg, *msg2; + WS_XML_READER *reader; + WS_MESSAGE_STATE state; + HRESULT hr; + + hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadEnvelopeStart( msg, NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadEnvelopeStart( msg, reader, NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, xml, strlen(xml) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadEnvelopeStart( msg2, reader, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg2, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_READING, "got %u\n", state ); + + WsFreeMessage( msg ); + WsFreeMessage( msg2 ); + WsFreeReader( reader ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -874,4 +931,5 @@ START_TEST(msg) test_WsRemoveMappedHeader(); test_WsAddCustomHeader(); test_WsRemoveCustomHeader(); + test_WsReadEnvelopeStart(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index fb9a1bc..6354243 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -112,7 +112,7 @@ @ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension @ stub WsReadEnvelopeEnd -@ stub WsReadEnvelopeStart +@ stdcall WsReadEnvelopeStart(ptr ptr ptr ptr ptr) @ stub WsReadMessageEnd @ stub WsReadMessageStart @ stub WsReadMetadata diff --git a/include/webservices.h b/include/webservices.h index 8e1270f..3a06ab5 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1444,6 +1444,8 @@ HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_R WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); +HRESULT WINAPI WsReadEnvelopeStart(WS_MESSAGE*, WS_XML_READER*, WS_MESSAGE_DONE_CALLBACK, void*, + WS_ERROR*); HRESULT WINAPI WsReadNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadStartAttribute(WS_XML_READER*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadStartElement(WS_XML_READER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsReadEnvelopeEnd.
by Alexandre Julliard 31 Aug '16

31 Aug '16

Module: wine Branch: master Commit: 6b583f9350af180ba908016453a5b16decb8c9d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b583f9350af180ba90801645… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 31 14:35:33 2016 +0200 webservices: Implement WsReadEnvelopeEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 27 ++++++++++++++++++++++ dlls/webservices/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 2004c70..27dbddd 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -588,6 +588,33 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return S_OK; } +static HRESULT read_envelope_end( WS_XML_READER *reader ) +{ + HRESULT hr; + if ((hr = WsReadEndElement( reader, NULL )) != S_OK) return hr; /* </s:Body> */ + return WsReadEndElement( reader, NULL ); /* </s:Envelope> */ +} + +/************************************************************************** + * WsReadEnvelopeEnd [webservices.@] + */ +HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (msg->state != WS_MESSAGE_STATE_READING) return WS_E_INVALID_OPERATION; + + if ((hr = read_envelope_end( msg->reader_body )) != S_OK) return hr; + + msg->state = WS_MESSAGE_STATE_DONE; + return S_OK; +} + /************************************************************************** * WsInitializeMessage [webservices.@] */ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index a31ed94..99db9e6 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -916,6 +916,52 @@ static void test_WsReadEnvelopeStart(void) WsFreeReader( reader ); } +static void test_WsReadEnvelopeEnd(void) +{ + static const char xml[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body></s:Body></s:Envelope>"; + WS_MESSAGE *msg, *msg2; + WS_XML_READER *reader; + WS_MESSAGE_STATE state; + HRESULT hr; + + hr = WsReadEnvelopeEnd( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, xml, strlen(xml) ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadEnvelopeEnd( msg2, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsReadEnvelopeStart( msg2, reader, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadEnvelopeEnd( msg2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg2, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_DONE, "got %u\n", state ); + + WsFreeMessage( msg ); + WsFreeMessage( msg2 ); + WsFreeReader( reader ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -932,4 +978,5 @@ START_TEST(msg) test_WsAddCustomHeader(); test_WsRemoveCustomHeader(); test_WsReadEnvelopeStart(); + test_WsReadEnvelopeEnd(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6354243..a0f88ac 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -111,7 +111,7 @@ @ stdcall WsReadEndAttribute(ptr ptr) @ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension -@ stub WsReadEnvelopeEnd +@ stdcall WsReadEnvelopeEnd(ptr ptr) @ stdcall WsReadEnvelopeStart(ptr ptr ptr ptr ptr) @ stub WsReadMessageEnd @ stub WsReadMessageStart diff --git a/include/webservices.h b/include/webservices.h index 3a06ab5..dbaa5d1 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1444,6 +1444,7 @@ HRESULT WINAPI WsReadElement(WS_XML_READER*, const WS_ELEMENT_DESCRIPTION*, WS_R WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndAttribute(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); +HRESULT WINAPI WsReadEnvelopeEnd(WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsReadEnvelopeStart(WS_MESSAGE*, WS_XML_READER*, WS_MESSAGE_DONE_CALLBACK, void*, WS_ERROR*); HRESULT WINAPI WsReadNode(WS_XML_READER*, WS_ERROR*);

1 0