Skip to content

W
wine-cw
Commit 491ae71e authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

mshtml: Change long to LONG in mshtml.idl (HTML*Element stuff).

parent 165f691c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 112 deletions
dlls/mshtml/htmlelem.c
View file @ 491ae71e
...@@ -678,7 +678,7 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC ...@@ -678,7 +678,7 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement_get_sourceIndex(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_sourceIndex(IHTMLElement *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM_THIS(iface); HTMLElement *This = HTMLELEM_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -706,14 +706,14 @@ static HRESULT WINAPI HTMLElement_get_lang(IHTMLElement *iface, BSTR *p) ...@@ -706,14 +706,14 @@ static HRESULT WINAPI HTMLElement_get_lang(IHTMLElement *iface, BSTR *p)
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetLeft(IHTMLElement *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM_THIS(iface); HTMLElement *This = HTMLELEM_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM_THIS(iface); HTMLElement *This = HTMLELEM_THIS(iface);
nsIDOMNSHTMLElement *nselem; nsIDOMNSHTMLElement *nselem;
...@@ -739,7 +739,7 @@ static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, long *p) ...@@ -739,7 +739,7 @@ static HRESULT WINAPI HTMLElement_get_offsetTop(IHTMLElement *iface, long *p)
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM_THIS(iface); HTMLElement *This = HTMLELEM_THIS(iface);
nsIDOMNSHTMLElement *nselem; nsIDOMNSHTMLElement *nselem;
...@@ -765,7 +765,7 @@ static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, long *p) ...@@ -765,7 +765,7 @@ static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, long *p)
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement_get_offsetHeight(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetHeight(IHTMLElement *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM_THIS(iface); HTMLElement *This = HTMLELEM_THIS(iface);
nsIDOMNSHTMLElement *nselem; nsIDOMNSHTMLElement *nselem;
......
dlls/mshtml/htmlelem2.c
View file @ 491ae71e
...@@ -120,10 +120,10 @@ static HRESULT WINAPI HTMLElement2_get_onlosecapture(IHTMLElement2 *iface, VARIA ...@@ -120,10 +120,10 @@ static HRESULT WINAPI HTMLElement2_get_onlosecapture(IHTMLElement2 *iface, VARIA
} }
static HRESULT WINAPI HTMLElement2_componentFromPoint(IHTMLElement2 *iface, static HRESULT WINAPI HTMLElement2_componentFromPoint(IHTMLElement2 *iface,
long x, long y, BSTR *component) LONG x, LONG y, BSTR *component)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
FIXME("(%p)->(%ld %ld %p)\n", This, x, y, component); FIXME("(%p)->(%d %d %p)\n", This, x, y, component);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -545,7 +545,7 @@ static HRESULT WINAPI HTMLElement2_removeFilter(IHTMLElement2 *iface, IUnknown * ...@@ -545,7 +545,7 @@ static HRESULT WINAPI HTMLElement2_removeFilter(IHTMLElement2 *iface, IUnknown *
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
...@@ -566,7 +566,7 @@ static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, long * ...@@ -566,7 +566,7 @@ static HRESULT WINAPI HTMLElement2_get_clientHeight(IHTMLElement2 *iface, long *
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
...@@ -587,14 +587,14 @@ static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, long *p ...@@ -587,14 +587,14 @@ static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, long *p
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -724,7 +724,7 @@ static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDis ...@@ -724,7 +724,7 @@ static HRESULT WINAPI HTMLElement2_createControlRange(IHTMLElement2 *iface, IDis
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
...@@ -744,12 +744,12 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, long * ...@@ -744,12 +744,12 @@ static HRESULT WINAPI HTMLElement2_get_scrollHeight(IHTMLElement2 *iface, long *
} }
*p = height == -1 ? 0 : height; *p = height == -1 ? 0 : height;
TRACE("*p = %ld\n", *p); TRACE("*p = %d\n", *p);
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
...@@ -769,18 +769,18 @@ static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, long *p ...@@ -769,18 +769,18 @@ static HRESULT WINAPI HTMLElement2_get_scrollWidth(IHTMLElement2 *iface, long *p
} }
*p = width; *p = width;
TRACE("*p = %ld\n", *p); TRACE("*p = %d\n", *p);
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v) static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, LONG v)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
if(!This->nselem) { if(!This->nselem) {
FIXME("NULL nselem\n"); FIXME("NULL nselem\n");
...@@ -798,7 +798,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v) ...@@ -798,7 +798,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollTop(IHTMLElement2 *iface, long v)
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
...@@ -818,18 +818,18 @@ static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, long *p) ...@@ -818,18 +818,18 @@ static HRESULT WINAPI HTMLElement2_get_scrollTop(IHTMLElement2 *iface, long *p)
} }
*p = top; *p = top;
TRACE("*p = %ld\n", *p); TRACE("*p = %d\n", *p);
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, LONG v)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
if(!This->nselem) { if(!This->nselem) {
FIXME("NULL nselem\n"); FIXME("NULL nselem\n");
...@@ -847,7 +847,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v) ...@@ -847,7 +847,7 @@ static HRESULT WINAPI HTMLElement2_put_scrollLeft(IHTMLElement2 *iface, long v)
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
nsIDOMNSElement *nselem; nsIDOMNSElement *nselem;
...@@ -875,7 +875,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, long *p) ...@@ -875,7 +875,7 @@ static HRESULT WINAPI HTMLElement2_get_scrollLeft(IHTMLElement2 *iface, long *p)
} }
*p = left; *p = left;
TRACE("*p = %ld\n", *p); TRACE("*p = %d\n", *p);
return S_OK; return S_OK;
} }
...@@ -947,18 +947,18 @@ static HRESULT WINAPI HTMLElement2_get_canHandleChildren(IHTMLElement2 *iface, V ...@@ -947,18 +947,18 @@ static HRESULT WINAPI HTMLElement2_get_canHandleChildren(IHTMLElement2 *iface, V
} }
static HRESULT WINAPI HTMLElement2_addBehavior(IHTMLElement2 *iface, BSTR bstrUrl, static HRESULT WINAPI HTMLElement2_addBehavior(IHTMLElement2 *iface, BSTR bstrUrl,
VARIANT *pvarFactory, long *pCookie) VARIANT *pvarFactory, LONG *pCookie)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrUrl), pvarFactory, pCookie); FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrUrl), pvarFactory, pCookie);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, long cookie, static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, LONG cookie,
VARIANT_BOOL *pfResult) VARIANT_BOOL *pfResult)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
FIXME("(%p)->(%ld %p)\n", This, cookie, pfResult); FIXME("(%p)->(%d %p)\n", This, cookie, pfResult);
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1004,7 +1004,7 @@ static HRESULT WINAPI HTMLElement2_get_onbeforeeditfocus(IHTMLElement2 *iface, V ...@@ -1004,7 +1004,7 @@ static HRESULT WINAPI HTMLElement2_get_onbeforeeditfocus(IHTMLElement2 *iface, V
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElement2_get_readyStateValue(IHTMLElement2 *iface, long *p) static HRESULT WINAPI HTMLElement2_get_readyStateValue(IHTMLElement2 *iface, LONG *p)
{ {
HTMLElement *This = HTMLELEM2_THIS(iface); HTMLElement *This = HTMLELEM2_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
......
dlls/mshtml/htmlelemcol.c
View file @ 491ae71e
...@@ -178,15 +178,15 @@ static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *ifa ...@@ -178,15 +178,15 @@ static HRESULT WINAPI HTMLElementCollection_toString(IHTMLElementCollection *ifa
} }
static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *iface, static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *iface,
long v) LONG v)
{ {
HTMLElementCollection *This = ELEMCOL_THIS(iface); HTMLElementCollection *This = ELEMCOL_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLElementCollection_get_length(IHTMLElementCollection *iface, static HRESULT WINAPI HTMLElementCollection_get_length(IHTMLElementCollection *iface,
long *p) LONG *p)
{ {
HTMLElementCollection *This = ELEMCOL_THIS(iface); HTMLElementCollection *This = ELEMCOL_THIS(iface);
......
dlls/mshtml/htmlimg.c
View file @ 491ae71e
...@@ -192,28 +192,28 @@ static HRESULT WINAPI HTMLImgElement_get_border(IHTMLImgElement *iface, VARIANT ...@@ -192,28 +192,28 @@ static HRESULT WINAPI HTMLImgElement_get_border(IHTMLImgElement *iface, VARIANT
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_put_vspace(IHTMLImgElement *iface, long v) static HRESULT WINAPI HTMLImgElement_put_vspace(IHTMLImgElement *iface, LONG v)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_get_vspace(IHTMLImgElement *iface, long *p) static HRESULT WINAPI HTMLImgElement_get_vspace(IHTMLImgElement *iface, LONG *p)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_put_hspace(IHTMLImgElement *iface, long v) static HRESULT WINAPI HTMLImgElement_put_hspace(IHTMLImgElement *iface, LONG v)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_get_hspace(IHTMLImgElement *iface, long *p) static HRESULT WINAPI HTMLImgElement_get_hspace(IHTMLImgElement *iface, LONG *p)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -441,28 +441,28 @@ static HRESULT WINAPI HTMLImgElement_get_name(IHTMLImgElement *iface, BSTR *p) ...@@ -441,28 +441,28 @@ static HRESULT WINAPI HTMLImgElement_get_name(IHTMLImgElement *iface, BSTR *p)
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, long v) static HRESULT WINAPI HTMLImgElement_put_width(IHTMLImgElement *iface, LONG v)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, long *p) static HRESULT WINAPI HTMLImgElement_get_width(IHTMLImgElement *iface, LONG *p)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, long v) static HRESULT WINAPI HTMLImgElement_put_height(IHTMLImgElement *iface, LONG v)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLImgElement_get_height(IHTMLImgElement *iface, long *p) static HRESULT WINAPI HTMLImgElement_get_height(IHTMLImgElement *iface, LONG *p)
{ {
HTMLImgElement *This = HTMLIMG_THIS(iface); HTMLImgElement *This = HTMLIMG_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
......
dlls/mshtml/htmlinput.c
View file @ 491ae71e
...@@ -257,28 +257,28 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF ...@@ -257,28 +257,28 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_put_size(IHTMLInputElement *iface, long v) static HRESULT WINAPI HTMLInputElement_put_size(IHTMLInputElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_get_size(IHTMLInputElement *iface, long *p) static HRESULT WINAPI HTMLInputElement_get_size(IHTMLInputElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, long v) static HRESULT WINAPI HTMLInputElement_put_maxLength(IHTMLInputElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, long *p) static HRESULT WINAPI HTMLInputElement_get_maxLength(IHTMLInputElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -461,28 +461,28 @@ static HRESULT WINAPI HTMLInputElement_get_border(IHTMLInputElement *iface, VARI ...@@ -461,28 +461,28 @@ static HRESULT WINAPI HTMLInputElement_get_border(IHTMLInputElement *iface, VARI
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_put_vspace(IHTMLInputElement *iface, long v) static HRESULT WINAPI HTMLInputElement_put_vspace(IHTMLInputElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_get_vspace(IHTMLInputElement *iface, long *p) static HRESULT WINAPI HTMLInputElement_get_vspace(IHTMLInputElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_put_hspace(IHTMLInputElement *iface, long v) static HRESULT WINAPI HTMLInputElement_put_hspace(IHTMLInputElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_get_hspace(IHTMLInputElement *iface, long *p) static HRESULT WINAPI HTMLInputElement_get_hspace(IHTMLInputElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -643,28 +643,28 @@ static HRESULT WINAPI HTMLInputElement_get_onabort(IHTMLInputElement *iface, VAR ...@@ -643,28 +643,28 @@ static HRESULT WINAPI HTMLInputElement_get_onabort(IHTMLInputElement *iface, VAR
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_put_width(IHTMLInputElement *iface, long v) static HRESULT WINAPI HTMLInputElement_put_width(IHTMLInputElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_get_width(IHTMLInputElement *iface, long *p) static HRESULT WINAPI HTMLInputElement_get_width(IHTMLInputElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_put_height(IHTMLInputElement *iface, long v) static HRESULT WINAPI HTMLInputElement_put_height(IHTMLInputElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLInputElement_get_height(IHTMLInputElement *iface, long *p) static HRESULT WINAPI HTMLInputElement_get_height(IHTMLInputElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUT_THIS(iface); HTMLInputElement *This = HTMLINPUT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -919,16 +919,16 @@ static HRESULT WINAPI HTMLInputTextElement_get_defaultValue(IHTMLInputTextElemen ...@@ -919,16 +919,16 @@ static HRESULT WINAPI HTMLInputTextElement_get_defaultValue(IHTMLInputTextElemen
return IHTMLInputElement_get_defaultValue(HTMLINPUT(This), p); return IHTMLInputElement_get_defaultValue(HTMLINPUT(This), p);
} }
static HRESULT WINAPI HTMLInputTextElement_put_size(IHTMLInputTextElement *iface, long v) static HRESULT WINAPI HTMLInputTextElement_put_size(IHTMLInputTextElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface); HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface);
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
return IHTMLInputElement_put_size(HTMLINPUT(This), v); return IHTMLInputElement_put_size(HTMLINPUT(This), v);
} }
static HRESULT WINAPI HTMLInputTextElement_get_size(IHTMLInputTextElement *iface, long *p) static HRESULT WINAPI HTMLInputTextElement_get_size(IHTMLInputTextElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface); HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface);
...@@ -937,16 +937,16 @@ static HRESULT WINAPI HTMLInputTextElement_get_size(IHTMLInputTextElement *iface ...@@ -937,16 +937,16 @@ static HRESULT WINAPI HTMLInputTextElement_get_size(IHTMLInputTextElement *iface
return IHTMLInputElement_get_size(HTMLINPUT(This), p); return IHTMLInputElement_get_size(HTMLINPUT(This), p);
} }
static HRESULT WINAPI HTMLInputTextElement_put_maxLength(IHTMLInputTextElement *iface, long v) static HRESULT WINAPI HTMLInputTextElement_put_maxLength(IHTMLInputTextElement *iface, LONG v)
{ {
HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface); HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface);
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
return IHTMLInputElement_put_maxLength(HTMLINPUT(This), v); return IHTMLInputElement_put_maxLength(HTMLINPUT(This), v);
} }
static HRESULT WINAPI HTMLInputTextElement_get_maxLength(IHTMLInputTextElement *iface, long *p) static HRESULT WINAPI HTMLInputTextElement_get_maxLength(IHTMLInputTextElement *iface, LONG *p)
{ {
HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface); HTMLInputElement *This = HTMLINPUTTEXT_THIS(iface);
......
dlls/mshtml/htmlselect.c
View file @ 491ae71e
...@@ -100,14 +100,14 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID ...@@ -100,14 +100,14 @@ static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID
wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
} }
static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, long v) static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG v)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, long *p) static HRESULT WINAPI HTMLSelectElement_get_size(IHTMLSelectElement *iface, LONG *p)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
...@@ -190,12 +190,12 @@ static HRESULT WINAPI HTMLSelectElement_get_onchange(IHTMLSelectElement *iface, ...@@ -190,12 +190,12 @@ static HRESULT WINAPI HTMLSelectElement_get_onchange(IHTMLSelectElement *iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *iface, long v) static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *iface, LONG v)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
nsresult nsres; nsresult nsres;
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
nsres = nsIDOMHTMLSelectElement_SetSelectedIndex(This->nsselect, v); nsres = nsIDOMHTMLSelectElement_SetSelectedIndex(This->nsselect, v);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
...@@ -204,7 +204,7 @@ static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *if ...@@ -204,7 +204,7 @@ static HRESULT WINAPI HTMLSelectElement_put_selectedIndex(IHTMLSelectElement *if
return S_OK; return S_OK;
} }
static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *iface, long *p) static HRESULT WINAPI HTMLSelectElement_get_selectedIndex(IHTMLSelectElement *iface, LONG *p)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
PRInt32 idx = 0; PRInt32 idx = 0;
...@@ -336,21 +336,21 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem ...@@ -336,21 +336,21 @@ static HRESULT WINAPI HTMLSelectElement_add(IHTMLSelectElement *iface, IHTMLElem
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, long index) static HRESULT WINAPI HTMLSelectElement_remove(IHTMLSelectElement *iface, LONG index)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, index); FIXME("(%p)->(%d)\n", This, index);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, long v) static HRESULT WINAPI HTMLSelectElement_put_length(IHTMLSelectElement *iface, LONG v)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, long *p) static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, LONG *p)
{ {
HTMLSelectElement *This = HTMLSELECT_THIS(iface); HTMLSelectElement *This = HTMLSELECT_THIS(iface);
PRUint32 length = 0; PRUint32 length = 0;
...@@ -364,7 +364,7 @@ static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, lo ...@@ -364,7 +364,7 @@ static HRESULT WINAPI HTMLSelectElement_get_length(IHTMLSelectElement *iface, lo
*p = length; *p = length;
TRACE("ret %ld\n", *p); TRACE("ret %d\n", *p);
return S_OK; return S_OK;
} }
......
dlls/mshtml/htmltextarea.c
View file @ 491ae71e
...@@ -264,28 +264,28 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa ...@@ -264,28 +264,28 @@ static HRESULT WINAPI HTMLTextAreaElement_get_readOnly(IHTMLTextAreaElement *ifa
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLTextAreaElement_put_rows(IHTMLTextAreaElement *iface, long v) static HRESULT WINAPI HTMLTextAreaElement_put_rows(IHTMLTextAreaElement *iface, LONG v)
{ {
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLTextAreaElement_get_rows(IHTMLTextAreaElement *iface, long *p) static HRESULT WINAPI HTMLTextAreaElement_get_rows(IHTMLTextAreaElement *iface, LONG *p)
{ {
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLTextAreaElement_put_cols(IHTMLTextAreaElement *iface, long v) static HRESULT WINAPI HTMLTextAreaElement_put_cols(IHTMLTextAreaElement *iface, LONG v)
{ {
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
FIXME("(%p)->(%ld)\n", This, v); FIXME("(%p)->(%d)\n", This, v);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLTextAreaElement_get_cols(IHTMLTextAreaElement *iface, long *p) static HRESULT WINAPI HTMLTextAreaElement_get_cols(IHTMLTextAreaElement *iface, LONG *p)
{ {
HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface); HTMLTextAreaElement *This = HTMLTXTAREA_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
......
dlls/mshtml/htmltextcont.c
View file @ 491ae71e
...@@ -93,7 +93,7 @@ static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *i ...@@ -93,7 +93,7 @@ static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *i
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, long *p) static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *iface, LONG *p)
{ {
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
...@@ -102,7 +102,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa ...@@ -102,7 +102,7 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollHeight(IHTMLTextContainer *ifa
return IHTMLElement2_get_scrollHeight(HTMLELEM2(&This->element), p); return IHTMLElement2_get_scrollHeight(HTMLELEM2(&This->element), p);
} }
static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, long *p) static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *iface, LONG *p)
{ {
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
...@@ -111,16 +111,16 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac ...@@ -111,16 +111,16 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollWidth(IHTMLTextContainer *ifac
return IHTMLElement2_get_scrollWidth(HTMLELEM2(&This->element), p); return IHTMLElement2_get_scrollWidth(HTMLELEM2(&This->element), p);
} }
static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, long v) static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, LONG v)
{ {
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
return IHTMLElement2_put_scrollTop(HTMLELEM2(&This->element), v); return IHTMLElement2_put_scrollTop(HTMLELEM2(&This->element), v);
} }
static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, long *p) static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, LONG *p)
{ {
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
...@@ -129,16 +129,16 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, ...@@ -129,16 +129,16 @@ static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface,
return IHTMLElement2_get_scrollTop(HTMLELEM2(&This->element), p); return IHTMLElement2_get_scrollTop(HTMLELEM2(&This->element), p);
} }
static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, long v) static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, LONG v)
{ {
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
TRACE("(%p)->(%ld)\n", This, v); TRACE("(%p)->(%d)\n", This, v);
return IHTMLElement2_put_scrollLeft(HTMLELEM2(&This->element), v); return IHTMLElement2_put_scrollLeft(HTMLELEM2(&This->element), v);
} }
static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, long *p) static HRESULT WINAPI HTMLTextContainer_get_scrollLeft(IHTMLTextContainer *iface, LONG *p)
{ {
HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface);
......
dlls/mshtml/tests/dom.c
View file @ 491ae71e
...@@ -652,7 +652,7 @@ static void _test_elem_attr(unsigned line, IHTMLElement *elem, const char *name, ...@@ -652,7 +652,7 @@ static void _test_elem_attr(unsigned line, IHTMLElement *elem, const char *name,
static void _test_elem_offset(unsigned line, IUnknown *unk) static void _test_elem_offset(unsigned line, IUnknown *unk)
{ {
IHTMLElement *elem = _get_elem_iface(line, unk); IHTMLElement *elem = _get_elem_iface(line, unk);
long l; LONG l;
HRESULT hres; HRESULT hres;
hres = IHTMLElement_get_offsetTop(elem, &l); hres = IHTMLElement_get_offsetTop(elem, &l);
...@@ -793,23 +793,23 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do ...@@ -793,23 +793,23 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do
#define test_select_length(s,l) _test_select_length(__LINE__,s,l) #define test_select_length(s,l) _test_select_length(__LINE__,s,l)
static void _test_select_length(unsigned line, IHTMLSelectElement *select, long length) static void _test_select_length(unsigned line, IHTMLSelectElement *select, long length)
{ {
long len = 0xdeadbeef; LONG len = 0xdeadbeef;
HRESULT hres; HRESULT hres;
hres = IHTMLSelectElement_get_length(select, &len); hres = IHTMLSelectElement_get_length(select, &len);
ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres);
ok_(__FILE__,line) (len == length, "len=%ld, expected %ld\n", len, length); ok_(__FILE__,line) (len == length, "len=%d, expected %ld\n", len, length);
} }
#define test_select_selidx(s,i) _test_select_selidx(__LINE__,s,i) #define test_select_selidx(s,i) _test_select_selidx(__LINE__,s,i)
static void _test_select_selidx(unsigned line, IHTMLSelectElement *select, long index) static void _test_select_selidx(unsigned line, IHTMLSelectElement *select, long index)
{ {
long idx = 0xdeadbeef; LONG idx = 0xdeadbeef;
HRESULT hres; HRESULT hres;
hres = IHTMLSelectElement_get_selectedIndex(select, &idx); hres = IHTMLSelectElement_get_selectedIndex(select, &idx);
ok_(__FILE__,line) (hres == S_OK, "get_selectedIndex failed: %08x\n", hres); ok_(__FILE__,line) (hres == S_OK, "get_selectedIndex failed: %08x\n", hres);
ok_(__FILE__,line) (idx == index, "idx=%ld, expected %ld\n", idx, index); ok_(__FILE__,line) (idx == index, "idx=%d, expected %ld\n", idx, index);
} }
#define test_select_put_selidx(s,i) _test_select_put_selidx(__LINE__,s,i) #define test_select_put_selidx(s,i) _test_select_put_selidx(__LINE__,s,i)
...@@ -1002,7 +1002,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, ...@@ -1002,7 +1002,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk,
const elem_type_t *elem_types, long exlen) const elem_type_t *elem_types, long exlen)
{ {
IHTMLElementCollection *col; IHTMLElementCollection *col;
long len; LONG len;
DWORD i; DWORD i;
VARIANT name, index; VARIANT name, index;
IDispatch *disp; IDispatch *disp;
...@@ -1015,7 +1015,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, ...@@ -1015,7 +1015,7 @@ static void _test_elem_collection(unsigned line, IUnknown *unk,
hres = IHTMLElementCollection_get_length(col, &len); hres = IHTMLElementCollection_get_length(col, &len);
ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres); ok_(__FILE__,line) (hres == S_OK, "get_length failed: %08x\n", hres);
ok_(__FILE__,line) (len == exlen, "len=%ld, expected %ld\n", len, exlen); ok_(__FILE__,line) (len == exlen, "len=%d, expected %ld\n", len, exlen);
if(len > exlen) if(len > exlen)
len = exlen; len = exlen;
...@@ -1276,7 +1276,7 @@ static long _elem_get_scroll_height(unsigned line, IUnknown *unk) ...@@ -1276,7 +1276,7 @@ static long _elem_get_scroll_height(unsigned line, IUnknown *unk)
{ {
IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLElement2 *elem = _get_elem2_iface(line, unk);
IHTMLTextContainer *txtcont; IHTMLTextContainer *txtcont;
long l = -1, l2 = -1; LONG l = -1, l2 = -1;
HRESULT hres; HRESULT hres;
hres = IHTMLElement2_get_scrollHeight(elem, &l); hres = IHTMLElement2_get_scrollHeight(elem, &l);
...@@ -1288,8 +1288,8 @@ static long _elem_get_scroll_height(unsigned line, IUnknown *unk) ...@@ -1288,8 +1288,8 @@ static long _elem_get_scroll_height(unsigned line, IUnknown *unk)
hres = IHTMLTextContainer_get_scrollHeight(txtcont, &l2); hres = IHTMLTextContainer_get_scrollHeight(txtcont, &l2);
IHTMLTextContainer_Release(txtcont); IHTMLTextContainer_Release(txtcont);
ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %ld\n", l2); ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %d\n", l2);
ok_(__FILE__,line) (l == l2, "unexpected height %ld, expected %ld\n", l2, l); ok_(__FILE__,line) (l == l2, "unexpected height %d, expected %d\n", l2, l);
return l; return l;
} }
...@@ -1299,7 +1299,7 @@ static long _elem_get_scroll_width(unsigned line, IUnknown *unk) ...@@ -1299,7 +1299,7 @@ static long _elem_get_scroll_width(unsigned line, IUnknown *unk)
{ {
IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLElement2 *elem = _get_elem2_iface(line, unk);
IHTMLTextContainer *txtcont; IHTMLTextContainer *txtcont;
long l = -1, l2 = -1; LONG l = -1, l2 = -1;
HRESULT hres; HRESULT hres;
hres = IHTMLElement2_get_scrollWidth(elem, &l); hres = IHTMLElement2_get_scrollWidth(elem, &l);
...@@ -1311,8 +1311,8 @@ static long _elem_get_scroll_width(unsigned line, IUnknown *unk) ...@@ -1311,8 +1311,8 @@ static long _elem_get_scroll_width(unsigned line, IUnknown *unk)
hres = IHTMLTextContainer_get_scrollWidth(txtcont, &l2); hres = IHTMLTextContainer_get_scrollWidth(txtcont, &l2);
IHTMLTextContainer_Release(txtcont); IHTMLTextContainer_Release(txtcont);
ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %ld\n", l2); ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %d\n", l2);
ok_(__FILE__,line) (l == l2, "unexpected width %ld, expected %ld\n", l2, l); ok_(__FILE__,line) (l == l2, "unexpected width %d, expected %d\n", l2, l);
return l; return l;
} }
...@@ -1322,7 +1322,7 @@ static long _elem_get_scroll_top(unsigned line, IUnknown *unk) ...@@ -1322,7 +1322,7 @@ static long _elem_get_scroll_top(unsigned line, IUnknown *unk)
{ {
IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLElement2 *elem = _get_elem2_iface(line, unk);
IHTMLTextContainer *txtcont; IHTMLTextContainer *txtcont;
long l = -1, l2 = -1; LONG l = -1, l2 = -1;
HRESULT hres; HRESULT hres;
hres = IHTMLElement2_get_scrollTop(elem, &l); hres = IHTMLElement2_get_scrollTop(elem, &l);
...@@ -1334,8 +1334,8 @@ static long _elem_get_scroll_top(unsigned line, IUnknown *unk) ...@@ -1334,8 +1334,8 @@ static long _elem_get_scroll_top(unsigned line, IUnknown *unk)
hres = IHTMLTextContainer_get_scrollTop(txtcont, &l2); hres = IHTMLTextContainer_get_scrollTop(txtcont, &l2);
IHTMLTextContainer_Release(txtcont); IHTMLTextContainer_Release(txtcont);
ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %ld\n", l2); ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %d\n", l2);
ok_(__FILE__,line) (l == l2, "unexpected top %ld, expected %ld\n", l2, l); ok_(__FILE__,line) (l == l2, "unexpected top %d, expected %d\n", l2, l);
return l; return l;
} }
...@@ -1345,7 +1345,7 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) ...@@ -1345,7 +1345,7 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk)
{ {
IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLElement2 *elem = _get_elem2_iface(line, unk);
IHTMLTextContainer *txtcont; IHTMLTextContainer *txtcont;
long l = -1, l2 = -1; LONG l = -1, l2 = -1;
HRESULT hres; HRESULT hres;
hres = IHTMLElement2_get_scrollLeft(elem, NULL); hres = IHTMLElement2_get_scrollLeft(elem, NULL);
...@@ -1360,8 +1360,8 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk) ...@@ -1360,8 +1360,8 @@ static void _elem_get_scroll_left(unsigned line, IUnknown *unk)
hres = IHTMLTextContainer_get_scrollLeft(txtcont, &l2); hres = IHTMLTextContainer_get_scrollLeft(txtcont, &l2);
IHTMLTextContainer_Release(txtcont); IHTMLTextContainer_Release(txtcont);
ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %ld\n", l2); ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %d\n", l2);
ok(l == l2, "unexpected left %ld, expected %ld\n", l2, l); ok(l == l2, "unexpected left %d, expected %d\n", l2, l);
} }
#define test_img_src(i,s) _test_img_src(__LINE__,i,s) #define test_img_src(i,s) _test_img_src(__LINE__,i,s)
...@@ -1701,7 +1701,7 @@ static void _test_node_put_value_str(unsigned line, IUnknown *unk, const char *v ...@@ -1701,7 +1701,7 @@ static void _test_node_put_value_str(unsigned line, IUnknown *unk, const char *v
static void _test_elem_client_size(unsigned line, IUnknown *unk) static void _test_elem_client_size(unsigned line, IUnknown *unk)
{ {
IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLElement2 *elem = _get_elem2_iface(line, unk);
long l; LONG l;
HRESULT hres; HRESULT hres;
hres = IHTMLElement2_get_clientWidth(elem, &l); hres = IHTMLElement2_get_clientWidth(elem, &l);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment