From 4c25d9683c1fc4605e47c6a66b49f1ec376a7975 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Wed, 25 Feb 2015 15:00:24 +0000 Subject: [PATCH] [COM_APITEST] - Add some more interfaces - Add CLSID_CDBurn svn path=/trunk/; revision=66453 --- rostests/apitests/com/browseui.c | 3 +++ rostests/apitests/com/com_apitest.c | 23 +++++++++++++++++++++++ rostests/apitests/com/com_apitest.h | 17 ++++++++++++++++- rostests/apitests/com/shell32.c | 19 ++++++++++++++++++- 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/rostests/apitests/com/browseui.c b/rostests/apitests/com/browseui.c index f4219bf8dd7..0e3f048f636 100644 --- a/rostests/apitests/com/browseui.c +++ b/rostests/apitests/com/browseui.c @@ -75,6 +75,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IAutoComplete2 }, { 0x0, &IID_IAutoComplete }, { 0x0, &IID_IUnknown }, + { 0x4, &IID_IAutoCompleteDropDown }, { 0x8, &IID_IEnumString }, { 0xc, &IID_IAccessible }, { 0xc, &IID_IDispatch }, @@ -218,6 +219,8 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x0, &IID_IProgressDialog }, { 0x0, &IID_IUnknown }, { 0x4, &IID_IOleWindow }, + { 0x8, &IID_IActionProgressDialog }, + { 0xc, &IID_IActionProgress }, { 0x10, &IID_IObjectWithSite }, }, L"Both" diff --git a/rostests/apitests/com/com_apitest.c b/rostests/apitests/com/com_apitest.c index 15f924edadf..050b0070229 100644 --- a/rostests/apitests/com/com_apitest.c +++ b/rostests/apitests/com/com_apitest.c @@ -39,6 +39,8 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IAccessor) }, { ID_NAME(IID_IActiveDesktop), TRUE }, { ID_NAME(IID_IActiveDesktopP), TRUE }, + { ID_NAME(IID_IActionProgress) }, + { ID_NAME(IID_IActionProgressDialog) }, { ID_NAME(IID_IAddressBarParser), TRUE }, { ID_NAME(IID_IAddressBand), TRUE }, { ID_NAME(IID_IAddressEditBox), TRUE }, @@ -46,6 +48,8 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IAugmentedShellFolder2), TRUE }, { ID_NAME(IID_IAutoComplete), TRUE }, { ID_NAME(IID_IAutoComplete2), TRUE }, + { ID_NAME(IID_IAutoCompleteDropDown) }, + { ID_NAME(IID_IBandHost) }, { ID_NAME(IID_IBandNavigate), TRUE }, { ID_NAME(IID_IBandProxy), TRUE }, { ID_NAME(IID_IBandSite) }, @@ -56,10 +60,16 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IBrowserService) }, { ID_NAME(IID_IBrowserService2), TRUE }, { ID_NAME(IID_IBrowserService3), TRUE }, + { ID_NAME(IID_ICDBurn) }, + { ID_NAME(IID_ICDBurnExt) }, { ID_NAME(IID_IClassFactory) }, { ID_NAME(IID_IClassFactory2) }, { ID_NAME(IID_IClassFactory3), TRUE }, { ID_NAME(IID_IClientSecurity), TRUE }, + { ID_NAME(IID_ICommDlgBrowser) }, + { ID_NAME(IID_ICommDlgBrowser2) }, + { ID_NAME(IID_ICommDlgBrowser3) }, + { ID_NAME(IID_IComputerInfoChangeNotify), }, { ID_NAME(IID_IComThreadingInfo), TRUE }, { ID_NAME(IID_IContext), TRUE }, { ID_NAME(IID_IContextMenu), TRUE }, @@ -68,6 +78,8 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IContextMenuCB), TRUE }, { ID_NAME(IID_IContextMenuSite) }, { ID_NAME(IID_IContinue) }, + { ID_NAME(IID_ICopyHookA), TRUE }, + { ID_NAME(IID_ICopyHookW), TRUE }, { ID_NAME(IID_IDVGetEnum), TRUE }, { ID_NAME(IID_IDataObject) }, //{ ID_NAME(IID_IDefViewID) }, == DefViewFrame3 @@ -98,6 +110,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IEnumUnknown) }, { ID_NAME(IID_IEnumVARIANT) }, { ID_NAME(IID_IErrorLog) }, + { ID_NAME(IID_IExplorerBrowser) }, { ID_NAME(IID_IExplorerToolbar), TRUE }, { ID_NAME(IID_IExtractIconA), TRUE }, { ID_NAME(IID_IExtractIconW), TRUE }, @@ -108,14 +121,20 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IFileOpenDialog) }, { ID_NAME(IID_IFileSaveDialog) }, { ID_NAME(IID_IFileSearchBand) }, + { ID_NAME(IID_IFileViewerA), TRUE }, + { ID_NAME(IID_IFileViewerSite), TRUE }, + { ID_NAME(IID_IFileViewerW), TRUE }, { ID_NAME(IID_IFolderBandPriv) }, { ID_NAME(IID_IFolderFilter) }, { ID_NAME(IID_IFolderFilterSite) }, { ID_NAME(IID_IFolderView) }, { ID_NAME(IID_IFolderView2) }, + { ID_NAME(IID_IFolderViewHost), TRUE }, { ID_NAME(IID_IFolderViewOC) }, { ID_NAME(IID_IFolderViewSettings) }, { ID_NAME(IID_IGlobalFolderSettings), TRUE }, + { ID_NAME(IID_IHWEventHandler) }, + { ID_NAME(IID_IHWEventHandler2) }, { ID_NAME(IID_IInitializeObject), TRUE }, { ID_NAME(IID_IInputObject) }, { ID_NAME(IID_IInputObjectSite) }, @@ -123,6 +142,7 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IMarshal) }, { ID_NAME(IID_IMenuBand), TRUE }, { ID_NAME(IID_IMenuPopup), TRUE }, + { ID_NAME(IID_IModalWindow) }, { ID_NAME(IID_IMoniker) }, { ID_NAME(IID_IMultiMonitorDockingSite), TRUE }, { ID_NAME(IID_IMultiQI), TRUE }, @@ -157,6 +177,9 @@ static KNOWN_INTERFACE KnownInterfaces[] = { ID_NAME(IID_IPersistStorage) }, { ID_NAME(IID_IPersistStream) }, { ID_NAME(IID_IPersistStreamInit) }, + { ID_NAME(IID_IPreviewHandler) }, + { ID_NAME(IID_IPreviewHandlerFrame) }, + { ID_NAME(IID_IPreviewHandlerVisuals) }, { ID_NAME(IID_IProgressDialog), TRUE }, { ID_NAME(IID_IPropertyBag) }, { ID_NAME(IID_IPropertyBag2) }, diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h index c7913b4daef..495e16566b3 100644 --- a/rostests/apitests/com/com_apitest.h +++ b/rostests/apitests/com/com_apitest.h @@ -68,6 +68,7 @@ DEFINE_GUID(CLSID_ActiveDesktop, 0x75048700, 0xef1f, 0x11d0, 0x98, 0x8 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_CDBurn, 0xfbeb8a05, 0xbeee, 0x4442, 0x80, 0x4e, 0x40, 0x9d, 0x6c, 0x45, 0x15, 0xe9); 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); DEFINE_GUID(CLSID_FileSearchBand, 0xc4ee31f3, 0x4768, 0x11d2, 0xbe, 0x5c, 0x00, 0xa0, 0xc9, 0xa8, 0x3d, 0xa1); @@ -90,13 +91,21 @@ DEFINE_GUID(CLSID_TrackShellMenu, 0x8278F931, 0x2A3E, 0x11d2, 0x83, 0x8 DEFINE_GUID(IID_IADesktopP2, 0xb22754e2, 0x4574, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); DEFINE_GUID(IID_IAccessControl, 0xeedd23e0, 0x8410, 0x11ce, 0xa1, 0xc3, 0x08, 0x00, 0x2b, 0x2b, 0x8d, 0x8f); DEFINE_GUID(IID_IAccessor, 0x0c733a8c, 0x2a1c, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +DEFINE_GUID(IID_IActionProgress, 0x49ff1173, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); +DEFINE_GUID(IID_IActionProgressDialog, 0x49ff1172, 0xeadc, 0x446d, 0x92, 0x85, 0x15, 0x64, 0x53, 0xa6, 0x43, 0x1c); 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_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_IContext, 0x000001c0, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +DEFINE_GUID(IID_IComputerInfoChangeNotify, 0x0df60d92, 0x6818, 0x46d6, 0xb3, 0x58, 0xd6, 0x61, 0x70, 0xdd, 0xe4, 0x66); +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_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); @@ -114,8 +123,14 @@ DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc 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); DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); +DEFINE_GUID(IID_IFolderViewHost, 0x1ea58f02, 0xd55a, 0x411d, 0xb0, 0x9e, 0x9e, 0x65, 0xac, 0x21, 0x60, 0x5b); DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); +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_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_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); diff --git a/rostests/apitests/com/shell32.c b/rostests/apitests/com/shell32.c index 90395ba0eef..5d33ffb432c 100644 --- a/rostests/apitests/com/shell32.c +++ b/rostests/apitests/com/shell32.c @@ -12,6 +12,22 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { + { + ID_NAME(CLSID_CDBurn), + { + { 0x0, &IID_IObjectWithSite }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IShellExtInit }, + { 0xc, &IID_IContextMenu }, + { 0x10, &IID_IShellPropSheetExt }, + { 0x18, &IID_IDropTarget }, + { 0x1c, &IID_IPersistFile }, + { 0x20, &IID_IOleCommandTarget }, + { 0x24, &IID_ICDBurn }, + { 0x2c, &IID_IPersistPropertyBag }, + { 0x3c, &IID_IServiceProvider }, + } + }, { ID_NAME(CLSID_ControlPanel), { @@ -131,7 +147,8 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { ID_NAME(CLSID_FolderViewHost), { - { 0x0, &IID_IUnknown }, + { 0x0, &IID_IFolderViewHost }, + { 0x0, &IID_IUnknown }, { 0x4, &IID_IServiceProvider }, { 0x8, &IID_IOleWindow }, { 0xc, &IID_IFolderView },