2002-07-26 Mattia Barbon <mbarbon@dsi.unive.it>

	* include/exdisp.h: New file.
	* include/exdispid.h: New file.
	* include/mshtml.h: New file.
	* lib/test.c: #include exdisp.h and mshtml.h
	* lib/uuid.c (CLSID_WebBrowser, DIID_DWebBrowserEvents,
	DIID_DWebBrowserEvents2, IID_IHTMLDocument, IID_IHTMLDocument2,
	IID_IHTMLElement, IID_IHTMLSelectionObject, IID_IHTMLTxtRange,
	IID_IWebBrowser, IID_IWebBrowser2, IID_IWebBrowserApp):
	New GUIDs.

	* include/docobj.h: New file.
	* include/idispids.h: New file.
	* include/objidl.h (IID_IMoniker): Declare.
	* include/ocidl.h (READYSTATE): New enum.
	(IOleInPlaceSiteEx): New interface.
	* include/olectlid.h (IID_IEnumSTATSTG): New interface
	identifier.
	* include/oleidl.h (IOleItemContainer, IOleInPlaceObject,
	IOleInPlaceSite): New interfaces.
	* lib/test.c: #include docobj.h,idispids.h,

12 files changed, 896 insertions, 1 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 20c8f27c7..29226856b 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,28 @@
+2002-07-26  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+	* include/exdisp.h: New file.
+	* include/exdispid.h: New file.
+	* include/mshtml.h: New file.
+	* lib/test.c: #include exdisp.h and mshtml.h
+	* lib/uuid.c (CLSID_WebBrowser, DIID_DWebBrowserEvents,
+	DIID_DWebBrowserEvents2, IID_IHTMLDocument, IID_IHTMLDocument2,
+	IID_IHTMLElement, IID_IHTMLSelectionObject, IID_IHTMLTxtRange,
+	IID_IWebBrowser, IID_IWebBrowser2, IID_IWebBrowserApp):
+	New GUIDs.
+
+2002-07-26  Mattia Barbon  <mbarbon@dsi.unive.it>
+
+	* include/docobj.h: New file.
+	* include/idispids.h: New file.
+	* include/objidl.h (IID_IMoniker): Declare.
+	* include/ocidl.h (READYSTATE): New enum.
+	(IOleInPlaceSiteEx): New interface.
+	* include/olectlid.h (IID_IEnumSTATSTG): New interface
+	identifier.
+	* include/oleidl.h (IOleItemContainer, IOleInPlaceObject,
+	IOleInPlaceSite): New interfaces.
+	* lib/test.c: #include docobj.h,idispids.h,
+
 2002-07-25  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines.
diff --git a/winsup/w32api/include/docobj.h b/winsup/w32api/include/docobj.h
new file mode 100644
index 000000000..0e16c6b90
--- /dev/null
+++ b/winsup/w32api/include/docobj.h
@@ -0,0 +1,147 @@
+#ifndef _DOCOBJ_H
+#define _DOCOBJ_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define OLECMDERR_E_UNKNOWNGROUP (-2147221244)
+#define OLECMDERR_E_DISABLED (-2147221247)
+#define OLECMDERR_E_NOHELP (-2147221246)
+#define OLECMDERR_E_CANCELED (-2147221245)
+#define OLECMDERR_E_NOTSUPPORTED (-2147221248)
+
+typedef enum {
+	OLECMDID_OPEN = 1,
+	OLECMDID_NEW = 2,
+	OLECMDID_SAVE = 3,
+	OLECMDID_SAVEAS = 4,
+	OLECMDID_SAVECOPYAS = 5,
+	OLECMDID_PRINT = 6,
+	OLECMDID_PRINTPREVIEW = 7,
+	OLECMDID_PAGESETUP = 8,
+	OLECMDID_SPELL = 9,
+	OLECMDID_PROPERTIES = 10,
+	OLECMDID_CUT = 11,
+	OLECMDID_COPY = 12,
+	OLECMDID_PASTE = 13,
+	OLECMDID_PASTESPECIAL = 14,
+	OLECMDID_UNDO = 15,
+	OLECMDID_REDO = 16,
+	OLECMDID_SELECTALL = 17,
+	OLECMDID_CLEARSELECTION = 18,
+	OLECMDID_ZOOM = 19,
+	OLECMDID_GETZOOMRANGE = 20,
+	OLECMDID_UPDATECOMMANDS = 21,
+	OLECMDID_REFRESH = 22,
+	OLECMDID_STOP = 23,
+	OLECMDID_HIDETOOLBARS = 24,
+	OLECMDID_SETPROGRESSMAX = 25,
+	OLECMDID_SETPROGRESSPOS = 26,
+	OLECMDID_SETPROGRESSTEXT = 27,
+	OLECMDID_SETTITLE = 28,
+	OLECMDID_SETDOWNLOADSTATE = 29,
+	OLECMDID_STOPDOWNLOAD = 30
+} OLECMDID;
+typedef enum {
+	OLECMDF_SUPPORTED = 1,
+	OLECMDF_ENABLED = 2,
+	OLECMDF_LATCHED = 4,
+	OLECMDF_NINCHED = 8
+} OLECMDF;
+typedef enum {
+	OLECMDEXECOPT_DODEFAULT = 0,
+	OLECMDEXECOPT_PROMPTUSER = 1,
+	OLECMDEXECOPT_DONTPROMPTUSER = 2,
+	OLECMDEXECOPT_SHOWHELP = 3
+} OLECMDEXECOPT;
+
+typedef struct _tagOLECMDTEXT {
+	DWORD cmdtextf;
+	ULONG cwActual;
+	ULONG cwBuf;
+	wchar_t rgwz[1];
+} OLECMDTEXT;
+typedef struct _tagOLECMD {
+	ULONG cmdID;
+	DWORD cmdf;
+} OLECMD;
+
+typedef interface IOleInPlaceSite *LPOLEINPLACESITE;
+/* typedef interface IEnumOleDocumentViews *LPENUMOLEDOCUMENTVIEWS;
+   in oleidl.h */
+
+EXTERN_C const IID IID_IContinueCallback;
+EXTERN_C const IID IID_IEnumOleDocumentViews;
+EXTERN_C const IID IID_IPrint;
+
+EXTERN_C const IID IID_IOleDocumentView;
+#undef INTERFACE
+#define INTERFACE IOleDocumentView
+DECLARE_INTERFACE_(IOleDocumentView,IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+
+	STDMETHOD(SetInPlaceSite)(THIS_ LPOLEINPLACESITE) PURE;
+	STDMETHOD(GetInPlaceSite)(THIS_ LPOLEINPLACESITE*) PURE;
+	STDMETHOD(GetDocument)(THIS_ IUnknown*) PURE;
+	STDMETHOD(SetRect)(THIS_ LPRECT) PURE;
+	STDMETHOD(GetRect)(THIS_ LPRECT) PURE;
+	STDMETHOD(SetRectComplex)(THIS_ LPRECT,LPRECT,LPRECT,LPRECT) PURE;
+	STDMETHOD(Show)(THIS_ BOOL) PURE;
+	STDMETHOD(UIActivate)(THIS_ BOOL) PURE;
+	STDMETHOD(Open)(THIS) PURE;
+	STDMETHOD(Close)(THIS_ DWORD) PURE;
+	STDMETHOD(SaveViewState)(THIS_ IStream*) PURE;
+	STDMETHOD(ApplyViewState)(THIS_ IStream*) PURE;
+	STDMETHOD(Clone)(THIS_ LPOLEINPLACESITE,IOleDocumentView**) PURE;
+};
+
+EXTERN_C const IID IID_IOleDocument;
+#undef INTERFACE
+#define INTERFACE IOleDocument
+DECLARE_INTERFACE_(IOleDocument,IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+
+	STDMETHOD(CreateView)(THIS_ LPOLEINPLACESITE,IStream*,DWORD,IOleDocumentView**) PURE;
+	STDMETHOD(GetDocMiscStatus)(THIS_ DWORD*) PURE;
+	STDMETHOD(EnumViews)(THIS_ LPENUMOLEDOCUMENTVIEWS*,IOleDocumentView**) PURE;
+};
+
+EXTERN_C const IID IID_IOleCommandTarget;
+#undef INTERFACE
+#define INTERFACE IOleCommandTarget
+DECLARE_INTERFACE_(IOleCommandTarget,IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+
+	STDMETHOD(QueryStatus)(THIS_ const GUID*,ULONG,OLECMD*,OLECMDTEXT*) PURE;
+	STDMETHOD(Exec)(THIS_ const GUID*,DWORD,DWORD,VARIANTARG*,VARIANTARG*) PURE;
+};
+
+EXTERN_C const IID IID_IOleDocumentSite;
+#undef INTERFACE
+#define INTERFACE IOleDocumentSite
+DECLARE_INTERFACE_(IOleDocumentSite,IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+
+	STDMETHOD(ActivateMe)(THIS_ IOleDocumentView*) PURE;
+};
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/exdisp.h b/winsup/w32api/include/exdisp.h
new file mode 100644
index 000000000..efff4328a
--- /dev/null
+++ b/winsup/w32api/include/exdisp.h
@@ -0,0 +1,257 @@
+#ifndef _EXDISP_H
+#define _EXDISP_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "oaidl.h"
+#include <ocidl.h>
+#include <docobj.h>
+
+EXTERN_C const CLSID CLSID_WebBrowser;
+EXTERN_C const IID DIID_DWebBrowserEvents;
+
+typedef enum {
+	navOpenInNewWindow = 0x1,
+	navNoHistory = 0x2,
+	navNoReadFromCache = 0x4,
+	navNoWriteTocache = 0x8,
+	navAllowAutosearch = 0x10,
+	navBrowserBar = 0x20,
+	navHyperLink = 0x40
+} BrowserNavConstants;
+
+EXTERN_C const IID IID_IWebBrowser;
+#undef INTERFACE
+#define INTERFACE IWebBrowser
+DECLARE_INTERFACE_(IWebBrowser,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(GoBack)(THIS) PURE;
+	STDMETHOD(GoForward)(THIS) PURE;
+	STDMETHOD(GoHome)(THIS) PURE;
+	STDMETHOD(GoSearch)(THIS) PURE;
+	STDMETHOD(Navigate)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
+	STDMETHOD(Refresh)(THIS) PURE;
+	STDMETHOD(Refresh2)(THIS_ VARIANT*) PURE;
+	STDMETHOD(Stop)(THIS) PURE;
+	STDMETHOD(get_Application)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Parent)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Container)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Document)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(get_Type)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Left)(THIS_ long*) PURE;
+	STDMETHOD(put_Left)(THIS_ long) PURE;
+	STDMETHOD(get_Top)(THIS_ long*) PURE;
+	STDMETHOD(put_Top)(THIS_ long) PURE;
+	STDMETHOD(get_Width)(THIS_ long*) PURE;
+	STDMETHOD(put_Width)(THIS_ long) PURE;
+	STDMETHOD(get_Height)(THIS_ long*) PURE;
+	STDMETHOD(put_Height)(THIS_ long) PURE;
+	STDMETHOD(get_LocationName)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE;
+};
+
+EXTERN_C const IID IID_IWebBrowserApp;
+#undef INTERFACE
+#define INTERFACE IWebBrowserApp
+DECLARE_INTERFACE_(IWebBrowserApp,IWebBrowser)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(GoBack)(THIS) PURE;
+	STDMETHOD(GoForward)(THIS) PURE;
+	STDMETHOD(GoHome)(THIS) PURE;
+	STDMETHOD(GoSearch)(THIS) PURE;
+	STDMETHOD(Navigate)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
+	STDMETHOD(Refresh)(THIS) PURE;
+	STDMETHOD(Refresh2)(THIS_ VARIANT*) PURE;
+	STDMETHOD(Stop)(THIS) PURE;
+	STDMETHOD(get_Application)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Parent)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Container)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Document)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(get_Type)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Left)(THIS_ long*) PURE;
+	STDMETHOD(put_Left)(THIS_ long) PURE;
+	STDMETHOD(get_Top)(THIS_ long*) PURE;
+	STDMETHOD(put_Top)(THIS_ long) PURE;
+	STDMETHOD(get_Width)(THIS_ long*) PURE;
+	STDMETHOD(put_Width)(THIS_ long) PURE;
+	STDMETHOD(get_Height)(THIS_ long*) PURE;
+	STDMETHOD(put_Height)(THIS_ long) PURE;
+	STDMETHOD(get_LocationName)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE;
+
+	STDMETHOD(Quit)(THIS) PURE;
+	STDMETHOD(ClientToWindow)(THIS_ int*,int*) PURE;
+	STDMETHOD(PutProperty)(THIS_ BSTR,VARIANT) PURE;
+	STDMETHOD(GetProperty)(THIS_ BSTR,VARIANT*) PURE;
+	STDMETHOD(get_Name)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_HWND)(THIS_ long*) PURE;
+	STDMETHOD(get_FullName)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Path)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Visible)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_Visible)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_StatusBar)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_StatusBar)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_StatusText)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_StatusText)(THIS_ BSTR) PURE;
+	STDMETHOD(get_ToolBar)(THIS_ int*) PURE;
+	STDMETHOD(put_ToolBar)(THIS_ int) PURE;
+	STDMETHOD(get_MenuBar)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_MenuBar)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_FullScreen)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_FullScreen)(THIS_ VARIANT_BOOL) PURE;
+};
+
+EXTERN_C const IID IID_IWebBrowser2;
+#undef INTERFACE
+#define INTERFACE IWebBrowser2
+DECLARE_INTERFACE_(IWebBrowser2,IWebBrowserApp)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(GoBack)(THIS) PURE;
+	STDMETHOD(GoForward)(THIS) PURE;
+	STDMETHOD(GoHome)(THIS) PURE;
+	STDMETHOD(GoSearch)(THIS) PURE;
+	STDMETHOD(Navigate)(THIS_ BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
+	STDMETHOD(Refresh)(THIS) PURE;
+	STDMETHOD(Refresh2)(THIS_ VARIANT*) PURE;
+	STDMETHOD(Stop)(THIS) PURE;
+	STDMETHOD(get_Application)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Parent)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Container)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_Document)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_TopLevelContainer)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(get_Type)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Left)(THIS_ long*) PURE;
+	STDMETHOD(put_Left)(THIS_ long) PURE;
+	STDMETHOD(get_Top)(THIS_ long*) PURE;
+	STDMETHOD(put_Top)(THIS_ long) PURE;
+	STDMETHOD(get_Width)(THIS_ long*) PURE;
+	STDMETHOD(put_Width)(THIS_ long) PURE;
+	STDMETHOD(get_Height)(THIS_ long*) PURE;
+	STDMETHOD(put_Height)(THIS_ long) PURE;
+	STDMETHOD(get_LocationName)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_LocationURL)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Busy)(THIS_ VARIANT_BOOL*) PURE;
+
+	STDMETHOD(Quit)(THIS) PURE;
+	STDMETHOD(ClientToWindow)(THIS_ int*,int*) PURE;
+	STDMETHOD(PutProperty)(THIS_ BSTR,VARIANT) PURE;
+	STDMETHOD(GetProperty)(THIS_ BSTR,VARIANT*) PURE;
+	STDMETHOD(get_Name)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_HWND)(THIS_ long*) PURE;
+	STDMETHOD(get_FullName)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Path)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_Visible)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_Visible)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_StatusBar)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_StatusBar)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_StatusText)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_StatusText)(THIS_ BSTR) PURE;
+	STDMETHOD(get_ToolBar)(THIS_ int*) PURE;
+	STDMETHOD(put_ToolBar)(THIS_ int) PURE;
+	STDMETHOD(get_MenuBar)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_MenuBar)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_FullScreen)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_FullScreen)(THIS_ VARIANT_BOOL) PURE;
+
+	STDMETHOD(Navigate2)(THIS_ VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT*) PURE;
+	STDMETHOD(QueryStatusWB)(THIS_ OLECMDID,OLECMDF*) PURE;
+	STDMETHOD(ExecWB)(THIS_ OLECMDID,OLECMDEXECOPT,VARIANT*,VARIANT*) PURE;
+	STDMETHOD(ShowBrowserBar)(THIS_ VARIANT*,VARIANT*,VARIANT*) PURE;
+	STDMETHOD(get_ReadyState)(THIS_ READYSTATE*) PURE;
+	STDMETHOD(get_Offline)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_Offline)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_Silent)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_Silent)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_RegistaerAsBrowser)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_RegisterAsBrowser)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_RegistaerAsDropTarget)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_RegisterAsDropTarget)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_TheaterMode)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_TheaterMode)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_AddressBar)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_AddressBar)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_Resizable)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_Resizable)(THIS_ VARIANT_BOOL) PURE;
+};
+
+#define STDDISP(m) STDMETHOD_(void,m)
+
+EXTERN_C const IID DIID_DWebBrowserEvents2;
+#undef INTERFACE
+#define INTERFACE DWebBrowserEvents2
+DECLARE_INTERFACE_(DWebBrowserEvents2,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDDISP(StatusTextChange)(THIS_ BSTR) PURE;
+	STDDISP(ProgressChange)(THIS_ long,long) PURE;
+	STDDISP(CommandStateChange)(THIS_ long,VARIANT_BOOL) PURE;
+	STDDISP(DownloadBegin)(THIS) PURE;
+	STDDISP(DownloadComplete)(THIS) PURE;
+	STDDISP(TitleChange)(THIS_ BSTR) PURE;
+	STDDISP(PropertyChange)(THIS_ BSTR) PURE;
+	STDDISP(BeforeNavigate2)(THIS_ IDispatch*,VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT*,VARIANT_BOOL*) PURE;
+	STDDISP(NewWindow2)(THIS_ IDispatch**,VARIANT_BOOL*) PURE;
+	STDDISP(NavigateComplete)(THIS_ IDispatch*,VARIANT*) PURE;
+	STDDISP(DocumentComplete)(THIS_ IDispatch*,VARIANT*) PURE;
+	STDDISP(OnQuit)(THIS) PURE;
+	STDDISP(OnVisible)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(OnToolBar)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(OnMenuBar)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(OnStatusBar)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(OnFullScreen)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(OnTheaterMode)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(WindowSetResizable)(THIS_ VARIANT_BOOL) PURE;
+	STDDISP(WindowSetLeft)(THIS_ long) PURE;
+	STDDISP(WindowSetTop)(THIS_ long) PURE;
+	STDDISP(WindowSetWidth)(THIS_ long) PURE;
+	STDDISP(WindowSetHeight)(THIS_ long) PURE;
+	STDDISP(WindowClosing)(THIS_ VARIANT_BOOL,VARIANT_BOOL*) PURE;
+	STDDISP(ClientToHostWindow)(THIS_ long*,long*) PURE;
+	STDDISP(SetSecureLockIcon)(THIS_ long) PURE;
+	STDDISP(FileDownload)(THIS_ VARIANT_BOOL*) PURE;
+};
+
+#undef STDDISP
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/exdispid.h b/winsup/w32api/include/exdispid.h
new file mode 100644
index 000000000..da2b0a4f0
--- /dev/null
+++ b/winsup/w32api/include/exdispid.h
@@ -0,0 +1,14 @@
+#ifndef _EXDISPID_H
+#define _EXDISPID_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#define DISPID_BEFORENAVIGATE2 250
+#define DISPID_NEWWINDOW2 251
+#define DISPID_PROGRESSCHANGE 108
+#define DISPID_DOCUMENTCOMPLETE 259
+#define DISPID_STATUSTEXTCHANGE 102
+#define DISPID_TITLECHANGE 113
+
+#endif
diff --git a/winsup/w32api/include/idispids.h b/winsup/w32api/include/idispids.h
new file mode 100644
index 000000000..66585b4d0
--- /dev/null
+++ b/winsup/w32api/include/idispids.h
@@ -0,0 +1,10 @@
+#ifndef _IDISPIDS_H
+#define _IDISPIDS_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#define DISPID_AMBIENT_OFFLINEIFNOTCONNECTED (-5501)
+#define DISPID_AMBIENT_SILENT (-5502)
+
+#endif
diff --git a/winsup/w32api/include/mshtml.h b/winsup/w32api/include/mshtml.h
new file mode 100644
index 000000000..192d8bed9
--- /dev/null
+++ b/winsup/w32api/include/mshtml.h
@@ -0,0 +1,332 @@
+#ifndef _MSHTML_H
+#define _MSHTML_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef interface IHTMLElementCollection *LPHTMLELEMENTCOLLECTION;
+typedef interface IHTMLElement *LPHTMLELEMENT;
+typedef interface IHTMLSelectionObject *LPHTMLSELECTIONOBJECT;
+typedef interface IHTMLFramesCollection *LPHTMLFRAMESCOLLECTION;
+typedef interface IHTMLLocation *LPHTMLLOCATION;
+typedef interface IHTMLWindow2 *LPHTMLWINDOW2;
+typedef interface IHTMLStyleSheetsCollection *LPHTMLSTYLESHEETSCOLLECTION;
+typedef interface IHTMLStyleSheet *LPHTMLSTYLESHEET;
+typedef interface IHTMLStyle *LPHTMLSTYLE;
+typedef interface IHTMLFiltersCollection *LPHTMLFILTERSCOLLECTION;
+
+EXTERN_C const IID IID_IHTMLDocument;
+#undef INTERFACE
+#define INTERFACE IHTMLDocument
+DECLARE_INTERFACE_(IHTMLDocument,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+        STDMETHOD(get_Script)(THIS_ IDispatch**) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLDocument2;
+#undef INTERFACE
+#define INTERFACE IHTMLDocument2
+DECLARE_INTERFACE_(IHTMLDocument2,IHTMLDocument)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(get_Script)(THIS_ IDispatch**) PURE;
+
+	STDMETHOD(get_all)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(get_body)(THIS_ LPHTMLELEMENT*) PURE;
+	STDMETHOD(get_activeElement)(THIS_ LPHTMLELEMENT*) PURE;
+	STDMETHOD(get_images)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(get_applets)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(get_links)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(get_forms)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(get_anchors)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(put_title)(THIS_ BSTR) PURE;
+	STDMETHOD(get_title)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_scripts)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(put_designMode)(THIS_ BSTR) PURE;
+	STDMETHOD(get_designMode)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_selection)(LPHTMLSELECTIONOBJECT*) PURE;
+	STDMETHOD(get_readyState)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_frames)(THIS_ LPHTMLFRAMESCOLLECTION*) PURE;
+	STDMETHOD(get_embeds)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(get_plugins)(THIS_ LPHTMLELEMENTCOLLECTION*) PURE;
+	STDMETHOD(put_alinkColor)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_alinkColor)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_bgColor)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_bgColor)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_fgColor)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_fgColor)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_linkColor)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_linkColor)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_vlinkColor)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_vlinkColor)(THIS_ VARIANT*) PURE;
+	STDMETHOD(get_referrer)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_location)(THIS_ LPHTMLLOCATION*) PURE;
+	STDMETHOD(get_lastModified)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_url)(THIS_ BSTR) PURE;
+	STDMETHOD(get_url)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_domain)(THIS_ BSTR) PURE;
+	STDMETHOD(get_domain)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_cookie)(THIS_ BSTR) PURE;
+	STDMETHOD(get_cookie)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_expands)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(get_expands)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(put_charset)(THIS_ BSTR) PURE;
+	STDMETHOD(get_charset)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_defaultCharset)(THIS_ BSTR) PURE;
+	STDMETHOD(get_defaultCharset)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_mimeType)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_fileSize)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_fileCreatedDate)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_fileModifiedDate)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_fileUpdatedDate)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_security)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_protocol)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_nameProp)(THIS_ BSTR*) PURE;
+	STDMETHOD(write)(THIS_ SAFEARRAY) PURE;
+	STDMETHOD(writeln)(THIS_ SAFEARRAY) PURE;
+	STDMETHOD(open)(THIS_ BSTR,VARIANT,VARIANT,VARIANT,IDispatch**) PURE;
+	STDMETHOD(close)(THIS) PURE;
+	STDMETHOD(clear)(THIS) PURE;
+	STDMETHOD(queryCommandSupported)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandEnabled)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandState)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandIndeterm)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandText)(THIS_ BSTR,BSTR*) PURE;
+	STDMETHOD(queryCommandValue)(THIS_ BSTR,VARIANT*) PURE;
+	STDMETHOD(execCommand)(THIS_ BSTR,VARIANT_BOOL,VARIANT,VARIANT_BOOL*) PURE;
+	STDMETHOD(execCommandShowHelp)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(createElement)(THIS_ BSTR,LPHTMLELEMENT*) PURE;
+	STDMETHOD(put_onhelp)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onclick)(THIS_ VARIANT) PURE;
+       STDMETHOD(get_onclick)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_ondblclick)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondblclick)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onkeyup)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onkeyup)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onkeydown)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onkeydown)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onkeypress)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onkeypress)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmouseup)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmouseup)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmousedown)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmousedown)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmousemove)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmousemove)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmouseout)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmouseout)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmouseover)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmouseover)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onreadystatechange)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onreadystatechange)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onafterupdate)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onafterupdate)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onrowexit)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onrowexit)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onrowenter)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onrowenter)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_ondragstart)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondragstart)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onselectstart)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onselectstart)(THIS_ VARIANT*) PURE;
+	STDMETHOD(elementFromPoint)(THIS_ long,long,LPHTMLELEMENT*) PURE;
+	STDMETHOD(get_parentWindow)(THIS_ LPHTMLWINDOW2*) PURE;
+	STDMETHOD(get_styleSheets)(THIS_ LPHTMLSTYLESHEETSCOLLECTION*) PURE;
+	STDMETHOD(put_onbeforeupdate)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onbeforeupdate)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onerrorupdate)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onerrorupdate)(THIS_ VARIANT*) PURE;
+	STDMETHOD(toString)(THIS_ BSTR*) PURE;
+	STDMETHOD(createStyleSheet)(THIS_ BSTR,long,LPHTMLSTYLESHEET*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLSelectionObject;
+#undef INTERFACE
+#define INTERFACE IHTMLSelectionObject
+DECLARE_INTERFACE_(IHTMLSelectionObject,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(createRange)(THIS_ IDispatch**) PURE;
+	STDMETHOD(empty)(THIS) PURE;
+	STDMETHOD(clear)(THIS) PURE;
+	STDMETHOD(type)(THIS_ BSTR*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLTxtRange;
+#undef INTERFACE
+#define INTERFACE IHTMLTxtRange
+DECLARE_INTERFACE_(IHTMLTxtRange,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(get_htmlText)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_text)(THIS_ BSTR) PURE;
+	STDMETHOD(get_text)(THIS_ BSTR*) PURE;
+	STDMETHOD(parentElement)(THIS_ LPHTMLELEMENT*) PURE;
+	STDMETHOD(duplicate)(THIS_ IHTMLTxtRange**) PURE;
+	STDMETHOD(inRange)(THIS_ IHTMLTxtRange*,VARIANT_BOOL*) PURE;
+	STDMETHOD(isEqual)(THIS_ IHTMLTxtRange*,VARIANT_BOOL*) PURE;
+	STDMETHOD(scrollIntoView)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(collapse)(THIS_ VARIANT_BOOL) PURE;
+	STDMETHOD(expand)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(move)(THIS_ BSTR,long,long*) PURE;
+	STDMETHOD(moveStart)(THIS_ BSTR,long,long*) PURE;
+	STDMETHOD(moveEnd)(THIS_ BSTR,long,long*) PURE;
+	STDMETHOD(select)(THIS) PURE;
+	STDMETHOD(pasteHTML)(THIS_ BSTR) PURE;
+	STDMETHOD(moveToElementText)(THIS_ LPHTMLELEMENT) PURE;
+	STDMETHOD(setEndPoint)(THIS_ BSTR,IHTMLTxtRange*) PURE;
+	STDMETHOD(compareEndPoints)(THIS_ BSTR,IHTMLTxtRange*,long*) PURE;
+	STDMETHOD(findText)(THIS_ BSTR,long,long,VARIANT_BOOL*) PURE;
+	STDMETHOD(moveToPoint)(THIS_ long,long) PURE;
+	STDMETHOD(getBookmark)(THIS_ BSTR*) PURE;
+	STDMETHOD(moveToBookbark)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandSupported)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandEnabled)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandState)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandIndeterm)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+	STDMETHOD(queryCommandText)(THIS_ BSTR,BSTR*) PURE;
+	STDMETHOD(queryCommandValue)(THIS_ BSTR,VARIANT*) PURE;
+	STDMETHOD(execCommand)(THIS_ BSTR,VARIANT_BOOL,VARIANT,VARIANT_BOOL*) PURE;
+	STDMETHOD(execCommandShowHelp)(THIS_ BSTR,VARIANT_BOOL*) PURE;
+};
+
+EXTERN_C const IID IID_IHTMLElement;
+#undef INTERFACE
+#define INTERFACE IHTMLElement
+DECLARE_INTERFACE_(IHTMLElement,IDispatch)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE;
+	STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE;
+	STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) PURE;
+	STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE;
+
+	STDMETHOD(setAttribute)(THIS_ BSTR,VARIANT,long) PURE;
+	STDMETHOD(getAttribute)(THIS_ BSTR,long,VARIANT*) PURE;
+	STDMETHOD(removeAttribute)(THIS_ BSTR,long,VARIANT_BOOL*) PURE;
+	STDMETHOD(put_className)(THIS_ BSTR) PURE;
+	STDMETHOD(get_className)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_id)(THIS_ BSTR) PURE;
+	STDMETHOD(get_id)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_tagName)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_parentElement)(THIS_ LPHTMLELEMENT*) PURE;
+	STDMETHOD(get_style)(THIS_ LPHTMLSTYLE*) PURE;
+	STDMETHOD(put_onhelp)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onhelp)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onclick)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onclick)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_ondblclick)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondblclick)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onkeydown)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onkeydown)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onkeyup)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onkeyup)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onkeypress)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onkeypress)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmouseout)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmouseout)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmouseover)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmouseover)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmousemove)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmousemove)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmousedown)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmousedown)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onmouseup)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onmouseup)(THIS_ VARIANT*) PURE;
+	STDMETHOD(get_document)(THIS_ IDispatch**) PURE;
+	STDMETHOD(put_title)(THIS_ BSTR) PURE;
+	STDMETHOD(get_title)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_language)(THIS_ BSTR) PURE;
+	STDMETHOD(get_language)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_onselectstart)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onselectstart)(THIS_ VARIANT*) PURE;
+	STDMETHOD(scrollIntoView)(THIS_ VARIANT) PURE;
+	STDMETHOD(contains)(THIS_ LPHTMLELEMENT,VARIANT_BOOL*) PURE;
+	STDMETHOD(get_source3Index)(THIS_ long*) PURE;
+	STDMETHOD(get_recordNumber)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_lang)(THIS_ BSTR) PURE;
+	STDMETHOD(get_lang)(THIS_ BSTR*) PURE;
+	STDMETHOD(get_offsetLeft)(THIS_ long*) PURE;
+	STDMETHOD(get_offsetTop)(THIS_ long*) PURE;
+	STDMETHOD(get_offsetWidth)(THIS_ long*) PURE;
+	STDMETHOD(get_offsetHeight)(THIS_ long*) PURE;
+	STDMETHOD(get_offsetParent)(THIS_ LPHTMLELEMENT*) PURE;
+	STDMETHOD(put_innerHTML)(THIS_ BSTR) PURE;
+	STDMETHOD(get_innerHTML)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_innerText)(THIS_ BSTR) PURE;
+	STDMETHOD(get_innerText)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_outerHTML)(THIS_ BSTR) PURE;
+	STDMETHOD(get_outerHTML)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_outerText)(THIS_ BSTR) PURE;
+	STDMETHOD(get_outerText)(THIS_ BSTR*) PURE;
+	STDMETHOD(insertAdjacentHTML)(THIS_ BSTR,BSTR) PURE;
+	STDMETHOD(insertAdjacentText)(THIS_ BSTR,BSTR) PURE;
+	STDMETHOD(get_parentTextEdit)(THIS_ LPHTMLELEMENT*) PURE;
+	STDMETHOD(isTextEdit)(THIS_ VARIANT_BOOL*) PURE;
+	STDMETHOD(click)(THIS) PURE;
+	STDMETHOD(get_filters)(THIS_ LPHTMLFILTERSCOLLECTION*) PURE;
+	STDMETHOD(put_ondragstart)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondragstart)(THIS_ VARIANT*) PURE;
+	STDMETHOD(toString)(THIS_ BSTR*) PURE;
+	STDMETHOD(put_onbeforeupdate)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onbeforeupdate)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onafterupdate)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onafterupdate)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onerrorupdate)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onerrorupdate)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onrowexit)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onrowexit)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onrowenter)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onrowenter)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_ondatasetchanged)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondatasetchanged)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_ondataavailable)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondataavailable)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_ondatasetcomplete)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_ondatasetcomplete)(THIS_ VARIANT*) PURE;
+	STDMETHOD(put_onfilterchange)(THIS_ VARIANT) PURE;
+	STDMETHOD(get_onfilterchange)(THIS_ VARIANT*) PURE;
+	STDMETHOD(get_children)(THIS_ IDispatch**) PURE;
+	STDMETHOD(get_all)(THIS_ IDispatch**) PURE;
+};
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/objidl.h b/winsup/w32api/include/objidl.h
index 20f5cd8cc..d3597e318 100644
--- a/winsup/w32api/include/objidl.h
+++ b/winsup/w32api/include/objidl.h
@@ -592,7 +592,7 @@ DECLARE_INTERFACE_(IBindCtx,IUnknown)
 	STDMETHOD(RevokeObjectParam)(THIS_ LPOLESTR) PURE;
 };
 
-EXTERN_C const IID IID_IPersistStream;
+EXTERN_C const IID IID_IMoniker;
 #undef INTERFACE
 #define INTERFACE IMoniker
 DECLARE_INTERFACE_(IMoniker,IPersistStream)
diff --git a/winsup/w32api/include/ocidl.h b/winsup/w32api/include/ocidl.h
index 2618d841d..9727c78b9 100644
--- a/winsup/w32api/include/ocidl.h
+++ b/winsup/w32api/include/ocidl.h
@@ -1,7 +1,47 @@
 #ifndef _OCIDL_H
 #define _OCIDL_H
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include <ole2.h>
 #include <olectl.h>
 
+typedef enum tagREADYSTATE {
+	READYSTATE_UNINITIALIZED = 0,
+	READYSTATE_LOADING = 1,
+	READYSTATE_LOADED = 2,
+	READYSTATE_INTERACTIVE = 3,
+	READYSTATE_COMPLETE = 4
+} READYSTATE;
+
+EXTERN_C const IID IID_IOleInPlaceSiteEx;
+#undef INTERFACE
+#define INTERFACE IOleInPlaceSiteEx
+DECLARE_INTERFACE_(IOleInPlaceSiteEx,IOleInPlaceSite)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
+	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
+	STDMETHOD(CanInPlaceActivate)(THIS) PURE;
+	STDMETHOD(OnInPlaceActivate)(THIS) PURE;
+	STDMETHOD(OnUIActivate)(THIS) PURE;
+	STDMETHOD(GetWindowContext)(THIS_ IOleInPlaceFrame**,IOleInPlaceUIWindow**,LPRECT,LPRECT,LPOLEINPLACEFRAMEINFO) PURE;
+	STDMETHOD(Scroll)(THIS_ SIZE) PURE;
+	STDMETHOD(OnUIDeactivate)(THIS_ BOOL) PURE;
+	STDMETHOD(OnInPlaceDeactivate)(THIS) PURE;
+	STDMETHOD(DiscardUndoState)(THIS) PURE;
+	STDMETHOD(DeactivateAndUndo)(THIS) PURE;
+	STDMETHOD(OnPosRectChange)(THIS_ LPCRECT) PURE;
+
+	STDMETHOD(OnInPlaceActivateEx)(THIS_ BOOL*,DWORD) PURE;
+	STDMETHOD(OnInPlaceDeactivateEx)(THIS_ BOOL) PURE;
+	STDMETHOD(RequestUIActivate)(THIS) PURE;
+};
+
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/winsup/w32api/include/olectlid.h b/winsup/w32api/include/olectlid.h
index 4795b64d6..73e935cca 100644
--- a/winsup/w32api/include/olectlid.h
+++ b/winsup/w32api/include/olectlid.h
@@ -68,6 +68,7 @@ extern const GUID IID_IEnumMoniker;
 extern const GUID IID_IEnumFORMATETC;
 extern const GUID IID_IEnumOLEVERB;
 extern const GUID IID_IEnumSTATDATA;
+extern const GUID IID_IEnumSTATSTG;
 extern const GUID IID_IEnumGeneric;
 extern const GUID IID_IEnumHolder;
 extern const GUID IID_IEnumCallback;
diff --git a/winsup/w32api/include/oleidl.h b/winsup/w32api/include/oleidl.h
index 570f2cc9f..b85ac110e 100644
--- a/winsup/w32api/include/oleidl.h
+++ b/winsup/w32api/include/oleidl.h
@@ -101,6 +101,22 @@ DECLARE_INTERFACE_(IOleContainer,IParseDisplayName)
 	STDMETHOD(LockContainer)(THIS_ BOOL) PURE;
 };
 
+EXTERN_C const IID IID_IOleItemContainer;
+#undef INTERFACE
+#define INTERFACE IOleItemContainer
+DECLARE_INTERFACE_(IOleItemContainer,IOleContainer)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(ParseDisplayName)(THIS_ IBindCtx*,LPOLESTR,ULONG*,IMoniker**) PURE;
+	STDMETHOD(EnumObjects)(THIS_ DWORD,IEnumUnknown**) PURE;
+	STDMETHOD(LockContainer)(THIS_ BOOL) PURE;
+	STDMETHOD(GetObject)(THIS_ LPOLESTR,DWORD,IBindCtx*,REFIID,void**) PURE;
+	STDMETHOD(GetObjectStorage)(THIS_ LPOLESTR,IBindCtx*,REFIID,void**) PURE;
+	STDMETHOD(IsRunning)(THIS_ LPOLESTR) PURE;
+};
+
 EXTERN_C const IID IID_IOleClientSite;
 #undef INTERFACE
 #define INTERFACE IOleClientSite
@@ -176,6 +192,22 @@ DECLARE_INTERFACE_(IOleInPlaceUIWindow,IOleWindow)
 	STDMETHOD(SetActiveObject)(THIS_ LPOLEINPLACEACTIVEOBJECT,LPCOLESTR) PURE;
 };
 
+EXTERN_C const IID IID_IOleInPlaceObject;
+#undef INTERFACE
+#define INTERFACE IOleInPlaceObject
+DECLARE_INTERFACE_(IOleInPlaceObject,IOleWindow)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
+	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
+	STDMETHOD(InPlaceDeactivate)(THIS) PURE;
+	STDMETHOD(UIDeactivate)(THIS) PURE;
+	STDMETHOD(SetObjectRects)(THIS_ LPCRECT,LPCRECT) PURE;
+	STDMETHOD(ReactivateAndUndo)(THIS) PURE;
+};
+
 EXTERN_C const IID IID_IOleInPlaceActiveObject;
 #undef INTERFACE
 #define INTERFACE IOleInPlaceActiveObject
@@ -215,6 +247,28 @@ DECLARE_INTERFACE_(IOleInPlaceFrame,IOleInPlaceUIWindow)
 	STDMETHOD(TranslateAccelerator)(THIS_ LPMSG,WORD) PURE;
 };
 
+EXTERN_C const IID IID_IOleInPlaceSite;
+#undef INTERFACE
+#define INTERFACE IOleInPlaceSite
+DECLARE_INTERFACE_(IOleInPlaceSite,IOleWindow)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(GetWindow)(THIS_ HWND*) PURE;
+	STDMETHOD(ContextSensitiveHelp)(THIS_ BOOL) PURE;
+	STDMETHOD(CanInPlaceActivate)(THIS) PURE;
+	STDMETHOD(OnInPlaceActivate)(THIS) PURE;
+	STDMETHOD(OnUIActivate)(THIS) PURE;
+	STDMETHOD(GetWindowContext)(THIS_ IOleInPlaceFrame**,IOleInPlaceUIWindow**,LPRECT,LPRECT,LPOLEINPLACEFRAMEINFO) PURE;
+	STDMETHOD(Scroll)(THIS_ SIZE) PURE;
+	STDMETHOD(OnUIDeactivate)(THIS_ BOOL) PURE;
+	STDMETHOD(OnInPlaceDeactivate)(THIS) PURE;
+	STDMETHOD(DiscardUndoState)(THIS) PURE;
+	STDMETHOD(DeactivateAndUndo)(THIS) PURE;
+	STDMETHOD(OnPosRectChange)(THIS_ LPCRECT) PURE;
+};
+
 EXTERN_C const IID IID_IOleAdviseHolder;
 #undef INTERFACE
 #define INTERFACE IOleAdviseHolder
diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index 8f8feda8b..6108642f7 100644
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -74,9 +74,13 @@
 #include <ole2ver.h>
 #include <olectl.h>
 #include <oledlg.h>
+#include <docobj.h>
+#include <idispids.h>
 #include <rapi.h>
 #include <richole.h>
 #include <rpcproxy.h>
+#include <exdisp.h>
+#include <mshtml.h>
 
 #else
 #undef BOOL
diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index 921887c1a..ea634f1d2 100644
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -66,6 +66,9 @@ DEFINE_GUID(CLSID_StdMarshal,0x17,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(CLSID_StdPicture,0xbe35204,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
 DEFINE_GUID(CLSID_StdURLMonikerE0,0xf979eac9,0xceba,0x8c11,0x82,0,0xaa,0,0x4b,0xa9,0xb,0);
 DEFINE_GUID(CLSID_StdURLProtocol,0x79eac9e1,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
+DEFINE_GUID(CLSID_WebBrowser,0x8856f961,0x340a,0x11d0,0xa9,0x6b,0x0,0xc0,0x4f,0xd7,0x5,0xa2);
+DEFINE_GUID(DIID_DWebBrowserEvents,0xeab22ac2,0x30c1,0x11cf,0xa7,0xeb,0x0,0x0,0xc0,0x5b,0xae,0x0b);
+DEFINE_GUID(DIID_DWebBrowserEvents2,0x34a715a0,0x6587,0x11d0,0x92,0x4a,0x0,0x20,0xaf,0xc7,0xac,0x4d);
 DEFINE_GUID(FLAGID_Internet,0x96300da0,0x2bab,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);
 DEFINE_GUID(FMTID_DocSummaryInformation,0xd5cdd502,0x2e9c,0x101b,0x93,0x97,0x8,0,0x2b,0x2c,0xf9,0xae);
 DEFINE_GUID(FMTID_SummaryInformation,0xf29f85e0,0x4ff9,0x1068,0xab,0x91,0x8,0,0x2b,0x27,0xb3,0xd9);
@@ -166,6 +169,11 @@ DEFINE_GUID(IID_IFillLockBytes,0x99caf010,0x415e,0x11cf,0x88,0x14,0,0xaa,0,0xb5,
 DEFINE_GUID(IID_IFilter,0x89bcb740,0x6119,0x101a,0xbc,0xb7,0,0xdd,0x1,0x6,0x55,0xaf);
 DEFINE_GUID(IID_IFont,0xbef6e002,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
 DEFINE_GUID(IID_IFontDisp,0xbef6e003,0xa874,0x101a,0x8b,0xba,0,0xaa,0,0x30,0xc,0xab);
+DEFINE_GUID(IID_IHTMLDocument,0x626fc520,0xa41e,0x11cf,0xa7,0x31,0x0,0xa0,0xc9,0x8,0x26,0x37);
+DEFINE_GUID(IID_IHTMLDocument2,0x332c4425,0x26cb,0x11d0,0xb4,0x83,0x0,0xc0,0x4f,0xd9,0x1,0x19);
+DEFINE_GUID(IID_IHTMLElement,0x3050f1ff,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb);
+DEFINE_GUID(IID_IHTMLSelectionObject,0x3050f25a,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0xb);
+DEFINE_GUID(IID_IHTMLTxtRange,0x3050f220,0x98b5,0x11cf,0xbb,0x82,0x0,0xaa,0x0,0xbd,0xce,0x0b);
 DEFINE_GUID(IID_IHlink,0x79eac9c3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 DEFINE_GUID(IID_IHlinkBrowseContext,0x79eac9c7,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 DEFINE_GUID(IID_IHlinkFrame,0x79eac9c5,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
@@ -288,6 +296,9 @@ DEFINE_GUID(IID_IUrlHistoryStg,0x3c374a41,0xbae4,0x11cf,0xbf,0x7d,0,0xaa,0,0x69,
 DEFINE_GUID(IID_IViewObject,0x10d,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IViewObject2,0x127,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IViewObjectEx,0x3af24292,0xc96,0x11ce,0xa0,0xcf,0,0xaa,0,0x60,0xa,0xb8);
+DEFINE_GUID(IID_IWebBrowser,0xeab22ac1,0x30c1,0x11cf,0xa7,0xeb,0x0,0x0,0xc0,0x5b,0xae,0x0b);
+DEFINE_GUID(IID_IWebBrowser2,0xd30c1661,0xcdaf,0x11d0,0x8a,0x3e,0x0,0xc0,0x4f,0xc9,0xe2,0x6e);
+DEFINE_GUID(IID_IWebBrowserApp,0x2df05,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x46);
 DEFINE_GUID(IID_IWinInetHttpInfo,0x79eac9d8,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 DEFINE_GUID(IID_IWinInetInfo,0x79eac9d6,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
 DEFINE_GUID(IID_IWindowForBindingUI,0x79eac9d5,0xbafa,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);