[shell32_apitest]

- CLSID_ShellFSFolder should also export IID_IStorage

svn path=/trunk/; revision=60866

diff --git a/rostests/apitests/com/com_apitest.c b/rostests/apitests/com/com_apitest.c
index bedf299..10467de 100644 (file)
--- a/rostests/apitests/com/com_apitest.c
+++ b/rostests/apitests/com/com_apitest.c
@@ -160,6 +160,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     ID_NAME(IID_IRunnableObject),
     ID_NAME(IID_IServerSecurity),
     ID_NAME(IID_IServiceProvider),
+    ID_NAME(IID_ISFHelper),
     ID_NAME(IID_IShellBrowser),
     ID_NAME(IID_IShellBrowserService),
     ID_NAME(IID_IShellChangeNotify),
@@ -198,6 +199,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
     ID_NAME(IID_IShellView2),
     ID_NAME(IID_IShellView3),
     ID_NAME(IID_IShellWindows),
+    ID_NAME(IID_IStorage),
     ID_NAME(IID_IStream),
     ID_NAME(IID_ISurrogate),
     ID_NAME(IID_ISynchronize),

diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h
index c111033..47bf156 100644 (file)
--- a/rostests/apitests/com/com_apitest.h
+++ b/rostests/apitests/com/com_apitest.h
@@ -128,3 +128,5 @@ DEFINE_GUID(IID_DFConstraint,              0x403df050, 0x23bd, 0x11d2, 0x93, 0x9
 DEFINE_GUID(IID_CDefView,                  0x4434ff80, 0xef4c, 0x11ce, 0xae, 0x65, 0x08, 0x00, 0x2b, 0xe2, 0x12, 0x62);
 DEFINE_GUID(IID_FolderItems2,              0xc94f0ad0, 0xf363, 0x11d2, 0xa3, 0x27, 0x00, 0xc0, 0x4f, 0x8e, 0xec, 0x7f);
 DEFINE_GUID(IID_FolderItems3,              0xeaa7c309, 0xbbec, 0x49d5, 0x82, 0x1d, 0x64, 0xd9, 0x66, 0xcb, 0x66, 0x7f);
+
+DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);

diff --git a/rostests/apitests/com/shell32.c b/rostests/apitests/com/shell32.c
index ec987ac..0f0ea29 100644 (file)
--- a/rostests/apitests/com/shell32.c
+++ b/rostests/apitests/com/shell32.c
@@ -304,6 +304,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   -0x8,   &CLSID_ShellDesktop },
             {   -0x8,       &IID_IObjectWithSite },
             {    0x0,   &IID_IUnknown },
+            {    0x4,   &IID_IStorage },
             {    0x8,   &IID_IPersistFolder2 },
             {    0x8,       &IID_IPersistFolder },
             {    0x8,           &IID_IPersist },
@@ -325,6 +326,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
             {   0x18,       &IID_IPersistFolder2 },
             {   0x18,           &IID_IPersistFolder },
             {   0x18,               &IID_IPersist },
+            {   0x1c,   &IID_IStorage },
             {   0x2c,   &IID_IContextMenuCB },
             {   0x34,   &IID_IOleCommandTarget },
         }