https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c8b42be0f49e4af31fcb0...
commit 4c8b42be0f49e4af31fcb0ccaa89afd39514756a Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Jan 19 00:00:10 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Jan 19 00:00:10 2018 +0100
[INCLUDE/WINE] Update atlbase.h. CORE-14225 --- sdk/include/reactos/wine/atlbase.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
diff --git a/sdk/include/reactos/wine/atlbase.h b/sdk/include/reactos/wine/atlbase.h index 1f91f55895..1e0d76082f 100644 --- a/sdk/include/reactos/wine/atlbase.h +++ b/sdk/include/reactos/wine/atlbase.h @@ -28,7 +28,9 @@ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 +#define _ATL_VER_90 0x0900 #define _ATL_VER_100 0x0a00 +#define _ATL_VER_110 0x0b00
#ifndef _ATL_VER #define _ATL_VER _ATL_VER_100 @@ -92,6 +94,23 @@ typedef struct _ATL_OBJMAP_ENTRYW_TAG void (WINAPI *pfnObjectMain)(BOOL bStarting); } _ATL_OBJMAP_ENTRYW, _ATL_OBJMAP_ENTRY30, _ATL_OBJMAP_ENTRY;
+typedef struct _ATL_OBJMAP_CACHE +{ + IUnknown *pCF; + DWORD dwRegister; +} _ATL_OBJMAP_CACHE; + +typedef struct _ATL_OBJMAP_ENTRY110 +{ + const CLSID* pclsid; + HRESULT (WINAPI *pfnUpdateRegistry)(BOOL bRegister); + _ATL_CREATORFUNC* pfnGetClassObject; + _ATL_CREATORFUNC* pfnCreateInstance; + _ATL_OBJMAP_CACHE* pCache; + _ATL_DESCRIPTIONFUNCW* pfnGetObjectDescription; + _ATL_CATMAPFUNC* pfnGetCategoryMap; + void (WINAPI *pfnObjectMain)(BOOL bStarting); +} _ATL_OBJMAP_ENTRY110, _ATL_OBJMAP_ENTRY_EX;
typedef struct _ATL_TERMFUNC_ELEM_TAG { @@ -184,6 +203,16 @@ typedef struct _ATL_WIN_MODULE70 CSimpleArray /* <ATOM> */ m_rgWindowClassAtoms; } _ATL_WIN_MODULE70;
+#if _ATL_VER >= _ATL_VER_110 +typedef struct _ATL_COM_MODULE70 +{ + UINT cbSize; + HINSTANCE m_hInstTypeLib; + _ATL_OBJMAP_ENTRY_EX **m_ppAutoObjMapFirst; + _ATL_OBJMAP_ENTRY_EX **m_ppAutoObjMapLast; + CComCriticalSection m_csObjMap; +} _ATL_COM_MODULE70, _ATL_COM_MODULE; +#else typedef struct _ATL_COM_MODULE70 { UINT cbSize; @@ -192,6 +221,7 @@ typedef struct _ATL_COM_MODULE70 _ATL_OBJMAP_ENTRY **m_ppAutoObjMapLast; CComCriticalSection m_csObjMap; } _ATL_COM_MODULE70, _ATL_COM_MODULE; +#endif
#if _ATL_VER >= _ATL_VER_70 typedef _ATL_MODULE70 _ATL_MODULE;
-
Amine Khaldi