[COM_APITEST]

- Add more interfaces, in particular IID_IMarshal2 and DIID_DWebBrowserEvents
- Alphabetize ieframe classes

svn path=/trunk/; revision=71121

diff --git a/rostests/apitests/com/browseui.c b/rostests/apitests/com/browseui.c
index 0e3f048..a71cd8b 100644 (file)
--- a/rostests/apitests/com/browseui.c
+++ b/rostests/apitests/com/browseui.c
@@ -207,6 +207,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   -0xc,   &IID_IDockingWindow },
             {   -0x8,   &IID_IObjectWithSite },
             {   -0x4,   &IID_IExplorerToolbar },
+            {    0x0,   &DIID_DWebBrowserEvents },
             {    0x0,   &IID_IDispatch },
             {    0x0,       &IID_IUnknown },
             {    0x4,   &IID_IPersistStreamInit },

diff --git a/rostests/apitests/com/com_apitest.c b/rostests/apitests/com/com_apitest.c
index 50d7ed9..6e9ffcb 100644 (file)
--- a/rostests/apitests/com/com_apitest.c
+++ b/rostests/apitests/com/com_apitest.c
@@ -54,16 +54,23 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IAutoComplete2),              TRUE },
     { ID_NAME(IID_IAutoCompleteDropDown)             },
     { ID_NAME(IID_IBandHost)                         },
-    { ID_NAME(IID_IBandNavigate),               TRUE },
+    { ID_NAME(IID_IBandNavigate),                    },
     { ID_NAME(IID_IBandProxy),                  TRUE },
     { ID_NAME(IID_IBandSite)                         },
     { ID_NAME(IID_IBandSiteHelper),             TRUE },
     { ID_NAME(IID_IBanneredBar),                TRUE },
     { ID_NAME(IID_IBindCtx)                          },
+    { ID_NAME(IID_IBindEventHandler)                 },
+    { ID_NAME(IID_IBindHost)                         },
+    { ID_NAME(IID_IBinding)                          },
+    { ID_NAME(IID_IBindProtocol),               TRUE },
+    { ID_NAME(IID_IBindResource)                     },
+    { ID_NAME(IID_IBindStatusCallback)               },
     { ID_NAME(IID_IBrowserFrameOptions),        TRUE },
     { ID_NAME(IID_IBrowserService)                   },
     { ID_NAME(IID_IBrowserService2),            TRUE },
     { ID_NAME(IID_IBrowserService3),            TRUE },
+    { ID_NAME(IID_IBrowserService4),            TRUE },
     { ID_NAME(IID_ICDBurn)                           },
     { ID_NAME(IID_ICDBurnExt)                        },
     { ID_NAME(IID_IClassFactory)                     },
@@ -110,11 +117,13 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IEnumExtraSearch)                  },
     { ID_NAME(IID_IEnumGUID)                         },
     { ID_NAME(IID_IEnumIDList)                       },
+    { ID_NAME(IID_IEnumMoniker)                      },
     //{ ID_NAME(IID_IEnumNetCfgBindingInterface)       },
     //{ ID_NAME(IID_IEnumNetCfgBindingPath)            },
     { ID_NAME(IID_IEnumNetCfgComponent),        TRUE },
     { ID_NAME(IID_IEnumNetConnection)                },
     { ID_NAME(IID_IEnumShellItems)                   },
+    { ID_NAME(IID_IEnumSTATSTG)                       },
     { ID_NAME(IID_IEnumString)                       },
     { ID_NAME(IID_IEnumUnknown)                      },
     { ID_NAME(IID_IEnumVARIANT)                      },
@@ -145,11 +154,14 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IGlobalFolderSettings),       TRUE },
     { ID_NAME(IID_IHWEventHandler)                   },
     { ID_NAME(IID_IHWEventHandler2)                  },
+    { ID_NAME(IID_IImageList),                  TRUE },
+    { ID_NAME(IID_IImageList2),                 TRUE },
     { ID_NAME(IID_IInitializeObject),           TRUE },
     { ID_NAME(IID_IInputObject)                      },
     { ID_NAME(IID_IInputObjectSite)                  },
     { ID_NAME(IID_IInternalUnknown),            TRUE },
     { ID_NAME(IID_IMarshal)                          },
+    { ID_NAME(IID_IMarshal2),                   TRUE },
     { ID_NAME(IID_IMenuBand),                   TRUE },
     { ID_NAME(IID_IMenuPopup),                  TRUE },
     { ID_NAME(IID_IModalWindow)                      },
@@ -158,9 +170,9 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IMultiQI),                    TRUE },
     { ID_NAME(IID_INamespaceProxy),             TRUE },
     { ID_NAME(IID_INameSpaceTreeControl),       TRUE },
-    { ID_NAME(IID_INamespaceWalk),              FALSE },
-    { ID_NAME(IID_INamespaceWalkCB),            FALSE },
-    { ID_NAME(IID_INamespaceWalkCB2),           FALSE },
+    { ID_NAME(IID_INamespaceWalk)                    },
+    { ID_NAME(IID_INamespaceWalkCB)                  },
+    { ID_NAME(IID_INamespaceWalkCB2)                 },
     { ID_NAME(IID_INetCfg),                     TRUE },
     //{ ID_NAME(IID_INetCfgBindingInterface)           },
     //{ ID_NAME(IID_INetCfgBindingPath)                },
@@ -177,6 +189,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_INetLanConnectionUiInfo),     TRUE },
     { ID_NAME(IID_INewShortcutHookA),           TRUE },
     { ID_NAME(IID_INewShortcutHookW),           TRUE },
+    { ID_NAME(IID_INewWindowManager)                 },
     { ID_NAME(IID_INSCTree),                    TRUE },
     { ID_NAME(IID_INSCTree2),                   TRUE },
     { ID_NAME(IID_IObjMgr),                     TRUE },
@@ -220,6 +233,12 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IRemoteComputer)                   },
     { ID_NAME(IID_IResolveShellLink)                 },
     { ID_NAME(IID_IRunnableObject)                   },
+    { ID_NAME(IID_IScriptErrorList)                  },
+    { ID_NAME(IID_ISearch)                           },
+    { ID_NAME(IID_ISearchAssistantOC)                },
+    { ID_NAME(IID_ISearchAssistantOC2)               },
+    { ID_NAME(IID_ISearchAssistantOC3)               },
+    { ID_NAME(IID_ISearches)                         },
     { ID_NAME(IID_IServerSecurity),             TRUE },
     { ID_NAME(IID_IServiceProvider)                  },
     { ID_NAME(IID_IShellApp),                   TRUE },
@@ -235,9 +254,11 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IShellDispatch3)                   },
     { ID_NAME(IID_IShellDispatch4)                   },
     { ID_NAME(IID_IShellDispatch5),             TRUE },
+    { ID_NAME(IID_IShellDispatch6),             TRUE },
     { ID_NAME(IID_IShellExecuteHookA),          TRUE },
     { ID_NAME(IID_IShellExecuteHookW),          TRUE },
     { ID_NAME(IID_IShellExtInit),               TRUE },
+    { ID_NAME(IID_IShellFavoritesNameSpace)          },
     { ID_NAME(IID_IShellFolder)                      },
     { ID_NAME(IID_IShellFolder2)                     },
     { ID_NAME(IID_IShellFolderBand),            TRUE },
@@ -247,6 +268,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IShellFolderViewCB),          TRUE },
     { ID_NAME(IID_IShellFolderViewDual)              },
     { ID_NAME(IID_IShellFolderViewDual2)             },
+    { ID_NAME(IID_IShellFolderViewDual3),       TRUE },
     { ID_NAME(IID_IShellFolderViewType),        TRUE },
     { ID_NAME(IID_IShellIcon)                        },
     { ID_NAME(IID_IShellIconOverlay),           TRUE },
@@ -271,6 +293,8 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IShellPropSheetExt),          TRUE },
     { ID_NAME(IID_IShellService),               TRUE },
     { ID_NAME(IID_IShellTaskScheduler),         TRUE },
+    { ID_NAME(IID_IShellUIHelper)                    },
+    { ID_NAME(IID_IShellUIHelper2),             TRUE },
     { ID_NAME(IID_IShellView)                        },
     { ID_NAME(IID_IShellView2)                       },
     { ID_NAME(IID_IShellView3)                       },
@@ -294,10 +318,19 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IViewObject)                       },
     { ID_NAME(IID_IViewObject2)                      },
     { ID_NAME(IID_IViewObjectEx),               TRUE },
+    { ID_NAME(IID_IWebBrowser)                       },
+    { ID_NAME(IID_IWebBrowser2)                      },
+    { ID_NAME(IID_IWebBrowserApp)                    },
     { ID_NAME(IID_IWinEventHandler),            TRUE },
 
     { ID_NAME(IID_DFConstraint),                TRUE },
+    { ID_NAME(DIID__SearchAssistantEvents)           },
     { ID_NAME(DIID_DShellFolderViewEvents)           },
+    { ID_NAME(DIID_DShellNameSpaceEvents)            },
+    { ID_NAME(DIID_DShellWindowsEvents)              },
+    { ID_NAME(DIID_DWebBrowserEvents)                },
+    { ID_NAME(DIID_DWebBrowserEvents2)               },
+    { ID_NAME(DIID_XMLDOMDocumentEvents )            },
 
     { ID_NAME(IID_CDefView),                    TRUE },
     { ID_NAME(IID_Folder)                            },

diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h
index c17a318..9773391 100644 (file)
--- a/rostests/apitests/com/com_apitest.h
+++ b/rostests/apitests/com/com_apitest.h
@@ -21,6 +21,7 @@
 #include <objbase.h>
 #include <objsafe.h>
 #include <oleacc.h>
+#include <oledb.h>
 #include <oaidl.h>
 #include <netcon.h>
 #include <netcfgx.h>
@@ -35,6 +36,8 @@
 #include <shlobj_undoc.h>
 #include <shlguid_undoc.h>
 #include <shlwapi.h>
+#include <commoncontrols.h>
+#include <activscp.h>
 #include <ndk/rtlfuncs.h>
 #include <initguid.h>
 

diff --git a/rostests/apitests/com/ieframe.c b/rostests/apitests/com/ieframe.c
index 864a8e3..9247fdc 100644 (file)
--- a/rostests/apitests/com/ieframe.c
+++ b/rostests/apitests/com/ieframe.c
@@ -12,10 +12,19 @@
 
 static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
 {
+    {
+        ID_NAME(CLSID_CURLSearchHook),
+        {
+            {    0x0,   &IID_IURLSearchHook2 },
+            {    0x0,       &IID_IURLSearchHook },
+            {    0x0,           &IID_IUnknown },
+        }
+    },
     {
         ID_NAME(CLSID_ShellWindows),
         {
-            {  -0xa0,   &IID_IMarshal },
+            {  -0xa0,   &IID_IMarshal2 },
+            {  -0xa0,       &IID_IMarshal },
             {  -0x20,   &IID_IClientSecurity },
             {    0x0,   &IID_IMultiQI },
             {    0x0,       &IID_IUnknown },
@@ -23,14 +32,6 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             { FARAWY,   &IID_IDispatch },
         }
     },
-    {
-        ID_NAME(CLSID_CURLSearchHook),
-        {
-            {    0x0,   &IID_IURLSearchHook2 },
-            {    0x0,       &IID_IURLSearchHook },
-            {    0x0,           &IID_IUnknown },
-        }
-    },
 };
 static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces);