January 2017 - Wine-Commits

Austin English : rstrtmgr: Add RmShutdown stub.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: f0555c5ebc277d43089769e3568b1315d2fce852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0555c5ebc277d43089769e35… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 28 02:18:13 2016 -0600 rstrtmgr: Add RmShutdown stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 9 +++++++++ dlls/rstrtmgr/rstrtmgr.spec | 2 +- include/restartmanager.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 2d45639..5c9a8dc 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -100,3 +100,12 @@ DWORD WINAPI RmEndSession(DWORD handle) FIXME("%u stub!\n", handle); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RmShutdown (rstrtmgr.@) + */ +DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) +{ + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index 0e1ba79..6c6a9c9 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -8,5 +8,5 @@ @ stub RmRemoveFilter @ stub RmReserveHeap @ stdcall RmRestart(long long ptr) -@ stub RmShutdown +@ stdcall RmShutdown(long long ptr) @ stdcall RmStartSession(ptr long ptr) diff --git a/include/restartmanager.h b/include/restartmanager.h index 27c1a92..9ee066d 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -64,6 +64,8 @@ typedef struct { BOOL bRestartable; } RM_PROCESS_INFO, *PRM_PROCESS_INFO; +typedef void (CDECL *RM_WRITE_STATUS_CALLBACK)(UINT); + #ifdef __cplusplus } #endif

1 0

Huw Davies : usp10/tests: Reorder the todo and broken arrays to match the order of the expected values.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 427caff915cc6ade6e240601da6156fac298c13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=427caff915cc6ade6e240601d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:23:03 2017 +0000 usp10/tests: Reorder the todo and broken arrays to match the order of the expected values. Also ensure that all elements of the broken arrays are explicitly initialized. This allows many tests to run that were previously incorrectly skipped. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 86 +++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=427caff915cc6ade6e240…

1 0

Huw Davies : urlmon/tests: Allow QueryInterface to accept IUnknown and IInternetProtocolSink.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 7453c835e996e349a5db50533a587c86e911159e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7453c835e996e349a5db50533… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 11:07:59 2017 +0000 urlmon/tests: Allow QueryInterface to accept IUnknown and IInternetProtocolSink. Fixes a crash on modern versions of Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index dad87ed..5981c25 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1110,6 +1110,12 @@ static IInternetProtocolSink protocol_sink = { &protocol_sink_vtbl }; static HRESULT WINAPI MimeProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + *ppv = iface; + return S_OK; + } + ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Józef Kucia : include/d3d11: Add D3D11_BUFFEREX_SRV_FLAG_RAW.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: eb18e57915029fc43805d8c407dde69f7e3fbbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb18e57915029fc43805d8c40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:13:46 2017 +0100 include/d3d11: Add D3D11_BUFFEREX_SRV_FLAG_RAW. 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> --- include/d3d11.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index d2b3836..ad676c7 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -595,6 +595,11 @@ typedef enum D3D11_DSV_FLAG D3D11_DSV_READ_ONLY_STENCIL = 0x2, } D3D11_DSV_FLAG; +typedef enum D3D11_BUFFEREX_SRV_FLAG +{ + D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1, +} D3D11_BUFFEREX_SRV_FLAG; + typedef enum D3D11_UAV_FLAG { D3D11_BUFFER_UAV_FLAG_RAW = 0x1,

1 0

Józef Kucia : wined3d: Create dummy buffer textures.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: e800093706e7b56ae1df73182ec52f906295a975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e800093706e7b56ae1df73182… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:30 2017 +0100 wined3d: Create dummy buffer textures. 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/context.c | 7 +++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 34 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b4e40fd..cd0057e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1545,6 +1545,9 @@ void context_bind_dummy_textures(const struct wined3d_device *device, const stru if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_textures.tex_2d_array); + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("Bind dummy textures"); } } @@ -2443,6 +2446,10 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, device->dummy_textures.tex_3d); checkGLcall("glBindTexture"); break; + case GL_TEXTURE_BUFFER: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("glBindTexture"); + break; default: ERR("Unexpected texture target %#x.\n", old_texture_type); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 75a939e..7898527 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -694,6 +694,29 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glTexImage3D"); } + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + { + GLuint buffer; + + GL_EXTCALL(glGenBuffers(1, &buffer)); + GL_EXTCALL(glBindBuffer(GL_TEXTURE_BUFFER, buffer)); + GL_EXTCALL(glBufferData(GL_TEXTURE_BUFFER, sizeof(color), &color, GL_STATIC_DRAW)); + GL_EXTCALL(glBindBuffer(GL_TEXTURE_BUFFER, 0)); + checkGLcall("Create buffer object"); + + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_textures.tex_buffer); + checkGLcall("glGenTextures"); + TRACE("Dummy buffer texture given name %u.\n", device->dummy_textures.tex_buffer); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, device->dummy_textures.tex_buffer); + checkGLcall("glBindTexture"); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA8, buffer)); + checkGLcall("glTexBuffer"); + + GL_EXTCALL(glDeleteBuffers(1, &buffer)); + checkGLcall("glDeleteBuffers"); + } + context_bind_dummy_textures(device, context); } @@ -702,6 +725,9 @@ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d { const struct wined3d_gl_info *gl_info = context->gl_info; + if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_buffer); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->dummy_textures.tex_2d_array); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ee9d5c..5c94803 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2587,6 +2587,7 @@ struct wined3d_device GLuint tex_3d; GLuint tex_cube; GLuint tex_2d_array; + GLuint tex_buffer; } dummy_textures; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */

1 0

Józef Kucia : wined3d: Add initial support for shader buffer views.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 81878178303ed52a18330fdb668c7d1dc1c02ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=81878178303ed52a18330fdb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:31 2017 +0100 wined3d: Add initial support for shader buffer views. 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/buffer.c | 2 +- dlls/wined3d/view.c | 51 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6883b40..7d0552b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -567,7 +567,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, } } -static BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 18b7180..c63d913 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -121,6 +121,35 @@ static void create_texture_view(struct wined3d_gl_view *view, GLenum view_target context_release(context); } +static void create_buffer_texture(struct wined3d_gl_view *view, + struct wined3d_buffer *buffer, const struct wined3d_format *view_format) +{ + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(buffer->resource.device, NULL); + gl_info = context->gl_info; + if (!gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + { + FIXME("OpenGL implementation does not support buffer textures.\n"); + context_release(context); + return; + } + + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + + view->target = GL_TEXTURE_BUFFER; + gl_info->gl_ops.gl.p_glGenTextures(1, &view->name); + + context_bind_texture(context, GL_TEXTURE_BUFFER, view->name); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format->glInternal, buffer->buffer_object)); + checkGLcall("Create buffer texture"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + + context_release(context); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -415,7 +444,27 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->type == WINED3D_RTYPE_BUFFER) { - FIXME("Buffer shader resource views not supported.\n"); + struct wined3d_buffer *buffer = buffer_from_resource(resource); + + if (desc->format_id == WINED3DFMT_UNKNOWN) + { + FIXME("Structured buffer views not supported.\n"); + } + else if (desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + FIXME("Raw buffer views not supported.\n"); + } + else + { + /* FIXME: Support for buffer offsets can be implemented using ARB_texture_buffer_range. */ + if (desc->u.buffer.start_idx + || desc->u.buffer.count * view_format->byte_count != buffer->resource.size) + { + FIXME("Ignoring buffer range %u-%u.\n", desc->u.buffer.start_idx, desc->u.buffer.count); + } + + create_buffer_texture(&view->gl_view, buffer, view_format); + } } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5c94803..051836c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3256,6 +3256,8 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, + struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr100: Add reader_writer_lock implementation.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: a9c215cee3fee0df604c993e5ced26d4d525c7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c215cee3fee0df604c993e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 26 17:30:30 2017 +0100 msvcr100: Add reader_writer_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 170 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 0aa1f1f..8c1061a 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -746,7 +746,17 @@ typedef struct DEFINE_THISCALL_WRAPPER(reader_writer_lock_ctor, 4) reader_writer_lock* __thiscall reader_writer_lock_ctor(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if (!keyed_event) { + HANDLE event; + + NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); + if (InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) + NtClose(event); + } + + memset(this, 0, sizeof(*this)); return this; } @@ -755,7 +765,42 @@ reader_writer_lock* __thiscall reader_writer_lock_ctor(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_dtor, 4) void __thiscall reader_writer_lock_dtor(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if (this->thread_id != 0 || this->count) + WARN("destroying locked reader_writer_lock\n"); +} + +static inline void spin_wait_for_next_rwl(rwl_queue *q) +{ + SpinWait sw; + + if(q->next) return; + + SpinWait_ctor(&sw, &spin_wait_yield); + SpinWait__Reset(&sw); + while(!q->next) + SpinWait__SpinOnce(&sw); + SpinWait_dtor(&sw); +} + +/* Remove when proper InterlockedOr implementation is added to wine */ +static LONG InterlockedOr(LONG *d, LONG v) +{ + LONG l; + while (~(l = *d) & v) + if (InterlockedCompareExchange(d, l|v, l) == l) break; + return l; +} + +static LONG InterlockedAnd(LONG *d, LONG v) +{ + LONG l = *d, old; + while ((l & v) != l) { + if((old = InterlockedCompareExchange(d, l&v, l)) == l) break; + l = old; + } + return l; } /* ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ */ @@ -763,7 +808,30 @@ void __thiscall reader_writer_lock_dtor(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock, 4) void __thiscall reader_writer_lock_lock(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + rwl_queue q = { NULL }, *last; + + TRACE("(%p)\n", this); + + if (this->thread_id == GetCurrentThreadId()) + FIXME("throw improper_lock exception\n"); + + last = InterlockedExchangePointer((void**)&this->writer_tail, &q); + if (last) { + last->next = &q; + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } else { + this->writer_head = &q; + if (InterlockedOr(&this->count, WRITER_WAITING)) + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } + + this->thread_id = GetCurrentThreadId(); + this->writer_head = &this->active; + this->active.next = NULL; + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &this->active, &q) != &q) { + spin_wait_for_next_rwl(&q); + this->active.next = q.next; + } } /* ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ */ @@ -771,7 +839,37 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock_read, 4) void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + rwl_queue q; + + TRACE("(%p)\n", this); + + if (this->thread_id == GetCurrentThreadId()) + FIXME("throw improper_lock exception\n"); + + do { + q.next = this->reader_head; + } while(InterlockedCompareExchangePointer((void**)&this->reader_head, &q, q.next) != q.next); + + if (!q.next) { + rwl_queue *head; + LONG count; + + while (!((count = this->count) & WRITER_WAITING)) + if (InterlockedCompareExchange(&this->count, count+1, count) == count) break; + + if (count & WRITER_WAITING) + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + + head = InterlockedExchangePointer((void**)&this->reader_head, NULL); + while(head && head != &q) { + rwl_queue *next = head->next; + InterlockedIncrement(&this->count); + NtReleaseKeyedEvent(keyed_event, head, 0, NULL); + head = next; + } + } else { + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } } /* ?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ */ @@ -779,7 +877,37 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_try_lock, 4) MSVCRT_bool __thiscall reader_writer_lock_try_lock(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + rwl_queue q = { NULL }; + + TRACE("(%p)\n", this); + + if (this->thread_id == GetCurrentThreadId()) + FIXME("throw improper_lock exception\n"); + + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &q, NULL)) + return FALSE; + this->writer_head = &q; + if (!InterlockedCompareExchange(&this->count, WRITER_WAITING, 0)) { + this->thread_id = GetCurrentThreadId(); + this->writer_head = &this->active; + this->active.next = NULL; + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &this->active, &q) != &q) { + spin_wait_for_next_rwl(&q); + this->active.next = q.next; + } + return TRUE; + } + + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, NULL, &q) == &q) + return FALSE; + spin_wait_for_next_rwl(&q); + this->writer_head = q.next; + if (!InterlockedOr(&this->count, WRITER_WAITING)) { + this->thread_id = GetCurrentThreadId(); + this->writer_head = &this->active; + this->active.next = q.next; + return TRUE; + } return FALSE; } @@ -788,7 +916,12 @@ MSVCRT_bool __thiscall reader_writer_lock_try_lock(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_try_lock_read, 4) MSVCRT_bool __thiscall reader_writer_lock_try_lock_read(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + LONG count; + + TRACE("(%p)\n", this); + + while (!((count = this->count) & WRITER_WAITING)) + if (InterlockedCompareExchange(&this->count, count+1, count) == count) return TRUE; return FALSE; } @@ -797,7 +930,37 @@ MSVCRT_bool __thiscall reader_writer_lock_try_lock_read(reader_writer_lock *this DEFINE_THISCALL_WRAPPER(reader_writer_lock_unlock, 4) void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + LONG count; + rwl_queue *head, *next; + + TRACE("(%p)\n", this); + + if ((count = this->count) & ~WRITER_WAITING) { + count = InterlockedDecrement(&this->count); + if (count != WRITER_WAITING) + return; + NtReleaseKeyedEvent(keyed_event, this->writer_head, 0, NULL); + return; + } + + this->thread_id = 0; + next = this->writer_head->next; + if (next) { + NtReleaseKeyedEvent(keyed_event, next, 0, NULL); + return; + } + InterlockedAnd(&this->count, ~WRITER_WAITING); + head = InterlockedExchangePointer((void**)&this->reader_head, NULL); + while (head) { + next = head->next; + InterlockedIncrement(&this->count); + NtReleaseKeyedEvent(keyed_event, head, 0, NULL); + head = next; + } + + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, NULL, this->writer_head) == this->writer_head) + return; + InterlockedOr(&this->count, WRITER_WAITING); } #endif

1 0

Louis Lenders : oledb32: Add version resource.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 239653ea12a9157e39125062e46303640c6ef8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=239653ea12a9157e39125062e… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Jan 22 17:07:26 2017 +0100 oledb32: Add version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/Makefile.in | 2 ++ dlls/oledb32/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index 0fcb4e4..a32e9b1 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -13,3 +13,5 @@ IDL_SRCS = \ convert.idl \ oledb32_classes.idl \ oledb32_typelib.idl + +RC_SRCS = version.rc diff --git a/dlls/oledb32/version.rc b/dlls/oledb32/version.rc new file mode 100644 index 0000000..e082acc --- /dev/null +++ b/dlls/oledb32/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine oledb" +#define WINE_FILENAME_STR "oledb32.dll" +#define WINE_FILEVERSION 2,81,1117,0 +#define WINE_FILEVERSION_STR "2.81.1117.0" +#define WINE_PRODUCTVERSION 2,81,1117,0 +#define WINE_PRODUCTVERSION_STR "2.81.1117.0" + +#include "wine/wine_common_ver.rc"

1 0

Austin English : mf3216: Add stub dll.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 45de91966235ca61827ec099ed345ffc43d27e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45de91966235ca61827ec099e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 20:28:31 2017 -0600 mf3216: Add stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/mf3216/Makefile.in | 1 + dlls/mf3216/mf3216.spec | 2 ++ 4 files changed, 6 insertions(+) diff --git a/configure b/configure index 5bfad88..54329a6 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_mciqtz32 enable_mciseq enable_mciwave enable_mf +enable_mf3216 enable_mfplat enable_mfreadwrite enable_mgmtapi @@ -18059,6 +18060,7 @@ wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave wine_fn_config_dll mf enable_mf +wine_fn_config_dll mf3216 enable_mf3216 wine_fn_config_dll mfplat enable_mfplat wine_fn_config_dll mfreadwrite enable_mfreadwrite wine_fn_config_dll mgmtapi enable_mgmtapi diff --git a/configure.ac b/configure.ac index d468bbe..26be5e6 100644 --- a/configure.ac +++ b/configure.ac @@ -3120,6 +3120,7 @@ WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) WINE_CONFIG_DLL(mf) +WINE_CONFIG_DLL(mf3216) WINE_CONFIG_DLL(mfplat) WINE_CONFIG_DLL(mfreadwrite) WINE_CONFIG_DLL(mgmtapi) diff --git a/dlls/mf3216/Makefile.in b/dlls/mf3216/Makefile.in new file mode 100644 index 0000000..bf98f53 --- /dev/null +++ b/dlls/mf3216/Makefile.in @@ -0,0 +1 @@ +MODULE = mf3216.dll diff --git a/dlls/mf3216/mf3216.spec b/dlls/mf3216/mf3216.spec new file mode 100644 index 0000000..b8480af --- /dev/null +++ b/dlls/mf3216/mf3216.spec @@ -0,0 +1,2 @@ +@ stub ConvertEmfToWmf +@ stub Mf3216DllInitialize

1 0

Huw Davies : gdi32: Add the ability to disable a DC.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 0805b0d56750637619529e91c301fb5e94d47564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0805b0d56750637619529e91c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:30:19 2017 +0000 gdi32: Add the ability to disable a DC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 10 ++++++++++ dlls/gdi32/gdi_private.h | 1 + include/wine/gdi_driver.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27e89ae..892d3e9 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -203,6 +203,11 @@ DC *get_dc_ptr( HDC hdc ) { DC *dc = get_dc_obj( hdc ); if (!dc) return NULL; + if (dc->disabled) + { + GDI_ReleaseObj( hdc ); + return NULL; + } if (!InterlockedCompareExchange( &dc->refcount, 1, 0 )) { @@ -1269,6 +1274,11 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) else if (flags & DCHF_VALIDATEVISRGN || !flags) ret = InterlockedExchange( &dc->dirty, 0 ); + if (flags & DCHF_DISABLEDC) + ret = InterlockedExchange( &dc->disabled, 1 ); + else if (flags & DCHF_ENABLEDC) + ret = InterlockedExchange( &dc->disabled, 0 ); + GDI_ReleaseObj( hdc ); if (flags & DCHF_RESETDC) ret = reset_dc_state( hdc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e4633d1..ab3c9bb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -65,6 +65,7 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ + LONG disabled; /* get_dc_ptr() will return NULL. Controlled by DCHF_(DISABLE|ENABLE)DC */ INT saveLevel; struct tagDC *saved_dc; DWORD_PTR dwHookData; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 6f67653..32d17f7 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -266,6 +266,8 @@ static inline ULONG window_surface_release( struct window_surface *surface ) #define DCHF_INVALIDATEVISRGN 0x0001 #define DCHF_VALIDATEVISRGN 0x0002 #define DCHF_RESETDC 0x0004 /* Wine extension */ +#define DCHF_DISABLEDC 0x0008 /* Wine extension */ +#define DCHF_ENABLEDC 0x0010 /* Wine extension */ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);

1 0