wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Sebastian Lackner : wined3d: Fix double free in geometry_shader_init.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 9b00f0182bc0afc9a30420163e96f85612486b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b00f0182bc0afc9a30420163… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 19 18:55:32 2017 +0200 wined3d: Fix double free in geometry_shader_init. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3681a8d..7dc276f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3433,21 +3433,23 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3 const struct wined3d_shader_desc *desc, const struct wined3d_stream_output_desc *so_desc, void *parent, const struct wined3d_parent_ops *parent_ops) { + struct wined3d_stream_output_element *elements = NULL; HRESULT hr; + if (so_desc && !(elements = wined3d_calloc(so_desc->element_count, sizeof(*elements)))) + return E_OUTOFMEMORY; + if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_GEOMETRY, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, elements); return hr; + } if (so_desc) { - struct wined3d_stream_output_desc *d = &shader->u.gs.so_desc; - *d = *so_desc; - if (!(d->elements = wined3d_calloc(so_desc->element_count, sizeof(*d->elements)))) - { - wined3d_cs_destroy_object(shader->device->cs, wined3d_shader_destroy_object, shader); - return E_OUTOFMEMORY; - } - memcpy(d->elements, so_desc->elements, so_desc->element_count * sizeof(*d->elements)); + shader->u.gs.so_desc = *so_desc; + shader->u.gs.so_desc.elements = elements; + memcpy(elements, so_desc->elements, so_desc->element_count * sizeof(*elements)); } return WINED3D_OK;

1 0

Sebastian Lackner : wined3d: Release resources on error in wined3d_cs_exec_blt_sub_resource.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 20adccf866dc2ff09182e8ab7ec545ecda41d332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20adccf866dc2ff09182e8ab7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 19 18:55:17 2017 +0200 wined3d: Release resources on error in wined3d_cs_exec_blt_sub_resource. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a579503..951520e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1934,14 +1934,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { FIXME("Flags %#x not implemented for %s resources.\n", op->flags, debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } if (op->src_resource->format != op->dst_resource->format) { FIXME("Format conversion not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } update_w = op->dst_box.right - op->dst_box.left; @@ -1953,14 +1953,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { FIXME("Stretching not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } if (op->src_box.left || op->src_box.top || op->src_box.front) { FIXME("Source box %s not supported for %s resources.\n", debug_box(&op->src_box), debug_d3dresourcetype(op->dst_resource->type)); - return; + goto error; } dst_texture = texture_from_resource(op->dst_resource); @@ -1974,7 +1974,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * ERR("Failed to load source sub-resource into %s.\n", wined3d_debug_location(src_texture->resource.map_binding)); context_release(context); - return; + goto error; } level = op->dst_sub_resource_idx % dst_texture->level_count; @@ -1989,7 +1989,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * { ERR("Failed to load destination sub-resource.\n"); context_release(context); - return; + goto error; } wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, src_texture->resource.map_binding); @@ -2009,6 +2009,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(op->dst_resource->type)); } +error: if (op->src_resource) wined3d_resource_release(op->src_resource); wined3d_resource_release(op->dst_resource);

1 0

Hans Leidekker : webservices: Implement WsResetListener.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: a3999d77efd41faf995c29bb138ff9a7f98bb5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3999d77efd41faf995c29bb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:46 2017 +0200 webservices: Implement WsResetListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 32 ++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 51 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a236ab9..99402ff 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -361,6 +361,38 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx } /************************************************************************** + * WsResetListener [webservices.@] + */ +HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + if (listener->state != WS_LISTENER_STATE_CREATED && listener->state != WS_LISTENER_STATE_CLOSED) + { + LeaveCriticalSection( &listener->cs ); + return WS_E_INVALID_OPERATION; + } + + reset_listener( listener ); + + LeaveCriticalSection( &listener->cs ); + return S_OK; +} + +/************************************************************************** * WsGetListenerProperty [webservices.@] */ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index c4a2747..9aaf330 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -190,9 +190,60 @@ static void test_WsCreateChannelForListener(void) WsFreeListener( listener ); } +static void test_WsResetListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; + WS_LISTENER *listener; + WS_LISTENER_STATE state; + WS_LISTENER_PROPERTY prop; + ULONG size, timeout = 1000; + HRESULT hr; + + hr = WsResetListener( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; + prop.value = &timeout; + prop.valueSize = sizeof(timeout); + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + timeout = 0xdeadbeef; + size = sizeof(timeout); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( timeout == 1000, "got %u\n", timeout ); + + WsFreeListener( listener ); +} + START_TEST(listener) { test_WsCreateListener(); test_WsOpenListener(); test_WsCreateChannelForListener(); + test_WsResetListener(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 522cc56..f55bef8 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -136,7 +136,7 @@ @ stdcall WsResetChannel(ptr ptr) @ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) -@ stub WsResetListener +@ stdcall WsResetListener(ptr ptr) @ stdcall WsResetMessage(ptr ptr) @ stub WsResetMetadata @ stub WsResetServiceHost

1 0

Hans Leidekker : webservices: Implement WsCreateChannelForListener.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 9cacff8e077e01cbf2d325abf54bc8bda9f1a13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cacff8e077e01cbf2d325abf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:45 2017 +0200 webservices: Implement WsCreateChannelForListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 39 ++++++++++++++++++++++++++++++++------- dlls/webservices/tests/listener.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 89070f6..e777e8c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -213,8 +213,35 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding return E_NOTIMPL; } - if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) - return hr; + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + + *handle = (WS_CHANNEL *)channel; + return S_OK; +} + +/************************************************************************** + * WsCreateChannelForListener [webservices.@] + */ +HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const WS_CHANNEL_PROPERTY *properties, + ULONG count, WS_CHANNEL **handle, WS_ERROR *error ) +{ + struct channel *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + HRESULT hr; + + TRACE( "%p %p %u %p %p\n", listener_handle, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener_handle || !handle) return E_INVALIDARG; + + if ((hr = WsGetListenerProperty( listener_handle, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, + sizeof(type), NULL )) != S_OK) return hr; + + if ((hr = WsGetListenerProperty( listener_handle, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, + sizeof(binding), NULL )) != S_OK) return hr; + + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; *handle = (WS_CHANNEL *)channel; return S_OK; @@ -393,11 +420,10 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return hr; } -static HRESULT close_channel( struct channel *channel ) +static void close_channel( struct channel *channel ) { reset_channel( channel ); channel->state = WS_CHANNEL_STATE_CLOSED; - return S_OK; } /************************************************************************** @@ -406,7 +432,6 @@ static HRESULT close_channel( struct channel *channel ) HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -422,10 +447,10 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - hr = close_channel( channel ); + close_channel( channel ); LeaveCriticalSection( &channel->cs ); - return hr; + return S_OK; } static HRESULT parse_url( const WCHAR *url, ULONG len, URL_COMPONENTS *uc ) diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index ab2fba9..c4a2747 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -154,8 +154,45 @@ static void test_WsOpenListener(void) WsFreeListener( listener ); } +static void test_WsCreateChannelForListener(void) +{ + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_STATE state; + HRESULT hr; + + hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + channel = NULL; + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( channel != NULL, "channel not set\n" ); + + type = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + WsFreeChannel( channel ); + WsFreeListener( listener ); +} + START_TEST(listener) { test_WsCreateListener(); test_WsOpenListener(); + test_WsCreateChannelForListener(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index ff35777..522cc56 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -21,7 +21,7 @@ @ stub WsCopyError @ stdcall WsCopyNode(ptr ptr ptr) @ stdcall WsCreateChannel(long long ptr long ptr ptr ptr) -@ stub WsCreateChannelForListener +@ stdcall WsCreateChannelForListener(ptr ptr long ptr ptr) @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @ stdcall WsCreateHeap(long long ptr long ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsOpenListener and WsCloseListener.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 823aa24f85e3b209e29257a4a6f74f492b928b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823aa24f85e3b209e29257a4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:44 2017 +0200 webservices: Implement WsOpenListener and WsCloseListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 2 +- dlls/webservices/listener.c | 187 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 76 ++++++++++++++++ dlls/webservices/webservices.spec | 4 +- 4 files changed, 266 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=823aa24f85e3b209e2925…

1 0

Hans Leidekker : webservices: Reuse the message read buffer.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 79be5ad469fceb93afc65747ed06ec4b29033bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=79be5ad469fceb93afc65747e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:43 2017 +0200 webservices: Reuse the message read buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 118 ++++++++++++++++++++------------- dlls/webservices/proxy.c | 14 +--- dlls/webservices/webservices_private.h | 4 +- 3 files changed, 77 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79be5ad469fceb93afc65…

1 0

Alexandre Julliard : glu32: Import mipmap functions from Mesa.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 99e24f0004ba2d3c0e7834761d18c96244a7b357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99e24f0004ba2d3c0e7834761… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 10:31:40 2017 +0200 glu32: Import mipmap functions from Mesa. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 1 + dlls/glu32/glu.c | 34 - dlls/glu32/glu32.spec | 6 +- dlls/glu32/mipmap.c | 6252 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 6256 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99e24f0004ba2d3c0e783…

1 0

Owen Rudge : include: Avoid redefining WSDXML typedefs.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: b7279badfa1583d9bb82bd951b0b621846cc38ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7279badfa1583d9bb82bd951… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Apr 19 20:47:22 2017 +0100 include: Avoid redefining WSDXML typedefs. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdxml.idl | 9 +-------- include/wsdxmldom.h | 3 +++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/wsdxml.idl b/include/wsdxml.idl index 0a63ffb..e86d54b 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -18,14 +18,7 @@ import "oaidl.idl"; import "ocidl.idl"; - -typedef struct _WSDXML_NAMESPACE WSDXML_NAMESPACE; -typedef struct _WSDXML_NAME WSDXML_NAME; -typedef struct _WSDXML_TYPE WSDXML_TYPE; -typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; - -typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; -typedef const WSDXML_TYPE *PCWSDXML_TYPE; +import "wsdxmldom.h"; interface IWSDXMLContext; diff --git a/include/wsdxmldom.h b/include/wsdxmldom.h index 59e481c..e9fb3bd 100644 --- a/include/wsdxmldom.h +++ b/include/wsdxmldom.h @@ -27,6 +27,9 @@ typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; typedef struct _WSDXML_NODE WSDXML_NODE; typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; +typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE; +typedef const WSDXML_TYPE *PCWSDXML_TYPE; + struct _WSDXML_TYPE { const WCHAR *Uri;

1 0

Owen Rudge : include: Remove typedefs from wsdapi.h, reorder includes.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 337a890ee4de00ed10ea6de445a5f26a8b2ea65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=337a890ee4de00ed10ea6de44… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 18 20:40:47 2017 +0100 include: Remove typedefs from wsdapi.h, reorder includes. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdapi.h | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/include/wsdapi.h b/include/wsdapi.h index 8deb377..dec0954 100644 --- a/include/wsdapi.h +++ b/include/wsdapi.h @@ -19,31 +19,10 @@ #ifndef WSDAPI_H #define WSDAPI_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct IWSDMessageParameters IWSDMessageParameters; - -typedef struct _WSD_URI_LIST WSD_URI_LIST; -typedef struct _WSD_NAME_LIST WSD_NAME_LIST; - -typedef struct _WSDXML_NAME WSDXML_NAME; -typedef struct _WSDXML_ELEMENT WSDXML_ELEMENT; -typedef struct _WSDXML_NODE WSDXML_NODE; -typedef struct _WSDXML_ATTRIBUTE WSDXML_ATTRIBUTE; -typedef struct _WSDXML_PREFIX_MAPPING WSDXML_PREFIX_MAPPING; -typedef struct _WSDXML_ELEMENT_LIST WSDXML_ELEMENT_LIST; -typedef struct _WSDXML_TYPE WSDXML_TYPE; - -#ifdef __cplusplus -} -#endif - -#include <wsdtypes.h> #include <wsdbase.h> -#include <wsdxmldom.h> #include <wsdxml.h> +#include <wsdxmldom.h> +#include <wsdtypes.h> #include <wsddisco.h> #endif

1 0

Owen Rudge : wsdapi/tests: Add tests for Register/ UnRegisterNotificationSink.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: b57c881fb3a76b6b488568c8dc424c71b974d800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57c881fb3a76b6b488568c8d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 18 20:40:42 2017 +0100 wsdapi/tests: Add tests for Register/UnRegisterNotificationSink. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 139 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 138 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 280b034..ffe64b0 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -28,6 +28,108 @@ #include "objbase.h" #include "wsdapi.h" +typedef struct IWSDiscoveryPublisherNotifyImpl { + IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify_iface; + LONG ref; +} IWSDiscoveryPublisherNotifyImpl; + +static inline IWSDiscoveryPublisherNotifyImpl *impl_from_IWSDiscoveryPublisherNotify(IWSDiscoveryPublisherNotify *iface) +{ + return CONTAINING_RECORD(iface, IWSDiscoveryPublisherNotifyImpl, IWSDiscoveryPublisherNotify_iface); +} + +static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_QueryInterface(IWSDiscoveryPublisherNotify *iface, REFIID riid, void **ppv) +{ + IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); + + if (!ppv) + { + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDiscoveryPublisherNotify)) + { + *ppv = &This->IWSDiscoveryPublisherNotify_iface; + } + else + { + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_AddRef(IWSDiscoveryPublisherNotify *iface) +{ + IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + trace("IWSDiscoveryPublisherNotifyImpl_AddRef called (%p, ref = %d)\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDiscoveryPublisherNotifyImpl_Release(IWSDiscoveryPublisherNotify *iface) +{ + IWSDiscoveryPublisherNotifyImpl *This = impl_from_IWSDiscoveryPublisherNotify(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + trace("IWSDiscoveryPublisherNotifyImpl_Release called (%p, ref = %d)\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters) +{ + trace("IWSDiscoveryPublisherNotifyImpl_ProbeHandler called (%p, %p, %p)\n", This, pSoap, pMessageParameters); + return S_OK; +} + +static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ResolveHandler(IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters) +{ + trace("IWSDiscoveryPublisherNotifyImpl_ResolveHandler called (%p, %p, %p)\n", This, pSoap, pMessageParameters); + return S_OK; +} + +static const IWSDiscoveryPublisherNotifyVtbl publisherNotify_vtbl = +{ + IWSDiscoveryPublisherNotifyImpl_QueryInterface, + IWSDiscoveryPublisherNotifyImpl_AddRef, + IWSDiscoveryPublisherNotifyImpl_Release, + IWSDiscoveryPublisherNotifyImpl_ProbeHandler, + IWSDiscoveryPublisherNotifyImpl_ResolveHandler +}; + +static BOOL create_discovery_publisher_notify(IWSDiscoveryPublisherNotify **publisherNotify) +{ + IWSDiscoveryPublisherNotifyImpl *obj; + + *publisherNotify = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + trace("Out of memory creating IWSDiscoveryPublisherNotify\n"); + return FALSE; + } + + obj->IWSDiscoveryPublisherNotify_iface.lpVtbl = &publisherNotify_vtbl; + obj->ref = 1; + + *publisherNotify = &obj->IWSDiscoveryPublisherNotify_iface; + + return TRUE; +} + static void CreateDiscoveryPublisher_tests(void) { IWSDiscoveryPublisher *publisher = NULL; @@ -63,6 +165,9 @@ static void CreateDiscoveryPublisher_tests(void) static void Publish_tests(void) { IWSDiscoveryPublisher *publisher = NULL; + IWSDiscoveryPublisherNotify *sink1 = NULL, *sink2 = NULL; + IWSDiscoveryPublisherNotifyImpl *sink1Impl = NULL, *sink2Impl = NULL; + HRESULT rc; ULONG ref; @@ -81,12 +186,44 @@ static void Publish_tests(void) rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV6); ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08x\n", rc); - /* TODO: Register notification sink */ + /* Create notification sinks */ + ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); + ok(create_discovery_publisher_notify(&sink2) == TRUE, "create_discovery_publisher_notify failed\n"); + + /* Get underlying implementation so we can check the ref count */ + sink1Impl = impl_from_IWSDiscoveryPublisherNotify(sink1); + sink2Impl = impl_from_IWSDiscoveryPublisherNotify(sink2); + + /* Attempt to unregister sink before registering it */ + rc = IWSDiscoveryPublisher_UnRegisterNotificationSink(publisher, sink1); + ok(rc == E_FAIL, "IWSDiscoveryPublisher_UnRegisterNotificationSink returned unexpected result: %08x\n", rc); + + /* Register notification sinks */ + rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); + ok(sink1Impl->ref == 2, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); + + rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink2); + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); + ok(sink2Impl->ref == 2, "Ref count for sink 2 is not as expected: %d\n", sink2Impl->ref); + + /* Unregister the first sink */ + rc = IWSDiscoveryPublisher_UnRegisterNotificationSink(publisher, sink1); + ok(rc == S_OK, "IWSDiscoveryPublisher_UnRegisterNotificationSink failed: %08x\n", rc); + ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); /* TODO: Publish */ ref = IWSDiscoveryPublisher_Release(publisher); ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + + /* Check that the sinks have been released by the publisher */ + ok(sink1Impl->ref == 1, "Ref count for sink 1 is not as expected: %d\n", sink1Impl->ref); + ok(sink2Impl->ref == 1, "Ref count for sink 2 is not as expected: %d\n", sink2Impl->ref); + + /* Release the sinks */ + IWSDiscoveryPublisherNotify_Release(sink1); + IWSDiscoveryPublisherNotify_Release(sink2); } START_TEST(discovery)

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
76
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 2017