wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Henri Verbeet : wined3d: Pass a texture and sub-resource index to context_acquire().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 2641c5c28f407fb157028c8e7dda5e306b6b313c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2641c5c28f407fb157028c8e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:15 2017 +0100 wined3d: Pass a texture and sub-resource index to context_acquire(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/buffer.c | 14 +++++++------- dlls/wined3d/context.c | 35 +++++++++++++++-------------------- dlls/wined3d/device.c | 21 ++++++++++++--------- dlls/wined3d/drawprim.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/query.c | 31 +++++++++++++++++++------------ dlls/wined3d/sampler.c | 4 ++-- dlls/wined3d/surface.c | 37 +++++++++++++++++++++---------------- dlls/wined3d/swapchain.c | 8 ++++---- dlls/wined3d/texture.c | 20 ++++++++++---------- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 13 files changed, 100 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2641c5c28f407fb157028…

1 0

Henri Verbeet : wined3d: Use wined3d_device_delete_opengl_contexts() in wined3d_device_uninit_3d().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: b64d5474de2e442d2fe11cd64c86adb6f2d75c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b64d5474de2e442d2fe11cd64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:14 2017 +0100 wined3d: Use wined3d_device_delete_opengl_contexts() in wined3d_device_uninit_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 191 ++++++++++++++++++++++---------------------------- 1 file changed, 83 insertions(+), 108 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1271363..22a13a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -942,6 +942,87 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_set_render_state(device, WINED3D_RS_ZENABLE, ds_enable); } +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) +{ + struct wined3d_resource *resource, *cursor; + struct wined3d_context *context; + struct wined3d_shader *shader; + + LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) + { + TRACE("Unloading resource %p.\n", resource); + wined3d_cs_emit_unload_resource(device->cs, resource); + } + + LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) + { + device->shader_backend->shader_destroy(shader); + } + + context = context_acquire(device, NULL); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + destroy_dummy_textures(device, context); + destroy_default_samplers(device, context); + context_release(context); + + while (device->context_count) + { + if (device->contexts[0]->swapchain) + swapchain_destroy_contexts(device->contexts[0]->swapchain); + else + context_destroy(device, device->contexts[0]); + } +} + +static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +{ + struct wined3d_context *context; + struct wined3d_texture *target; + HRESULT hr; + + if (FAILED(hr = device->shader_backend->shader_alloc_private(device, + device->adapter->vertex_pipe, device->adapter->fragment_pipe))) + { + ERR("Failed to allocate shader private data, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = device->blitter->alloc_private(device))) + { + ERR("Failed to allocate blitter private data, hr %#x.\n", hr); + device->shader_backend->shader_free_private(device); + return hr; + } + + /* Recreate the primary swapchain's context. */ + if (!(swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)))) + { + ERR("Failed to allocate memory for swapchain context array.\n"); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + return E_OUTOFMEMORY; + } + + target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; + if (!(context = context_create(swapchain, target, swapchain->ds_format))) + { + WARN("Failed to create context.\n"); + HeapFree(GetProcessHeap(), 0, swapchain->context); + device->blitter->free_private(device); + device->shader_backend->shader_free_private(device); + return E_FAIL; + } + + swapchain->context[0] = context; + swapchain->num_contexts = 1; + create_dummy_textures(device, context); + create_default_samplers(device, context); + context_release(context); + + return WINED3D_OK; +} + HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { @@ -1094,9 +1175,6 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { - struct wined3d_resource *resource, *cursor; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; UINT i; TRACE("device %p.\n", device); @@ -1104,12 +1182,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (!device->d3d_initialized) return WINED3DERR_INVALIDCALL; - /* I don't think that the interface guarantees that the device is destroyed from the same thread - * it was created. Thus make sure a context is active for the glDelete* calls - */ - context = context_acquire(device, NULL); - gl_info = context->gl_info; - if (device->logo_texture) wined3d_texture_decref(device->logo_texture); if (device->cursor_texture) @@ -1117,22 +1189,9 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) state_unbind_resources(&device->state); - /* Unload resources */ - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - wine_rb_clear(&device->samplers, device_free_sampler, NULL); - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, context); - destroy_default_samplers(device, context); - - context_release(context); + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1153,7 +1212,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4528,90 +4587,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } -static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) -{ - struct wined3d_resource *resource, *cursor; - struct wined3d_context *context; - struct wined3d_shader *shader; - - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) - { - TRACE("Unloading resource %p.\n", resource); - wined3d_cs_emit_unload_resource(device->cs, resource); - } - - LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) - { - device->shader_backend->shader_destroy(shader); - } - - context = context_acquire(device, NULL); - - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - destroy_dummy_textures(device, context); - destroy_default_samplers(device, context); - - context_release(context); - - while (device->context_count) - { - if (device->contexts[0]->swapchain) - swapchain_destroy_contexts(device->contexts[0]->swapchain); - else - context_destroy(device, device->contexts[0]); - } -} - -static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) -{ - struct wined3d_context *context; - struct wined3d_texture *target; - HRESULT hr; - - if (FAILED(hr = device->shader_backend->shader_alloc_private(device, - device->adapter->vertex_pipe, device->adapter->fragment_pipe))) - { - ERR("Failed to allocate shader private data, hr %#x.\n", hr); - return hr; - } - - if (FAILED(hr = device->blitter->alloc_private(device))) - { - ERR("Failed to allocate blitter private data, hr %#x.\n", hr); - device->shader_backend->shader_free_private(device); - return hr; - } - - /* Recreate the primary swapchain's context */ - swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(*swapchain->context)); - if (!swapchain->context) - { - ERR("Failed to allocate memory for swapchain context array.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - return E_OUTOFMEMORY; - } - - target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; - if (!(context = context_create(swapchain, target, swapchain->ds_format))) - { - WARN("Failed to create context.\n"); - device->blitter->free_private(device); - device->shader_backend->shader_free_private(device); - HeapFree(GetProcessHeap(), 0, swapchain->context); - return E_FAIL; - } - - swapchain->context[0] = context; - swapchain->num_contexts = 1; - create_dummy_textures(device, context); - create_default_samplers(device, context); - context_release(context); - - return WINED3D_OK; -} - HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state)

1 0

Henri Verbeet : wined3d: Free the swapchain context array in swapchain_destroy_contexts().
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 274b091c87a564f955f7dcef7f5f5508b6997f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274b091c87a564f955f7dcef7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:13 2017 +0100 wined3d: Free the swapchain context array in swapchain_destroy_contexts(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++----- dlls/wined3d/swapchain.c | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6452420..1271363 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4528,7 +4528,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } -static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) +static void wined3d_device_delete_opengl_contexts(struct wined3d_device *device) { struct wined3d_resource *resource, *cursor; struct wined3d_context *context; @@ -4561,9 +4561,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d else context_destroy(device, device->contexts[0]); } - - HeapFree(GetProcessHeap(), 0, swapchain->context); - swapchain->context = NULL; } static HRESULT create_primary_opengl_context(struct wined3d_device *device, struct wined3d_swapchain *swapchain) @@ -4827,7 +4824,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_cleanup(&device->state); if (device->d3d_initialized) - delete_opengl_contexts(device, swapchain); + wined3d_device_delete_opengl_contexts(device); state_init(&device->state, &device->fb, &device->adapter->gl_info, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dfb62c8..f5fdd96 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1136,7 +1136,9 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) { context_destroy(swapchain->device, swapchain->context[i]); } + HeapFree(GetProcessHeap(), 0, swapchain->context); swapchain->num_contexts = 0; + swapchain->context = NULL; } struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain)

1 0

Henri Verbeet : wined3d: Get rid of the unused "depth_blt_texture" field from struct wined3d_device.
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 908010d47bfeaed417250897bb18e569f5632394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908010d47bfeaed417250897b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 15 14:17:12 2017 +0100 wined3d: Get rid of the unused "depth_blt_texture" field from struct wined3d_device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 ----------------- dlls/wined3d/wined3d_private.h | 3 --- 2 files changed, 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b4b1803..6452420 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1126,15 +1126,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - /* Destroy the depth blt resources, they will be invalid after the reset. Also free shader - * private data, it might contain opengl pointers - */ - if (device->depth_blt_texture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); - device->depth_blt_texture = 0; - } - /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ device->blitter->free_private(device); device->shader_backend->shader_free_private(device); @@ -4540,7 +4531,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { struct wined3d_resource *resource, *cursor; - const struct wined3d_gl_info *gl_info; struct wined3d_context *context; struct wined3d_shader *shader; @@ -4556,13 +4546,6 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d } context = context_acquire(device, NULL); - gl_info = context->gl_info; - - if (device->depth_blt_texture) - { - gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture); - device->depth_blt_texture = 0; - } device->blitter->free_private(device); device->shader_backend->shader_free_private(device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 23a8559..6b3d3e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2618,9 +2618,6 @@ struct wined3d_device struct wined3d_fb_state fb; struct wined3d_rendertarget_view *auto_depth_stencil_view; - /* For rendering to a texture using glCopyTexImage */ - GLuint depth_blt_texture; - /* Cursor management */ UINT xHotSpot; UINT yHotSpot;

1 0

Piotr Caban : wine.inf: Add Dynamic DST/{First, Last}Entry registry keys.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 8af23cb93e4e1cd3686984399cb50d755f5171e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af23cb93e4e1cd3686984399… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 14:52:56 2017 +0100 wine.inf: Add Dynamic DST/{First,Last}Entry registry keys. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8af23cb93e4e1cd368698…

1 0

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

14 Feb '17

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 : rbtree.h: Added WINE_RB_FOR_EACH_DESTRUCTOR and WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR helpers for implementing tree destructors.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 357bf1b56986039b3f95510589183147cbe5e167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357bf1b56986039b3f9551058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:12:15 2017 +0100 rbtree.h: Added WINE_RB_FOR_EACH_DESTRUCTOR and WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR helpers for implementing tree destructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 598a15f..65d9a90 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -136,16 +136,24 @@ static inline struct wine_rb_entry *wine_rb_postorder_next(struct wine_rb_entry &(elem)->field; \ (elem) = WINE_RB_ENTRY_VALUE(wine_rb_next(&elem->field), type, field)) +/* iterate through the tree using using postorder, making it safe to free the entry */ +#define WINE_RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ + for ((cursor) = wine_rb_postorder_head((tree)->root); \ + (cursor) && (((cursor2) = wine_rb_postorder_next(cursor)) || 1); \ + (cursor) = (cursor2)) + +/* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ +#define WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ + for ((elem) = WINE_RB_ENTRY_VALUE(wine_rb_postorder_head((tree)->root), type, field); \ + &(elem)->field \ + && (((elem2) = WINE_RB_ENTRY_VALUE(wine_rb_postorder_next(&(elem)->field), type, field)) || 1); \ + (elem) = (elem2)) + static inline void wine_rb_postorder(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { struct wine_rb_entry *iter, *next; - - for (iter = wine_rb_postorder_head(tree->root); iter; iter = next) - { - next = wine_rb_postorder_next(iter); - callback(iter, context); - } + WINE_RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); } static inline void wine_rb_init(struct wine_rb_tree *tree, wine_rb_compare_func_t compare)

1 0

Jacek Caban : mshtml: Release event target in XMLHttpRequest destructor.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 68d2f9c6a65e9d71feae92191123ef578e0e5ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d2f9c6a65e9d71feae92191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:57 2017 +0100 mshtml: Release event target in XMLHttpRequest destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index efbb79f..51e2445 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -252,6 +252,7 @@ static ULONG WINAPI HTMLXMLHttpRequest_Release(IHTMLXMLHttpRequest *iface) if(!ref) { if(This->event_listener) detach_xhr_event_listener(This->event_listener); + release_event_target(&This->event_target); release_dispex(&This->event_target.dispex); nsIXMLHttpRequest_Release(This->nsxhr); heap_free(This);

1 0

Jacek Caban : mshtml: Pass event target as EventTarget to release_event_target.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: bc02ba80b922f0e62e00cb366e0f592115b4a63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc02ba80b922f0e62e00cb366… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:50 2017 +0100 mshtml: Pass event target as EventTarget to release_event_target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 21 +++++++++++++-------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlnode.c | 3 +-- dlls/mshtml/htmlwindow.c | 3 +-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e844728..7d11747 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1642,20 +1642,25 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } -void release_event_target(event_target_t *event_target) +void release_event_target(EventTarget *event_target) { int i; unsigned int j; + if(!event_target->ptr) + return; + for(i=0; i < EVENTID_LAST; i++) { - if(event_target->event_table[i]) { - if(event_target->event_table[i]->handler_prop) - IDispatch_Release(event_target->event_table[i]->handler_prop); - for(j=0; j < event_target->event_table[i]->handler_cnt; j++) - if(event_target->event_table[i]->handlers[j]) - IDispatch_Release(event_target->event_table[i]->handlers[j]); + 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]); } } - heap_free(event_target); + heap_free(event_target->ptr); } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index cc16fd8..d66f359 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -55,7 +55,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; -void release_event_target(event_target_t*) 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; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1ba477e..ab47323 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1185,12 +1185,11 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) void HTMLDOMNode_destructor(HTMLDOMNode *This) { + release_event_target(&This->event_target); if(This->nsnode) nsIDOMNode_Release(This->nsnode); if(This->doc && &This->doc->node != This) htmldoc_release(&This->doc->basedoc); - if(This->event_target.ptr) - release_event_target(This->event_target.ptr); } static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index aa64fb4..e3f22cf 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -253,8 +253,7 @@ static void release_inner_window(HTMLInnerWindow *This) htmldoc_release(&This->doc->basedoc); } - if(This->event_target.ptr) - release_event_target(This->event_target.ptr); + release_event_target(&This->event_target); release_dispex(&This->event_target.dispex); for(i=0; i < This->global_prop_cnt; i++)

1 0

Jacek Caban : mshtml: Use get_handler_vector in detach_event.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 57239e7822ac7d3bc41a3734ed2201bc801ab208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57239e7822ac7d3bc41a3734e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:38 2017 +0100 mshtml: Use get_handler_vector in detach_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d144eeb..e844728 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1539,9 +1539,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) { - event_target_t *data; + handler_vector_t *handler_vector; eventid_t eid; - DWORD i = 0; + unsigned i; eid = attr_to_eid(name); if(eid == EVENTID_LAST) { @@ -1549,19 +1549,15 @@ HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) return S_OK; } - data = get_event_target_data(event_target, FALSE); - if(!data) - return S_OK; - - if(!data->event_table[eid]) + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(!handler_vector) return S_OK; - while(i < data->event_table[eid]->handler_cnt) { - if(data->event_table[eid]->handlers[i] == disp) { - IDispatch_Release(data->event_table[eid]->handlers[i]); - data->event_table[eid]->handlers[i] = NULL; + for(i = 0; i < handler_vector->handler_cnt; i++) { + if(handler_vector->handlers[i] == disp) { + IDispatch_Release(handler_vector->handlers[i]); + handler_vector->handlers[i] = NULL; } - i++; } return S_OK;

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
84
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 February 2017