https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3bd2aabe1cc8558eb0bf6bfa041b686c9bf6156
commit b3bd2aabe1cc8558eb0bf6bfa041b686c9bf6156
Author: Thomas Faber <thomas.fa...@reactos.org>
AuthorDate: Fri Mar 2 14:14:53 2018 +0100
Commit: Thomas Faber <thomas.fa...@reactos.org>
CommitDate: Fri Mar 2 15:23:05 2018 +0100
[COM_APITEST] Fix test failures on Win2003.
---
modules/rostests/apitests/com/com_apitest.c | 19 ++++++++++---------
modules/rostests/apitests/com/com_apitest.h | 1 -
modules/rostests/apitests/com/shell32.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules/rostests/apitests/com/com_apitest.c
b/modules/rostests/apitests/com/com_apitest.c
index bd1ec684c6..752f5549e6 100644
--- a/modules/rostests/apitests/com/com_apitest.c
+++ b/modules/rostests/apitests/com/com_apitest.c
@@ -48,7 +48,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ ID_NAME(IID_IAccessibleHandler) },
{ ID_NAME(IID_IAccessControl), TRUE },
{ ID_NAME(IID_IAccessor) },
- { ID_NAME(IID_IACLCustomMRU) },
+ { ID_NAME(IID_IACLCustomMRU), TRUE },
{ ID_NAME(IID_IActiveDesktop), TRUE },
{ ID_NAME(IID_IActiveDesktopP), TRUE },
{ ID_NAME(IID_IActionProgress) },
@@ -129,7 +129,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ ID_NAME(IID_IDockingWindowSite), TRUE },
{ ID_NAME(IID_IDocViewSite), TRUE },
{ ID_NAME(IID_IDragSourceHelper), TRUE },
- { ID_NAME(IID_IDriveFolderExt) },
+ { ID_NAME(IID_IDriveFolderExt), TRUE },
{ ID_NAME(IID_IDropSource) },
{ ID_NAME(IID_IDropTarget) },
{ ID_NAME(IID_IDropTargetHelper), TRUE },
@@ -416,7 +416,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ ID_NAME(IID_IUserNotificationCallback) }, // On Vista+
{ ID_NAME(IID_IUserNotification2) }, // On Vista+
- { ID_NAME(IID_IAggregateFilterCondition), TRUE },
+ { ID_NAME(IID_IAggregateFilterCondition) },
{ ID_NAME(IID_IAliasRegistrationCallback), TRUE },
{ ID_NAME(IID_IAssociationArrayInitialize), TRUE },
{ ID_NAME(IID_IAssociationList), TRUE },
@@ -429,7 +429,7 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ ID_NAME(IID_IEnumAssociationElements), TRUE },
{ ID_NAME(IID_IEnumerateAssociationElements),TRUE },
{ ID_NAME(IID_IExecuteCommand), TRUE },
- { ID_NAME(IID_IFilterCondition), TRUE },
+ { ID_NAME(IID_IFilterCondition) },
{ ID_NAME(IID_IFolderNotify), TRUE },
{ ID_NAME(IID_IFolderProperties), TRUE },
{ ID_NAME(IID_IFolderType), TRUE },
@@ -460,15 +460,16 @@ static KNOWN_INTERFACE KnownInterfaces[] =
{ ID_NAME(IID_ITaskConditionCombiner), TRUE },
{ ID_NAME(IID_ITaskConditionInit), TRUE },
{ ID_NAME(IID_ITransferProvider), TRUE },
- { ID_NAME(IID_IUserEventTimer), TRUE },
- { ID_NAME(IID_IUserEventTimerCallback), TRUE },
+ { ID_NAME(IID_IUserEventTimer) },
+ { ID_NAME(IID_IUserEventTimerCallback) },
{ ID_NAME(IID_IAssociationArrayOld), TRUE },
{ ID_NAME(IID_IAssociationArray), TRUE },
- { ID_NAME(IID_IDriveFolderExtOld), TRUE },
- { ID_NAME(IID_IDriveFolderExt), TRUE },
+#define IID_IDriveFolderExt IID_IDriveFolderExtOld
+ { ID_NAME(IID_IDriveFolderExt) },
+#undef IID_IDriveFolderExt
{ ID_NAME(IID_IPinnedListOld), TRUE },
{ ID_NAME(IID_IPinnedList), TRUE },
- { ID_NAME(IID_IAttachmentExecute), TRUE }
+ { ID_NAME(IID_IAttachmentExecute), TRUE },
};
static const INT KnownInterfaceCount = RTL_NUMBER_OF(KnownInterfaces);
diff --git a/modules/rostests/apitests/com/com_apitest.h
b/modules/rostests/apitests/com/com_apitest.h
index f1f4c73876..28d774c6b8 100644
--- a/modules/rostests/apitests/com/com_apitest.h
+++ b/modules/rostests/apitests/com/com_apitest.h
@@ -138,7 +138,6 @@ DEFINE_GUID(IID_IDeskBandEx, 0x5dd6b79a,
0x3ab7, 0x49c0, 0xab, 0x8
DEFINE_GUID(IID_IDeskMovr, 0x72267f69, 0xa6f9, 0x11d0, 0xbc,
0x94, 0x00, 0xc0, 0x4f, 0xb6, 0x78, 0x63);
DEFINE_GUID(IID_IDiscMasterProgressEvents, 0xec9e51c1, 0x4e5d, 0x11d3, 0x91,
0x44, 0x00, 0x10, 0x4b, 0xa1, 0x1c, 0x5e);
DEFINE_GUID(IID_IDocViewSite, 0x87D605E0, 0xC511, 0x11CF, 0x89,
0xA9, 0x00, 0xA0, 0xC9, 0x05, 0x41, 0x29);
-DEFINE_GUID(IID_IDriveFolderExt, 0x98467961, 0x4f27, 0x4a1f, 0x96,
0x29, 0x22, 0xb0, 0x6d, 0x0b, 0x5c, 0xcb);
DEFINE_GUID(IID_IEFrameAuto, 0x0b7b9bb9, 0xade1, 0x4ea0, 0xa4,
0xb6, 0x02, 0xb9, 0xc6, 0x6e, 0x31, 0x69);
DEFINE_GUID(IID_IExtractImage, 0xbb2e617c, 0x0920, 0x11d1, 0x9a,
0x0b, 0x00, 0xc0, 0x4f, 0xc2, 0xd6, 0xc1);
DEFINE_GUID(IID_IExtractImage2, 0x953bb1ee, 0x93b4, 0x11d1, 0x98,
0xa3, 0x00, 0xc0, 0x4f, 0xb6, 0x87, 0xda);
diff --git a/modules/rostests/apitests/com/shell32.c
b/modules/rostests/apitests/com/shell32.c
index c7bae24ba2..76769e6c62 100644
--- a/modules/rostests/apitests/com/shell32.c
+++ b/modules/rostests/apitests/com/shell32.c
@@ -27,7 +27,7 @@ static const CLASS_AND_INTERFACES ExpectedInterfaces[] =
{ 0x24, &IID_ICDBurn },
{ 0x28, &IID_ICDBurnPriv },
{ 0x2c, &IID_IPersistPropertyBag },
- { 0x30, &IID_IDriveFolderExt },
+ { 0x30, &IID_IDriveFolderExtOld },
{ 0x34, &IID_INamespaceWalkCB },
{ 0x3c, &IID_IServiceProvider },
{ 0x40, &IID_ITransferAdviseSinkPriv },
