wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Hans Leidekker : webservices: Implement WsOpenChannel and WsCloseChannel.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: be767562ae230a7e21b840947c6b9b008ed179e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be767562ae230a7e21b840947… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:45 2016 +0200 webservices: Implement WsOpenChannel and WsCloseChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 44 ++++++++++++++++++++++++++++++++++ dlls/webservices/tests/channel.c | 40 +++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 ++-- dlls/webservices/webservices_private.h | 3 +++ 4 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index d02bfa1..9081d95 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -162,3 +162,47 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID return prop_set( channel->prop, channel->prop_count, id, value, size ); } + +HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint ) +{ + channel->state = WS_CHANNEL_STATE_OPEN; + return S_OK; +} + +/************************************************************************** + * WsOpenChannel [webservices.@] + */ +HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + if (!endpoint) return E_INVALIDARG; + if (channel->state != WS_CHANNEL_STATE_CREATED) return WS_E_INVALID_OPERATION; + + return open_channel( channel, endpoint ); +} + +HRESULT close_channel( struct channel *channel ) +{ + channel->state = WS_CHANNEL_STATE_CLOSED; + return S_OK; +} + +/************************************************************************** + * WsCloseChannel [webservices.@] + */ +HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p %p %p\n", handle, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + + return close_channel( channel ); +} diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 82a7a69..d85a151 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -57,7 +57,47 @@ static void test_WsCreateChannel(void) WsFreeChannel( channel ); } +static void test_WsOpenChannel(void) +{ + WCHAR url[] = {'h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t'}; + HRESULT hr; + WS_CHANNEL *channel; + WS_ENDPOINT_ADDRESS addr; + + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeChannel( channel ); + + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenChannel( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + addr.url.length = sizeof(url)/sizeof(url[0]); + addr.url.chars = url; + addr.headers = NULL; + addr.extensions = NULL; + addr.identity = NULL; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeChannel( channel ); +} + START_TEST(channel) { test_WsCreateChannel(); + test_WsOpenChannel(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index b39f715..95a8c1f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -13,7 +13,7 @@ @ stub WsAsyncExecute @ stub WsCall @ stub WsCheckMustUnderstandHeaders -@ stub WsCloseChannel +@ stdcall WsCloseChannel(ptr ptr ptr) @ stub WsCloseListener @ stub WsCloseServiceHost @ stub WsCloseServiceProxy @@ -95,7 +95,7 @@ @ stub WsMatchPolicyAlternative @ stdcall WsMoveReader(ptr long ptr ptr) @ stub WsMoveWriter -@ stub WsOpenChannel +@ stdcall WsOpenChannel(ptr ptr ptr ptr) @ stub WsOpenListener @ stub WsOpenServiceHost @ stub WsOpenServiceProxy diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 1a7b729..c33038d 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -74,6 +74,7 @@ struct channel { WS_CHANNEL_TYPE type; WS_CHANNEL_BINDING binding; + WS_CHANNEL_STATE state; ULONG prop_count; struct prop prop[9]; }; @@ -81,6 +82,8 @@ struct channel 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; +HRESULT open_channel( struct channel *, const WS_ENDPOINT_ADDRESS * ) DECLSPEC_HIDDEN; +HRESULT close_channel( struct channel * ) DECLSPEC_HIDDEN; static inline void *heap_alloc( SIZE_T size ) {

1 0

Hans Leidekker : webservices: Implement WsCreateServiceProxyFromTemplate.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: a04361f9bda55179a17c04bc46e989642fbfaa64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04361f9bda55179a17c04bc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:44 2016 +0200 webservices: Implement WsCreateServiceProxyFromTemplate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index b0c09f5..1563ac9 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -122,6 +122,66 @@ HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNE } /************************************************************************** + * WsCreateServiceProxyFromTemplate [webservices.@] + */ +HRESULT WINAPI WsCreateServiceProxyFromTemplate( WS_CHANNEL_TYPE channel_type, + const WS_PROXY_PROPERTY *properties, const ULONG count, + WS_BINDING_TEMPLATE_TYPE type, void *value, ULONG size, + const void *desc, ULONG desc_size, WS_SERVICE_PROXY **handle, + WS_ERROR *error ) +{ + const WS_CHANNEL_PROPERTY *channel_props = NULL; + ULONG channel_props_count = 0; + WS_CHANNEL_BINDING binding; + struct channel *channel; + HRESULT hr; + + TRACE( "%u %p %u %u %p %u %p %u %p %p\n", channel_type, properties, count, type, value, size, desc, + desc_size, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!desc || !handle) return E_INVALIDARG; + FIXME( "ignoring description\n" ); + + switch (type) + { + case WS_HTTP_BINDING_TEMPLATE_TYPE: + { + WS_HTTP_BINDING_TEMPLATE *http = value; + if (http) + { + channel_props = http->channelProperties.properties; + channel_props_count = http->channelProperties.propertyCount; + } + binding = WS_HTTP_CHANNEL_BINDING; + break; + } + case WS_HTTP_SSL_BINDING_TEMPLATE_TYPE: + { + WS_HTTP_SSL_BINDING_TEMPLATE *https = value; + if (https) + { + channel_props = https->channelProperties.properties; + channel_props_count = https->channelProperties.propertyCount; + } + binding = WS_HTTP_CHANNEL_BINDING; + break; + } + default: + FIXME( "template type %u not implemented\n", type ); + return E_NOTIMPL; + } + + if ((hr = create_channel( type, binding, channel_props, channel_props_count, &channel )) != S_OK) + return hr; + + if ((hr = create_proxy( channel, properties, count, handle )) != S_OK) + free_channel( channel ); + + return hr; +} + +/************************************************************************** * WsFreeServiceProxy [webservices.@] */ void WINAPI WsFreeServiceProxy( WS_SERVICE_PROXY *handle ) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 81c7c87..b39f715 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -33,7 +33,7 @@ @ stub WsCreateServiceEndpointFromTemplate @ stub WsCreateServiceHost @ stdcall WsCreateServiceProxy(long long ptr ptr long ptr long ptr ptr) -@ stub WsCreateServiceProxyFromTemplate +@ stdcall WsCreateServiceProxyFromTemplate(long ptr long long ptr long ptr long ptr ptr) @ stdcall WsCreateWriter(ptr long ptr ptr) @ stdcall WsCreateXmlBuffer(ptr ptr long ptr ptr) @ stub WsCreateXmlSecurityToken

1 0

Hans Leidekker : webservices: Implement WsGetServiceProxyProperty.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 7c60c0169d936f567c92968ee401c6e3f2a9371e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c60c0169d936f567c92968ee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:43 2016 +0200 webservices: Implement WsGetServiceProxyProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/proxy.c | 14 ++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index 169f89a..b0c09f5 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -131,3 +131,17 @@ void WINAPI WsFreeServiceProxy( WS_SERVICE_PROXY *handle ) TRACE( "%p\n", handle ); free_proxy( proxy ); } + +/************************************************************************** + * WsGetServiceProxyProperty [webservices.@] + */ +HRESULT WINAPI WsGetServiceProxyProperty( WS_SERVICE_PROXY *handle, WS_PROXY_PROPERTY_ID id, + void *buf, ULONG size, WS_ERROR *error ) +{ + struct proxy *proxy = (struct proxy *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return prop_get( proxy->prop, proxy->prop_count, id, buf, size ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index d47a0e1..81c7c87 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -86,7 +86,7 @@ @ stub WsGetSecurityContextProperty @ stub WsGetSecurityTokenProperty @ stub WsGetServiceHostProperty -@ stub WsGetServiceProxyProperty +@ stdcall WsGetServiceProxyProperty(ptr long ptr long ptr) @ stub WsGetWriterPosition @ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsCreateServiceProxy and WsFreeServiceProxy.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: b353271afaf60d8ba33383ec0959c21e625d13e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b353271afaf60d8ba33383ec0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:42 2016 +0200 webservices: Implement WsCreateServiceProxy and WsFreeServiceProxy. 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/proxy.c | 133 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 3 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index c052252..285368f 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -5,5 +5,6 @@ IMPORTS = user32 C_SRCS = \ channel.c \ main.c \ + proxy.c \ reader.c \ writer.c diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c new file mode 100644 index 0000000..169f89a --- /dev/null +++ b/dlls/webservices/proxy.c @@ -0,0 +1,133 @@ +/* + * 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 <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 proxy_props[] = +{ + { sizeof(ULONG), FALSE, TRUE }, /* WS_PROXY_PROPERTY_CALL_TIMEOUT */ + { sizeof(WS_MESSAGE_PROPERTIES), FALSE }, /* WS_PROXY_PROPERTY_MESSAGE_PROPERTIES */ + { sizeof(USHORT), FALSE, TRUE }, /* WS_PROXY_PROPERTY_MAX_CALL_POOL_SIZE */ + { sizeof(WS_SERVICE_PROXY_STATE), TRUE }, /* WS_PROXY_PROPERTY_STATE */ + { sizeof(ULONG), FALSE, TRUE }, /* WS_PROXY_PROPERTY_MAX_PENDING_CALLS */ + { sizeof(ULONG), FALSE, TRUE }, /* WS_PROXY_PROPERTY_MAX_CLOSE_TIMEOUT */ + { sizeof(LANGID), FALSE, TRUE }, /* WS_PROXY_FAULT_LANG_ID */ +}; + +struct proxy +{ + struct channel *channel; + ULONG prop_count; + struct prop prop[sizeof(proxy_props)/sizeof(proxy_props[0])]; +}; + +static struct proxy *alloc_proxy(void) +{ + static const ULONG count = sizeof(proxy_props)/sizeof(proxy_props[0]); + struct proxy *ret; + ULONG size = sizeof(*ret) + prop_size( proxy_props, count ); + + if (!(ret = heap_alloc_zero( size ))) return NULL; + prop_init( proxy_props, count, ret->prop, &ret[1] ); + ret->prop_count = count; + return ret; +} + +static void free_proxy( struct proxy *proxy ) +{ + free_channel( proxy->channel ); + heap_free( proxy ); +} + +static HRESULT create_proxy( struct channel *channel, const WS_PROXY_PROPERTY *properties, ULONG count, + WS_SERVICE_PROXY **handle ) +{ + struct proxy *proxy; + HRESULT hr; + ULONG i; + + if (!(proxy = alloc_proxy())) return E_OUTOFMEMORY; + + for (i = 0; i < count; i++) + { + hr = prop_set( proxy->prop, proxy->prop_count, properties[i].id, properties[i].value, + properties[i].valueSize ); + if (hr != S_OK) + { + free_proxy( proxy ); + return hr; + } + } + + proxy->channel = channel; + + *handle = (WS_SERVICE_PROXY *)proxy; + return S_OK; +} + +/************************************************************************** + * WsCreateServiceProxy [webservices.@] + */ +HRESULT WINAPI WsCreateServiceProxy( const WS_CHANNEL_TYPE type, const WS_CHANNEL_BINDING binding, + const WS_SECURITY_DESCRIPTION *desc, + const WS_PROXY_PROPERTY *proxy_props, ULONG proxy_props_count, + const WS_CHANNEL_PROPERTY *channel_props, + const ULONG channel_props_count, WS_SERVICE_PROXY **handle, + WS_ERROR *error ) +{ + struct channel *channel; + HRESULT hr; + + TRACE( "%u %u %p %p %u %p %u %p %p\n", type, binding, desc, proxy_props, proxy_props_count, + channel_props, channel_props_count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (desc) FIXME( "ignoring security description\n" ); + + if (!handle) return E_INVALIDARG; + + if ((hr = create_channel( type, binding, channel_props, channel_props_count, &channel )) != S_OK) + return hr; + + if ((hr = create_proxy( channel, proxy_props, proxy_props_count, handle )) != S_OK) + free_channel( channel ); + + return hr; +} + +/************************************************************************** + * WsFreeServiceProxy [webservices.@] + */ +void WINAPI WsFreeServiceProxy( WS_SERVICE_PROXY *handle ) +{ + struct proxy *proxy = (struct proxy *)handle; + + TRACE( "%p\n", handle ); + free_proxy( proxy ); +} diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 8c3b999..d47a0e1 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -32,7 +32,7 @@ @ stdcall WsCreateReader(ptr long ptr ptr) @ stub WsCreateServiceEndpointFromTemplate @ stub WsCreateServiceHost -@ stub WsCreateServiceProxy +@ stdcall WsCreateServiceProxy(long long ptr ptr long ptr long ptr ptr) @ stub WsCreateServiceProxyFromTemplate @ stdcall WsCreateWriter(ptr long ptr ptr) @ stdcall WsCreateXmlBuffer(ptr ptr long ptr ptr) @@ -57,7 +57,7 @@ @ stdcall WsFreeReader(ptr) @ stub WsFreeSecurityToken @ stub WsFreeServiceHost -@ stub WsFreeServiceProxy +@ stdcall WsFreeServiceProxy(ptr) @ stdcall WsFreeWriter(ptr) @ stdcall WsGetChannelProperty(ptr long ptr long ptr) @ stub WsGetCustomHeader

1 0

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

22 Apr '16

Module: wine Branch: master Commit: 2c1628a6f4cdc98a06184f993cfa31ea8abb1fdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1628a6f4cdc98a06184f993… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:40 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 | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 87035bc..6217105 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -39,6 +39,7 @@ typedef struct _WS_SECURITY_BINDING WS_SECURITY_BINDING; typedef struct _WS_CHANNEL WS_CHANNEL; typedef struct _WS_MESSAGE_PROPERTY WS_MESSAGE_PROPERTY; typedef struct _WS_MESSAGE_PROPERTIES WS_MESSAGE_PROPERTIES; +typedef struct _WS_HTTP_BINDING_TEMPLATE WS_HTTP_BINDING_TEMPLATE; typedef struct _WS_HTTP_SSL_BINDING_TEMPLATE WS_HTTP_SSL_BINDING_TEMPLATE; typedef struct _WS_CHANNEL_PROPERTIES WS_CHANNEL_PROPERTIES; typedef struct _WS_SSL_TRANSPORT_SECURITY_BINDING_TEMPLATE WS_SSL_TRANSPORT_SECURITY_BINDING_TEMPLATE; @@ -49,6 +50,16 @@ typedef struct _WS_ENDPOINT_IDENTITY WS_ENDPOINT_IDENTITY; typedef struct _WS_ENUM_DESCRIPTION WS_ENUM_DESCRIPTION; typedef struct _WS_ENUM_VALUE WS_ENUM_VALUE; typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION; +typedef struct _WS_HTTP_POLICY_DESCRIPTION WS_HTTP_POLICY_DESCRIPTION; +typedef struct _WS_MESSAGE_PROPERTY WS_MESSAGE_PROPERTY; +typedef struct _WS_MESSAGE_PROPERTIES WS_MESSAGE_PROPERTIES; +typedef struct _WS_MESSAGE WS_MESSAGE; +typedef struct _WS_MESSAGE_DESCRIPTION WS_MESSAGE_DESCRIPTION; +typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION; +typedef struct _WS_PARAMETER_DESCRIPTION WS_PARAMETER_DESCRIPTION; +typedef struct _WS_OPERATION_CONTEXT WS_OPERATION_CONTEXT; +typedef struct _WS_CALL_PROPERTY WS_CALL_PROPERTY; +typedef struct _WS_DOUBLE_DESCRIPTION WS_DOUBLE_DESCRIPTION; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -372,6 +383,11 @@ struct _WS_ENUM_DESCRIPTION { ULONG *nameIndices; }; +struct _WS_DOUBLE_DESCRIPTION { + double minValue; + double maxValue; +}; + typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, @@ -823,6 +839,10 @@ struct _WS_SSL_TRANSPORT_SECURITY_BINDING_TEMPLATE { WS_CERT_CREDENTIAL *localCertCredential; }; +struct _WS_HTTP_BINDING_TEMPLATE { + WS_CHANNEL_PROPERTIES channelProperties; +}; + struct _WS_HTTP_SSL_BINDING_TEMPLATE { WS_CHANNEL_PROPERTIES channelProperties; WS_SECURITY_PROPERTIES securityProperties; @@ -878,6 +898,22 @@ struct _WS_MESSAGE_PROPERTIES { }; typedef enum { + WS_MESSAGE_STATE_EMPTY = 1, + WS_MESSAGE_STATE_INITIALIZED = 2, + WS_MESSAGE_STATE_READING = 3, + WS_MESSAGE_STATE_WRITING = 4, + WS_MESSAGE_STATE_DONE = 5 +} WS_MESSAGE_STATE; + +typedef enum { + WS_BLANK_MESSAGE, + WS_DUPLICATE_MESSAGE, + WS_REQUEST_MESSAGE, + WS_REPLY_MESSAGE, + WS_FAULT_MESSAGE +} WS_MESSAGE_INITIALIZATION; + +typedef enum { WS_DNS_ENDPOINT_IDENTITY_TYPE = 1, WS_UPN_ENDPOINT_IDENTITY_TYPE = 2, WS_SPN_ENDPOINT_IDENTITY_TYPE = 3, @@ -897,12 +933,79 @@ struct _WS_ENDPOINT_ADDRESS { WS_ENDPOINT_IDENTITY *identity; }; +struct _WS_HTTP_POLICY_DESCRIPTION { + WS_CHANNEL_PROPERTIES channelProperties; +}; + +struct _WS_MESSAGE_DESCRIPTION { + WS_XML_STRING *action; + WS_ELEMENT_DESCRIPTION *bodyElementDescription; +}; + +typedef enum { + WS_PARAMETER_TYPE_NORMAL, + WS_PARAMETER_TYPE_ARRAY, + WS_PARAMETER_TYPE_ARRAY_COUNT, + WS_PARAMETER_TYPE_MESSAGES +} WS_PARAMETER_TYPE; + +struct _WS_PARAMETER_DESCRIPTION { + WS_PARAMETER_TYPE parameterType; + USHORT inputMessageIndex; + USHORT outputMessageIndex; +}; + +typedef HRESULT (CALLBACK *WS_SERVICE_STUB_CALLBACK)( + const WS_OPERATION_CONTEXT *context, + void *frame, + const void *callback, + const WS_ASYNC_CONTEXT *asyncContext, + WS_ERROR *error ); + +typedef enum { + WS_NON_RPC_LITERAL_OPERATION, + WS_RPC_LITERAL_OPERATION +} WS_OPERATION_STYLE; + +struct _WS_OPERATION_DESCRIPTION { + ULONG versionInfo; + WS_MESSAGE_DESCRIPTION *inputMessageDescription; + WS_MESSAGE_DESCRIPTION *outputMessageDescription; + ULONG inputMessageOptions; + ULONG outputMessageOptions; + USHORT parameterCount; + WS_PARAMETER_DESCRIPTION *parameterDescription; + WS_SERVICE_STUB_CALLBACK stubCallback; + WS_OPERATION_STYLE style; +}; + +typedef enum { + WS_CALL_PROPERTY_CHECK_MUST_UNDERSTAND, + WS_CALL_PROPERTY_SEND_MESSAGE_CONTEXT, + WS_CALL_PROPERTY_RECEIVE_MESSAGE_CONTEXT, + WS_CALL_PROPERTY_CALL_ID +} WS_CALL_PROPERTY_ID; + +struct _WS_CALL_PROPERTY { + WS_CALL_PROPERTY_ID id; + void *value; + ULONG valueSize; +}; + 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*, + WS_ERROR*); +HRESULT WINAPI WsCloseChannel(WS_CHANNEL*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCloseServiceProxy(WS_SERVICE_PROXY*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCreateChannel(WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY*, ULONG, const WS_SECURITY_DESCRIPTION*, WS_CHANNEL**, WS_ERROR*); HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); +HRESULT WINAPI WsCreateMessage(WS_ENVELOPE_VERSION, WS_ADDRESSING_VERSION, const WS_MESSAGE_PROPERTY*, + ULONG, WS_MESSAGE**, WS_ERROR*); +HRESULT WINAPI WsCreateMessageForChannel(WS_CHANNEL*, const WS_MESSAGE_PROPERTY*, ULONG, WS_MESSAGE**, + WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*); HRESULT WINAPI WsCreateServiceProxy(const WS_CHANNEL_TYPE, const WS_CHANNEL_BINDING, const WS_SECURITY_DESCRIPTION*, const WS_PROXY_PROPERTY*, @@ -921,6 +1024,7 @@ HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XM void WINAPI WsFreeChannel(WS_CHANNEL*); void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); +void WINAPI WsFreeMessage(WS_MESSAGE*); void WINAPI WsFreeReader(WS_XML_READER*); void WINAPI WsFreeServiceProxy(WS_SERVICE_PROXY*); void WINAPI WsFreeWriter(WS_XML_WRITER*); @@ -940,8 +1044,10 @@ HRESULT WINAPI WsGetServiceProxyProperty(WS_SERVICE_PROXY*, const WS_PROXY_PROPE HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); +HRESULT WINAPI WsInitializeMessage(WS_MESSAGE*, WS_MESSAGE_INITIALIZATION, WS_MESSAGE*, WS_ERROR*); HRESULT WINAPI WsMoveReader(WS_XML_READER*, WS_MOVE_TO, BOOL*, WS_ERROR*); HRESULT WINAPI WsMoveWriter(WS_XML_WRITER*, WS_MOVE_TO, BOOL*, WS_ERROR*); +HRESULT WINAPI WsOpenChannel(WS_CHANNEL*, const WS_ENDPOINT_ADDRESS*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsOpenServiceProxy(WS_SERVICE_PROXY*, const WS_ENDPOINT_ADDRESS*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, @@ -956,6 +1062,8 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); +HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, @@ -975,6 +1083,8 @@ HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndCData(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteMessageStart(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsWriteMessageEnd(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, WS_ERROR*); HRESULT WINAPI WsWriteStartCData(WS_XML_WRITER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsResetHeap.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 767056dc3ebc15d00a0d383624fd076059ec7317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=767056dc3ebc15d00a0d38362… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:39 2016 +0200 webservices: Implement WsResetHeap. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 38 ++++++++++++++++---- dlls/webservices/tests/reader.c | 75 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 555ab71..e30864d 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -157,33 +157,48 @@ struct heap struct prop prop[sizeof(heap_props)/sizeof(heap_props[0])]; }; +static BOOL ensure_heap( struct heap *heap ) +{ + SIZE_T size; + if (heap->handle) return TRUE; + if (prop_get( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_MAX_SIZE, &size, sizeof(size) ) != S_OK) + return FALSE; + if (!(heap->handle = HeapCreate( 0, 0, size ))) return FALSE; + return TRUE; +} + void *ws_alloc( WS_HEAP *handle, SIZE_T size ) { struct heap *heap = (struct heap *)handle; + if (!ensure_heap( heap )) return NULL; return HeapAlloc( heap->handle, 0, size ); } static void *ws_alloc_zero( WS_HEAP *handle, SIZE_T size ) { struct heap *heap = (struct heap *)handle; + if (!ensure_heap( heap )) return NULL; return HeapAlloc( heap->handle, HEAP_ZERO_MEMORY, size ); } void *ws_realloc( WS_HEAP *handle, void *ptr, SIZE_T size ) { struct heap *heap = (struct heap *)handle; + if (!ensure_heap( heap )) return NULL; return HeapReAlloc( heap->handle, 0, ptr, size ); } static void *ws_realloc_zero( WS_HEAP *handle, void *ptr, SIZE_T size ) { struct heap *heap = (struct heap *)handle; + if (!ensure_heap( heap )) return NULL; return HeapReAlloc( heap->handle, HEAP_ZERO_MEMORY, ptr, size ); } void ws_free( WS_HEAP *handle, void *ptr ) { struct heap *heap = (struct heap *)handle; + if (!heap->handle) return; HeapFree( heap->handle, 0, ptr ); } @@ -233,12 +248,6 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR prop_set( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_MAX_SIZE, &max_size, sizeof(max_size) ); prop_set( heap->prop, heap->prop_count, WS_HEAP_PROPERTY_TRIM_SIZE, &trim_size, sizeof(trim_size) ); - if (!(heap->handle = HeapCreate( 0, 0, max_size ))) - { - heap_free( heap ); - return E_OUTOFMEMORY; - } - *handle = (WS_HEAP *)heap; return S_OK; } @@ -257,6 +266,23 @@ void WINAPI WsFreeHeap( WS_HEAP *handle ) heap_free( heap ); } +/************************************************************************** + * WsResetHeap [webservices.@] + */ +HRESULT WINAPI WsResetHeap( WS_HEAP *handle, WS_ERROR *error ) +{ + struct heap *heap = (struct heap *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!heap) return E_INVALIDARG; + + HeapDestroy( heap->handle ); + heap->handle = NULL; + return S_OK; +} + struct node *alloc_node( WS_XML_NODE_TYPE type ) { struct node *ret; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 9b5face..5c94fef 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2850,6 +2850,80 @@ static void test_repeating_element(void) WsFreeHeap( heap ); } +static void test_WsResetHeap(void) +{ + HRESULT hr; + WS_HEAP *heap; + SIZE_T requested, actual; + ULONG size; + void *ptr; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !requested, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !actual, "got %u\n", (ULONG)actual ); + + hr = WsAlloc( heap, 128, &ptr, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( requested == 128, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( actual == 128, "got %u\n", (ULONG)actual ); + + hr = WsAlloc( heap, 1, &ptr, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( requested == 129, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( actual == 384, "got %u\n", (ULONG)actual ); + + hr = WsResetHeap( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsResetHeap( heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + requested = 0xdeadbeef; + size = sizeof(requested); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_REQUESTED_SIZE, &requested, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !requested, "got %u\n", (ULONG)requested ); + + actual = 0xdeadbeef; + size = sizeof(actual); + hr = WsGetHeapProperty( heap, WS_HEAP_PROPERTY_ACTUAL_SIZE, &actual, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + todo_wine ok( actual == 128, "got %u\n", (ULONG)actual ); + + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -2874,4 +2948,5 @@ START_TEST(reader) test_text_field_mapping(); test_complex_struct_type(); test_repeating_element(); + test_WsResetHeap(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 001b3ca..8c3b999 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -135,7 +135,7 @@ @ stub WsRequestSecurityToken @ stub WsResetChannel @ stub WsResetError -@ stub WsResetHeap +@ stdcall WsResetHeap(ptr ptr) @ stub WsResetListener @ stub WsResetMessage @ stub WsResetMetadata diff --git a/include/webservices.h b/include/webservices.h index bfc84e2..87035bc 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -955,6 +955,7 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const BOOL*, WS_ERROR*); HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*,

1 0

Hans Leidekker : webservices: Add generic property handlers.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 19fecc4f214d9aa93b357414f67d8156802a4540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fecc4f214d9aa93b357414f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 22 09:42:38 2016 +0200 webservices: Add generic property handlers. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 49 ++------ dlls/webservices/reader.c | 201 ++++++++++++--------------------- dlls/webservices/webservices_private.h | 22 +++- dlls/webservices/writer.c | 72 ++++-------- 4 files changed, 125 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19fecc4f214d9aa93b357…

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 880M.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: f52accf86de3f3be387090cf5f1516a693213331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52accf86de3f3be387090cf5… Author: Caron Wills <caron(a)codeweavers.com> Date: Thu Apr 21 18:06:05 2016 +0000 wined3d: Add Nvidia GeForce GTX 880M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1ff8d43..761ee07 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1294,6 +1294,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1756,6 +1757,7 @@ cards_nvidia_binary[] = {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ + {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 099d1ee..bfc8f26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1802,6 +1802,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX870M = 0x1199, + CARD_NVIDIA_GEFORCE_GTX880M = 0x1198, CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401,

1 0

Piotr Caban : gdi32/enhmfdrv: Don't drop viewport/ window transformation in StretchBlt.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: d9e7c4d820a104a7a675baa1b2e0261e685deb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e7c4d820a104a7a675baa1b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 21 17:41:21 2016 +0200 gdi32/enhmfdrv: Don't drop viewport/window transformation in StretchBlt. 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/gdi32/enhmfdrv/bitblt.c | 2 +- dlls/gdi32/tests/metafile.c | 60 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/bitblt.c b/dlls/gdi32/enhmfdrv/bitblt.c index d6d0fe7..ed03c1f 100644 --- a/dlls/gdi32/enhmfdrv/bitblt.c +++ b/dlls/gdi32/enhmfdrv/bitblt.c @@ -122,7 +122,7 @@ BOOL EMFDRV_StretchBlt( PHYSDEV devDst, struct bitblt_coords *dst, pEMR->dwRop = rop; pEMR->xSrc = src->log_x; pEMR->ySrc = src->log_y; - GetWorldTransform(devSrc->hdc, &pEMR->xformSrc); + GetTransform(devSrc->hdc, 0x204, &pEMR->xformSrc); pEMR->crBkColorSrc = GetBkColor(devSrc->hdc); pEMR->iUsageSrc = DIB_RGB_COLORS; pEMR->offBmiSrc = emrSize; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index b9e7522..c77112d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -989,7 +989,7 @@ static void test_mf_SaveDC(void) /* with the nominal results. */ /* Maximum size of sample metafiles in bytes. */ -#define MF_BUFSIZE 512 +#define MF_BUFSIZE 1024 /* 8x8 bitmap data for a pattern brush */ static const unsigned char SAMPLE_PATTERN_BRUSH[] = { @@ -1231,16 +1231,16 @@ static const unsigned char EMF_BITBLT[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x6a, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, + 0x4f, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xa0, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x64, 0x02, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x23, 0x04, 0x00, 0x00, 0x3b, 0x02, 0x00, 0x00, - 0x75, 0x01, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, + 0x80, 0x07, 0x00, 0x00, 0xb0, 0x04, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x08, 0xb1, 0x05, 0x00, - 0x28, 0x11, 0x03, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x07, 0x00, + 0x30, 0xda, 0x04, 0x00, 0x4c, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1276,9 +1276,34 @@ static const unsigned char EMF_BITBLT[] = 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 + 0x00, 0x00, 0x00, 0x00, 0x4d, 0x00, 0x00, 0x00, + 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x20, 0x00, 0xcc, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0a, 0xd7, 0xa3, 0x3b, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0a, 0xd7, 0x23, 0x3c, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6c, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, + 0x94, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 }; static const unsigned char EMF_DCBRUSH_BITS[] = @@ -1858,6 +1883,7 @@ static void test_emf_BitBlt(void) 0, /* biClrImportant */ }; void *bits; + XFORM xform; BOOL ret; hdcDisplay = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1865,6 +1891,7 @@ static void test_emf_BitBlt(void) hdcBitmap = CreateCompatibleDC(hdcDisplay); ok( hdcBitmap != 0, "CreateCompatibleDC failed\n" ); + ok(SetGraphicsMode(hdcBitmap, GM_ADVANCED), "SetGraphicsMode failed\n"); bmih.biXPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSX), 100, 3937); bmih.biYPelsPerMeter = MulDiv(GetDeviceCaps(hdcDisplay, LOGPIXELSY), 100, 3937); hBitmap = CreateDIBSection(hdcDisplay, (const BITMAPINFO *)&bmih, @@ -1883,6 +1910,19 @@ static void test_emf_BitBlt(void) ret = BitBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, 0, 0, 0, WHITENESS); ok( ret, "BitBlt(WHITENESS) failed\n" ); + ok(SetMapMode(hdcBitmap, MM_ANISOTROPIC), "SetMapMode failed\n"); + ok(SetWindowOrgEx(hdcBitmap, 0, 0, NULL), "SetWindowOrgEx failed\n"); + ok(SetWindowExtEx(hdcBitmap, 400, 400, NULL), "SetWindowExtEx failed\n"); + ok(SetViewportOrgEx(hdcBitmap, 0, 0, NULL), "SetViewportOrgEx failed\n"); + ok(SetViewportExtEx(hdcBitmap, BMP_DIM, BMP_DIM, NULL), "SetViewportExtEx failed\n"); + memset(&xform, 0, sizeof(xform)); + xform.eM11 = 0.5; + xform.eM22 = 1.0; + ok(SetWorldTransform(hdcBitmap, &xform), "SetWorldTransform failed\n"); + + ret = StretchBlt(hdcMetafile, 0, 0, BMP_DIM, BMP_DIM, hdcBitmap, 0, 0, 400, 400, SRCCOPY); + ok( ret, "StretchBlt(SRCCOPY) failed\n" ); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok( hMetafile != 0, "CloseEnhMetaFile failed\n" );

1 0

Francois Gouget : shell32/tests: A spelling fix for an shlfolder ok() message.
by Alexandre Julliard 22 Apr '16

22 Apr '16

Module: wine Branch: master Commit: 9638ddd62c2298a2db71b24841f65f86e65218ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9638ddd62c2298a2db71b2484… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:38:28 2016 +0200 shell32/tests: A spelling fix for an shlfolder ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index da903b0..e80e8a4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1142,7 +1142,7 @@ static void test_GetAttributesOf(void) todo_wine ok (hr == E_INVALIDARG || broken(hr == S_OK), /* W2K and earlier */ - "MyComputer->GetAttributesOf(emtpy pidl) should fail! hr = %08x\n", hr); + "MyComputer->GetAttributesOf(empty pidl) should fail! hr = %08x\n", hr); dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfMyComputer, 0, NULL, &dwFlags);

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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