April 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce wined3d_device_get_hull_shader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 3c1726c2b5013e456b0b10f4f62db3f328dfd8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1726c2b5013e456b0b10f4f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:17 2017 +0200 wined3d: Introduce wined3d_device_get_hull_shader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a3924c0..961bda6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2671,6 +2671,13 @@ void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_get_hull_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->state.shader[WINED3D_SHADER_TYPE_HULL]; +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3331066..e5edcb4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -64,6 +64,7 @@ @ cdecl wined3d_device_get_gs_cb(ptr long) @ cdecl wined3d_device_get_gs_resource_view(ptr long) @ cdecl wined3d_device_get_gs_sampler(ptr long) +@ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c2729fb..6733087 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2203,6 +2203,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_gs_cb(const struct wined3d_de struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); +struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_hull_shader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 94c11d23d171e531cdbb8303522554ac2ecf7d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c11d23d171e531cdbb83035… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:13 2017 +0200 wined3d: Introduce wined3d_device_set_hull_shader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 +++++++++++++++++ dlls/wined3d/state.c | 2 ++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 21 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e90be5..154197c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2654,6 +2654,23 @@ HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device return WINED3D_OK; } +void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader) +{ + struct wined3d_shader *prev; + + TRACE("device %p, shader %p.\n", device, shader); + + prev = device->update_state->shader[WINED3D_SHADER_TYPE_HULL]; + if (shader == prev) + return; + if (shader) + wined3d_shader_incref(shader); + device->update_state->shader[WINED3D_SHADER_TYPE_HULL] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_HULL, shader); + if (prev) + wined3d_shader_decref(prev); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2c47ce6..5c22a04 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5207,6 +5207,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), { STATE_SHADER(WINED3D_SHADER_TYPE_HULL), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_compute_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, @@ -5988,6 +5989,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_STREAMSRC, STATE_INDEXBUFFER, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), + STATE_SHADER(WINED3D_SHADER_TYPE_HULL), STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ad02eeb..dd8b743 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -128,6 +128,7 @@ @ cdecl wined3d_device_set_gs_cb(ptr long ptr) @ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) +@ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_set_light(ptr long ptr) @ cdecl wined3d_device_set_light_enable(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1bf5a6c..bbcea55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2303,6 +2303,7 @@ void __cdecl wined3d_device_set_gs_cb(struct wined3d_device *device, UINT idx, s void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); +void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset); HRESULT __cdecl wined3d_device_set_light(struct wined3d_device *device,

1 0

Sebastian Lackner : wined3d: Release resources on error in wined3d_cs_exec_blt_sub_resource.
by Alexandre Julliard April 20, 2017

April 20, 2017

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

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetShader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: e1dae7b11ccfd9f318c8ba448b3823d1f4a6961a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dae7b11ccfd9f318c8ba448… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:18 2017 +0200 d3d11: Implement d3d11_immediate_context_HSGetShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d2eaec8..d6881de 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1942,8 +1942,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceContext *iface, ID3D11HullShader **shader, ID3D11ClassInstance **class_instances, UINT *class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_hull_shader *shader_impl; + struct wined3d_shader *wined3d_shader; + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %p.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances || class_instance_count) + FIXME("Dynamic linking not implemented yet.\n"); + + wined3d_mutex_lock(); + if (!(wined3d_shader = wined3d_device_get_hull_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + ID3D11HullShader_AddRef(*shader = &shader_impl->ID3D11HullShader_iface); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext *iface,

1 0

Hans Leidekker : webservices: Implement WsOpenListener and WsCloseListener.
by Alexandre Julliard April 20, 2017

April 20, 2017

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

Owen Rudge : include: Remove typedefs from wsdapi.h, reorder includes.
by Alexandre Julliard April 20, 2017

April 20, 2017

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 April 20, 2017

April 20, 2017

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

Alexandre Julliard : glu32: Import mipmap functions from Mesa.
by Alexandre Julliard April 20, 2017

April 20, 2017

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

Hans Leidekker : webservices: Reuse the message read buffer.
by Alexandre Julliard April 20, 2017

April 20, 2017

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

Owen Rudge : include: Avoid redefining WSDXML typedefs.
by Alexandre Julliard April 20, 2017

April 20, 2017

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