July 2016 - Wine-Commits - list.winehq.org

Michael Stefaniuc : winmm: Remove redundant NULL checks before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: fb1f42754d6c562903fa285e930da3d01d453b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb1f42754d6c562903fa285e9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:12:55 2016 +0200 winmm: Remove redundant NULL checks before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/waveform.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 2d8b838..1915c21 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -899,8 +899,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, hr = IAudioClient_IsFormatSupported(device->client, AUDCLNT_SHAREMODE_SHARED, &target, &closer_fmt); - if(closer_fmt) - CoTaskMemFree(closer_fmt); + CoTaskMemFree(closer_fmt); if(hr != S_OK) return WAVERR_BADFORMAT; @@ -1119,8 +1118,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, hr = IAudioClient_IsFormatSupported(device->client, AUDCLNT_SHAREMODE_SHARED, device->orig_fmt, &closer_fmt); - if(closer_fmt) - CoTaskMemFree(closer_fmt); + CoTaskMemFree(closer_fmt); if((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !(info->flags & WAVE_FORMAT_DIRECT)) ret = WINMM_MapDevice(device, TRUE, is_out); else

1 0

Henri Verbeet : wined3d: Send buffer destruction through the command stream.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: b21f3c930eac9c8f5ff8fcb9383d4bec99e9ac6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21f3c930eac9c8f5ff8fcb93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:04 2016 +0200 wined3d: Send buffer 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/buffer.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8adc2a1..a15613d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -556,28 +556,35 @@ static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) device_invalidate_state(device, STATE_STREAMSRC); } +static void wined3d_buffer_destroy_object(void *object) +{ + struct wined3d_buffer *buffer = object; + struct wined3d_context *context; + + if (buffer->buffer_object) + { + context = context_acquire(buffer->resource.device, NULL); + delete_gl_buffer(buffer, context->gl_info); + context_release(context); + + HeapFree(GetProcessHeap(), 0, buffer->conversion_map); + } + + HeapFree(GetProcessHeap(), 0, buffer->maps); + HeapFree(GetProcessHeap(), 0, buffer); +} + ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); - struct wined3d_context *context; TRACE("%p decreasing refcount to %u.\n", buffer, refcount); if (!refcount) { - if (buffer->buffer_object) - { - context = context_acquire(buffer->resource.device, NULL); - delete_gl_buffer(buffer, context->gl_info); - context_release(context); - - HeapFree(GetProcessHeap(), 0, buffer->conversion_map); - } - - resource_cleanup(&buffer->resource); buffer->resource.parent_ops->wined3d_object_destroyed(buffer->resource.parent); - HeapFree(GetProcessHeap(), 0, buffer->maps); - HeapFree(GetProcessHeap(), 0, buffer); + resource_cleanup(&buffer->resource); + wined3d_cs_emit_destroy_object(buffer->resource.device->cs, wined3d_buffer_destroy_object, buffer); } return refcount;

1 0

Henri Verbeet : wined3d: Send texture destruction through the command stream.
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 1184237640ad33a23c7b48db146c17185ae3a048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1184237640ad33a23c7b48db1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:03 2016 +0200 wined3d: Send texture 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/texture.c | 59 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4ed5f12..1283b0b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -468,6 +468,24 @@ static void wined3d_texture_unload_gl_texture(struct wined3d_texture *texture) resource_unload(&texture->resource); } +static void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + struct wined3d_texture_sub_resource *sub_resource; + unsigned int i; + + for (i = 0; i < sub_count; ++i) + { + sub_resource = &texture->sub_resources[i]; + if (sub_resource->parent) + { + TRACE("sub-resource %u.\n", i); + sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); + sub_resource->parent = NULL; + } + } +} + static void wined3d_texture_cleanup(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -499,19 +517,8 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) if (context) context_release(context); - for (i = 0; i < sub_count; ++i) - { - struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (sub_resource->parent) - { - TRACE("sub-resource %u.\n", i); - sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); - } - } - texture->texture_ops->texture_cleanup_sub_resources(texture); wined3d_texture_unload_gl_texture(texture); - resource_cleanup(&texture->resource); } void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) @@ -805,6 +812,19 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) return refcount; } +static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) +{ + wined3d_texture_sub_resources_destroyed(texture); + resource_cleanup(&texture->resource); + wined3d_texture_cleanup(texture); +} + +static void wined3d_texture_destroy_object(void *object) +{ + wined3d_texture_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) { ULONG refcount; @@ -819,9 +839,10 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) if (!refcount) { - wined3d_texture_cleanup(texture); + wined3d_texture_sub_resources_destroyed(texture); texture->resource.parent_ops->wined3d_object_destroyed(texture->resource.parent); - HeapFree(GetProcessHeap(), 0, texture); + resource_cleanup(&texture->resource); + wined3d_cs_emit_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); } return refcount; @@ -1993,7 +2014,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if (level_count > ~(SIZE_T)0 / layer_count || !(surfaces = wined3d_calloc(level_count * layer_count, sizeof(*surfaces)))) { - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } @@ -2037,7 +2058,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { WARN("Failed to create surface parent, hr %#x.\n", hr); sub_resource->parent = NULL; - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return hr; } @@ -2048,7 +2069,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 if (((desc->usage & WINED3DUSAGE_OWNDC) || (device->wined3d->flags & WINED3D_NO3D)) && FAILED(hr = wined3d_surface_create_dc(surface))) { - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return hr; } } @@ -2257,7 +2278,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct if (!(volumes = wined3d_calloc(level_count, sizeof(*volumes)))) { - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return E_OUTOFMEMORY; } @@ -2280,7 +2301,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct { WARN("Failed to create volume parent, hr %#x.\n", hr); sub_resource->parent = NULL; - wined3d_texture_cleanup(texture); + wined3d_texture_cleanup_sync(texture); return hr; } @@ -2585,7 +2606,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct * in this case. */ if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) { - wined3d_texture_cleanup(object); + wined3d_texture_cleanup_sync(object); HeapFree(GetProcessHeap(), 0, object); return hr; }

1 0

Hans Leidekker : webservices: Implement WsWriteBody.
by Alexandre Julliard July 8, 2016

July 8, 2016

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><u xmlns=\"ns\"><val>1</val></u></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 July 8, 2016

July 8, 2016

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 July 8, 2016

July 8, 2016

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 July 8, 2016

July 8, 2016

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 July 8, 2016

July 8, 2016

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 July 8, 2016

July 8, 2016

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

Michael Stefaniuc : urlmon: Remove a redundant NULL check before CoTaskMemFree().
by Alexandre Julliard July 8, 2016

July 8, 2016

Module: wine Branch: master Commit: 7218d488647388816e599420a596c416be72d80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7218d488647388816e599420a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 8 10:17:24 2016 +0200 urlmon: Remove a redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index d8bba1b..2759f3d 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -429,7 +429,7 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate2 *iface, DWORD if(pszAdditionalRequestHeaders) *pszAdditionalRequestHeaders = additional_headers; - else if(additional_headers) + else CoTaskMemFree(additional_headers); return hres;

1 0