December 2017 - Wine-commits

Hans Leidekker : taskschd: Consistently check for allocation failure.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 77a7094bb899780f09bd1ad4f571a813e0922ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a7094bb899780f09bd1ad4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:50 2017 +0100 taskschd: Consistently check for allocation failure. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder_collection.c | 6 ++++- dlls/taskschd/task.c | 54 +++++++++++++++++++++------------------ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/dlls/taskschd/folder_collection.c b/dlls/taskschd/folder_collection.c index 47c9620..969baec 100644 --- a/dlls/taskschd/folder_collection.c +++ b/dlls/taskschd/folder_collection.c @@ -236,7 +236,11 @@ HRESULT TaskFolderCollection_create(const WCHAR *path, ITaskFolderCollection **o folders->ITaskFolderCollection_iface.lpVtbl = &TaskFolderCollection_vtbl; folders->ref = 1; - folders->path = heap_strdupW(path); + if (!(folders->path = heap_strdupW(path))) + { + heap_free(folders); + return E_OUTOFMEMORY; + } folders->count = count; folders->list = list; *obj = &folders->ITaskFolderCollection_iface; diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index df75236..9959f04 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -542,7 +542,9 @@ static HRESULT WINAPI RegistrationInfo_get_Description(IRegistrationInfo *iface, if (!description) return E_POINTER; - *description = SysAllocString(reginfo->description); + if (!reginfo->description) *description = NULL; + else if (!(*description = SysAllocString(reginfo->description))) return E_OUTOFMEMORY; + return S_OK; } @@ -568,7 +570,9 @@ static HRESULT WINAPI RegistrationInfo_get_Author(IRegistrationInfo *iface, BSTR if (!author) return E_POINTER; - *author = SysAllocString(reginfo->author); + if (!reginfo->author) *author = NULL; + else if (!(*author = SysAllocString(reginfo->author))) return E_OUTOFMEMORY; + return S_OK; } @@ -594,7 +598,9 @@ static HRESULT WINAPI RegistrationInfo_get_Version(IRegistrationInfo *iface, BST if (!version) return E_POINTER; - *version = SysAllocString(reginfo->version); + if (!reginfo->version) *version = NULL; + else if (!(*version = SysAllocString(reginfo->version))) return E_OUTOFMEMORY; + return S_OK; } @@ -620,7 +626,9 @@ static HRESULT WINAPI RegistrationInfo_get_Date(IRegistrationInfo *iface, BSTR * if (!date) return E_POINTER; - *date = SysAllocString(reginfo->date); + if (!reginfo->date) *date = NULL; + else if (!(*date = SysAllocString(reginfo->date))) return E_OUTOFMEMORY; + return S_OK; } @@ -646,7 +654,9 @@ static HRESULT WINAPI RegistrationInfo_get_Documentation(IRegistrationInfo *ifac if (!doc) return E_POINTER; - *doc = SysAllocString(reginfo->documentation); + if (!reginfo->documentation) *doc = NULL; + else if (!(*doc = SysAllocString(reginfo->documentation))) return E_OUTOFMEMORY; + return S_OK; } @@ -684,7 +694,9 @@ static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *u if (!uri) return E_POINTER; - *uri = SysAllocString(reginfo->uri); + if (!reginfo->uri) *uri = NULL; + else if (!(*uri = SysAllocString(reginfo->uri))) return E_OUTOFMEMORY; + return S_OK; } @@ -722,7 +734,9 @@ static HRESULT WINAPI RegistrationInfo_get_Source(IRegistrationInfo *iface, BSTR if (!source) return E_POINTER; - *source = SysAllocString(reginfo->source); + if (!reginfo->source) *source = NULL; + else if (!(*source = SysAllocString(reginfo->source))) return E_OUTOFMEMORY; + return S_OK; } @@ -921,8 +935,8 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST return S_OK; } - *interval = SysAllocString(taskset->restart_interval); - if (!*interval) return E_OUTOFMEMORY; + if (!taskset->restart_interval) *interval = NULL; + else if (!(*interval = SysAllocString(taskset->restart_interval))) return E_OUTOFMEMORY; return S_OK; } @@ -1135,8 +1149,8 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, return S_OK; } - *limit = SysAllocString(taskset->execution_time_limit); - if (!*limit) return E_OUTOFMEMORY; + if (!taskset->execution_time_limit) *limit = NULL; + else if (!(*limit = SysAllocString(taskset->execution_time_limit))) return E_OUTOFMEMORY; return S_OK; } @@ -1187,14 +1201,8 @@ static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *ifa if (!delay) return E_POINTER; - if (!taskset->delete_expired_task_after) - { - *delay = NULL; - return S_OK; - } - - *delay = SysAllocString(taskset->delete_expired_task_after); - if (!*delay) return E_OUTOFMEMORY; + if (!taskset->delete_expired_task_after) *delay = NULL; + else if (!(*delay = SysAllocString(taskset->delete_expired_task_after))) return E_OUTOFMEMORY; return S_OK; } @@ -1746,13 +1754,9 @@ static HRESULT WINAPI ExecAction_get_Path(IExecAction *iface, BSTR *path) if (!path) return E_POINTER; - if (!action->path) - { - *path = NULL; - return S_OK; - } + if (!action->path) *path = NULL; + else if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; - if (!(*path = SysAllocString(action->path))) return E_OUTOFMEMORY; return S_OK; }

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_put_StartBoundary.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: adad0705b0a68f47150527c9d7c3380aea6dbcd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adad0705b0a68f47150527c9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:51 2017 +0100 taskschd: Implement IDailyTrigger_put_StartBoundary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 15 ++++++++++++++- dlls/taskschd/tests/scheduler.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 9959f04..ee5a7dd 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -39,6 +39,7 @@ typedef struct { IDailyTrigger IDailyTrigger_iface; LONG ref; short interval; + WCHAR *start_boundary; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -88,7 +89,11 @@ static ULONG WINAPI DailyTrigger_Release(IDailyTrigger *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { + TRACE("destroying %p\n", iface); + heap_free(This->start_boundary); heap_free(This); + } return ref; } @@ -183,7 +188,14 @@ static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(start)); + WCHAR *str = NULL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(start)); + + if (start && !(str = heap_strdupW(start))) return E_OUTOFMEMORY; + heap_free(This->start_boundary); + This->start_boundary = str; + return S_OK; } @@ -290,6 +302,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->IDailyTrigger_iface.lpVtbl = &DailyTrigger_vtbl; daily_trigger->ref = 1; daily_trigger->interval = 1; + daily_trigger->start_boundary = NULL; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index c7de7c7..fb6d626 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1195,9 +1195,37 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) static void test_daily_trigger(ITrigger *trigger) { + static const WCHAR startW[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0',0}; + static const WCHAR start2W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','Z',0}; + static const WCHAR start3W[] = + {'2','0','0','4','-','0','1','-','0','1','T','0','0',':','0','0',':','0','0','+','0','1',':','0','0',0}; + static const WCHAR start4W[] = + {'2','0','0','4','.','0','1','.','0','1','T','0','0','.','0','0','.','0','0',0}; + static const WCHAR start5W[] = + {'9','9','9','9','-','9','9','-','9','9','T','9','9',':','9','9',':','9','9',0}; + static const WCHAR start6W[] = + {'i','n','v','a','l','i','d',0}; + static const struct + { + const WCHAR *str; + HRESULT hr; + } + start_test[] = + { + {startW, S_OK}, + {start2W, S_OK}, + {start3W, S_OK}, + {start4W, S_OK}, + {start5W, S_OK}, + {start6W, S_OK}, + }; IDailyTrigger *daily_trigger; + BSTR start_boundary; short interval; HRESULT hr; + ULONG i; hr = ITrigger_QueryInterface(trigger, &IID_IDailyTrigger, (void**)&daily_trigger); ok(hr == S_OK, "Could not get IDailyTrigger iface: %08x\n", hr); @@ -1225,6 +1253,17 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) + { + start_boundary = SysAllocString(start_test[i].str); + hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); + ok(hr == start_test[i].hr, "%u: got %08x expected %08x\n", i, hr, start_test[i].hr); + SysFreeString(start_boundary); + } + + hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); + ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + IDailyTrigger_Release(daily_trigger); }

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_get_StartBoundary.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 179d1ed75b55d6a71ba8a8c0c083a87c432b7d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179d1ed75b55d6a71ba8a8c0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:52 2017 +0100 taskschd: Implement IDailyTrigger_get_StartBoundary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 11 +++++++++-- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index ee5a7dd..8b64663 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -181,8 +181,15 @@ static HRESULT WINAPI DailyTrigger_put_ExecutionTimeLimit(IDailyTrigger *iface, static HRESULT WINAPI DailyTrigger_get_StartBoundary(IDailyTrigger *iface, BSTR *start) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, start); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, start); + + if (!start) return E_POINTER; + + if (!This->start_boundary) *start = NULL; + else if (!(*start = SysAllocString(This->start_boundary))) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI DailyTrigger_put_StartBoundary(IDailyTrigger *iface, BSTR start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index fb6d626..d0477a8 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1253,12 +1253,29 @@ static void test_daily_trigger(ITrigger *trigger) ok(hr == S_OK, "get_DaysInterval failed: %08x\n", hr); ok(interval == 2, "interval = %d\n", interval); + hr = IDailyTrigger_get_StartBoundary(daily_trigger, NULL); + ok(hr == E_POINTER, "get_StartBoundary failed: %08x\n", hr); + + start_boundary = (BSTR)0xdeadbeef; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "get_StartBoundary failed: %08x\n", hr); + ok(start_boundary == NULL, "start_boundary not set\n"); + for (i = 0; i < sizeof(start_test)/sizeof(start_test[0]); i++) { start_boundary = SysAllocString(start_test[i].str); hr = IDailyTrigger_put_StartBoundary(daily_trigger, start_boundary); ok(hr == start_test[i].hr, "%u: got %08x expected %08x\n", i, hr, start_test[i].hr); SysFreeString(start_boundary); + if (hr == S_OK) + { + start_boundary = NULL; + hr = IDailyTrigger_get_StartBoundary(daily_trigger, &start_boundary); + ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(start_boundary != NULL, "start_boundary not set\n"); + ok(!lstrcmpW(start_boundary, start_test[i].str), "%u: got %s\n", i, wine_dbgstr_w(start_boundary)); + SysFreeString(start_boundary); + } } hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL);

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_put_Enabled.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 929272f1397473dd03a0af7202031c73c1c6545b URL: http://source.winehq.org/git/wine.git/?a=commit;h=929272f1397473dd03a0af720… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:53 2017 +0100 taskschd: Implement IDailyTrigger_put_Enabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 8b64663..d720d50 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -40,6 +40,7 @@ typedef struct { LONG ref; short interval; WCHAR *start_boundary; + BOOL enabled; } DailyTrigger; static inline DailyTrigger *impl_from_IDailyTrigger(IDailyTrigger *iface) @@ -230,7 +231,10 @@ static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOO static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%x)\n", This, enabled); + + TRACE("(%p)->(%x)\n", This, enabled); + + This->enabled = enabled ? TRUE : FALSE; return S_OK; } @@ -310,6 +314,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; + daily_trigger->enabled = FALSE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK;

1 0

Hans Leidekker : taskschd: Implement IDailyTrigger_get_Enabled.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 3c2d8dc3aef7d0f0a42eff89f82aceb2bf4df41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2d8dc3aef7d0f0a42eff89f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 1 12:01:54 2017 +0100 taskschd: Implement IDailyTrigger_get_Enabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 11 ++++++++--- dlls/taskschd/tests/scheduler.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d720d50..a8b819c 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -224,8 +224,13 @@ static HRESULT WINAPI DailyTrigger_put_EndBoundary(IDailyTrigger *iface, BSTR en static HRESULT WINAPI DailyTrigger_get_Enabled(IDailyTrigger *iface, VARIANT_BOOL *enabled) { DailyTrigger *This = impl_from_IDailyTrigger(iface); - FIXME("(%p)->(%p)\n", This, enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, enabled); + + if (!enabled) return E_POINTER; + + *enabled = This->enabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI DailyTrigger_put_Enabled(IDailyTrigger *iface, VARIANT_BOOL enabled) @@ -314,7 +319,7 @@ static HRESULT DailyTrigger_create(ITrigger **trigger) daily_trigger->ref = 1; daily_trigger->interval = 1; daily_trigger->start_boundary = NULL; - daily_trigger->enabled = FALSE; + daily_trigger->enabled = TRUE; *trigger = (ITrigger*)&daily_trigger->IDailyTrigger_iface; return S_OK; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d0477a8..c60fd1d 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1223,6 +1223,7 @@ static void test_daily_trigger(ITrigger *trigger) }; IDailyTrigger *daily_trigger; BSTR start_boundary; + VARIANT_BOOL enabled; short interval; HRESULT hr; ULONG i; @@ -1281,6 +1282,22 @@ static void test_daily_trigger(ITrigger *trigger) hr = IDailyTrigger_put_StartBoundary(daily_trigger, NULL); ok(hr == S_OK, "put_StartBoundary failed: %08x\n", hr); + hr = IDailyTrigger_get_Enabled(daily_trigger, NULL); + ok(hr == E_POINTER, "get_Enabled failed: %08x\n", hr); + + enabled = VARIANT_FALSE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_TRUE, "got %d\n", enabled); + + hr = IDailyTrigger_put_Enabled(daily_trigger, VARIANT_FALSE); + ok(hr == S_OK, "put_Enabled failed: %08x\n", hr); + + enabled = VARIANT_TRUE; + hr = IDailyTrigger_get_Enabled(daily_trigger, &enabled); + ok(hr == S_OK, "get_Enabled failed: %08x\n", hr); + ok(enabled == VARIANT_FALSE, "got %d\n", enabled); + IDailyTrigger_Release(daily_trigger); }

1 0

Jacek Caban : mshtml: Store event type string in DOMEvent object.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: d121009f249af769e445618e756da1375a3502d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d121009f249af769e445618e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:01:59 2017 +0100 mshtml: Store event type string in DOMEvent object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 59 ++++++++++++++++++++++++++++--------------------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 35 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a046491..980b31a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -938,6 +938,7 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); + heap_free(This->type); heap_free(This); } @@ -1138,7 +1139,7 @@ static dispex_static_data_t DOMEvent_dispex = { DOMEvent_iface_tids }; -static DOMEvent *alloc_event(nsIDOMEvent *nsevent) +static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { DOMEvent *event; @@ -1149,34 +1150,42 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent) init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, &DOMEvent_dispex); event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->ref = 1; + event->event_id = event_id; + if(event_id != EVENTID_LAST) { + event->type = heap_strdupW(event_info[event_id].name); + if(!event->type) { + IDOMEvent_Release(&event->IDOMEvent_iface); + return NULL; + } + } nsIDOMEvent_AddRef(event->nsevent = nsevent); - event->event_id = EVENTID_LAST; return event; } HRESULT create_event_from_nsevent(nsIDOMEvent *nsevent, DOMEvent **ret_event) { + eventid_t event_id = EVENTID_LAST; DOMEvent *event; nsAString nsstr; nsresult nsres; - event = alloc_event(nsevent); - if(!event) - return E_OUTOFMEMORY; - nsAString_Init(&nsstr, NULL); - nsres = nsIDOMEvent_GetType(event->nsevent, &nsstr); + nsres = nsIDOMEvent_GetType(nsevent, &nsstr); if(NS_SUCCEEDED(nsres)) { const WCHAR *type; nsAString_GetData(&nsstr, &type); - event->event_id = str_to_eid(type); - if(event->event_id == EVENTID_LAST) + event_id = str_to_eid(type); + if(event_id == EVENTID_LAST) FIXME("unknown event type %s\n", debugstr_w(type)); }else { ERR("GetType failed: %08x\n", nsres); } nsAString_Finish(&nsstr); + event = alloc_event(nsevent, event_id); + if(!event) + return E_OUTOFMEMORY; + *ret_event = event; return S_OK; } @@ -1196,7 +1205,7 @@ HRESULT create_document_event_str(HTMLDocumentNode *doc, const WCHAR *type, IDOM return E_FAIL; } - event = alloc_event(nsevent); + event = alloc_event(nsevent, EVENTID_LAST); nsIDOMEvent_Release(nsevent); if(!event) return E_OUTOFMEMORY; @@ -1220,7 +1229,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent); + event = alloc_event(nsevent, event_id); if(!event) return E_OUTOFMEMORY; @@ -1301,7 +1310,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; - const listener_container_t *container = get_listener_container(event_target, event_info[eid].name, FALSE); + const listener_container_t *container = get_listener_container(event_target, event->type, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; const BOOL use_quirks = use_event_quirks(event_target); event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; @@ -1323,10 +1332,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_DISPATCH(&arg) = (IDispatch*)&event_target->dispex.IDispatchEx_iface; V_VT(&v) = VT_EMPTY; - TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); + TRACE("%s >>>\n", debugstr_w(event->type)); hres = call_disp_func(listener->function, &dp, &v); if(hres == S_OK) { - TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); + TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1338,7 +1347,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("%s <<< %08x\n", debugstr_w(event_info[eid].name), hres); + WARN("%s <<< %08x\n", debugstr_w(event->type), hres); } } } @@ -1402,10 +1411,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) ? (IDispatch*)event->event_obj : (IDispatch*)&event->IDOMEvent_iface; V_VT(&v) = VT_EMPTY; - TRACE("%s >>>\n", debugstr_w(event_info[event->event_id].name)); + TRACE("%s >>>\n", debugstr_w(event->type)); hres = call_disp_func(listener->function, &dp, &v); if(hres == S_OK) { - TRACE("%s <<< %s\n", debugstr_w(event_info[event->event_id].name), + TRACE("%s <<< %s\n", debugstr_w(event->type), debugstr_variant(&v)); if(cancelable) { @@ -1418,7 +1427,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("%s <<< %08x\n", debugstr_w(event_info[event->event_id].name), hres); + WARN("%s <<< %08x\n", debugstr_w(event->type), hres); } }else { VARIANTARG arg; @@ -1428,10 +1437,10 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_DISPATCH(&arg) = (IDispatch*)event->event_obj; V_VT(&v) = VT_EMPTY; - TRACE("%s attached >>>\n", debugstr_w(event_info[eid].name)); + TRACE("%s attached >>>\n", debugstr_w(event->type)); hres = call_disp_func(listener->function, &dp, &v); if(hres == S_OK) { - TRACE("%s attached <<<\n", debugstr_w(event_info[eid].name)); + TRACE("%s attached <<<\n", debugstr_w(event->type)); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1443,7 +1452,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("%s attached <<< %08x\n", debugstr_w(event_info[eid].name), hres); + WARN("%s attached <<< %08x\n", debugstr_w(event->type), hres); } } } @@ -1474,11 +1483,11 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) V_VT(&v) = VT_EMPTY; - TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] >>>\n", debugstr_w(event->type), i); hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, cp->data->pass_event_arg ? event->event_obj : NULL, &v); if(hres == S_OK) { - TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); + TRACE("cp %s [%u] <<<\n", debugstr_w(event->type), i); if(cancelable) { if(V_VT(&v) == VT_BOOL) { @@ -1490,7 +1499,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) } VariantClear(&v); }else { - WARN("cp %s [%u] <<< %08x\n", debugstr_w(event_info[eid].name), i, hres); + WARN("cp %s [%u] <<< %08x\n", debugstr_w(event->type), i, hres); } } } @@ -1515,7 +1524,7 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) return; } - TRACE("(%p) %s\n", event_target, debugstr_w(event_info[event->event_id].name)); + TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); event_flags = event_info[event->event_id].flags; iter = event_target; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 7dfc7ad..33eea21 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,6 +64,7 @@ typedef struct { nsIDOMEvent *nsevent; eventid_t event_id; + WCHAR *type; EventTarget *target; BOOL prevent_default; BOOL stop_propagation;

1 0

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

01 Dec '17

Module: wine Branch: master Commit: dc5aefcebb6ec4a1dadfc11b928ae3d8246b3b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc5aefcebb6ec4a1dadfc11b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:06 2017 +0100 mshtml: Added IDOMEvent::get_type implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.c | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 980b31a..4278d22 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1033,8 +1033,17 @@ static HRESULT WINAPI DOMEvent_get_timeStamp(IDOMEvent *iface, ULONGLONG *p) static HRESULT WINAPI DOMEvent_get_type(IDOMEvent *iface, BSTR *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->type) { + *p = SysAllocString(This->type); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } + return S_OK; } static HRESULT WINAPI DOMEvent_initEvent(IDOMEvent *iface, BSTR type, VARIANT_BOOL can_bubble, VARIANT_BOOL cancelable) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index bc8e045..7719dc1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2693,6 +2693,11 @@ static void test_create_event(IHTMLDocument2 *doc) hres = IDOMEvent_stopPropagation(event); ok(hres == S_OK, "stopPropagation failed: %08x\n", hres); + str = (void*)0xdeadbeef; + hres = IDOMEvent_get_type(event, &str); + ok(hres == S_OK, "get_type failed: %08x\n", hres); + ok(!str, "type = %s\n", wine_dbgstr_w(str)); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Jacek Caban : mshtml: Use IDOMEvent for IHTMLEventObj:: get_type implementation.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 1508eb484fc7acfc8d0c095ea9d8da272a7c13b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1508eb484fc7acfc8d0c095ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:13 2017 +0100 mshtml: Use IDOMEvent for IHTMLEventObj::get_type implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4278d22..940fccc 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -296,7 +296,6 @@ typedef struct { LONG ref; - const event_info_t *type; DOMEvent *event; VARIANT return_value; } HTMLEventObj; @@ -613,13 +612,12 @@ static HRESULT WINAPI HTMLEventObj_get_type(IHTMLEventObj *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - if(!This->type) { + if(!This->event) { *p = NULL; return S_OK; } - *p = SysAllocString(This->type->name); - return *p ? S_OK : E_OUTOFMEMORY; + return IDOMEvent_get_type(&This->event->IDOMEvent_iface, p); } static HRESULT WINAPI HTMLEventObj_get_qualifier(IHTMLEventObj *iface, BSTR *p) @@ -1568,10 +1566,8 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) if(!event->event_obj && !event->no_event_obj) { event_obj_ref = alloc_event_obj(event); - if(event_obj_ref) { - event_obj_ref->type = event_info + event->event_id; + if(event_obj_ref) event->event_obj = &event_obj_ref->IHTMLEventObj_iface; - } } target_vtbl = dispex_get_vtbl(&event_target->dispex); @@ -1671,7 +1667,6 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va return E_OUTOFMEMORY; } - event_obj->type = event_info + eid; if(!event_obj->event) hres = create_document_event(node->doc, eid, &event_obj->event);

1 0

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

01 Dec '17

Module: wine Branch: master Commit: 4678a85966f3326459da6bfe559eac24f70043a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4678a85966f3326459da6bfe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 1 17:02:22 2017 +0100 mshtml: Added IDOMEvent::get_bubbles implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 ++++++++------ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.c | 6 ++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 940fccc..ddce8b3 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -976,8 +976,11 @@ static HRESULT WINAPI DOMEvent_Invoke(IDOMEvent *iface, DISPID dispIdMember, static HRESULT WINAPI DOMEvent_get_bubbles(IDOMEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = variant_bool(This->bubbles); + return S_OK; } static HRESULT WINAPI DOMEvent_get_cancelable(IDOMEvent *iface, VARIANT_BOOL *p) @@ -1164,6 +1167,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) IDOMEvent_Release(&event->IDOMEvent_iface); return NULL; } + event->bubbles = (event_info[event_id].flags & EVENT_BUBBLES) != 0; } nsIDOMEvent_AddRef(event->nsevent = nsevent); return event; @@ -1523,7 +1527,6 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) HTMLEventObj *event_obj_ref = NULL; IHTMLEventObj *prev_event = NULL; EventTarget *iter; - DWORD event_flags; HRESULT hres; if(event->event_id == EVENTID_LAST) { @@ -1533,7 +1536,6 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) TRACE("(%p) %s\n", event_target, debugstr_w(event->type)); - event_flags = event_info[event->event_id].flags; iter = event_target; IDispatchEx_AddRef(&event_target->dispex.IDispatchEx_iface); @@ -1587,7 +1589,7 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) call_event_handlers(target_chain[0], event); } - if(event_flags & EVENT_BUBBLES) { + if(event->bubbles) { event->phase = DEP_BUBBLING_PHASE; for(i = 1; !event->stop_propagation && i < chain_cnt; i++) call_event_handlers(target_chain[i], event); @@ -1599,7 +1601,7 @@ void dispatch_event(EventTarget *event_target, DOMEvent *event) IHTMLEventObj_Release(prev_event); } - if(event_flags & EVENT_HASDEFAULTHANDLERS) { + if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS)) { for(i = 0; !event->prevent_default && i < chain_cnt; i++) { BOOL prevent_default = FALSE; vtbl = dispex_get_vtbl(&target_chain[i]->dispex); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 33eea21..4f106d2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -66,6 +66,7 @@ typedef struct { eventid_t event_id; WCHAR *type; EventTarget *target; + BOOL bubbles; BOOL prevent_default; BOOL stop_propagation; DOM_EVENT_PHASE phase; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 7719dc1..864d7d4 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2668,6 +2668,7 @@ static void test_create_event(IHTMLDocument2 *doc) { IDocumentEvent *doc_event; IDOMEvent *event; + VARIANT_BOOL b; USHORT phase; BSTR str; HRESULT hres; @@ -2698,6 +2699,11 @@ static void test_create_event(IHTMLDocument2 *doc) ok(hres == S_OK, "get_type failed: %08x\n", hres); ok(!str, "type = %s\n", wine_dbgstr_w(str)); + b = 0xdead; + hres = IDOMEvent_get_bubbles(event, &b); + ok(hres == S_OK, "get_bubbles failed: %08x\n", hres); + ok(!b, "bubbles = %x\n", b); + IDOMEvent_Release(event); IDocumentEvent_Release(doc_event);

1 0

Austin English : winedbg: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

1 0