[COM_APITEST]

- Test INamespaceWalk, INamespaceWalkCB and INamespaceWalkCB2
CORE-11093

svn path=/trunk/; revision=71120

diff --git a/rostests/apitests/com/com_apitest.c b/rostests/apitests/com/com_apitest.c
index 00e4e6c..50d7ed9 100644 (file)
--- a/rostests/apitests/com/com_apitest.c
+++ b/rostests/apitests/com/com_apitest.c
@@ -158,6 +158,9 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     { ID_NAME(IID_IMultiQI),                    TRUE },
     { ID_NAME(IID_INamespaceProxy),             TRUE },
     { ID_NAME(IID_INameSpaceTreeControl),       TRUE },
     { 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_INetCfg),                     TRUE },
     //{ ID_NAME(IID_INetCfgBindingInterface)           },
     //{ ID_NAME(IID_INetCfgBindingPath)                },
     { ID_NAME(IID_INetCfg),                     TRUE },
     //{ ID_NAME(IID_INetCfgBindingInterface)           },
     //{ ID_NAME(IID_INetCfgBindingPath)                },

diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h
index defd3e1..c17a318 100644 (file)
--- a/rostests/apitests/com/com_apitest.h
+++ b/rostests/apitests/com/com_apitest.h
@@ -131,6 +131,9 @@ DEFINE_GUID(IID_IGetNameSpaceExtensionPointer,0x287d4a71, 0x439f, 0x43a4, 0x8d,
 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_IMultiMonitorDockingSite,  0x03879de0, 0xa205, 0x11d0, 0x99, 0xcb, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1);
 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_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_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);
 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/shell32.c b/rostests/apitests/com/shell32.c
index 8cc9ce4..21a5f47 100644 (file)
--- a/rostests/apitests/com/shell32.c
+++ b/rostests/apitests/com/shell32.c
@@ -25,6 +25,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x20,   &IID_IOleCommandTarget },
             {   0x24,   &IID_ICDBurn },
             {   0x2c,   &IID_IPersistPropertyBag },
             {   0x20,   &IID_IOleCommandTarget },
             {   0x24,   &IID_ICDBurn },
             {   0x2c,   &IID_IPersistPropertyBag },

+            {   0x34,   &IID_INamespaceWalkCB },

             {   0x3c,   &IID_IServiceProvider },
         }
     },
             {   0x3c,   &IID_IServiceProvider },
         }
     },