[Decaldev-cvscommit] source/Decal StdAfx.h,1.5,1.6 DecalRes.cpp,1.2,1.3 DecalManager.cpp,1.16,1.17 DecalEnum.cpp,1.7,1.8 ActiveXSurrogate.cpp,1.5,1.6 ACHooks.cpp,1.51,1.52

[<par...@us...>]

Update of /cvsroot/decaldev/source/Decal
In directory sc8-pr-cvs1:/tmp/cvs-serv1222

Modified Files:
	StdAfx.h DecalRes.cpp DecalManager.cpp DecalEnum.cpp 
	ActiveXSurrogate.cpp ACHooks.cpp 
Log Message:
regkey changes for vc6 compat

Index: StdAfx.h
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/StdAfx.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** StdAfx.h	23 May 2003 02:20:46 -0000	1.5
--- StdAfx.h	29 May 2003 20:50:36 -0000	1.6
***************
*** 37,40 ****
--- 37,42 ----
  #import <msxml.dll>
  
+ #include "../include/Helpers.h"
+ 
  //{{AFX_INSERT_LOCATION}}
  // Microsoft Visual C++ will insert additional declarations immediately before the previous line.

Index: DecalRes.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/DecalRes.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DecalRes.cpp	23 May 2003 02:20:46 -0000	1.2
--- DecalRes.cpp	29 May 2003 20:50:36 -0000	1.3
***************
*** 37,41 ****
  
     // Otherwise, manufacture a type library filename
!    CRegKey key;
     key.Open( HKEY_LOCAL_MACHINE, _T( "Software\\Decal\\Agent" ) );
  
--- 37,41 ----
  
     // Otherwise, manufacture a type library filename
!    RegKey key;
     key.Open( HKEY_LOCAL_MACHINE, _T( "Software\\Decal\\Agent" ) );
  

Index: DecalManager.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/DecalManager.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DecalManager.cpp	23 May 2003 02:20:46 -0000	1.16
--- DecalManager.cpp	29 May 2003 20:50:36 -0000	1.17
***************
*** 40,44 ****
           DWORD dwCount = MAX_PATH;
           TCHAR szBuffer[ MAX_PATH ];
!          CRegKey key;
           key.Open( HKEY_LOCAL_MACHINE, pPath->szKey );
  		 key.QueryStringValue (pPath->szValue, szBuffer, &dwCount);
--- 40,44 ----
           DWORD dwCount = MAX_PATH;
           TCHAR szBuffer[ MAX_PATH ];
!          RegKey key;
           key.Open( HKEY_LOCAL_MACHINE, pPath->szKey );
  		 key.QueryStringValue (pPath->szValue, szBuffer, &dwCount);

Index: DecalEnum.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/DecalEnum.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DecalEnum.cpp	23 May 2003 02:20:46 -0000	1.7
--- DecalEnum.cpp	29 May 2003 20:50:36 -0000	1.8
***************
*** 22,26 ****
  
     // Compile the new order from the 
!    CRegKey hkGroup;
     if( hkGroup.Create( HKEY_LOCAL_MACHINE, m_strGroupKey.c_str() ) != ERROR_SUCCESS ) 
     {
--- 22,26 ----
  
     // Compile the new order from the 
!    RegKey hkGroup;
     if( hkGroup.Create( HKEY_LOCAL_MACHINE, m_strGroupKey.c_str() ) != ERROR_SUCCESS ) 
     {
***************
*** 64,68 ****
  
     // Load and sort the list
!    CRegKey hkGroup;
     if( hkGroup.Create( HKEY_LOCAL_MACHINE, m_strGroupKey.c_str() ) != ERROR_SUCCESS ) 
        return Error ( IDE_GROUPKEYNOTOPEN );
--- 64,68 ----
  
     // Load and sort the list
!    RegKey hkGroup;
     if( hkGroup.Create( HKEY_LOCAL_MACHINE, m_strGroupKey.c_str() ) != ERROR_SUCCESS ) 
        return Error ( IDE_GROUPKEYNOTOPEN );
***************
*** 115,119 ****
           continue;
  
!       CRegKey hkItem;
        if ( hkItem.Open ( hkGroup, szCLSID ) != ERROR_SUCCESS )
           continue;
--- 115,119 ----
           continue;
  
!       RegKey hkItem;
        if ( hkItem.Open ( hkGroup, szCLSID ) != ERROR_SUCCESS )
           continue;

Index: ActiveXSurrogate.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ActiveXSurrogate.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ActiveXSurrogate.cpp	23 May 2003 02:20:46 -0000	1.5
--- ActiveXSurrogate.cpp	29 May 2003 20:50:37 -0000	1.6
***************
*** 89,93 ****
                 ::_tcscat ( ::_tcscpy ( szRegKey, _T( "Software\\Decal\\Plugins\\" ) ), szCLSID );
  
!                CRegKey key;
                 key.Create( HKEY_LOCAL_MACHINE, szRegKey );
  
--- 89,93 ----
                 ::_tcscat ( ::_tcscpy ( szRegKey, _T( "Software\\Decal\\Plugins\\" ) ), szCLSID );
  
!                RegKey key;
                 key.Create( HKEY_LOCAL_MACHINE, szRegKey );
  
***************
*** 117,121 ****
                    ::_tcscat ( ::_tcscpy ( szRegKey, _T( "Software\\Decal\\Plugins\\" ) ), szCLSID );
  
!                   CRegKey key;
                    key.Create( HKEY_LOCAL_MACHINE, szRegKey );
  
--- 117,121 ----
                    ::_tcscat ( ::_tcscpy ( szRegKey, _T( "Software\\Decal\\Plugins\\" ) ), szCLSID );
  
!                   RegKey key;
                    key.Create( HKEY_LOCAL_MACHINE, szRegKey );
  
***************
*** 152,156 ****
     ::_tcscat ( ::_tcscpy ( szParent, _T( "Software\\Decal\\Plugins\\" ) ), OLE2T( m_strGroup ) );
  
!    CRegKey rk;
     if( rk.Open( HKEY_LOCAL_MACHINE, szParent ) != ERROR_SUCCESS )
     {
--- 152,156 ----
     ::_tcscat ( ::_tcscpy ( szParent, _T( "Software\\Decal\\Plugins\\" ) ), OLE2T( m_strGroup ) );
  
!    RegKey rk;
     if( rk.Open( HKEY_LOCAL_MACHINE, szParent ) != ERROR_SUCCESS )
     {

Index: ACHooks.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** ACHooks.cpp	23 May 2003 02:20:46 -0000	1.51
--- ACHooks.cpp	29 May 2003 20:50:37 -0000	1.52
***************
*** 110,114 ****
  	DWORD lTimestampFormatLength = MAX_PATH;
  
! 	CRegKey key;
  	if( key.Open( HKEY_LOCAL_MACHINE, "SOFTWARE\\Decal", KEY_READ ) == ERROR_SUCCESS )
  	{
--- 110,114 ----
  	DWORD lTimestampFormatLength = MAX_PATH;
  
! 	RegKey key;
  	if( key.Open( HKEY_LOCAL_MACHINE, "SOFTWARE\\Decal", KEY_READ ) == ERROR_SUCCESS )
  	{
***************
*** 180,184 ****
  		lVerRelease = atol( szTemp );
  
! 		CRegKey rk;
  		if( rk.Open( HKEY_LOCAL_MACHINE, _T( "Software\\Microsoft\\Microsoft Games\\Asheron's Call\\1.00" ) ) == ERROR_SUCCESS )
  		{
--- 180,184 ----
  		lVerRelease = atol( szTemp );
  
! 		RegKey rk;
  		if( rk.Open( HKEY_LOCAL_MACHINE, _T( "Software\\Microsoft\\Microsoft Games\\Asheron's Call\\1.00" ) ) == ERROR_SUCCESS )
  		{