Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 23:53:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ATL] Add some hacks for gcc,

Browse source 
since parsing templates is not something it can do
This commit is contained in:
Mark Jansen 2020-03-17 22:35:53 +01:00
parent 4439b53800
commit 1437433039
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sdk/lib/atl/atlcom.h
View file

@ -456,7 +456,7 @@ class CComCreator2
public: public:
static HRESULT WINAPI CreateInstance(void *pv, REFIID riid, LPVOID *ppv) static HRESULT WINAPI CreateInstance(void *pv, REFIID riid, LPVOID *ppv)
{ {
ATLASSERT(ppv != NULL && riid != NULL); ATLASSERT(ppv != NULL && &riid != NULL);
if (pv == NULL) if (pv == NULL)
return T1::CreateInstance(NULL, riid, ppv); return T1::CreateInstance(NULL, riid, ppv);

10
sdk/lib/atl/atlwin.h
View file

@ -1465,6 +1465,7 @@ public:
// + Hacks for gcc // + Hacks for gcc
using CWindowImplRoot<TBase>::WINSTATE_DESTROYED; using CWindowImplRoot<TBase>::WINSTATE_DESTROYED;
using CWindowImplRoot<TBase>::m_thunk; using CWindowImplRoot<TBase>::m_thunk;
using CWindowImplRoot<TBase>::m_hWnd;
// - Hacks for gcc // - Hacks for gcc
WNDPROC m_pfnSuperWindowProc; WNDPROC m_pfnSuperWindowProc;
@ -1623,6 +1624,11 @@ template <class T, class TBase = CWindow, class TWinTraits = CControlWinTraits>
class CWindowImpl : public CWindowImplBaseT<TBase, TWinTraits> class CWindowImpl : public CWindowImplBaseT<TBase, TWinTraits>
{ {
public: public:
// + Hacks for gcc
using CWindowImplRoot<TBase>::m_hWnd;
// - Hacks for gcc
static LPCTSTR GetWndCaption() static LPCTSTR GetWndCaption()
{ {
return NULL; return NULL;
@ -1655,6 +1661,10 @@ template <class TBase = CWindow, class TWinTraits = CControlWinTraits>
class CContainedWindowT : public TBase class CContainedWindowT : public TBase
{ {
public: public:
// + Hacks for gcc
using TBase::m_hWnd;
// - Hacks for gcc
CWndProcThunk m_thunk; CWndProcThunk m_thunk;
LPCTSTR m_lpszClassName; LPCTSTR m_lpszClassName;
WNDPROC m_pfnSuperWindowProc; WNDPROC m_pfnSuperWindowProc;