mshtml.idl: Added DispCEventObj declaration.

diff --git a/include/mshtmdid.h b/include/mshtmdid.h
index baa23543da5aa6fcbb37b03ce203744b965fc65e..d9c8f7cbc404f349b154314af42dcd46b6ba51ea 100644 (file)
--- a/include/mshtmdid.h
+++ b/include/mshtmdid.h
@@ -96,6 +96,7 @@
 #define DISPID_DOMIMPLEMENTATION  DISPID_NORMAL_FIRST
 
 #define DISPID_COLLECTION      (DISPID_NORMAL_FIRST+500)
+#define DISPID_OPTIONS_COL     (DISPID_NORMAL_FIRST+500)
 #define DISPID_IMG             (DISPID_IMGBASE+1000)
 #define DISPID_INPUTIMAGE      (DISPID_IMGBASE+1000)
 #define DISPID_INPUT           (DISPID_TEXTSITE+1000)
@@ -1486,6 +1487,11 @@
 #define DISPID_IHTMLLOCATION_HREF       DISPID_VALUE
 #define DISPID_IHTMLLOCATION_PROTOCOL   DISPID_LOCATION
 
+/* IHTMLBookmarkCollection */
+#define DISPID_IHTMLBOOKMARKCOLLECTION_LENGTH    DISPID_OPTIONS_COL+1
+#define DISPID_IHTMLBOOKMARKCOLLECTION__NEWENUM  DISPID_NEWENUM
+#define DISPID_IHTMLBOOKMARKCOLLECTION_ITEM      DISPID_VALUE
+
 /* IHTMLWindow2 */
 #define DISPID_IHTMLWINDOW2_HISTORY              2
 #define DISPID_IHTMLWINDOW2_CLOSE                3
@@ -1673,6 +1679,56 @@
 #define DISPID_IHTMLEVENTOBJ_SCREENY        (DISPID_EVENTOBJ+25)
 #define DISPID_IHTMLEVENTOBJ_SRCFILTER      (DISPID_EVENTOBJ+26)
 
+/* IHTMLEventObj2 */
+#define DISPID_IHTMLEVENTOBJ2_SETATTRIBUTE     DISPID_HTMLOBJECT+1
+#define DISPID_IHTMLEVENTOBJ2_GETATTRIBUTE     DISPID_HTMLOBJECT+2
+#define DISPID_IHTMLEVENTOBJ2_REMOVEATTRIBUTE  DISPID_HTMLOBJECT+3
+#define DISPID_IHTMLEVENTOBJ2_PROPERTYNAME     DISPID_EVENTOBJ+27
+#define DISPID_IHTMLEVENTOBJ2_BOOKMARKS        DISPID_EVENTOBJ+31
+#define DISPID_IHTMLEVENTOBJ2_RECORDSET        DISPID_EVENTOBJ+32
+#define DISPID_IHTMLEVENTOBJ2_DATAFLD          DISPID_EVENTOBJ+33
+#define DISPID_IHTMLEVENTOBJ2_BOUNDELEMENTS    DISPID_EVENTOBJ+34
+#define DISPID_IHTMLEVENTOBJ2_REPEAT           DISPID_EVENTOBJ+35
+#define DISPID_IHTMLEVENTOBJ2_SRCURN           DISPID_EVENTOBJ+36
+#define DISPID_IHTMLEVENTOBJ2_SRCELEMENT       DISPID_EVENTOBJ+1
+#define DISPID_IHTMLEVENTOBJ2_ALTKEY           DISPID_EVENTOBJ+2
+#define DISPID_IHTMLEVENTOBJ2_CTRLKEY          DISPID_EVENTOBJ+3
+#define DISPID_IHTMLEVENTOBJ2_SHIFTKEY         DISPID_EVENTOBJ+4
+#define DISPID_IHTMLEVENTOBJ2_FROMELEMENT      DISPID_EVENTOBJ+9
+#define DISPID_IHTMLEVENTOBJ2_TOELEMENT        DISPID_EVENTOBJ+10
+#define DISPID_IHTMLEVENTOBJ2_BUTTON           DISPID_EVENTOBJ+12
+#define DISPID_IHTMLEVENTOBJ2_TYPE             DISPID_EVENTOBJ+13
+#define DISPID_IHTMLEVENTOBJ2_QUALIFIER        DISPID_EVENTOBJ+14
+#define DISPID_IHTMLEVENTOBJ2_REASON           DISPID_EVENTOBJ+15
+#define DISPID_IHTMLEVENTOBJ2_X                DISPID_EVENTOBJ+5
+#define DISPID_IHTMLEVENTOBJ2_Y                DISPID_EVENTOBJ+6
+#define DISPID_IHTMLEVENTOBJ2_CLIENTX          DISPID_EVENTOBJ+20
+#define DISPID_IHTMLEVENTOBJ2_CLIENTY          DISPID_EVENTOBJ+21
+#define DISPID_IHTMLEVENTOBJ2_OFFSETX          DISPID_EVENTOBJ+22
+#define DISPID_IHTMLEVENTOBJ2_OFFSETY          DISPID_EVENTOBJ+23
+#define DISPID_IHTMLEVENTOBJ2_SCREENX          DISPID_EVENTOBJ+24
+#define DISPID_IHTMLEVENTOBJ2_SCREENY          DISPID_EVENTOBJ+25
+#define DISPID_IHTMLEVENTOBJ2_SRCFILTER        DISPID_EVENTOBJ+26
+#define DISPID_IHTMLEVENTOBJ2_DATATRANSFER     DISPID_EVENTOBJ+37
+
+/* IHTMLEventObj3 */
+#define DISPID_IHTMLEVENTOBJ3_CONTENTOVERFLOW       DISPID_EVENTOBJ+38
+#define DISPID_IHTMLEVENTOBJ3_SHIFTLEFT             DISPID_EVENTOBJ+39
+#define DISPID_IHTMLEVENTOBJ3_ALTLEFT               DISPID_EVENTOBJ+40
+#define DISPID_IHTMLEVENTOBJ3_CTRLLEFT              DISPID_EVENTOBJ+41
+#define DISPID_IHTMLEVENTOBJ3_IMECOMPOSITIONCHANGE  DISPID_EVENTOBJ+42
+#define DISPID_IHTMLEVENTOBJ3_IMENOTIFYCOMMAND      DISPID_EVENTOBJ+43
+#define DISPID_IHTMLEVENTOBJ3_IMENOTIFYDATA         DISPID_EVENTOBJ+44
+#define DISPID_IHTMLEVENTOBJ3_IMEREQUEST            DISPID_EVENTOBJ+46
+#define DISPID_IHTMLEVENTOBJ3_IMEREQUESTDATA        DISPID_EVENTOBJ+47
+#define DISPID_IHTMLEVENTOBJ3_KEYBOARDLAYOUT        DISPID_EVENTOBJ+45
+#define DISPID_IHTMLEVENTOBJ3_BEHAVIORCOOKIE        DISPID_EVENTOBJ+48
+#define DISPID_IHTMLEVENTOBJ3_BEHAVIORPART          DISPID_EVENTOBJ+49
+#define DISPID_IHTMLEVENTOBJ3_NEXTPAGE              DISPID_EVENTOBJ+50
+
+/* IHTMLEventObj4 */
+#define DISPID_IHTMLEVENTOBJ4_WHEELDELTA  DISPID_EVENTOBJ+51
+
 /* IHTMLScreen */
 #define DISPID_IHTMLSCREEN_COLORDEPTH             (DISPID_SCREEN+1)
 #define DISPID_IHTMLSCREEN_BUFFERDEPTH            (DISPID_SCREEN+2)

diff --git a/include/mshtml.idl b/include/mshtml.idl
index c58bad8d1b02d98a88d99ab2c063e000ad0cb182..680748b84e726a11c7ba65f15ba90347612fe0b8 100644 (file)
--- a/include/mshtml.idl
+++ b/include/mshtml.idl
@@ -2785,7 +2785,7 @@ methods:
     BSTR textJustifyTrim();
 
     [propget, id(DISPID_IHTMLCURRENTSTYLE_TEXTKASHIDA), displaybind, bindable]
-   VARIANT textKashida();
+    VARIANT textKashida();
 
     [propget, id(DISPID_IHTMLCURRENTSTYLE_BLOCKDIRECTION), displaybind, bindable]
     BSTR blockDirection();
@@ -12490,6 +12490,26 @@ interface IHTMLLocation : IDispatch
     HRESULT toString([retval, out] BSTR *String);
 }
 
+[
+    odl,
+    oleautomation,
+    dual,
+    uuid(3050f4ce-98b5-11cf-bb82-00aa00bdce0b)
+]
+interface IHTMLBookmarkCollection : IDispatch
+{
+    [propget, id(DISPID_IHTMLBOOKMARKCOLLECTION_LENGTH), hidden]
+    HRESULT length([out, retval] long *p);
+
+    [propget, id(DISPID_IHTMLBOOKMARKCOLLECTION__NEWENUM), hidden, restricted]
+    HRESULT _newEnum([out, retval] IUnknown **p);
+
+    [id(DISPID_IHTMLBOOKMARKCOLLECTION_ITEM)]
+    HRESULT item(
+            [in] long index,
+            [out, retval] VARIANT *pVarBookmark);
+}
+
 /*****************************************************************************
  *    IHTMLDataTransfer interface
  */
@@ -12617,6 +12637,261 @@ interface IHTMLEventObj : IDispatch
     HRESULT srcFilter([retval, out] IDispatch **p);
 }
 
+/*****************************************************************************
+ *    DispCEventObj dispinterface
+ */
+[
+    hidden,
+    uuid(3050f558-98b5-11cf-bb82-00aa00bdce0b)
+]
+dispinterface DispCEventObj
+{
+properties:
+methods:
+    [propput, id(DISPID_IHTMLEVENTOBJ_RETURNVALUE)]
+    void returnValue(VARIANT v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ_RETURNVALUE)]
+    VARIANT returnValue();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ_CANCELBUBBLE)]
+    void cancelBubble(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ_CANCELBUBBLE)]
+    VARIANT_BOOL cancelBubble();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ_KEYCODE)]
+    void keyCode(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ_KEYCODE)]
+    long keyCode();
+
+    [id(DISPID_IHTMLEVENTOBJ2_SETATTRIBUTE)]
+    void setAttribute(
+            [in] BSTR strAttributeName,
+            [in] VARIANT AttributeValue,
+            [in, defaultvalue(1)] LONG lFlags);
+
+    [id(DISPID_IHTMLEVENTOBJ2_GETATTRIBUTE)]
+    VARIANT getAttribute(
+            [in] BSTR strAttributeName,
+            [in, defaultvalue(0)] LONG lFlags);
+
+    [id(DISPID_IHTMLEVENTOBJ2_REMOVEATTRIBUTE)]
+    VARIANT_BOOL removeAttribute(
+            [in] BSTR strAttributeName,
+            [in, defaultvalue(1)] LONG lFlags);
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_PROPERTYNAME)]
+    void propertyName(BSTR v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_PROPERTYNAME)]
+    BSTR propertyName();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_BOOKMARKS)]
+    void bookmarks(IHTMLBookmarkCollection *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_BOOKMARKS)]
+    IHTMLBookmarkCollection *bookmarks();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_RECORDSET)]
+    void recordset(IDispatch *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_RECORDSET)]
+    IDispatch *recordset();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_DATAFLD)]
+    void dataFld(BSTR v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_DATAFLD)]
+    BSTR dataFld();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_BOUNDELEMENTS)]
+    void boundElements(IHTMLElementCollection *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_BOUNDELEMENTS)]
+    IHTMLElementCollection *boundElements();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_REPEAT)]
+    void repeat(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_REPEAT)]
+    VARIANT_BOOL repeat();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_SRCURN)]
+    void srcUrn(BSTR v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_SRCURN)]
+    BSTR srcUrn();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_SRCELEMENT)]
+    void srcElement(IHTMLElement *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_SRCELEMENT)]
+    IHTMLElement *srcElement();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_ALTKEY)]
+    void altKey(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_ALTKEY)]
+    VARIANT_BOOL altKey();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_CTRLKEY)]
+    void ctrlKey(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_CTRLKEY)]
+    VARIANT_BOOL ctrlKey();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_SHIFTKEY)]
+    void shiftKey(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_SHIFTKEY)]
+    VARIANT_BOOL shiftKey();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_FROMELEMENT)]
+    void fromElement(IHTMLElement *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_FROMELEMENT)]
+    IHTMLElement *fromElement();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_TOELEMENT)]
+    void toElement(IHTMLElement *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_TOELEMENT)]
+    IHTMLElement *toElement();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_BUTTON)]
+    void button(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_BUTTON)]
+    long button();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_TYPE)]
+    void type(BSTR v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_TYPE)]
+    BSTR type();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_QUALIFIER)]
+    void qualifier(BSTR v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_QUALIFIER)]
+    BSTR qualifier();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_REASON)]
+    void reason(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_REASON)]
+    long reason();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_X)]
+    void x(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_X)]
+    long x();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_Y)]
+    void y(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_Y)]
+    long y();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_CLIENTX)]
+    void clientX(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_CLIENTX)]
+    long clientX();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_CLIENTY)]
+    void clientY(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_CLIENTY)]
+    long clientY();
+    [propput, id(DISPID_IHTMLEVENTOBJ2_OFFSETX)]
+    void offsetX(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_OFFSETX)]
+    long offsetX();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_OFFSETY)]
+    void offsetY(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_OFFSETY)]
+    long offsetY();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_SCREENX)]
+    void screenX(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_SCREENX)]
+    long screenX();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ2_SCREENY)]
+    void screenY(long v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_SCREENY)]
+    long screenY();
+
+    [propputref, id(DISPID_IHTMLEVENTOBJ2_SRCFILTER)]
+    void srcFilter(IDispatch *v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_SRCFILTER)]
+    IDispatch *srcFilter();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ2_DATATRANSFER)]
+    IHTMLDataTransfer *dataTransfer();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_CONTENTOVERFLOW)]
+    VARIANT_BOOL contentOverflow();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ3_SHIFTLEFT)]
+    void shiftLeft(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_SHIFTLEFT)]
+    VARIANT_BOOL shiftLeft();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ3_ALTLEFT)]
+    void altLeft(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_ALTLEFT)]
+    VARIANT_BOOL altLeft();
+
+    [propput, id(DISPID_IHTMLEVENTOBJ3_CTRLLEFT)]
+    void ctrlLeft(VARIANT_BOOL v);
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_CTRLLEFT)]
+    VARIANT_BOOL ctrlLeft();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_IMECOMPOSITIONCHANGE), hidden, restricted, nonbrowsable]
+    LONG_PTR imeCompositionChange();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_IMENOTIFYCOMMAND), hidden, restricted, nonbrowsable]
+    LONG_PTR imeNotifyCommand();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_IMENOTIFYDATA), hidden, restricted, nonbrowsable]
+    LONG_PTR imeNotifyData();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_IMEREQUEST), hidden, restricted, nonbrowsable]
+    LONG_PTR imeRequest();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_IMEREQUESTDATA), hidden, restricted, nonbrowsable]
+    LONG_PTR imeRequestData();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_KEYBOARDLAYOUT), hidden, restricted, nonbrowsable]
+    LONG_PTR keyboardLayout();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_BEHAVIORCOOKIE)]
+    long behaviorCookie();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_BEHAVIORPART)]
+    long behaviorPart();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ3_NEXTPAGE)]
+    BSTR nextPage();
+
+    [propget, id(DISPID_IHTMLEVENTOBJ4_WHEELDELTA)]
+    long wheelDelta();
+}
+
 /*****************************************************************************
  *    IHTMLFramesCollection2 interface
  */
@@ -17204,7 +17479,7 @@ methods:
     void onrowsinserted(VARIANT v);
 
     [propget, id(DISPID_IHTMLELEMENT2_ONROWSINSERTED), displaybind, bindable]
-     VARIANT onrowsinserted();
+    VARIANT onrowsinserted();
 
     [propput, id(DISPID_IHTMLELEMENT2_ONCELLCHANGE), displaybind, bindable]
      void oncellchange(VARIANT v);