From 990e7dfd1ac05ed1a224578daf2f64508cbe0e10 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Wed, 18 Jul 2018 15:00:22 +0200 Subject: [PATCH] [MSHTML] Fix 3 MSVC warnings about HTML*Element_handle_event() - "...\htmlanchor.c(769) : warning C4028: formal parameter 2 different from declaration" - "...\htmlarea.c(427) : warning C4028: formal parameter 2 different from declaration" - "...\htmlform.c(757) : warning C4028: formal parameter 2 different from declaration" Cherry-pick Jacek Caban https://source.winehq.org/git/wine.git/commit/a660f673cb7d6d04e0f2a9a98cff439b5403365b CORE-7538 --- dll/win32/mshtml/htmlanchor.c | 2 +- dll/win32/mshtml/htmlarea.c | 2 +- dll/win32/mshtml/htmlform.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/mshtml/htmlanchor.c b/dll/win32/mshtml/htmlanchor.c index 32e57098b63..b2a66540c4c 100644 --- a/dll/win32/mshtml/htmlanchor.c +++ b/dll/win32/mshtml/htmlanchor.c @@ -710,7 +710,7 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dll/win32/mshtml/htmlarea.c b/dll/win32/mshtml/htmlarea.c index a70c487450c..968222e618e 100644 --- a/dll/win32/mshtml/htmlarea.c +++ b/dll/win32/mshtml/htmlarea.c @@ -388,7 +388,7 @@ static HRESULT HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); nsAString href_str, target_str; diff --git a/dll/win32/mshtml/htmlform.c b/dll/win32/mshtml/htmlform.c index 12062b0e73b..21807d2e473 100644 --- a/dll/win32/mshtml/htmlform.c +++ b/dll/win32/mshtml/htmlform.c @@ -717,7 +717,7 @@ static HRESULT HTMLFormElement_invoke(HTMLDOMNode *iface, return S_OK; } -static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLFormElement *This = impl_from_HTMLDOMNode(iface);