June 2019 - Wine-Devel - list.winehq.org

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_bind_dummy_textures().
by Henri Verbeet June 7, 2019

June 7, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1f187f34769..18a516c606e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1759,10 +1759,10 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_context *context) +void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) { - const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context_gl->c.device)->dummy_textures; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int i; for (i = 0; i < gl_info->limits.combined_samplers; ++i) @@ -2279,7 +2279,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (wined3d_device_gl(device)->dummy_textures.tex_2d) - context_bind_dummy_textures(context); + wined3d_context_gl_bind_dummy_textures(context_gl); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ec4022dce6..3acaee6e70b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -803,7 +803,7 @@ static void wined3d_device_gl_create_dummy_textures(struct wined3d_device_gl *de checkGLcall("create dummy textures"); - context_bind_dummy_textures(&context_gl->c); + wined3d_context_gl_bind_dummy_textures(context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6402ec13357..94623580109 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2082,6 +2082,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; +void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; @@ -2238,7 +2239,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_bind_bo().
by Henri Verbeet June 7, 2019

June 7, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 +++- dlls/wined3d/context.c | 21 ++++++++++++--------- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1069d050813..8dc6d4b6a1b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,7 +135,9 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 87445706b32..1f187f34769 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2514,12 +2514,12 @@ void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, context_gl->active_texture = unit; } -void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) +void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (binding == GL_ELEMENT_ARRAY_BUFFER) - context_invalidate_state(context, STATE_INDEXBUFFER); + context_invalidate_state(&context_gl->c, STATE_INDEXBUFFER); GL_EXTCALL(glBindBuffer(binding, name)); } @@ -2591,6 +2591,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen void *context_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *memory; @@ -2598,7 +2599,7 @@ void *context_map_bo_address(struct wined3d_context *context, return data->addr; gl_info = context->gl_info; - context_bind_bo(context, binding, data->buffer_object); + wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { @@ -2611,7 +2612,7 @@ void *context_map_bo_address(struct wined3d_context *context, memory += (INT_PTR)data->addr; } - context_bind_bo(context, binding, 0); + wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Map buffer object"); return memory; @@ -2620,15 +2621,16 @@ void *context_map_bo_address(struct wined3d_context *context, void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; if (!data->buffer_object) return; gl_info = context->gl_info; - context_bind_bo(context, binding, data->buffer_object); + wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); - context_bind_bo(context, binding, 0); + wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("Unmap buffer object"); } @@ -2636,6 +2638,7 @@ void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, const struct wined3d_bo_address *src, GLenum src_binding, size_t size) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info; BYTE *dst_ptr, *src_ptr; @@ -2664,13 +2667,13 @@ void context_copy_bo_address(struct wined3d_context *context, } else if (!dst->buffer_object && src->buffer_object) { - context_bind_bo(context, src_binding, src->buffer_object); + wined3d_context_gl_bind_bo(context_gl, src_binding, src->buffer_object); GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); checkGLcall("buffer download"); } else if (dst->buffer_object && !src->buffer_object) { - context_bind_bo(context, dst_binding, dst->buffer_object); + wined3d_context_gl_bind_bo(context_gl, dst_binding, dst->buffer_object); GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); checkGLcall("buffer upload"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b43dcddcdf2..4456a10a36b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1034,6 +1034,7 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value, struct wined3d_context *context) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format_gl *format; struct wined3d_buffer_gl *buffer_gl; @@ -1067,7 +1068,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); - context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4471e7c2634..6402ec13357 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2081,6 +2081,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; @@ -2237,7 +2238,6 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN; -void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, GLenum dst_binding, -- 2.11.0

1 0

[PATCH 1/5] wined3d: Move the "tid" field from struct wined3d_context to struct wined3d_context_gl.
by Henri Verbeet June 7, 2019

June 7, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e562844194..87445706b32 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1917,7 +1917,6 @@ static void wined3d_context_init(struct wined3d_context *context, struct wined3d context->swapchain = swapchain; context->current_rt.texture = swapchain->front_buffer; context->current_rt.sub_resource_idx = 0; - context->tid = GetCurrentThreadId(); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) @@ -1956,6 +1955,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi gl_info = context->gl_info; d3d_info = context->d3d_info; + context_gl->tid = GetCurrentThreadId(); context_gl->window = context->swapchain->win_handle; if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) { @@ -2324,7 +2324,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) device_context_remove(device, &context_gl->c); - if (context_gl->c.current && context_gl->c.tid != GetCurrentThreadId()) + if (context_gl->c.current && context_gl->tid != GetCurrentThreadId()) { struct wined3d_gl_info *gl_info; @@ -4264,7 +4264,7 @@ struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_g struct wined3d_context *acquired_context; struct wined3d_device *device; - if (!context_gl || context_gl->c.tid != GetCurrentThreadId()) + if (!context_gl || context_gl->tid != GetCurrentThreadId()) return NULL; device = context_gl->c.device; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c18f7304d94..dd9ec123c20 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1126,7 +1126,7 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai for (i = 0; i < swapchain->num_contexts; ++i) { - if (swapchain->context[i]->tid == tid) + if (wined3d_context_gl(swapchain->context[i])->tid == tid) return swapchain->context[i]; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8272a56203b..4471e7c2634 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1900,7 +1900,6 @@ struct wined3d_context struct wined3d_texture *texture; unsigned int sub_resource_idx; } current_rt; - DWORD tid; /* Thread ID which owns this context at the moment */ /* Stores some information about the context state for optimization */ DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ @@ -1967,6 +1966,8 @@ struct wined3d_context_gl { struct wined3d_context c; + DWORD tid; /* Thread ID which owns this context at the moment. */ + uint32_t dc_is_private : 1; uint32_t dc_has_format : 1; /* Only meaningful for private DCs. */ uint32_t fog_enabled : 1; -- 2.11.0

1 0

[PATCH 1/2] user32: Do not call SendMessage() to show a window that is already visible.
by Alexey Prokhin June 7, 2019

June 7, 2019

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- dlls/user32/winpos.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..8e09455e99 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1231,6 +1231,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; + if ((cmd == SW_SHOW) && (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) + return TRUE; + return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } -- 2.17.2 (Apple Git-113)

3 6

[PATCH v2] dinput: Trace reference count in a consistent way
by Alistair Leslie-Hughes June 7, 2019

June 7, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 6 ++++-- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/effect_linuxinput.c | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c9d24a9174..28329d03b5 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1140,7 +1140,7 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) releasing from %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (ref) return ref; @@ -1215,7 +1215,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A ifa ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c02bafad10..0855cb41cd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -528,7 +528,7 @@ static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedIncrement(&This->ref); - TRACE( "(%p) incrementing from %d\n", This, ref - 1); + TRACE( "(%p) ref %d\n", This, ref ); return ref; } @@ -543,7 +543,7 @@ static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "(%p) releasing from %d\n", This, ref + 1 ); + TRACE( "(%p) ref %d\n", This, ref ); if (ref == 0) { diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7477bc757d..4b2f317ce3 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -167,7 +167,9 @@ static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - return InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } static HRESULT WINAPI LinuxInputEffectImpl_Download( @@ -759,6 +761,8 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE( "(%p) ref %d\n", This, ref ); + if (ref == 0) { LinuxInputEffectImpl_Stop(iface); -- 2.17.1

1 0

[PATCH] dinput: Trace reference count in a consistent way
by Alistair Leslie-Hughes June 7, 2019

June 7, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 4 +++- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/effect_linuxinput.c | 6 +++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c9d24a9174..0c75a6ec36 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1215,7 +1215,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A ifa ULONG WINAPI IDirectInputDevice2WImpl_AddRef(LPDIRECTINPUTDEVICE8W iface) { IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8W(iface); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c02bafad10..0855cb41cd 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -528,7 +528,7 @@ static ULONG WINAPI IDirectInputAImpl_AddRef(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedIncrement(&This->ref); - TRACE( "(%p) incrementing from %d\n", This, ref - 1); + TRACE( "(%p) ref %d\n", This, ref ); return ref; } @@ -543,7 +543,7 @@ static ULONG WINAPI IDirectInputAImpl_Release(LPDIRECTINPUT7A iface) IDirectInputImpl *This = impl_from_IDirectInput7A( iface ); ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "(%p) releasing from %d\n", This, ref + 1 ); + TRACE( "(%p) ref %d\n", This, ref ); if (ref == 0) { diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7477bc757d..4b2f317ce3 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -167,7 +167,9 @@ static ULONG WINAPI LinuxInputEffectImpl_AddRef( LPDIRECTINPUTEFFECT iface) { LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); - return InterlockedIncrement(&(This->ref)); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE( "(%p) ref %d\n", This, ref ); + return ref; } static HRESULT WINAPI LinuxInputEffectImpl_Download( @@ -759,6 +761,8 @@ static ULONG WINAPI LinuxInputEffectImpl_Release(LPDIRECTINPUTEFFECT iface) LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); ULONG ref = InterlockedDecrement(&(This->ref)); + TRACE( "(%p) ref %d\n", This, ref ); + if (ref == 0) { LinuxInputEffectImpl_Stop(iface); -- 2.17.1

2 1

[PATCH] dinput: Return correct value in IDirectInputDevice2 Release
by Alistair Leslie-Hughes June 7, 2019

June 7, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index ade79474f6..c9d24a9174 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1168,7 +1168,7 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) HeapFree(GetProcessHeap(), 0, This); - return DI_OK; + return ref; } ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) -- 2.17.1

1 0

[PATCH v2] po: Update Sinhala translation.
by Isira Seneviratne June 6, 2019

June 6, 2019

1 0

[PATCH 1/6] strmbase: Add a cached implementation of IDispatch and use it in IBasicVideo.
by Zebediah Figura June 6, 2019

June 6, 2019

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/dispatch.c | 49 +++++++++++++++++++++++++++++++ dlls/strmbase/video.c | 63 +++++++++++++++++++++++----------------- include/wine/strmbase.h | 14 ++++++++- 3 files changed, 98 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index e91b65a94a..1521471889 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -20,6 +20,55 @@ #include "strmbase_private.h" +WINE_DEFAULT_DEBUG_CHANNEL(strmbase); + +static ITypeLib *control_typelib; +static ITypeInfo *control_typeinfo[last_tid]; + +static REFIID control_tid_id[] = +{ + &IID_IBasicAudio, + &IID_IBasicVideo, + &IID_IMediaControl, + &IID_IMediaEvent, + &IID_IMediaPosition, + &IID_IVideoWindow, +}; + +HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) +{ + HRESULT hr; + + if (!control_typelib) + { + ITypeLib *typelib; + + hr = LoadRegTypeLib(&LIBID_QuartzTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &typelib); + if (FAILED(hr)) + { + ERR("Failed to load typelib, hr %#x.\n", hr); + return hr; + } + if (InterlockedCompareExchangePointer((void **)&control_typelib, typelib, NULL)) + ITypeLib_Release(typelib); + } + if (!control_typeinfo[tid]) + { + ITypeInfo *typeinfo; + + hr = ITypeLib_GetTypeInfoOfGuid(control_typelib, control_tid_id[tid], &typeinfo); + if (FAILED(hr)) + { + ERR("Failed to get type info for %s, hr %#x.\n", debugstr_guid(control_tid_id[tid]), hr); + return hr; + } + if (InterlockedCompareExchangePointer((void **)(control_typeinfo + tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + ITypeInfo_AddRef(*ret = control_typeinfo[tid]); + return S_OK; +} + HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { ITypeLib *pTypeLib; diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 2857932a05..440adc43a8 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -35,14 +35,12 @@ HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBas pControlVideo->pPin = pPin; pControlVideo->pFuncsTable = pFuncsTable; - BaseDispatch_Init(&pControlVideo->baseDispatch, &IID_IBasicVideo); - return S_OK; } HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo) { - return BaseDispatch_Destroy(&pControlVideo->baseDispatch); + return S_OK; } static HRESULT BaseControlVideoImpl_CheckSourceRect(BaseControlVideo *This, RECT *pSourceRect) @@ -72,40 +70,51 @@ static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *pctinfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *count) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetTypeInfoCount(&This->baseDispatch, pctinfo); + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, &IID_NULL, iTInfo, lcid, ppTInfo); + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IBasicVideo_tid, typeinfo); } -HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - BaseControlVideo *This = impl_from_IBasicVideo(iface); - - return BaseDispatchImpl_GetIDsOfNames(&This->baseDispatch, riid, rgszNames, cNames, lcid, rgDispId); -} - -HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, UINT *puArgErr) -{ - BaseControlVideo *This = impl_from_IBasicVideo(iface); - ITypeInfo *pTypeInfo; + ITypeInfo *typeinfo; HRESULT hr; - hr = BaseDispatchImpl_GetTypeInfo(&This->baseDispatch, riid, 1, lcid, &pTypeInfo); - if (SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(pTypeInfo, &This->IBasicVideo_iface, dispIdMember, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - ITypeInfo_Release(pTypeInfo); - } + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } + return hr; +} + +HRESULT WINAPI BaseControlVideoImpl_Invoke(IBasicVideo *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) +{ + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IBasicVideo_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 56560ed02b..0cbb7c3b78 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -399,6 +399,19 @@ RECT WINAPI BaseWindowImpl_GetDefaultRect(BaseWindow *This); LRESULT WINAPI BaseWindowImpl_OnReceiveMessage(BaseWindow *This, HWND hwnd, INT uMsg, WPARAM wParam, LPARAM lParam); BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); +enum strmbase_type_id +{ + IBasicAudio_tid, + IBasicVideo_tid, + IMediaControl_tid, + IMediaEvent_tid, + IMediaPosition_tid, + IVideoWindow_tid, + last_tid +}; + +HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); + typedef struct{ ITypeInfo *pTypeInfo; } BaseDispatch; @@ -473,7 +486,6 @@ HRESULT WINAPI BaseControlWindowImpl_IsCursorHidden(IVideoWindow *iface, LONG *C typedef struct tagBaseControlVideo { IBasicVideo IBasicVideo_iface; - BaseDispatch baseDispatch; BaseFilter* pFilter; CRITICAL_SECTION* pInterfaceLock; -- 2.20.1

2 6

[PATCH 3/3] dbghelp: Use internal flag for loading native files.
by Alistair Leslie-Hughes June 6, 2019

June 6, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/dbghelp_private.h | 3 --- dlls/dbghelp/module.c | 2 +- dlls/dbghelp/symbol.c | 4 ++-- programs/winedbg/info.c | 6 +++--- programs/winedbg/symbol.c | 20 ++++++++++---------- programs/winedbg/tgt_module.c | 7 +++++-- programs/winedbg/winedbg.c | 6 +++--- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 9e76d2dd4b..d083102432 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -116,9 +116,6 @@ void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; extern unsigned dbghelp_options DECLSPEC_HIDDEN; extern BOOL dbghelp_opt_native DECLSPEC_HIDDEN; -/* some more Wine extensions */ -#define SYMOPT_WINE_WITH_NATIVE_MODULES 0x40000000 - enum location_kind {loc_error, /* reg is the error code */ loc_unavailable, /* location is not available */ loc_absolute, /* offset is the location */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index d9d8417e84..fe8ed35108 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -832,7 +832,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, for (module = pcs->lmodules; module; module = module->next) { - if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && + if (!dbghelp_opt_native && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; if (!EnumModulesCallback(module->modulename, diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index f59e322fef..25169043b6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1062,7 +1062,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCWSTR Mask, } /* not found in PE modules, retry on the ELF ones */ - if (!pair.requested && (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES)) + if (!pair.requested && dbghelp_opt_native) { for (pair.requested = pair.pcs->lmodules; pair.requested; pair.requested = pair.requested->next) { @@ -1393,7 +1393,7 @@ BOOL WINAPI SymFromName(HANDLE hProcess, PCSTR Name, PSYMBOL_INFO Symbol) } /* not found in PE modules, retry on the ELF ones */ - if (dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) + if (dbghelp_opt_native) { for (module = pcs->lmodules; module; module = module->next) { diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 72c57a29b4..bf5ba4f6e3 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -214,7 +214,7 @@ void info_win32_module(DWORD64 base) { struct info_modules im; UINT i, j, num_printed = 0; - DWORD opt; + BOOL opt; if (!dbg_curr_process) { @@ -228,9 +228,9 @@ void info_win32_module(DWORD64 base) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); qsort(im.modules, im.num_used, sizeof(im.modules[0]), module_compare); diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index aa88ffcbc7..372ae76c33 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -366,7 +366,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, struct sgv_data sgv; int i; char buffer[512]; - DWORD opt; + BOOL opt; IMAGEHLP_STACK_FRAME ihsf; if (strlen(name) + 4 > sizeof(buffer)) @@ -394,7 +394,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); if (!sgv.num) @@ -419,7 +419,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv); } } - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); /* now grab local symbols */ if (stack_get_current_frame(&ihsf) && sgv.num < NUMDBGV) @@ -655,10 +655,10 @@ BOOL symbol_get_line(const char* filename, const char* name, /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); return FALSE; } @@ -668,11 +668,11 @@ BOOL symbol_get_line(const char* filename, const char* name, strcpy(&buffer[3], name); if (!SymEnumSymbols(dbg_curr_process->handle, 0, buffer, sgv_cb, (void*)&sgv)) { - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); return FALSE; } } - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); for (i = 0; i < sgv.num; i++) { @@ -795,7 +795,7 @@ static BOOL CALLBACK symbols_info_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) void symbol_info(const char* str) { char buffer[512]; - DWORD opt; + BOOL opt; if (strlen(str) + 3 >= sizeof(buffer)) { @@ -808,7 +808,7 @@ void symbol_info(const char* str) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumSymbols(dbg_curr_process->handle, 0, buffer, symbols_info_cb, NULL); - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); } diff --git a/programs/winedbg/tgt_module.c b/programs/winedbg/tgt_module.c index 58c4282689..2fdebc94ed 100644 --- a/programs/winedbg/tgt_module.c +++ b/programs/winedbg/tgt_module.c @@ -45,13 +45,15 @@ static BOOL tgt_process_module_write(HANDLE hProcess, void* addr, enum dbg_start tgt_module_load(const char* name, BOOL keep) { DWORD opts = SymGetOptions(); + BOOL native; HANDLE hDummy = (HANDLE)0x87654321; enum dbg_start ret = start_ok; WCHAR* nameW; unsigned len; SymSetOptions((opts & ~(SYMOPT_UNDNAME|SYMOPT_DEFERRED_LOADS)) | - SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS | 0x40000000); + SYMOPT_LOAD_LINES | SYMOPT_AUTO_PUBLICS); + native = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); if (!dbg_init(hDummy, NULL, FALSE)) return start_error_init; len = MultiByteToWideChar(CP_ACP, 0, name, -1, NULL, 0); @@ -76,7 +78,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { dbg_printf("Non supported mode... errors may occur\n" "Use at your own risks\n"); - SymSetOptions(SymGetOptions() | 0x40000000); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); dbg_curr_process = dbg_add_process(&be_process_module_io, 1, hDummy); dbg_curr_pid = 1; dbg_curr_thread = dbg_add_thread(dbg_curr_process, 2, NULL, NULL); @@ -87,6 +89,7 @@ enum dbg_start tgt_module_load(const char* name, BOOL keep) { SymCleanup(hDummy); SymSetOptions(opts); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, native); } return ret; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5aeaa0d4a2..92d248c918 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -436,7 +436,7 @@ static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) { struct mod_loader_info mli; - DWORD opt; + BOOL opt; /* this will resynchronize builtin dbghelp's internal ELF module list */ SymLoadModule(hProcess, 0, 0, 0, 0, 0); @@ -447,9 +447,9 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) /* this is a wine specific options to return also ELF modules in the * enumeration */ - SymSetOptions((opt = SymGetOptions()) | 0x40000000); + opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); SymEnumerateModules64(hProcess, mod_loader_cb, &mli); - SymSetOptions(opt); + SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); return imh_mod->BaseOfImage != 0; } -- 2.17.1

1 0