wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Zebediah Figura : winebus.sys: Allocate IRP return buffers from paged pool.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: eebb1d99318b8e165ff73647097251b5c4586861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eebb1d99318b8e165ff73647… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:13 2019 -0500 winebus.sys: Allocate IRP return buffers from paged pool. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 7207e14..b649bfb 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -149,7 +149,7 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device) DWORD len = strlenW(ext->busid) + strlenW(serial) + 64; WCHAR *dst; - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { if (ext->input == (WORD)-1) { @@ -176,7 +176,7 @@ static WCHAR *get_device_id(DEVICE_OBJECT *device) DWORD len = strlenW(ext->busid) + 34; WCHAR *dst; - if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) { if (ext->input == (WORD)-1) { @@ -197,7 +197,7 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) struct device_extension *ext = (struct device_extension *)device->DeviceExtension; WCHAR *dst; - if ((dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) + if ((dst = ExAllocatePool(PagedPool, (strlenW(ext->busid) + 2) * sizeof(WCHAR)))) { strcpyW(dst, ext->busid); dst[strlenW(dst) + 1] = 0; @@ -387,8 +387,7 @@ static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) struct pnp_device *ptr; EnterCriticalSection(&device_list_cs); - *devices = HeapAlloc(GetProcessHeap(), 0, sizeof(DEVICE_RELATIONS) + - list_count(&pnp_devset) * sizeof (void *)); + *devices = ExAllocatePool(PagedPool, offsetof(DEVICE_RELATIONS, Objects[list_count(&pnp_devset)])); if (!*devices) {

1 0

Zebediah Figura : ntoskrnl.exe: Free device IDs from pool.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 533a426d145144f79e2e81d70e5b28f530b00926 URL: https://source.winehq.org/git/wine.git/?a=commit;h=533a426d145144f79e2e81d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 5 09:22:12 2019 -0500 ntoskrnl.exe: Free device IDs from pool. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 23ae4ca..d8f74e0 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -301,7 +301,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device ) if (get_driver_for_id( ptr, driver )) break; } - RtlFreeHeap( GetProcessHeap(), 0, ids ); + ExFreePool( ids ); if (!driver[0]) { @@ -409,7 +409,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP else status = STATUS_BUFFER_TOO_SMALL; - HeapFree( GetProcessHeap(), 0, id ); + ExFreePool( id ); break; } case DevicePropertyPhysicalDeviceObjectName: @@ -658,17 +658,17 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla HeapFree( GetProcessHeap(), 0, id ); if (!rc) { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } else { - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); return STATUS_UNSUCCESSFUL; } } - HeapFree( GetProcessHeap(), 0, instance_id ); + ExFreePool( instance_id ); if (!SetupDiCreateDeviceInterfaceW( set, &sp_device, class_guid, refstr ? refstr->Buffer : NULL, 0, &sp_iface )) return STATUS_UNSUCCESSFUL;

1 0

Henri Verbeet : wined3d: Make the adapter responsible for acquiring and releasing contexts.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 6937b987002beb4a1c4c429f1f50979481ccdbf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6937b987002beb4a1c4c429f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 17:12:07 2019 +0430 wined3d: Make the adapter responsible for acquiring and releasing contexts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 49 ++++----------------------- dlls/wined3d/adapter_vk.c | 60 ++++++++++++++++++++------------- dlls/wined3d/context.c | 75 ++++++++++++++++++------------------------ dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 69 +++++++++++++++++++++++--------------- dlls/wined3d/query.c | 6 ++-- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 39 ++++++++++++++++------ dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 46 +++++++++++++++++++------- 10 files changed, 190 insertions(+), 160 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6937b987002beb4a1c4c…

1 0

Henri Verbeet : wined3d: Move the blit dimension fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 02e8841d2f853ebb4dcf814af286ee48d46cca34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02e8841d2f853ebb4dcf814a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 17:12:06 2019 +0430 wined3d: Move the blit dimension fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 +++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8600361..2a2b2e8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2791,12 +2791,11 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, if (context->last_was_blit) { - if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) { gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); context->viewport_count = WINED3D_MAX_VIEWPORTS; - context->blit_w = rt_size.cx; - context->blit_h = rt_size.cy; + context_gl->blit_size = rt_size; /* No need to dirtify here, the states are still dirtified because * they weren't applied since the last context_apply_blit_state() * call. */ @@ -2870,8 +2869,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, device->shader_backend->shader_disable(device->shader_priv, context); - context->blit_w = rt_size.cx; - context->blit_h = rt_size.cy; + context_gl->blit_size = rt_size; checkGLcall("blit state application"); } @@ -2909,7 +2907,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ SIZE rt_size; wined3d_context_gl_get_rt_size(context_gl, &rt_size); - if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) + if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) context_apply_blit_projection(context, rt_size.cx, rt_size.cy); wined3d_context_gl_apply_blit_state(context_gl, device); @@ -2964,7 +2962,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); gl_info->gl_ops.gl.p_glLoadIdentity(); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - context_apply_blit_projection(context, context->blit_w, context->blit_h); + context_apply_blit_projection(context, context_gl->blit_size.cx, context_gl->blit_size.cy); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); /* Other misc states. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4eddc55..864476c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1944,8 +1944,7 @@ struct wined3d_context DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */ GLenum untracked_materials[2]; - UINT blit_w, blit_h; - enum fogsource fog_source; + enum fogsource fog_source; UINT instance_count; @@ -1982,6 +1981,7 @@ struct wined3d_context_gl uint32_t default_attrib_value_set; + SIZE blit_size; unsigned int active_texture; GLenum *texture_type;

1 0

Henri Verbeet : wined3d: Move the "active_texture" field from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 52c5abb3d75adb461a4c310de5843a254ef13239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c5abb3d75adb461a4c310d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 17:12:05 2019 +0430 wined3d: Move the "active_texture" field from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7988eb6..8600361 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2520,7 +2520,7 @@ void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, { GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); checkGLcall("glActiveTexture"); - context_gl->c.active_texture = unit; + context_gl->active_texture = unit; } void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) @@ -2545,7 +2545,7 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLen else target = GL_NONE; - unit = context_gl->c.active_texture; + unit = context_gl->active_texture; old_texture_type = context_gl->texture_type[unit]; if (old_texture_type != target) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e3d9d54..beda900 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1061,9 +1061,9 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we * would risk marking already applied sampler states dirty again. */ - if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1d61d09..b43dcdd 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -858,9 +858,9 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context_gl *context_gl) { - if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } @@ -912,7 +912,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - GL_EXTCALL(glBindSampler(context->active_texture, 0)); + GL_EXTCALL(glBindSampler(context_gl->active_texture, 0)); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); if (context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ec40e3b..4eddc55 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1946,7 +1946,6 @@ struct wined3d_context GLenum untracked_materials[2]; UINT blit_w, blit_h; enum fogsource fog_source; - DWORD active_texture; UINT instance_count; @@ -1983,6 +1982,8 @@ struct wined3d_context_gl uint32_t default_attrib_value_set; + unsigned int active_texture; + GLenum *texture_type; /* The WGL context. */

1 0

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

05 Jun '19

Module: wine Branch: master Commit: 899e4c7aed5539aac0222c7c2b89e14e6d42917e URL: https://source.winehq.org/git/wine.git/?a=commit;h=899e4c7aed5539aac0222c7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 17:12:04 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_active_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context.c | 15 ++++++++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 8 ++++---- dlls/wined3d/state.c | 22 +++++++++++++--------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 9 files changed, 33 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=899e4c7aed5539aac022…

1 0

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

05 Jun '19

Module: wine Branch: master Commit: 8bd2730ab7711ab1fd28e0d5133e620fd36bde85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd2730ab7711ab1fd28e0d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 5 17:12:03 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_resource_view_gl_bind_and_dirtify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f3de770..a8f319f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -856,20 +856,18 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl /* Context activation is done by the caller. */ static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - - if (context->active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) + if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->rev_tex_unit_map)) { - unsigned int active_sampler = context_gl->rev_tex_unit_map[context->active_texture]; + unsigned int active_sampler = context_gl->rev_tex_unit_map[context_gl->c.active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } /* FIXME: Ideally we'd only do this when touching a binding that's used by * a shader. */ - context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); - context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); + context_invalidate_compute_state(&context_gl->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); } @@ -880,6 +878,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * unsigned int i, j, layer_count, level_count, base_level, max_level; const struct wined3d_gl_info *gl_info; struct wined3d_texture_gl *texture_gl; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; struct gl_texture *gl_tex; DWORD location; @@ -888,6 +887,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); context = context_acquire(view_gl->v.resource->device, NULL, 0); + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; layer_count = view_gl->v.desc.u.texture.layer_count; level_count = view_gl->v.desc.u.texture.level_count; @@ -902,11 +902,11 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * if (view_gl->gl_view.name) { - shader_resource_view_gl_bind_and_dirtify(view_gl, context); + shader_resource_view_gl_bind_and_dirtify(view_gl, context_gl); } else { - wined3d_texture_gl_bind_and_dirtify(texture_gl, wined3d_context_gl(context), srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); }

1 0

Marcus Meissner : qcap: Release filter only if allocated.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: e4331ce6e5578f718fa0f4991c65188f314928c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4331ce6e5578f718fa0f499… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 5 09:19:07 2019 +0200 qcap: Release filter only if allocated. Fixes test crash when built without v4l2. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index b80b0f2..062138e 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -118,12 +118,12 @@ START_TEST(videocapture) { test_capture(filter); IBaseFilter_Release(filter); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } else skip("Failed to open capture device, hr=%#x.\n", hr); - ref = IBaseFilter_Release(filter); - ok(!ref, "Got outstanding refcount %d.\n", ref); IMoniker_Release(moniker); }

1 0

Paul Gofman : ddraw/tests: Test lighting with _ProcessVertices() for ddraw7.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 68b15fec00ee167dd152f83ffefede2561425d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b15fec00ee167dd152f83f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Jun 5 00:58:18 2019 +0300 ddraw/tests: Test lighting with _ProcessVertices() for ddraw7. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 378 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 282 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68b15fec00ee167dd152…

1 0

Zebediah Figura : evr: Use strmbase filter aggregation support.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 444c6a16ef2b12d979c9d10816413863cb7e6ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444c6a16ef2b12d979c9d108… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 4 17:54:28 2019 -0500 evr: Use strmbase filter aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 173 +++++++-------------------------------------------- dlls/evr/tests/evr.c | 3 +- 2 files changed, 22 insertions(+), 154 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 21a4af0..b64b046 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -35,148 +35,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr); typedef struct { BaseFilter filter; - - IUnknown IUnknown_inner; } evr_filter; -static inline evr_filter *impl_from_inner_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, evr_filter, IUnknown_inner); -} - -static HRESULT WINAPI inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - evr_filter *This = impl_from_inner_IUnknown(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->IUnknown_inner; - - else if (IsEqualIID(riid, &IID_IAMCertifiedOutputProtection)) - FIXME("No interface for IID_IAMCertifiedOutputProtection\n"); - else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - FIXME("No interface for IID_IAMFilterMiscFlags\n"); - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv =&This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv =&This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv =&This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IKsPropertySet)) - FIXME("No interface for IID_IKsPropertySet\n"); - else if (IsEqualIID(riid, &IID_IMediaEventSink)) - FIXME("No interface for IID_IMediaEventSink\n"); - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - FIXME("No interface for IID_IMediaSeeking\n"); - else if (IsEqualIID(riid, &IID_IQualityControl)) - FIXME("No interface for IID_IQualityControl\n"); - else if (IsEqualIID(riid, &IID_IQualProp)) - FIXME("No interface for IID_IQualProp\n"); - - else if (IsEqualIID(riid, &IID_IEVRFilterConfig)) - FIXME("No interface for IID_IEVRFilterConfig\n"); - else if (IsEqualIID(riid, &IID_IMFGetService)) - FIXME("No interface for IID_IMFGetService\n"); - else if (IsEqualIID(riid, &IID_IMFVideoPositionMapper)) - FIXME("No interface for IID_IMFVideoPositionMapper\n"); - else if (IsEqualIID(riid, &IID_IMFVideoRenderer)) - FIXME("No interface for IID_IMFVideoRenderer\n"); - - else if (IsEqualIID(riid, &IID_IMemInputPin)) - FIXME("No interface for IID_IMemInputPin\n"); - else if (IsEqualIID(riid, &IID_IPin)) - FIXME("No interface for IID_IPin\n"); - else if (IsEqualIID(riid, &IID_IQualityControl)) - FIXME("No interface for IID_IQualityControl\n"); - - else if (IsEqualIID(riid, &IID_IDirectXVideoMemoryConfiguration)) - FIXME("No interface for IID_IDirectXVideoMemoryConfiguration\n"); - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv); - return E_NOINTERFACE; -} - -static ULONG WINAPI inner_AddRef(IUnknown *iface) -{ - evr_filter *This = impl_from_inner_IUnknown(iface); - ULONG ref = BaseFilterImpl_AddRef(&This->filter.IBaseFilter_iface); - - TRACE("(%p, %p)->(): new ref %d\n", iface, This, ref); - - return ref; -} - -static ULONG WINAPI inner_Release(IUnknown *iface) -{ - evr_filter *This = impl_from_inner_IUnknown(iface); - ULONG ref = InterlockedDecrement(&This->filter.refcount); - - TRACE("(%p, %p)->(): new ref %d\n", iface, This, ref); - - if (!ref) - { - strmbase_filter_cleanup(&This->filter); - CoTaskMemFree(This); - } - - return ref; -} - -static const IUnknownVtbl evr_inner_vtbl = -{ - inner_QueryInterface, - inner_AddRef, - inner_Release -}; - -static inline evr_filter *impl_from_IBaseFilter(IBaseFilter *iface) -{ - return CONTAINING_RECORD(iface, evr_filter, filter); -} - -static HRESULT WINAPI filter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) -{ - evr_filter *This = impl_from_IBaseFilter(iface); - return IUnknown_QueryInterface(&This->IUnknown_inner, riid, ppv); -} - -static ULONG WINAPI filter_AddRef(IBaseFilter *iface) -{ - evr_filter *This = impl_from_IBaseFilter(iface); - LONG ret; - - ret = IUnknown_AddRef(&This->IUnknown_inner); - - TRACE("(%p)->AddRef from %d\n", iface, ret - 1); - - return ret; -} - -static ULONG WINAPI filter_Release(IBaseFilter *iface) -{ - evr_filter *This = impl_from_IBaseFilter(iface); - LONG ret; - - ret = IUnknown_Release(&This->IUnknown_inner); - - TRACE("(%p)->Release from %d\n", iface, ret + 1); - - return ret; -} - static const IBaseFilterVtbl basefilter_vtbl = { - filter_QueryInterface, - filter_AddRef, - filter_Release, + BaseFilterImpl_QueryInterface, + BaseFilterImpl_AddRef, + BaseFilterImpl_Release, BaseFilterImpl_GetClassID, BaseRendererImpl_Stop, BaseRendererImpl_Pause, @@ -191,41 +56,45 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo }; +static inline evr_filter *impl_from_BaseFilter(BaseFilter *iface) +{ + return CONTAINING_RECORD(iface, evr_filter, filter); +} + static IPin *evr_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; } +static void evr_destroy(BaseFilter *iface) +{ + evr_filter *filter = impl_from_BaseFilter(iface); + + strmbase_filter_cleanup(&filter->filter); + CoTaskMemFree(filter); +} + static const BaseFilterFuncTable basefilter_functable = { .filter_get_pin = evr_get_pin, + .filter_destroy = evr_destroy, }; -HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) +HRESULT evr_filter_create(IUnknown *outer, void **out) { evr_filter *object; - TRACE("(%p, %p)\n", outer_unk, ppv); - - *ppv = NULL; - - if(outer_unk != NULL) - { - FIXME("Aggregation yet unsupported!\n"); - return E_NOINTERFACE; - } + *out = NULL; object = CoTaskMemAlloc(sizeof(evr_filter)); if (!object) return E_OUTOFMEMORY; - strmbase_filter_init(&object->filter, &basefilter_vtbl, NULL, &CLSID_EnhancedVideoRenderer, + strmbase_filter_init(&object->filter, &basefilter_vtbl, outer, &CLSID_EnhancedVideoRenderer, (DWORD_PTR)(__FILE__ ": EVR.csFilter"), &basefilter_functable); - object->IUnknown_inner.lpVtbl = &evr_inner_vtbl; - - *ppv = &object->IUnknown_inner; + *out = &object->filter.IUnknown_inner; return S_OK; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 34db51c..cd88ec1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -91,8 +91,7 @@ static void test_aggregation(void) hr = CoCreateInstance(&CLSID_EnhancedVideoRenderer, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (FAILED(hr)) return; + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk);

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
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