ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Correctly handle VT_EMPTY in set_event_handler_disp in standard compliant mode. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-09-29 17:14:42 +02:00 committed by Alexandre Julliard
parent e6778fe023
commit fd10004e31
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/mshtml/htmlevent.c
View File

@ -185,6 +185,8 @@ static const event_info_t event_info[] = {
EVENT_FIXME} EVENT_FIXME}
}; };
static BOOL use_event_quirks(EventTarget*);
eventid_t str_to_eid(LPCWSTR str) eventid_t str_to_eid(LPCWSTR str)
{ {
int i; int i;
@ -953,6 +955,9 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa
VARIANTARG arg; VARIANTARG arg;
DISPPARAMS dp = {&arg, &named_arg, 1, 1}; DISPPARAMS dp = {&arg, &named_arg, 1, 1};
if(!use_event_quirks(event_target))
FIXME("Event argument not supported\n");
V_VT(&arg) = VT_DISPATCH; V_VT(&arg) = VT_DISPATCH;
V_DISPATCH(&arg) = this_obj; V_DISPATCH(&arg) = this_obj;
V_VT(&v) = VT_EMPTY; V_VT(&v) = VT_EMPTY;
@ -1381,6 +1386,12 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid,
HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var) HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var)
{ {
switch(V_VT(var)) { switch(V_VT(var)) {
case VT_EMPTY:
if(use_event_quirks(event_target)) {
WARN("attempt to set to VT_EMPTY in quirks mode\n");
return E_NOTIMPL;
}
/* fall through */
case VT_NULL: case VT_NULL:
remove_event_handler(event_target, eid); remove_event_handler(event_target, eid);
return S_OK; return S_OK;
@ -1392,6 +1403,9 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var
VARIANT *v; VARIANT *v;
HRESULT hres; HRESULT hres;
if(!use_event_quirks(event_target))
FIXME("Setting to string %s not supported\n", debugstr_w(V_BSTR(var)));
/* /*
* Setting event handler to string is a rare case and we don't want to * Setting event handler to string is a rare case and we don't want to
* complicate nor increase memory of handler_vector_t for that. Instead, * complicate nor increase memory of handler_vector_t for that. Instead,
@ -1413,8 +1427,6 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var
default: default:
FIXME("not handler %s\n", debugstr_variant(var)); FIXME("not handler %s\n", debugstr_variant(var));
/* fall through */
case VT_EMPTY:
return E_NOTIMPL; return E_NOTIMPL;
} }