From 46e350e52c7949434a7076f335c83471be67e83e Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 14 Feb 2015 12:59:16 +0000 Subject: [PATCH] [COM_APITEST] - Add classes found in Wine's shell32_classes.idl and browseui_classes.idl svn path=/trunk/; revision=66258 --- rostests/apitests/com/browseui.c | 22 ++++++++ rostests/apitests/com/com_apitest.h | 1 + rostests/apitests/com/shdocvw.c | 6 +++ rostests/apitests/com/shell32.c | 84 +++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) diff --git a/rostests/apitests/com/browseui.c b/rostests/apitests/com/browseui.c index 763c329b91c..5e54cbfe723 100644 --- a/rostests/apitests/com/browseui.c +++ b/rostests/apitests/com/browseui.c @@ -21,6 +21,17 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x8, &IID_IACList }, } }, + { + ID_NAME(CLSID_ACListISF), + { + { 0x0, &IID_IEnumString }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IACList2 }, + { 0x4, &IID_IACList }, + { 0xc, &IID_IShellService }, + { 0x10, &IID_IPersistFolder }, + } + }, { ID_NAME(CLSID_AddressEditBox), { @@ -56,6 +67,17 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x10, &IID_IDropTarget }, } }, + { + ID_NAME(CLSID_AutoComplete), + { + { 0x0, &IID_IAutoComplete2 }, + { 0x0, &IID_IAutoComplete }, + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IEnumString }, + { 0xc, &IID_IAccessible }, + { 0xc, &IID_IDispatch }, + } + }, { ID_NAME(CLSID_BandProxy), { diff --git a/rostests/apitests/com/com_apitest.h b/rostests/apitests/com/com_apitest.h index e2484912db2..768ef5e8ea7 100644 --- a/rostests/apitests/com/com_apitest.h +++ b/rostests/apitests/com/com_apitest.h @@ -79,6 +79,7 @@ DEFINE_GUID(CLSID_MergedFolder, 0x26fdc864, 0xbe88, 0x46e7, 0x92, 0x3 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); +DEFINE_GUID(CLSID_MruLongList, 0x53BD6B4E, 0x3780, 0x4693, 0xAF, 0xC3, 0x71, 0x61, 0xC2, 0xF3, 0xEE, 0x9C); 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); diff --git a/rostests/apitests/com/shdocvw.c b/rostests/apitests/com/shdocvw.c index c84fa207d75..c46a702695f 100644 --- a/rostests/apitests/com/shdocvw.c +++ b/rostests/apitests/com/shdocvw.c @@ -61,6 +61,12 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = } }, #endif + { + ID_NAME(CLSID_MruLongList), + { + { 0x0, &IID_IUnknown }, + } + }, { ID_NAME(CLSID_TaskbarList), { diff --git a/rostests/apitests/com/shell32.c b/rostests/apitests/com/shell32.c index 5b824332d82..8d8797e6ac7 100644 --- a/rostests/apitests/com/shell32.c +++ b/rostests/apitests/com/shell32.c @@ -12,6 +12,17 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { + { + ID_NAME(CLSID_ControlPanel), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0xbc, &IID_IShellFolder2 }, + { 0xbc, &IID_IShellFolder }, + } + }, { ID_NAME(CLSID_CopyToMenu), { @@ -236,6 +247,46 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x10, &IID_IFolderFilter }, } }, + { + ID_NAME(CLSID_MyComputer), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0x64, &IID_IShellFolder2 }, + { 0x64, &IID_IShellFolder }, + } + }, + { + ID_NAME(CLSID_MyDocuments), + { + { -0x4, &IID_IPersistFolder }, + { -0x4, &IID_IPersist }, + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x70, &IID_IShellIcon }, + { 0x78, &IID_IPersistFolder3 }, + { 0x78, &IID_IPersistFolder2 }, + { 0x7c, &IID_IStorage }, + { 0x8c, &IID_IContextMenuCB }, + { 0x94, &IID_IOleCommandTarget }, + + } + }, + { + ID_NAME(CLSID_NetworkPlaces), + { + { 0x0, &IID_IUnknown }, + { 0x10, &IID_IPersistFolder3 }, + { 0x10, &IID_IPersistFolder2 }, + { 0x10, &IID_IPersistFolder }, + { 0x10, &IID_IPersist }, + { 0xcc, &IID_IShellFolder2 }, + { 0xcc, &IID_IShellFolder }, + } + }, { ID_NAME(CLSID_NewMenu), { @@ -269,6 +320,25 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x10, &IID_IShellMenuAcc }, } }, + { + ID_NAME(CLSID_Printers), + { + { 0x0, &IID_IShellFolder2 }, + { 0x0, &IID_IShellFolder }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IPersistFolder2 }, + { 0x4, &IID_IPersistFolder }, + { 0x4, &IID_IPersist }, + { 0x8, &IID_IContextMenuCB }, + } + }, + { + ID_NAME(CLSID_QueryAssociations), + { + { 0x0, &IID_IUnknown }, + { 0x8, &IID_IQueryAssociations }, + } + }, { ID_NAME(CLSID_QuickLinks), { @@ -290,6 +360,20 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] = { 0x94, &IID_IFolderBandPriv }, } }, + { + ID_NAME(CLSID_RecycleBin), + { + { 0x0, &IID_IPersistFolder2 }, + { 0x0, &IID_IPersistFolder }, + //{ 0x0, &IID_IPersist }, + { 0x0, &IID_IUnknown }, + { 0x4, &IID_IShellFolder2 }, + { 0x4, &IID_IShellFolder }, + { 0x8, &IID_IContextMenu }, + { 0xc, &IID_IShellPropSheetExt }, + { 0x10, &IID_IShellExtInit }, + } + }, { ID_NAME(CLSID_SendToMenu), {