From: Thomas Faber Date: Wed, 25 Feb 2015 16:22:26 +0000 (+0000) Subject: [COM_APITEST] X-Git-Tag: ReactOS-0.3.17-CLT2015~291 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=8e610dc42c9c9e19f6bfed5132dc6e109695d004 [COM_APITEST] - Add some more interfaces svn path=/trunk/; revision=66455 --- diff --git a/rostests/apitests/com/com_apitest.c b/rostests/apitests/com/com_apitest.c index 050b0070229..9f053ee9686 100644 --- a/rostests/apitests/com/com_apitest.c +++ b/rostests/apitests/com/com_apitest.c @@ -186,14 +186,18 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IQueryAssociations), TRUE }, { ID_NAME(IID_IQueryInfo), TRUE }, { ID_NAME(IID_IRegTreeOptions), TRUE }, + { ID_NAME(IID_IRemoteComputer) }, + { ID_NAME(IID_IResolveShellLink) }, { ID_NAME(IID_IRunnableObject) }, { ID_NAME(IID_IServerSecurity), TRUE }, { ID_NAME(IID_IServiceProvider) }, { ID_NAME(IID_ISFHelper), TRUE }, + { ID_NAME(IID_IShellApp), TRUE }, { ID_NAME(IID_IShellBrowser) }, { ID_NAME(IID_IShellBrowserService), TRUE }, { ID_NAME(IID_IShellChangeNotify), TRUE }, { ID_NAME(IID_IShellDesktopTray), TRUE }, + { ID_NAME(IID_IShellDetails), TRUE }, { ID_NAME(IID_IShellDispatch) }, { ID_NAME(IID_IShellDispatch2) }, { ID_NAME(IID_IShellDispatch3) }, @@ -205,16 +209,25 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IShellFolder) }, { ID_NAME(IID_IShellFolder2) }, { ID_NAME(IID_IShellFolderBand), TRUE }, + { ID_NAME(IID_IShellFolderSearchable), TRUE }, + { ID_NAME(IID_IShellFolderSearchableCallback), TRUE }, { ID_NAME(IID_IShellFolderView), TRUE }, { ID_NAME(IID_IShellFolderViewCB), TRUE }, { ID_NAME(IID_IShellFolderViewDual) }, { ID_NAME(IID_IShellFolderViewDual2) }, + { ID_NAME(IID_IShellFolderViewType), TRUE }, { ID_NAME(IID_IShellIcon) }, + { ID_NAME(IID_IShellIconOverlay), TRUE }, + { ID_NAME(IID_IShellIconOverlayIdentifier), TRUE }, + { ID_NAME(IID_IShellImageData), TRUE }, + { ID_NAME(IID_IShellImageDataAbort), TRUE }, + { ID_NAME(IID_IShellImageDataFactory), TRUE }, { ID_NAME(IID_IShellItem) }, { ID_NAME(IID_IShellItem2) }, { ID_NAME(IID_IShellItemArray) }, { ID_NAME(IID_IShellItemFilter) }, { ID_NAME(IID_IShellLinkA) }, + { ID_NAME(IID_IShellLinkDataList), TRUE }, { ID_NAME(IID_IShellLinkDual) }, { ID_NAME(IID_IShellLinkDual2) }, { ID_NAME(IID_IShellLinkW) }, @@ -223,6 +236,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IShellMenuAcc), TRUE }, { ID_NAME(IID_IShellMenuCallback), TRUE }, { ID_NAME(IID_IShellNameSpace) }, + { ID_NAME(IID_IShellPropSheetExt), TRUE }, { ID_NAME(IID_IShellService), TRUE }, { ID_NAME(IID_IShellTaskScheduler), TRUE }, { ID_NAME(IID_IShellView) }, diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h index 495e16566b3..51b00891ef2 100644 --- a/rostests/apitests/com/com_apitest.h +++ b/rostests/apitests/com/com_apitest.h @@ -84,6 +84,7 @@ DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC DEFINE_GUID(CLSID_QuickLinks, 0x0E5CBF21, 0xD15F, 0x11D0, 0x83, 0x01, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); DEFINE_GUID(CLSID_SendToMenu, 0x7BA4C740, 0x9E81, 0x11CF, 0x99, 0xD3, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); DEFINE_GUID(CLSID_ShellFolderView, 0x62112aa1, 0xebe4, 0x11cf, 0xa5, 0xfb, 0x00, 0x20, 0xaf, 0xe7, 0x29, 0x2d); +DEFINE_GUID(CLSID_ShellImageDataFactory, 0x66e4e4fb, 0xf385, 0x4dd0, 0x8d, 0x74, 0xa2, 0xef, 0xd1, 0xbc, 0x61, 0x78); DEFINE_GUID(CLSID_ShellLinkObject, 0x11219420, 0x1768, 0x11d1, 0x95, 0xbe, 0x00, 0x60, 0x97, 0x97, 0xea, 0x4f); DEFINE_GUID(CLSID_StartMenuPin, 0xa2a9545d, 0xa0c2, 0x42b4, 0x97, 0x08, 0xa0, 0xb2, 0xba, 0xdd, 0x77, 0xc8); DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8F, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); @@ -131,14 +132,22 @@ DEFINE_GUID(IID_IMultiMonitorDockingSite, 0x03879de0, 0xa205, 0x11d0, 0x99, 0xc 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_IPreviewHandlerVisuals, 0x196bf9a5, 0xb346, 0x4ef0, 0xaa, 0x1e, 0x5d, 0xcd, 0xb7, 0x67, 0x68, 0xb1); +DEFINE_GUID(IID_IShellApp, 0xa3e14960, 0x935f, 0x11d1, 0xb8, 0xb8, 0x00, 0x60, 0x08, 0x05, 0x93, 0x82); DEFINE_GUID(IID_IShellDispatch3, 0x177160ca, 0xbb5a, 0x411c, 0x84, 0x1d, 0xbd, 0x38, 0xfa, 0xcd, 0xea, 0xa0); DEFINE_GUID(IID_IShellDispatch4, 0xefd84b2d, 0x4bcf, 0x4298, 0xbe, 0x25, 0xeb, 0x54, 0x2a, 0x59, 0xfb, 0xda); DEFINE_GUID(IID_IShellDispatch5, 0x866738b9, 0x6cf2, 0x4de8, 0x87, 0x67, 0xf7, 0x94, 0xeb, 0xe7, 0x4f, 0x4e); +DEFINE_GUID(IID_IShellFolderSearchable, 0x4e1ae66c, 0x204b, 0x11d2, 0x8d, 0xb3, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellFolderSearchableCallback,0xf98d8294, 0x2bbc, 0x11d2, 0x8d, 0xbd, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellFolderViewType, 0x49422c1e, 0x1c03, 0x11d2, 0x8d, 0xab, 0x00, 0x00, 0xf8, 0x7a, 0x55, 0x6c); +DEFINE_GUID(IID_IShellIconOverlay, 0x7d688a70, 0xc613, 0x11d0, 0x99, 0x9b, 0x00, 0xc0, 0x4f, 0xd6, 0x55, 0xe1); DEFINE_GUID(IID_IContextMenuSite, 0x0811aebe, 0x0b87, 0x4c54, 0x9e, 0x72, 0x54, 0x8c, 0xf6, 0x49, 0x01, 0x6b); DEFINE_GUID(IID_IShellDesktopTray, 0x213e2df9, 0x9a14, 0x4328, 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9); DEFINE_GUID(IID_IShellFolderBand, 0x7fe80cc8, 0xc247, 0x11d0, 0xb9, 0x3a, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1); DEFINE_GUID(IID_IShellFolderViewDual, 0xe7a1af80, 0x4d96, 0x11cf, 0x96, 0x0c, 0x00, 0x80, 0xc7, 0xf4, 0xee, 0x85); DEFINE_GUID(IID_IShellFolderViewDual2, 0x31c147b6, 0x0ade, 0x4a3c, 0xb5, 0x14, 0xdd, 0xf9, 0x32, 0xef, 0x6d, 0x17); +DEFINE_GUID(IID_IShellImageData, 0xbfdeec12, 0x8040, 0x4403, 0xa5, 0xea, 0x9e, 0x07, 0xda, 0xfc, 0xf5, 0x30); +DEFINE_GUID(IID_IShellImageDataAbort, 0x53fb8e58, 0x50c0, 0x4003, 0xb4, 0xaa, 0x0c, 0x8d, 0xf2, 0x8e, 0x7f, 0x3a); +DEFINE_GUID(IID_IShellImageDataFactory, 0x9be8ed5c, 0xedab, 0x4d75, 0x90, 0xf3, 0xbd, 0x5b, 0xdb, 0xb2, 0x1c, 0x82); DEFINE_GUID(IID_IShellLinkDual, 0x88a05c00, 0xf000, 0x11ce, 0x83, 0x50, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); DEFINE_GUID(IID_IShellLinkDual2, 0x317ee249, 0xf12e, 0x11d2, 0xb1, 0xe4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84, 0x21, 0x38, 0xbe, 0xd2, 0x8f, 0x46, 0x73); diff --git a/rostests/apitests/com/shell32.c b/rostests/apitests/com/shell32.c index 5d33ffb432c..5bd474dddbb 100644 --- a/rostests/apitests/com/shell32.c +++ b/rostests/apitests/com/shell32.c @@ -35,6 +35,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -251,6 +252,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0xc, &IID_IPersistFolder }, { 0xc, &IID_IPersist }, { 0x10, &IID_IPersistPropertyBag }, + { 0x14, &IID_IShellIconOverlay }, } }, { @@ -272,6 +274,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -284,6 +287,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellIcon }, { FARAWY, &IID_IPersistFolder3 }, { FARAWY, &IID_IPersistFolder2 }, @@ -300,6 +304,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x10, &IID_IPersistFolder2 }, { 0x10, &IID_IPersistFolder }, { 0x10, &IID_IPersist }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -340,6 +345,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { ID_NAME(CLSID_Printers), { + { -0xc, &IID_IRemoteComputer }, { 0x0, &IID_IShellFolder2 }, { 0x0, &IID_IShellFolder }, { 0x0, &IID_IUnknown }, @@ -347,6 +353,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x4, &IID_IPersistFolder }, { 0x4, &IID_IPersist }, { 0x8, &IID_IContextMenuCB }, + { 0xc, &IID_IShellIconOverlay }, } }, { @@ -429,6 +436,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x14, &IID_IContextMenuCB }, { 0x18, &IID_ITranslateShellChangeNotify }, { 0x20, &IID_IOleCommandTarget }, + { FARAWY, &IID_IShellIconOverlay }, { FARAWY, &IID_IShellFolder2 }, { FARAWY, &IID_IShellFolder }, } @@ -440,6 +448,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0xc, &IID_IShellFolder2 }, { 0xc, &IID_IShellFolder }, { 0x10, &IID_IShellIcon }, + { 0x14, &IID_IShellIconOverlay }, { 0x18, &IID_IPersistFolder3 }, { 0x18, &IID_IPersistFolder2 }, { 0x18, &IID_IPersistFolder }, @@ -509,6 +518,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x14, &IID_IContextMenu }, { 0x18, &IID_IDropTarget }, { 0x1c, &IID_IQueryInfo }, + { 0x20, &IID_IShellLinkDataList }, { 0x24, &IID_IExtractIconA }, { 0x28, &IID_IExtractIconW }, { 0x2c, &IID_IExtractImage2 },