August 2011 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use task destructor for navigate_javascript task.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 3be3074fa1ebe77fe34964305226551aeeeb8707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be3074fa1ebe77fe34964305… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:35:27 2011 +0200 mshtml: Use task destructor for navigate_javascript task. --- dlls/mshtml/htmlwindow.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6e04612..7581337 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1679,17 +1679,33 @@ static ULONG WINAPI HTMLPrivateWindow_Release(IHTMLPrivateWindow *iface) return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); } -static void handle_javascript(HTMLWindow *window, const WCHAR *code) +typedef struct { + task_t header; + HTMLWindow *window; + IUri *uri; +} navigate_javascript_task_t; + +static void navigate_javascript_proc(task_t *_task) { + navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; + HTMLWindow *window = task->window; VARIANT v; + BSTR code; HRESULT hres; static const WCHAR jscriptW[] = {'j','s','c','r','i','p','t',0}; + task->window->readystate = READYSTATE_COMPLETE; + + hres = IUri_GetPath(task->uri, &code); + if(FAILED(hres)) + return; + set_download_state(window->doc_obj, 1); V_VT(&v) = VT_EMPTY; hres = exec_script(window, code, jscriptW, &v); + SysFreeString(code); if(SUCCEEDED(hres) && V_VT(&v) != VT_EMPTY) { FIXME("javascirpt URL returned %s\n", debugstr_variant(&v)); VariantClear(&v); @@ -1701,28 +1717,12 @@ static void handle_javascript(HTMLWindow *window, const WCHAR *code) set_download_state(window->doc_obj, 0); } -typedef struct { - task_t header; - HTMLWindow *window; - IUri *uri; -} navigate_javascript_task_t; - -static void navigate_javascript_proc(task_t *_task) +static void navigate_javascript_task_destr(task_t *_task) { navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; - BSTR code; - HRESULT hres; - - task->window->readystate = READYSTATE_COMPLETE; - hres = IUri_GetPath(task->uri, &code); - if(SUCCEEDED(hres)) { - handle_javascript(task->window, code); - SysFreeString(code); - } - - IHTMLWindow2_Release(&task->window->IHTMLWindow2_iface); IUri_Release(task->uri); + heap_free(task); } typedef struct { @@ -1868,10 +1868,9 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return E_OUTOFMEMORY; } - IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); task->window = This; task->uri = uri; - push_task(&task->header, navigate_javascript_proc, NULL, This->task_magic); + push_task(&task->header, navigate_javascript_proc, navigate_javascript_task_destr, This->task_magic); /* Why silently? */ This->readystate = READYSTATE_COMPLETE;

1 0

Jacek Caban : mshtml: Use task destructor for start_request task.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: d65758db2826e3eac3e5e78281dbc59d535a8ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65758db2826e3eac3e5e7828… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:35:47 2011 +0200 mshtml: Use task destructor for start_request task. --- dlls/mshtml/navigate.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ee6fd93..b42b372 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1224,7 +1224,14 @@ static void stop_request_proc(task_t *_task) list_remove(&task->bsc->bsc.entry); list_init(&task->bsc->bsc.entry); on_stop_nsrequest(task->bsc, S_OK); +} + +static void stop_request_task_destr(task_t *_task) +{ + stop_request_task_t *task = (stop_request_task_t*)_task; + IBindStatusCallback_Release(&task->bsc->bsc.IBindStatusCallback_iface); + heap_free(task); } static HRESULT async_stop_request(nsChannelBSC *This) @@ -1242,7 +1249,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, NULL, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); + push_task(&task->header, stop_request_proc, stop_request_task_destr, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); return S_OK; }

1 0

Jacek Caban : mshtml: Use task destructor for navigate task.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 832d4eb2e2117220231a6983a42bc8264200015e URL: http://source.winehq.org/git/wine.git/?a=commit;h=832d4eb2e2117220231a6983a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:35:04 2011 +0200 mshtml: Use task destructor for navigate task. --- dlls/mshtml/htmlwindow.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 61d0837..6e04612 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1741,9 +1741,15 @@ static void navigate_proc(task_t *_task) if(SUCCEEDED(hres)) hres = start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); +} + +static void navigate_task_destr(task_t *_task) +{ + navigate_task_t *task = (navigate_task_t*)_task; + IUnknown_Release((IUnknown*)task->bscallback); - IHTMLWindow2_Release(&task->window->IHTMLWindow2_iface); IMoniker_Release(task->mon); + heap_free(task); } static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, BSTR url, BSTR arg2, BSTR arg3, @@ -1843,11 +1849,10 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return E_OUTOFMEMORY; } - IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); task->window = This; task->bscallback = bsc; task->mon = mon; - push_task(&task->header, navigate_proc, NULL, This->task_magic); + push_task(&task->header, navigate_proc, navigate_task_destr, This->task_magic); /* Silently and repeated when real loading starts? */ This->readystate = READYSTATE_LOADING;

1 0

Jacek Caban : mshtml: Use task destructor for async_doc_binding task.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 6830a3b3123214be427bb13f13bd9c19a9cfa4de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6830a3b3123214be427bb13f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:36:10 2011 +0200 mshtml: Use task destructor for async_doc_binding task. --- dlls/mshtml/navigate.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index b42b372..23a7c0d 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1598,7 +1598,14 @@ static void start_doc_binding_proc(task_t *_task) start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); +} + +static void start_doc_binding_task_destr(task_t *_task) +{ + start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; + IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); + heap_free(task); } HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) @@ -1613,7 +1620,7 @@ HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) task->bscallback = bscallback; IBindStatusCallback_AddRef(&bscallback->bsc.IBindStatusCallback_iface); - push_task(&task->header, start_doc_binding_proc, NULL, window->task_magic); + push_task(&task->header, start_doc_binding_proc, start_doc_binding_task_destr, window->task_magic); return S_OK; }

1 0

Jacek Caban : mshtml: Use task destructor for start_binding task.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 9f77da607f46e8c0b4d87ca9fd09ab7e55cf91a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f77da607f46e8c0b4d87ca9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:36:26 2011 +0200 mshtml: Use task destructor for start_binding task. --- dlls/mshtml/nsio.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 36ffcf8..4e4e530 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -889,8 +889,14 @@ static void start_binding_proc(task_t *_task) start_binding_task_t *task = (start_binding_task_t*)_task; start_binding(NULL, task->doc, (BSCallback*)task->bscallback, NULL); +} + +static void start_binding_task_destr(task_t *_task) +{ + start_binding_task_t *task = (start_binding_task_t*)_task; - IUnknown_Release((IUnknown*)task->bscallback); + IBindStatusCallback_Release(&task->bscallback->bsc.IBindStatusCallback_iface); + heap_free(task); } static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_channel, nsIStreamListener *listener, @@ -925,7 +931,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan task->doc = window->doc; task->bscallback = bscallback; - push_task(&task->header, start_binding_proc, NULL, window->doc->basedoc.task_magic); + push_task(&task->header, start_binding_proc, start_binding_task_destr, window->doc->basedoc.task_magic); } return NS_OK;

1 0

Jacek Caban : mshtml: Use task destructor for set_downloading task.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 923484bd7caadfbffe03d5b880b50a6752b4c42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=923484bd7caadfbffe03d5b88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:36:41 2011 +0200 mshtml: Use task destructor for set_downloading task. --- dlls/mshtml/persist.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a8f6834..a299be2 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -166,7 +166,6 @@ static void set_downloading_proc(task_t *_task) TRACE("(%p)\n", doc); set_statustext(doc, IDS_STATUS_DOWNLOADINGFROM, task->url); - CoTaskMemFree(task->url); if(task->set_download) set_download_state(doc, 1); @@ -188,6 +187,14 @@ static void set_downloading_proc(task_t *_task) } } +static void set_downloading_task_destr(task_t *_task) +{ + download_proc_task_t *task = (download_proc_task_t*)_task; + + CoTaskMemFree(task->url); + heap_free(task); +} + void prepare_for_binding(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL navigated_binding) { HRESULT hres; @@ -303,7 +310,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel download_task->doc = This->doc_obj; download_task->set_download = set_download; download_task->url = url; - push_task(&download_task->header, set_downloading_proc, NULL, This->doc_obj->basedoc.task_magic); + push_task(&download_task->header, set_downloading_proc, set_downloading_task_destr, This->doc_obj->basedoc.task_magic); return S_OK; }

1 0

Jacek Caban : mshtml: Properly free tasks in remove_target_tasks.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 5150e0f0483b89379ca4ef40cb95aa39a4cbedaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5150e0f0483b89379ca4ef40c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:37:12 2011 +0200 mshtml: Properly free tasks in remove_target_tasks. --- dlls/mshtml/task.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 136561c..a38437c 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -116,15 +116,16 @@ void remove_target_tasks(LONG target) SetTimer(thread_data->thread_hwnd, TIMER_ID, timer->time - GetTickCount(), NULL); } - while(thread_data->task_queue_head - && thread_data->task_queue_head->target_magic == target) - pop_task(); + while(thread_data->task_queue_head && thread_data->task_queue_head->target_magic == target) { + iter = pop_task(); + iter->destr(iter); + } for(iter = thread_data->task_queue_head; iter; iter = iter->next) { while(iter->next && iter->next->target_magic == target) { tmp = iter->next; iter->next = tmp->next; - heap_free(tmp); + tmp->destr(tmp); } if(!iter->next)

1 0

Jacek Caban : mshtml: Allow async tasks to have custom destructors.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 7247eaa181eb05e423cdac6944bd62afeb6b91c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7247eaa181eb05e423cdac694… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:34:34 2011 +0200 mshtml: Allow async tasks to have custom destructors. --- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/task.c | 10 ++++++++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 465db09..61d0837 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1847,7 +1847,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, task->window = This; task->bscallback = bsc; task->mon = mon; - push_task(&task->header, navigate_proc, This->task_magic); + push_task(&task->header, navigate_proc, NULL, This->task_magic); /* Silently and repeated when real loading starts? */ This->readystate = READYSTATE_LOADING; @@ -1866,7 +1866,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); task->window = This; task->uri = uri; - push_task(&task->header, navigate_javascript_proc, This->task_magic); + push_task(&task->header, navigate_javascript_proc, NULL, This->task_magic); /* Why silently? */ This->readystate = READYSTATE_COMPLETE; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 66f89c9..cc92d2f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -817,6 +817,7 @@ typedef void (*task_proc_t)(task_t*); struct task_t { LONG target_magic; task_proc_t proc; + task_proc_t destr; struct task_t *next; }; @@ -836,7 +837,7 @@ thread_data_t *get_thread_data(BOOL) DECLSPEC_HIDDEN; HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; -void push_task(task_t*,task_proc_t,LONG) DECLSPEC_HIDDEN; +void push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 7c38935..ee6fd93 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1242,7 +1242,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); + push_task(&task->header, stop_request_proc, NULL, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); return S_OK; } @@ -1606,7 +1606,7 @@ HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) task->bscallback = bscallback; IBindStatusCallback_AddRef(&bscallback->bsc.IBindStatusCallback_iface); - push_task(&task->header, start_doc_binding_proc, window->task_magic); + push_task(&task->header, start_doc_binding_proc, NULL, window->task_magic); return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ef36afb..36ffcf8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -925,7 +925,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan task->doc = window->doc; task->bscallback = bscallback; - push_task(&task->header, start_binding_proc, window->doc->basedoc.task_magic); + push_task(&task->header, start_binding_proc, NULL, window->doc->basedoc.task_magic); } return NS_OK; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 550414f..a8f6834 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -296,14 +296,14 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel task = heap_alloc(sizeof(docobj_task_t)); task->doc = This->doc_obj; - push_task(&task->header, set_progress_proc, This->doc_obj->basedoc.task_magic); + push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic); } download_task = heap_alloc(sizeof(download_proc_task_t)); download_task->doc = This->doc_obj; download_task->set_download = set_download; download_task->url = url; - push_task(&download_task->header, set_downloading_proc, This->doc_obj->basedoc.task_magic); + push_task(&download_task->header, set_downloading_proc, NULL, This->doc_obj->basedoc.task_magic); return S_OK; } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index c896179..136561c 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -47,12 +47,18 @@ typedef struct { struct list entry; } task_timer_t; -void push_task(task_t *task, task_proc_t proc, LONG magic) +static void default_task_destr(task_t *task) +{ + heap_free(task); +} + +void push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) { thread_data_t *thread_data = get_thread_data(TRUE); task->target_magic = magic; task->proc = proc; + task->destr = destr ? destr : default_task_destr; task->next = NULL; if(thread_data->task_queue_tail) @@ -266,7 +272,7 @@ static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; task->proc(task); - heap_free(task); + task->destr(task); } return 0;

1 0

Michael Stefaniuc : ole32/tests: COM cleanup in compobj.c.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 3673f6b7c4651247e206e5cb9c852d974c8adc43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3673f6b7c4651247e206e5cb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 3 12:13:03 2011 +0200 ole32/tests: COM cleanup in compobj.c. --- dlls/ole32/tests/compobj.c | 47 +++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 53a838e..b76c9d2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -115,7 +115,7 @@ static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, + IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { @@ -570,7 +570,7 @@ static void test_CoRegisterMessageFilter(void) } static HRESULT WINAPI Test_IUnknown_QueryInterface( - LPUNKNOWN iface, + IUnknown *iface, REFIID riid, LPVOID *ppvObj) { @@ -588,12 +588,12 @@ static HRESULT WINAPI Test_IUnknown_QueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI Test_IUnknown_AddRef(LPUNKNOWN iface) +static ULONG WINAPI Test_IUnknown_AddRef(IUnknown *iface) { return 2; /* non-heap-based object */ } -static ULONG WINAPI Test_IUnknown_Release(LPUNKNOWN iface) +static ULONG WINAPI Test_IUnknown_Release(IUnknown *iface) { return 1; /* non-heap-based object */ } @@ -1271,10 +1271,15 @@ static void test_CoGetObjectContext(void) } typedef struct { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; LONG refs; } Test_CallContext; +static inline Test_CallContext *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, Test_CallContext, IUnknown_iface); +} + static HRESULT WINAPI Test_CallContext_QueryInterface( IUnknown *iface, REFIID riid, @@ -1295,13 +1300,13 @@ static HRESULT WINAPI Test_CallContext_QueryInterface( static ULONG WINAPI Test_CallContext_AddRef(IUnknown *iface) { - Test_CallContext *This = (Test_CallContext*)iface; + Test_CallContext *This = impl_from_IUnknown(iface); return InterlockedIncrement(&This->refs); } static ULONG WINAPI Test_CallContext_Release(IUnknown *iface) { - Test_CallContext *This = (Test_CallContext*)iface; + Test_CallContext *This = impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); @@ -1320,7 +1325,7 @@ static void test_CoGetCallContext(void) HRESULT hr; ULONG refs; IUnknown *pUnk; - IUnknown *test_object; + Test_CallContext *test_object; if (!pCoSwitchCallContext) { @@ -1331,41 +1336,43 @@ static void test_CoGetCallContext(void) CoInitialize(NULL); test_object = HeapAlloc(GetProcessHeap(), 0, sizeof(Test_CallContext)); - ((Test_CallContext*)test_object)->lpVtbl = &TestCallContext_Vtbl; - ((Test_CallContext*)test_object)->refs = 1; + test_object->IUnknown_iface.lpVtbl = &TestCallContext_Vtbl; + test_object->refs = 1; hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); ok(hr == RPC_E_CALL_COMPLETE, "Expected RPC_E_CALL_COMPLETE, got 0x%08x\n", hr); pUnk = (IUnknown*)0xdeadbeef; - hr = pCoSwitchCallContext(test_object, &pUnk); + hr = pCoSwitchCallContext(&test_object->IUnknown_iface, &pUnk); ok_ole_success(hr, "CoSwitchCallContext"); ok(pUnk == NULL, "expected NULL, got %p\n", pUnk); - refs = IUnknown_AddRef(test_object); + refs = IUnknown_AddRef(&test_object->IUnknown_iface); ok(refs == 2, "Expected refcount 2, got %d\n", refs); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); pUnk = (IUnknown*)0xdeadbeef; hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); ok_ole_success(hr, "CoGetCallContext"); - ok(pUnk == test_object, "expected %p, got %p\n", test_object, pUnk); - refs = IUnknown_AddRef(test_object); + ok(pUnk == &test_object->IUnknown_iface, "expected %p, got %p\n", + &test_object->IUnknown_iface, pUnk); + refs = IUnknown_AddRef(&test_object->IUnknown_iface); ok(refs == 3, "Expected refcount 3, got %d\n", refs); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); IUnknown_Release(pUnk); pUnk = (IUnknown*)0xdeadbeef; hr = pCoSwitchCallContext(NULL, &pUnk); ok_ole_success(hr, "CoSwitchCallContext"); - ok(pUnk == test_object, "expected %p, got %p\n", test_object, pUnk); - refs = IUnknown_AddRef(test_object); + ok(pUnk == &test_object->IUnknown_iface, "expected %p, got %p\n", + &test_object->IUnknown_iface, pUnk); + refs = IUnknown_AddRef(&test_object->IUnknown_iface); ok(refs == 2, "Expected refcount 2, got %d\n", refs); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); ok(hr == RPC_E_CALL_COMPLETE, "Expected RPC_E_CALL_COMPLETE, got 0x%08x\n", hr); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Call default event handlers only for events that have them.
by Alexandre Julliard Aug. 3, 2011

Aug. 3, 2011

Module: wine Branch: master Commit: 7a0600dc39e00e1232520d107d8efba781dbcda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0600dc39e00e1232520d107… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:34:01 2011 +0200 mshtml: Call default event handlers only for events that have them. --- dlls/mshtml/htmlevent.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ab07a4..80d3d12 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -141,7 +141,7 @@ typedef struct { #define EVENT_FORWARDBODY 0x0004 #define EVENT_NODEHANDLER 0x0008 #define EVENT_CANCELABLE 0x0010 -#define EVENT_SETONINIT 0x0020 +#define EVENT_HASDEFAULTHANDLERS 0x0020 static const event_info_t event_info[] = { {beforeunloadW, onbeforeunloadW, EVENTT_NONE, DISPID_EVMETH_ONBEFOREUNLOAD, @@ -151,7 +151,7 @@ static const event_info_t event_info[] = { {changeW, onchangeW, EVENTT_HTML, DISPID_EVMETH_ONCHANGE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENTT_MOUSE, DISPID_EVMETH_ONCLICK, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_SETONINIT}, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, {contextmenuW, oncontextmenuW, EVENTT_MOUSE, DISPID_EVMETH_ONCONTEXTMENU, EVENT_BUBBLE|EVENT_CANCELABLE}, {dblclickW, ondblclickW, EVENTT_MOUSE, DISPID_EVMETH_ONDBLCLICK, @@ -1062,7 +1062,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); - if(!prevent_default) { + if(!prevent_default && (event_info[eid].flags & EVENT_HASDEFAULTHANDLERS)) { nsIDOMNode_AddRef(target); nsnode = target; @@ -1382,7 +1382,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) init_nsevents(doc); for(i=0; i < EVENTID_LAST; i++) { - if(event_info[i].flags & EVENT_SETONINIT) { + if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { hres = ensure_nsevent_handler(doc, NULL, NULL, i); if(FAILED(hres)) return hres;

1 0