mirror of
https://github.com/reactos/reactos.git
synced 2024-12-28 01:55:19 +00:00
[ATL][ATL_APITEST] Independent ReactOS ATL (RATL) support (#5657)
This is an attempt to make ReactOS ATL (RATL) independent. https://github.com/katahiromz/RATL CORE-19153
This commit is contained in:
parent
490fbfb2c5
commit
ebfec38cd1
4 changed files with 16 additions and 2 deletions
|
@ -63,13 +63,13 @@ public:
|
||||||
END_COM_MAP()
|
END_COM_MAP()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifndef __RATL__ // Avoid conflict (causing assertion at CAtlModule::CAtlModule)
|
||||||
class CDumExe: public CAtlExeModuleT<CDumExe>
|
class CDumExe: public CAtlExeModuleT<CDumExe>
|
||||||
{
|
{
|
||||||
|
|
||||||
};
|
};
|
||||||
CDumExe dum;
|
CDumExe dum;
|
||||||
|
#endif
|
||||||
|
|
||||||
START_TEST(CComObject)
|
START_TEST(CComObject)
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,6 +80,8 @@ public:
|
||||||
#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)>
|
#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)>
|
||||||
#elif defined(__GNUC__)
|
#elif defined(__GNUC__)
|
||||||
#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)>
|
#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)>
|
||||||
|
#elif defined(__RATL__)
|
||||||
|
#define DECLARE_QIPTR(type) CComQIIDPtr<I_ID(type)>
|
||||||
#else
|
#else
|
||||||
#define DECLARE_QIPTR(type) CComQIPtr<type>
|
#define DECLARE_QIPTR(type) CComQIPtr<type>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -6,6 +6,12 @@
|
||||||
#include <atlcore.h>
|
#include <atlcore.h>
|
||||||
#include <atlexcept.h>
|
#include <atlexcept.h>
|
||||||
|
|
||||||
|
#ifdef __RATL__
|
||||||
|
#ifndef _In_count_
|
||||||
|
#define _In_count_(nLength)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace ATL
|
namespace ATL
|
||||||
{
|
{
|
||||||
struct CStringData;
|
struct CStringData;
|
||||||
|
|
|
@ -49,6 +49,12 @@ inline LONG_PTR GetWindowLongPtr(HWND hWnd, int nIndex)
|
||||||
#pragma push_macro("SubclassWindow")
|
#pragma push_macro("SubclassWindow")
|
||||||
#undef SubclassWindow
|
#undef SubclassWindow
|
||||||
|
|
||||||
|
#ifdef __RATL__
|
||||||
|
#ifndef _Post_z_
|
||||||
|
#define _Post_z_
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace ATL
|
namespace ATL
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue