sync some idl files and mshtml headers with wine

svn path=/trunk/; revision=36105
This commit is contained in:
Christoph von Wittich 2008-09-10 07:40:52 +00:00
parent 9d7da6c792
commit a7467a03c8
14 changed files with 1644 additions and 55 deletions

View file

@ -48,7 +48,11 @@ cpp_quote("#define MAX_PIN_NAME 128")
cpp_quote("#define MAX_FILTER_NAME 128")
typedef LONGLONG REFERENCE_TIME;
cpp_quote("#ifndef REFTIME_DEFINED")
cpp_quote("#define REFTIME_DEFINED")
typedef DOUBLE REFTIME;
cpp_quote("#endif")
typedef DWORD_PTR HSEMAPHORE;
typedef DWORD_PTR HEVENT;

View file

@ -958,7 +958,8 @@ cpp_quote("#define KSPROPERTY_SUPPORT_SET 2")
[
object,
uuid(31efac30-515c-11d0-a9aa-00aa0061be93),
pointer_default(unique)
pointer_default(unique),
local
]
interface IKsPropertySet : IUnknown
{
@ -982,3 +983,30 @@ interface IKsPropertySet : IUnknown
[out] DWORD *pTypeSupport);
}
cpp_quote("#endif /* _IKsPropertySet_ */")
[
object,
uuid(36b73883-c2c8-11cf-8b46-00805f6cef60),
pointer_default(unique)
]
interface ISeekingPassThru : IUnknown
{
HRESULT Init( [in] BOOL bSupportRendering, [in] IPin *pPin);
}
enum _AM_FILTER_MISC_FLAGS
{
AM_FILTER_MISC_FLAGS_IS_RENDERER = 0x1,
AM_FILTER_MISC_FLAGS_IS_SOURCE = 0x2
};
[
local,
object,
uuid(2dd74950-a890-11d1-abe8-00a0c905f375),
pointer_default(unique)
]
interface IAMFilterMiscFlags : IUnknown
{
ULONG GetMiscFlags();
};

View file

@ -185,7 +185,8 @@ interface IEnumRegisterWordW : IUnknown
[
object,
uuid(09b5eab0-f997-11d1-93d4-0060b067b86e),
pointer_default(unique)
pointer_default(unique),
local
]
interface IEnumInputContext : IUnknown
{
@ -206,7 +207,8 @@ interface IEnumInputContext : IUnknown
[
object,
uuid(08c0e040-62d1-11d1-9326-0060b067b86e),
pointer_default(unique)
pointer_default(unique),
local
]
interface IActiveIMMApp : IUnknown
{

View file

@ -16,7 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
import "unknwn.idl";
import "objidl.idl";
/* FIXME: import "filter.idl"; */
/*
* widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it...
@ -49,7 +50,6 @@ typedef enum tagWORDREP_BREAK_TYPE
* IWordSink interface
*/
[
unique,
uuid(cc907054-c058-101a-b554-08002b33b0e6),
object,
local
@ -76,7 +76,6 @@ interface IWordSink : IUnknown
* IPhraseSink interface
*/
[
unique,
uuid(cc906ff0-c058-101a-b554-08002b33b0e6),
object,
local
@ -98,7 +97,6 @@ interface IPhraseSink: IUnknown
* IWordBreaker interface
*/
[
unique,
uuid(d53552c8-77e3-101a-b552-08002b33b0e6),
object,
local

View file

@ -1063,6 +1063,71 @@
#define DISPID_HTMLELEMENTEVENTS_ONFOCUSIN DISPID_EVMETH_ONFOCUSIN
#define DISPID_HTMLELEMENTEVENTS_ONFOCUSOUT DISPID_EVMETH_ONFOCUSOUT
/* HTMLElementEvents2 */
#define DISPID_HTMLELEMENTEVENTS2_ONHELP DISPID_EVMETH_ONHELP
#define DISPID_HTMLELEMENTEVENTS2_ONCLICK DISPID_EVMETH_ONCLICK
#define DISPID_HTMLELEMENTEVENTS2_ONDBLCLICK DISPID_EVMETH_ONDBLCLICK
#define DISPID_HTMLELEMENTEVENTS2_ONKEYPRESS DISPID_EVMETH_ONKEYPRESS
#define DISPID_HTMLELEMENTEVENTS2_ONKEYDOWN DISPID_EVMETH_ONKEYDOWN
#define DISPID_HTMLELEMENTEVENTS2_ONKEYUP DISPID_EVMETH_ONKEYUP
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEOUT DISPID_EVMETH_ONMOUSEOUT
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEOVER DISPID_EVMETH_ONMOUSEOVER
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEMOVE DISPID_EVMETH_ONMOUSEMOVE
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEDOWN DISPID_EVMETH_ONMOUSEDOWN
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEUP DISPID_EVMETH_ONMOUSEUP
#define DISPID_HTMLELEMENTEVENTS2_ONSELECTSTART DISPID_EVMETH_ONSELECTSTART
#define DISPID_HTMLELEMENTEVENTS2_ONFILTERCHANGE DISPID_EVMETH_ONFILTER
#define DISPID_HTMLELEMENTEVENTS2_ONDRAGSTART DISPID_EVMETH_ONDRAGSTART
#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREUPDATE DISPID_EVMETH_ONBEFOREUPDATE
#define DISPID_HTMLELEMENTEVENTS2_ONAFTERUPDATE DISPID_EVMETH_ONAFTERUPDATE
#define DISPID_HTMLELEMENTEVENTS2_ONERRORUPDATE DISPID_EVMETH_ONERRORUPDATE
#define DISPID_HTMLELEMENTEVENTS2_ONROWEXIT DISPID_EVMETH_ONROWEXIT
#define DISPID_HTMLELEMENTEVENTS2_ONROWENTER DISPID_EVMETH_ONROWENTER
#define DISPID_HTMLELEMENTEVENTS2_ONDATASETCHANGED DISPID_EVMETH_ONDATASETCHANGED
#define DISPID_HTMLELEMENTEVENTS2_ONDATAAVAILABLE DISPID_EVMETH_ONDATAAVAILABLE
#define DISPID_HTMLELEMENTEVENTS2_ONDATASETCOMPLETE DISPID_EVMETH_ONDATASETCOMPLETE
#define DISPID_HTMLELEMENTEVENTS2_ONLOSECAPTURE DISPID_EVMETH_ONLOSECAPTURE
#define DISPID_HTMLELEMENTEVENTS2_ONPROPERTYCHANGE DISPID_EVMETH_ONPROPERTYCHANGE
#define DISPID_HTMLELEMENTEVENTS2_ONSCROLL DISPID_EVMETH_ONSCROLL
#define DISPID_HTMLELEMENTEVENTS2_ONFOCUS DISPID_EVMETH_ONFOCUS
#define DISPID_HTMLELEMENTEVENTS2_ONBLUR DISPID_EVMETH_ONBLUR
#define DISPID_HTMLELEMENTEVENTS2_ONRESIZE DISPID_EVMETH_ONRESIZE
#define DISPID_HTMLELEMENTEVENTS2_ONDRAG DISPID_EVMETH_ONDRAG
#define DISPID_HTMLELEMENTEVENTS2_ONDRAGEND DISPID_EVMETH_ONDRAGEND
#define DISPID_HTMLELEMENTEVENTS2_ONDRAGENTER DISPID_EVMETH_ONDRAGENTER
#define DISPID_HTMLELEMENTEVENTS2_ONDRAGOVER DISPID_EVMETH_ONDRAGOVER
#define DISPID_HTMLELEMENTEVENTS2_ONDRAGLEAVE DISPID_EVMETH_ONDRAGLEAVE
#define DISPID_HTMLELEMENTEVENTS2_ONDROP DISPID_EVMETH_ONDROP
#define DISPID_HTMLELEMENTEVENTS2_ONBEFORECUT DISPID_EVMETH_ONBEFORECUT
#define DISPID_HTMLELEMENTEVENTS2_ONCUT DISPID_EVMETH_ONCUT
#define DISPID_HTMLELEMENTEVENTS2_ONBEFORECOPY DISPID_EVMETH_ONBEFORECOPY
#define DISPID_HTMLELEMENTEVENTS2_ONCOPY DISPID_EVMETH_ONCOPY
#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREPASTE DISPID_EVMETH_ONBEFOREPASTE
#define DISPID_HTMLELEMENTEVENTS2_ONPASTE DISPID_EVMETH_ONPASTE
#define DISPID_HTMLELEMENTEVENTS2_ONCONTEXTMENU DISPID_EVMETH_ONCONTEXTMENU
#define DISPID_HTMLELEMENTEVENTS2_ONROWSDELETE DISPID_EVMETH_ONROWSDELETE
#define DISPID_HTMLELEMENTEVENTS2_ONROWSINSERTED DISPID_EVMETH_ONROWSINSERTED
#define DISPID_HTMLELEMENTEVENTS2_ONCELLCHANGE DISPID_EVMETH_ONCELLCHANGE
#define DISPID_HTMLELEMENTEVENTS2_ONREADYSTATECHANGE DISPID_EVMETH_ONREADYSTATECHANGE
#define DISPID_HTMLELEMENTEVENTS2_ONLAYOUTCOMPLETE DISPID_EVMETH_ONLAYOUTCOMPLETE
#define DISPID_HTMLELEMENTEVENTS2_ONPAGE DISPID_EVMETH_ONPAGE
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEENTER DISPID_EVMETH_ONMOUSEENTER
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSELEAVE DISPID_EVMETH_ONMOUSELEAVE
#define DISPID_HTMLELEMENTEVENTS2_ONACTIVATE DISPID_EVMETH_ONACTIVATE
#define DISPID_HTMLELEMENTEVENTS2_ONDEACTIVATE DISPID_EVMETH_ONDEACTIVATE
#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREDEACTIVATE DISPID_EVMETH_ONBEFOREDEACTIVATE
#define DISPID_HTMLELEMENTEVENTS2_ONBEFOREACTIVATE DISPID_EVMETH_ONBEFOREACTIVATE
#define DISPID_HTMLELEMENTEVENTS2_ONFOCUSIN DISPID_EVMETH_ONFOCUSIN
#define DISPID_HTMLELEMENTEVENTS2_ONFOCUSOUT DISPID_EVMETH_ONFOCUSOUT
#define DISPID_HTMLELEMENTEVENTS2_ONMOVE DISPID_EVMETH_ONMOVE
#define DISPID_HTMLELEMENTEVENTS2_ONCONTROLSELECT DISPID_EVMETH_ONCONTROLSELECT
#define DISPID_HTMLELEMENTEVENTS2_ONMOVESTART DISPID_EVMETH_ONMOVESTART
#define DISPID_HTMLELEMENTEVENTS2_ONMOVEEND DISPID_EVMETH_ONMOVEEND
#define DISPID_HTMLELEMENTEVENTS2_ONRESIZESTART DISPID_EVMETH_ONRESIZESTART
#define DISPID_HTMLELEMENTEVENTS2_ONRESIZEEND DISPID_EVMETH_ONRESIZEEND
#define DISPID_HTMLELEMENTEVENTS2_ONMOUSEWHEEL DISPID_EVMETH_ONMOUSEWHEEL
/* IHTMLElement */
#define DISPID_IHTMLELEMENT_SETATTRIBUTE (DISPID_HTMLOBJECT+1)
#define DISPID_IHTMLELEMENT_GETATTRIBUTE (DISPID_HTMLOBJECT+2)
@ -2211,4 +2276,19 @@
#define DISPID_IHTMLFRAMEBASE2_READYSTATE DISPID_A_READYSTATE
#define DISPID_IHTMLFRAMEBASE2_ALLOWTRANSPARENCY DISPID_A_ALLOWTRANSPARENCY
/* IHTMLControlElement */
#define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX
#define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0)
#define DISPID_IHTMLCONTROLELEMENT_ACCESSKEY (DISPID_SITE+5)
#define DISPID_IHTMLCONTROLELEMENT_ONBLUR DISPID_EVPROP_ONBLUR
#define DISPID_IHTMLCONTROLELEMENT_ONFOCUS DISPID_EVPROP_ONFOCUS
#define DISPID_IHTMLCONTROLELEMENT_ONRESIZE DISPID_EVPROP_ONRESIZE
#define DISPID_IHTMLCONTROLELEMENT_BLUR (DISPID_SITE+2)
#define DISPID_IHTMLCONTROLELEMENT_ADDFILTER (DISPID_SITE+17)
#define DISPID_IHTMLCONTROLELEMENT_REMOVEFILTER (DISPID_SITE+18)
#define DISPID_IHTMLCONTROLELEMENT_CLIENTHEIGHT (DISPID_SITE+19)
#define DISPID_IHTMLCONTROLELEMENT_CLIENTWIDTH (DISPID_SITE+20)
#define DISPID_IHTMLCONTROLELEMENT_CLIENTTOP (DISPID_SITE+21)
#define DISPID_IHTMLCONTROLELEMENT_CLIENTLEFT (DISPID_SITE+22)
#endif /* __MSHTMDID_H__ */

File diff suppressed because it is too large Load diff

View file

@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef DO_NO_IMPORTS
import "objidl.idl";
#endif
interface IDispatch;
interface ITypeInfo;
@ -1162,7 +1164,7 @@ interface ITypeChangeEvents : IUnknown
[in] ITypeInfo *pTInfoBefore,
[in] LPOLESTR pStrName,
[out] INT *pfCancel);
HRESULT AfterTypeChange(
[in] CHANGEKIND changeKind,
[in] ITypeInfo *pTInfoAfter,
@ -1472,25 +1474,25 @@ interface ICreateTypeInfo2 : ICreateTypeInfo
[in] REFGUID guid,
[in] VARIANT *pVarVal);
HRESULT SetFuncCustData(
[in] UINT index,
[in] REFGUID guid,
HRESULT SetFuncCustData(
[in] UINT index,
[in] REFGUID guid,
[in] VARIANT *pVarVal);
HRESULT SetParamCustData(
[in] UINT indexFunc,
[in] UINT indexParam,
[in] REFGUID guid,
[in] VARIANT *pVarVal);
HRESULT SetParamCustData(
[in] UINT indexFunc,
[in] UINT indexParam,
[in] REFGUID guid,
HRESULT SetVarCustData(
[in] UINT index,
[in] REFGUID guid,
[in] VARIANT *pVarVal);
HRESULT SetVarCustData(
[in] UINT index,
[in] REFGUID guid,
[in] VARIANT *pVarVal);
HRESULT SetImplTypeCustData(
[in] UINT index,
[in] REFGUID guid,
HRESULT SetImplTypeCustData(
[in] UINT index,
[in] REFGUID guid,
[in] VARIANT *pVarVal);
HRESULT SetHelpStringContext(

View file

@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef DO_NO_IMPORTS
import "unknwn.idl";
#endif
interface IStream;
interface IEnumString;
@ -2192,7 +2194,7 @@ interface IRpcOptions : IUnknown
enum {
COMBND_RPCTIMEOUT = 1,
COMBND_SERVER_LOCALITY = 2
};
};
enum {
SERVER_LOCALITY_PROCESS_LOCAL = 0,

View file

@ -22,12 +22,18 @@
import "objidl.idl";
import "oleidl.idl";
import "oaidl.idl";
import "docobj.idl";
import "shtypes.idl";
import "servprov.idl";
import "comcat.idl";
import "propidl.idl";
/*import "prsht.idl";*/
/*import "msxml.idl";*/
/* FIXME: import "prsht.idl";*/
import "msxml.idl";
import "wtypes.idl";
/* FIXME: import "propsys.idl"; */
/* FIXME: import "structuredquery.idl"; */
cpp_quote("/* FIXME: #include <sherrors.h> */")
/*****************************************************************************
@ -388,7 +394,7 @@ typedef const FOLDERSETTINGS *LPCFOLDERSETTINGS;
/*****************************************************************************
* IShellView interface
*/
interface IShellBrowser;
interface IShellBrowser; /* forward declaration */
[
object,
uuid(000214e3-0000-0000-c000-000000000046),
@ -412,7 +418,7 @@ interface IShellView : IOleWindow
typedef UINT SVSIF;
typedef enum tagSVGIO
typedef enum
{
SVGIO_BACKGROUND = 0x00000000,
SVGIO_SELECTION = 0x00000001,
@ -422,7 +428,7 @@ interface IShellView : IOleWindow
SVGIO_FLAG_VIEWORDER = 0x80000000,
} SVGIO;
typedef enum tagSVUIA_STATUS
typedef enum
{
SVUIA_DEACTIVATE = 0,
SVUIA_ACTIVATE_NOFOCUS = 1,
@ -788,7 +794,8 @@ cpp_quote("#define IShellLink WINELIB_NAME_AW(IShellLink)")
[
object,
uuid(000214e8-0000-0000-c000-000000000046),
pointer_default(unique)
pointer_default(unique),
local
]
interface IShellExtInit : IUnknown
{
@ -941,7 +948,8 @@ cpp_quote("#define CDBOSC_STATECHANGE 0x00000004")
[
object,
uuid(47d2657a-7b27-11d0-8ca9-00a0c92dbfe8),
pointer_default(unique)
pointer_default(unique),
local
]
interface IDockingWindowFrame : IOleWindow
{
@ -1031,7 +1039,8 @@ interface IDropTargetHelper : IUnknown
[
object,
uuid(000214e4-0000-0000-c000-000000000046),
pointer_default(unique)
pointer_default(unique),
local
]
interface IContextMenu : IUnknown
{
@ -1189,7 +1198,8 @@ interface IContextMenu3 : IContextMenu2
[
object,
uuid(000214f5-0000-0000-c000-000000000046),
pointer_default(unique)
pointer_default(unique),
local
]
interface IShellExecuteHookA : IUnknown
{
@ -1205,7 +1215,8 @@ interface IShellExecuteHookA : IUnknown
[
object,
uuid(000214fb-0000-0000-c000-000000000046),
pointer_default(unique)
pointer_default(unique),
local
]
interface IShellExecuteHookW : IUnknown
{
@ -1224,9 +1235,9 @@ interface IShellExecuteHookW : IUnknown
]
interface IShellLinkDataList : IUnknown
{
HRESULT AddDataBlock(
[local] HRESULT AddDataBlock(
[in] void *pDataBlock);
HRESULT CopyDataBlock(
[local] HRESULT CopyDataBlock(
[in] DWORD dwSig,
[out] void **ppDataBlock);
HRESULT RemoveDataBlock(
@ -1336,7 +1347,7 @@ interface INewShortcutHookA : IUnknown
HRESULT GetExtension(
[out] LPSTR pszExtension,
[in] int cchExtension);
}
}
/*****************************************************************************
@ -1366,8 +1377,24 @@ interface INewShortcutHookW : IUnknown
HRESULT GetExtension(
[out] LPWSTR pszExtension,
[in] int cchExtension);
}
}
/*****************************************************************************
* IRunnableTask interface
*/
[
object,
uuid(85788d00-6807-11d0-b810-00c04fd706ec),
pointer_default(unique)
]
interface IRunnableTask : IUnknown
{
HRESULT Run();
HRESULT Kill([in] BOOL fWait);
HRESULT Suspend();
HRESULT Resume();
ULONG IsRunning();
}
/*****************************************************************************
* IShellChangeNotify interface
@ -1428,7 +1455,8 @@ interface IContextMenuCB : IUnknown
[
object,
uuid(800AB0B8-F5FA-4e72-8FF3-B1A243B87BD9), /* FIXME: wrong value! */
pointer_default(unique)
pointer_default(unique),
local
]
interface IDefaultExtractIconInit : IUnknown
{

View file

@ -35,7 +35,7 @@ library stdole
typedef unsigned long HRESULT;
typedef void *VARIANT;
typedef unsigned long SCODE;
typedef struct GUID {
unsigned long Data1;
unsigned short Data2;
@ -251,7 +251,7 @@ library stdole
[propput] HRESULT Charset([in] short pcharset);
[propget] HRESULT hFont([out, retval] OLE_HANDLE *phfont);
HRESULT Clone([out] IFont **ppfont);
HRESULT IsEqual([in] IFont *pfontOther);
@ -304,7 +304,7 @@ library stdole
[propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle);
[propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal);
[propget] HRESULT Type([out, retval] short *ptype);
[propget] HRESULT Width([out, retval] OLE_XSIZE_HIMETRIC *pwidth);
@ -329,7 +329,7 @@ library stdole
HRESULT SelectPicture([in] int hdcIn,
[out] int *phdcOut,
[out] OLE_HANDLE *phbmpOut);
[propget] HRESULT KeepOriginalFormat([out, retval] VARIANT_BOOL *pfkeep);
[propput] HRESULT KeepOriginalFormat([in] VARIANT_BOOL pfkeep);
@ -351,7 +351,7 @@ library stdole
properties:
[id(0x0), readonly] OLE_HANDLE Handle;
[id(0x2)] OLE_HANDLE hPal;
[id(0x3), readonly] short Type;
[id(0x3), readonly] short Type;
[id(0x4), readonly] OLE_XSIZE_HIMETRIC Width;
[id(0x5), readonly] OLE_XSIZE_HIMETRIC Height;
methods:
@ -366,7 +366,7 @@ library stdole
OLE_YSIZE_HIMETRIC cySrc,
void *prcWBounds);
};
typedef [public] Picture IPictureDisp;
[

View file

@ -25,3 +25,6 @@ import "objidl.idl";
#include <axextend.idl>
#include <dyngraph.idl>
/* TODO: #include <dvdif.h> */
#include <vmrender.idl>

View file

@ -368,7 +368,7 @@ interface ITextFont : IDispatch
]
interface ITextPara : IDispatch
{
HRESULT GetDuplicate([retval, out]ITextPara *ppPara);
HRESULT GetDuplicate([retval, out]ITextPara **ppPara);
HRESULT SetDuplicate([in]ITextPara *pPara);
HRESULT CanChange([out]long *pB);
HRESULT IsEqual([in]ITextPara *pPara, [retval, out]long *pB);

View file

@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef DO_NO_IMPORTS
import "wtypes.idl";
#endif
/* Interfaces */

View file

@ -210,14 +210,14 @@ cpp_quote("#endif")
cpp_quote("#ifndef _SYSTEMTIME_")
cpp_quote("#define _SYSTEMTIME_")
typedef struct _SYSTEMTIME{
WORD wYear;
WORD wMonth;
WORD wDayOfWeek;
WORD wDay;
WORD wHour;
WORD wMinute;
WORD wSecond;
WORD wMilliseconds;
WORD wYear;
WORD wMonth;
WORD wDayOfWeek;
WORD wDay;
WORD wHour;
WORD wMinute;
WORD wSecond;
WORD wMilliseconds;
} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME;
cpp_quote("#endif")