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

mshtml: Rename call_event to fire_event.

This commit is contained in:
Jacek Caban 2011-08-02 11:07:12 +02:00 committed by Alexandre Julliard
parent 989f39ef32
commit aa6ee29e01
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/htmlelem.c
View File

@ -1371,7 +1371,7 @@ static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface)
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
return call_event(&This->node, EVENTID_CLICK); return call_fire_event(&This->node, EVENTID_CLICK);
} }
static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface, static HRESULT WINAPI HTMLElement_get_filters(IHTMLElement *iface,

6
dlls/mshtml/htmlevent.c
View File

@ -1088,14 +1088,14 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even
return S_OK; return S_OK;
} }
HRESULT call_event(HTMLDOMNode *node, eventid_t eid) HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid)
{ {
HRESULT hres; HRESULT hres;
if(node->vtbl->call_event) { if(node->vtbl->fire_event) {
BOOL handled = FALSE; BOOL handled = FALSE;
hres = node->vtbl->call_event(node, eid, &handled); hres = node->vtbl->fire_event(node, eid, &handled);
if(handled) if(handled)
return hres; return hres;
} }

2
dlls/mshtml/htmlevent.h
View File

@ -51,7 +51,7 @@ HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN;
HRESULT attach_event(event_target_t**,nsIDOMNode*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT attach_event(event_target_t**,nsIDOMNode*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN;
HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN;
HRESULT call_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN;
void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN; void update_cp_events(HTMLWindow*,event_target_t**,cp_static_data_t*,nsIDOMNode*) DECLSPEC_HIDDEN;
static inline event_target_t **get_node_event_target(HTMLDOMNode *node) static inline event_target_t **get_node_event_target(HTMLDOMNode *node)

4
dlls/mshtml/htmlinput.c
View File

@ -1150,7 +1150,7 @@ static void HTMLInputElement_destructor(HTMLDOMNode *iface)
HTMLElement_destructor(&This->element.node); HTMLElement_destructor(&This->element.node);
} }
static HRESULT HTMLInputElementImpl_call_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled) static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled)
{ {
HTMLInputElement *This = impl_from_HTMLDOMNode(iface); HTMLInputElement *This = impl_from_HTMLDOMNode(iface);
@ -1186,7 +1186,7 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = {
HTMLInputElement_destructor, HTMLInputElement_destructor,
HTMLElement_clone, HTMLElement_clone,
NULL, NULL,
HTMLInputElementImpl_call_event, HTMLInputElementImpl_fire_event,
HTMLInputElementImpl_put_disabled, HTMLInputElementImpl_put_disabled,
HTMLInputElementImpl_get_disabled, HTMLInputElementImpl_get_disabled,
}; };

2
dlls/mshtml/mshtml_private.h
View File

@ -498,7 +498,7 @@ typedef struct {
void (*destructor)(HTMLDOMNode*); void (*destructor)(HTMLDOMNode*);
HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**); HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);
event_target_t **(*get_event_target)(HTMLDOMNode*); event_target_t **(*get_event_target)(HTMLDOMNode*);
HRESULT (*call_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*);
HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL);
HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);
HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);