21 Mar
2014
21 Mar
'14
11:23 a.m.
Author: tfaber
Date: Fri Mar 21 11:23:47 2014
New Revision: 62540
URL: http://svn.reactos.org/svn/reactos?rev=62540&view=rev
Log:
[COM_APITEST]
- Add MergedFolder and AugmentedShellFolder classes/interfaces
Modified:
trunk/rostests/apitests/com/browseui.c
trunk/rostests/apitests/com/com_apitest.c
trunk/rostests/apitests/com/com_apitest.h
trunk/rostests/apitests/com/shell32.c
Modified: trunk/rostests/apitests/com/browseui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/browseui.c?r…
==============================================================================
--- trunk/rostests/apitests/com/browseui.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/browseui.c [iso-8859-1] Fri Mar 21 11:23:47 2014
@@ -32,6 +32,28 @@
{ 0x10, &IID_IOleCommandTarget },
{ 0x14, &IID_IPersistStream },
{ 0x18, &IID_IShellService },
+ }
+ },
+ {
+ ID_NAME(CLSID_AugmentedShellFolder),
+ {
+ { 0x0, &IID_IAugmentedShellFolder2 },
+ { 0x0, &IID_IAugmentedShellFolder },
+ { 0x0, &IID_IShellFolder },
+ { 0x0, &IID_IUnknown },
+ { 0x4, &IID_IShellService },
+ }
+ },
+ {
+ ID_NAME(CLSID_AugmentedShellFolder2),
+ {
+ { 0x0, &IID_IAugmentedShellFolder2 },
+ { 0x0, &IID_IAugmentedShellFolder },
+ { 0x0, &IID_IShellFolder },
+ { 0x0, &IID_IUnknown },
+ { 0x4, &IID_IShellFolder2 },
+ { 0x8, &IID_IShellService },
+ { 0x10, &IID_IDropTarget },
}
},
{
Modified: trunk/rostests/apitests/com/com_apitest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.…
==============================================================================
--- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Fri Mar 21 11:23:47 2014
@@ -40,6 +40,8 @@
ID_NAME(IID_IAddressBarParser),
ID_NAME(IID_IAddressBand),
ID_NAME(IID_IAddressEditBox),
+ ID_NAME(IID_IAugmentedShellFolder),
+ ID_NAME(IID_IAugmentedShellFolder2),
ID_NAME(IID_IAutoComplete),
ID_NAME(IID_IAutoComplete2),
ID_NAME(IID_IBandNavigate),
Modified: trunk/rostests/apitests/com/com_apitest.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.…
==============================================================================
--- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Fri Mar 21 11:23:47 2014
@@ -65,6 +65,8 @@
// TODO: fix our headers... we really shouldn't need these here
DEFINE_GUID(CLSID_ActiveDesktop, 0x75048700, 0xef1f, 0x11d0, 0x98, 0x88, 0x00,
0x60, 0x97, 0xde, 0xac, 0xf9);
+DEFINE_GUID(CLSID_AugmentedShellFolder, 0x91ea3f8b, 0xc99b, 0x11d0, 0x98, 0x15, 0x00,
0xc0, 0x4f, 0xd9, 0x19, 0x72);
+DEFINE_GUID(CLSID_AugmentedShellFolder2, 0x6413ba2c, 0xb461, 0x11d1, 0xa1, 0x8a, 0x08,
0x00, 0x36, 0xb1, 0x1a, 0x03);
DEFINE_GUID(CLSID_CopyToMenu, 0xC2FBB630, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00,
0xC0, 0x4F, 0xD7, 0x5D, 0x13);
DEFINE_GUID(CLSID_DeskMovr, 0x72267F6A, 0xA6F9, 0x11D0, 0xBC, 0x94, 0x00,
0xC0, 0x4F, 0xB6, 0x78, 0x63);
DEFINE_GUID(CLSID_FadeTask, 0x7EB5FBE4, 0x2100, 0x49E6, 0x85, 0x93, 0x17,
0xE1, 0x30, 0x12, 0x2F, 0x91);
@@ -73,6 +75,7 @@
DEFINE_GUID(CLSID_FolderItemsFDF, 0x53c74826, 0xab99, 0x4d33, 0xac, 0xa4, 0x31,
0x17, 0xf5, 0x1d, 0x37, 0x88);
DEFINE_GUID(CLSID_FolderViewHost, 0x20b1cb23, 0x6968, 0x4eb9, 0xb7, 0xd4, 0xa6,
0x6d, 0x00, 0xd0, 0x7c, 0xee);
DEFINE_GUID(CLSID_ISFBand, 0xD82BE2B0, 0x5764, 0x11D0, 0xA9, 0x6E, 0x00,
0xC0, 0x4F, 0xD7, 0x05, 0xA2);
+DEFINE_GUID(CLSID_MergedFolder, 0x26fdc864, 0xbe88, 0x46e7, 0x92, 0x35, 0x03,
0x2d, 0x8e, 0xa5, 0x16, 0x2e);
DEFINE_GUID(CLSID_MenuDeskBar, 0xECD4FC4F, 0x521C, 0x11D0, 0xB7, 0x92, 0x00,
0xA0, 0xC9, 0x03, 0x12, 0xE1);
DEFINE_GUID(CLSID_MenuToolbarBase, 0x40b96610, 0xb522, 0x11d1, 0xb3, 0xb4, 0x00,
0xaa, 0x00, 0x6e, 0xfd, 0xe7);
DEFINE_GUID(CLSID_MoveToMenu, 0xC2FBB631, 0x2971, 0x11D1, 0xA1, 0x8C, 0x00,
0xC0, 0x4F, 0xD7, 0x5D, 0x13);
@@ -89,6 +92,8 @@
DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00,
0x60, 0x97, 0xde, 0xac, 0xf9);
DEFINE_GUID(IID_IActiveDesktopP, 0x52502ee0, 0xec80, 0x11d0, 0x89, 0xab, 0x00,
0xc0, 0x4f, 0xc2, 0x97, 0x2d);
DEFINE_GUID(IID_IAddressBarParser, 0xc9d81948, 0x443a, 0x40c7, 0x94, 0x5c, 0x5e,
0x17, 0x1b, 0x8c, 0x66, 0xb4);
+DEFINE_GUID(IID_IAugmentedShellFolder, 0x91ea3f8c, 0xc99b, 0x11d0, 0x98, 0x15, 0x00,
0xc0, 0x4f, 0xd9, 0x19, 0x72);
+DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8db3b3f4, 0x6cfe, 0x11d1, 0x8a, 0xe9, 0x00,
0xc0, 0x4f, 0xd9, 0x18, 0xd0);
DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b, 0x34, 0x00,
0x60, 0x97, 0xdf, 0x5b, 0xd4);
DEFINE_GUID(IID_IContext, 0x000001c0, 0x0000, 0x0000, 0xc0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x46);
DEFINE_GUID(IID_IDVGetEnum, 0x70f55181, 0x5fea, 0x4900, 0xb6, 0xb8, 0x73,
0x43, 0xcb, 0x0a, 0x34, 0x8c);
Modified: trunk/rostests/apitests/com/shell32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/shell32.c?re…
==============================================================================
--- trunk/rostests/apitests/com/shell32.c [iso-8859-1] (original)
+++ trunk/rostests/apitests/com/shell32.c [iso-8859-1] Fri Mar 21 11:23:47 2014
@@ -208,6 +208,22 @@
}
},
#endif
+ {
+ ID_NAME(CLSID_MergedFolder),
+ {
+ { -0x8, &IID_IShellFolder2 },
+ { -0x4, &IID_IStorage },
+ { 0x0, &IID_IAugmentedShellFolder2 },
+ { 0x0, &IID_IAugmentedShellFolder },
+ { 0x0, &IID_IShellFolder },
+ { 0x0, &IID_IUnknown },
+ { 0x4, &IID_IShellService },
+ { 0xc, &IID_IPersistFolder2 },
+ { 0xc, &IID_IPersistFolder },
+ { 0xc, &IID_IPersist },
+ { 0x10, &IID_IPersistPropertyBag },
+ }
+ },
{
ID_NAME(CLSID_MoveToMenu),
{