Skip to content

W
wine-winehq
Commit 165f691c authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

mshtml: Change long to LONG in mshtml.idl (htmlwindow.c part).

parent 6b37e6bb
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 69 deletions
dlls/mshtml/htmlwindow.c
View file @ 165f691c
......@@ -140,7 +140,7 @@ static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex,
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, long *p)
static HRESULT WINAPI HTMLWindow2_get_length(IHTMLWindow2 *iface, LONG *p)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
......@@ -183,12 +183,12 @@ static HRESULT WINAPI HTMLWindow2_get_status(IHTMLWindow2 *iface, BSTR *p)
}
static HRESULT WINAPI HTMLWindow2_setTimeout(IHTMLWindow2 *iface, BSTR expression,
long msec, VARIANT *language, long *timerID)
LONG msec, VARIANT *language, LONG *timerID)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
VARIANT expr_var;
TRACE("(%p)->(%s %ld %p %p)\n", This, debugstr_w(expression), msec, language, timerID);
TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_w(expression), msec, language, timerID);
V_VT(&expr_var) = VT_BSTR;
V_BSTR(&expr_var) = expression;
......@@ -196,11 +196,11 @@ static HRESULT WINAPI HTMLWindow2_setTimeout(IHTMLWindow2 *iface, BSTR expressio
return IHTMLWindow3_setTimeout(HTMLWINDOW3(This), &expr_var, msec, language, timerID);
}
static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, long timerID)
static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, LONG timerID)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
TRACE("(%p)->(%ld)\n", This, timerID);
TRACE("(%p)->(%d)\n", This, timerID);
return clear_task_timer(This->doc, FALSE, timerID);
}
......@@ -586,10 +586,10 @@ static HRESULT WINAPI HTMLWindow2_blur(IHTMLWindow2 *iface)
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_scroll(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%ld %ld)\n", This, x, y);
FIXME("(%p)->(%d %d)\n", This, x, y);
return E_NOTIMPL;
}
......@@ -601,23 +601,23 @@ static HRESULT WINAPI HTMLWindow2_get_clientInformation(IHTMLWindow2 *iface, IOm
}
static HRESULT WINAPI HTMLWindow2_setInterval(IHTMLWindow2 *iface, BSTR expression,
long msec, VARIANT *language, long *timerID)
LONG msec, VARIANT *language, LONG *timerID)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
VARIANT expr;
TRACE("(%p)->(%s %ld %p %p)\n", This, debugstr_w(expression), msec, language, timerID);
TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_w(expression), msec, language, timerID);
V_VT(&expr) = VT_BSTR;
V_BSTR(&expr) = expression;
return IHTMLWindow3_setInterval(HTMLWINDOW3(This), &expr, msec, language, timerID);
}
static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, long timerID)
static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, LONG timerID)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
TRACE("(%p)->(%ld)\n", This, timerID);
TRACE("(%p)->(%d)\n", This, timerID);
return clear_task_timer(This->doc, TRUE, timerID);
}
......@@ -651,12 +651,12 @@ static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String)
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
nsresult nsres;
TRACE("(%p)->(%ld %ld)\n", This, x, y);
TRACE("(%p)->(%d %d)\n", This, x, y);
nsres = nsIDOMWindow_ScrollBy(This->nswindow, x, y);
if(NS_FAILED(nsres))
......@@ -665,12 +665,12 @@ static HRESULT WINAPI HTMLWindow2_scrollBy(IHTMLWindow2 *iface, long x, long y)
return S_OK;
}
static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
nsresult nsres;
TRACE("(%p)->(%ld %ld)\n", This, x, y);
TRACE("(%p)->(%d %d)\n", This, x, y);
nsres = nsIDOMWindow_ScrollTo(This->nswindow, x, y);
if(NS_FAILED(nsres))
......@@ -679,31 +679,31 @@ static HRESULT WINAPI HTMLWindow2_scrollTo(IHTMLWindow2 *iface, long x, long y)
return S_OK;
}
static HRESULT WINAPI HTMLWindow2_moveTo(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_moveTo(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%ld %ld)\n", This, x, y);
FIXME("(%p)->(%d %d)\n", This, x, y);
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow2_moveBy(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_moveBy(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%ld %ld)\n", This, x, y);
FIXME("(%p)->(%d %d)\n", This, x, y);
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow2_resizeTo(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_resizeTo(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%ld %ld)\n", This, x, y);
FIXME("(%p)->(%d %d)\n", This, x, y);
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow2_resizeBy(IHTMLWindow2 *iface, long x, long y)
static HRESULT WINAPI HTMLWindow2_resizeBy(IHTMLWindow2 *iface, LONG x, LONG y)
{
HTMLWindow *This = HTMLWINDOW2_THIS(iface);
FIXME("(%p)->(%ld %ld)\n", This, x, y);
FIXME("(%p)->(%d %d)\n", This, x, y);
return E_NOTIMPL;
}
......@@ -860,14 +860,14 @@ static HRESULT WINAPI HTMLWindow3_Invoke(IHTMLWindow3 *iface, DISPID dispIdMembe
pVarResult, pExcepInfo, puArgErr);
}
static HRESULT WINAPI HTMLWindow3_get_screenLeft(IHTMLWindow3 *iface, long *p)
static HRESULT WINAPI HTMLWindow3_get_screenLeft(IHTMLWindow3 *iface, LONG *p)
{
HTMLWindow *This = HTMLWINDOW3_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
}
static HRESULT WINAPI HTMLWindow3_get_screenTop(IHTMLWindow3 *iface, long *p)
static HRESULT WINAPI HTMLWindow3_get_screenTop(IHTMLWindow3 *iface, LONG *p)
{
HTMLWindow *This = HTMLWINDOW3_THIS(iface);
FIXME("(%p)->(%p)\n", This, p);
......@@ -888,8 +888,8 @@ static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, I
return E_NOTIMPL;
}
static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, long msec, VARIANT *language,
BOOL interval, long *timer_id)
static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, LONG msec, VARIANT *language,
BOOL interval, LONG *timer_id)
{
IDispatch *disp = NULL;
......@@ -917,22 +917,22 @@ static HRESULT window_set_timer(HTMLWindow *This, VARIANT *expr, long msec, VARI
return S_OK;
}
static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, long msec,
VARIANT *language, long *timerID)
static HRESULT WINAPI HTMLWindow3_setTimeout(IHTMLWindow3 *iface, VARIANT *expression, LONG msec,
VARIANT *language, LONG *timerID)
{
HTMLWindow *This = HTMLWINDOW3_THIS(iface);
TRACE("(%p)->(%p(%d) %ld %p %p)\n", This, expression, V_VT(expression), msec, language, timerID);
TRACE("(%p)->(%p(%d) %d %p %p)\n", This, expression, V_VT(expression), msec, language, timerID);
return window_set_timer(This, expression, msec, language, FALSE, timerID);
}
static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, long msec,
VARIANT *language, long *timerID)
static HRESULT WINAPI HTMLWindow3_setInterval(IHTMLWindow3 *iface, VARIANT *expression, LONG msec,
VARIANT *language, LONG *timerID)
{
HTMLWindow *This = HTMLWINDOW3_THIS(iface);
TRACE("(%p)->(%p %ld %p %p)\n", This, expression, msec, language, timerID);
TRACE("(%p)->(%p %d %p %p)\n", This, expression, msec, language, timerID);
return window_set_timer(This, expression, msec, language, TRUE, timerID);
}
......
include/mshtml.idl
View file @ 165f691c
......@@ -13526,7 +13526,7 @@ interface IHTMLFramesCollection2 : IDispatch
[retval, out] VARIANT *pvarResult);
[propget, id(DISPID_IHTMLFRAMESCOLLECTION2_LENGTH)]
HRESULT length([retval, out] long *p);
HRESULT length([retval, out] LONG *p);
}
/*****************************************************************************
......@@ -13600,12 +13600,12 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
[id(DISPID_IHTMLWINDOW2_SETTIMEOUT)]
HRESULT setTimeout(
[in] BSTR expression,
[in] long msec,
[in] LONG msec,
[optional, in] VARIANT *language,
[retval, out] long *timerID);
[retval, out] LONG *timerID);
[id(DISPID_IHTMLWINDOW2_CLEARTIMEOUT)]
HRESULT clearTimeout([in] long timerID);
HRESULT clearTimeout([in] LONG timerID);
[id(DISPID_IHTMLWINDOW2_ALERT)]
HRESULT alert([defaultvalue(""), in] BSTR message);
......@@ -13763,7 +13763,7 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
HRESULT blur();
[id(DISPID_IHTMLWINDOW2_SCROLL)]
HRESULT scroll([in] long x, [in] long y);
HRESULT scroll([in] LONG x, [in] LONG y);
[propget, id(DISPID_IHTMLWINDOW2_CLIENTINFORMATION)]
HRESULT clientInformation([retval, out] IOmNavigator **p);
......@@ -13771,12 +13771,12 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
[id(DISPID_IHTMLWINDOW2_SETINTERVAL)]
HRESULT setInterval([
in] BSTR expression,
[in] long msec,
[in] LONG msec,
[optional, in] VARIANT *language,
[retval, out] long *timerID);
[retval, out] LONG *timerID);
[id(DISPID_IHTMLWINDOW2_CLEARINTERVAL)]
HRESULT clearInterval([in] long timerID);
HRESULT clearInterval([in] LONG timerID);
[propput, id(DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING)]
HRESULT offscreenBuffering([in] VARIANT v);
......@@ -13794,22 +13794,22 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
HRESULT toString([retval, out] BSTR *String);
[id(DISPID_IHTMLWINDOW2_SCROLLBY)]
HRESULT scrollBy([in] long x, [in] long y);
HRESULT scrollBy([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_SCROLLTO)]
HRESULT scrollTo([in] long x, [in] long y);
HRESULT scrollTo([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_MOVETO)]
HRESULT moveTo([in] long x, [in] long y);
HRESULT moveTo([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_MOVEBY)]
HRESULT moveBy([in] long x, [in] long y);
HRESULT moveBy([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_RESIZETO)]
HRESULT resizeTo([in] long x, [in] long y);
HRESULT resizeTo([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_RESIZEBY)]
HRESULT resizeBy([in] long x, [in] long y);
HRESULT resizeBy([in] LONG x, [in] LONG y);
[propget, id(DISPID_IHTMLWINDOW2_EXTERNAL)]
HRESULT external([retval, out] IDispatch **p);
......@@ -13827,10 +13827,10 @@ interface IHTMLWindow2 : IHTMLFramesCollection2
interface IHTMLWindow3 : IDispatch
{
[propget, id(DISPID_IHTMLWINDOW3_SCREENLEFT)]
HRESULT screenLeft([out, retval] long *p);
HRESULT screenLeft([out, retval] LONG *p);
[propget, id(DISPID_IHTMLWINDOW3_SCREENTOP)]
HRESULT screenTop([out, retval] long *p);
HRESULT screenTop([out, retval] LONG *p);
[id(DISPID_IHTMLWINDOW3_ATTACHEVENT)]
HRESULT attachEvent(
......@@ -13846,16 +13846,16 @@ interface IHTMLWindow3 : IDispatch
[id(DISPID_IHTMLWINDOW3_SETTIMEOUT)]
HRESULT setTimeout(
[in] VARIANT *expression,
[in] long msec,
[in] LONG msec,
[in, optional] VARIANT *language,
[out, retval] long *timerID);
[out, retval] LONG *timerID);
[id(DISPID_IHTMLWINDOW3_SETINTERVAL)]
HRESULT setInterval(
[in] VARIANT *expression,
[in] long msec,
[in] LONG msec,
[in, optional] VARIANT *language,
[out, retval] long *timerID);
[out, retval] LONG *timerID);
[id(DISPID_IHTMLWINDOW3_PRINT)]
HRESULT print();
......@@ -13898,7 +13898,7 @@ methods:
VARIANT item([in] VARIANT *pvarIndex);
[propget, id(DISPID_IHTMLFRAMESCOLLECTION2_LENGTH)]
long length();
LONG length();
[propget, id(DISPID_IHTMLWINDOW2_FRAMES)]
IHTMLFramesCollection2 *frames();
......@@ -13916,7 +13916,7 @@ methods:
BSTR status();
[id(DISPID_IHTMLWINDOW2_CLEARTIMEOUT)]
void clearTimeout([in] long timerID);
void clearTimeout([in] LONG timerID);
[id(DISPID_IHTMLWINDOW2_ALERT)]
void alert([in, defaultvalue("")] BSTR message);
......@@ -14066,13 +14066,13 @@ methods:
void blur();
[id(DISPID_IHTMLWINDOW2_SCROLL)]
void scroll([in] long x, [in] long y);
void scroll([in] LONG x, [in] LONG y);
[propget, id(DISPID_IHTMLWINDOW2_CLIENTINFORMATION)]
IOmNavigator *clientInformation();
[id(DISPID_IHTMLWINDOW2_CLEARINTERVAL)]
void clearInterval([in] long timerID);
void clearInterval([in] LONG timerID);
[propput, id(DISPID_IHTMLWINDOW2_OFFSCREENBUFFERING)]
void offscreenBuffering(VARIANT v);
......@@ -14089,31 +14089,31 @@ methods:
BSTR toString();
[id(DISPID_IHTMLWINDOW2_SCROLLBY)]
void scrollBy([in] long x, [in] long y);
void scrollBy([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_SCROLLTO)]
void scrollTo([in] long x, [in] long y);
void scrollTo([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_MOVETO)]
void moveTo([in] long x, [in] long y);
void moveTo([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_MOVEBY)]
void moveBy([in] long x, [in] long y);
void moveBy([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_RESIZETO)]
void resizeTo([in] long x, [in] long y);
void resizeTo([in] LONG x, [in] LONG y);
[id(DISPID_IHTMLWINDOW2_RESIZEBY)]
void resizeBy([in] long x, [in] long y);
void resizeBy([in] LONG x, [in] LONG y);
[propget, id(DISPID_IHTMLWINDOW2_EXTERNAL)]
IDispatch *external();
[propget, id(DISPID_IHTMLWINDOW3_SCREENLEFT)]
long screenLeft();
LONG screenLeft();
[propget, id(DISPID_IHTMLWINDOW3_SCREENTOP)]
long screenTop();
LONG screenTop();
[id(DISPID_IHTMLWINDOW3_ATTACHEVENT)]
VARIANT_BOOL attachEvent(
......@@ -14126,15 +14126,15 @@ methods:
[in] IDispatch *pDisp);
[id(DISPID_IHTMLWINDOW3_SETTIMEOUT)]
long setTimeout(
LONG setTimeout(
[in] VARIANT *expression,
[in] long msec,
[in] LONG msec,
[in, optional] VARIANT *language);
[id(DISPID_IHTMLWINDOW3_SETINTERVAL)]
long setInterval(
LONG setInterval(
[in] VARIANT *expression,
[in] long msec,
[in] LONG msec,
[in, optional] VARIANT *language);
[id(DISPID_IHTMLWINDOW3_PRINT)]
......
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