Modifications to the Xtreme Toolkit Pro library

Our App uses the Xtreme Toolkit Pro library provided by Code Jocks.  https://codejock.com/products/toolkitpro/?2yn6s14z=zsp" rel="nofollow - https://codejock.com/products/toolkitpro

Currently, we are using version 17.3 of the library. The most current version of the library is 19.2, but we are using an older version, 17.3. It was planned for 14.1 to possibly move to the latest version.

We do not use a "stock" version of the library. We use a modified version of the library.

The modifications are as follows (assume $ is the root of the Toolkit Pro library):

1) Modify $/Workspace/ToolkitPro/ToolkitPro.cpp to add this line after the #include statements:

#define XTP_INIT_BY_REGULAR_DLL

That line changes initialization which we have to do because we use both the regular and Unicode versions of the library at the same time (when loading Enterprise Addin). It also follows that XTPInitDLL() needs to be called at some point before using the library–somewhere in InitInstance() of the caller's derived CWinApp derived class.

2) In $/Source/Common/XTPMacros.h, comment out the HashKey function instance. This causes conflicts within our app. It will compile fine, but bad things happen at runtime.

// #if (_MSC_VER >= 1300)
// template<> AFX_INLINE UINT AFXAPI HashKey<UINT_PTR>(UINT_PTR key) {
// return (DWORD)(((DWORD_PTR)key)>>4);
// }
// #endif

3) In the $/Source/Markup directory, modify the files XTPMarkupBuilder.cpp, XTPMarkupObject.cpp, and XTPMarkupParser to initialize their m_pComInitializer object with NULL. This is due to STAT-10088 found by Intel.

CXTPMarkupBuilder::CXTPMarkupBuilder(CXTPMarkupContext* pContext)
: m_pMarkupContext(pContext)
, m_pStaticExtension(NULL)
, m_pStaticResourceExtension(NULL)
// , m_pComInitializer(new CXTPComInitializer) //STAT-10088, replace new object/constructor with NULL
, m_pComInitializer(NULL)
{
ASSERT(m_pMarkupContext);
}

CXTPMarkupObject::CXTPMarkupObject()
: m_dwRef(1)
, m_pProperties(NULL)
, m_pLogicalParent(NULL)
, m_lpszMarkupTag(NULL)
, m_posExtension(NULL)
, m_pMarkupContext(NULL)
, m_pMarkupElement(NULL)
, m_pAssociatedProperty(NULL)
// , m_pComInitializer(new CXTPComInitializer) 
, m_pComInitializer(NULL)
{
EnableAutomation();
#ifdef _XTP_ACTIVEX
EnableTypeLib();
#endif
}

CXTPMarkupParser::CXTPMarkupParser()
: m_bInFixReferenceToUndeclaredNamespacePrefixX(FALSE)
// , m_pComInitializer(new CXTPComInitializer) 
, m_pComInitializer(NULL)
{
ResetErrorInfo();
}

4) Finally, there is a file that is added, $/Source/_XTPToolkitPro.h. This file is an edited version of the XTToolkitPro.h file found in the same directory. The purpose of the file is to duplicate the functionality of XTToolkitPro.h but to cut down on all the compiler messages that get spit out by using a plain XTToolkitPro.h file. The file is not for compiling the ToolkitPro library, but for compiling our app against ToolkitPro.

When our app uses ToolkitPro library, it does an include of $XXXXXXXX/include/xtpsupport.h. Assume $XXXXXXXX is where everything.sln is located, currently in TFS as $/XXXXXXXX/Trunk. The file xtpsupport.h has a #include of _XTPToolkitPro.h and some other definitions. It does have some version specific things that such when a different version of the ToolkitPro library is used, the file will have to be modified.

Any one can help?
Thanks,