February 2017 - Wine-Commits

Jacek Caban : mshtml: Store event handlers in rb tree.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: c4e9787e8683ae0f88df8225500e914f42db4397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e9787e8683ae0f88df82255… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:12:33 2017 +0100 mshtml: Store event handlers in rb tree. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 89 ++++++++++++++++++++++---------------------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/xmlhttprequest.c | 1 + 6 files changed, 49 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7d11747..27e041c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -36,15 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + struct wine_rb_entry entry; + eventid_t event_id; IDispatch *handler_prop; DWORD handler_cnt; IDispatch **handlers; } handler_vector_t; -struct event_target_t { - handler_vector_t *event_table[EVENTID_LAST]; -}; - static const WCHAR abortW[] = {'a','b','o','r','t',0}; static const WCHAR onabortW[] = {'o','n','a','b','o','r','t',0}; @@ -899,37 +897,35 @@ HRESULT create_event_obj(IHTMLEventObj **ret) return S_OK; } -static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) +static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) { - const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); + const dispex_static_data_vtbl_t *vtbl; + handler_vector_t *handler_vector; + struct wine_rb_entry *entry; - if(vtbl && vtbl->get_event_target) + vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->get_event_target) event_target = vtbl->get_event_target(&event_target->dispex); - if(event_target->ptr || !alloc) - return event_target->ptr; - return event_target->ptr = heap_alloc_zero(sizeof(event_target_t)); -} - -static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) -{ - event_target_t *data; + entry = wine_rb_get(&event_target->handler_map, (const void*)eid); + if(entry) + return WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry); + if(!alloc) + return NULL; - data = get_event_target_data(event_target, alloc); - if(!data) + handler_vector = heap_alloc_zero(sizeof(*handler_vector)); + if(!handler_vector) return NULL; - if(alloc && !data->event_table[eid]) { - data->event_table[eid] = heap_alloc_zero(sizeof(*data->event_table[eid])); - if(data->event_table[eid]) { - const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); - if(vtbl->bind_event) - vtbl->bind_event(&event_target->dispex, eid); - else - FIXME("Unsupported event binding on target %p\n", event_target); - } - } - return data->event_table[eid]; + handler_vector->event_id = eid; + vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->bind_event) + vtbl->bind_event(&event_target->dispex, eid); + else + FIXME("Unsupported event binding on target %p\n", event_target); + + wine_rb_put(&event_target->handler_map, (const void*)eid, &handler_vector->entry); + return handler_vector; } static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) @@ -1642,25 +1638,28 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } -void release_event_target(EventTarget *event_target) +static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { - int i; - unsigned int j; + return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry)->event_id; +} - if(!event_target->ptr) - return; +void init_event_target(EventTarget *event_target) +{ + wine_rb_init(&event_target->handler_map, event_id_cmp); +} - for(i=0; i < EVENTID_LAST; i++) { - if(event_target->ptr->event_table[i]) { - if(event_target->ptr->event_table[i]->handler_prop) - IDispatch_Release(event_target->ptr->event_table[i]->handler_prop); - for(j=0; j < event_target->ptr->event_table[i]->handler_cnt; j++) - if(event_target->ptr->event_table[i]->handlers[j]) - IDispatch_Release(event_target->ptr->event_table[i]->handlers[j]); - heap_free(event_target->ptr->event_table[i]->handlers); - heap_free(event_target->ptr->event_table[i]); - } - } +void release_event_target(EventTarget *event_target) +{ + handler_vector_t *iter, *iter2; + unsigned i; - heap_free(event_target->ptr); + WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(iter, iter2, &event_target->handler_map, handler_vector_t, entry) { + if(iter->handler_prop) + IDispatch_Release(iter->handler_prop); + for(i = 0; i < iter->handler_cnt; i++) + if(iter->handlers[i]) + IDispatch_Release(iter->handlers[i]); + heap_free(iter->handlers); + heap_free(iter); + } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d66f359..5bdd435 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -55,6 +55,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; +void init_event_target(EventTarget*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,HTMLDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ab47323..2dfbeaa 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1214,6 +1214,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; ccref_init(&node->ccref, 1); + init_event_target(&node->event_target); if(&doc->node != node) htmldoc_addref(&doc->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e3f22cf..a5db035 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3020,6 +3020,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, window->base.outer_window = outer_window; window->base.inner_window = window; + init_event_target(&window->event_target); init_dispex(&window->event_target.dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); window->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 457e32b..89f2fcb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -72,7 +72,6 @@ typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; -typedef struct event_target_t event_target_t; typedef struct EventTarget EventTarget; #define TID_LIST \ @@ -366,7 +365,7 @@ typedef struct { struct EventTarget { DispatchEx dispex; - event_target_t *ptr; + struct wine_rb_tree handler_map; }; typedef struct { diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 51e2445..ab14c54 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -851,6 +851,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + init_event_target(&ret->event_target); init_dispex(&ret->event_target.dispex, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex); ret->ref = 1;

1 0

Jacek Caban : mshtml: Use get_handler_vector in get_event_handler.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 3fcb5a0aed232acb0f860aa8c94fbc5cfece2191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fcb5a0aed232acb0f860aa8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:32 2017 +0100 mshtml: Use get_handler_vector in get_event_handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c8438a7..d144eeb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1446,7 +1446,7 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var /* * Setting event handler to string is a rare case and we don't want to - * complicate nor increase memory of event_target_t for that. Instead, + * complicate nor increase memory of handler_vector_t for that. Instead, * we store the value in DispatchEx, which can already handle custom * properties. */ @@ -1475,7 +1475,7 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var) { - event_target_t *data; + handler_vector_t *handler_vector; VARIANT *v; HRESULT hres; @@ -1485,10 +1485,10 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var return VariantCopy(var, v); } - data = get_event_target_data(event_target, FALSE); - if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(handler_vector && handler_vector->handler_prop) { V_VT(var) = VT_DISPATCH; - V_DISPATCH(var) = data->event_table[eid]->handler_prop; + V_DISPATCH(var) = handler_vector->handler_prop; IDispatch_AddRef(V_DISPATCH(var)); }else { V_VT(var) = VT_NULL;

1 0

Jacek Caban : mshtml: Added new get_handler_vector helper for creating handle_vector_t.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: db67232ce25b0c197afb8e2506b9e6335bd0d536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db67232ce25b0c197afb8e250… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:15 2017 +0100 mshtml: Added new get_handler_vector helper for creating handle_vector_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 88 ++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 96885b0..44a5df0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -911,6 +911,27 @@ static inline event_target_t *get_event_target_data(EventTarget *event_target, B return event_target->ptr = heap_alloc_zero(sizeof(event_target_t)); } +static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) +{ + event_target_t *data; + + data = get_event_target_data(event_target, alloc); + if(!data) + return NULL; + + if(alloc && !data->event_table[eid]) { + data->event_table[eid] = heap_alloc_zero(sizeof(*data->event_table[eid])); + if(data->event_table[eid]) { + const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->bind_event) + vtbl->bind_event(&event_target->dispex, eid); + else + FIXME("Unsupported event binding on target %p\n", event_target); + } + } + return data->event_table[eid]; +} + static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) { IDispatchEx *dispex; @@ -1315,15 +1336,6 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return S_OK; } -static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid) -{ - if(event_target->event_table[eid]) - return TRUE; - - event_target->event_table[eid] = heap_alloc_zero(sizeof(*event_target->event_table[eid])); - return event_target->event_table[eid] != NULL; -} - HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) { nsIDOMNode *nsnode = NULL; @@ -1378,16 +1390,6 @@ void detach_events(HTMLDocumentNode *doc) release_nsevents(doc); } -/* Caller should ensure that it's called only once for given event in the target. */ -static void bind_event(EventTarget *event_target, eventid_t eid) -{ - const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); - if(vtbl->bind_event) - vtbl->bind_event(&event_target->dispex, eid); - else - FIXME("Unsupported event binding on target %p\n", event_target); -} - static void remove_event_handler(EventTarget *event_target, eventid_t eid) { event_target_t *data; @@ -1407,7 +1409,7 @@ static void remove_event_handler(EventTarget *event_target, eventid_t eid) static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, IDispatch *disp) { - event_target_t *data; + handler_vector_t *handler_vector; if(event_info[eid].flags & EVENT_FIXME) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); @@ -1416,20 +1418,14 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, if(!disp) return S_OK; - data = get_event_target_data(event_target, TRUE); - if(!data) + handler_vector = get_handler_vector(event_target, eid, TRUE); + if(!handler_vector) return E_OUTOFMEMORY; - if(!data->event_table[eid]) { - if(!alloc_handler_vector(data, eid)) - return E_OUTOFMEMORY; + if(handler_vector->handler_prop) + IDispatch_Release(handler_vector->handler_prop); - bind_event(event_target, eid); - }else if(data->event_table[eid]->handler_prop) { - IDispatch_Release(data->event_table[eid]->handler_prop); - } - - data->event_table[eid]->handler_prop = disp; + handler_vector->handler_prop = disp; IDispatch_AddRef(disp); return S_OK; } @@ -1503,7 +1499,7 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARIANT_BOOL *res) { - event_target_t *data; + handler_vector_t *handler_vector; eventid_t eid; DWORD i = 0; @@ -1517,31 +1513,25 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI if(event_info[eid].flags & EVENT_FIXME) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); - data = get_event_target_data(event_target, TRUE); - if(!data) + handler_vector = get_handler_vector(event_target, eid, TRUE); + if(!handler_vector) return E_OUTOFMEMORY; - if(data->event_table[eid]) { - while(i < data->event_table[eid]->handler_cnt && data->event_table[eid]->handlers[i]) - i++; - }else if(alloc_handler_vector(data, eid)) { - bind_event(event_target, eid); - }else { - return E_OUTOFMEMORY; - } - if(i == data->event_table[eid]->handler_cnt) { + while(i < handler_vector->handler_cnt && handler_vector->handlers[i]) + i++; + if(i == handler_vector->handler_cnt) { if(i) - data->event_table[eid]->handlers = heap_realloc_zero(data->event_table[eid]->handlers, - (i + 1) * sizeof(*data->event_table[eid]->handlers)); + handler_vector->handlers = heap_realloc_zero(handler_vector->handlers, + (i + 1) * sizeof(*handler_vector->handlers)); else - data->event_table[eid]->handlers = heap_alloc_zero(sizeof(*data->event_table[eid]->handlers)); - if(!data->event_table[eid]->handlers) + handler_vector->handlers = heap_alloc_zero(sizeof(*handler_vector->handlers)); + if(!handler_vector->handlers) return E_OUTOFMEMORY; - data->event_table[eid]->handler_cnt++; + handler_vector->handler_cnt++; } IDispatch_AddRef(disp); - data->event_table[eid]->handlers[i] = disp; + handler_vector->handlers[i] = disp; *res = VARIANT_TRUE; return S_OK;

1 0

Jacek Caban : mshtml: Return event target as EventTarget in NodeImplVtbl.get_event_target.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: e1d54def73187d2302c9c8c789062fc6637a3a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d54def73187d2302c9c8c78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:51 2017 +0100 mshtml: Return event target as EventTarget in NodeImplVtbl.get_event_target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 8 ++++---- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/mshtml_private.h | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fbd04aa..e1e886f 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -825,13 +825,13 @@ static void HTMLBodyElement_unlink(HTMLDOMNode *iface) } } -static event_target_t **HTMLBodyElement_get_event_target_ptr(HTMLDOMNode *iface) +static EventTarget *HTMLBodyElement_get_event_target(HTMLDOMNode *iface) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); return This->textcont.element.node.doc && This->textcont.element.node.doc->window - ? &This->textcont.element.node.doc->window->event_target.ptr - : &This->textcont.element.node.event_target.ptr; + ? &This->textcont.element.node.doc->window->event_target + : &This->textcont.element.node.event_target; } static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) @@ -863,7 +863,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, - HTMLBodyElement_get_event_target_ptr, + HTMLBodyElement_get_event_target, NULL, NULL, NULL, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d191a35..3a6197d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5077,8 +5077,8 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex); - return This->node.vtbl->get_event_target_ptr - ? This->node.vtbl->get_event_target_ptr(&This->node) + return This->node.vtbl->get_event_target + ? &This->node.vtbl->get_event_target(&This->node)->ptr : &This->node.event_target.ptr; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8bc0599..68362f7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -73,6 +73,7 @@ typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; typedef struct event_target_t event_target_t; +typedef struct EventTarget EventTarget; #define TID_LIST \ XIID(NULL) \ @@ -363,10 +364,10 @@ typedef struct { DISPID id; } global_prop_t; -typedef struct { +struct EventTarget { DispatchEx dispex; event_target_t *ptr; -} EventTarget; +}; typedef struct { DispatchEx dispex; @@ -695,7 +696,7 @@ typedef struct { HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**); HRESULT (*handle_event)(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*); HRESULT (*get_attr_col)(HTMLDOMNode*,HTMLAttributeCollection**); - event_target_t **(*get_event_target_ptr)(HTMLDOMNode*); + EventTarget *(*get_event_target)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);

1 0

Józef Kucia : d3d11/tests: Add test for atomic instructions.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 826b1e9c7852f4bceb28b1129063c263c49d3730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826b1e9c7852f4bceb28b1129… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:13 2017 +0100 d3d11/tests: Add test for atomic instructions. 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/d3d11/tests/d3d11.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff983b2..3977f70 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -66,6 +66,11 @@ struct vec4 float x, y, z, w; }; +struct ivec4 +{ + int x, y, z, w; +}; + struct uvec4 { unsigned int x, y, z, w; @@ -12842,6 +12847,177 @@ static void test_ps_cs_uav_binding(void) release_test_context(&test_context); } +static void test_ps_uav_atomic_instructions(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + struct resource_readback rb; + ID3D11Buffer *cb, *raw_uav; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + unsigned int i, j; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD ps_atomics_code[] = + { +#if 0 + RWByteAddressBuffer u; + + uint4 v; + int4 i; + + void main() + { + u.InterlockedAnd(0 * 4, v.x); + u.InterlockedCompareStore(1 * 4, v.y, v.x); + u.InterlockedAdd(2 * 4, v.x); + u.InterlockedOr(3 * 4, v.x); + u.InterlockedMax(4 * 4, i.x); + u.InterlockedMin(5 * 4, i.x); + u.InterlockedMax(6 * 4, v.x); + u.InterlockedMin(7 * 4, v.x); + u.InterlockedXor(8 * 4, v.x); + } +#endif + 0x43425844, 0x24c6a30c, 0x2ce4437d, 0xdee8a0df, 0xd18cb4bc, 0x00000001, 0x000001ac, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000158, 0x00000050, 0x00000056, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300009d, 0x0011e000, 0x00000000, 0x080000a9, + 0x0011e000, 0x00000000, 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0b0000ac, + 0x0011e000, 0x00000000, 0x00004001, 0x00000004, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ad, 0x0011e000, 0x00000000, 0x00004001, 0x00000008, 0x0020800a, + 0x00000000, 0x00000000, 0x080000aa, 0x0011e000, 0x00000000, 0x00004001, 0x0000000c, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ae, 0x0011e000, 0x00000000, 0x00004001, 0x00000010, 0x0020800a, + 0x00000000, 0x00000001, 0x080000af, 0x0011e000, 0x00000000, 0x00004001, 0x00000014, 0x0020800a, + 0x00000000, 0x00000001, 0x080000b0, 0x0011e000, 0x00000000, 0x00004001, 0x00000018, 0x0020800a, + 0x00000000, 0x00000000, 0x080000b1, 0x0011e000, 0x00000000, 0x00004001, 0x0000001c, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ab, 0x0011e000, 0x00000000, 0x00004001, 0x00000020, 0x0020800a, + 0x00000000, 0x00000000, 0x0100003e, + }; + + static const char * const instructions[] = + { + "atomic_and", "atomic_cmp_store", "atomic_iadd", "atomic_or", + "atomic_imax", "atomic_imin", "atomic_umax", "atomic_umin", "atomic_xor", + }; + static const struct test + { + struct uvec4 v; + struct ivec4 i; + unsigned int input[sizeof(instructions) / sizeof(*instructions)]; + unsigned int expected_result[sizeof(instructions) / sizeof(*instructions)]; + } + tests[] = + { + {{1, 0}, {-1}, {0xffff, 0, 1, 0, 0, 0, 0, 0, 0xff}, { 1, 1, 2, 1, 0, ~0u, 1, 0, 0xfe}}, + {{~0u, ~0u}, { 0}, {0xffff, 0xf, 1, 0, 0, 0, 0, 9, ~0u}, {0xffff, 0xf, 0, ~0u, 0, 0, ~0u, 9, 0}}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 2 * sizeof(struct uvec4), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + buffer_desc.ByteWidth = sizeof(tests->input); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &raw_uav); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = buffer_desc.ByteWidth / sizeof(*tests->input); + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)raw_uav, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, NULL, + 0, 1, &uav, NULL); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + hr = ID3D11Device_CreatePixelShader(device, ps_atomics_code, sizeof(ps_atomics_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, + NULL, &test->v, 0, 0); + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)raw_uav, 0, + NULL, test->input, 0, 0); + + draw_quad(&test_context); + + get_buffer_readback(raw_uav, &rb); + for (j = 0; j < sizeof(instructions) / sizeof(*instructions); ++j) + { + unsigned int value = get_readback_color(&rb, j, 0); + unsigned int expected = test->expected_result[j]; + + todo_wine_if(expected != test->input[j] + && (!strcmp(instructions[j], "atomic_imax") + || !strcmp(instructions[j], "atomic_imin") + || !strcmp(instructions[j], "atomic_umax") + || !strcmp(instructions[j], "atomic_umin"))) + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + } + release_resource_readback(&rb); + } + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(raw_uav); + ID3D11PixelShader_Release(ps); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + static void test_sm4_ret_instruction(void) { struct d3d11_test_context test_context; @@ -14075,6 +14251,7 @@ START_TEST(d3d11) test_uav_load(); test_cs_uav_store(); test_ps_cs_uav_binding(); + test_ps_uav_atomic_instructions(); test_sm4_ret_instruction(); test_primitive_restart(); test_resinfo_instruction();

1 0

Józef Kucia : wined3d: Implement SM5 atomic_* instructions.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 5043770acff11971315a1bc626f8b5149ef49dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5043770acff11971315a1bc62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:12 2017 +0100 wined3d: Implement SM5 atomic_* instructions. 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 | 63 +++++++++++++++++++++++++++++++++------------- dlls/wined3d/shader.c | 8 +++--- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e752e3..7a7501e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4926,21 +4926,13 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - struct glsl_src_param image_coord_param, image_data_param; + struct glsl_src_param coord_param, data_param, data_param2; enum wined3d_shader_resource_type resource_type; enum wined3d_data_type data_type; unsigned int uav_idx; DWORD coord_mask; const char *op; - switch (ins->handler_idx) - { - case WINED3DSIH_ATOMIC_IADD: op = "imageAtomicAdd"; break; - default: - ERR("Unhandled opcode %#x.\n", ins->handler_idx); - return; - } - uav_idx = ins->dst[0].reg.idx[0].offset; resource_type = reg_maps->uav_resource_info[uav_idx].type; if (resource_type >= ARRAY_SIZE(resource_type_info)) @@ -4951,11 +4943,46 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) data_type = reg_maps->uav_resource_info[uav_idx].data_type; coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; - shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); - shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, %s);\n", - op, shader_glsl_get_prefix(version->type), uav_idx, - image_coord_param.param_str, image_data_param.param_str); + switch (ins->handler_idx) + { + case WINED3DSIH_ATOMIC_AND: + op = "imageAtomicAnd"; + break; + case WINED3DSIH_ATOMIC_CMP_STORE: + op = "imageAtomicCompSwap"; + break; + case WINED3DSIH_ATOMIC_IADD: + op = "imageAtomicAdd"; + break; + case WINED3DSIH_ATOMIC_OR: + op = "imageAtomicOr"; + break; + case WINED3DSIH_ATOMIC_XOR: + op = "imageAtomicXor"; + break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &coord_param); + + if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s / 4, ", + op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + else + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, ", + op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data_param, data_type); + shader_addline(ins->ctx->buffer, "%s", data_param.param_str); + if (ins->src_count >= 3) + { + shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data_param2, data_type); + shader_addline(ins->ctx->buffer, ", %s", data_param2.param_str); + } + + shader_addline(ins->ctx->buffer, ");\n"); } static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) @@ -9160,15 +9187,15 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, - /* WINED3DSIH_ATOMIC_AND */ NULL, - /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, + /* WINED3DSIH_ATOMIC_AND */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_CMP_STORE */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_IMIN */ NULL, - /* WINED3DSIH_ATOMIC_OR */ NULL, + /* WINED3DSIH_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, - /* WINED3DSIH_ATOMIC_XOR */ NULL, + /* WINED3DSIH_ATOMIC_XOR */ shader_glsl_atomic, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ shader_glsl_bitwise_op, /* WINED3DSIH_BFREV */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dbf0430..82fa011 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1282,14 +1282,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD + if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) { unsigned int reg_idx; - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) - reg_idx = ins.dst[0].reg.idx[0].offset; - else + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) reg_idx = ins.src[1].reg.idx[0].offset; + else + reg_idx = ins.dst[0].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) { ERR("Invalid UAV index %u.\n", reg_idx);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 9e779666faed703373958a1bd6ec3c67b0cb8ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e779666faed703373958a1bd… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 17:02:02 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index e98f148..16683a2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9325,10 +9325,8 @@ msgid "Confidentiality Required" msgstr "Vaaditaan luottamuksellisuutta" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Sulkeminen meneillään.\n" +msgstr "SASL-todennus on kesken" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11923,17 +11921,11 @@ msgstr "Valitun rekisteriarvon uudelleennimeäminen ei onnistu." #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Avaimet ja arvot tiedostosta %1 on nyt lisätty rekisteriin." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Avaimen '%1' nimeäminen ei onnistu.\n" -"Annettu avaimen nimi on jo varattu." +msgstr "Tiedostoa %1 ei voi tuoda, koska se ei ole kelpo rekisteritiedosto." #: regedit.rc:373 msgid ""

1 0

Jacek Caban : mshtml: Return event target as EventTarget from DispatchEx vtbl.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: c12b4b4846a06f53736c54a8dcc932599c4368cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12b4b4846a06f53736c54a8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:58 2017 +0100 mshtml: Return event target as EventTarget from DispatchEx vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlevent.c | 12 +++++------- dlls/mshtml/htmlwindow.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3a6197d..3d156d8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5074,12 +5074,12 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) return S_OK; } -static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) +static EventTarget *HTMLElement_get_event_target(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex); return This->node.vtbl->get_event_target - ? &This->node.vtbl->get_event_target(&This->node)->ptr - : &This->node.event_target.ptr; + ? This->node.vtbl->get_event_target(&This->node) + : &This->node.event_target; } static void HTMLElement_bind_event(DispatchEx *dispex, int eid) @@ -5113,7 +5113,7 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { HTMLElement_get_dispid, HTMLElement_invoke, HTMLElement_populate_props, - HTMLElement_get_event_target_ptr, + HTMLElement_get_event_target, HTMLElement_bind_event }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fc5277b..4a28bb8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -902,15 +902,13 @@ HRESULT create_event_obj(IHTMLEventObj **ret) static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) { const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); - event_target_t **ptr; - ptr = vtbl && vtbl->get_event_target_ptr - ? vtbl->get_event_target_ptr(&event_target->dispex) - : &event_target->ptr; - if(*ptr || !alloc) - return *ptr; + if(vtbl && vtbl->get_event_target) + event_target = vtbl->get_event_target(&event_target->dispex); + if(event_target->ptr || !alloc) + return event_target->ptr; - return *ptr = heap_alloc_zero(sizeof(event_target_t)); + return event_target->ptr = heap_alloc_zero(sizeof(event_target_t)); } static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b1efc0d..aa64fb4 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2942,10 +2942,10 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } -static event_target_t **HTMLWindow_get_event_target_ptr(DispatchEx *dispex) +static EventTarget *HTMLWindow_get_event_target(DispatchEx *dispex) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - return &This->event_target.ptr; + return &This->event_target; } static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) @@ -2964,7 +2964,7 @@ static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, HTMLWindow_invoke, NULL, - HTMLWindow_get_event_target_ptr, + HTMLWindow_get_event_target, HTMLWindow_bind_event }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 68362f7..457e32b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -259,7 +259,7 @@ typedef struct { HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*populate_props)(DispatchEx*); /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ - event_target_t **(*get_event_target_ptr)(DispatchEx*); + EventTarget *(*get_event_target)(DispatchEx*); void (*bind_event)(DispatchEx*,int); } dispex_static_data_vtbl_t;

1 0

Jacek Caban : mshtml: Don' t reallocate handler_vector_t when handlers are added.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 72ee409e7f4729f1b22ea1fc0d092c83ceffe2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ee409e7f4729f1b22ea1fc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:07 2017 +0100 mshtml: Don't reallocate handler_vector_t when handlers are added. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4a28bb8..96885b0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IDispatch *handler_prop; DWORD handler_cnt; - IDispatch *handlers[0]; + IDispatch **handlers; } handler_vector_t; struct event_target_t { @@ -1315,25 +1315,13 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return S_OK; } -static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, int cnt) +static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid) { - handler_vector_t *new_vector, *handler_vector = event_target->event_table[eid]; + if(event_target->event_table[eid]) + return TRUE; - if(handler_vector) { - if(cnt <= handler_vector->handler_cnt) - return TRUE; - - new_vector = heap_realloc_zero(handler_vector, sizeof(handler_vector_t) + sizeof(IDispatch*)*cnt); - }else { - new_vector = heap_alloc_zero(sizeof(handler_vector_t) + sizeof(IDispatch*)*cnt); - } - - if(!new_vector) - return FALSE; - - new_vector->handler_cnt = cnt; - event_target->event_table[eid] = new_vector; - return TRUE; + event_target->event_table[eid] = heap_alloc_zero(sizeof(*event_target->event_table[eid])); + return event_target->event_table[eid] != NULL; } HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) @@ -1433,7 +1421,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, return E_OUTOFMEMORY; if(!data->event_table[eid]) { - if(!alloc_handler_vector(data, eid, 0)) + if(!alloc_handler_vector(data, eid)) return E_OUTOFMEMORY; bind_event(event_target, eid); @@ -1536,13 +1524,21 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI if(data->event_table[eid]) { while(i < data->event_table[eid]->handler_cnt && data->event_table[eid]->handlers[i]) i++; - if(i == data->event_table[eid]->handler_cnt && !alloc_handler_vector(data, eid, i+1)) - return E_OUTOFMEMORY; - }else if(alloc_handler_vector(data, eid, i+1)) { + }else if(alloc_handler_vector(data, eid)) { bind_event(event_target, eid); }else { return E_OUTOFMEMORY; } + if(i == data->event_table[eid]->handler_cnt) { + if(i) + data->event_table[eid]->handlers = heap_realloc_zero(data->event_table[eid]->handlers, + (i + 1) * sizeof(*data->event_table[eid]->handlers)); + else + data->event_table[eid]->handlers = heap_alloc_zero(sizeof(*data->event_table[eid]->handlers)); + if(!data->event_table[eid]->handlers) + return E_OUTOFMEMORY; + data->event_table[eid]->handler_cnt++; + } IDispatch_AddRef(disp); data->event_table[eid]->handlers[i] = disp;

1 0

Jacek Caban : mshtml: Use get_handler_vector in remove_event_handler.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 6da77419b5f7240cad402bd83f45828344489fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da77419b5f7240cad402bd83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:25 2017 +0100 mshtml: Use get_handler_vector in remove_event_handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 44a5df0..0f835e2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1392,7 +1392,7 @@ void detach_events(HTMLDocumentNode *doc) static void remove_event_handler(EventTarget *event_target, eventid_t eid) { - event_target_t *data; + handler_vector_t *handler_vector; VARIANT *store; HRESULT hres; @@ -1400,10 +1400,10 @@ static void remove_event_handler(EventTarget *event_target, eventid_t eid) if(SUCCEEDED(hres)) VariantClear(store); - data = get_event_target_data(event_target, FALSE); - if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { - IDispatch_Release(data->event_table[eid]->handler_prop); - data->event_table[eid]->handler_prop = NULL; + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(handler_vector && handler_vector->handler_prop) { + IDispatch_Release(handler_vector->handler_prop); + handler_vector->handler_prop = NULL; } }

1 0