[0.4.8][MSHTML] Fix 4 MSVC warnings C4028 CORE-7538

That can be observed in MSVC2010SP1 x86 dbg config:
- "...\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"
- "...\htmlinput.c(1303) : warning C4028: formal parameter 2 different from declaration"

fixes picked from:
0.4.10-dev-620-g 990e7dfd1ac05ed1a224578daf2f64508cbe0e10 (WineSync)
0.4.10-dev-603-g 2e7b73dc755ba5b9e8a8bf0aa95a8e5d1f18a5b3 (htmlinput Temporary fix)

diff --git a/dll/win32/mshtml/htmlanchor.c b/dll/win32/mshtml/htmlanchor.c
index 32e5709..b2a6654 100644 (file)
--- 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 a70c487..968222e 100644 (file)
--- 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 12062b0..21807d2 100644 (file)
--- 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);
 

diff --git a/dll/win32/mshtml/htmlinput.c b/dll/win32/mshtml/htmlinput.c
index 49083cc..ead391e 100644 (file)
--- a/dll/win32/mshtml/htmlinput.c
+++ b/dll/win32/mshtml/htmlinput.c
@@ -1215,7 +1215,11 @@ static HRESULT HTMLInputElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
     return HTMLElement_QI(&This->element.node, riid, ppv);
 }
 
+#ifndef __REACTOS__
 static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid, BOOL *handled)
+#else
+static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, DWORD eid, BOOL *handled)
+#endif
 {
     HTMLInputElement *This = impl_from_HTMLDOMNode(iface);