wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Hans Leidekker : webservices: Implement WsCreateChannel and WsFreeChannel.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 8d9bf5375879ab3c220029966faffa4c74d4793c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9bf5375879ab3c220029966… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:44 2016 +0200 webservices: Implement WsCreateChannel and WsFreeChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/channel.c | 158 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- dlls/webservices/webservices_private.h | 12 +++ 4 files changed, 173 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index d48e3c6..c052252 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = webservices IMPORTS = user32 C_SRCS = \ + channel.c \ main.c \ reader.c \ writer.c diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c new file mode 100644 index 0000000..c8a920d --- /dev/null +++ b/dlls/webservices/channel.c @@ -0,0 +1,158 @@ +/* + * Copyright 2016 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "webservices.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "webservices_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +static const struct +{ + ULONG size; + BOOL readonly; +} +channel_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE */ + { sizeof(UINT64), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_MESSAGE_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_START_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_FLUSH_SIZE */ + { sizeof(WS_ENCODING), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODING */ + { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ + { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ + { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ +}; + +static struct channel *alloc_channel(void) +{ + static const ULONG count = sizeof(channel_props)/sizeof(channel_props[0]); + struct channel *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_CHANNEL_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += channel_props[i].size; + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ptr = (char *)&ret->prop[count]; + for (i = 0; i < count; i++) + { + ret->prop[i].value = ptr; + ret->prop[i].valueSize = channel_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_channel_prop( struct channel *channel, WS_CHANNEL_PROPERTY_ID id, const void *value, + ULONG size ) +{ + if (id >= channel->prop_count || size != channel_props[id].size || channel_props[id].readonly) + return E_INVALIDARG; + + memcpy( channel->prop[id].value, value, size ); + return S_OK; +} + +void free_channel( struct channel *channel ) +{ + heap_free( channel ); +} + +HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_CHANNEL_PROPERTY *properties, ULONG count, struct channel **ret ) +{ + struct channel *channel; + ULONG i, msg_size = 65536; + HRESULT hr; + + if (!(channel = alloc_channel())) return E_OUTOFMEMORY; + + set_channel_prop( channel, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &msg_size, sizeof(msg_size) ); + + for (i = 0; i < count; i++) + { + hr = set_channel_prop( channel, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) + { + free_channel( channel ); + return hr; + } + } + + channel->type = type; + channel->binding = binding; + + *ret = channel; + return S_OK; +} + +/************************************************************************** + * WsCreateChannel [webservices.@] + */ +HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, + const WS_CHANNEL_PROPERTY *properties, ULONG count, + const WS_SECURITY_DESCRIPTION *desc, WS_CHANNEL **handle, + WS_ERROR *error ) +{ + struct channel *channel; + HRESULT hr; + + TRACE( "%u %u %p %u %p %p %p\n", type, binding, properties, count, desc, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (desc) FIXME( "ignoring security description\n" ); + + if (!handle) return E_INVALIDARG; + + if (type != WS_CHANNEL_TYPE_REQUEST) + { + FIXME( "channel type %u not implemented\n", type ); + return E_NOTIMPL; + } + if (binding != WS_HTTP_CHANNEL_BINDING) + { + FIXME( "channel binding %u not implemented\n", binding ); + return E_NOTIMPL; + } + + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) + return hr; + + *handle = (WS_CHANNEL *)channel; + return S_OK; +} + +/************************************************************************** + * WsFreeChannel [webservices.@] + */ +void WINAPI WsFreeChannel( WS_CHANNEL *handle ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p\n", handle ); + free_channel( channel ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 9c0b3c7..2ddda72 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -20,7 +20,7 @@ @ stub WsCombineUrl @ stub WsCopyError @ stub WsCopyNode -@ stub WsCreateChannel +@ stdcall WsCreateChannel(long long ptr long ptr ptr ptr) @ stub WsCreateChannelForListener @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @@ -48,7 +48,7 @@ @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody @ stub WsFlushWriter -@ stub WsFreeChannel +@ stdcall WsFreeChannel(ptr) @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) @ stub WsFreeListener diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index c286fd2..1ec3eeb 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -50,6 +50,18 @@ static inline WS_XML_NODE_TYPE node_type( const struct node *node ) return node->hdr.node.nodeType; } +struct channel +{ + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + ULONG prop_count; + WS_CHANNEL_PROPERTY prop[9]; +}; + +HRESULT create_channel( WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY *, + ULONG, struct channel ** ) DECLSPEC_HIDDEN; +void free_channel( struct channel * ) DECLSPEC_HIDDEN; + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size );

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 051f326c0044e28d1a0c1576c16b6ef952312856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=051f326c0044e28d1a0c1576c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:43 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 377 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 377 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=051f326c0044e28d1a0c1…

1 0

Hans Leidekker : webservices: Add support for reading enum values.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 2b5b0f0174fd91ec6dcdebbc211cae341fd895ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5b0f0174fd91ec6dcdebbc2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:42 2016 +0200 webservices: Add support for reading enum values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 68 +++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 18 +++++++++++ 2 files changed, 86 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f09781e..c2c9d0b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2542,6 +2542,67 @@ static HRESULT read_type_wsz( struct reader *reader, WS_TYPE_MAPPING mapping, return S_OK; } +static HRESULT get_enum_value( const WS_XML_UTF8_TEXT *text, const WS_ENUM_DESCRIPTION *desc, int *ret ) +{ + ULONG i; + for (i = 0; i < desc->valueCount; i++) + { + if (WsXmlStringEquals( &text->value, desc->values[i].name, NULL ) == S_OK) + { + *ret = desc->values[i].value; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; +} + +static HRESULT read_type_enum( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_ENUM_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + HRESULT hr; + int val = 0; + BOOL found; + + if (!desc) return E_INVALIDARG; + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = get_enum_value( utf8, desc, &val )) != S_OK) return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + if (size != sizeof(int)) return E_INVALIDARG; + *(int *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + { + int *heap_val = NULL; + if (size != sizeof(heap_val)) return E_INVALIDARG; + if (found) + { + if (!(heap_val = ws_alloc( heap, sizeof(*heap_val) ))) return WS_E_QUOTA_EXCEEDED; + *heap_val = val; + } + *(int **)ret = heap_val; + break; + } + default: + FIXME( "read option %u not supported\n", option ); + return E_NOTIMPL; + } + + return S_OK; +} + static BOOL is_empty_text_node( const struct node *node ) { const WS_XML_TEXT_NODE *text = (const WS_XML_TEXT_NODE *)node; @@ -2608,6 +2669,7 @@ static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_BOOL_TYPE: case WS_INT32_TYPE: case WS_UINT32_TYPE: + case WS_ENUM_TYPE: return sizeof(INT32); case WS_INT64_TYPE: @@ -2716,6 +2778,7 @@ static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) case WS_UINT16_TYPE: case WS_UINT32_TYPE: case WS_UINT64_TYPE: + case WS_ENUM_TYPE: return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: @@ -2944,6 +3007,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_ENUM_TYPE: + if ((hr = read_type_enum( reader, mapping, localname, ns, desc, option, heap, value, size )) != S_OK) + return hr; + break; + default: FIXME( "type %u not supported\n", type ); return E_NOTIMPL; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 02b1c27..9b5face 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1324,6 +1324,12 @@ static void test_WsReadType(void) HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; + enum { ONE = 1, TWO = 2 }; + WS_XML_STRING one = { 3, (BYTE *)"ONE" }; + WS_XML_STRING two = { 3, (BYTE *)"TWO" }; + WS_ENUM_VALUE enum_values[] = { { ONE, &one }, { TWO, &two } }; + WS_ENUM_DESCRIPTION enum_desc; + int val_enum; WCHAR *val_str; BOOL val_bool; INT8 val_int8; @@ -1561,6 +1567,18 @@ static void test_WsReadType(void) todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); ok( !val_uint64, "wrong value\n" ); + enum_desc.values = enum_values; + enum_desc.valueCount = sizeof(enum_values)/sizeof(enum_values[0]); + enum_desc.maxByteCount = 3; + enum_desc.nameIndices = NULL; + + val_enum = 0; + prepare_type_test( reader, "<t>ONE</t>", sizeof("<t>ONE</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_ENUM_TYPE, &enum_desc, + WS_READ_REQUIRED_VALUE, heap, &val_enum, sizeof(val_enum), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val_enum == 1, "got %d\n", val_enum ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Hans Leidekker : webservices: Reject field mappings without a description.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 4bb2e5efea12560ca87500b53f10fd8e646df465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb2e5efea12560ca87500b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:41 2016 +0200 webservices: Reject field mappings without a description. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 34b62e7..f09781e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2731,18 +2731,19 @@ static WS_READ_OPTION map_field_options( WS_TYPE type, ULONG options ) static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DESCRIPTION *desc, WS_HEAP *heap, char *buf ) { - char *ptr = buf + desc->offset; + char *ptr; WS_READ_OPTION option; ULONG size; HRESULT hr; - if (!(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; + if (!desc || !(option = map_field_options( desc->type, desc->options ))) return E_INVALIDARG; if (option == WS_READ_REQUIRED_VALUE) size = get_type_size( desc->type, desc->typeDescription ); else size = sizeof(void *); + ptr = buf + desc->offset; switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING:

1 0

Hans Leidekker : webservices: Fix a typo.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 7af5a14de1b3b029b630e6110f7b014e5ed2425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af5a14de1b3b029b630e6110… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:40 2016 +0200 webservices: Fix a typo. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 713e992..34b62e7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2759,7 +2759,7 @@ static HRESULT read_type_struct_field( struct reader *reader, const WS_FIELD_DES { ULONG count; hr = read_type_repeating_element( reader, desc, option, heap, (void **)ptr, size, &count ); - if (hr == S_OK) *(ULONG *)(ptr + desc->countOffset) = count; + if (hr == S_OK) *(ULONG *)(buf + desc->countOffset) = count; break; } case WS_TEXT_FIELD_MAPPING:

1 0

Hans Leidekker : webservices: Fix reader movement for text field mappings.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: a5a12491acf3c8a1a02c4e4b34ac014669395aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a12491acf3c8a1a02c4e4b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:39 2016 +0200 webservices: Fix reader movement for text field mappings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8191aa5..713e992 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2016,6 +2016,7 @@ static HRESULT read_get_text( struct reader *reader, WS_TYPE_MAPPING mapping, } case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: + case WS_ANY_ELEMENT_TYPE_MAPPING: { HRESULT hr; *found = TRUE; @@ -2690,8 +2691,9 @@ static HRESULT read_type_text( struct reader *reader, const WS_FIELD_DESCRIPTION if ((hr = read_to_startelement( reader, &found )) != S_OK) return S_OK; if (!found) return WS_E_INVALID_FORMAT; if ((hr = read_node( reader )) != S_OK) return hr; + if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; - return read_type( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, desc->type, NULL, NULL, + return read_type( reader, WS_ANY_ELEMENT_TYPE_MAPPING, desc->type, NULL, NULL, desc->typeDescription, option, heap, ret, size ); } @@ -2875,6 +2877,7 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; break; + case WS_ANY_ELEMENT_TYPE_MAPPING: case WS_ATTRIBUTE_TYPE_MAPPING: break;

1 0

Hans Leidekker : webservices/tests: Add more tests for repeating element field mappings.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 0652e61859acdfc1f34bde3e6f9fa956267b23b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0652e61859acdfc1f34bde3e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 13 13:49:38 2016 +0200 webservices/tests: Add more tests for repeating element field mappings. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 105 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7384cba..02b1c27 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -80,6 +80,30 @@ static const char data12[] = static const char data13[] = "<services></services>"; +static const char data14[] = + "<services>" + "<wrapper>" + "<service><id>1</id></service>" + "<service><id>2</id></service>" + "</wrapper>" + "</services>"; + +static const char data15[] = + "<services>" + "<wrapper>" + "<service>1</service>" + "<service>2</service>" + "</wrapper>" + "</services>"; + +static const char data16[] = + "<services>" + "<wrapper>" + "<service name='1'>1</service>" + "<service name='2'>2</service>" + "</wrapper>" + "</services>"; + static void test_WsCreateError(void) { HRESULT hr; @@ -2653,25 +2677,37 @@ static void test_complex_struct_type(void) static void test_repeating_element(void) { + static const WCHAR oneW[] = {'1',0}, twoW[] = {'2',0}; + WS_XML_STRING str_name = {4, (BYTE *)"name"}; WS_XML_STRING str_services = {8, (BYTE *)"services"}; WS_XML_STRING str_service = {7, (BYTE *)"service"}; + WS_XML_STRING str_wrapper = {7, (BYTE *)"wrapper"}; WS_XML_STRING str_id = {2, (BYTE *)"id"}; WS_XML_STRING str_ns = {0, NULL}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; WS_STRUCT_DESCRIPTION s, s2; - WS_FIELD_DESCRIPTION f, f2, *fields[1], *fields2[1]; + WS_FIELD_DESCRIPTION f, f2, f3, *fields[1], *fields2[2]; WS_ITEM_RANGE range; - struct service - { - UINT32 id; - }; + struct service { UINT32 id; }; + struct service2 { WCHAR *id; }; + struct service3 { WCHAR *name; WCHAR *id; }; struct services { struct service *service; ULONG service_count; } *test; + struct services2 + { + struct service2 *service; + ULONG service_count; + } *test2; + struct services3 + { + struct service3 *service; + ULONG service_count; + } *test3; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2721,6 +2757,7 @@ static void test_repeating_element(void) ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); + /* item range */ prepare_struct_type_test( reader, data13 ); range.minItemCount = 0; range.maxItemCount = 1; @@ -2733,6 +2770,64 @@ static void test_repeating_element(void) ok( test->service != NULL, "service not set\n" ); ok( !test->service_count, "got %u\n", test->service_count ); + /* wrapper element */ + prepare_struct_type_test( reader, data14 ); + f.itemRange = NULL; + f.localName = &str_wrapper; + f.ns = &str_ns; + test = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test != NULL, "test not set\n" ); + ok( test->service != NULL, "service not set\n" ); + ok( test->service_count == 2, "got %u\n", test->service_count ); + ok( test->service[0].id == 1, "got %u\n", test->service[0].id ); + ok( test->service[1].id == 2, "got %u\n", test->service[1].id ); + + /* repeating text field mapping */ + prepare_struct_type_test( reader, data15 ); + f2.mapping = WS_TEXT_FIELD_MAPPING; + f2.localName = NULL; + f2.ns = NULL; + f2.type = WS_WSZ_TYPE; + s2.size = sizeof(struct service2); + s2.alignment = TYPE_ALIGNMENT(struct service2); + test2 = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test2, sizeof(test2), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test2 != NULL, "test2 not set\n" ); + ok( test2->service != NULL, "service not set\n" ); + ok( test2->service_count == 2, "got %u\n", test2->service_count ); + ok( !lstrcmpW( test2->service[0].id, oneW ), "wrong data\n" ); + ok( !lstrcmpW( test2->service[1].id, twoW ), "wrong data\n" ); + + /* repeating attribute field + text field mapping */ + prepare_struct_type_test( reader, data16 ); + f2.offset = FIELD_OFFSET(struct service3, id); + memset( &f3, 0, sizeof(f3) ); + f3.mapping = WS_ATTRIBUTE_FIELD_MAPPING; + f3.localName = &str_name; + f3.ns = &str_ns; + f3.type = WS_WSZ_TYPE; + fields2[0] = &f3; + fields2[1] = &f2; + s2.size = sizeof(struct service3); + s2.alignment = TYPE_ALIGNMENT(struct service3); + s2.fieldCount = 2; + test3 = NULL; + hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &test3, sizeof(test3), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( test3 != NULL, "test3 not set\n" ); + ok( test3->service != NULL, "service not set\n" ); + ok( test3->service_count == 2, "got %u\n", test3->service_count ); + ok( !lstrcmpW( test3->service[0].name, oneW ), "wrong data\n" ); + ok( !lstrcmpW( test3->service[0].id, oneW ), "wrong data\n" ); + ok( !lstrcmpW( test3->service[1].name, twoW ), "wrong data\n" ); + ok( !lstrcmpW( test3->service[1].id, twoW ), "wrong data\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); }

1 0

Michael Stefaniuc : quartz: Simplify a RECT transformation.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 063cb64e111a7bfcb008599ce9711cf348120a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=063cb64e111a7bfcb008599ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 13 13:48:52 2016 +0200 quartz: Simplify a RECT transformation. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 03b4115..701d06d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2592,14 +2592,9 @@ static HRESULT VMR9_ImagePresenter_PresentOffscreenSurface(VMR9DefaultAllocatorP return hr; } - target_rect = This->pVMR9->target_rect; - target_rect.right -= target_rect.left; - target_rect.bottom -= target_rect.top; - target_rect.left = target_rect.top = 0; - - /* Flip */ - target_rect.top = target_rect.bottom; - target_rect.bottom = 0; + /* Move rect to origin and flip it */ + SetRect(&target_rect, 0, This->pVMR9->target_rect.bottom - This->pVMR9->target_rect.top, + This->pVMR9->target_rect.right - This->pVMR9->target_rect.left, 0); hr = IDirect3DDevice9_StretchRect(This->d3d9_dev, surface, &This->pVMR9->source_rect, target, &target_rect, D3DTEXF_LINEAR); if (FAILED(hr))

1 0

Michael Stefaniuc : quartz: Use SetRect instead of open coding it.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: f96aab3f2281b230e72c8346d40a1b35c3cb7873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96aab3f2281b230e72c8346d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 13 13:45:54 2016 +0200 quartz: Use SetRect instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 14 +++----------- dlls/quartz/vmr9.c | 30 ++++++++++-------------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 7bc2620..3026c07 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -430,9 +430,7 @@ static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) VideoRendererImpl *This = impl_from_BaseWindow(iface); static RECT defRect; - defRect.left = defRect.top = 0; - defRect.right = This->VideoWidth; - defRect.bottom = This->VideoHeight; + SetRect(&defRect, 0, 0, This->VideoWidth, This->VideoHeight); return defRect; } @@ -596,10 +594,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultSourceRect(BaseControlVideo* iface { VideoRendererImpl *This = impl_from_BaseControlVideo(iface); - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = This->VideoWidth; - This->SourceRect.bottom = This->VideoHeight; + SetRect(&This->SourceRect, 0, 0, This->VideoWidth, This->VideoHeight); return S_OK; } @@ -612,10 +607,7 @@ static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - This->DestRect.left = 0; - This->DestRect.top = 0; - This->DestRect.right = rect.right; - This->DestRect.bottom = rect.bottom; + SetRect(&This->DestRect, 0, 0, rect.right, rect.bottom); return S_OK; } diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3538ddb..03b4115 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -353,9 +353,9 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY This->bmiheader = format->bmiHeader; TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); - This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; - This->source_rect.top = This->source_rect.left = 0; + This->VideoWidth = format->bmiHeader.biWidth; + This->VideoHeight = format->bmiHeader.biHeight; + SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); } else if (IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo2)) { @@ -364,9 +364,9 @@ static HRESULT WINAPI VMR9_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TY This->bmiheader = format->bmiHeader; TRACE("Resolution: %dx%d\n", format->bmiHeader.biWidth, format->bmiHeader.biHeight); - This->source_rect.right = This->VideoWidth = format->bmiHeader.biWidth; - This->source_rect.bottom = This->VideoHeight = format->bmiHeader.biHeight; - This->source_rect.top = This->source_rect.left = 0; + This->VideoWidth = format->bmiHeader.biWidth; + This->VideoHeight = format->bmiHeader.biHeight; + SetRect(&This->source_rect, 0, 0, This->VideoWidth, This->VideoHeight); } else { @@ -426,9 +426,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force) hr = IVMRSurfaceAllocatorEx9_InitializeDevice(This->allocator, This->cookie, &info, &buffers); if (SUCCEEDED(hr)) { - This->source_rect.left = This->source_rect.top = 0; - This->source_rect.right = This->bmiheader.biWidth; - This->source_rect.bottom = This->bmiheader.biHeight; + SetRect(&This->source_rect, 0, 0, This->bmiheader.biWidth, This->bmiheader.biHeight); This->num_surfaces = buffers; } @@ -544,9 +542,7 @@ static RECT WINAPI VMR9_GetDefaultRect(BaseWindow *This) struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); static RECT defRect; - defRect.left = defRect.top = 0; - defRect.right = pVMR9->VideoWidth; - defRect.bottom = pVMR9->VideoHeight; + SetRect(&defRect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight); return defRect; } @@ -688,10 +684,7 @@ static HRESULT WINAPI VMR9_SetDefaultSourceRect(BaseControlVideo* This) { struct quartz_vmr* pVMR9 = impl_from_BaseControlVideo(This); - pVMR9->source_rect.left = 0; - pVMR9->source_rect.top = 0; - pVMR9->source_rect.right = pVMR9->VideoWidth; - pVMR9->source_rect.bottom = pVMR9->VideoHeight; + SetRect(&pVMR9->source_rect, 0, 0, pVMR9->VideoWidth, pVMR9->VideoHeight); return S_OK; } @@ -704,10 +697,7 @@ static HRESULT WINAPI VMR9_SetDefaultTargetRect(BaseControlVideo* This) if (!GetClientRect(pVMR9->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - pVMR9->target_rect.left = 0; - pVMR9->target_rect.top = 0; - pVMR9->target_rect.right = rect.right; - pVMR9->target_rect.bottom = rect.bottom; + SetRect(&pVMR9->target_rect, 0, 0, rect.right, rect.bottom); return S_OK; }

1 0

Henri Verbeet : gdi32: Implement DC creation from pre-existing memory.
by Alexandre Julliard 13 Apr '16

13 Apr '16

Module: wine Branch: master Commit: 0a41694b535914726df5cbeb4bb1cf7724c5c41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a41694b535914726df5cbeb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 12:18:51 2016 +0200 gdi32: Implement DC creation from pre-existing memory. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dib.c | 137 ++++++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 13 +-- dlls/gdi32/gdi32.spec | 2 + dlls/gdi32/tests/bitmap.c | 260 +++++++++++++++++++++++++++++++++++++++++++++- include/Makefile.in | 2 + include/d3dukmdt.h | 139 +++++++++++++++++++++++++ include/ddk/d3dkmthk.h | 55 ++++++++++ 7 files changed, 599 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a41694b535914726df5c…

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
75
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 April 2016