December 2017 - Wine-commits

Józef Kucia : wined3d: Limit number of supported user clip planes to 8.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 2fdec9a8988917d10dd5589fbdf54701b9fdb82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdec9a8988917d10dd5589fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:40 2017 +0100 wined3d: Limit number of supported user clip planes to 8. We never supported, and we should never need to support more than 8 user clip planes in wined3d. OpenGL drivers do not expose more than 8 clip distances. Similarly, other APIs, D3D10, D3D11 and D3D12 provide exactly 8 clip distances. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 48 ------------------------------------------ dlls/wined3d/state.c | 31 ++------------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 4 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fdec9a8988917d10dd55…

1 0

Józef Kucia : wined3d: Disable all clip distances for blits.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 46f0b1674fcfe08fe92c2922fd277516ad8392bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f0b1674fcfe08fe92c2922f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:41 2017 +0100 wined3d: Disable all clip distances for blits. GL_CLIP_PLANE0 and GL_CLIP_DISTANCE0 has the same value. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ba9e19c..3dc6ca7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2530,12 +2530,9 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)"); - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)"); - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)"); - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)"); - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); + for (i = 0; i < gl_info->limits.user_clip_distances; ++i) + gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); + checkGLcall("disable clip planes"); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */

1 0

Józef Kucia : wined3d: Pack wined3d_context better.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: cf0f52324386f7ac798ba10f211b2f498a139f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf0f52324386f7ac798ba10f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:42 2017 +0100 wined3d: Pack wined3d_context better. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e8eec2..9fe7fbc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1869,6 +1869,7 @@ struct wined3d_context /* Stores some information about the context state for optimization */ DWORD render_offscreen : 1; DWORD last_was_rhw : 1; /* true iff last draw_primitive was in xyzrhw mode */ + DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; DWORD last_was_normal : 1; @@ -1899,9 +1900,8 @@ struct wined3d_context DWORD destroy_delayed : 1; DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; - DWORD padding : 7; - DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ - DWORD shader_update_mask; + DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ + DWORD padding : 17; DWORD constant_update_mask; DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */

1 0

Józef Kucia : wined3d: Keep track of enabled clip distances.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 46cf12318be7004c3cb7b98b2a4253ef58eacd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=46cf12318be7004c3cb7b98b2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:43 2017 +0100 wined3d: Keep track of enabled clip distances. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 31 +++++++++++++++++++++++++--- dlls/wined3d/state.c | 47 ++++++++---------------------------------- dlls/wined3d/wined3d_private.h | 4 +++- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3dc6ca7..8af9e4b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2352,6 +2352,33 @@ static void context_get_rt_size(const struct wined3d_context *context, SIZE *siz size->cy = wined3d_texture_get_level_height(rt, level); } +void context_enable_clip_distances(struct wined3d_context *context, unsigned int enable_mask) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int clip_distance_count = gl_info->limits.user_clip_distances; + unsigned int i, disable_mask, current_mask; + + disable_mask = ~enable_mask; + enable_mask &= (1u << clip_distance_count) - 1; + disable_mask &= (1u << clip_distance_count) - 1; + current_mask = context->clip_distance_mask; + context->clip_distance_mask = enable_mask; + + enable_mask &= ~current_mask; + for (i = 0; enable_mask; enable_mask >>= 1, ++i) + { + if (enable_mask & 1) + gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); + } + disable_mask &= current_mask; + for (i = 0; disable_mask; disable_mask >>= 1, ++i) + { + if (disable_mask & 1) + gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); + } + checkGLcall("toggle clip distances"); +} + /***************************************************************************** * SetupForBlit * @@ -2530,9 +2557,7 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ - for (i = 0; i < gl_info->limits.user_clip_distances; ++i) - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); - checkGLcall("disable clip planes"); + context_enable_clip_distances(context, 0); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ea497fa..f3ec7df 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -611,9 +611,7 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int clipplane_count = gl_info->limits.user_clip_distances; - unsigned int i, enable_mask, disable_mask; + unsigned int enable_mask; if (use_vs(state) && !context->d3d_info->vs_clipping) { @@ -626,7 +624,7 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state * disables all clip planes because of that - don't do anything here * and keep them disabled. */ if (state->render_states[WINED3D_RS_CLIPPLANEENABLE] && !warned++) - FIXME("Clipping not supported with vertex shaders\n"); + FIXME("Clipping not supported with vertex shaders.\n"); return; } @@ -636,36 +634,12 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state * need to update the clipping field from ffp_vertex_settings. */ context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; - /* TODO: Keep track of previously enabled clipplanes to avoid unnecessary resetting - * of already set values - */ - /* If enabling / disabling all * TODO: Is this correct? Doesn't D3DRS_CLIPPING disable clipping on the viewport frustrum? */ - if (state->render_states[WINED3D_RS_CLIPPING]) - { - enable_mask = state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - disable_mask = ~state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - } - else - { - enable_mask = 0; - disable_mask = ~0u; - } - - enable_mask &= (1u << clipplane_count) - 1; - disable_mask &= (1u << clipplane_count) - 1; - - for (i = 0; enable_mask && i < clipplane_count; enable_mask >>= 1, ++i) - if (enable_mask & 1) - gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); - checkGLcall("clip plane enable"); - - for (i = 0; disable_mask && i < clipplane_count; disable_mask >>= 1, ++i) - if (disable_mask & 1) - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); - checkGLcall("clip plane disable"); + enable_mask = state->render_states[WINED3D_RS_CLIPPING] ? + state->render_states[WINED3D_RS_CLIPPLANEENABLE] : 0; + context_enable_clip_distances(context, enable_mask); } static void state_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4532,22 +4506,19 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine } else { - if(!context->last_was_vshader) { + if (!context->last_was_vshader) + { static BOOL warned = FALSE; if (!context->d3d_info->vs_clipping) { /* Disable all clip planes to get defined results on all drivers. See comment in the * state_clipping state handler */ - for (i = 0; i < gl_info->limits.user_clip_distances; ++i) - { - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE0 + i); - checkGLcall("glDisable(GL_CLIP_PLANE0 + i)"); - } + context_enable_clip_distances(context, 0); if (!warned && state->render_states[WINED3D_RS_CLIPPLANEENABLE]) { - FIXME("Clipping not supported with vertex shaders\n"); + FIXME("Clipping not supported with vertex shaders.\n"); warned = TRUE; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9fe7fbc..da06ba1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1901,7 +1901,8 @@ struct wined3d_context DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ - DWORD padding : 17; + DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD padding : 9; DWORD constant_update_mask; DWORD numbered_array_mask; GLenum tracking_parm; /* Which source is tracking current colour */ @@ -2146,6 +2147,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_enable_clip_distances(struct wined3d_context *context, unsigned int mask) DECLSPEC_HIDDEN; void context_end_transform_feedback(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Don' t try to use the Message-Id if the email had none.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: tools Branch: master Commit: e9c3cacc6b62b1290e4b94c0a4e8a40c22264177 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e9c3cacc6b62b1290e4b94c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 4 18:27:30 2017 +0100 testbot: Don't try to use the Message-Id if the email had none. This can happen if one directly feeds the output of git format-patch to the TestBot through formail, which can be useful for testing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b5320dc..42118e6 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -101,9 +101,12 @@ sub FromSubmission($$) $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); my $MessageId = $Head->get("Message-Id"); - $MessageId =~ s/\s*\n\s*/ /gs; - $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); - $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + if ($MessageId) + { + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + } $self->Disposition("Processing"); }

1 0

Francois Gouget : testbot/Janitor: Import File::Path. It' s needed for rmtree().
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: tools Branch: master Commit: 6fcc282a60ecdbef12b54c0d983178cdddb898eb URL: http://source.winehq.org/git/tools.git/?a=commit;h=6fcc282a60ecdbef12b54c0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Dec 4 18:27:42 2017 +0100 testbot/Janitor: Import File::Path. It's needed for rmtree(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index fd1b256..c07c21b 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN } } +use File::Path; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log;

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_cancelable implementation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: a27ad40e317aafc9ad62f8b4c05dcbb0c094b36e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27ad40e317aafc9ad62f8b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:31 2017 +0100 mshtml: Added IDOMEvent::get_cancelable implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 17 ++++++++++------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 5 +++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ddce8b3..a4fa956 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -986,8 +986,11 @@ static HRESULT WINAPI DOMEvent_get_bubbles(IDOMEvent *iface, VARIANT_BOOL *p) static HRESULT WINAPI DOMEvent_get_cancelable(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->cancelable); + return S_OK; } static HRESULT WINAPI DOMEvent_get_currentTarget(IDOMEvent *iface, IEventTarget **p) @@ -1168,6 +1171,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) return NULL; } event->bubbles = (event_info[event_id].flags & EVENT_BUBBLES) != 0; + event->cancelable = (event_info[event_id].flags & EVENT_CANCELABLE) != 0; } nsIDOMEvent_AddRef(event->nsevent = nsevent); return event; @@ -1322,7 +1326,6 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); - const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; @@ -1348,7 +1351,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); @@ -1428,7 +1431,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); @@ -1453,7 +1456,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(hres == S_OK) { TRACE("%s attached <<<\n", debugstr_w(event->type)); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); @@ -1500,7 +1503,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event->type), i); - if(cancelable) { + if(event->cancelable) { if(V_VT(&v) == VT_BOOL) { if(!V_BOOL(&v)) IDOMEvent_preventDefault(&event->IDOMEvent_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 4f106d2..38499d3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -67,6 +67,7 @@ typedef struct { WCHAR *type; EventTarget *target; BOOL bubbles; + BOOL cancelable; BOOL prevent_default; BOOL stop_propagation; DOM_EVENT_PHASE phase; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 864d7d4..a943e41 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2704,6 +2704,11 @@ static void test_create_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_bubbles failed: %08x\n", hres); ok(!b, "bubbles = %x\n", b); + b = 0xdead; + hres = IDOMEvent_get_cancelable(event, &b); + ok(hres == S_OK, "get_cancelable failed: %08x\n", hres); + ok(!b, "cancelable = %x\n", b); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Ignore preventDefault calls for non-cancelable events.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 8600c2a57394b4d71e465e192b3621154b07c5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=8600c2a57394b4d71e465e192… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:40 2017 +0100 mshtml: Ignore preventDefault calls for non-cancelable events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a4fa956..01d9753 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1063,8 +1063,10 @@ static HRESULT WINAPI DOMEvent_preventDefault(IDOMEvent *iface) TRACE("(%p)\n", This); - This->prevent_default = TRUE; - nsIDOMEvent_PreventDefault(This->nsevent); + if(This->current_target && This->cancelable) { + This->prevent_default = TRUE; + nsIDOMEvent_PreventDefault(This->nsevent); + } return S_OK; }

1 0

Jacek Caban : mshtml: Fixed event target leak in dispatch_event.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: e150f96a3e2134d99e17417adae8982c4398d9ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e150f96a3e2134d99e17417ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:48 2017 +0100 mshtml: Fixed event target leak in dispatch_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 01d9753..85f8fe7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1581,6 +1581,8 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) if(target_vtbl && target_vtbl->set_current_event) prev_event = target_vtbl->set_current_event(&event_target->dispex, event->event_obj); + if(event->target) + IDispatchEx_Release(&event->target->dispex.IDispatchEx_iface); event->target = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface);

1 0

Jacek Caban : mshtml: Added IDOMEvent::get_currentTarget implementation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 49abeb63cb88ea2efa6ad599047745bd8794f03c URL: http://source.winehq.org/git/wine.git/?a=commit;h=49abeb63cb88ea2efa6ad5990… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:59 2017 +0100 mshtml: Added IDOMEvent::get_currentTarget implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 32 +++++++++++++++++++++++--------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 85f8fe7..0d45b0b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -996,8 +996,14 @@ static HRESULT WINAPI DOMEvent_get_cancelable(IDOMEvent *iface, VARIANT_BOOL *p) static HRESULT WINAPI DOMEvent_get_currentTarget(IDOMEvent *iface, IEventTarget **p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->current_target) + IEventTarget_AddRef(*p = &This->current_target->IEventTarget_iface); + else + *p = NULL; + return S_OK; } static HRESULT WINAPI DOMEvent_get_defaultPrevented(IDOMEvent *iface, VARIANT_BOOL *p) @@ -1326,7 +1332,6 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { - const eventid_t eid = event->event_id; const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; @@ -1336,6 +1341,9 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) VARIANT v; HRESULT hres; + assert(!event->current_target); + event->current_target = event_target; + if(use_quirks && container && !list_empty(&container->listeners) && event->phase != DEP_CAPTURING_PHASE) { listener = LIST_ENTRY(list_tail(&container->listeners), event_listener_t, entry); @@ -1477,10 +1485,9 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) IDispatch_Release(listener->function); if(listeners != listeners_buf) heap_free(listeners); - if(event->phase == DEP_CAPTURING_PHASE) - return; - if(event_info[eid].dispid && (vtbl = dispex_get_vtbl(&event_target->dispex)) + if(event->phase != DEP_CAPTURING_PHASE && event->event_id != EVENTID_LAST + && event_info[event->event_id].dispid && (vtbl = dispex_get_vtbl(&event_target->dispex)) && vtbl->get_cp_container) cp_container = vtbl->get_cp_container(&event_target->dispex); if(cp_container) { @@ -1490,7 +1497,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) for(j=0; cp_container->cp_entries[j].riid; j++) { cp = cp_container->cps + j; - if(!cp->sinks_size || !is_cp_event(cp->data, event_info[eid].dispid)) + if(!cp->sinks_size || !is_cp_event(cp->data, event_info[event->event_id].dispid)) continue; for(i=0; i < cp->sinks_size; i++) { @@ -1500,7 +1507,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(&v) = VT_EMPTY; TRACE("cp %s [%u] >>>\n", debugstr_w(event->type), i); - hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, + hres = call_cp_func(cp->sinks[i].disp, event_info[event->event_id].dispid, cp->data->pass_event_arg ? event->event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event->type), i); @@ -1522,6 +1529,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } IConnectionPointContainer_Release(&cp_container->IConnectionPointContainer_iface); } + + event->current_target = NULL; } void dispatch_event(EventTarget *event_target, DOMEvent *event) @@ -1534,12 +1543,17 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) EventTarget *iter; HRESULT hres; + TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); + if(event->event_id == EVENTID_LAST) { FIXME("Unsupported on unknown events\n"); return; } - TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); + if(event->current_target) { + FIXME("event is being dispatched.\n"); + return; + } iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 38499d3..f99c893 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,7 @@ typedef struct { eventid_t event_id; WCHAR *type; EventTarget *target; + EventTarget *current_target; BOOL bubbles; BOOL cancelable; BOOL prevent_default;

1 0