From 6f1b1324940a7e9827173abbdfaa504f3018ff05 Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Sun, 2 Nov 2014 13:35:03 +0000 Subject: [PATCH] [ATL] - Add a couple of macros needed for the time we will be able to support aggregation with ATL svn path=/branches/shell-experiments/; revision=65182 --- lib/atl/atlcom.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/atl/atlcom.h b/lib/atl/atlcom.h index f00aa865e7a..b260e20cda4 100644 --- a/lib/atl/atlcom.h +++ b/lib/atl/atlcom.h @@ -521,6 +521,11 @@ public: \ #define COM_INTERFACE_ENTRY_IID(iid, x) \ {&iid, offsetofclass(x, _ComMapClass), _ATL_SIMPLEMAPENTRY}, +#define COM_INTERFACE_ENTRY(x) \ + {&_ATL_IIDOF(x), \ + offsetofclass(x, _ComMapClass), \ + _ATL_SIMPLEMAPENTRY}, + #define COM_INTERFACE_ENTRY2_IID(iid, x, x2) \ {&iid, \ reinterpret_cast(static_cast(static_cast(reinterpret_cast<_ComMapClass *>(_ATL_PACKING)))) - _ATL_PACKING, \ @@ -579,6 +584,11 @@ public: \ public: \ typedef ATL::CComCreator > _CreatorClass; +#define COM_INTERFACE_ENTRY_AGGREGATE(iid, punk) \ + {&iid, \ + (DWORD_PTR)offsetof(_ComMapClass, punk), \ + _Delegate}, + #define DECLARE_GET_CONTROLLING_UNKNOWN() \ public: \ virtual IUnknown *GetControllingUnknown() \