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

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetShader().
by Alexandre Julliard 20 Apr '17

20 Apr '17

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

Józef Kucia : wined3d: Introduce wined3d_device_get_domain_shader().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 5bc49dd525ce10d1a4170b86b526f0d78ed63908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc49dd525ce10d1a4170b86b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:19 2017 +0200 wined3d: Introduce wined3d_device_get_domain_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 961bda6..b5f4bdd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2695,6 +2695,13 @@ void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struc wined3d_shader_decref(prev); } +struct wined3d_shader * CDECL wined3d_device_get_domain_shader(const struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return device->state.shader[WINED3D_SHADER_TYPE_DOMAIN]; +} + 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/wined3d.spec b/dlls/wined3d/wined3d.spec index e5edcb4..84ba5d4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -59,6 +59,7 @@ @ cdecl wined3d_device_get_depth_stencil_view(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) +@ cdecl wined3d_device_get_domain_shader(ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6733087..29a8431 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2196,6 +2196,7 @@ struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); +struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSGetShader().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: c08da43ddd37196cb94484fccc967fb819031570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08da43ddd37196cb94484fcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:20 2017 +0200 d3d11: Implement d3d11_immediate_context_DSGetShader(). 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 d6881de..175e271 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1989,8 +1989,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceContext *iface, ID3D11DomainShader **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_domain_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_domain_shader(device->wined3d_device))) + { + wined3d_mutex_unlock(); + *shader = NULL; + return; + } + + shader_impl = wined3d_shader_get_parent(wined3d_shader); + wined3d_mutex_unlock(); + ID3D11DomainShader_AddRef(*shader = &shader_impl->ID3D11DomainShader_iface); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Use correct layer count for 3D textures.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 583255f2b2ff97e26348b3db4d00a9fe80b28688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=583255f2b2ff97e26348b3db4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 12:26:59 2017 +0200 wined3d: Use correct layer count for 3D textures. Fixes a regression introduced by commit 9ffacc434e90d80dbdfb107b10f02a759f2266f3. 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/view.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cb3578a..3abd85b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -422,7 +422,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view struct wined3d_context *context, DWORD location) { struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -433,7 +433,8 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view texture = texture_from_resource(resource); sub_resource_idx = view->sub_resource_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); } @@ -441,7 +442,7 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v struct wined3d_context *context, DWORD location) { struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -452,14 +453,15 @@ void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *v texture = texture_from_resource(resource); sub_resource_idx = view->sub_resource_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_load_location(texture, sub_resource_idx, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) { struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -470,7 +472,8 @@ void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_vie texture = texture_from_resource(resource); sub_resource_idx = view->sub_resource_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_validate_location(texture, sub_resource_idx, location); }

1 0

Henri Verbeet : wined3d: Introduce a context function to bind a buffer object.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 49da36a501723fa8b4f2a12c50e65e551090bb45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49da36a501723fa8b4f2a12c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 19 23:40:53 2017 +0200 wined3d: Introduce a context function to bind a buffer object. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 7 +------ dlls/wined3d/context.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 52cdc67..6e1ecb0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,12 +135,7 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; - - if (buffer->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER) - context_invalidate_state(context, STATE_INDEXBUFFER); - - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + context_bind_bo(context, buffer->buffer_type_hint, buffer->buffer_object); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4d1c2a8..3e5e1d0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2510,6 +2510,16 @@ void context_active_texture(struct wined3d_context *context, const struct wined3 context->active_texture = unit; } +void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (binding == GL_ELEMENT_ARRAY_BUFFER) + context_invalidate_state(context, STATE_INDEXBUFFER); + + GL_EXTCALL(glBindBuffer(binding, name)); +} + void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 578060a..b5d2907 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1945,6 +1945,7 @@ void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target struct wined3d_surface *render_target, struct wined3d_surface *depth_stencil, DWORD location) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; +void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN;

1 0

Owen Rudge : wsdapi: Implement RegisterNotificationSink and UnRegisterNotificationSink.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 44048e06ba7e08036e9a3e01684344223cb0a26a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44048e06ba7e08036e9a3e016… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Apr 18 20:40:38 2017 +0100 wsdapi: Implement RegisterNotificationSink and UnRegisterNotificationSink. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index a3d7b9b..ea0f34b 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -26,17 +26,25 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wine/list.h" #include "objbase.h" #include "guiddef.h" #include "wsdapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); +struct notificationSink +{ + struct list entry; + IWSDiscoveryPublisherNotify *notificationSink; +}; + typedef struct IWSDiscoveryPublisherImpl { IWSDiscoveryPublisher IWSDiscoveryPublisher_iface; LONG ref; IWSDXMLContext *xmlContext; DWORD addressFamily; + struct list notificationSinks; } IWSDiscoveryPublisherImpl; static inline IWSDiscoveryPublisherImpl *impl_from_IWSDiscoveryPublisher(IWSDiscoveryPublisher *iface) @@ -86,6 +94,7 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa { IWSDiscoveryPublisherImpl *This = impl_from_IWSDiscoveryPublisher(iface); ULONG ref = InterlockedDecrement(&This->ref); + struct notificationSink *sink, *cursor; TRACE("(%p) ref=%d\n", This, ref); @@ -95,6 +104,15 @@ static ULONG WINAPI IWSDiscoveryPublisherImpl_Release(IWSDiscoveryPublisher *ifa { IWSDXMLContext_Release(This->xmlContext); } + + LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &This->notificationSinks, struct notificationSink, entry) + { + IWSDiscoveryPublisherNotify_Release(sink->notificationSink); + list_remove(&sink->entry); + HeapFree(GetProcessHeap(), 0, sink); + } + + HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -125,14 +143,57 @@ static HRESULT WINAPI IWSDiscoveryPublisherImpl_SetAddressFamily(IWSDiscoveryPub static HRESULT WINAPI IWSDiscoveryPublisherImpl_RegisterNotificationSink(IWSDiscoveryPublisher *This, IWSDiscoveryPublisherNotify *pSink) { - FIXME("(%p, %p)\n", This, pSink); - return E_NOTIMPL; + IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); + struct notificationSink *sink; + + TRACE("(%p, %p)\n", This, pSink); + + if (pSink == NULL) + { + return E_INVALIDARG; + } + + sink = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sink)); + + if (!sink) + { + return E_OUTOFMEMORY; + } + + sink->notificationSink = pSink; + IWSDiscoveryPublisherNotify_AddRef(pSink); + + list_add_tail(&impl->notificationSinks, &sink->entry); + + return S_OK; } static HRESULT WINAPI IWSDiscoveryPublisherImpl_UnRegisterNotificationSink(IWSDiscoveryPublisher *This, IWSDiscoveryPublisherNotify *pSink) { - FIXME("(%p, %p)\n", This, pSink); - return E_NOTIMPL; + IWSDiscoveryPublisherImpl *impl = impl_from_IWSDiscoveryPublisher(This); + struct notificationSink *sink; + + TRACE("(%p, %p)\n", This, pSink); + + if (pSink == NULL) + { + return E_INVALIDARG; + } + + LIST_FOR_EACH_ENTRY(sink, &impl->notificationSinks, struct notificationSink, entry) + { + if (sink->notificationSink == pSink) + { + IWSDiscoveryPublisherNotify_Release(pSink); + list_remove(&sink->entry); + HeapFree(GetProcessHeap(), 0, sink); + + return S_OK; + } + } + + /* Notification sink is not registered */ + return E_FAIL; } static HRESULT WINAPI IWSDiscoveryPublisherImpl_Publish(IWSDiscoveryPublisher *This, LPCWSTR pszId, ULONGLONG ullMetadataVersion, ULONGLONG ullInstanceId, @@ -306,6 +367,8 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover IWSDXMLContext_AddRef(pContext); } + list_init(&obj->notificationSinks); + *ppPublisher = &obj->IWSDiscoveryPublisher_iface; TRACE("Returning iface %p\n", *ppPublisher);

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

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 : 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

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