[COM_APITEST]

- Add ieframe classes CLSID_Internet, CLSID_CUrlHistory, CLSID_InternetShortcut, CLSID_ShellUIHelper, CLSID_ShellNameSpace, CLSID_WebBrowser and CLSID_WebBrowser_V1
- Add shdocvw classes CLSID_SearchAssistantOC, CLSID_ShellSearchAssistantOC and CLSID_ShellShellNameSpace

svn path=/trunk/; revision=71123

diff --git a/rostests/apitests/com/ieframe.c b/rostests/apitests/com/ieframe.c
index 9976223..e043ffc 100644 (file)
--- a/rostests/apitests/com/ieframe.c
+++ b/rostests/apitests/com/ieframe.c
@@ -12,6 +12,26 @@
 
 static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
 {
+    {
+        ID_NAME(CLSID_Internet),
+        {
+            {  -0x14,   &IID_IShellFolder2 },
+            {  -0x14,       &IID_IShellFolder },
+            {  -0x10,   &IID_IPersistFolder2 },
+            {  -0x10,       &IID_IPersistFolder },
+            {  -0x10,           &IID_IPersist },
+            {   -0xc,   &IID_IBrowserFrameOptions },
+            {    0x0,   &IID_IContextMenu },
+            {    0x0,       &IID_IUnknown },
+            {    0x4,   &IID_IShellExtInit },
+        }
+    },
+    {
+        ID_NAME(CLSID_CUrlHistory),
+        {
+            {    0x0,   &IID_IUnknown },
+        }
+    },
     {
         ID_NAME(CLSID_CURLSearchHook),
         {
@@ -20,6 +40,68 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,           &IID_IUnknown },
         }
     },
+    {
+        ID_NAME(CLSID_InternetShortcut),
+        {
+            {   -0xc,   &IID_IDataObject },
+            {   -0x8,   &IID_IContextMenu2 },
+            {   -0x8,       &IID_IContextMenu },
+            {   -0x4,   &IID_IExtractIconA },
+            {    0x0,   &IID_IExtractIconW },
+            {    0x0,       &IID_IUnknown },
+            {    0x4,   &IID_IPersistFile },
+            {    0x4,       &IID_IPersist },
+            {    0x8,   &IID_IPersistStream },
+            {    0xc,   &IID_IShellExtInit },
+            {   0x10,   &IID_IShellLinkA },
+            {   0x14,   &IID_IShellLinkW },
+            {   0x18,   &IID_IShellPropSheetExt },
+            {   0x20,   &IID_INewShortcutHookA },
+            {   0x24,   &IID_INewShortcutHookW },
+            {   0x30,   &IID_IQueryInfo },
+            {   0x38,   &IID_IObjectWithSite },
+            {   0x44,   &IID_IOleCommandTarget },
+            {   0x48,   &IID_IServiceProvider },
+        }
+    },
+    {
+        ID_NAME(CLSID_ShellUIHelper),
+        {
+            {    0x0,   &IID_IUnknown },
+            {    0xc,   &IID_IObjectWithSite },
+            {   0x10,   &IID_IObjectSafety },
+            {   0x14,   &IID_IShellUIHelper2 },
+            {   0x14,       &IID_IShellUIHelper },
+            {   0x14,           &IID_IDispatch },
+        }
+    },
+    {
+        ID_NAME(CLSID_ShellNameSpace),
+        {
+            {    0x0,   &IID_IShellNameSpace },
+            {    0x0,       &IID_IShellFavoritesNameSpace },
+            {    0x0,           &IID_IDispatch },
+            {    0x0,               &IID_IUnknown },
+            {    0x8,   &IID_IPersistStreamInit },
+            {   0x10,   &IID_IPersistPropertyBag },
+            {   0x1c,   &IID_IOleObject },
+            {   0x20,   &IID_IOleInPlaceActiveObject },
+            {   0x24,   &IID_IViewObjectEx },
+            {   0x24,       &IID_IViewObject2 },
+            {   0x24,           &IID_IViewObject },
+            {   0x28,   &IID_IOleInPlaceObjectWindowless },
+            {   0x28,       &IID_IOleInPlaceObject },
+            {   0x28,           &IID_IOleWindow },
+            {   0x3c,   &IID_IDropTarget },
+            {   0xb4,   &IID_IObjectWithSite },
+            {   0xbc,   &IID_INSCTree },
+            {   0xc4,   &IID_IShellBrowser },
+            {   0xc8,   &IID_IFolderFilterSite },
+            {   0xd0,   &IID_IServiceProvider },
+            {   0xd4,   &IID_INameSpaceTreeControl },
+            {   0xe4,   &IID_IWinEventHandler },
+        }
+    },
     {
         ID_NAME(CLSID_ShellWindows),
         {
@@ -35,6 +117,60 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             { FARAWY,   &IID_IDispatch },
         }
     },
+    {
+        ID_NAME(CLSID_WebBrowser),
+        {
+            {  -0x20,   &IID_IPersist },
+            {  -0x1c,   &IID_IOleObject },
+            {  -0x18,   &IID_IViewObject2 },
+            {  -0x18,       &IID_IViewObject },
+            {  -0x14,   &IID_IDataObject },
+            {  -0x10,   &IID_IOleInPlaceObject },
+            {  -0x10,       &IID_IOleWindow },
+            {   -0xc,   &IID_IOleInPlaceActiveObject },
+            {    0x0,   &IID_IUnknown },
+            {   0x98,   &IID_IPersistStream },
+            {   0x98,   &IID_IPersistStreamInit },
+            {   0x9c,   &IID_IPersistPropertyBag },
+            {  0x120,   &IID_IWebBrowser2 },
+            {  0x120,       &IID_IWebBrowserApp },
+            {  0x120,           &IID_IWebBrowser },
+            {  0x120,               &IID_IDispatch },
+            {  0x130,   &IID_IOleCommandTarget },
+            {  0x134,   &IID_IObjectSafety },
+            {  0x140,   &IID_IPersistStorage },
+            {  0x144,   &IID_IPersistHistory },
+            { FARAWY,   &IID_IShellService },
+            { FARAWY,   &IID_IServiceProvider },
+        }
+    },
+    {
+        ID_NAME(CLSID_WebBrowser_V1),
+        {
+            {  -0x20,   &IID_IPersist },
+            {  -0x1c,   &IID_IOleObject },
+            {  -0x18,   &IID_IViewObject2 },
+            {  -0x18,       &IID_IViewObject },
+            {  -0x14,   &IID_IDataObject },
+            {  -0x10,   &IID_IOleInPlaceObject },
+            {  -0x10,       &IID_IOleWindow },
+            {   -0xc,   &IID_IOleInPlaceActiveObject },
+            {    0x0,   &IID_IUnknown },
+            {   0x98,   &IID_IPersistStream },
+            {   0x98,   &IID_IPersistStreamInit },
+            {   0x9c,   &IID_IPersistPropertyBag },
+            {  0x120,   &IID_IWebBrowser2 },
+            {  0x120,       &IID_IWebBrowserApp },
+            {  0x120,           &IID_IWebBrowser },
+            {  0x120,               &IID_IDispatch },
+            {  0x130,   &IID_IOleCommandTarget },
+            {  0x134,   &IID_IObjectSafety },
+            {  0x140,   &IID_IPersistStorage },
+            {  0x144,   &IID_IPersistHistory },
+            { FARAWY,   &IID_IShellService },
+            { FARAWY,   &IID_IServiceProvider },
+        }
+    },
 };
 static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces);
 

diff --git a/rostests/apitests/com/shdocvw.c b/rostests/apitests/com/shdocvw.c
index 4ddd95a..223d6f7 100644 (file)
--- a/rostests/apitests/com/shdocvw.c
+++ b/rostests/apitests/com/shdocvw.c
@@ -88,6 +88,75 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,   &IID_IUnknown },
         }
     },
+    {
+        ID_NAME(CLSID_SearchAssistantOC),
+        {
+            {    0x0,   &IID_ISearchAssistantOC3 },
+            {    0x0,       &IID_ISearchAssistantOC },
+            {    0x0,           &IID_IDispatch },
+            {    0x0,               &IID_IUnknown },
+            {   0x10,   &IID_IOleObject },
+            {   0x14,   &IID_IOleInPlaceActiveObject },
+            {   0x18,   &IID_IViewObjectEx },
+            {   0x18,       &IID_IViewObject2 },
+            {   0x18,           &IID_IViewObject },
+            {   0x1c,   &IID_IOleInPlaceObjectWindowless },
+            {   0x1c,       &IID_IOleInPlaceObject },
+            {   0x1c,           &IID_IOleWindow },
+            {   0x20,   &IID_IDataObject },
+            {   0x34,   &IID_IObjectSafety },
+            {   0x3c,   &IID_IOleCommandTarget },
+            {   0x40,   &IID_IObjectWithSite },
+        }
+    },
+    {
+        ID_NAME(CLSID_ShellSearchAssistantOC),
+        {
+            {    0x0,   &IID_ISearchAssistantOC3 },
+            {    0x0,       &IID_ISearchAssistantOC },
+            {    0x0,           &IID_IDispatch },
+            {    0x0,               &IID_IUnknown },
+            {   0x10,   &IID_IOleObject },
+            {   0x14,   &IID_IOleInPlaceActiveObject },
+            {   0x18,   &IID_IViewObjectEx },
+            {   0x18,       &IID_IViewObject2 },
+            {   0x18,           &IID_IViewObject },
+            {   0x1c,   &IID_IOleInPlaceObjectWindowless },
+            {   0x1c,       &IID_IOleInPlaceObject },
+            {   0x1c,           &IID_IOleWindow },
+            {   0x20,   &IID_IDataObject },
+            {   0x34,   &IID_IObjectSafety },
+            {   0x3c,   &IID_IOleCommandTarget },
+            {   0x40,   &IID_IObjectWithSite },
+        }
+    },
+    {
+        ID_NAME(CLSID_ShellShellNameSpace),
+        {
+            {    0x0,   &IID_IShellNameSpace },
+            {    0x0,       &IID_IShellFavoritesNameSpace },
+            {    0x0,           &IID_IDispatch },
+            {    0x0,               &IID_IUnknown },
+            {    0x8,   &IID_IPersistStreamInit },
+            {    0xc,   &IID_IPersistPropertyBag },
+            {   0x18,   &IID_IOleObject },
+            {   0x1c,   &IID_IOleInPlaceActiveObject },
+            {   0x20,   &IID_IViewObjectEx },
+            {   0x20,       &IID_IViewObject2 },
+            {   0x20,           &IID_IViewObject },
+            {   0x24,   &IID_IOleInPlaceObjectWindowless },
+            {   0x24,       &IID_IOleInPlaceObject },
+            {   0x24,           &IID_IOleWindow },
+            {   0x3c,   &IID_IShellChangeNotify },
+            {   0x40,   &IID_IDropTarget },
+            {   0xb4,   &IID_IObjectWithSite },
+            {   0xbc,   &IID_INSCTree2 },
+            {   0xbc,       &IID_INSCTree },
+            {   0xc0,   &IID_IWinEventHandler },
+            {   0xc4,   &IID_IShellBrowser },
+            {   0xc8,   &IID_IFolderFilterSite },
+        }
+    },
     {
         ID_NAME(CLSID_TaskbarList),
         {