mshtml: Change long to LONG in mshtml.idl (HTML*Element stuff).
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 444cf83..170d5a0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c
@@ -678,7 +678,7 @@ 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); FIXME("(%p)->(%p)\n", This, p); @@ -706,14 +706,14 @@ 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); FIXME("(%p)->(%p)\n", This, p); 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); nsIDOMNSHTMLElement *nselem; @@ -739,7 +739,7 @@ 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); nsIDOMNSHTMLElement *nselem; @@ -765,7 +765,7 @@ 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); nsIDOMNSHTMLElement *nselem;
diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 3e22155..4d6de2c 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c
@@ -120,10 +120,10 @@ } static HRESULT WINAPI HTMLElement2_componentFromPoint(IHTMLElement2 *iface, - long x, long y, BSTR *component) + LONG x, LONG y, BSTR *component) { 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; } @@ -545,7 +545,7 @@ 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); nsIDOMNSElement *nselem; @@ -566,7 +566,7 @@ 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); nsIDOMNSElement *nselem; @@ -587,14 +587,14 @@ 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); FIXME("(%p)->(%p)\n", This, p); 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); FIXME("(%p)->(%p)\n", This, p); @@ -724,7 +724,7 @@ 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); nsIDOMNSElement *nselem; @@ -744,12 +744,12 @@ } *p = height == -1 ? 0 : height; - TRACE("*p = %ld\n", *p); + TRACE("*p = %d\n", *p); 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); nsIDOMNSElement *nselem; @@ -769,18 +769,18 @@ } *p = width; - TRACE("*p = %ld\n", *p); + TRACE("*p = %d\n", *p); 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); nsIDOMNSElement *nselem; nsresult nsres; - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", This, v); if(!This->nselem) { FIXME("NULL nselem\n"); @@ -798,7 +798,7 @@ 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); nsIDOMNSElement *nselem; @@ -818,18 +818,18 @@ } *p = top; - TRACE("*p = %ld\n", *p); + TRACE("*p = %d\n", *p); 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); nsIDOMNSElement *nselem; nsresult nsres; - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", This, v); if(!This->nselem) { FIXME("NULL nselem\n"); @@ -847,7 +847,7 @@ 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); nsIDOMNSElement *nselem; @@ -875,7 +875,7 @@ } *p = left; - TRACE("*p = %ld\n", *p); + TRACE("*p = %d\n", *p); return S_OK; } @@ -947,18 +947,18 @@ } static HRESULT WINAPI HTMLElement2_addBehavior(IHTMLElement2 *iface, BSTR bstrUrl, - VARIANT *pvarFactory, long *pCookie) + VARIANT *pvarFactory, LONG *pCookie) { HTMLElement *This = HTMLELEM2_THIS(iface); FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(bstrUrl), pvarFactory, pCookie); return E_NOTIMPL; } -static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, long cookie, +static HRESULT WINAPI HTMLElement2_removeBehavior(IHTMLElement2 *iface, LONG cookie, VARIANT_BOOL *pfResult) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%ld %p)\n", This, cookie, pfResult); + FIXME("(%p)->(%d %p)\n", This, cookie, pfResult); return E_NOTIMPL; } @@ -1004,7 +1004,7 @@ 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); FIXME("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 2dbbaca..049da58 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c
@@ -178,15 +178,15 @@ } static HRESULT WINAPI HTMLElementCollection_put_length(IHTMLElementCollection *iface, - long v) + LONG v) { HTMLElementCollection *This = ELEMCOL_THIS(iface); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLElementCollection_get_length(IHTMLElementCollection *iface, - long *p) + LONG *p) { HTMLElementCollection *This = ELEMCOL_THIS(iface);
diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index a2a27c8..f7e2ab5 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c
@@ -192,28 +192,28 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); @@ -441,28 +441,28 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index dd40326..eaffae5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c
@@ -257,28 +257,28 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); @@ -461,28 +461,28 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); @@ -643,28 +643,28 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); @@ -919,16 +919,16 @@ 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); - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", 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); @@ -937,16 +937,16 @@ 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); - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", 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);
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 3a414cf..2264dfa 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c
@@ -100,14 +100,14 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); @@ -190,12 +190,12 @@ 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); nsresult nsres; - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", This, v); nsres = nsIDOMHTMLSelectElement_SetSelectedIndex(This->nsselect, v); if(NS_FAILED(nsres)) @@ -204,7 +204,7 @@ 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); PRInt32 idx = 0; @@ -336,21 +336,21 @@ 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); - FIXME("(%p)->(%ld)\n", This, index); + FIXME("(%p)->(%d)\n", This, index); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); PRUint32 length = 0; @@ -364,7 +364,7 @@ *p = length; - TRACE("ret %ld\n", *p); + TRACE("ret %d\n", *p); return S_OK; }
diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 9db2c98..e72a761 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c
@@ -264,28 +264,28 @@ 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p); 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); - FIXME("(%p)->(%ld)\n", This, v); + FIXME("(%p)->(%d)\n", This, v); 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); FIXME("(%p)->(%p)\n", This, p);
diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index d96dfaf..d86a97b 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c
@@ -93,7 +93,7 @@ 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); @@ -102,7 +102,7 @@ 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); @@ -111,16 +111,16 @@ 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); - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", This, 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); @@ -129,16 +129,16 @@ 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); - TRACE("(%p)->(%ld)\n", This, v); + TRACE("(%p)->(%d)\n", This, 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);
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a272d95..1fde367 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c
@@ -652,7 +652,7 @@ static void _test_elem_offset(unsigned line, IUnknown *unk) { IHTMLElement *elem = _get_elem_iface(line, unk); - long l; + LONG l; HRESULT hres; hres = IHTMLElement_get_offsetTop(elem, &l); @@ -793,23 +793,23 @@ #define test_select_length(s,l) _test_select_length(__LINE__,s,l) static void _test_select_length(unsigned line, IHTMLSelectElement *select, long length) { - long len = 0xdeadbeef; + LONG len = 0xdeadbeef; HRESULT hres; hres = IHTMLSelectElement_get_length(select, &len); 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) static void _test_select_selidx(unsigned line, IHTMLSelectElement *select, long index) { - long idx = 0xdeadbeef; + LONG idx = 0xdeadbeef; HRESULT hres; hres = IHTMLSelectElement_get_selectedIndex(select, &idx); 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) @@ -1002,7 +1002,7 @@ const elem_type_t *elem_types, long exlen) { IHTMLElementCollection *col; - long len; + LONG len; DWORD i; VARIANT name, index; IDispatch *disp; @@ -1015,7 +1015,7 @@ hres = IHTMLElementCollection_get_length(col, &len); 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) len = exlen; @@ -1276,7 +1276,7 @@ { IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLTextContainer *txtcont; - long l = -1, l2 = -1; + LONG l = -1, l2 = -1; HRESULT hres; hres = IHTMLElement2_get_scrollHeight(elem, &l); @@ -1288,8 +1288,8 @@ hres = IHTMLTextContainer_get_scrollHeight(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %ld\n", l2); - ok_(__FILE__,line) (l == l2, "unexpected height %ld, expected %ld\n", l2, l); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollHeight failed: %d\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected height %d, expected %d\n", l2, l); return l; } @@ -1299,7 +1299,7 @@ { IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLTextContainer *txtcont; - long l = -1, l2 = -1; + LONG l = -1, l2 = -1; HRESULT hres; hres = IHTMLElement2_get_scrollWidth(elem, &l); @@ -1311,8 +1311,8 @@ hres = IHTMLTextContainer_get_scrollWidth(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %ld\n", l2); - ok_(__FILE__,line) (l == l2, "unexpected width %ld, expected %ld\n", l2, l); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollWidth failed: %d\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected width %d, expected %d\n", l2, l); return l; } @@ -1322,7 +1322,7 @@ { IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLTextContainer *txtcont; - long l = -1, l2 = -1; + LONG l = -1, l2 = -1; HRESULT hres; hres = IHTMLElement2_get_scrollTop(elem, &l); @@ -1334,8 +1334,8 @@ hres = IHTMLTextContainer_get_scrollTop(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %ld\n", l2); - ok_(__FILE__,line) (l == l2, "unexpected top %ld, expected %ld\n", l2, l); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %d\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected top %d, expected %d\n", l2, l); return l; } @@ -1345,7 +1345,7 @@ { IHTMLElement2 *elem = _get_elem2_iface(line, unk); IHTMLTextContainer *txtcont; - long l = -1, l2 = -1; + LONG l = -1, l2 = -1; HRESULT hres; hres = IHTMLElement2_get_scrollLeft(elem, NULL); @@ -1360,8 +1360,8 @@ hres = IHTMLTextContainer_get_scrollLeft(txtcont, &l2); IHTMLTextContainer_Release(txtcont); - ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %ld\n", l2); - ok(l == l2, "unexpected left %ld, expected %ld\n", l2, l); + ok(hres == S_OK, "IHTMLTextContainer::get_scrollLeft failed: %d\n", l2); + ok(l == l2, "unexpected left %d, expected %d\n", l2, l); } #define test_img_src(i,s) _test_img_src(__LINE__,i,s) @@ -1701,7 +1701,7 @@ static void _test_elem_client_size(unsigned line, IUnknown *unk) { IHTMLElement2 *elem = _get_elem2_iface(line, unk); - long l; + LONG l; HRESULT hres; hres = IHTMLElement2_get_clientWidth(elem, &l);
diff --git a/include/mshtml.idl b/include/mshtml.idl index 68d54c3..52ba782 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl
@@ -3817,7 +3817,7 @@ [retval, out] VARIANT_BOOL *pfResult); [propget, id(DISPID_IHTMLELEMENT_SOURCEINDEX)] - HRESULT sourceIndex([retval, out] long *p); + HRESULT sourceIndex([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT_RECORDNUMBER)] HRESULT recordNumber([retval, out] VARIANT *p); @@ -3829,16 +3829,16 @@ HRESULT lang([retval, out] BSTR *p); [propget, id(DISPID_IHTMLELEMENT_OFFSETLEFT)] - HRESULT offsetLeft([retval, out] long *p); + HRESULT offsetLeft([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT_OFFSETTOP)] - HRESULT offsetTop([retval, out] long *p); + HRESULT offsetTop([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT_OFFSETWIDTH)] - HRESULT offsetWidth([retval, out] long *p); + HRESULT offsetWidth([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT_OFFSETHEIGHT)] - HRESULT offsetHeight([retval, out] long *p); + HRESULT offsetHeight([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT_OFFSETPARENT)] HRESULT offsetParent([retval, out] IHTMLElement **p); @@ -3983,8 +3983,8 @@ [id(DISPID_IHTMLELEMENT2_COMPONENTFROMPOINT)] HRESULT componentFromPoint( - [in] long x, - [in] long y, + [in] LONG x, + [in] LONG y, [retval, out] BSTR *component); [id(DISPID_IHTMLELEMENT2_DOSCROLL)] @@ -4142,16 +4142,16 @@ HRESULT removeFilter([in] IUnknown *pUnk); [propget, id(DISPID_IHTMLELEMENT2_CLIENTHEIGHT), displaybind, bindable] - HRESULT clientHeight([retval, out] long *p); + HRESULT clientHeight([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT2_CLIENTWIDTH), displaybind, bindable] - HRESULT clientWidth([retval, out] long *p); + HRESULT clientWidth([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT2_CLIENTTOP), displaybind, bindable] - HRESULT clientTop([retval, out] long *p); + HRESULT clientTop([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT2_CLIENTLEFT), displaybind, bindable] - HRESULT clientLeft([retval, out] long *p); + HRESULT clientLeft([retval, out] LONG *p); [id(DISPID_IHTMLELEMENT2_ATTACHEVENT)] HRESULT attachEvent( @@ -4201,22 +4201,22 @@ HRESULT createControlRange([retval, out] IDispatch **range); [propget, id(DISPID_IHTMLELEMENT2_SCROLLHEIGHT), displaybind, bindable] - HRESULT scrollHeight([retval, out] long *p); + HRESULT scrollHeight([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENT2_SCROLLWIDTH), displaybind, bindable] - HRESULT scrollWidth([retval, out] long *p); + HRESULT scrollWidth([retval, out] LONG *p); [propput, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - HRESULT scrollTop([in] long v); + HRESULT scrollTop([in] LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - HRESULT scrollTop([retval, out] long *p); + HRESULT scrollTop([retval, out] LONG *p); [propput, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - HRESULT scrollLeft([in] long v); + HRESULT scrollLeft([in] LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - HRESULT scrollLeft([retval, out] long *p); + HRESULT scrollLeft([retval, out] LONG *p); [id(DISPID_IHTMLELEMENT2_CLEARATTRIBUTES)] HRESULT clearAttributes(); @@ -4260,11 +4260,11 @@ HRESULT addBehavior( [in] BSTR bstrUrl, [optional, in] VARIANT *pvarFactory, - [retval, out] long *pCookie); + [retval, out] LONG *pCookie); [id(DISPID_IHTMLELEMENT2_REMOVEBEHAVIOR)] HRESULT removeBehavior( - [in] long cookie, + [in] LONG cookie, [retval, out] VARIANT_BOOL *pfResult); [propget, id(DISPID_IHTMLELEMENT2_RUNTIMESTYLE), nonbrowsable] @@ -4286,7 +4286,7 @@ HRESULT onbeforeeditfocus([retval, out] VARIANT *p); [propget, id(DISPID_IHTMLELEMENT2_READYSTATEVALUE), hidden, restricted] - HRESULT readyStateValue([retval, out] long *p); + HRESULT readyStateValue([retval, out] LONG *p); [id(DISPID_IHTMLELEMENT2_GETELEMENTSBYTAGNAME)] HRESULT getElementsByTagName( @@ -4653,7 +4653,7 @@ VARIANT_BOOL contains([in] IHTMLElement *pChild); [propget, id(DISPID_IHTMLELEMENT_SOURCEINDEX), bindable] - long sourceIndex(); + LONG sourceIndex(); [propget, id(DISPID_IHTMLELEMENT_RECORDNUMBER)] VARIANT recordNumber(); @@ -4665,16 +4665,16 @@ BSTR lang(); [propget, id(DISPID_IHTMLELEMENT_OFFSETLEFT)] - long offsetLeft(); + LONG offsetLeft(); [propget, id(DISPID_IHTMLELEMENT_OFFSETTOP)] - long offsetTop(); + LONG offsetTop(); [propget, id(DISPID_IHTMLELEMENT_OFFSETWIDTH)] - long offsetWidth(); + LONG offsetWidth(); [propget, id(DISPID_IHTMLELEMENT_OFFSETHEIGHT)] - long offsetHeight(); + LONG offsetHeight(); [propget, id(DISPID_IHTMLELEMENT_OFFSETPARENT)] IHTMLElement *offsetParent(); @@ -4811,8 +4811,8 @@ [id(DISPID_IHTMLELEMENT2_COMPONENTFROMPOINT)] BSTR componentFromPoint( - [in] long x, - [in] long y); + [in] LONG x, + [in] LONG y); [id(DISPID_IHTMLELEMENT2_DOSCROLL)] void doScroll([in, optional] VARIANT component); @@ -4965,16 +4965,16 @@ void removeFilter([in] IUnknown *pUnk); [propget, id(DISPID_IHTMLELEMENT2_CLIENTHEIGHT), displaybind, bindable] - long clientHeight(); + LONG clientHeight(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTWIDTH), displaybind, bindable] - long clientWidth(); + LONG clientWidth(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTTOP), displaybind, bindable] - long clientTop(); + LONG clientTop(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTLEFT), displaybind, bindable] - long clientLeft(); + LONG clientLeft(); [id(DISPID_IHTMLELEMENT2_ATTACHEVENT)] VARIANT_BOOL attachEvent( @@ -5023,22 +5023,22 @@ IDispatch *createControlRange(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLHEIGHT), displaybind, bindable] - long scrollHeight(); + LONG scrollHeight(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLWIDTH), displaybind, bindable] - long scrollWidth(); + LONG scrollWidth(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - void scrollTop(long v); + void scrollTop(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - long scrollTop(); + LONG scrollTop(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - void scrollLeft(long v); + void scrollLeft(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - long scrollLeft(); + LONG scrollLeft(); [id(DISPID_IHTMLELEMENT2_CLEARATTRIBUTES)] void clearAttributes(); @@ -5071,12 +5071,12 @@ VARIANT_BOOL canHaveChildren(); [id(DISPID_IHTMLELEMENT2_ADDBEHAVIOR)] - long addBehavior( + LONG addBehavior( [in] BSTR bstrUrl, [in, optional] VARIANT *pvarFactory); [id(DISPID_IHTMLELEMENT2_REMOVEBEHAVIOR)] - VARIANT_BOOL removeBehavior([in] long cookie); + VARIANT_BOOL removeBehavior([in] LONG cookie); [propget, id(DISPID_IHTMLELEMENT2_RUNTIMESTYLE), nonbrowsable] IHTMLStyle *runtimeStyle(); @@ -5097,7 +5097,7 @@ VARIANT onbeforeeditfocus(); [propget, id(DISPID_IHTMLELEMENT2_READYSTATEVALUE), hidden, restricted] - long readyStateValue(); + LONG readyStateValue(); [id(DISPID_IHTMLELEMENT2_GETELEMENTSBYTAGNAME)] IHTMLElementCollection *getElementsByTagName([in] BSTR v); @@ -5272,13 +5272,13 @@ VARIANT onfocusout(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - long uniqueNumber(); + LONG uniqueNumber(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] BSTR uniqueID(); [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] - long nodeType(); + LONG nodeType(); [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)] IHTMLDOMNode *parentNode(); @@ -5879,10 +5879,10 @@ HRESULT reset(); [propput, id(DISPID_IHTMLFORMELEMENT_LENGTH)] - HRESULT length([in] long v); + HRESULT length([in] LONG v); [propget, id(DISPID_IHTMLFORMELEMENT_LENGTH)] - HRESULT length([retval, out] long *p); + HRESULT length([retval, out] LONG *p); [propget, id(DISPID_IHTMLFORMELEMENT__NEWENUM)] HRESULT _newEnum([retval, out] IUnknown **p); @@ -5914,22 +5914,22 @@ HRESULT createControlRange([retval, out] IDispatch **range); [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLHEIGHT), displaybind, bindable] - HRESULT scrollHeight([retval, out] long *p); + HRESULT scrollHeight([retval, out] LONG *p); [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLWIDTH), displaybind, bindable] - HRESULT scrollWidth([retval, out] long *p); + HRESULT scrollWidth([retval, out] LONG *p); [propput, id(DISPID_IHTMLTEXTCONTAINER_SCROLLTOP), displaybind, bindable] - HRESULT scrollTop([in] long v); + HRESULT scrollTop([in] LONG v); [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLTOP), displaybind, bindable] - HRESULT scrollTop([retval, out] long *p); + HRESULT scrollTop([retval, out] LONG *p); [propput, id(DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT), displaybind, bindable] - HRESULT scrollLeft([in] long v); + HRESULT scrollLeft([in] LONG v); [propget, id(DISPID_IHTMLTEXTCONTAINER_SCROLLLEFT), displaybind, bindable] - HRESULT scrollLeft([retval, out] long *p); + HRESULT scrollLeft([retval, out] LONG *p); [propput, id(DISPID_IHTMLTEXTCONTAINER_ONSCROLL), displaybind, bindable] HRESULT onscroll([in] VARIANT v); @@ -5992,16 +5992,16 @@ HRESULT border([retval, out] VARIANT *p); [propput, id(DISPID_IHTMLIMGELEMENT_VSPACE)] - HRESULT vspace([in] long v); + HRESULT vspace([in] LONG v); [propget, id(DISPID_IHTMLIMGELEMENT_VSPACE)] - HRESULT vspace([retval, out] long *p); + HRESULT vspace([retval, out] LONG *p); [propput, id(DISPID_IHTMLIMGELEMENT_HSPACE)] - HRESULT hspace([in] long v); + HRESULT hspace([in] LONG v); [propget, id(DISPID_IHTMLIMGELEMENT_HSPACE)] - HRESULT hspace([retval, out] long *p); + HRESULT hspace([retval, out] LONG *p); [propput, id(DISPID_IHTMLIMGELEMENT_ALT)] HRESULT alt([in] BSTR v); @@ -6076,16 +6076,16 @@ HRESULT name([retval, out] BSTR *p); [propput, id(DISPID_IHTMLIMGELEMENT_WIDTH)] - HRESULT width([in] long v); + HRESULT width([in] LONG v); [propget, id(DISPID_IHTMLIMGELEMENT_WIDTH)] - HRESULT width([retval, out] long *p); + HRESULT width([retval, out] LONG *p); [propput, id(DISPID_IHTMLIMGELEMENT_HEIGHT)] - HRESULT height([in] long v); + HRESULT height([in] LONG v); [propget, id(DISPID_IHTMLIMGELEMENT_HEIGHT)] - HRESULT height([retval, out] long *p); + HRESULT height([retval, out] LONG *p); [propput, id(DISPID_IHTMLIMGELEMENT_START)] HRESULT start([in] BSTR v); @@ -7210,16 +7210,16 @@ HRESULT removeFilter([in] IUnknown* pUnk); [propget, id(DISPID_IHTMLCONTROLELEMENT_CLIENTHEIGHT), displaybind, bindable] - HRESULT clientHeight([retval, out] long * p); + HRESULT clientHeight([retval, out] LONG * p); [propget, id(DISPID_IHTMLCONTROLELEMENT_CLIENTWIDTH), displaybind, bindable] - HRESULT clientWidth([retval, out] long * p); + HRESULT clientWidth([retval, out] LONG * p); [propget, id(DISPID_IHTMLCONTROLELEMENT_CLIENTTOP), displaybind, bindable] - HRESULT clientTop([retval, out] long * p); + HRESULT clientTop([retval, out] LONG * p); [propget, id(DISPID_IHTMLCONTROLELEMENT_CLIENTLEFT), displaybind, bindable] - HRESULT clientLeft([retval, out] long * p); + HRESULT clientLeft([retval, out] LONG * p); }; /***************************************************************************** @@ -8469,10 +8469,10 @@ HRESULT toString([retval, out] BSTR *String); [propput, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] - HRESULT length([in] long v); + HRESULT length([in] LONG v); [propget, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] - HRESULT length([retval, out] long *p); + HRESULT length([retval, out] LONG *p); [propget, id(DISPID_IHTMLELEMENTCOLLECTION__NEWENUM)] HRESULT _newEnum([retval, out] IUnknown **p); @@ -8504,10 +8504,10 @@ BSTR toString(); [propput, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] - void length(long v); + void length(LONG v); [propget, id(DISPID_IHTMLELEMENTCOLLECTION_LENGTH)] - long length(); + LONG length(); [propget, id(DISPID_IHTMLELEMENTCOLLECTION__NEWENUM), hidden, restricted] IUnknown *_newEnum(); @@ -8540,10 +8540,10 @@ interface IHTMLSelectElement : IDispatch { [propput, id(DISPID_IHTMLSELECTELEMENT_SIZE), displaybind, bindable] - HRESULT size([in] long v); + HRESULT size([in] LONG v); [propget, id(DISPID_IHTMLSELECTELEMENT_SIZE), displaybind, bindable] - HRESULT size([retval, out] long *p); + HRESULT size([retval, out] LONG *p); [propput, id(DISPID_IHTMLSELECTELEMENT_MULTIPLE), displaybind, bindable] HRESULT multiple([in] VARIANT_BOOL v); @@ -8567,10 +8567,10 @@ HRESULT onchange([retval, out] VARIANT *p); [propput, id(DISPID_IHTMLSELECTELEMENT_SELECTEDINDEX)] - HRESULT selectedIndex([in] long v); + HRESULT selectedIndex([in] LONG v); [propget, id(DISPID_IHTMLSELECTELEMENT_SELECTEDINDEX)] - HRESULT selectedIndex([retval, out] long *p); + HRESULT selectedIndex([retval, out] LONG *p); [propget, id(DISPID_IHTMLSELECTELEMENT_TYPE), displaybind, bindable] HRESULT type([retval, out] BSTR *p); @@ -8596,13 +8596,13 @@ [optional, in] VARIANT before); [id(DISPID_IHTMLSELECTELEMENT_REMOVE)] - HRESULT remove([defaultvalue(-1), in] long index); + HRESULT remove([defaultvalue(-1), in] LONG index); [propput, id(DISPID_IHTMLSELECTELEMENT_LENGTH)] - HRESULT length([in] long v); + HRESULT length([in] LONG v); [propget, id(DISPID_IHTMLSELECTELEMENT_LENGTH)] - HRESULT length([retval, out] long *p); + HRESULT length([retval, out] LONG *p); [propget, id(DISPID_IHTMLSELECTELEMENT__NEWENUM), hidden, restricted] HRESULT _newEnum([retval, out] IUnknown **p); @@ -8761,7 +8761,7 @@ VARIANT_BOOL contains([in] IHTMLElement *pChild); [propget, id(DISPID_IHTMLELEMENT_SOURCEINDEX), bindable] - long sourceIndex(); + LONG sourceIndex(); [propget, id(DISPID_IHTMLELEMENT_RECORDNUMBER)] VARIANT recordNumber(); @@ -8773,16 +8773,16 @@ BSTR lang(); [propget, id(DISPID_IHTMLELEMENT_OFFSETLEFT)] - long offsetLeft(); + LONG offsetLeft(); [propget, id(DISPID_IHTMLELEMENT_OFFSETTOP)] - long offsetTop(); + LONG offsetTop(); [propget, id(DISPID_IHTMLELEMENT_OFFSETWIDTH)] - long offsetWidth(); + LONG offsetWidth(); [propget, id(DISPID_IHTMLELEMENT_OFFSETHEIGHT)] - long offsetHeight(); + LONG offsetHeight(); [propget, id(DISPID_IHTMLELEMENT_OFFSETPARENT)] IHTMLElement *offsetParent(); @@ -8919,8 +8919,8 @@ [id(DISPID_IHTMLELEMENT2_COMPONENTFROMPOINT)] BSTR componentFromPoint( - [in] long x, - [in] long y); + [in] LONG x, + [in] LONG y); [id(DISPID_IHTMLELEMENT2_DOSCROLL)] void doScroll([in, optional] VARIANT component); @@ -9073,16 +9073,16 @@ void removeFilter([in] IUnknown *pUnk); [propget, id(DISPID_IHTMLELEMENT2_CLIENTHEIGHT), displaybind, bindable] - long clientHeight(); + LONG clientHeight(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTWIDTH), displaybind, bindable] - long clientWidth(); + LONG clientWidth(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTTOP), displaybind, bindable] - long clientTop(); + LONG clientTop(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTLEFT), displaybind, bindable] - long clientLeft(); + LONG clientLeft(); [id(DISPID_IHTMLELEMENT2_ATTACHEVENT)] VARIANT_BOOL attachEvent( @@ -9131,22 +9131,22 @@ IDispatch *createControlRange(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLHEIGHT), displaybind, bindable] - long scrollHeight(); + LONG scrollHeight(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLWIDTH), displaybind, bindable] - long scrollWidth(); + LONG scrollWidth(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - void scrollTop(long v); + void scrollTop(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - long scrollTop(); + LONG scrollTop(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - void scrollLeft(long v); + void scrollLeft(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - long scrollLeft(); + LONG scrollLeft(); [id(DISPID_IHTMLELEMENT2_CLEARATTRIBUTES)] void clearAttributes(); @@ -9179,12 +9179,12 @@ VARIANT_BOOL canHaveChildren(); [id(DISPID_IHTMLELEMENT2_ADDBEHAVIOR)] - long addBehavior( + LONG addBehavior( [in] BSTR bstrUrl, [in, optional] VARIANT *pvarFactory); [id(DISPID_IHTMLELEMENT2_REMOVEBEHAVIOR)] - VARIANT_BOOL removeBehavior([in] long cookie); + VARIANT_BOOL removeBehavior([in] LONG cookie); [propget, id(DISPID_IHTMLELEMENT2_RUNTIMESTYLE), nonbrowsable] IHTMLStyle *runtimeStyle(); @@ -9205,7 +9205,7 @@ VARIANT onbeforeeditfocus(); [propget, id(DISPID_IHTMLELEMENT2_READYSTATEVALUE), hidden, restricted] - long readyStateValue(); + LONG readyStateValue(); [id(DISPID_IHTMLELEMENT2_GETELEMENTSBYTAGNAME)] IHTMLElementCollection *getElementsByTagName([in] BSTR v); @@ -9380,13 +9380,13 @@ VARIANT onfocusout(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - long uniqueNumber(); + LONG uniqueNumber(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] BSTR uniqueID(); [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] - long nodeType(); + LONG nodeType(); [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)] IHTMLDOMNode *parentNode(); @@ -9471,10 +9471,10 @@ BSTR dataFormatAs(); [propput, id(DISPID_IHTMLSELECTELEMENT_SIZE), displaybind, bindable] - void size(long v); + void size(LONG v); [propget, id(DISPID_IHTMLSELECTELEMENT_SIZE), displaybind, bindable] - long size(); + LONG size(); [propput, id(DISPID_IHTMLSELECTELEMENT_MULTIPLE), displaybind, bindable] void multiple(VARIANT_BOOL v); @@ -9498,10 +9498,10 @@ VARIANT onchange(); [propput, id(DISPID_IHTMLSELECTELEMENT_SELECTEDINDEX)] - void selectedIndex(long v); + void selectedIndex(LONG v); [propget, id(DISPID_IHTMLSELECTELEMENT_SELECTEDINDEX)] - long selectedIndex(); + LONG selectedIndex(); [propget, id(DISPID_IHTMLSELECTELEMENT_TYPE), displaybind, bindable] BSTR type(); @@ -9521,13 +9521,13 @@ [in, optional] VARIANT before); [id(DISPID_IHTMLSELECTELEMENT_REMOVE)] - void remove([in, defaultvalue(-1)] long index); + void remove([in, defaultvalue(-1)] LONG index); [propput, id(DISPID_IHTMLSELECTELEMENT_LENGTH)] - void length(long v); + void length(LONG v); [propget, id(DISPID_IHTMLSELECTELEMENT_LENGTH)] - long length(); + LONG length(); [propget, id(DISPID_IHTMLSELECTELEMENT__NEWENUM), hidden, restricted] IUnknown *_newEnum(); @@ -9778,7 +9778,7 @@ VARIANT_BOOL contains([in] IHTMLElement *pChild); [propget, id(DISPID_IHTMLELEMENT_SOURCEINDEX), bindable] - long sourceIndex(); + LONG sourceIndex(); [propget, id(DISPID_IHTMLELEMENT_RECORDNUMBER)] VARIANT recordNumber(); @@ -9790,16 +9790,16 @@ BSTR lang(); [propget, id(DISPID_IHTMLELEMENT_OFFSETLEFT)] - long offsetLeft(); + LONG offsetLeft(); [propget, id(DISPID_IHTMLELEMENT_OFFSETTOP)] - long offsetTop(); + LONG offsetTop(); [propget, id(DISPID_IHTMLELEMENT_OFFSETWIDTH)] - long offsetWidth(); + LONG offsetWidth(); [propget, id(DISPID_IHTMLELEMENT_OFFSETHEIGHT)] - long offsetHeight(); + LONG offsetHeight(); [propget, id(DISPID_IHTMLELEMENT_OFFSETPARENT)] IHTMLElement *offsetParent(); @@ -9936,8 +9936,8 @@ [id(DISPID_IHTMLELEMENT2_COMPONENTFROMPOINT)] BSTR componentFromPoint( - [in] long x, - [in] long y); + [in] LONG x, + [in] LONG y); [id(DISPID_IHTMLELEMENT2_DOSCROLL)] void doScroll([in, optional] VARIANT component); @@ -10090,16 +10090,16 @@ void removeFilter([in] IUnknown *pUnk); [propget, id(DISPID_IHTMLELEMENT2_CLIENTHEIGHT), displaybind, bindable] - long clientHeight(); + LONG clientHeight(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTWIDTH), displaybind, bindable] - long clientWidth(); + LONG clientWidth(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTTOP), displaybind, bindable] - long clientTop(); + LONG clientTop(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTLEFT), displaybind, bindable] - long clientLeft(); + LONG clientLeft(); [id(DISPID_IHTMLELEMENT2_ATTACHEVENT)] VARIANT_BOOL attachEvent( @@ -10148,22 +10148,22 @@ IDispatch *createControlRange(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLHEIGHT), displaybind, bindable] - long scrollHeight(); + LONG scrollHeight(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLWIDTH), displaybind, bindable] - long scrollWidth(); + LONG scrollWidth(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - void scrollTop(long v); + void scrollTop(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - long scrollTop(); + LONG scrollTop(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - void scrollLeft(long v); + void scrollLeft(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - long scrollLeft(); + LONG scrollLeft(); [id(DISPID_IHTMLELEMENT2_CLEARATTRIBUTES)] void clearAttributes(); @@ -10196,12 +10196,12 @@ VARIANT_BOOL canHaveChildren(); [id(DISPID_IHTMLELEMENT2_ADDBEHAVIOR)] - long addBehavior( + LONG addBehavior( [in] BSTR bstrUrl, [in, optional] VARIANT *pvarFactory); [id(DISPID_IHTMLELEMENT2_REMOVEBEHAVIOR)] - VARIANT_BOOL removeBehavior([in] long cookie); + VARIANT_BOOL removeBehavior([in] LONG cookie); [propget, id(DISPID_IHTMLELEMENT2_RUNTIMESTYLE), nonbrowsable] IHTMLStyle *runtimeStyle(); @@ -10222,7 +10222,7 @@ VARIANT onbeforeeditfocus(); [propget, id(DISPID_IHTMLELEMENT2_READYSTATEVALUE), hidden, restricted] - long readyStateValue(); + LONG readyStateValue(); [id(DISPID_IHTMLELEMENT2_GETELEMENTSBYTAGNAME)] IHTMLElementCollection *getElementsByTagName([in] BSTR v); @@ -10397,13 +10397,13 @@ VARIANT onfocusout(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - long uniqueNumber(); + LONG uniqueNumber(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] BSTR uniqueID(); [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] - long nodeType(); + LONG nodeType(); [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)] IHTMLDOMNode *parentNode(); @@ -10572,16 +10572,16 @@ HRESULT form([retval, out] IHTMLFormElement **p); [propput, id(DISPID_IHTMLINPUTELEMENT_SIZE), displaybind, bindable] - HRESULT size([in] long v); + HRESULT size([in] LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_SIZE), displaybind, bindable] - HRESULT size([retval, out] long *p); + HRESULT size([retval, out] LONG *p); [propput, id(DISPID_IHTMLINPUTELEMENT_MAXLENGTH), displaybind, bindable] - HRESULT maxLength([in] long v); + HRESULT maxLength([in] LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_MAXLENGTH), displaybind, bindable] - HRESULT maxLength([retval, out] long *p); + HRESULT maxLength([retval, out] LONG *p); [id(DISPID_IHTMLINPUTELEMENT_SELECT)] HRESULT select(); @@ -10638,16 +10638,16 @@ HRESULT border([retval, out] VARIANT *p); [propput, id(DISPID_IHTMLINPUTELEMENT_VSPACE), displaybind, bindable] - HRESULT vspace([in] long v); + HRESULT vspace([in] LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_VSPACE), displaybind, bindable] - HRESULT vspace([retval, out] long *p); + HRESULT vspace([retval, out] LONG *p); [propput, id(DISPID_IHTMLINPUTELEMENT_HSPACE), displaybind, bindable] - HRESULT hspace([in] long v); + HRESULT hspace([in] LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_HSPACE), displaybind, bindable] - HRESULT hspace([retval, out] long *p); + HRESULT hspace([retval, out] LONG *p); [propput, id(DISPID_IHTMLINPUTELEMENT_ALT), displaybind, bindable] HRESULT alt([in] BSTR v); @@ -10716,16 +10716,16 @@ HRESULT onabort([retval, out] VARIANT *p); [propput, id(DISPID_IHTMLINPUTELEMENT_WIDTH)] - HRESULT width([in] long v); + HRESULT width([in] LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_WIDTH)] - HRESULT width([retval, out] long *p); + HRESULT width([retval, out] LONG *p); [propput, id(DISPID_IHTMLINPUTELEMENT_HEIGHT)] - HRESULT height([in] long v); + HRESULT height([in] LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_HEIGHT)] - HRESULT height([retval, out] long *p); + HRESULT height([retval, out] LONG *p); [propput, id(DISPID_IHTMLINPUTELEMENT_START), displaybind, bindable] HRESULT start([in] BSTR v); @@ -10782,16 +10782,16 @@ HRESULT defaultValue([retval, out] BSTR *p); [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_SIZE), displaybind, bindable] - HRESULT size([in] long v); + HRESULT size([in] LONG v); [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_SIZE), displaybind, bindable] - HRESULT size([retval, out] long *p); + HRESULT size([retval, out] LONG *p); [propput, id(DISPID_IHTMLINPUTTEXTELEMENT_MAXLENGTH), displaybind, bindable] - HRESULT maxLength([in] long v); + HRESULT maxLength([in] LONG v); [propget, id(DISPID_IHTMLINPUTTEXTELEMENT_MAXLENGTH), displaybind, bindable] - HRESULT maxLength([retval, out] long *p); + HRESULT maxLength([retval, out] LONG *p); [id(DISPID_IHTMLINPUTTEXTELEMENT_SELECT)] HRESULT select(); @@ -10957,7 +10957,7 @@ VARIANT_BOOL contains([in] IHTMLElement *pChild); [propget, id(DISPID_IHTMLELEMENT_SOURCEINDEX), bindable] - long sourceIndex(); + LONG sourceIndex(); [propget, id(DISPID_IHTMLELEMENT_RECORDNUMBER)] VARIANT recordNumber(); @@ -10969,16 +10969,16 @@ BSTR lang(); [propget, id(DISPID_IHTMLELEMENT_OFFSETLEFT)] - long offsetLeft(); + LONG offsetLeft(); [propget, id(DISPID_IHTMLELEMENT_OFFSETTOP)] - long offsetTop(); + LONG offsetTop(); [propget, id(DISPID_IHTMLELEMENT_OFFSETWIDTH)] - long offsetWidth(); + LONG offsetWidth(); [propget, id(DISPID_IHTMLELEMENT_OFFSETHEIGHT)] - long offsetHeight(); + LONG offsetHeight(); [propget, id(DISPID_IHTMLELEMENT_OFFSETPARENT)] IHTMLElement *offsetParent(); @@ -11115,8 +11115,8 @@ [id(DISPID_IHTMLELEMENT2_COMPONENTFROMPOINT)] BSTR componentFromPoint( - [in] long x, - [in] long y); + [in] LONG x, + [in] LONG y); [id(DISPID_IHTMLELEMENT2_DOSCROLL)] void doScroll([in, optional] VARIANT component); @@ -11269,16 +11269,16 @@ void removeFilter([in] IUnknown *pUnk); [propget, id(DISPID_IHTMLELEMENT2_CLIENTHEIGHT), displaybind, bindable] - long clientHeight(); + LONG clientHeight(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTWIDTH), displaybind, bindable] - long clientWidth(); + LONG clientWidth(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTTOP), displaybind, bindable] - long clientTop(); + LONG clientTop(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTLEFT), displaybind, bindable] - long clientLeft(); + LONG clientLeft(); [id(DISPID_IHTMLELEMENT2_ATTACHEVENT)] VARIANT_BOOL attachEvent( @@ -11327,22 +11327,22 @@ IDispatch *createControlRange(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLHEIGHT), displaybind, bindable] - long scrollHeight(); + LONG scrollHeight(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLWIDTH), displaybind, bindable] - long scrollWidth(); + LONG scrollWidth(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - void scrollTop(long v); + void scrollTop(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - long scrollTop(); + LONG scrollTop(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - void scrollLeft(long v); + void scrollLeft(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - long scrollLeft(); + LONG scrollLeft(); [id(DISPID_IHTMLELEMENT2_CLEARATTRIBUTES)] void clearAttributes(); @@ -11375,12 +11375,12 @@ VARIANT_BOOL canHaveChildren(); [id(DISPID_IHTMLELEMENT2_ADDBEHAVIOR)] - long addBehavior( + LONG addBehavior( [in] BSTR bstrUrl, [in, optional] VARIANT *pvarFactory); [id(DISPID_IHTMLELEMENT2_REMOVEBEHAVIOR)] - VARIANT_BOOL removeBehavior([in] long cookie); + VARIANT_BOOL removeBehavior([in] LONG cookie); [propget, id(DISPID_IHTMLELEMENT2_RUNTIMESTYLE), nonbrowsable] IHTMLStyle *runtimeStyle(); @@ -11401,7 +11401,7 @@ VARIANT onbeforeeditfocus(); [propget, id(DISPID_IHTMLELEMENT2_READYSTATEVALUE), hidden, restricted] - long readyStateValue(); + LONG readyStateValue(); [id(DISPID_IHTMLELEMENT2_GETELEMENTSBYTAGNAME)] IHTMLElementCollection *getElementsByTagName([in] BSTR v); @@ -11576,13 +11576,13 @@ VARIANT onfocusout(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - long uniqueNumber(); + LONG uniqueNumber(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] BSTR uniqueID(); [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] - long nodeType(); + LONG nodeType(); [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)] IHTMLDOMNode *parentNode(); @@ -11694,16 +11694,16 @@ IHTMLFormElement *form(); [propput, id(DISPID_IHTMLINPUTELEMENT_SIZE), displaybind, bindable] - void size(long v); + void size(LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_SIZE), displaybind, bindable] - long size(); + LONG size(); [propput, id(DISPID_IHTMLINPUTELEMENT_MAXLENGTH), displaybind, bindable] - void maxLength(long v); + void maxLength(LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_MAXLENGTH), displaybind, bindable] - long maxLength(); + LONG maxLength(); [id(DISPID_IHTMLINPUTELEMENT_SELECT)] void select(); @@ -11760,16 +11760,16 @@ VARIANT border(); [propput, id(DISPID_IHTMLINPUTELEMENT_VSPACE), displaybind, bindable] - void vspace(long v); + void vspace(LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_VSPACE), displaybind, bindable] - long vspace(); + LONG vspace(); [propput, id(DISPID_IHTMLINPUTELEMENT_HSPACE), displaybind, bindable] - void hspace(long v); + void hspace(LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_HSPACE), displaybind, bindable] - long hspace(); + LONG hspace(); [propput, id(DISPID_IHTMLINPUTELEMENT_ALT), displaybind, bindable] void alt(BSTR v); @@ -11835,16 +11835,16 @@ VARIANT onabort(); [propput, id(DISPID_IHTMLINPUTELEMENT_WIDTH)] - void width(long v); + void width(LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_WIDTH)] - long width(); + LONG width(); [propput, id(DISPID_IHTMLINPUTELEMENT_HEIGHT)] - void height(long v); + void height(LONG v); [propget, id(DISPID_IHTMLINPUTELEMENT_HEIGHT)] - long height(); + LONG height(); [propput, id(DISPID_IHTMLINPUTELEMENT_START), displaybind, bindable] void start(BSTR v); @@ -11934,16 +11934,16 @@ HRESULT readOnly([retval, out] VARIANT_BOOL *p); [propput, id(DISPID_IHTMLTEXTAREAELEMENT_ROWS), displaybind, bindable] - HRESULT rows([in] long v); + HRESULT rows([in] LONG v); [propget, id(DISPID_IHTMLTEXTAREAELEMENT_ROWS), displaybind, bindable] - HRESULT rows([retval, out] long *p); + HRESULT rows([retval, out] LONG *p); [propput, id(DISPID_IHTMLTEXTAREAELEMENT_COLS), displaybind, bindable] - HRESULT cols([in] long v); + HRESULT cols([in] LONG v); [propget, id(DISPID_IHTMLTEXTAREAELEMENT_COLS), displaybind, bindable] - HRESULT cols([retval, out] long *p); + HRESULT cols([retval, out] LONG *p); [propput, id(DISPID_IHTMLTEXTAREAELEMENT_WRAP), displaybind, bindable] HRESULT wrap([in] BSTR v); @@ -12097,7 +12097,7 @@ VARIANT_BOOL contains([in] IHTMLElement *pChild); [propget, id(DISPID_IHTMLELEMENT_SOURCEINDEX), bindable] - long sourceIndex(); + LONG sourceIndex(); [propget, id(DISPID_IHTMLELEMENT_RECORDNUMBER)] VARIANT recordNumber(); @@ -12109,16 +12109,16 @@ BSTR lang(); [propget, id(DISPID_IHTMLELEMENT_OFFSETLEFT)] - long offsetLeft(); + LONG offsetLeft(); [propget, id(DISPID_IHTMLELEMENT_OFFSETTOP)] - long offsetTop(); + LONG offsetTop(); [propget, id(DISPID_IHTMLELEMENT_OFFSETWIDTH)] - long offsetWidth(); + LONG offsetWidth(); [propget, id(DISPID_IHTMLELEMENT_OFFSETHEIGHT)] - long offsetHeight(); + LONG offsetHeight(); [propget, id(DISPID_IHTMLELEMENT_OFFSETPARENT)] IHTMLElement *offsetParent(); @@ -12255,8 +12255,8 @@ [id(DISPID_IHTMLELEMENT2_COMPONENTFROMPOINT)] BSTR componentFromPoint( - [in] long x, - [in] long y); + [in] LONG x, + [in] LONG y); [id(DISPID_IHTMLELEMENT2_DOSCROLL)] void doScroll([in, optional] VARIANT component); @@ -12409,16 +12409,16 @@ void removeFilter([in] IUnknown *pUnk); [propget, id(DISPID_IHTMLELEMENT2_CLIENTHEIGHT), displaybind, bindable] - long clientHeight(); + LONG clientHeight(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTWIDTH), displaybind, bindable] - long clientWidth(); + LONG clientWidth(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTTOP), displaybind, bindable] - long clientTop(); + LONG clientTop(); [propget, id(DISPID_IHTMLELEMENT2_CLIENTLEFT), displaybind, bindable] - long clientLeft(); + LONG clientLeft(); [id(DISPID_IHTMLELEMENT2_ATTACHEVENT)] VARIANT_BOOL attachEvent( @@ -12467,22 +12467,22 @@ IDispatch *createControlRange(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLHEIGHT), displaybind, bindable] - long scrollHeight(); + LONG scrollHeight(); [propget, id(DISPID_IHTMLELEMENT2_SCROLLWIDTH), displaybind, bindable] - long scrollWidth(); + LONG scrollWidth(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - void scrollTop(long v); + void scrollTop(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLTOP), displaybind, bindable] - long scrollTop(); + LONG scrollTop(); [propput, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - void scrollLeft(long v); + void scrollLeft(LONG v); [propget, id(DISPID_IHTMLELEMENT2_SCROLLLEFT), displaybind, bindable] - long scrollLeft(); + LONG scrollLeft(); [id(DISPID_IHTMLELEMENT2_CLEARATTRIBUTES)] void clearAttributes(); @@ -12515,12 +12515,12 @@ VARIANT_BOOL canHaveChildren(); [id(DISPID_IHTMLELEMENT2_ADDBEHAVIOR)] - long addBehavior( + LONG addBehavior( [in] BSTR bstrUrl, [in, optional] VARIANT *pvarFactory); [id(DISPID_IHTMLELEMENT2_REMOVEBEHAVIOR)] - VARIANT_BOOL removeBehavior([in] long cookie); + VARIANT_BOOL removeBehavior([in] LONG cookie); [propget, id(DISPID_IHTMLELEMENT2_RUNTIMESTYLE), nonbrowsable] IHTMLStyle *runtimeStyle(); @@ -12541,7 +12541,7 @@ VARIANT onbeforeeditfocus(); [propget, id(DISPID_IHTMLELEMENT2_READYSTATEVALUE), hidden, restricted] - long readyStateValue(); + LONG readyStateValue(); [id(DISPID_IHTMLELEMENT2_GETELEMENTSBYTAGNAME)] IHTMLElementCollection *getElementsByTagName([in] BSTR v); @@ -12716,13 +12716,13 @@ VARIANT onfocusout(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUENUMBER), hidden] - long uniqueNumber(); + LONG uniqueNumber(); [propget, id(DISPID_IHTMLUNIQUENAME_UNIQUEID), hidden] BSTR uniqueID(); [propget, id(DISPID_IHTMLDOMNODE_NODETYPE)] - long nodeType(); + LONG nodeType(); [propget, id(DISPID_IHTMLDOMNODE_PARENTNODE)] IHTMLDOMNode *parentNode();