diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 622581f5b11..1628413704c 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -97,6 +97,18 @@ #define DISPID_DOMATTRIBUTE DISPID_NORMAL_FIRST #define DISPID_DOMTEXTNODE DISPID_NORMAL_FIRST #define DISPID_GENERIC DISPID_NORMAL_FIRST +#define DISPID_URN_COLL DISPID_NORMAL_FIRST +#define DISPID_NAMESPACE_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_NAMESPACE DISPID_NORMAL_FIRST +#define DISPID_TAGNAMES_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_XMLHTTPREQUEST DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTCOMPATIBLEINFO_COLLECTION DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST +#define DISPID_XDOMAINREQUEST DISPID_NORMAL_FIRST +#define DISPID_DOMSTORAGEITEM DISPID_NORMAL_FIRST +#define DISPID_DOMSTORAGE DISPID_NORMAL_FIRST +#define DISPID_DOMSTORAGELIST DISPID_NORMAL_FIRST + #define DISPID_DOMIMPLEMENTATION DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFO DISPID_NORMAL_FIRST #define DISPID_DOCUMENTCOMPATIBLEINFOCOLLECTION DISPID_NORMAL_FIRST @@ -609,9 +621,26 @@ #define DISPID_EVPROP_ONBEFOREACTIVATE (DISPID_EVENTS+90) #define DISPID_EVPROP_ONFOCUSIN (DISPID_EVENTS+91) #define DISPID_EVPROP_ONFOCUSOUT (DISPID_EVENTS+92) -#define DISPID_EVPROP_ONSTORAGE (DISPID_EVENTS+93) -#define DISPID_EVPROP_ONSTORAGECOMMIT (DISPID_EVENTS+94) -#define DISPID_EVPROPS_COUNT 95 +#define DISPID_EVPROP_ONVALUECHANGE (DISPID_EVENTS+93) +#define DISPID_EVPROP_ONSELECTADD (DISPID_EVENTS+94) +#define DISPID_EVPROP_ONSELECTREMOV (DISPID_EVENTS+95) +#define DISPID_EVPROP_ONSELECTWITHI (DISPID_EVENTS+96) +#define DISPID_EVPROP_ONSYSTEMSCROLLINGSTART (DISPID_EVENTS+97) +#define DISPID_EVPROP_ONSYSTEMSCROLLINGEND (DISPID_EVENTS+98) +#define DISPID_EVPROP_ONOBJECTCONTENTSCROLLED (DISPID_EVENTS+99) +#define DISPID_EVPROP_ONSTORAGE (DISPID_EVENTS+100) +#define DISPID_EVPROP_ONSTORAGECOMMIT (DISPID_EVENTS+101) +#define DISPID_EVPROP_ONSHOW (DISPID_EVENTS+102) +#define DISPID_EVPROP_ONHIDE (DISPID_EVENTS+103) +#define DISPID_EVPROP_ONALERT (DISPID_EVENTS+104) +#define DISPID_EVPROP_ONPOPUPMENUSTART (DISPID_EVENTS+105) +#define DISPID_EVPROP_ONPOPUPMENUEND (DISPID_EVENTS+106) +#define DISPID_EVPROP_ONONLINE (DISPID_EVENTS+107) +#define DISPID_EVPROP_ONOFFLINE (DISPID_EVENTS+108) +#define DISPID_EVPROP_ONHASHCHANGE (DISPID_EVENTS+109) +#define DISPID_EVPROP_ONMESSAGE (DISPID_EVENTS+110) +#define DISPID_EVPROP_ONDOMMUTATION (DISPID_EVENTS+111) +#define DISPID_EVPROPS_COUNT 112 #define DISPID_EVMETH_ONMOUSEOVER STDDISPID_XOBJ_ONMOUSEOVER #define DISPID_EVMETH_ONMOUSEOUT STDDISPID_XOBJ_ONMOUSEOUT @@ -1721,6 +1750,17 @@ /* IHTMLWindow5 */ #define DISPID_IHTMLWINDOW5_XMLHTTPREQUEST 1190 +/* IHTMLWindow6 */ +#define DISPID_IHTMLWINDOW6_XDOMAINREQUEST 1191 +#define DISPID_IHTMLWINDOW6_SESSIONSTORAGE 1192 +#define DISPID_IHTMLWINDOW6_LOCALSTORAGE 1193 +#define DISPID_IHTMLWINDOW6_ONHASHCHANGE DISPID_EVPROP_ONHASHCHANGE +#define DISPID_IHTMLWINDOW6_MAXCONNECTIONSPERSERVER 1194 +#define DISPID_IHTMLWINDOW6_POSTMESSAGE 1196 +#define DISPID_IHTMLWINDOW6_TOSTATICHTML 1197 +#define DISPID_IHTMLWINDOW6_ONMESSAGE DISPID_EVPROP_ONMESSAGE +#define DISPID_IHTMLWINDOW6_MSWRITEPROFILERMARK 1198 + /* IHTMLImageElementFactory */ #define DISPID_IHTMLIMAGEELEMENTFACTORY_CREATE DISPID_VALUE @@ -2724,6 +2764,15 @@ #define DISPID_IHTMLSTYLEELEMENT_DISABLED STDPROPID_XOBJ_DISABLED #define DISPID_IHTMLSTYLEELEMENT_MEDIA DISPID_STYLEELEMENT+6 +/* IHTMLStorage */ +#define DISPID_IHTMLSTORAGE_LENGTH DISPID_DOMSTORAGE+1 +#define DISPID_IHTMLSTORAGE_REMAININGSPACE DISPID_DOMSTORAGE+2 +#define DISPID_IHTMLSTORAGE_KEY DISPID_DOMSTORAGE+6 +#define DISPID_IHTMLSTORAGE_GETITEM DISPID_DOMSTORAGE+3 +#define DISPID_IHTMLSTORAGE_SETITEM DISPID_DOMSTORAGE+4 +#define DISPID_IHTMLSTORAGE_REMOVEITEM DISPID_DOMSTORAGE+5 +#define DISPID_IHTMLSTORAGE_CLEAR DISPID_DOMSTORAGE+7 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index a840944a0a3..2837b60ffb8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -129,6 +129,7 @@ interface IHTMLDocument2; interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; +interface IHTMLStorage; /***************************************************************************** * IHTMLFiltersCollection interface @@ -10969,6 +10970,58 @@ interface IHTMLWindow5 : IDispatch HRESULT XMLHttpRequest([retval, out] VARIANT * p); } +/***************************************************************************** + * IHTMLWindow6 interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510453-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLWindow6 : IDispatch +{ + [propput, id(DISPID_IHTMLWINDOW6_XDOMAINREQUEST)] + HRESULT XDomainRequest([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_XDOMAINREQUEST)] + HRESULT XDomainRequest([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLWINDOW6_SESSIONSTORAGE)] + HRESULT sessionStorage([out, retval] IHTMLStorage **p); + + [propget, id(DISPID_IHTMLWINDOW6_LOCALSTORAGE)] + HRESULT localStorage([out, retval] IHTMLStorage **p); + + [propput, id(DISPID_IHTMLWINDOW6_ONHASHCHANGE), displaybind, bindable] + HRESULT onhashchange([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_ONHASHCHANGE), displaybind, bindable] + HRESULT onhashchange([out, retval] VARIANT *p); + + [propget, id(DISPID_IHTMLWINDOW6_MAXCONNECTIONSPERSERVER)] + HRESULT maxConnectionsPerServer([out, retval] long *p); + + [id(DISPID_IHTMLWINDOW6_POSTMESSAGE)] + HRESULT postMessage( + [in] BSTR msg, + [in, optional] VARIANT targetOrigin); + + [id(DISPID_IHTMLWINDOW6_TOSTATICHTML)] + HRESULT toStaticHTML( + [in] BSTR bstrHTML, + [out, retval] BSTR *pbstrStaticHTML); + + [propput, id(DISPID_IHTMLWINDOW6_ONMESSAGE), displaybind, bindable] + HRESULT onmessage([in] VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_ONMESSAGE), displaybind, bindable] + HRESULT onmessage([out, retval] VARIANT *p); + + [id(DISPID_IHTMLWINDOW6_MSWRITEPROFILERMARK)] + HRESULT msWriteProfilerMark([in] BSTR bstrProfilerMarkName); +} + /***************************************************************************** * DispHTMLScreen dispinterface */ @@ -11315,6 +11368,40 @@ methods: [propget, id(DISPID_IHTMLWINDOW4_FRAMEELEMENT)] IHTMLFrameBase *frameElement(); + + [propget, id(DISPID_IHTMLWINDOW6_SESSIONSTORAGE)] + IHTMLStorage *sessionStorage(); + + [propget, id(DISPID_IHTMLWINDOW6_LOCALSTORAGE)] + IHTMLStorage *localStorage(); + + [propput, id(DISPID_IHTMLWINDOW6_ONHASHCHANGE), displaybind, bindable] + void onhashchange(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_ONHASHCHANGE), displaybind, bindable] + VARIANT onhashchange(); + + [propget, id(DISPID_IHTMLWINDOW6_MAXCONNECTIONSPERSERVER)] + long maxConnectionsPerServer(); + + [id(DISPID_IHTMLWINDOW6_POSTMESSAGE)] + void postMessage( + [in] BSTR msg, + [in, optional] VARIANT targetOrigin); + + [id(DISPID_IHTMLWINDOW6_TOSTATICHTML)] + BSTR toStaticHTML([in] BSTR bstrHTML); + + [propput, id(DISPID_IHTMLWINDOW6_ONMESSAGE), displaybind, bindable] + void onmessage(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_ONMESSAGE), displaybind, bindable] + VARIANT onmessage(); + + [id(DISPID_IHTMLWINDOW6_MSWRITEPROFILERMARK)] + void msWriteProfilerMark([in] BSTR bstrProfilerMarkName); + + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } /***************************************************************************** @@ -11606,6 +11693,40 @@ methods: [propget, id(DISPID_IHTMLWINDOW5_XMLHTTPREQUEST)] VARIANT XMLHttpRequest(); + + [propget, id(DISPID_IHTMLWINDOW6_SESSIONSTORAGE)] + IHTMLStorage *sessionStorage(); + + [propget, id(DISPID_IHTMLWINDOW6_LOCALSTORAGE)] + IHTMLStorage *localStorage(); + + [propput, id(DISPID_IHTMLWINDOW6_ONHASHCHANGE), displaybind, bindable] + void onhashchange(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_ONHASHCHANGE), displaybind, bindable] + VARIANT onhashchange(); + + [propget, id(DISPID_IHTMLWINDOW6_MAXCONNECTIONSPERSERVER)] + long maxConnectionsPerServer(); + + [id(DISPID_IHTMLWINDOW6_POSTMESSAGE)] + void postMessage( + [in] BSTR msg, + [in, optional] VARIANT targetOrigin); + + [id(DISPID_IHTMLWINDOW6_TOSTATICHTML)] + BSTR toStaticHTML([in] BSTR bstrHTML); + + [propput, id(DISPID_IHTMLWINDOW6_ONMESSAGE), displaybind, bindable] + void onmessage(VARIANT v); + + [propget, id(DISPID_IHTMLWINDOW6_ONMESSAGE), displaybind, bindable] + VARIANT onmessage(); + + [id(DISPID_IHTMLWINDOW6_MSWRITEPROFILERMARK)] + void msWriteProfilerMark([in] BSTR bstrProfilerMarkName); + + WINE_IHTMLDOMCONSTRUCTOR_DISPINTERFACE_DECL; } /***************************************************************************** @@ -16455,6 +16576,45 @@ methods: BSTR media(); } +/***************************************************************************** + * IHTMLStorage interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510474-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLStorage : IDispatch +{ + [propget, id(DISPID_IHTMLSTORAGE_LENGTH), hidden] + HRESULT length([out, retval] long *p); + + [propget, id(DISPID_IHTMLSTORAGE_REMAININGSPACE), hidden] + HRESULT remainingSpace([out, retval] long *p); + + [id(DISPID_IHTMLSTORAGE_KEY)] + HRESULT key( + [in] long lIndex, + [out, retval] BSTR *); + + [id(DISPID_IHTMLSTORAGE_GETITEM)] + HRESULT getItem( + [in] BSTR bstrKey, + [out, retval] VARIANT *); + + [id(DISPID_IHTMLSTORAGE_SETITEM)] + HRESULT setItem( + [in] BSTR bstrKey, + [in] BSTR bstrValue); + + [id(DISPID_IHTMLSTORAGE_REMOVEITEM)] + HRESULT removeItem([in] BSTR bstrKey); + + [id(DISPID_IHTMLSTORAGE_CLEAR)] + HRESULT clear(); +} + /***************************************************************************** * IMarkupContainer interface */