24 Feb
2015
24 Feb
'15
12:52 p.m.
Author: tfaber
Date: Tue Feb 24 12:52:18 2015
New Revision: 66440
URL: http://svn.reactos.org/svn/reactos?rev=66440&view=rev
Log:
[COM_APITEST]
- Add IID_ITranslateShellChangeNotify, the answer to CORE-8844 - found by David
- Fix some non-constant offsets
- Re-alphabetize the lists
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] Tue Feb 24 12:52:18 2015
@@ -53,6 +53,7 @@
{ 0x0, &IID_IShellFolder },
{ 0x0, &IID_IUnknown },
{ 0x4, &IID_IShellService },
+ { 0x8, &IID_ITranslateShellChangeNotify },
}
},
{
@@ -64,6 +65,7 @@
{ 0x0, &IID_IUnknown },
{ 0x4, &IID_IShellFolder2 },
{ 0x8, &IID_IShellService },
+ { 0xc, &IID_ITranslateShellChangeNotify },
{ 0x10, &IID_IDropTarget },
}
},
@@ -76,6 +78,13 @@
{ 0x8, &IID_IEnumString },
{ 0xc, &IID_IAccessible },
{ 0xc, &IID_IDispatch },
+ }
+ },
+ {
+ ID_NAME(CLSID_BackgroundTaskScheduler),
+ {
+ { 0x0, &IID_IShellTaskScheduler },
+ { 0x0, &IID_IUnknown },
}
},
{
@@ -204,6 +213,16 @@
}
},
{
+ ID_NAME(CLSID_ProgressDialog),
+ {
+ { 0x0, &IID_IProgressDialog },
+ { 0x0, &IID_IUnknown },
+ { 0x4, &IID_IOleWindow },
+ { 0x10, &IID_IObjectWithSite },
+ },
+ L"Both"
+ },
+ {
ID_NAME(CLSID_RebarBandSite),
{
{ 0x0, &IID_IUnknown },
@@ -240,6 +259,13 @@
}
},
{
+ ID_NAME(CLSID_SharedTaskScheduler),
+ {
+ { 0x0, &IID_IShellTaskScheduler },
+ { 0x0, &IID_IUnknown },
+ }
+ },
+ {
ID_NAME(CLSID_ShellSearchExt),
{
{ 0x0, &IID_IContextMenu },
@@ -247,30 +273,6 @@
{ 0x4, &IID_IObjectWithSite },
}
},
- {
- ID_NAME(CLSID_ProgressDialog),
- {
- { 0x0, &IID_IProgressDialog },
- { 0x0, &IID_IUnknown },
- { 0x4, &IID_IOleWindow },
- { 0x10, &IID_IObjectWithSite },
- },
- L"Both"
- },
- {
- ID_NAME(CLSID_SharedTaskScheduler),
- {
- { 0x0, &IID_IShellTaskScheduler },
- { 0x0, &IID_IUnknown },
- }
- },
- {
- ID_NAME(CLSID_BackgroundTaskScheduler),
- {
- { 0x0, &IID_IShellTaskScheduler },
- { 0x0, &IID_IUnknown },
- }
- }
};
static const INT ExpectedInterfaceCount = RTL_NUMBER_OF(ExpectedInterfaces);
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] Tue Feb 24 12:52:18 2015
@@ -105,6 +105,8 @@
{ ID_NAME(IID_IExtractImage2) },
{ ID_NAME(IID_IFileDialog) },
{ ID_NAME(IID_IFileDialog2), TRUE },
+ { ID_NAME(IID_IFileOpenDialog) },
+ { ID_NAME(IID_IFileSaveDialog) },
{ ID_NAME(IID_IFileSearchBand) },
{ ID_NAME(IID_IFolderBandPriv) },
{ ID_NAME(IID_IFolderFilter) },
@@ -199,6 +201,7 @@
{ ID_NAME(IID_IShellMenuCallback), TRUE },
{ ID_NAME(IID_IShellNameSpace) },
{ ID_NAME(IID_IShellService), TRUE },
+ { ID_NAME(IID_IShellTaskScheduler), TRUE },
{ ID_NAME(IID_IShellView) },
{ ID_NAME(IID_IShellView2) },
{ ID_NAME(IID_IShellView3) },
@@ -213,6 +216,7 @@
{ ID_NAME(IID_ITaskbarList) },
{ ID_NAME(IID_ITaskbarList2) },
{ ID_NAME(IID_ITrackShellMenu), TRUE },
+ { ID_NAME(IID_ITranslateShellChangeNotify), TRUE },
{ ID_NAME(IID_ITrayPriv), TRUE },
{ ID_NAME(IID_ITrayPriv2), TRUE },
{ ID_NAME(IID_IUnknown) },
@@ -235,7 +239,6 @@
{ ID_NAME(IID_FolderItems3) },
{ ID_NAME(IID_FolderItemVerb) },
{ ID_NAME(IID_FolderItemVerbs) },
- { ID_NAME(IID_IShellTaskScheduler) },
{ ID_NAME(CLSID_ShellDesktop), TRUE }
};
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] Tue Feb 24 12:52:18 2015
@@ -127,6 +127,7 @@
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);
+DEFINE_GUID(IID_ITranslateShellChangeNotify,0xb4df2675, 0xba23, 0x11d2, 0xb5, 0xee, 0x00,
0x60, 0x97, 0xc6, 0x86, 0xf6);
DEFINE_GUID(IID_IViewObjectEx, 0x3af24292, 0x0c96, 0x11ce, 0xa0, 0xcf, 0x00,
0xaa, 0x00, 0x60, 0x0a, 0xb8);
DEFINE_GUID(IID_DFConstraint, 0x403df050, 0x23bd, 0x11d2, 0x93, 0x9f, 0x00,
0xa0, 0xc9, 0x1e, 0xed, 0xba);
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] Tue Feb 24 12:52:18 2015
@@ -19,8 +19,8 @@
{ 0x10, &IID_IPersistFolder2 },
{ 0x10, &IID_IPersistFolder },
{ 0x10, &IID_IPersist },
- { 0xbc, &IID_IShellFolder2 },
- { 0xbc, &IID_IShellFolder },
+ { FARAWY, &IID_IShellFolder2 },
+ { FARAWY, &IID_IShellFolder },
}
},
{
@@ -229,6 +229,7 @@
{ 0x0, &IID_IShellFolder },
{ 0x0, &IID_IUnknown },
{ 0x4, &IID_IShellService },
+ { 0x8, &IID_ITranslateShellChangeNotify },
{ 0xc, &IID_IPersistFolder2 },
{ 0xc, &IID_IPersistFolder },
{ 0xc, &IID_IPersist },
@@ -254,8 +255,8 @@
{ 0x10, &IID_IPersistFolder2 },
{ 0x10, &IID_IPersistFolder },
{ 0x10, &IID_IPersist },
- { 0x64, &IID_IShellFolder2 },
- { 0x64, &IID_IShellFolder },
+ { FARAWY, &IID_IShellFolder2 },
+ { FARAWY, &IID_IShellFolder },
}
},
{
@@ -266,13 +267,12 @@
{ 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 },
-
+ { FARAWY, &IID_IShellIcon },
+ { FARAWY, &IID_IPersistFolder3 },
+ { FARAWY, &IID_IPersistFolder2 },
+ { FARAWY, &IID_IStorage },
+ { FARAWY, &IID_IContextMenuCB },
+ { FARAWY, &IID_IOleCommandTarget },
}
},
{
@@ -283,8 +283,8 @@
{ 0x10, &IID_IPersistFolder2 },
{ 0x10, &IID_IPersistFolder },
{ 0x10, &IID_IPersist },
- { 0xcc, &IID_IShellFolder2 },
- { 0xcc, &IID_IShellFolder },
+ { FARAWY, &IID_IShellFolder2 },
+ { FARAWY, &IID_IShellFolder },
}
},
{
@@ -410,6 +410,7 @@
{ 0x8, &IID_IPersist },
{ 0xc, &IID_IShellIcon },
{ 0x14, &IID_IContextMenuCB },
+ { 0x18, &IID_ITranslateShellChangeNotify },
{ 0x20, &IID_IOleCommandTarget },
{ FARAWY, &IID_IShellFolder2 },
{ FARAWY, &IID_IShellFolder },