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

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

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

Henri Verbeet : wined3d: Call the sub-resource destruction callbacks in wined3d_texture_cleanup().
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 229616a5faf41d8e0a1fa5a6ea8968a5f42e060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=229616a5faf41d8e0a1fa5a6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:02 2016 +0200 wined3d: Call the sub-resource destruction callbacks in wined3d_texture_cleanup(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f42250b..4ed5f12 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -499,6 +499,16 @@ 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); @@ -1518,8 +1528,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) list_remove(&overlay->overlay_entry); overlay->overlay_dest = NULL; } - - sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); } if (context) context_release(context); @@ -2028,6 +2036,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture, idx, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create surface parent, hr %#x.\n", hr); + sub_resource->parent = NULL; wined3d_texture_cleanup(texture); return hr; } @@ -2106,21 +2115,6 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) { - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_texture_sub_resource *sub_resource; - struct wined3d_volume *volume; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - sub_resource = &texture->sub_resources[i]; - if ((volume = sub_resource->u.volume)) - { - TRACE("volume %p.\n", volume); - - sub_resource->parent_ops->wined3d_object_destroyed(sub_resource->parent); - } - } HeapFree(GetProcessHeap(), 0, texture->sub_resources[0].u.volume); } @@ -2285,6 +2279,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture, i, &sub_resource->parent, &sub_resource->parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); + sub_resource->parent = NULL; wined3d_texture_cleanup(texture); return hr; }

1 0

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

08 Jul '16

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

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

08 Jul '16

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: Synchronise resource destruction with the command stream.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: cc9c18a46d1ce7e2834bae0fa65a6ed7904820dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9c18a46d1ce7e2834bae0fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 8 10:59:05 2016 +0200 wined3d: Synchronise resource destruction with 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 | 2 ++ dlls/wined3d/resource.c | 2 ++ dlls/wined3d/texture.c | 1 + dlls/wined3d/wined3d_private.h | 16 ++++++++++++++++ 4 files changed, 21 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a15613d..674daec 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1342,6 +1342,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device ERR("Out of memory.\n"); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); + wined3d_resource_wait_idle(&buffer->resource); return E_OUTOFMEMORY; } buffer->maps_size = 1; @@ -1351,6 +1352,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device ERR("Failed to upload data, hr %#x.\n", hr); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); + wined3d_resource_wait_idle(&buffer->resource); HeapFree(GetProcessHeap(), 0, buffer->maps); return hr; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index a475dc0..a17203d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -239,6 +239,7 @@ static void wined3d_resource_destroy_object(void *object) wined3d_resource_free_sysmem(resource); context_resource_released(resource->device, resource, resource->type); + wined3d_resource_release(resource); } void resource_cleanup(struct wined3d_resource *resource) @@ -254,6 +255,7 @@ void resource_cleanup(struct wined3d_resource *resource) } device_resource_released(resource->device, resource); + wined3d_resource_acquire(resource); wined3d_cs_emit_destroy_object(resource->device->cs, wined3d_resource_destroy_object, resource); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1283b0b..d8e6b86 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -816,6 +816,7 @@ static void wined3d_texture_cleanup_sync(struct wined3d_texture *texture) { wined3d_texture_sub_resources_destroyed(texture); resource_cleanup(&texture->resource); + wined3d_resource_wait_idle(&texture->resource); wined3d_texture_cleanup(texture); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8d97d2e..3de14e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2498,6 +2498,7 @@ struct wined3d_resource DWORD priority; void *heap_memory; struct list resource_list_entry; + LONG access_count; void *parent; const struct wined3d_parent_ops *parent_ops; @@ -2514,6 +2515,21 @@ static inline ULONG wined3d_resource_decref(struct wined3d_resource *resource) return resource->resource_ops->resource_decref(resource); } +static inline void wined3d_resource_acquire(struct wined3d_resource *resource) +{ + InterlockedIncrement(&resource->access_count); +} + +static inline void wined3d_resource_release(struct wined3d_resource *resource) +{ + InterlockedDecrement(&resource->access_count); +} + +static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) +{ + while (InterlockedCompareExchange(&resource->access_count, 0, 0)); +} + void resource_cleanup(struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device *device, enum wined3d_resource_type type, const struct wined3d_format *format,

1 0

Piotr Caban : riched20: Add support for ECO_NOHIDESEL flag.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 060d8c6abb25119cfc67b069a7fe3a94248c3702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060d8c6abb25119cfc67b069a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 8 12:27:14 2016 +0200 riched20: Add support for ECO_NOHIDESEL flag. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 9 +++++++-- dlls/riched20/paint.c | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 13a2857..9ec72e2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3453,14 +3453,15 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_RewrapRepaint(editor); } + if ((changedSettings & settings & ES_NOHIDESEL) && !editor->bHaveFocus) + ME_InvalidateSelection( editor ); + if (changedSettings & settings & ECO_VERTICAL) FIXME("ECO_VERTICAL not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOHSCROLL) FIXME("ECO_AUTOHSCROLL not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOVSCROLL) FIXME("ECO_AUTOVSCROLL not implemented yet!\n"); - if (changedSettings & settings & ECO_NOHIDESEL) - FIXME("ECO_NOHIDESEL not implemented yet!\n"); if (changedSettings & settings & ECO_WANTRETURN) FIXME("ECO_WANTRETURN not implemented yet!\n"); if (changedSettings & settings & ECO_AUTOWORDSELECTION) @@ -4257,6 +4258,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->bHaveFocus = TRUE; ME_ShowCaret(editor); ME_SendOldNotify(editor, EN_SETFOCUS); + if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + ME_InvalidateSelection( editor ); return 0; case WM_KILLFOCUS: ME_CommitUndo(editor); /* End coalesced undos for typed characters */ @@ -4264,6 +4267,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->wheel_remain = 0; ME_HideCaret(editor); ME_SendOldNotify(editor, EN_KILLFOCUS); + if (!editor->bHideSelection && !(editor->styleFlags & ES_NOHIDESEL)) + ME_InvalidateSelection( editor ); return 0; case WM_COMMAND: TRACE("editor wnd command = %d\n", LOWORD(wParam)); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 8580539..42434b9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -261,7 +261,8 @@ static void draw_space( ME_Context *c, ME_Run *run, int x, int y, SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); - if (c->editor->bHideSelection) selected = FALSE; + if (c->editor->bHideSelection || (!c->editor->bHaveFocus && + !(c->editor->styleFlags & ES_NOHIDESEL))) selected = FALSE; if (c->editor->bEmulateVersion10) { old_style_selected = selected; @@ -355,7 +356,8 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, HGDIOBJ hOldFont; int yOffset = 0; BOOL selected = (nSelFrom < run->len && nSelTo >= 0 - && nSelFrom < nSelTo && !c->editor->bHideSelection); + && nSelFrom < nSelTo && !c->editor->bHideSelection && + (c->editor->bHaveFocus || (c->editor->styleFlags & ES_NOHIDESEL))); BOOL old_style_selected = FALSE; RECT sel_rect; HRGN clip = NULL, sel_rgn = NULL;

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 08 Jul '16

08 Jul '16

Module: wine Branch: master Commit: 3a5dd73b051c387f3577aba3b7eb61e6443fcf50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5dd73b051c387f3577aba3b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 7 17:24:42 2016 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 95 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/po/uk.po b/po/uk.po index e0400a9..d86394a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -2991,11 +2991,11 @@ msgstr "%1!u!МБ використано, %2!u!МБ доступно" #: gdi32.rc:28 msgid "Western" -msgstr "Західне" +msgstr "Західноєвропейський" #: gdi32.rc:29 msgid "Central European" -msgstr "Центральна Європа" +msgstr "Центральноєвропейський" #: gdi32.rc:30 msgid "Cyrillic" @@ -3003,11 +3003,11 @@ msgstr "Кирилиця" #: gdi32.rc:31 msgid "Greek" -msgstr "Грецьке" +msgstr "Грецький" #: gdi32.rc:32 msgid "Turkish" -msgstr "Турецьке" +msgstr "Турецький" #: gdi32.rc:33 msgid "Hebrew" @@ -3015,27 +3015,27 @@ msgstr "Іврит" #: gdi32.rc:34 msgid "Arabic" -msgstr "Арабське" +msgstr "Арабський" #: gdi32.rc:35 msgid "Baltic" -msgstr "Балтійське" +msgstr "Балтійський" #: gdi32.rc:36 msgid "Vietnamese" -msgstr "В'єтнамське" +msgstr "В'єтнамський" #: gdi32.rc:37 msgid "Thai" -msgstr "Тайське" +msgstr "Тайський" #: gdi32.rc:38 msgid "Japanese" -msgstr "Японське" +msgstr "Японський" #: gdi32.rc:39 msgid "CHINESE_GB2312" -msgstr "" +msgstr "Китайський GB2312" #: gdi32.rc:40 msgid "Hangul" @@ -3043,7 +3043,7 @@ msgstr "Хангул" #: gdi32.rc:41 msgid "CHINESE_BIG5" -msgstr "" +msgstr "Китайський BIG5" #: gdi32.rc:42 msgid "Hangul(Johab)" @@ -11635,6 +11635,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Використання:\n" +" REG [операція] [параметри]\n" +"\n" +"Підтримувані операції:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Для довідки по конкретній операції, введіть:\n" +" REG [операція] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11739,24 +11748,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Пошук завершено. Знайдено збігів: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: невірне ім'я ключа\n" +msgstr "reg: Невірний синтаксис. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "uninstaller: Невірний параметр [%1]\n" +msgstr "reg: Невірна опція [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Введіть \"REG /?\" для довідки.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Введіть \"REG %1 /?\" для довідки.\n" #: regedit.rc:34 msgid "&Registry" @@ -12002,46 +12007,60 @@ msgid "" " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgstr "" +"Використання:\n" +" regedit [опції] [ім'я файлу] [ключ реєстру]\n" +"\n" +"Опції:\n" +" [без опцій] Запуск програми з графічним інтерфейсом.\n" +" /L:system.dat Шлях до файла system.dat для редагування.\n" +" Сумісна з будь-якими іншими опціями. Ігнорується.\n" +" /R:user.dat Шлях до файла user.dat для редагування.\n" +" Сумісна з будь-якими іншими опціями. Ігнорується.\n" +" /C Імпортувати вміст файлу реєстру.\n" +" /D Видалення зазначеного ключа реєстру.\n" +" /E Експортувати вміст зазначеного ключа реєстру у файл.\n" +" Якщо параметр не заданий, експортується весь реєстр.\n" +" /S Тихий режим. Повідомлення не відображатимуться.\n" +" /V Запуск графічного інтерфейсу в розширеному режимі. " +"Ігнорується.\n" +" /? Показати цю інформацію і вийти.\n" +" [ім'я файлу] Шлях до файлу, який містить дані реєстру для імпорту.\n" +" Опція [/Е] вказує на шлях до файлу куди будуть експортовані " +"дані реєстру.\n" +" [ключ реєстру] Ключ реєстру для редагування.\n" +"\n" +"Приклади використання:\n" +" regedit \"import.reg\"\n" +" regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" #: regedit.rc:360 -#, fuzzy -#| msgid "" -#| "regsvr32: Invalid or unrecognized switch [%1]\n" -#| "\n" msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "" -"regsvr32: Невірний або нерозпізнаний параметр [%1]\n" -"\n" +msgstr "regedit: Невірний або нерозпізнаний параметр [%1]\n" #: regedit.rc:361 msgid "Type \"regedit /?\" for help.\n" -msgstr "" +msgstr "Введіть \"regedit /?\" для довідки.\n" #: regedit.rc:362 -#, fuzzy -#| msgid "No command was specified." msgid "regedit: No filename was specified.\n" -msgstr "Команда не вказана." +msgstr "regedit: Ім'я файлу не вказано.\n" #: regedit.rc:363 msgid "regedit: No registry key was specified for removal.\n" -msgstr "" +msgstr "regedit: Не вказано ключ реєстру для видалення.\n" #: regedit.rc:364 -#, fuzzy -#| msgid "uninstaller: The application with GUID '%1' was not found\n" msgid "regedit: The file '%1' was not found.\n" -msgstr "uninstaller: Застосунок з ідентифікатором '%1' не знайдено\n" +msgstr "regedit: Файл '%1' не знайдено.\n" #: regedit.rc:365 -#, fuzzy -#| msgid "reg: Unable to access remote machine\n" msgid "regedit: Unable to open the file '%1'.\n" -msgstr "reg: неможливо отримати доступ до віддаленої машини\n" +msgstr "regedit: Неможливо відкрити файл '%1'.\n" #: regedit.rc:366 msgid "regedit: Unhandled action.\n" -msgstr "" +msgstr "regedit: Непідтримувана операція.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0