Jacek Caban : mshtml: Don't use PRInt32 in property getters implementations .
Alexandre Julliard
julliard at winehq.org
Fri Jan 18 12:07:38 CST 2013
Module: wine
Branch: master
Commit: d83822adbe88e59589d7387c15e44f68c95620d1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83822adbe88e59589d7387c15e44f68c95620d1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Jan 18 14:05:50 2013 +0100
mshtml: Don't use PRInt32 in property getters implementations.
---
dlls/mshtml/htmlevent.c | 8 ++++----
dlls/mshtml/htmlform.c | 4 +---
dlls/mshtml/htmlinput.c | 2 +-
dlls/mshtml/htmlobject.c | 4 +---
dlls/mshtml/htmlselect.c | 8 ++++----
5 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c
index 13095fb..68a3942 100644
--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@@ -641,7 +641,7 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p)
static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p)
{
HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
- PRInt32 x = 0;
+ LONG x = 0;
TRACE("(%p)->(%p)\n", This, p);
@@ -663,7 +663,7 @@ static HRESULT WINAPI HTMLEventObj_get_clientX(IHTMLEventObj *iface, LONG *p)
static HRESULT WINAPI HTMLEventObj_get_clientY(IHTMLEventObj *iface, LONG *p)
{
HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
- PRInt32 y = 0;
+ LONG y = 0;
TRACE("(%p)->(%p)\n", This, p);
@@ -705,7 +705,7 @@ static HRESULT WINAPI HTMLEventObj_get_offsetY(IHTMLEventObj *iface, LONG *p)
static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p)
{
HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
- PRInt32 x = 0;
+ LONG x = 0;
TRACE("(%p)->(%p)\n", This, p);
@@ -727,7 +727,7 @@ static HRESULT WINAPI HTMLEventObj_get_screenX(IHTMLEventObj *iface, LONG *p)
static HRESULT WINAPI HTMLEventObj_get_screenY(IHTMLEventObj *iface, LONG *p)
{
HTMLEventObj *This = impl_from_IHTMLEventObj(iface);
- PRInt32 y = 0;
+ LONG y = 0;
TRACE("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c
index 6459093..c48415a 100644
--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@@ -391,18 +391,16 @@ static HRESULT WINAPI HTMLFormElement_put_length(IHTMLFormElement *iface, LONG v
static HRESULT WINAPI HTMLFormElement_get_length(IHTMLFormElement *iface, LONG *p)
{
HTMLFormElement *This = impl_from_IHTMLFormElement(iface);
- PRInt32 length;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
- nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, &length);
+ nsres = nsIDOMHTMLFormElement_GetLength(This->nsform, p);
if(NS_FAILED(nsres)) {
ERR("GetLength failed: %08x\n", nsres);
return E_FAIL;
}
- *p = length;
return S_OK;
}
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c
index fb0e80b..7937161 100644
--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@@ -291,7 +291,7 @@ static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, L
static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, LONG *p)
{
HTMLInputElement *This = impl_from_IHTMLInputElement(iface);
- PRInt32 max_length;
+ LONG max_length;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c
index 9e9bbdd..bcfbbe5 100644
--- a/dlls/mshtml/htmlobject.c
+++ b/dlls/mshtml/htmlobject.c
@@ -433,18 +433,16 @@ static HRESULT WINAPI HTMLObjectElement_put_vspace(IHTMLObjectElement *iface, LO
static HRESULT WINAPI HTMLObjectElement_get_vspace(IHTMLObjectElement *iface, LONG *p)
{
HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface);
- PRInt32 vspace;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
- nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, &vspace);
+ nsres = nsIDOMHTMLObjectElement_GetVspace(This->nsobject, p);
if(NS_FAILED(nsres)) {
ERR("GetVspace failed: %08x\n", nsres);
return E_FAIL;
}
- *p = vspace;
return S_OK;
}
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c
index 8fceedf..ff609dd 100644
--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@@ -250,16 +250,16 @@ static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *if
static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *iface, LONG *p)
{
HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface);
- PRInt32 idx = 0;
nsresult nsres;
TRACE("(%p)->(%p)\n", This, p);
- nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, &idx);
- if(NS_FAILED(nsres))
+ nsres = nsIDOMHTMLSelectElement_GetSelectedIndex(This->nsselect, p);
+ if(NS_FAILED(nsres)) {
ERR("GetSelectedIndex failed: %08x\n", nsres);
+ return E_FAIL;
+ }
- *p = idx;
return S_OK;
}
More information about the wine-cvs
mailing list