wine-commits July 2016

wine-commits@winehq.org

2 participants
680 discussions

Henri Verbeet : wined3d: Send resource destruction through the command stream.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 38f3d59ed694afba7913b4992d13cb044a09126c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f3d59ed694afba7913b4992… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:01 2016 +0200 wined3d: Send resource destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 -- dlls/wined3d/resource.c | 11 +++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b52970f..32e7092 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4993,8 +4993,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - context_resource_released(device, resource, type); - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index be7dfb4..a475dc0 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -233,6 +233,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3D_OK; } +static void wined3d_resource_destroy_object(void *object) +{ + struct wined3d_resource *resource = object; + + wined3d_resource_free_sysmem(resource); + context_resource_released(resource->device, resource, resource->type); +} + void resource_cleanup(struct wined3d_resource *resource) { const struct wined3d *d3d = resource->device->wined3d; @@ -245,9 +253,8 @@ void resource_cleanup(struct wined3d_resource *resource) adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); } - wined3d_resource_free_sysmem(resource); - device_resource_released(resource->device, resource); + wined3d_cs_emit_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource); } void resource_unload(struct wined3d_resource *resource)

1 0

Hans Leidekker : webservices: Implement WsWriteBody.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 8cb6698762d0c23f53c44a9ea53f2f65cf9349c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb6698762d0c23f53c44a9ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:39 2016 +0200 webservices: Implement WsWriteBody. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 26 +++++++++++ dlls/webservices/tests/msg.c | 93 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 120 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 99f3837..1182919 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -453,3 +453,29 @@ HRESULT WINAPI WsWriteEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) msg->state = WS_MESSAGE_STATE_DONE; return S_OK; } + +/************************************************************************** + * WsWriteBody [webservices.@] + */ +HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *desc, WS_WRITE_OPTION option, + const void *value, ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %p %08x %p %u %p\n", handle, desc, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !desc) return E_INVALIDARG; + if (msg->state != WS_MESSAGE_STATE_WRITING) return WS_E_INVALID_OPERATION; + + if (desc->elementLocalName && + (hr = WsWriteStartElement( msg->writer_body, NULL, desc->elementLocalName, desc->elementNs, + NULL )) != S_OK) return hr; + + if ((hr = WsWriteType( msg->writer_body, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, + option, value, size, NULL )) != S_OK) return hr; + + if (desc->elementLocalName) hr = WsWriteEndElement( msg->writer_body, NULL ); + return hr; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 05d3169..ae2876d 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -431,6 +431,98 @@ static void test_WsWriteEnvelopeEnd(void) WsFreeWriter( writer ); } +static void test_WsWriteBody(void) +{ + static 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>" + "</s:Header><s:Body><val>1</val></s:Body></s:Envelope>"; + static 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>"; + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"u"}; + WS_XML_STRING val = {3, (BYTE *)"val"}, ns = {2, (BYTE *)"ns"}; + HRESULT hr; + WS_MESSAGE *msg; + WS_XML_WRITER *writer; + WS_MESSAGE_STATE state; + WS_ELEMENT_DESCRIPTION desc; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + struct test + { + UINT32 val; + } test, *ptr; + + 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 = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBody( NULL, NULL, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteBody( msg, NULL, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &val; + f.ns = &ns; + f.type = WS_UINT32_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + s.typeLocalName = &localname; + s.typeNs = &ns; + + desc.elementLocalName = &localname2; + desc.elementNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + + ptr = &test; + test.val = 1; + hr = WsWriteBody( msg, &desc, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, 240, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_WRITING, "got %u\n", state ); + + hr = WsWriteEnvelopeEnd( msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + hr = WsWriteBody( msg, &desc, WS_WRITE_REQUIRED_POINTER, &ptr, sizeof(ptr), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeWriter( writer ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -439,4 +531,5 @@ START_TEST(msg) test_WsAddressMessage(); test_WsWriteEnvelopeStart(); test_WsWriteEnvelopeEnd(); + test_WsWriteBody(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index bdb50a7..29b09c6 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -166,7 +166,7 @@ @ stub WsVerifyXmlNCName @ stub WsWriteArray @ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) -@ stub WsWriteBody +@ stdcall WsWriteBody(ptr ptr long ptr long ptr) @ stub WsWriteBytes @ stub WsWriteChars @ stub WsWriteCharsUtf8

1 0

Hans Leidekker : webservices: Implement WsWriteEnvelopeEnd.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 485c9722d9e734d817c6bb8084faa99696d067ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=485c9722d9e734d817c6bb808… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:38 2016 +0200 webservices: Implement WsWriteEnvelopeEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 20 +++++++++++++++ dlls/webservices/tests/msg.c | 52 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 50821d9..99f3837 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -433,3 +433,23 @@ HRESULT WINAPI WsWriteEnvelopeStart( WS_MESSAGE *handle, WS_XML_WRITER *writer, msg->state = WS_MESSAGE_STATE_WRITING; return S_OK; } + +/************************************************************************** + * WsWriteEnvelopeEnd [webservices.@] + */ +HRESULT WINAPI WsWriteEnvelopeEnd( 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_WRITING) return WS_E_INVALID_OPERATION; + + if ((hr = write_envelope_end( msg, msg->writer_body )) != S_OK) return hr; + + msg->state = WS_MESSAGE_STATE_DONE; + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index ec737c1..05d3169 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -380,6 +380,57 @@ static void test_WsWriteEnvelopeStart(void) WsFreeWriter( writer ); } +static void test_WsWriteEnvelopeEnd(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>" + "</s:Header><s:Body/></s:Envelope>"; + HRESULT hr; + WS_MESSAGE *msg; + WS_XML_WRITER *writer; + WS_MESSAGE_STATE state; + + hr = WsWriteEnvelopeEnd( 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 = WsWriteEnvelopeEnd( msg, 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 ); + + hr = WsWriteEnvelopeEnd( msg, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeEnd( msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, 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 ); + WsFreeWriter( writer ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -387,4 +438,5 @@ START_TEST(msg) test_WsInitializeMessage(); test_WsAddressMessage(); test_WsWriteEnvelopeStart(); + test_WsWriteEnvelopeEnd(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6a29af0..bdb50a7 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -175,7 +175,7 @@ @ stdcall WsWriteEndCData(ptr ptr) @ stdcall WsWriteEndElement(ptr ptr) @ stdcall WsWriteEndStartElement(ptr ptr) -@ stub WsWriteEnvelopeEnd +@ stdcall WsWriteEnvelopeEnd(ptr ptr) @ stdcall WsWriteEnvelopeStart(ptr ptr ptr ptr ptr) @ stub WsWriteMessageEnd @ stub WsWriteMessageStart

1 0

Hans Leidekker : webservices: Implement WsWriteEnvelopeStart.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: b72c6e606106328e2ff20eaba7d932e2e42b09be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b72c6e606106328e2ff20eaba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:37 2016 +0200 webservices: Implement WsWriteEnvelopeStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 2 +- dlls/webservices/msg.c | 155 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/msg.c | 110 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 1 + 5 files changed, 268 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b72c6e606106328e2ff20…

1 0

Hans Leidekker : webservices: Implement WsAddressMessage.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: e36a185fd878804de9d752fe8388742ed4ebc602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36a185fd878804de9d752fe8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:36 2016 +0200 webservices: Implement WsAddressMessage. 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 | 63 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index b3444e0..360e0bd 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -49,6 +49,7 @@ struct msg WS_ENVELOPE_VERSION version_env; WS_ADDRESSING_VERSION version_addr; BOOL is_addressed; + WS_STRING addr; ULONG prop_count; struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; }; @@ -68,6 +69,8 @@ static struct msg *alloc_msg(void) static void free_msg( struct msg *msg ) { + if (!msg) return; + heap_free( msg->addr.chars ); heap_free( msg ); } @@ -246,3 +249,32 @@ HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID } return prop_set( msg->prop, msg->prop_count, id, value, size ); } + +/************************************************************************** + * WsAddressMessage [webservices.@] + */ +HRESULT WINAPI WsAddressMessage( WS_MESSAGE *handle, const WS_ENDPOINT_ADDRESS *addr, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %p %p\n", handle, addr, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (addr && (addr->headers || addr->extensions || addr->identity)) + { + FIXME( "headers, extensions or identity not supported\n" ); + return E_NOTIMPL; + } + + if (!handle) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED || msg->is_addressed) return WS_E_INVALID_OPERATION; + + if (addr && addr->url.length) + { + if (!(msg->addr.chars = heap_alloc( addr->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + memcpy( msg->addr.chars, addr->url.chars, addr->url.length * sizeof(WCHAR) ); + msg->addr.length = addr->url.length; + } + + msg->is_addressed = TRUE; + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index e7b91d0..3e321d7 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -209,9 +209,72 @@ static void test_WsInitializeMessage(void) WsFreeMessage( msg ); } +static void test_WsAddressMessage(void) +{ + static WCHAR localhost[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t','/',0}; + HRESULT hr; + WS_MESSAGE *msg; + WS_ENDPOINT_ADDRESS endpoint; + BOOL addressed; + + hr = WsAddressMessage( 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 = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsAddressMessage( msg, NULL, 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 ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !addressed, "unexpected value %d\n", addressed ); + + hr = WsAddressMessage( msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addressed == TRUE, "unexpected value %d\n", addressed ); + WsFreeMessage( msg ); + + 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 = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &endpoint, 0, sizeof(endpoint) ); + endpoint.url.chars = localhost; + endpoint.url.length = sizeof(localhost)/sizeof(localhost[0]); + hr = WsAddressMessage( msg, &endpoint, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addressed == TRUE, "unexpected value %d\n", addressed ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); test_WsCreateMessageForChannel(); test_WsInitializeMessage(); + test_WsAddressMessage(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6a3fbd4..a702fc0 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -8,7 +8,7 @@ @ stub WsAddCustomHeader @ stub WsAddErrorString @ stub WsAddMappedHeader -@ stub WsAddressMessage +@ stdcall WsAddressMessage(ptr ptr ptr) @ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute @ stdcall WsCall(ptr ptr ptr ptr ptr long ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsInitializeMessage.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: d91a7d2e4b39341ea1629ad1b57c12c268bcb654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d91a7d2e4b39341ea1629ad1b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:35 2016 +0200 webservices: Implement WsInitializeMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 25 ++++++++++++++++++ dlls/webservices/tests/msg.c | 54 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 82c8106..b3444e0 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -44,6 +44,7 @@ static const struct prop_desc msg_props[] = struct msg { + WS_MESSAGE_INITIALIZATION init; WS_MESSAGE_STATE state; WS_ENVELOPE_VERSION version_env; WS_ADDRESSING_VERSION version_addr; @@ -144,6 +145,30 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M } /************************************************************************** + * WsInitializeMessage [webservices.@] + */ +HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, + WS_MESSAGE *src_handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %p\n", handle, init, src_handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (src_handle) + { + FIXME( "src message not supported\n" ); + return E_NOTIMPL; + } + + if (!handle || init > WS_FAULT_MESSAGE) return E_INVALIDARG; + if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + msg->init = init; + msg->state = WS_MESSAGE_STATE_INITIALIZED; + return S_OK; +} + +/************************************************************************** * WsFreeMessage [webservices.@] */ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 957a64e..e7b91d0 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -156,8 +156,62 @@ static void test_WsCreateMessageForChannel(void) WsFreeMessage( msg ); } +static void test_WsInitializeMessage(void) +{ + HRESULT hr; + WS_MESSAGE *msg; + WS_MESSAGE_STATE state; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; + BOOL addressed; + + return; + hr = WsInitializeMessage( NULL, WS_REQUEST_MESSAGE, 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 = WsInitializeMessage( msg, 0xdeadbeef, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + state = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_MESSAGE_STATE_INITIALIZED, "got %u\n", state ); + + addressed = -1; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_IS_ADDRESSED, &addressed, sizeof(addressed), + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !addressed, "unexpected value %d\n", addressed ); + + state = WS_MESSAGE_STATE_EMPTY; + hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + env_version = WS_ENVELOPE_VERSION_SOAP_1_1; + hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + addr_version = WS_ADDRESSING_VERSION_0_9; + hr = WsSetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); test_WsCreateMessageForChannel(); + test_WsInitializeMessage(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8c9c8ee..6a3fbd4 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -90,7 +90,7 @@ @ stdcall WsGetWriterPosition(ptr ptr ptr) @ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) -@ stub WsInitializeMessage +@ stdcall WsInitializeMessage(ptr long ptr ptr) @ stub WsMarkHeaderAsUnderstood @ stub WsMatchPolicyAlternative @ stdcall WsMoveReader(ptr long ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsCreateMessageForChannel.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: dc8033d3710f2c04945e50d499bae727f5736cbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8033d3710f2c04945e50d49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:34 2016 +0200 webservices: Implement WsCreateMessageForChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 83 +++++++++++++++++++++++++++--- dlls/webservices/tests/msg.c | 103 +++++++++++++++++++++++++++++++++++--- dlls/webservices/webservices.spec | 2 +- 3 files changed, 172 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc8033d3710f2c04945e5…

1 0

Hans Leidekker : webservices: Return the number of bytes written from WsWriteXmlBufferToBytes.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: da5c332c924cbc4c485c48edab083ec6527b1988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5c332c924cbc4c485c48eda… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:33 2016 +0200 webservices: Return the number of bytes written from WsWriteXmlBufferToBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 50cd398..45c5021 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1929,6 +1929,7 @@ HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *bu if (!(buf = ws_alloc( heap, xmlbuf->size ))) return WS_E_QUOTA_EXCEEDED; memcpy( buf, xmlbuf->ptr, xmlbuf->size ); *bytes = buf; + *size = xmlbuf->size; return S_OK; }

1 0

Hans Leidekker : webservices: Allow integer values to be passed by pointer in WsWriteType.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 04c52f14673b5ff1e8865e53a44e820e35db6422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c52f14673b5ff1e8865e53a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:32 2016 +0200 webservices: Allow integer values to be passed by pointer in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 84 +++++++++++++++++++++-------------------- dlls/webservices/writer.c | 73 +++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04c52f14673b5ff1e8865…

1 0

Hans Leidekker : webservices: Inherit the prefix only if parent and child namespaces match.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: d921526312e7f2da54c53a8d4f91ba330db7e761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d921526312e7f2da54c53a8d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 10:20:31 2016 +0200 webservices: Inherit the prefix only if parent and child namespaces match. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 29 ++++++++++++++++++++++++----- dlls/webservices/writer.c | 7 +++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d230cdd..6be47b5 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -364,7 +364,7 @@ static void test_WsWriteStartElement(void) { HRESULT hr; WS_XML_WRITER *writer; - WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}; + WS_XML_STRING prefix = {1, (BYTE *)"p"}, ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; WS_XML_STRING localname = {1, (BYTE *)"a"}, localname2 = {1, (BYTE *)"b"}; hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; @@ -404,21 +404,40 @@ static void test_WsWriteStartElement(void) hr = set_output( writer ); ok( hr == S_OK, "got %08x\n", hr ); - hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "", __LINE__ ); hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\">", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/>", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\"><p:b/></p:a>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteStartElement( writer, NULL, &localname2, &ns2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\">", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\">", __LINE__ ); hr = WsWriteEndElement( writer, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - check_output( writer, "<a xmlns=\"ns\"></a>", __LINE__ ); + check_output( writer, "<p:a xmlns:p=\"ns\"></p:a>", __LINE__ ); WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 48c7382..f8512dc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -929,8 +929,11 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; - if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) - prefix = writer->current->hdr.prefix; + if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) + { + elem = &parent->hdr; + if (WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) prefix = elem->prefix; + } if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; elem = &node->hdr;

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
68
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 July 2016