wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind().
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 5fcffb10f7f9dad3dc1dc57683ab80c35629a4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fcffb10f7f9dad3dc1dc576… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:34 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- dlls/wined3d/texture.c | 15 +++++++-------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1e13557..d87f608 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3617,7 +3617,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture_gl); - wined3d_texture_gl_bind(texture_gl, context, srgb); + wined3d_texture_gl_bind(texture_gl, context_gl, srgb); if ((entry = wine_rb_get(&device->samplers, &desc))) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index da646ce..d3c58cb 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -934,18 +934,17 @@ void wined3d_gl_texture_swizzle_from_color_fixup(GLint swizzle[4], struct color_ /* Context activation is done by the caller. */ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, BOOL srgb) + struct wined3d_context_gl *context_gl, BOOL srgb) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_format *format = texture_gl->t.resource.format; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct color_fixup_desc fixup = format->color_fixup; - const struct wined3d_gl_info *gl_info = context->gl_info; struct gl_texture *gl_tex; GLenum target; - TRACE("texture_gl %p, context %p, srgb %#x.\n", texture_gl, context, srgb); + TRACE("texture_gl %p, context_gl %p, srgb %#x.\n", texture_gl, context_gl, srgb); - if (!needs_separate_srgb_gl_texture(context, &texture_gl->t)) + if (!needs_separate_srgb_gl_texture(&context_gl->c, &texture_gl->t)) srgb = FALSE; /* sRGB mode cache for preload() calls outside drawprim. */ @@ -988,7 +987,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, gl_tex->sampler_desc.max_anisotropy = 1; gl_tex->sampler_desc.compare = FALSE; gl_tex->sampler_desc.comparison_func = WINED3D_CMP_LESSEQUAL; - if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) gl_tex->sampler_desc.srgb_decode = TRUE; else gl_tex->sampler_desc.srgb_decode = srgb; @@ -1046,7 +1045,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); } - if (!is_identity_fixup(fixup) && can_use_texture_swizzle(context->d3d_info, format)) + if (!is_identity_fixup(fixup) && can_use_texture_swizzle(context_gl->c.d3d_info, format)) { GLint swizzle[4]; @@ -1080,7 +1079,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, context_invalidate_compute_state(&context_gl->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - wined3d_texture_gl_bind(texture_gl, &context_gl->c, srgb); + wined3d_texture_gl_bind(texture_gl, context_gl, srgb); } /* Context activation is done by the caller (state handler). */ diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e0ac57e..06e24fb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -850,7 +850,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl } texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); - wined3d_texture_gl_bind(texture_gl, context, FALSE); + wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); wined3d_sampler_bind(sampler, unit, texture_gl, context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74ad31e..91570ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3620,7 +3620,7 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; + struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_apply_sampler_desc ().
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 6811cc6414fad244eb78976bdc7bd15493049616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6811cc6414fad244eb78976b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:33 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_apply_sampler_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 3 ++- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 6e45f0e..8c3a947 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -184,6 +184,7 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) @@ -193,7 +194,7 @@ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, } else if (texture_gl) { - wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler->desc, context); + wined3d_texture_gl_apply_sampler_desc(texture_gl, &sampler->desc, context_gl); } else { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 8b27e59..da646ce 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1086,14 +1086,14 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, /* Context activation is done by the caller (state handler). */ /* This function relies on the correct texture being bound and loaded. */ void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLenum target = texture_gl->target; struct gl_texture *gl_tex; DWORD state; - TRACE("texture_gl %p, sampler_desc %p, context %p.\n", texture_gl, sampler_desc, context); + TRACE("texture_gl %p, sampler_desc %p, context_gl %p.\n", texture_gl, sampler_desc, context_gl); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); @@ -1156,7 +1156,7 @@ void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl } if (!sampler_desc->srgb_decode != !gl_tex->sampler_desc.srgb_decode - && (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + && (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9617a44..74ad31e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3618,7 +3618,7 @@ static inline GLenum wined3d_texture_gl_get_sub_resource_target(const struct win } void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl, - const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; + const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_prepare_texture().
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: ed9a6a2d6711d7c4739bb27bd9112051ad2be222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed9a6a2d6711d7c4739bb27b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:32 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 5 ++-- dlls/wined3d/surface.c | 11 +++++---- dlls/wined3d/texture.c | 54 +++++++++++++++++++++++------------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 5 files changed, 41 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9a6a2d6711d7c4739b…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_unmap_bo_address().
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: e3d28cd45d4e9a3fadb687980bf9acc2d31185d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d28cd45d4e9a3fadb68798… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 12 16:17:31 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- dlls/wined3d/surface.c | 12 ++++++------ dlls/wined3d/texture.c | 14 +++++++++++--- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index be24baf..76b5858 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2618,16 +2618,15 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return memory; } -void context_unmap_bo_address(struct wined3d_context *context, +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, 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; + gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); GL_EXTCALL(glUnmapBuffer(binding)); wined3d_context_gl_bind_bo(context_gl, binding, 0); @@ -2660,8 +2659,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, memcpy(dst_ptr, src_ptr, size); - context_unmap_bo_address(&context_gl->c, dst, dst_binding); - context_unmap_bo_address(&context_gl->c, src, src_binding); + wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding); + wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding); } } else if (!dst->buffer_object && src->buffer_object) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5e28c46..0b6104d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -684,8 +684,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr conv->convert(src, dst, src_row_pitch, dst_row_pitch, desc.width, desc.height); wined3d_texture_invalidate_location(dst_texture, 0, ~map_binding); - context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); - context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &src_data, GL_PIXEL_UNPACK_BUFFER); } else { @@ -1660,7 +1660,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re width, height, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); data.buffer_object = 0; data.addr = dst_mem; @@ -2932,9 +2932,9 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - context_unmap_bo_address(context, &dst_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &dst_data, GL_PIXEL_UNPACK_BUFFER); if (!same_sub_resource) - context_unmap_bo_address(context, &src_data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &src_data, GL_PIXEL_UNPACK_BUFFER); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture) { SetRect(&dst_texture->swapchain->front_buffer_update, @@ -3054,7 +3054,7 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, memcpy(row, map.data, w * bpp); } - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2a8bff4..5e84a82 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -774,6 +774,7 @@ static void wined3d_texture_create_dc(void *object) static void wined3d_texture_destroy_dc(void *object) { const struct wined3d_texture_idx *idx = object; + struct wined3d_context_gl *context_gl = NULL; D3DKMT_DESTROYDCFROMMEMORY destroy_desc; struct wined3d_context *context = NULL; struct wined3d_texture *texture; @@ -804,10 +805,13 @@ static void wined3d_texture_destroy_dc(void *object) dc_info->bitmap = NULL; if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); @@ -2008,7 +2012,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s else format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; bo.addr = converted_mem; @@ -2715,6 +2719,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso { struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; + struct wined3d_context_gl *context_gl = NULL; struct wined3d_context *context = NULL; struct wined3d_texture *texture; struct wined3d_bo_address data; @@ -2734,10 +2739,13 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso } if (device->d3d_initialized) + { context = context_acquire(device, NULL, 0); + context_gl = wined3d_context_gl(context); + } wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); + wined3d_context_gl_unmap_bo_address(context_gl, &data, GL_PIXEL_UNPACK_BUFFER); if (context) context_release(context); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f0b91a..04f160e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2112,6 +2112,8 @@ void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, G void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, + const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) DECLSPEC_HIDDEN; @@ -2269,8 +2271,6 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void context_unmap_bo_address(struct wined3d_context *context, - const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; /***************************************************************************** * Internal representation of a light

1 0

Piotr Caban : libwine: Fix NORM_IGNORESYMBOLS flag handling in compare_weights.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 324082a8f390f23be4f266a5b51cd77f722890ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=324082a8f390f23be4f266a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 12 11:15:45 2019 +0200 libwine: Fix NORM_IGNORESYMBOLS flag handling in compare_weights. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/sortkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/sortkey.c b/libs/port/sortkey.c index f62289b..8dc1e31 100644 --- a/libs/port/sortkey.c +++ b/libs/port/sortkey.c @@ -216,7 +216,7 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1, inc_str_pos(&str1, &len1, &dpos1, &dlen1); skip = 1; } - if (!dlen2 && get_char_typeW(dstr2[dpos2]) & (C1_PUNCT | C1_SPACE)) + if (get_char_typeW(dstr2[dpos2]) & (C1_PUNCT | C1_SPACE)) { inc_str_pos(&str2, &len2, &dpos2, &dlen2); skip = 1;

1 0

Zebediah Figura : quartz: Use strmbase IUnknown methods for IVideoWindow.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 5e63f7f93a6410f1d89a24e1cd08fb5a4a8c9269 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e63f7f93a6410f1d89a24e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:39 2019 -0500 quartz: Use strmbase IUnknown methods for IVideoWindow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 34 +++------------------------------- dlls/quartz/vmr9.c | 39 +++------------------------------------ 2 files changed, 6 insertions(+), 67 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6b6806b..e4b50e2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -708,34 +708,6 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -/*** IUnknown methods ***/ -static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj) -{ - VideoRendererImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); -} - -static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface) -{ - VideoRendererImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface) -{ - VideoRendererImpl *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, LONG *FullScreenMode) { @@ -781,9 +753,9 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, static const IVideoWindowVtbl IVideoWindow_VTable = { - VideoWindow_QueryInterface, - VideoWindow_AddRef, - VideoWindow_Release, + BaseControlWindowImpl_QueryInterface, + BaseControlWindowImpl_AddRef, + BaseControlWindowImpl_Release, BaseControlWindowImpl_GetTypeInfoCount, BaseControlWindowImpl_GetTypeInfo, BaseControlWindowImpl_GetIDsOfNames, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 3cb7984..845b1c4 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -95,11 +95,6 @@ static inline struct quartz_vmr *impl_from_BaseWindow(BaseWindow *wnd) return CONTAINING_RECORD(wnd, struct quartz_vmr, baseControlWindow.baseWindow); } -static inline struct quartz_vmr *impl_from_IVideoWindow(IVideoWindow *iface) -{ - return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlWindow.IVideoWindow_iface); -} - static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cvid) { return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo); @@ -809,39 +804,11 @@ static const IBaseFilterVtbl VMR_Vtbl = BaseFilterImpl_QueryVendorInfo }; -/*** IUnknown methods ***/ -static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID*ppvObj) -{ - struct quartz_vmr *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); -} - -static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface) -{ - struct quartz_vmr *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI Videowindow_Release(IVideoWindow *iface) -{ - struct quartz_vmr *This = impl_from_IVideoWindow(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IVideoWindowVtbl IVideoWindow_VTable = { - Videowindow_QueryInterface, - Videowindow_AddRef, - Videowindow_Release, + BaseControlWindowImpl_QueryInterface, + BaseControlWindowImpl_AddRef, + BaseControlWindowImpl_Release, BaseControlWindowImpl_GetTypeInfoCount, BaseControlWindowImpl_GetTypeInfo, BaseControlWindowImpl_GetIDsOfNames,

1 0

Zebediah Figura : strmbase: Add default implementations of IUnknown methods for IVideoWindow.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 89cf4cba6e678474e91a3e531b29117d8cef9319 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cf4cba6e678474e91a3e53… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:38 2019 -0500 strmbase: Add default implementations of IUnknown methods for IVideoWindow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 18 ++++++++++++++++++ include/wine/strmbase.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index eea45aa..1ca06f7 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -217,6 +217,24 @@ HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow) return S_OK; } +HRESULT WINAPI BaseControlWindowImpl_QueryInterface(IVideoWindow *iface, REFIID iid, void **out) +{ + BaseControlWindow *window = impl_from_IVideoWindow(iface); + return IUnknown_QueryInterface(window->pFilter->outer_unk, iid, out); +} + +ULONG WINAPI BaseControlWindowImpl_AddRef(IVideoWindow *iface) +{ + BaseControlWindow *window = impl_from_IVideoWindow(iface); + return IUnknown_AddRef(window->pFilter->outer_unk); +} + +ULONG WINAPI BaseControlWindowImpl_Release(IVideoWindow *iface) +{ + BaseControlWindow *window = impl_from_IVideoWindow(iface); + return IUnknown_Release(window->pFilter->outer_unk); +} + HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT *count) { TRACE("iface %p, count %p.\n", iface, count); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a7dda2e..2833f5e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -430,6 +430,10 @@ HRESULT WINAPI BaseControlWindow_Init(BaseControlWindow *pControlWindow, const I HRESULT WINAPI BaseControlWindow_Destroy(BaseControlWindow *pControlWindow); BOOL WINAPI BaseControlWindowImpl_PossiblyEatMessage(BaseWindow *This, UINT uMsg, WPARAM wParam, LPARAM lParam); + +HRESULT WINAPI BaseControlWindowImpl_QueryInterface(IVideoWindow *iface, REFIID iid, void **out); +ULONG WINAPI BaseControlWindowImpl_AddRef(IVideoWindow *iface); +ULONG WINAPI BaseControlWindowImpl_Release(IVideoWindow *iface); HRESULT WINAPI BaseControlWindowImpl_GetTypeInfoCount(IVideoWindow *iface, UINT*pctinfo); HRESULT WINAPI BaseControlWindowImpl_GetTypeInfo(IVideoWindow *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo); HRESULT WINAPI BaseControlWindowImpl_GetIDsOfNames(IVideoWindow *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId);

1 0

Zebediah Figura : strmbase: Get rid of the "lpVtbl" parameter to BaseControlVideo_Init().
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: fbd9133ee5f30ade0696abd3ad35f18a9dec34ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbd9133ee5f30ade0696abd3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:37 2019 -0500 strmbase: Get rid of the "lpVtbl" parameter to BaseControlVideo_Init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 46 +------------- dlls/quartz/vmr9.c | 49 +-------------- dlls/strmbase/video.c | 146 ++++++++++++++++++++++++++++---------------- include/wine/strmbase.h | 43 +------------ 4 files changed, 101 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fbd9133ee5f30ade0696…

1 0

Zebediah Figura : quartz: Use strmbase IUnknown methods for IBasicVideo.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: cb0b2d81d2d88b8390a31d5122ca1b67d1d6dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb0b2d81d2d88b8390a31d51… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:36 2019 -0500 quartz: Use strmbase IUnknown methods for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 39 +++------------------------------------ dlls/quartz/vmr9.c | 39 +++------------------------------------ 2 files changed, 6 insertions(+), 72 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 4f279b0..f4d6e54 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -86,11 +86,6 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static inline VideoRendererImpl *impl_from_IBasicVideo(IBasicVideo *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo.IBasicVideo_iface); -} - static DWORD WINAPI MessageLoop(LPVOID lpParameter) { VideoRendererImpl* This = lpParameter; @@ -713,39 +708,11 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -/*** IUnknown methods ***/ -static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); -} - -static ULONG WINAPI BasicVideo_AddRef(IBasicVideo *iface) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IBasicVideoVtbl IBasicVideo_VTable = { - BasicVideo_QueryInterface, - BasicVideo_AddRef, - BasicVideo_Release, + BaseControlVideoImpl_QueryInterface, + BaseControlVideoImpl_AddRef, + BaseControlVideoImpl_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 751eeeb..8f4aa8e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -105,11 +105,6 @@ static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cv return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo); } -static inline struct quartz_vmr *impl_from_IBasicVideo(IBasicVideo *iface) -{ - return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlVideo.IBasicVideo_iface); -} - static inline struct quartz_vmr *impl_from_IAMCertifiedOutputProtection(IAMCertifiedOutputProtection *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IAMCertifiedOutputProtection_iface); @@ -892,39 +887,11 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden }; -/*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID * ppvObj) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj); - - return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj); -} - -static ULONG WINAPI Basicvideo_AddRef(IBasicVideo *iface) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IBasicVideoVtbl IBasicVideo_VTable = { - Basicvideo_QueryInterface, - Basicvideo_AddRef, - Basicvideo_Release, + BaseControlVideoImpl_QueryInterface, + BaseControlVideoImpl_AddRef, + BaseControlVideoImpl_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames,

1 0

Zebediah Figura : strmbase: Add default implementations of IUnknown methods for IBasicVideo.
by Alexandre Julliard 12 Jun '19

12 Jun '19

Module: wine Branch: master Commit: 96b6f0e1d685c0c7e38c3e102a3406589d73013f URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b6f0e1d685c0c7e38c3e10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 11 18:54:35 2019 -0500 strmbase: Add default implementations of IUnknown methods for IBasicVideo. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 18 ++++++++++++++++++ include/wine/strmbase.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 440adc4..8e26aaf 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -70,6 +70,24 @@ static HRESULT BaseControlVideoImpl_CheckTargetRect(BaseControlVideo *This, RECT return S_OK; } +HRESULT WINAPI BaseControlVideoImpl_QueryInterface(IBasicVideo *iface, REFIID iid, void **out) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_QueryInterface(video->pFilter->outer_unk, iid, out); +} + +ULONG WINAPI BaseControlVideoImpl_AddRef(IBasicVideo *iface) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_AddRef(video->pFilter->outer_unk); +} + +ULONG WINAPI BaseControlVideoImpl_Release(IBasicVideo *iface) +{ + BaseControlVideo *video = impl_from_IBasicVideo(iface); + return IUnknown_Release(video->pFilter->outer_unk); +} + HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT *count) { TRACE("iface %p, count %p.\n", iface, count); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9f686dc..0b582b9 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -517,6 +517,9 @@ typedef struct BaseControlVideoFuncTable { HRESULT WINAPI BaseControlVideo_Init(BaseControlVideo *pControlVideo, const IBasicVideoVtbl *lpVtbl, BaseFilter *owner, CRITICAL_SECTION *lock, BasePin* pPin, const BaseControlVideoFuncTable* pFuncsTable); HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); +HRESULT WINAPI BaseControlVideoImpl_QueryInterface(IBasicVideo *iface, REFIID iid, void **out); +ULONG WINAPI BaseControlVideoImpl_AddRef(IBasicVideo *iface); +ULONG WINAPI BaseControlVideoImpl_Release(IBasicVideo *iface); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfoCount(IBasicVideo *iface, UINT*pctinfo); HRESULT WINAPI BaseControlVideoImpl_GetTypeInfo(IBasicVideo *iface, UINT iTInfo, LCID lcid, ITypeInfo**ppTInfo); HRESULT WINAPI BaseControlVideoImpl_GetIDsOfNames(IBasicVideo *iface, REFIID riid, LPOLESTR*rgszNames, UINT cNames, LCID lcid, DISPID*rgDispId);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
87
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 June 2019