diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index d3d533a8b0b..94dfcc136e0 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -35,6 +35,7 @@ #include "ole2.h" #include "advpub.h" #include "shlwapi.h" +#include "optary.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -236,7 +237,6 @@ DEFINE_GUID(CLSID_CSvrOMUses, 0x3050F4F0, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0 DEFINE_GUID(CLSID_CrSource, 0x65014010, 0x9F62, 0x11D1, 0xA6,0x51, 0x00,0x60,0x08,0x11,0xD5,0xCE); DEFINE_GUID(CLSID_ExternalFrameworkSite, 0x3050F163, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_HTADocument, 0x3050F5C8, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); -DEFINE_GUID(CLSID_HTMLLoadOptions, 0x18845040, 0x0FA5, 0x11D1, 0xBA,0x19, 0x00,0xC0,0x4F,0xD9,0x12,0xD0); DEFINE_GUID(CLSID_HTMLPluginDocument, 0x25336921, 0x03F9, 0x11CF, 0x8F,0xD0, 0x00,0xAA,0x00,0x68,0x6F,0x13); DEFINE_GUID(CLSID_HTMLPopup, 0x3050F667, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_HTMLPopupDoc, 0x3050F67D, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 2b30313e7de..20116ee3a16 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -63,6 +63,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" +#include "optary.h" /* FIXME: cguids declares GUIDs but does not define their values */ diff --git a/include/.gitignore b/include/.gitignore index 66216906645..762edb8a47f 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -26,6 +26,7 @@ objidl.h objsafe.h ocidl.h oleidl.h +optary.h propidl.h pstore.h richole.h diff --git a/include/Makefile.in b/include/Makefile.in index 75d928dc25e..02a009bca63 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -31,6 +31,7 @@ WINDOWS_IDL_SRCS = \ objsafe.idl \ ocidl.idl \ oleidl.idl \ + optary.idl \ propidl.idl \ pstore.idl \ richole.idl \ diff --git a/include/optary.idl b/include/optary.idl new file mode 100644 index 00000000000..b0c49e62fae --- /dev/null +++ b/include/optary.idl @@ -0,0 +1,65 @@ +/* + * Copyright 2006 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "oleidl.idl"; + +/***************************************************************************** + * IOptionArray interface + */ +[ + local, + object, + uuid(22b6d492-0f88-11d1-ba19-00c04fd912d0), + pointer_default(unique) +] +interface IOptionArray : IUnknown +{ + typedef [unique] IOptionArray *LPOPTIONARRAY; + + HRESULT QueryOption( + [in] DWORD dwOption, + [out, size_is(*pcbBuf)] LPVOID pBuffer, + [in, out] ULONG *pcbBuf); + + HRESULT SetOption( + [in] DWORD dwOption, + [in, size_is(cbBuf)] LPVOID pBuffer, + [in] ULONG cbBuf); +} + +/***************************************************************************** + * IHtmlLoadOptions interface + */ +[ + local, + object, + uuid(a71a0808-0f88-11d1-ba19-00c04fd912d0), + pointer_default(unique) +] +interface IHtmlLoadOptions : IOptionArray +{ + typedef enum { + HTMLLOADOPTION_CODEPAGE, + HTMLLOADOPTION_INETSHORTCUTPATH, + HTMLLOADOPTION_HYPERLINK, + HTMLLOADOPTION_FRAMELOAD + } HTMLLOADOPTION; +} + +cpp_quote("DEFINE_GUID(CLSID_HTMLLoadOptions, 0x18845040, 0x0FA5, 0x11D1, 0xBA,0x19, 0x00,0xC0,0x4F,0xD9,0x12,0xD0);")