https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1437433039a525004ad0267a7361e9d788e745cc
commit 1437433039a525004ad0267a7361e9d788e745cc Author: Mark Jansen <[email protected]> AuthorDate: Tue Mar 17 22:35:53 2020 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Sat Apr 4 19:55:31 2020 +0200 [ATL] Add some hacks for gcc, since parsing templates is not something it can do --- sdk/lib/atl/atlcom.h | 2 +- sdk/lib/atl/atlwin.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sdk/lib/atl/atlcom.h b/sdk/lib/atl/atlcom.h index 57121ff3973..9c45c2eab2a 100644 --- a/sdk/lib/atl/atlcom.h +++ b/sdk/lib/atl/atlcom.h @@ -456,7 +456,7 @@ class CComCreator2 public: static HRESULT WINAPI CreateInstance(void *pv, REFIID riid, LPVOID *ppv) { - ATLASSERT(ppv != NULL && riid != NULL); + ATLASSERT(ppv != NULL && &riid != NULL); if (pv == NULL) return T1::CreateInstance(NULL, riid, ppv); diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index c35c936acab..70f0413b41a 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1465,6 +1465,7 @@ public: // + Hacks for gcc using CWindowImplRoot<TBase>::WINSTATE_DESTROYED; using CWindowImplRoot<TBase>::m_thunk; + using CWindowImplRoot<TBase>::m_hWnd; // - Hacks for gcc WNDPROC m_pfnSuperWindowProc; @@ -1623,6 +1624,11 @@ template <class T, class TBase = CWindow, class TWinTraits = CControlWinTraits> class CWindowImpl : public CWindowImplBaseT<TBase, TWinTraits> { public: + // + Hacks for gcc + using CWindowImplRoot<TBase>::m_hWnd; + // - Hacks for gcc + + static LPCTSTR GetWndCaption() { return NULL; @@ -1655,6 +1661,10 @@ template <class TBase = CWindow, class TWinTraits = CControlWinTraits> class CContainedWindowT : public TBase { public: + // + Hacks for gcc + using TBase::m_hWnd; + // - Hacks for gcc + CWndProcThunk m_thunk; LPCTSTR m_lpszClassName; WNDPROC m_pfnSuperWindowProc;
