[COM_APITEST]

- Add some more interfaces

svn path=/trunk/; revision=71126

diff --git a/rostests/apitests/com/com_apitest.c b/rostests/apitests/com/com_apitest.c
index 6444834..0735f91 100644 (file)
--- a/rostests/apitests/com/com_apitest.c
+++ b/rostests/apitests/com/com_apitest.c
@@ -81,8 +81,10 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_ICommDlgBrowser)                   },
     { ID_NAME(IID_ICommDlgBrowser2)                  },
     { ID_NAME(IID_ICommDlgBrowser3)                  },
+    { ID_NAME(IID_ICompositeFolder)                  },
     { ID_NAME(IID_IComputerInfoChangeNotify),        },
     { ID_NAME(IID_IComThreadingInfo),           TRUE },
+    { ID_NAME(IID_IConnectionPointContainer)         },
     { ID_NAME(IID_IContext),                    TRUE },
     { ID_NAME(IID_IContextMenu),                TRUE },
     { ID_NAME(IID_IContextMenu2),               TRUE },
@@ -92,6 +94,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IContinue)                         },
     { ID_NAME(IID_ICopyHookA),                  TRUE },
     { ID_NAME(IID_ICopyHookW),                  TRUE },
+    { ID_NAME(IID_ICustomizeInfoTip)                 },
     { ID_NAME(IID_IDVGetEnum),                  TRUE },
     { ID_NAME(IID_IDataObject)                       },
     //{ ID_NAME(IID_IDefViewID)                        }, == DefViewFrame3
@@ -107,6 +110,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IDeskBarClient),              TRUE },
     { ID_NAME(IID_IDeskMovr),                   TRUE },
     { ID_NAME(IID_IDispatch)                         },
+    { ID_NAME(IID_IDispatchEx)                       },
     { ID_NAME(IID_IDockingWindow)                    },
     { ID_NAME(IID_IDockingWindowFrame),         TRUE },
     { ID_NAME(IID_IDockingWindowSite),          TRUE },
@@ -143,6 +147,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IFileViewerA),                TRUE },
     { ID_NAME(IID_IFileViewerSite),             TRUE },
     { ID_NAME(IID_IFileViewerW),                TRUE },
+    { ID_NAME(IID_IFilter)                           },
     { ID_NAME(IID_IFolderBandPriv)                   },
     { ID_NAME(IID_IFolderFilter)                     },
     { ID_NAME(IID_IFolderFilterSite)                 },
@@ -162,6 +167,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IInputObject)                      },
     { ID_NAME(IID_IInputObjectSite)                  },
     { ID_NAME(IID_IInternalUnknown),            TRUE },
+    { ID_NAME(IID_IItemNameLimits)                   },
     { ID_NAME(IID_IMarshal)                          },
     { ID_NAME(IID_IMarshal2),                   TRUE },
     { ID_NAME(IID_IMenuBand),                   TRUE },
@@ -196,8 +202,12 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_INSCTree2),                   TRUE },
     { ID_NAME(IID_IObjMgr),                     TRUE },
     { ID_NAME(IID_IObjectSafety)                     },
+    { ID_NAME(IID_IObjectWithBackReferences)         },
     { ID_NAME(IID_IObjectWithSite)                   },
+    { ID_NAME(IID_IOleClientSite)                    },
     { ID_NAME(IID_IOleCommandTarget)                 },
+    { ID_NAME(IID_IOleControl)                       },
+    { ID_NAME(IID_IOleControlSite)                   },
     { ID_NAME(IID_IOleInPlaceActiveObject)           },
     { ID_NAME(IID_IOleInPlaceFrame)                  },
     { ID_NAME(IID_IOleInPlaceObject)                 },
@@ -208,6 +218,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IOleInPlaceUIWindow)               },
     { ID_NAME(IID_IOleObject)                        },
     { ID_NAME(IID_IOleWindow)                        },
+    { ID_NAME(IID_IParentAndItem)                    },
     { ID_NAME(IID_IPersist)                          },
     { ID_NAME(IID_IPersistFile)                      },
     { ID_NAME(IID_IPersistFolder)                    },
@@ -228,9 +239,14 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IProgressDialog),             TRUE },
     { ID_NAME(IID_IPropertyBag)                      },
     { ID_NAME(IID_IPropertyBag2)                     },
+    { ID_NAME(IID_IPropertySetStorage)               },
+    { ID_NAME(IID_IPropertyStore)                    },
     { ID_NAME(IID_IPropSheetPage),              TRUE },
+    { ID_NAME(IID_IProvideClassInfo)                 },
+    { ID_NAME(IID_IProvideClassInfo2)                },
     { ID_NAME(IID_IQueryAssociations),          TRUE },
     { ID_NAME(IID_IQueryInfo),                  TRUE },
+    { ID_NAME(IID_IQuickActivate)                    },
     { ID_NAME(IID_IRegTreeOptions),             TRUE },
     { ID_NAME(IID_IRemoteComputer)                   },
     { ID_NAME(IID_IResolveShellLink)                 },
@@ -302,6 +318,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IShellView2)                       },
     { ID_NAME(IID_IShellView3)                       },
     { ID_NAME(IID_IShellWindows)                     },
+    { ID_NAME(IID_ISpecifyPropertyPages)             },
     { ID_NAME(IID_IStorage)                          },
     { ID_NAME(IID_IStream)                           },
     { ID_NAME(IID_ISurrogate)                        },

diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h
index 9773391..5fd27e0 100644 (file)
--- a/rostests/apitests/com/com_apitest.h
+++ b/rostests/apitests/com/com_apitest.h
@@ -23,6 +23,7 @@
 #include <oleacc.h>
 #include <oledb.h>
 #include <oaidl.h>
+#include <dispex.h>
 #include <netcon.h>
 #include <netcfgx.h>
 #include <netcfgn.h>
@@ -107,11 +108,13 @@ DEFINE_GUID(IID_IAugmentedShellFolder2,    0x8db3b3f4, 0x6cfe, 0x11d1, 0x8a, 0xe
 DEFINE_GUID(IID_IBandHost,                 0xb9075c7c, 0xd48e, 0x403f, 0xab, 0x99, 0xd6, 0xc7, 0x7a, 0x10, 0x84, 0xac);
 DEFINE_GUID(IID_IBrowserFrameOptions,      0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00, 0x60, 0x97, 0xdf, 0x5b, 0xd4);
 DEFINE_GUID(IID_IComputerInfoChangeNotify, 0x0df60d92, 0x6818, 0x46d6, 0xb3, 0x58, 0xd6, 0x61, 0x70, 0xdd, 0xe4, 0x66);
+DEFINE_GUID(IID_ICustomizeInfoTip,         0xda22171f, 0x70b4, 0x43db, 0xb3, 0x8f, 0x29, 0x67, 0x41, 0xd1, 0x49, 0x4c);
 DEFINE_OLEGUID(IID_IContext,               0x000001c0, 0x0000, 0x0000);
 DEFINE_OLEGUID(IID_ICopyHookA,             0x000214ef, 0x0000, 0x0000);
 DEFINE_OLEGUID(IID_ICopyHookW,             0x000214fc, 0x0000, 0x0000);
 DEFINE_GUID(IID_ICDBurn,                   0x3d73a659, 0xe5d0, 0x4d42, 0xaf, 0xc0, 0x51, 0x21, 0xba, 0x42, 0x5c, 0x8d);
 DEFINE_GUID(IID_ICDBurnExt,                0x2271dcca, 0x74fc, 0x4414, 0x8f, 0xb7, 0xc5, 0x6b, 0x05, 0xac, 0xe2, 0xd7);
+DEFINE_GUID(IID_ICompositeFolder,          0x601ac3dd, 0x786a, 0x4eb0, 0xbf, 0x40, 0xee, 0x35, 0x21, 0xe7, 0x0b, 0xfb);
 DEFINE_GUID(IID_IDVGetEnum,                0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73, 0x43, 0xcb, 0x0a, 0x34, 0x8c);
 DEFINE_GUID(IID_IDefViewID,                0x985f64f0, 0xd410, 0x4e02, 0xbe, 0x22, 0xda, 0x07, 0xf2, 0xb5, 0xc5, 0xe1);
 DEFINE_GUID(IID_IDefViewFrame,             0x710EB7A0, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D);
@@ -125,6 +128,7 @@ DEFINE_GUID(IID_IDocViewSite,              0x87D605E0, 0xC511, 0x11CF, 0x89, 0xA
 DEFINE_GUID(IID_IExtractImage,             0xbb2e617c, 0x0920, 0x11d1, 0x9a, 0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1);
 DEFINE_GUID(IID_IExtractImage2,            0x953bb1ee, 0x93b4, 0x11d1, 0x98, 0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda);
 DEFINE_GUID(IID_IFileSearchBand,           0x2d91eea1, 0x9932, 0x11d2, 0xbe, 0x86, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1);
+DEFINE_GUID(IID_IFilter,                   0x89bcb740, 0x6119, 0x101a, 0xbc, 0xb7, 0x00, 0xdd, 0x01, 0x06, 0x55, 0xaf);
 DEFINE_GUID(IID_IFolderBandPriv,           0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea);
 DEFINE_GUID(IID_IFolderFilter,             0x9cc22886, 0xdc8e, 0x11d2, 0xb1, 0xd0, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e);
 DEFINE_GUID(IID_IFolderFilterSite,         0xc0a651f5, 0xb48b, 0x11d2, 0xb5, 0xed, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6);
@@ -133,10 +137,13 @@ DEFINE_GUID(IID_IFolderViewSettings,       0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x7
 DEFINE_GUID(IID_IGetNameSpaceExtensionPointer,0x287d4a71, 0x439f, 0x43a4, 0x8d, 0x5b, 0x0e, 0x0a, 0xe7, 0x1e, 0x84, 0xa9);
 DEFINE_GUID(IID_IHWEventHandler,           0xc1fb73d0, 0xec3a, 0x4ba2, 0xb5, 0x12, 0x8c, 0xdb, 0x91, 0x87, 0xb6, 0xd1);
 DEFINE_GUID(IID_IHWEventHandler2,          0xcfcc809f, 0x295d, 0x42e8, 0x9f, 0xfc, 0x42, 0x4b, 0x33, 0xc4, 0x87, 0xe6);
+DEFINE_GUID(IID_IItemNameLimits,           0x1df0d7f1, 0xb267, 0x4d28, 0x8b, 0x10, 0x12, 0xe2, 0x32, 0x02, 0xa5, 0xc4);
 DEFINE_GUID(IID_IMultiMonitorDockingSite,  0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1);
 DEFINE_GUID(IID_INamespaceWalk,            0x57ced8a7, 0x3f4a, 0x432c, 0x93, 0x50, 0x30, 0xf2, 0x44, 0x83, 0xf7, 0x4f);
 DEFINE_GUID(IID_INamespaceWalkCB,          0xd92995f8, 0xcf5e, 0x4a76, 0xbf, 0x59, 0xea, 0xd3, 0x9e, 0xa2, 0xb9, 0x7e);
 DEFINE_GUID(IID_INamespaceWalkCB2,         0x7ac7492b, 0xc38e, 0x438a, 0x87, 0xdb, 0x68, 0x73, 0x78, 0x44, 0xff, 0x70);
+DEFINE_GUID(IID_IObjectWithBackReferences, 0x321a6a6a, 0xd61f, 0x4bf3, 0x97, 0xae, 0x14, 0xbe, 0x29, 0x86, 0xbb, 0x36);
+DEFINE_GUID(IID_IParentAndItem,            0xB3A4B685, 0xB685, 0x4805, 0x99, 0xD9, 0x5D, 0xEA, 0xD2, 0x87, 0x32, 0x36);
 DEFINE_GUID(IID_IPersistFreeThreadedObject,0xc7264bf0, 0xedb6, 0x11d1, 0x85, 0x46, 0x00, 0x60, 0x08, 0x05, 0x93, 0x68);
 DEFINE_GUID(IID_IPreviewHandler,           0x8895b1c6, 0xb41f, 0x4c1c, 0xa5, 0x62, 0x0d, 0x56, 0x42, 0x50, 0x83, 0x6f);
 DEFINE_GUID(IID_IPreviewHandlerFrame,      0xfec87aaf, 0x35f9, 0x447a, 0xad, 0xb7, 0x20, 0x23, 0x44, 0x91, 0x40, 0x1a);

diff --git a/rostests/apitests/com/ieframe.c b/rostests/apitests/com/ieframe.c
index e043ffc..e52a504 100644 (file)
--- a/rostests/apitests/com/ieframe.c
+++ b/rostests/apitests/com/ieframe.c
@@ -15,6 +15,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
     {
         ID_NAME(CLSID_Internet),
         {
+            {  -0x18,   &IID_IObjectWithBackReferences },
             {  -0x14,   &IID_IShellFolder2 },
             {  -0x14,       &IID_IShellFolder },
             {  -0x10,   &IID_IPersistFolder2 },
@@ -56,12 +57,14 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x10,   &IID_IShellLinkA },
             {   0x14,   &IID_IShellLinkW },
             {   0x18,   &IID_IShellPropSheetExt },
+            {   0x1c,   &IID_IPropertySetStorage },
             {   0x20,   &IID_INewShortcutHookA },
             {   0x24,   &IID_INewShortcutHookW },
             {   0x30,   &IID_IQueryInfo },
             {   0x38,   &IID_IObjectWithSite },
             {   0x44,   &IID_IOleCommandTarget },
             {   0x48,   &IID_IServiceProvider },
+            {   0x4c,   &IID_IPropertyStore },
         }
     },
     {
@@ -73,6 +76,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x14,   &IID_IShellUIHelper2 },
             {   0x14,       &IID_IShellUIHelper },
             {   0x14,           &IID_IDispatch },
+            {   0x18,   &IID_IDispatchEx },
         }
     },
     {
@@ -82,8 +86,12 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,       &IID_IShellFavoritesNameSpace },
             {    0x0,           &IID_IDispatch },
             {    0x0,               &IID_IUnknown },
+            {    0x4,   &IID_IProvideClassInfo2 },
+            {    0x4,       &IID_IProvideClassInfo },
             {    0x8,   &IID_IPersistStreamInit },
             {   0x10,   &IID_IPersistPropertyBag },
+            {   0x14,   &IID_IQuickActivate },
+            {   0x18,   &IID_IOleControl },
             {   0x1c,   &IID_IOleObject },
             {   0x20,   &IID_IOleInPlaceActiveObject },
             {   0x24,   &IID_IViewObjectEx },
@@ -92,6 +100,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x28,   &IID_IOleInPlaceObjectWindowless },
             {   0x28,       &IID_IOleInPlaceObject },
             {   0x28,           &IID_IOleWindow },
+            {   0x38,   &IID_IConnectionPointContainer },
             {   0x3c,   &IID_IDropTarget },
             {   0xb4,   &IID_IObjectWithSite },
             {   0xbc,   &IID_INSCTree },
@@ -115,6 +124,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,       &IID_IUnknown },
             { FARAWY,   &IID_IShellWindows },
             { FARAWY,   &IID_IDispatch },
+            { FARAWY,   &IID_IConnectionPointContainer },
         }
     },
     {
@@ -132,6 +142,10 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x98,   &IID_IPersistStream },
             {   0x98,   &IID_IPersistStreamInit },
             {   0x9c,   &IID_IPersistPropertyBag },
+            {   0xa0,   &IID_IOleControl },
+            {   0xa8,   &IID_IProvideClassInfo2 },
+            {   0xa8,       &IID_IProvideClassInfo },
+            {   0xac,   &IID_IConnectionPointContainer },
             {  0x120,   &IID_IWebBrowser2 },
             {  0x120,       &IID_IWebBrowserApp },
             {  0x120,           &IID_IWebBrowser },
@@ -159,6 +173,10 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x98,   &IID_IPersistStream },
             {   0x98,   &IID_IPersistStreamInit },
             {   0x9c,   &IID_IPersistPropertyBag },
+            {   0xa0,   &IID_IOleControl },
+            {   0xa8,   &IID_IProvideClassInfo2 },
+            {   0xa8,       &IID_IProvideClassInfo },
+            {   0xac,   &IID_IConnectionPointContainer },
             {  0x120,   &IID_IWebBrowser2 },
             {  0x120,       &IID_IWebBrowserApp },
             {  0x120,           &IID_IWebBrowser },

diff --git a/rostests/apitests/com/shdocvw.c b/rostests/apitests/com/shdocvw.c
index 223d6f7..0580650 100644 (file)
--- a/rostests/apitests/com/shdocvw.c
+++ b/rostests/apitests/com/shdocvw.c
@@ -95,6 +95,10 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,       &IID_ISearchAssistantOC },
             {    0x0,           &IID_IDispatch },
             {    0x0,               &IID_IUnknown },
+            {    0x4,   &IID_IProvideClassInfo2 },
+            {    0x4,       &IID_IProvideClassInfo },
+            {    0x8,   &IID_IQuickActivate },
+            {    0xc,   &IID_IOleControl },
             {   0x10,   &IID_IOleObject },
             {   0x14,   &IID_IOleInPlaceActiveObject },
             {   0x18,   &IID_IViewObjectEx },
@@ -104,6 +108,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x1c,       &IID_IOleInPlaceObject },
             {   0x1c,           &IID_IOleWindow },
             {   0x20,   &IID_IDataObject },
+            {   0x30,   &IID_IConnectionPointContainer },
             {   0x34,   &IID_IObjectSafety },
             {   0x3c,   &IID_IOleCommandTarget },
             {   0x40,   &IID_IObjectWithSite },
@@ -116,6 +121,10 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,       &IID_ISearchAssistantOC },
             {    0x0,           &IID_IDispatch },
             {    0x0,               &IID_IUnknown },
+            {    0x4,   &IID_IProvideClassInfo2 },
+            {    0x4,       &IID_IProvideClassInfo },
+            {    0x8,   &IID_IQuickActivate },
+            {    0xc,   &IID_IOleControl },
             {   0x10,   &IID_IOleObject },
             {   0x14,   &IID_IOleInPlaceActiveObject },
             {   0x18,   &IID_IViewObjectEx },
@@ -125,6 +134,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x1c,       &IID_IOleInPlaceObject },
             {   0x1c,           &IID_IOleWindow },
             {   0x20,   &IID_IDataObject },
+            {   0x30,   &IID_IConnectionPointContainer },
             {   0x34,   &IID_IObjectSafety },
             {   0x3c,   &IID_IOleCommandTarget },
             {   0x40,   &IID_IObjectWithSite },
@@ -137,8 +147,12 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,       &IID_IShellFavoritesNameSpace },
             {    0x0,           &IID_IDispatch },
             {    0x0,               &IID_IUnknown },
+            {    0x4,   &IID_IProvideClassInfo2 },
+            {    0x4,       &IID_IProvideClassInfo },
             {    0x8,   &IID_IPersistStreamInit },
             {    0xc,   &IID_IPersistPropertyBag },
+            {   0x10,   &IID_IQuickActivate },
+            {   0x14,   &IID_IOleControl },
             {   0x18,   &IID_IOleObject },
             {   0x1c,   &IID_IOleInPlaceActiveObject },
             {   0x20,   &IID_IViewObjectEx },
@@ -147,6 +161,8 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x24,   &IID_IOleInPlaceObjectWindowless },
             {   0x24,       &IID_IOleInPlaceObject },
             {   0x24,           &IID_IOleWindow },
+            {   0x28,   &IID_ISpecifyPropertyPages },
+            {   0x38,   &IID_IConnectionPointContainer },
             {   0x3c,   &IID_IShellChangeNotify },
             {   0x40,   &IID_IDropTarget },
             {   0xb4,   &IID_IObjectWithSite },

diff --git a/rostests/apitests/com/shell32.c b/rostests/apitests/com/shell32.c
index 21a5f47..22486bb 100644 (file)
--- a/rostests/apitests/com/shell32.c
+++ b/rostests/apitests/com/shell32.c
@@ -60,6 +60,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x70,   &IID_IDeskMovr },
             {   0x74,   &IID_IOleObject },
             {   0x78,   &IID_IPersistPropertyBag },
+            {   0x7c,   &IID_IOleControl },
             {   0x80,   &IID_IOleInPlaceActiveObject },
             {   0x84,   &IID_IViewObjectEx },
             {   0x84,       &IID_IViewObject2 },
@@ -67,6 +68,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x88,   &IID_IOleWindow },
             {   0x88,       &IID_IOleInPlaceObject },
             {   0x88,           &IID_IOleInPlaceObjectWindowless },
+            {   0x8c,   &IID_IQuickActivate },
         }
     },
     {
@@ -96,7 +98,9 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0xc,       &IID_IDockingWindow },
             {    0xc,           &IID_IOleWindow },
             {   0x10,   &IID_IInputObject },
+            {   0x14,   &IID_IOleClientSite },
             {   0x18,   &IID_IOleInPlaceSite },
+            {   0x1c,   &IID_IOleControlSite },
         }
     },
     {
@@ -111,6 +115,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x4,       &IID_IPersistFolder },
             {    0x4,           &IID_IPersist },
             {    0x8,   &IID_IObjectSafety },
+            {   0x10,   &IID_IParentAndItem },
         }
     },
     {
@@ -254,6 +259,8 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0xc,           &IID_IPersist },
             {   0x10,   &IID_IPersistPropertyBag },
             {   0x14,   &IID_IShellIconOverlay },
+            {   0x18,   &IID_ICompositeFolder },
+            {   0x1c,   &IID_IItemNameLimits },
         }
     },
     {
@@ -296,6 +303,8 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             { FARAWY,   &IID_IStorage },
             { FARAWY,   &IID_IContextMenuCB },
             { FARAWY,   &IID_IOleCommandTarget },
+            { FARAWY,   &IID_IItemNameLimits },
+            { FARAWY,   &IID_IPropertySetStorage },
         }
     },
     {
@@ -438,6 +447,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0xc,   &IID_IShellIcon },
             {   0x14,   &IID_IContextMenuCB },
             {   0x18,   &IID_ITranslateShellChangeNotify },
+            {   0x1c,   &IID_IItemNameLimits },
             {   0x20,   &IID_IOleCommandTarget },
             { FARAWY,   &IID_IShellIconOverlay },
             { FARAWY,   &IID_IShellFolder2 },
@@ -458,6 +468,8 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x18,               &IID_IPersist },
             {   0x18,               &IID_IPersistFreeThreadedObject },
             {   0x1c,   &IID_IStorage },
+            {   0x24,   &IID_IPropertySetStorage },
+            {   0x28,   &IID_IItemNameLimits },
             {   0x2c,   &IID_IContextMenuCB },
             {   0x34,   &IID_IOleCommandTarget },
         }
@@ -482,6 +494,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x8,   &IID_IServiceProvider },
             {    0xc,   &IID_IObjectSafety },
             {   0x14,   &IID_IObjectWithSite },
+            {   0x1c,   &IID_IConnectionPointContainer },
         }
     },
     {
@@ -490,9 +503,13 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,   &IID_IFolderViewOC },
             {    0x0,       &IID_IDispatch },
             {    0x0,           &IID_IUnknown },
+            {    0x4,   &IID_IProvideClassInfo2 },
+            {    0x4,       &IID_IProvideClassInfo },
             {    0x8,   &IID_IObjectSafety },
+            {   0x10,   &IID_IConnectionPointContainer },
             {   0x88,   &IID_IPersistStreamInit },
             {   0x88,       &IID_IPersist },
+            {   0x8c,   &IID_IOleControl },
             {   0x90,   &IID_IOleObject },
             {   0x94,   &IID_IOleInPlaceActiveObject },
             {   0x98,   &IID_IOleInPlaceObjectWindowless },
@@ -506,6 +523,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {    0x0,   &IID_IShellItem },
             {    0x0,       &IID_IUnknown },
             {    0x4,   &IID_IPersistIDList },
+            {    0x8,   &IID_IParentAndItem },
         }
     },
     {
@@ -529,7 +547,9 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x2c,       &IID_IExtractImage },
             {   0x30,   &IID_IPersistPropertyBag },
             {   0x34,   &IID_IServiceProvider },
+            {   0x38,   &IID_IFilter },
             {   0x3c,   &IID_IObjectWithSite },
+            {   0x44,   &IID_ICustomizeInfoTip },
         }
     },
 #if 0 // Apparently we can only get this through Folder.Items().GetLink