[PATCH 05/17] dlls/mshtml: use correct integral type

[Eric Pouech]

Signed-off-by: Eric Pouech

---
 dlls/mshtml/dispex.c         |    2 +-
 dlls/mshtml/htmlevent.c      |   16 ++++++++--------
 dlls/mshtml/htmlinput.c      |    4 ++--
 dlls/mshtml/htmlnode.c       |    2 +-
 dlls/mshtml/htmlselect.c     |    2 +-
 dlls/mshtml/htmlwindow.c     |    8 ++++----
 dlls/mshtml/pluginhost.c     |    6 +++---
 dlls/mshtml/range.c          |    2 +-
 dlls/mshtml/xmlhttprequest.c |    2 +-
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c
index 2fff4d444b2..450bc8efe51 100644
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@@ -945,7 +945,7 @@ static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lc
         hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, flags, &new_dp, res, ei, caller);
         IDispatchEx_Release(dispex);
     }else {
-        ULONG err = 0;
+        UINT err = 0;
         hres = IDispatch_Invoke(func_disp, DISPID_VALUE, &IID_NULL, lcid, flags, &new_dp, res, ei, &err);
     }
     if(SUCCEEDED(hres))
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 7ed1dfd2adc..50ca4cbb168 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -1198,7 +1198,7 @@ static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p)
 static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMUIEvent(iface);
-    INT32 detail;
+    LONG detail;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1314,7 +1314,7 @@ static HRESULT WINAPI DOMMouseEvent_Invoke(IDOMMouseEvent *iface, DISPID dispIdM
 static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMMouseEvent(iface);
-    INT32 screen_x;
+    LONG screen_x;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1330,7 +1330,7 @@ static HRESULT WINAPI DOMMouseEvent_get_screenX(IDOMMouseEvent *iface, LONG *p)
 static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMMouseEvent(iface);
-    INT32 screen_y;
+    LONG screen_y;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1346,7 +1346,7 @@ static HRESULT WINAPI DOMMouseEvent_get_screenY(IDOMMouseEvent *iface, LONG *p)
 static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMMouseEvent(iface);
-    INT32 client_x;
+    LONG client_x;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1362,7 +1362,7 @@ static HRESULT WINAPI DOMMouseEvent_get_clientX(IDOMMouseEvent *iface, LONG *p)
 static HRESULT WINAPI DOMMouseEvent_get_clientY(IDOMMouseEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMMouseEvent(iface);
-    INT32 client_y;
+    LONG client_y;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1653,7 +1653,7 @@ static HRESULT WINAPI DOMMouseEvent_get_offsetY(IDOMMouseEvent *iface, LONG *p)
 static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMMouseEvent(iface);
-    INT32 r;
+    LONG r;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1669,7 +1669,7 @@ static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p)
 static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p)
 {
     DOMEvent *This = impl_from_IDOMMouseEvent(iface);
-    INT32 r;
+    LONG r;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -2375,7 +2375,7 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event
 {
     DISPPARAMS dp = {NULL,NULL,0,0};
     VARIANT event_arg;
-    ULONG argerr;
+    UINT argerr;
     EXCEPINFO ei;

TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv);
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index e9b53dadb92..c0f6db8dd3b 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -1245,7 +1245,7 @@ static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextEle
 static HRESULT WINAPI HTMLInputTextElement2_get_selectionStart(IHTMLInputTextElement2 *iface, LONG *p)
 {
     HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface);
-    INT32 selection_start;
+    LONG selection_start;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -1278,7 +1278,7 @@ static HRESULT WINAPI HTMLInputTextElement2_put_selectionEnd(IHTMLInputTextEleme
 static HRESULT WINAPI HTMLInputTextElement2_get_selectionEnd(IHTMLInputTextElement2 *iface, LONG *p)
 {
     HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface);
-    INT32 selection_end;
+    LONG selection_end;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c
index 23ab7195aca..9918174fa41 100644
--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@@ -107,7 +107,7 @@ static ULONG WINAPI HTMLDOMChildrenCollectionEnum_Release(IEnumVARIANT *iface)

static ULONG get_enum_len(HTMLDOMChildrenCollectionEnum *This)
 {
-    ULONG len;
+    UINT32 len;
     nsresult nsres;

nsres = nsIDOMNodeList_GetLength(This->col->nslist, &len);
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index b2c10f725bb..9400ee043b6 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -792,7 +792,7 @@ static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG
 static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p)
 {
     HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface);
-    DWORD val;
+    UINT32 val;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 389552c3088..5aa2351f5f0 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -2428,7 +2428,7 @@ static HRESULT WINAPI HTMLWindow7_get_performance(IHTMLWindow7 *iface, VARIANT *
 static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p)
 {
     HTMLWindow *This = impl_from_IHTMLWindow7(iface);
-    INT32 ret;
+    LONG ret;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -2446,7 +2446,7 @@ static HRESULT WINAPI HTMLWindow7_get_innerWidth(IHTMLWindow7 *iface, LONG *p)
 static HRESULT WINAPI HTMLWindow7_get_innerHeight(IHTMLWindow7 *iface, LONG *p)
 {
     HTMLWindow *This = impl_from_IHTMLWindow7(iface);
-    INT32 ret;
+    LONG ret;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);
@@ -2465,7 +2465,7 @@ static HRESULT WINAPI HTMLWindow7_get_pageXOffset(IHTMLWindow7 *iface, LONG *p)
 {
     HTMLWindow *This = impl_from_IHTMLWindow7(iface);
     nsresult nsres;
-    INT32 ret;
+    LONG ret;

TRACE("(%p)->(%p)\n", This, p);

@@ -2483,7 +2483,7 @@ static HRESULT WINAPI HTMLWindow7_get_pageYOffset(IHTMLWindow7 *iface, LONG *p)
 {
     HTMLWindow *This = impl_from_IHTMLWindow7(iface);
     nsresult nsres;
-    INT32 ret;
+    LONG ret;

TRACE("(%p)->(%p)\n", This, p);

diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c
index ad67db5548c..b6a2c57479c 100644
--- a/dlls/mshtml/pluginhost.c
+++ b/dlls/mshtml/pluginhost.c
@@ -378,7 +378,7 @@ static BOOL check_script_safety(PluginHost *host)
     DWORD policy_size, policy;
     struct CONFIRMSAFETY cs;
     BYTE *ppolicy;
-    ULONG err = 0;
+    UINT err = 0;
     VARIANT v;
     HRESULT hres;

@@ -412,7 +412,7 @@ static void update_readystate(PluginHost *host)
     DISPPARAMS params = {NULL,NULL,0,0};
     IDispatchEx *dispex;
     IDispatch *disp;
-    ULONG err = 0;
+    UINT err = 0;
     VARIANT v;
     HRESULT hres;

@@ -643,7 +643,7 @@ static void notif_enabled(PluginHost *plugin_host)
 {
     DISPPARAMS args = {NULL, NULL, 0, 0};
     IDispatch *disp;
-    ULONG err = 0;
+    UINT err = 0;
     VARIANT res;
     HRESULT hres;

diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c
index bea5ac6b371..375f76de40c 100644
--- a/dlls/mshtml/range.c
+++ b/dlls/mshtml/range.c
@@ -1389,7 +1389,7 @@ static HRESULT WINAPI HTMLTxtRange_setEndPoint(IHTMLTxtRange *iface, BSTR how,
     HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface);
     HTMLTxtRange *src_range;
     nsIDOMNode *ref_node;
-    INT32 ref_offset;
+    LONG ref_offset;
     BOOL set_start;
     int how_type;
     INT16 cmp;
diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index 4cd47acd107..cd8ba65b5b8 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -395,7 +395,7 @@ static HRESULT WINAPI HTMLXMLHttpRequest_get_responseXML(IHTMLXMLHttpRequest *if
 static HRESULT WINAPI HTMLXMLHttpRequest_get_status(IHTMLXMLHttpRequest *iface, LONG *p)
 {
     HTMLXMLHttpRequest *This = impl_from_IHTMLXMLHttpRequest(iface);
-    DWORD val;
+    UINT32 val;
     nsresult nsres;
     TRACE("(%p)->(%p)\n", This, p);