Update of /cvsroot/decaldev/source/Decal
In directory sc8-pr-cvs1:/tmp/cvs-serv3110/Decal
Modified Files:
ACHooks.cpp ACHooks.h
Log Message:
Fixed VC7 vs VC6 Compile Issues #if'd it.
Index: ACHooks.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ACHooks.cpp 13 Jan 2003 04:48:15 -0000 1.36
--- ACHooks.cpp 13 Jan 2003 05:30:40 -0000 1.37
***************
*** 821,826 ****
if( m_bDecalRef )
{
! /* CComPtr< DecalPlugins::IPluginSite > pSite;
! if( m_pDecal->get_Object( _bstr_t( "services\\DecalPlugins.InjectService\\site" ), __uuidof( DecalPlugins::IPluginSite ), reinterpret_cast< void ** >( &pSite ) ) == S_OK )
{
if( pSite->get_Focus( pVal ) != S_OK )
--- 821,826 ----
if( m_bDecalRef )
{
! CComPtr< IPSite > pSite;
! if( m_pDecal->get_Object( _bstr_t( "services\\DecalPlugins.InjectService\\site" ), __uuidof( IPSite ), reinterpret_cast< void ** >( &pSite ) ) == S_OK )
{
if( pSite->get_Focus( pVal ) != S_OK )
***************
*** 835,839 ****
*pVal = *pChatState ? VARIANT_TRUE : VARIANT_FALSE;
! return S_OK;*/
}
--- 835,839 ----
*pVal = *pChatState ? VARIANT_TRUE : VARIANT_FALSE;
! return S_OK;
}
Index: ACHooks.h
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ACHooks.h 13 Jan 2003 04:48:15 -0000 1.30
--- ACHooks.h 13 Jan 2003 05:30:40 -0000 1.31
***************
*** 5,9 ****
--- 5,16 ----
#include "DecalManager.h"
#include "DecalCP.h"
+ // .NET vs VC6.0 Compiler Config
+ #if _MSC_VER > 1200 // .NET
+ #import "..\Include\Inject.tlb"
+ #define IPSite DecalPlugins::IPluginSite
+ #else // Not .Net
#include "..\inject\Inject.h"
+ #define IPSite IPluginSite
+ #endif
struct sMemoryLocation
|
