wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Iván Matellanes : msvcirt: Implement ostream constructors/destructors.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: cf1f23379b57025fd8e6e202be95b71f668b81b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1f23379b57025fd8e6e202b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 14 15:40:16 2016 +0100 msvcirt: Implement ostream constructors/destructors. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 105 ++++++++++++++++++++++++---- dlls/msvcirt/tests/msvcirt.c | 158 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 248 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1f23379b57025fd8e6e…

1 0

Piotr Caban : msvcp90: Fix base computation in vbase destructors.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c5075c057cedbf3eb421d7b16bb461ccb2bf9d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5075c057cedbf3eb421d7b16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 15 12:02:32 2016 +0200 msvcp90: Fix base computation in vbase destructors. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 126 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5075c057cedbf3eb421d…

1 0

Hans Leidekker : webservices/tests: Add message tests.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: c97da062ffced7ecce78a0d7ffe39ea54f1691b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97da062ffced7ecce78a0d7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:25 2016 +0200 webservices/tests: Add message tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/msg.c | 74 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index c278a47..afff870 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = webservices C_SRCS = \ channel.c \ + msg.c \ proxy.c \ reader.c \ url.c \ diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c new file mode 100644 index 0000000..852407c --- /dev/null +++ b/dlls/webservices/tests/msg.c @@ -0,0 +1,74 @@ +/* + * 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 <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static void test_WsCreateMessage(void) +{ + HRESULT hr; + WS_MESSAGE *msg; + WS_ENVELOPE_VERSION env_version; + WS_ADDRESSING_VERSION addr_version; + WS_MESSAGE_PROPERTY prop; + + hr = WsCreateMessage( 0, 0, NULL, 0, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( 0, 0, NULL, 0, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, 0, NULL, 0, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( 0, WS_ENVELOPE_VERSION_SOAP_1_1, NULL, 0, &msg, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + env_version = WS_ENVELOPE_VERSION_SOAP_1_1; + prop.id = WS_MESSAGE_PROPERTY_ENVELOPE_VERSION; + prop.value = &env_version; + prop.valueSize = sizeof(env_version); + hr = WsCreateMessage( WS_ADDRESSING_VERSION_0_9, WS_ENVELOPE_VERSION_SOAP_1_1, &prop, + 1, &msg, 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 ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_1, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_0_9, "got %u\n", addr_version ); + + WsFreeMessage( msg ); +} + +START_TEST(msg) +{ + test_WsCreateMessage(); +}

1 0

Hans Leidekker : webservices: Implement WsGetMessageProperty and WsSetMessageProperty.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 6d87b2489d72eab97e8b253192bda7805f1d019d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d87b2489d72eab97e8b25319… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:24 2016 +0200 webservices: Implement WsGetMessageProperty and WsSetMessageProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 28 ++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 85a27f5..47df32e 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -126,3 +126,31 @@ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) TRACE( "%p\n", handle ); free_msg( msg ); } + +/************************************************************************** + * WsGetMessageProperty [webservices.@] + */ +HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID id, void *buf, + ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return prop_get( msg->prop, msg->prop_count, id, buf, size ); +} + +/************************************************************************** + * WsSetMessageProperty [webservices.@] + */ +HRESULT WINAPI WsSetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID id, const void *value, + ULONG size, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %u\n", handle, id, value, size ); + if (error) FIXME( "ignoring error parameter\n" ); + + return prop_set( msg->prop, msg->prop_count, id, value, size ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c7794a3..0093fc0 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -71,7 +71,7 @@ @ stdcall WsGetHeapProperty(ptr long ptr long ptr) @ stub WsGetListenerProperty @ stub WsGetMappedHeader -@ stub WsGetMessageProperty +@ stdcall WsGetMessageProperty(ptr long ptr long ptr) @ stub WsGetMetadataEndpoints @ stub WsGetMetadataProperty @ stub WsGetMissingMetadataDocumentAddress @@ -153,7 +153,7 @@ @ stdcall WsSetInput(ptr ptr ptr ptr long ptr) @ stdcall WsSetInputToBuffer(ptr ptr ptr long ptr) @ stub WsSetListenerProperty -@ stub WsSetMessageProperty +@ stdcall WsSetMessageProperty(ptr long ptr long ptr) @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition

1 0

Hans Leidekker : webservices: Implement WsCreateMessage and WsFreeMessage.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 33cebe51e1a291bbc21378a3f7c9614504b45c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cebe51e1a291bbc21378a3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:23 2016 +0200 webservices: Implement WsCreateMessage and WsFreeMessage. 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/msg.c | 128 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 3 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index acb7d0e..12b647a 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = user32 C_SRCS = \ channel.c \ main.c \ + msg.c \ proxy.c \ reader.c \ url.c \ diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c new file mode 100644 index 0000000..85a27f5 --- /dev/null +++ b/dlls/webservices/msg.c @@ -0,0 +1,128 @@ +/* + * 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 prop_desc msg_props[] = +{ + { sizeof(WS_MESSAGE_STATE), TRUE }, /* WS_MESSAGE_PROPERTY_STATE */ + { sizeof(WS_HEAP *), TRUE }, /* WS_MESSAGE_PROPERTY_HEAP */ + { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_MESSAGE_PROPERTY_ENVELOPE_VERSION */ + { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_MESSAGE_PROPERTY_ADDRESSING_VERSION */ + { sizeof(WS_XML_BUFFER *), TRUE }, /* WS_MESSAGE_PROPERTY_HEADER_BUFFER */ + { sizeof(WS_XML_NODE_POSITION *), TRUE }, /* WS_MESSAGE_PROPERTY_HEADER_POSITION */ + { sizeof(WS_XML_READER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_READER */ + { sizeof(WS_XML_WRITER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_WRITER */ + { sizeof(BOOL), TRUE }, /* WS_MESSAGE_PROPERTY_IS_ADDRESSED */ +}; + +struct msg +{ + WS_MESSAGE_STATE state; + ULONG prop_count; + struct prop prop[sizeof(msg_props)/sizeof(msg_props[0])]; +}; + +static struct msg *alloc_msg(void) +{ + static const ULONG count = sizeof(msg_props)/sizeof(msg_props[0]); + struct msg *ret; + ULONG size = sizeof(*ret) + prop_size( msg_props, count ); + + if (!(ret = heap_alloc_zero( size ))) return NULL; + ret->state = WS_MESSAGE_STATE_EMPTY; + prop_init( msg_props, count, ret->prop, &ret[1] ); + ret->prop_count = count; + return ret; +} + +static void free_msg( struct msg *msg ) +{ + heap_free( msg ); +} + +static HRESULT create_msg( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSION addr_version, + const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle ) +{ + struct msg *msg; + HRESULT hr; + ULONG i; + + if (!(msg = alloc_msg())) return E_OUTOFMEMORY; + + prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version) ); + prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version) ); + + for (i = 0; i < count; i++) + { + if (properties[i].id == WS_MESSAGE_PROPERTY_ENVELOPE_VERSION || + properties[i].id == WS_MESSAGE_PROPERTY_ADDRESSING_VERSION) + { + free_msg( msg ); + return E_INVALIDARG; + } + hr = prop_set( msg->prop, msg->prop_count, properties[i].id, properties[i].value, + properties[i].valueSize ); + if (hr != S_OK) + { + free_msg( msg ); + return hr; + } + } + + *handle = (WS_MESSAGE *)msg; + return S_OK; +} + +/************************************************************************** + * WsCreateMessage [webservices.@] + */ +HRESULT WINAPI WsCreateMessage( WS_ENVELOPE_VERSION env_version, WS_ADDRESSING_VERSION addr_version, + const WS_MESSAGE_PROPERTY *properties, ULONG count, WS_MESSAGE **handle, + WS_ERROR *error ) +{ + TRACE( "%u %u %p %u %p %p\n", env_version, addr_version, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !env_version || !addr_version) return E_INVALIDARG; + return create_msg( env_version, addr_version, properties, count, handle ); +} + +/************************************************************************** + * WsFreeMessage [webservices.@] + */ +void WINAPI WsFreeMessage( WS_MESSAGE *handle ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p\n", handle ); + free_msg( msg ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3c6262b..c7794a3 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -26,7 +26,7 @@ @ stub WsCreateFaultFromError @ stdcall WsCreateHeap(long long ptr long ptr ptr) @ stub WsCreateListener -@ stub WsCreateMessage +@ stdcall WsCreateMessage(long long ptr long ptr ptr) @ stub WsCreateMessageForChannel @ stub WsCreateMetadata @ stdcall WsCreateReader(ptr long ptr ptr) @@ -52,7 +52,7 @@ @ stdcall WsFreeError(ptr) @ stdcall WsFreeHeap(ptr) @ stub WsFreeListener -@ stub WsFreeMessage +@ stdcall WsFreeMessage(ptr) @ stub WsFreeMetadata @ stdcall WsFreeReader(ptr) @ stub WsFreeSecurityToken

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: a684e0bc6155f482f28448f274634b274bcac0ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a684e0bc6155f482f28448f27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:22 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 | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 78d53bc..451cfad 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -66,6 +66,13 @@ typedef struct _WS_HTTPS_URL WS_HTTPS_URL; typedef struct _WS_NETTCP_URL WS_NETTCP_URL; typedef struct _WS_SOAPUDP_URL WS_SOAPUDP_URL; typedef struct _WS_NETPIPE_URL WS_NETPIPE_URL; +typedef struct _WS_CUSTOM_CHANNEL_CALLBACKS WS_CUSTOM_CHANNEL_CALLBACKS; +typedef struct _WS_CHANNEL_ENCODER WS_CHANNEL_ENCODER; +typedef struct _WS_CHANNEL_DECODER WS_CHANNEL_DECODER; +typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; +typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; +typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; +typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -248,6 +255,9 @@ typedef struct _WS_ASYNC_CONTEXT { typedef HRESULT (CALLBACK *WS_READ_CALLBACK) (void*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +typedef HRESULT (CALLBACK *WS_WRITE_CALLBACK) + (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); + typedef struct _WS_XML_READER_STREAM_INPUT { WS_XML_READER_INPUT input; WS_READ_CALLBACK readCallback; @@ -1072,6 +1082,190 @@ struct _WS_NETPIPE_URL { WS_STRING fragment; }; +typedef enum +{ + WS_IP_VERSION_4 = 1, + WS_IP_VERSION_6 = 2, + WS_IP_VERSION_AUTO = 3 +} WS_IP_VERSION; + +typedef enum +{ + WS_BUFFERED_TRANSFER_MODE = 0x0, + WS_STREAMED_INPUT_TRANSFER_MODE = 0x1, + WS_STREAMED_OUTPUT_TRANSFER_MODE = 0x2, + WS_STREAMED_TRANSFER_MODE = (WS_STREAMED_INPUT_TRANSFER_MODE|WS_STREAMED_OUTPUT_TRANSFER_MODE) +} WS_TRANSFER_MODE; + +typedef HRESULT (CALLBACK *WS_CREATE_CHANNEL_CALLBACK) + (WS_CHANNEL_TYPE, const void*, ULONG, void**, WS_ERROR*); + +typedef void (CALLBACK *WS_FREE_CHANNEL_CALLBACK) + (void*); + +typedef HRESULT (CALLBACK *WS_RESET_CHANNEL_CALLBACK) + (void*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_OPEN_CHANNEL_CALLBACK) + (void*, const WS_ENDPOINT_ADDRESS*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_CLOSE_CHANNEL_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ABORT_CHANNEL_CALLBACK) + (void*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_GET_CHANNEL_PROPERTY_CALLBACK) + (void*, WS_CHANNEL_PROPERTY_ID, void*, ULONG, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_SET_CHANNEL_PROPERTY_CALLBACK) + (void*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_WRITE_MESSAGE_START_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_WRITE_MESSAGE_END_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_READ_MESSAGE_START_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_READ_MESSAGE_END_CALLBACK) + (void*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ABANDON_MESSAGE_CALLBACK) + (void*, WS_MESSAGE*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_SHUTDOWN_SESSION_CHANNEL_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +struct _WS_CUSTOM_CHANNEL_CALLBACKS +{ + WS_CREATE_CHANNEL_CALLBACK createChannelCallback; + WS_FREE_CHANNEL_CALLBACK freeChannelCallback; + WS_RESET_CHANNEL_CALLBACK resetChannelCallback; + WS_OPEN_CHANNEL_CALLBACK openChannelCallback; + WS_CLOSE_CHANNEL_CALLBACK closeChannelCallback; + WS_ABORT_CHANNEL_CALLBACK abortChannelCallback; + WS_GET_CHANNEL_PROPERTY_CALLBACK getChannelPropertyCallback; + WS_SET_CHANNEL_PROPERTY_CALLBACK setChannelPropertyCallback; + WS_WRITE_MESSAGE_START_CALLBACK writeMessageStartCallback; + WS_WRITE_MESSAGE_END_CALLBACK writeMessageEndCallback; + WS_READ_MESSAGE_START_CALLBACK readMessageStartCallback; + WS_READ_MESSAGE_END_CALLBACK readMessageEndCallback; + WS_ABANDON_MESSAGE_CALLBACK abandonMessageCallback; + WS_SHUTDOWN_SESSION_CHANNEL_CALLBACK shutdownSessionChannelCallback; +}; + +typedef HRESULT (CALLBACK *WS_CREATE_ENCODER_CALLBACK) + (void*, WS_WRITE_CALLBACK, void*, void**, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_GET_CONTENT_TYPE_CALLBACK) + (void*, const WS_STRING*, WS_STRING*, WS_STRING*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_START_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_ENCODE_CALLBACK) + (void*, const WS_BYTES*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_ENCODER_END_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef void (CALLBACK *WS_FREE_ENCODER_CALLBACK) + (void*); + +struct _WS_CHANNEL_ENCODER +{ + void *createContext; + WS_CREATE_ENCODER_CALLBACK createEncoderCallback; + WS_ENCODER_GET_CONTENT_TYPE_CALLBACK encoderGetContentTypeCallback; + WS_ENCODER_START_CALLBACK encoderStartCallback; + WS_ENCODER_ENCODE_CALLBACK encoderEncodeCallback; + WS_ENCODER_END_CALLBACK encoderEndCallback; + WS_FREE_ENCODER_CALLBACK freeEncoderCallback; +}; + +typedef HRESULT (CALLBACK *WS_CREATE_DECODER_CALLBACK) + (void*, WS_READ_CALLBACK, void*, void**, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_GET_CONTENT_TYPE_CALLBACK) + (void*, const WS_STRING*, const WS_STRING*, WS_STRING*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_START_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_DECODE_CALLBACK) + (void*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef HRESULT (CALLBACK *WS_DECODER_END_CALLBACK) + (void*, const WS_ASYNC_CONTEXT*, WS_ERROR*); + +typedef void (CALLBACK *WS_FREE_DECODER_CALLBACK) + (void*); + +struct _WS_CHANNEL_DECODER +{ + void *createContext; + WS_CREATE_DECODER_CALLBACK createDecoderCallback; + WS_DECODER_GET_CONTENT_TYPE_CALLBACK decoderGetContentTypeCallback; + WS_DECODER_START_CALLBACK decoderStartCallback; + WS_DECODER_DECODE_CALLBACK decoderDecodeCallback; + WS_DECODER_END_CALLBACK decoderEndCallback; + WS_FREE_DECODER_CALLBACK freeDecoderCallback; +}; + +typedef enum +{ + WS_PROTECTION_LEVEL_NONE = 1, + WS_PROTECTION_LEVEL_SIGN = 2, + WS_PROTECTION_LEVEL_SIGN_AND_ENCRYPT = 3 +} WS_PROTECTION_LEVEL; + +typedef enum +{ + WS_MANUAL_COOKIE_MODE = 1, + WS_AUTO_COOKIE_MODE = 2 +} WS_COOKIE_MODE; + +typedef enum +{ + WS_HTTP_PROXY_SETTING_MODE_AUTO = 0x1, + WS_HTTP_PROXY_SETTING_MODE_NONE = 0x2, + WS_HTTP_PROXY_SETTING_MODE_CUSTOM = 0x3 +} WS_HTTP_PROXY_SETTING_MODE; + +struct _WS_CUSTOM_HTTP_PROXY +{ + WS_STRING servers; + WS_STRING bypass; +}; + +struct _WS_HTTP_HEADER_MAPPING +{ + WS_XML_STRING headerName; + ULONG headerMappingOptions; +}; + +struct _WS_HTTP_MESSAGE_MAPPING +{ + ULONG requestMappingOptions; + ULONG responseMappingOptions; + WS_HTTP_HEADER_MAPPING **requestHeaderMappings; + ULONG requestHeaderMappingCount; + WS_HTTP_HEADER_MAPPING **responseHeaderMappings; + ULONG responseHeaderMappingCount; +}; + +typedef HRESULT (CALLBACK *WS_HTTP_REDIRECT_CALLBACK) + (void*, const WS_STRING*, const WS_STRING*); + +struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT +{ + WS_HTTP_REDIRECT_CALLBACK callback; + void *state; +}; + HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, WS_HEAP*, const WS_CALL_PROPERTY*, const ULONG, const WS_ASYNC_CONTEXT*, @@ -1117,6 +1311,7 @@ HRESULT WINAPI WsGetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, void*, HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetMessageProperty(WS_MESSAGE*, WS_MESSAGE_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetNamespaceFromPrefix(WS_XML_READER*, const WS_XML_STRING*, BOOL, const WS_XML_STRING**, WS_ERROR*); HRESULT WINAPI WsGetPrefixFromNamespace(WS_XML_WRITER*, const WS_XML_STRING*, BOOL, @@ -1159,6 +1354,7 @@ HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const W const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetInputToBuffer(WS_XML_READER*, WS_XML_BUFFER*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetMessageProperty(WS_MESSAGE*, WS_MESSAGE_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const WS_XML_WRITER_OUTPUT*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*,

1 0

Hans Leidekker : webservices: Add support for reading GUID values.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: dbbcd290fdfaf21b2e5e4b09335f439a309502ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbcd290fdfaf21b2e5e4b093… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:21 2016 +0200 webservices: Add support for reading GUID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 103 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/reader.c | 33 +++++++++++++ include/webservices.h | 1 + 3 files changed, 137 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 6452e21..ca8f1bd 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -2108,6 +2108,52 @@ done: return hr; } +static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) +{ + static const unsigned char hex[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + const unsigned char *p = str; + ULONG i; + + while (len && read_isspace( *p )) { p++; len--; } + while (len && read_isspace( p[len - 1] )) { len--; } + if (len != 36) return WS_E_INVALID_FORMAT; + + if (p[8] != '-' || p[13] != '-' || p[18] != '-' || p[23] != '-') + return WS_E_INVALID_FORMAT; + + for (i = 0; i < 36; i++) + { + if (i == 8 || i == 13 || i == 18 || i == 23) continue; + if (p[i] > 'f' || (!hex[p[i]] && p[i] != '0')) return WS_E_INVALID_FORMAT; + } + + ret->Data1 = hex[p[0]] << 28 | hex[p[1]] << 24 | hex[p[2]] << 20 | hex[p[3]] << 16 | + hex[p[4]] << 12 | hex[p[5]] << 8 | hex[p[6]] << 4 | hex[p[7]]; + + ret->Data2 = hex[p[9]] << 12 | hex[p[10]] << 8 | hex[p[11]] << 4 | hex[p[12]]; + ret->Data3 = hex[p[14]] << 12 | hex[p[15]] << 8 | hex[p[16]] << 4 | hex[p[17]]; + + ret->Data4[0] = hex[p[19]] << 4 | hex[p[20]]; + ret->Data4[1] = hex[p[21]] << 4 | hex[p[22]]; + ret->Data4[2] = hex[p[24]] << 4 | hex[p[25]]; + ret->Data4[3] = hex[p[26]] << 4 | hex[p[27]]; + ret->Data4[4] = hex[p[28]] << 4 | hex[p[29]]; + ret->Data4[5] = hex[p[30]] << 4 | hex[p[31]]; + ret->Data4[6] = hex[p[32]] << 4 | hex[p[33]]; + ret->Data4[7] = hex[p[34]] << 4 | hex[p[35]]; + + return S_OK; +} + #define TICKS_PER_SEC 10000000 #define TICKS_PER_MIN (60 * (ULONGLONG)TICKS_PER_SEC) #define TICKS_PER_HOUR (3600 * (ULONGLONG)TICKS_PER_SEC) @@ -3074,6 +3120,53 @@ static HRESULT read_type_datetime( struct reader *reader, WS_TYPE_MAPPING mappin return S_OK; } +static HRESULT read_type_guid( struct reader *reader, WS_TYPE_MAPPING mapping, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + const WS_GUID_DESCRIPTION *desc, WS_READ_OPTION option, + WS_HEAP *heap, void *ret, ULONG size ) +{ + WS_XML_UTF8_TEXT *utf8; + GUID val; + HRESULT hr; + BOOL found; + + if (desc) FIXME( "ignoring description\n" ); + + if ((hr = read_get_text( reader, mapping, localname, ns, &utf8, &found )) != S_OK) return hr; + if (found && (hr = str_to_guid( utf8->value.bytes, utf8->value.length, &val )) != S_OK) return hr; + + switch (option) + { + case WS_READ_REQUIRED_VALUE: + if (!found) return WS_E_INVALID_FORMAT; + if (size != sizeof(GUID)) return E_INVALIDARG; + *(GUID *)ret = val; + break; + + case WS_READ_REQUIRED_POINTER: + if (!found) return WS_E_INVALID_FORMAT; + /* fall through */ + + case WS_READ_OPTIONAL_POINTER: + { + GUID *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; + } + *(GUID **)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; @@ -3182,6 +3275,9 @@ static ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_DATETIME_TYPE: return sizeof(WS_DATETIME); + case WS_GUID_TYPE: + return sizeof(GUID); + case WS_WSZ_TYPE: return sizeof(WCHAR *); @@ -3211,6 +3307,7 @@ static WS_READ_OPTION get_array_read_option( WS_TYPE type ) case WS_ENUM_TYPE: case WS_STRUCT_TYPE: case WS_DATETIME_TYPE: + case WS_GUID_TYPE: return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: @@ -3315,6 +3412,7 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type ) case WS_DOUBLE_TYPE: case WS_ENUM_TYPE: case WS_DATETIME_TYPE: + case WS_GUID_TYPE: return WS_READ_REQUIRED_VALUE; case WS_WSZ_TYPE: @@ -3564,6 +3662,11 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP return hr; break; + case WS_GUID_TYPE: + if ((hr = read_type_guid( 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 310d973..4997f7a 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1321,6 +1321,8 @@ static void prepare_type_test( WS_XML_READER *reader, const char *data, ULONG si static void test_WsReadType(void) { static const WCHAR testW[] = {'t','e','s','t',0}; + static const GUID guid1 = {0,0,0,{0,0,0,0,0,0,0,0}}; + static const GUID guid2 = {0,0,0,{0,0,0,0,0,0,0,0xa1}}; HRESULT hr; WS_XML_READER *reader; WS_HEAP *heap; @@ -1340,6 +1342,7 @@ static void test_WsReadType(void) UINT16 val_uint16; UINT32 val_uint32; UINT64 val_uint64; + GUID val_guid; hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1579,6 +1582,36 @@ static void test_WsReadType(void) ok( hr == S_OK, "got %08x\n", hr ); ok( val_enum == 1, "got %d\n", val_enum ); + prepare_type_test( reader, "<t>{00000000-0000-0000-0000-000000000000}</t>", + sizeof("<t>{00000000-0000-0000-0000-000000000000}</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + memset( &val_guid, 0xff, sizeof(val_guid) ); + prepare_type_test( reader, "<t> 00000000-0000-0000-0000-000000000000 </t>", + sizeof("<t> 00000000-0000-0000-0000-000000000000 </t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &val_guid, &guid1, sizeof(val_guid) ), "wrong guid\n" ); + + memset( &val_guid, 0, sizeof(val_guid) ); + prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000a1</t>", + sizeof("<t>00000000-0000-0000-0000-0000000000a1</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &val_guid, &guid2, sizeof(val_guid) ), "wrong guid\n" ); + + memset( &val_guid, 0, sizeof(val_guid) ); + prepare_type_test( reader, "<t>00000000-0000-0000-0000-0000000000A1</t>", + sizeof("<t>00000000-0000-0000-0000-0000000000A1</t>") - 1 ); + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, + WS_READ_REQUIRED_VALUE, heap, &val_guid, sizeof(val_guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp( &val_guid, &guid2, sizeof(val_guid) ), "wrong guid\n" ); + WsFreeReader( reader ); WsFreeHeap( heap ); } diff --git a/include/webservices.h b/include/webservices.h index a8d74e9..78d53bc 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -59,6 +59,7 @@ typedef struct _WS_CALL_PROPERTY WS_CALL_PROPERTY; typedef struct _WS_DOUBLE_DESCRIPTION WS_DOUBLE_DESCRIPTION; typedef struct _WS_DATETIME WS_DATETIME; typedef struct _WS_DATETIME_DESCRIPTION WS_DATETIME_DESCRIPTION; +typedef struct _WS_GUID_DESCRIPTION WS_GUID_DESCRIPTION; typedef struct _WS_URL WS_URL; typedef struct _WS_HTTP_URL WS_HTTP_URL; typedef struct _WS_HTTPS_URL WS_HTTPS_URL;

1 0

Hans Leidekker : webservices: Avoid writing redundant namespace attributes.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: acf64c4e68510915c79dc482bbf926b65bd09389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf64c4e68510915c79dc482b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 15 09:21:20 2016 +0200 webservices: Avoid writing redundant namespace attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 15 +++++++++++++++ dlls/webservices/writer.c | 29 ++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 4f6b1b1..4e22887 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1072,6 +1072,7 @@ static void test_WsWriteXmlnsAttribute(void) WS_XML_STRING ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; WS_XML_STRING prefix = {6, (BYTE *)"prefix"}, prefix2 = {7, (BYTE *)"prefix2"}; WS_XML_STRING xmlns = {6, (BYTE *)"xmlns"}, attr = {4, (BYTE *)"attr"}; + WS_XML_STRING localname = {1, (BYTE *)"u"}; WS_HEAP *heap; WS_XML_BUFFER *buffer; WS_XML_WRITER *writer; @@ -1211,6 +1212,20 @@ static void test_WsWriteXmlnsAttribute(void) check_output_buffer( buffer, "<prefix:t prefix:attr='' xmlns:prefix='ns' xmlns:prefix2='ns2'/>", __LINE__ ); WsFreeHeap( heap ); + /* scope */ + prepare_xmlns_test( writer, &heap, &buffer ); + hr = WsWriteXmlnsAttribute( writer, &prefix2, &ns2, TRUE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &prefix2, &localname, &ns2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_buffer( buffer, "<prefix:t xmlns:prefix2='ns2' xmlns:prefix=\"ns\"><prefix2:u/></prefix:t>", + __LINE__ ); + WsFreeHeap( heap ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 20e17d0..ecbba37 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -633,21 +633,28 @@ static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XM return S_OK; } -static const WS_XML_ATTRIBUTE *find_namespace_attribute( const WS_XML_ELEMENT_NODE *elem, - const WS_XML_STRING *prefix, - const WS_XML_STRING *ns ) +static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_STRING *prefix, + const WS_XML_STRING *ns ) { ULONG i; - for (i = 0; i < elem->attributeCount; i++) + const struct node *node; + + for (node = (const struct node *)elem; node; node = node->parent) { - if (!elem->attributes[i]->isXmlNs) continue; - if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && - WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) + if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) break; + + elem = &node->hdr; + for (i = 0; i < elem->attributeCount; i++) { - return elem->attributes[i]; + if (!elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->prefix, prefix, NULL ) == S_OK && + WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) == S_OK) + { + return TRUE; + } } } - return NULL; + return FALSE; } static HRESULT write_set_element_namespace( struct writer *writer ) @@ -656,7 +663,7 @@ static HRESULT write_set_element_namespace( struct writer *writer ) HRESULT hr; if (!elem->ns->length || is_current_namespace( writer, elem->ns ) || - find_namespace_attribute( elem, elem->prefix, elem->ns )) return S_OK; + namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) return hr; @@ -1689,6 +1696,6 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING if (!writer || !ns) return E_INVALIDARG; if (writer->state != WRITER_STATE_STARTELEMENT) return WS_E_INVALID_OPERATION; - if (find_namespace_attribute( &writer->current->hdr, prefix, ns )) return S_OK; + if (namespace_in_scope( &writer->current->hdr, prefix, ns )) return S_OK; return write_add_namespace_attribute( writer, prefix, ns, single ); }

1 0

Hugh McMaster : reg: Always output the long key name when printing strings.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: ecdd3c8e84bac9be42686b576b64ee49674ee4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecdd3c8e84bac9be42686b576… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 15 02:31:05 2016 +0000 reg: Always output the long key name when printing strings. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6f8a882..38861f8 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -818,7 +818,34 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } -static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) +static WCHAR *get_long_key(HKEY root, WCHAR *path) +{ + DWORD i, array_size = ARRAY_SIZE(root_rels), len; + WCHAR *long_key; + WCHAR fmt[] = {'%','s','\\','%','s',0}; + + for (i = 0; i < array_size; i++) + { + if (root == root_rels[i].key) + break; + } + + len = strlenW(root_rels[i].long_name); + + if (!path) + { + long_key = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + strcpyW(long_key, root_rels[i].long_name); + return long_key; + } + + len += strlenW(path) + 1; /* add one for the backslash */ + long_key = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + sprintfW(long_key, fmt, root_rels[i].long_name, path); + return long_key; +} + +static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) { if (!sane_path(key)) return FALSE; @@ -833,6 +860,8 @@ static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) *path = strchrW(key, '\\'); if (*path) (*path)++; + *long_key = get_long_key(*root, *path); + return TRUE; } @@ -924,11 +953,9 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - if (!parse_registry_key(argvW[2], &root, &path)) + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; - key_name = argvW[2]; - for (i = 3; i < argc; i++) { if (argvW[i][0] == '/' || argvW[i][0] == '-')

1 0

Hugh McMaster : reg: Parse the registry key using a helper function.
by Alexandre Julliard 15 Jun '16

15 Jun '16

Module: wine Branch: master Commit: 4a22ba5b46f463484ef09f0618e8c750aadbb513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a22ba5b46f463484ef09f061… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 15 02:30:53 2016 +0000 reg: Parse the registry key using a helper function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 20df2dd..6f8a882 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -818,6 +818,24 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } +static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) +{ + if (!sane_path(key)) + return FALSE; + + *root = path_get_rootkey(key); + if (!*root) + { + output_message(STRING_INVALID_KEY); + return FALSE; + } + + *path = strchrW(key, '\\'); + if (*path) (*path)++; + + return TRUE; +} + static BOOL is_help_switch(const WCHAR *s) { if (strlenW(s) > 2) @@ -906,20 +924,10 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - key_name = argvW[2]; - - if (!sane_path(key_name)) - return 1; - - root = path_get_rootkey(key_name); - if (!root) - { - output_message(STRING_INVALID_KEY); + if (!parse_registry_key(argvW[2], &root, &path)) return 1; - } - path = strchrW(key_name, '\\'); - if (path) path++; + key_name = argvW[2]; for (i = 3; i < argc; i++) {

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
60
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 June 2016