wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

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

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

Ken Thomases : secur32: Add support for the cipher suites using pre-shared keys (PSK) added by the 10.9 SDK.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: db3a723887dfd9be47b06eb723727d7fbe2a9902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3a723887dfd9be47b06eb72… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 19 16:37:26 2017 -0500 secur32: Add support for the cipher suites using pre-shared keys (PSK) added by the 10.9 SDK. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 84 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index 2ed12d6..2c5896a 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -142,6 +142,45 @@ enum { }; #endif +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1090 +/* Defined in <Security/CipherSuite.h> in the 10.9 SDK or later. */ +enum { + TLS_PSK_WITH_RC4_128_SHA = 0x008A, + TLS_PSK_WITH_3DES_EDE_CBC_SHA = 0x008B, + TLS_PSK_WITH_AES_128_CBC_SHA = 0x008C, + TLS_PSK_WITH_AES_256_CBC_SHA = 0x008D, + TLS_DHE_PSK_WITH_RC4_128_SHA = 0x008E, + TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA = 0x008F, + TLS_DHE_PSK_WITH_AES_128_CBC_SHA = 0x0090, + TLS_DHE_PSK_WITH_AES_256_CBC_SHA = 0x0091, + TLS_RSA_PSK_WITH_RC4_128_SHA = 0x0092, + TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA = 0x0093, + TLS_RSA_PSK_WITH_AES_128_CBC_SHA = 0x0094, + TLS_RSA_PSK_WITH_AES_256_CBC_SHA = 0x0095, + TLS_PSK_WITH_NULL_SHA = 0x002C, + TLS_DHE_PSK_WITH_NULL_SHA = 0x002D, + TLS_RSA_PSK_WITH_NULL_SHA = 0x002E, + TLS_PSK_WITH_AES_128_GCM_SHA256 = 0x00A8, + TLS_PSK_WITH_AES_256_GCM_SHA384 = 0x00A9, + TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 = 0x00AA, + TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 = 0x00AB, + TLS_RSA_PSK_WITH_AES_128_GCM_SHA256 = 0x00AC, + TLS_RSA_PSK_WITH_AES_256_GCM_SHA384 = 0x00AD, + TLS_PSK_WITH_AES_128_CBC_SHA256 = 0x00AE, + TLS_PSK_WITH_AES_256_CBC_SHA384 = 0x00AF, + TLS_PSK_WITH_NULL_SHA256 = 0x00B0, + TLS_PSK_WITH_NULL_SHA384 = 0x00B1, + TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 = 0x00B2, + TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 = 0x00B3, + TLS_DHE_PSK_WITH_NULL_SHA256 = 0x00B4, + TLS_DHE_PSK_WITH_NULL_SHA384 = 0x00B5, + TLS_RSA_PSK_WITH_AES_128_CBC_SHA256 = 0x00B6, + TLS_RSA_PSK_WITH_AES_256_CBC_SHA384 = 0x00B7, + TLS_RSA_PSK_WITH_NULL_SHA256 = 0x00B8, + TLS_RSA_PSK_WITH_NULL_SHA384 = 0x00B9, +}; +#endif + struct mac_session { SSLContextRef context; @@ -163,6 +202,7 @@ enum { schan_kx_DH_RSA, schan_kx_DHE_DSS_EXPORT, schan_kx_DHE_DSS, + schan_kx_DHE_PSK, schan_kx_DHE_RSA_EXPORT, schan_kx_DHE_RSA, schan_kx_ECDH_anon, @@ -172,7 +212,9 @@ enum { schan_kx_ECDHE_RSA, schan_kx_FORTEZZA_DMS, schan_kx_NULL, + schan_kx_PSK, schan_kx_RSA_EXPORT, + schan_kx_RSA_PSK, schan_kx_RSA, }; @@ -309,6 +351,23 @@ static const struct cipher_suite cipher_suites[] = { CIPHER_SUITE(TLS, DH_anon, 3DES_EDE_CBC, SHA), CIPHER_SUITE(TLS, DH_anon, AES_128_CBC, SHA256), CIPHER_SUITE(TLS, DH_anon, AES_256_CBC, SHA256), + + CIPHER_SUITE(TLS, PSK, RC4_128, SHA), + CIPHER_SUITE(TLS, PSK, 3DES_EDE_CBC, SHA), + CIPHER_SUITE(TLS, PSK, AES_128_CBC, SHA), + CIPHER_SUITE(TLS, PSK, AES_256_CBC, SHA), + CIPHER_SUITE(TLS, DHE_PSK, RC4_128, SHA), + CIPHER_SUITE(TLS, DHE_PSK, 3DES_EDE_CBC, SHA), + CIPHER_SUITE(TLS, DHE_PSK, AES_128_CBC, SHA), + CIPHER_SUITE(TLS, DHE_PSK, AES_256_CBC, SHA), + CIPHER_SUITE(TLS, RSA_PSK, RC4_128, SHA), + CIPHER_SUITE(TLS, RSA_PSK, 3DES_EDE_CBC, SHA), + CIPHER_SUITE(TLS, RSA_PSK, AES_128_CBC, SHA), + CIPHER_SUITE(TLS, RSA_PSK, AES_256_CBC, SHA), + CIPHER_SUITE(TLS, PSK, NULL, SHA), + CIPHER_SUITE(TLS, DHE_PSK, NULL, SHA), + CIPHER_SUITE(TLS, RSA_PSK, NULL, SHA), + CIPHER_SUITE(TLS, RSA, AES_128_GCM, SHA256), CIPHER_SUITE(TLS, RSA, AES_256_GCM, SHA384), CIPHER_SUITE(TLS, DHE_RSA, AES_128_GCM, SHA256), @@ -321,6 +380,26 @@ static const struct cipher_suite cipher_suites[] = { CIPHER_SUITE(TLS, DH_DSS, AES_256_GCM, SHA384), CIPHER_SUITE(TLS, DH_anon, AES_128_GCM, SHA256), CIPHER_SUITE(TLS, DH_anon, AES_256_GCM, SHA384), + + CIPHER_SUITE(TLS, PSK, AES_128_GCM, SHA256), + CIPHER_SUITE(TLS, PSK, AES_256_GCM, SHA384), + CIPHER_SUITE(TLS, DHE_PSK, AES_128_GCM, SHA256), + CIPHER_SUITE(TLS, DHE_PSK, AES_256_GCM, SHA384), + CIPHER_SUITE(TLS, RSA_PSK, AES_128_GCM, SHA256), + CIPHER_SUITE(TLS, RSA_PSK, AES_256_GCM, SHA384), + CIPHER_SUITE(TLS, PSK, AES_128_CBC, SHA256), + CIPHER_SUITE(TLS, PSK, AES_256_CBC, SHA384), + CIPHER_SUITE(TLS, PSK, NULL, SHA256), + CIPHER_SUITE(TLS, PSK, NULL, SHA384), + CIPHER_SUITE(TLS, DHE_PSK, AES_128_CBC, SHA256), + CIPHER_SUITE(TLS, DHE_PSK, AES_256_CBC, SHA384), + CIPHER_SUITE(TLS, DHE_PSK, NULL, SHA256), + CIPHER_SUITE(TLS, DHE_PSK, NULL, SHA384), + CIPHER_SUITE(TLS, RSA_PSK, AES_128_CBC, SHA256), + CIPHER_SUITE(TLS, RSA_PSK, AES_256_CBC, SHA384), + CIPHER_SUITE(TLS, RSA_PSK, NULL, SHA256), + CIPHER_SUITE(TLS, RSA_PSK, NULL, SHA384), + CIPHER_SUITE(TLS, ECDHE_ECDSA, AES_128_CBC, SHA256), CIPHER_SUITE(TLS, ECDHE_ECDSA, AES_256_CBC, SHA384), CIPHER_SUITE(TLS, ECDH_ECDSA, AES_128_CBC, SHA256), @@ -492,6 +571,7 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) { case schan_kx_DHE_DSS_EXPORT: case schan_kx_DHE_DSS: + case schan_kx_DHE_PSK: case schan_kx_DHE_RSA_EXPORT: case schan_kx_DHE_RSA: return CALG_DH_EPHEM; case schan_kx_ECDH_anon: @@ -501,7 +581,8 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_ECDHE_RSA: return CALG_ECDH_EPHEM; case schan_kx_NULL: return 0; case schan_kx_RSA: - case schan_kx_RSA_EXPORT: return CALG_RSA_KEYX; + case schan_kx_RSA_EXPORT: + case schan_kx_RSA_PSK: return CALG_RSA_KEYX; case schan_kx_DH_anon_EXPORT: case schan_kx_DH_anon: @@ -510,6 +591,7 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_DH_RSA_EXPORT: case schan_kx_DH_RSA: case schan_kx_FORTEZZA_DMS: + case schan_kx_PSK: FIXME("Don't know CALG for key exchange algorithm %d for cipher suite %#x, returning 0\n", c->kx_alg, (unsigned)c->suite); return 0;

1 0

Henri Verbeet : wined3d: Use the CPU blitter for clearing textures that are current in the map binding.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: b7140a212df1d683611aefd9ddc375581c6c9c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7140a212df1d683611aefd9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 19 23:40:49 2017 +0200 wined3d: Use the CPU blitter for clearing textures that are current in the map binding. In order to avoid bouncing them between the CPU and GPU. This fixes a regression instroduced by commit 381cd03eb3860f4b963af9b37cc3258b3f45d17d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2ba8060..91db892 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2538,6 +2538,22 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } +static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) +{ + struct wined3d_resource *resource; + struct wined3d_texture *texture; + + resource = view->resource; + if (resource->type == WINED3D_RTYPE_BUFFER) + return FALSE; + + texture = texture_from_resource(resource); + if (!(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM)) + return FALSE; + + return texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding; +} + static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) @@ -2558,6 +2574,10 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (resource->pool == WINED3D_POOL_SYSTEM_MEM) goto next; + if (!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + && ffp_blitter_use_cpu_clear(view)) + goto next; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!((view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)

1 0

Henri Verbeet : wined3d: Avoid unmapping the module while the CS thread is still running.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: b5d225e4524adc90197ae152946537226965124f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d225e4524adc90197ae1529… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 19 23:40:50 2017 +0200 wined3d: Avoid unmapping the module while the CS thread is still running. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 43352eb..a579503 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2451,7 +2451,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) queue->tail = queue->head = 0; TRACE("Stopped.\n"); - return 0; + FreeLibraryAndExitThread(cs->wined3d_module, 0); } struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) @@ -2490,9 +2490,19 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) goto fail; } + if (!(GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, + (const WCHAR *)wined3d_cs_run, &cs->wined3d_module))) + { + ERR("Failed to get wined3d module handle.\n"); + CloseHandle(cs->event); + HeapFree(GetProcessHeap(), 0, cs->data); + goto fail; + } + if (!(cs->thread = CreateThread(NULL, 0, wined3d_cs_run, cs, 0, NULL))) { ERR("Failed to create wined3d command stream thread.\n"); + FreeLibrary(cs->wined3d_module); CloseHandle(cs->event); HeapFree(GetProcessHeap(), 0, cs->data); goto fail; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cd90eb8..578060a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3253,6 +3253,7 @@ struct wined3d_cs struct wined3d_device *device; struct wined3d_fb_state fb; struct wined3d_state state; + HMODULE wined3d_module; HANDLE thread; DWORD thread_id;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_memory() in surface_cpu_blt().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: ee17d7ba1b72b26baae90c1d5e2ae5b3e4721654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee17d7ba1b72b26baae90c1d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 19 23:40:51 2017 +0200 wined3d: Use wined3d_texture_get_memory() in surface_cpu_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 59 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 91db892..6d9d1b8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2872,13 +2872,19 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int enum wined3d_texture_filter_type filter) { unsigned int bpp, src_height, src_width, dst_height, dst_width, row_byte_count; + struct wined3d_device *device = dst_texture->resource.device; const struct wined3d_format *src_format, *dst_format; struct wined3d_texture *converted_texture = NULL; + const struct wined3d_gl_info *gl_info = NULL; + struct wined3d_bo_address src_data, dst_data; unsigned int src_fmt_flags, dst_fmt_flags; struct wined3d_map_desc dst_map, src_map; + struct wined3d_context *context = NULL; unsigned int x, sx, xinc, y, sy, yinc; + unsigned int texture_level; HRESULT hr = WINED3D_OK; BOOL same_sub_resource; + DWORD map_binding; const BYTE *sbase; const BYTE *sbuf; BYTE *dbuf; @@ -2888,10 +2894,26 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int dst_texture, dst_sub_resource_idx, debug_box(dst_box), src_texture, src_sub_resource_idx, debug_box(src_box), flags, fx, debug_d3dtexturefiltertype(filter)); + if (device->d3d_initialized) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + } + if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) { same_sub_resource = TRUE; - wined3d_resource_map(&dst_texture->resource, dst_sub_resource_idx, &dst_map, NULL, 0); + + map_binding = dst_texture->resource.map_binding; + texture_level = dst_sub_resource_idx % dst_texture->level_count; + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); + wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + dst_map.data = wined3d_texture_map_bo_address(&dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, + gl_info, GL_PIXEL_UNPACK_BUFFER, 0); + src_map = dst_map; src_format = dst_texture->resource.format; dst_format = src_format; @@ -2914,11 +2936,27 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_texture = converted_texture; src_sub_resource_idx = 0; } - wined3d_resource_map(&src_texture->resource, src_sub_resource_idx, &src_map, NULL, WINED3D_MAP_READONLY); src_format = src_texture->resource.format; src_fmt_flags = src_texture->resource.format_flags; - wined3d_resource_map(&dst_texture->resource, dst_sub_resource_idx, &dst_map, dst_box, 0); + map_binding = src_texture->resource.map_binding; + texture_level = src_sub_resource_idx % src_texture->level_count; + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, map_binding)) + ERR("Failed to load the source sub-resource into %s.\n", wined3d_debug_location(map_binding)); + wined3d_texture_get_pitch(src_texture, texture_level, &src_map.row_pitch, &src_map.slice_pitch); + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &src_data, map_binding); + src_map.data = wined3d_texture_map_bo_address(&src_data, src_texture->sub_resources[src_sub_resource_idx].size, + gl_info, GL_PIXEL_UNPACK_BUFFER, 0); + + map_binding = dst_texture->resource.map_binding; + texture_level = dst_sub_resource_idx % dst_texture->level_count; + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); + wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + dst_map.data = wined3d_texture_map_bo_address(&dst_data, dst_texture->sub_resources[dst_sub_resource_idx].size, + gl_info, GL_PIXEL_UNPACK_BUFFER, 0); } bpp = dst_format->byte_count; @@ -2931,12 +2969,9 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int sbase = (BYTE *)src_map.data + ((src_box->top / src_format->block_height) * src_map.row_pitch) + ((src_box->left / src_format->block_width) * src_format->block_byte_count); - if (same_sub_resource) - dbuf = (BYTE *)dst_map.data - + ((dst_box->top / dst_format->block_height) * dst_map.row_pitch) - + ((dst_box->left / dst_format->block_width) * dst_format->block_byte_count); - else - dbuf = dst_map.data; + dbuf = (BYTE *)dst_map.data + + ((dst_box->top / dst_format->block_height) * dst_map.row_pitch) + + ((dst_box->left / dst_format->block_width) * dst_format->block_byte_count); if (src_fmt_flags & dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS) { @@ -3296,11 +3331,13 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_resource_unmap(&dst_texture->resource, dst_sub_resource_idx); + wined3d_texture_unmap_bo_address(&dst_data, gl_info, GL_PIXEL_UNPACK_BUFFER); if (!same_sub_resource) - wined3d_resource_unmap(&src_texture->resource, src_sub_resource_idx); + wined3d_texture_unmap_bo_address(&src_data, gl_info, GL_PIXEL_UNPACK_BUFFER); if (converted_texture) wined3d_texture_decref(converted_texture); + if (context) + context_release(context); return hr; }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_get_memory() in surface_cpu_blt_colour_fill().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: da321cebf7b077a619aeca7d8c4bc28068c163e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da321cebf7b077a619aeca7d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 19 23:40:52 2017 +0200 wined3d: Use wined3d_texture_get_memory() in surface_cpu_blt_colour_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6d9d1b8..f2fbf21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3345,8 +3345,14 @@ release: static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, const struct wined3d_box *box, const struct wined3d_color *colour) { + struct wined3d_device *device = view->resource->device; + const struct wined3d_gl_info *gl_info = NULL; + struct wined3d_context *context = NULL; + struct wined3d_texture *texture; + struct wined3d_bo_address data; unsigned int x, y, w, h, bpp; struct wined3d_map_desc map; + DWORD map_binding; BYTE *row; DWORD c; @@ -3358,12 +3364,37 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, return; } + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for buffers.\n"); + return; + } + + if (device->d3d_initialized) + { + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + } + c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; w = box->right - box->left; h = box->bottom - box->top; - wined3d_resource_map(view->resource, view->sub_resource_idx, &map, box, 0); + texture = texture_from_resource(view->resource); + map_binding = texture->resource.map_binding; + if (!wined3d_texture_load_location(texture, view->sub_resource_idx, context, map_binding)) + ERR("Failed to load the sub-resource into %s.\n", wined3d_debug_location(map_binding)); + wined3d_texture_invalidate_location(texture, view->sub_resource_idx, ~map_binding); + wined3d_texture_get_pitch(texture, view->sub_resource_idx % texture->level_count, + &map.row_pitch, &map.slice_pitch); + wined3d_texture_get_memory(texture, view->sub_resource_idx, &data, map_binding); + map.data = wined3d_texture_map_bo_address(&data, texture->sub_resources[view->sub_resource_idx].size, + gl_info, GL_PIXEL_UNPACK_BUFFER, 0); + map.data = (BYTE *)map.data + + (box->front * map.slice_pitch) + + ((box->top / view->format->block_height) * map.row_pitch) + + ((box->left / view->format->block_width) * view->format->block_byte_count); switch (bpp) { @@ -3411,7 +3442,10 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, row += map.row_pitch; memcpy(row, map.data, w * bpp); } - wined3d_resource_unmap(view->resource, view->sub_resource_idx); + + wined3d_texture_unmap_bo_address(&data, gl_info, GL_PIXEL_UNPACK_BUFFER); + if (context) + context_release(context); } static void cpu_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,

1 0

Ken Thomases : secur32: Return CALG_ECDH_EPHEM as the key exchange algorithm ID for the internal schan_kx_ECDHE_* values.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 46ff5d34b99f56e9271cf8a5bd7f76c0f133d034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ff5d34b99f56e9271cf8a5b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 19 16:37:25 2017 -0500 secur32: Return CALG_ECDH_EPHEM as the key exchange algorithm ID for the internal schan_kx_ECDHE_* values. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index fdfa48e..2ed12d6 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -496,9 +496,9 @@ static ALG_ID schan_get_kx_algid(const struct cipher_suite* c) case schan_kx_DHE_RSA: return CALG_DH_EPHEM; case schan_kx_ECDH_anon: case schan_kx_ECDH_ECDSA: - case schan_kx_ECDH_RSA: + case schan_kx_ECDH_RSA: return CALG_ECDH; case schan_kx_ECDHE_ECDSA: - case schan_kx_ECDHE_RSA: return CALG_ECDH; + case schan_kx_ECDHE_RSA: return CALG_ECDH_EPHEM; case schan_kx_NULL: return 0; case schan_kx_RSA: case schan_kx_RSA_EXPORT: return CALG_RSA_KEYX;

1 0

Alexandre Julliard : Wine release 2.0.1
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: website Branch: master Commit: 89cfd81a4627fc692ee299b50ef65f845d55ce3c URL: http://source.winehq.org/git/website.git/?a=commit;h=89cfd81a4627fc692ee299… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 19:35:21 2017 +0200 Wine release 2.0.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017042001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2017042001.xml b/news/en/2017042001.xml new file mode 100644 index 0000000..112f528 --- /dev/null +++ b/news/en/2017042001.xml @@ -0,0 +1,13 @@ +<news> +<date>April 20, 2017</date> +<title>Wine 2.0.1 Released</title> +<body> + The Wine maintenance release 2.0.1 is now available. + <a href="{$root}/announce/2.0.1">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>Deprecated tools/wineinstall</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.0.1 : Alexandre Julliard : Release 2.0.1
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: refs/tags/wine-2.0.1 Tag: 7be0d76a0b5631249caf6b65c468d3707bbd8cdb URL: http://source.winehq.org/git/wine.git/?a=tag;h=7be0d76a0b5631249caf6b65c468… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 19:32:33 2017 +0200 Release 2.0.1

1 0

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