Update of /cvsroot/decaldev/source/Decal
In directory sc8-pr-cvs1:/tmp/cvs-serv7944/Decal
Modified Files:
ACHooks.cpp ActiveXSurrogate.cpp Decal.def Decal.vcproj
DecalEnum.cpp DecalManager.cpp DecalRes.cpp StdAfx.cpp
StdAfx.h
Log Message:
Lots of warning cleanup, and add ReleaseMinDependency configuration to all projects that don't have it (or equivalent). Remove dependence on C Runtime completely.
Index: ACHooks.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ACHooks.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** ACHooks.cpp 30 Mar 2003 07:11:24 -0000 1.50
--- ACHooks.cpp 23 May 2003 02:20:46 -0000 1.51
***************
*** 113,123 ****
if( key.Open( HKEY_LOCAL_MACHINE, "SOFTWARE\\Decal", KEY_READ ) == ERROR_SUCCESS )
{
! if( key.QueryValue( dwTimestamp, "Timestamp" ) != ERROR_SUCCESS )
dwTimestamp = 0;
! if( key.QueryValue( szTimestampFormat, "TimestampFormat", &lTimestampFormatLength ) != ERROR_SUCCESS ) /* Heyus 21 March 2003 */
memset( szTimestampFormat, 0, sizeof(szTimestampFormat) ), strncpy( szTimestampFormat, "[%H:%M]", sizeof( szTimestampFormat ) );
! if( key.QueryValue( g_lTimestampColor, "TimestampColor" ) != ERROR_SUCCESS )
g_lTimestampColor = 12; // Grey
--- 113,123 ----
if( key.Open( HKEY_LOCAL_MACHINE, "SOFTWARE\\Decal", KEY_READ ) == ERROR_SUCCESS )
{
! if( key.QueryDWORDValue( _T("Timestamp"), dwTimestamp ) != ERROR_SUCCESS )
dwTimestamp = 0;
! if( key.QueryStringValue( _T("TimestampFormat"), szTimestampFormat, &lTimestampFormatLength ) != ERROR_SUCCESS ) /* Heyus 21 March 2003 */
memset( szTimestampFormat, 0, sizeof(szTimestampFormat) ), strncpy( szTimestampFormat, "[%H:%M]", sizeof( szTimestampFormat ) );
! if( key.QueryDWORDValue( _T("TimestampColor"), g_lTimestampColor ) != ERROR_SUCCESS )
g_lTimestampColor = 12; // Grey
***************
*** 136,140 ****
g_lTimestampColor = 12; // Grey
! g_bTimestamp = static_cast< bool >( dwTimestamp );
--- 136,140 ----
g_lTimestampColor = 12; // Grey
! g_bTimestamp = dwTimestamp ? true : false ;
***************
*** 154,158 ****
key.Open( HKEY_LOCAL_MACHINE, "SOFTWARE\\Decal\\Agent", KEY_READ );
! key.QueryValue( szPath, "AgentPath", &dwCount );
strncat( szPath, "\\memlocs.xml", MAX_PATH );
--- 154,158 ----
key.Open( HKEY_LOCAL_MACHINE, "SOFTWARE\\Decal\\Agent", KEY_READ );
! key.QueryStringValue( _T("AgentPath"), szPath, &dwCount );
strncat( szPath, "\\memlocs.xml", MAX_PATH );
***************
*** 185,189 ****
TCHAR szClientPath[ MAX_PATH ];
DWORD dwPathLength = MAX_PATH;
! if( rk.QueryValue ( szClientPath, _T( "path" ), &dwPathLength ) == ERROR_SUCCESS )
{
::_tcscpy( szClientPath + ( dwPathLength - 1 ), _T( "\\client.exe" ) );
--- 185,189 ----
TCHAR szClientPath[ MAX_PATH ];
DWORD dwPathLength = MAX_PATH;
! if( rk.QueryStringValue ( _T( "path" ), szClientPath, &dwPathLength ) == ERROR_SUCCESS )
{
::_tcscpy( szClientPath + ( dwPathLength - 1 ), _T( "\\client.exe" ) );
Index: ActiveXSurrogate.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/ActiveXSurrogate.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ActiveXSurrogate.cpp 30 Sep 2001 03:07:37 -0000 1.4
--- ActiveXSurrogate.cpp 23 May 2003 02:20:46 -0000 1.5
***************
*** 95,102 ****
pClass1->GetDocumentation( MEMBERID_NIL, NULL, &strDescription, NULL, NULL );
! key.SetValue( OLE2T( strDescription ) );
! key.SetValue( szFilename, _T( "File" ) );
! key.SetValue( 1, _T( "Enabled" ) );
! key.SetValue( _T( "{7559F22F-C56F-4621-AE08-9C354D799D4B}" ), _T( "Uninstall" ) );
++ nFound;
--- 95,102 ----
pClass1->GetDocumentation( MEMBERID_NIL, NULL, &strDescription, NULL, NULL );
! key.SetStringValue( NULL, OLE2T( strDescription ) );
! key.SetStringValue( _T("File"), szFilename );
! key.SetDWORDValue( _T( "Enabled" ), 1 );
! key.SetStringValue( _T("Uninstall"), _T( "{7559F22F-C56F-4621-AE08-9C354D799D4B}" ) );
++ nFound;
***************
*** 124,136 ****
// Friendly name
! key.SetValue( OLE2T( strDescription ) );
// File for uninstalling
! key.SetValue( szFilename, _T( "File" ) );
// Enabled by default
! key.SetValue( 1, _T( "Enabled" ) );
// This object uninstalls
! key.SetValue( _T( "{7559F22F-C56F-4621-AE08-9C354D799D4B}" ), _T( "Uninstall" ) );
// The V1 surrogate
! key.SetValue( _T( "{3D837F6E-B5CA-4604-885F-7AB45FCFA62A}" ), _T( "Surrogate" ) );
++ nFound;
--- 124,136 ----
// Friendly name
! key.SetStringValue( NULL, OLE2T( strDescription ) );
// File for uninstalling
! key.SetStringValue( _T( "File" ), szFilename );
// Enabled by default
! key.SetDWORDValue( _T( "Enabled" ), 1 );
// This object uninstalls
! key.SetStringValue( _T("Uninstall"), _T( "{7559F22F-C56F-4621-AE08-9C354D799D4B}" ));
// The V1 surrogate
! key.SetStringValue( _T( "Surrogate" ), _T( "{3D837F6E-B5CA-4604-885F-7AB45FCFA62A}" ) );
++ nFound;
Index: Decal.def
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/Decal.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Decal.def 22 Sep 2001 22:50:22 -0000 1.1
--- Decal.def 23 May 2003 02:20:46 -0000 1.2
***************
*** 4,9 ****
EXPORTS
! DllCanUnloadNow @1 PRIVATE
! DllGetClassObject @2 PRIVATE
! DllRegisterServer @3 PRIVATE
! DllUnregisterServer @4 PRIVATE
--- 4,9 ----
EXPORTS
! DllCanUnloadNow PRIVATE
! DllGetClassObject PRIVATE
! DllRegisterServer PRIVATE
! DllUnregisterServer PRIVATE
Index: Decal.vcproj
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/Decal.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Decal.vcproj 13 May 2003 07:16:09 -0000 1.1
--- Decal.vcproj 23 May 2003 02:20:46 -0000 1.2
***************
*** 87,91 ****
ConfigurationType="2"
UseOfMFC="0"
! UseOfATL="2"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
--- 87,91 ----
ConfigurationType="2"
UseOfMFC="0"
! UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
***************
*** 101,105 ****
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="TRUE"
! RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
--- 101,105 ----
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
StringPooling="TRUE"
! RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="3"
***************
*** 124,128 ****
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\Release"
! IgnoreDefaultLibraryNames="libcmt.lib"
ModuleDefinitionFile=".\Decal.def"
GenerateDebugInformation="TRUE"
--- 124,128 ----
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\Release"
! IgnoreDefaultLibraryNames=""
ModuleDefinitionFile=".\Decal.def"
GenerateDebugInformation="TRUE"
***************
*** 302,305 ****
--- 302,384 ----
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
+ <Configuration
+ Name="Release MinDependency|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="2"
+ UseOfMFC="0"
+ UseOfATL="2"
+ ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="4"
+ GlobalOptimizations="TRUE"
+ InlineFunctionExpansion="1"
+ EnableIntrinsicFunctions="TRUE"
+ FavorSizeOrSpeed="2"
+ OmitFramePointers="TRUE"
+ AdditionalIncludeDirectories="..\Include"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderFile=".\ReleaseMinSize/Decal.pch"
+ AssemblerListingLocation=".\ReleaseMinDependency/"
+ ObjectFile=".\ReleaseMinDependency/"
+ ProgramDataBaseFileName=".\ReleaseMinDependency/"
+ BrowseInformation="1"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="TRUE"
+ AdditionalDependencies="version.lib odbc32.lib odbccp32.lib"
+ OutputFile=".\..\Release/Decal.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\Release"
+ IgnoreDefaultLibraryNames=""
+ ModuleDefinitionFile=".\Decal.def"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\..\Release/Decal.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\Release/Decal.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalIncludeDirectories="..\Include"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ GenerateStublessProxies="TRUE"
+ TypeLibraryName=".\..\Release/Decal.tlb"
+ HeaderFileName=""/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="4105"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
</Configurations>
<References>
***************
*** 347,350 ****
--- 426,437 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 386,389 ****
--- 473,484 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 425,428 ****
--- 520,531 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 471,474 ****
--- 574,587 ----
InterfaceIdentifierFileName="..\Include\Decal_i.c"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalIncludeDirectories=""
+ TargetEnvironment="1"
+ TypeLibraryName="Decal.tlb"
+ HeaderFileName="..\Include\Decal.h"
+ InterfaceIdentifierFileName="..\Include\Decal_i.c"/>
+ </FileConfiguration>
</File>
<File
***************
*** 502,505 ****
--- 615,625 ----
AdditionalIncludeDirectories="$(OUTDIR)"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="$(OUTDIR)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 541,544 ****
--- 661,672 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 580,583 ****
--- 708,719 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 619,622 ****
--- 755,766 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 658,661 ****
--- 802,813 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 701,704 ****
--- 853,865 ----
UsePrecompiledHeader="1"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ UsePrecompiledHeader="1"
+ BrowseInformation="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 739,742 ****
--- 900,911 ----
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;$(NoInherit)"
BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ BrowseInformation="1"/>
</FileConfiguration>
</File>
Index: DecalEnum.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/DecalEnum.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DecalEnum.cpp 25 Apr 2003 04:51:39 -0000 1.6
--- DecalEnum.cpp 23 May 2003 02:20:46 -0000 1.7
***************
*** 29,33 ****
}
! hkGroup.SetValue( strOrder.c_str(), _T( "Order" ) );
}
--- 29,33 ----
}
! hkGroup.SetStringValue (_T("Order"), strOrder.c_str ());
}
***************
*** 82,86 ****
// Load an existing order
! if ( hkGroup.QueryValue ( szOrder, _T( "Order" ), &nMaxOrder ) == ERROR_SUCCESS )
{
szEndOrder = szOrder + ( nMaxOrder - 1 );
--- 82,86 ----
// Load an existing order
! if ( hkGroup.QueryStringValue (_T("Order"), szOrder, &nMaxOrder) == ERROR_SUCCESS )
{
szEndOrder = szOrder + ( nMaxOrder - 1 );
***************
*** 125,129 ****
ke.m_clsid = clsid;
! if ( hkItem.QueryValue ( szSequence, _T( "Order" ), &dwSequence ) == ERROR_SUCCESS )
{
_ASSERTE ( szSequence[ 1 ] == _T( '\0' ) );
--- 125,129 ----
ke.m_clsid = clsid;
! if ( hkItem.QueryStringValue ( _T( "Order" ), szSequence, &dwSequence ) == ERROR_SUCCESS )
{
_ASSERTE ( szSequence[ 1 ] == _T( '\0' ) );
***************
*** 139,143 ****
m_keys.push_back ( ke );
TCHAR szVal[ 2 ] = { ke.m_letter, _T( '\0' ) };
! hkItem.SetValue ( szVal, _T( "Order" ) );
// The sequence is changed by adding items
--- 139,143 ----
m_keys.push_back ( ke );
TCHAR szVal[ 2 ] = { ke.m_letter, _T( '\0' ) };
! hkItem.SetStringValue ( _T( "Order" ), szVal );
// The sequence is changed by adding items
***************
*** 220,224 ****
TCHAR szName[ MAX_PATH ];
DWORD dwSize = MAX_PATH;
! if( m_key.QueryValue( szName, NULL, &dwSize ) != ERROR_SUCCESS )
return E_FAIL;
--- 220,224 ----
TCHAR szName[ MAX_PATH ];
DWORD dwSize = MAX_PATH;
! if( m_key.QueryStringValue( NULL, szName, &dwSize ) != ERROR_SUCCESS )
return E_FAIL;
***************
*** 264,268 ****
DWORD dwEnabled;
! if( m_key.QueryValue( dwEnabled, _T( "Enabled" ) ) != ERROR_SUCCESS )
// Plugins are enabled when this value is ommitted
dwEnabled = TRUE;
--- 264,268 ----
DWORD dwEnabled;
! if( m_key.QueryDWORDValue( _T("Enabled"), dwEnabled ) != ERROR_SUCCESS )
// Plugins are enabled when this value is ommitted
dwEnabled = TRUE;
***************
*** 281,285 ****
}
! if( m_key.SetValue( ( ( newVal ) ? 1 : 0 ), _T( "Enabled" ) ) != ERROR_SUCCESS )
return E_FAIL;
--- 281,285 ----
}
! if( m_key.SetDWORDValue( _T( "Enabled" ), ( ( newVal ) ? 1 : 0 ) ) != ERROR_SUCCESS )
return E_FAIL;
***************
*** 364,368 ****
DWORD dwSize = MAX_PATH + 1;
! if( m_key.QueryValue( szName, _T( "Surrogate" ), &dwSize ) != ERROR_SUCCESS )
{
// If the surrogate is not found, return the NULL guid
--- 364,368 ----
DWORD dwSize = MAX_PATH + 1;
! if( m_key.QueryStringValue( _T("Surrogate"), szName, &dwSize ) != ERROR_SUCCESS )
{
// If the surrogate is not found, return the NULL guid
***************
*** 392,396 ****
TCHAR szName[ MAX_PATH ];
DWORD dwSize = MAX_PATH;
! if( m_key.QueryValue( szName, NULL, &dwSize ) != ERROR_SUCCESS )
return E_FAIL;
--- 392,396 ----
TCHAR szName[ MAX_PATH ];
DWORD dwSize = MAX_PATH;
! if( m_key.QueryStringValue( NULL, szName, &dwSize ) != ERROR_SUCCESS )
return E_FAIL;
***************
*** 429,433 ****
{
DWORD dwValue;
! if( m_key.QueryValue( dwValue, szValueName ) != ERROR_SUCCESS )
return E_FAIL;
--- 429,433 ----
{
DWORD dwValue;
! if( m_key.QueryDWORDValue( szValueName, dwValue ) != ERROR_SUCCESS )
return E_FAIL;
***************
*** 443,447 ****
TCHAR szValue[ MAX_PATH ];
DWORD dwSize = MAX_PATH;
! if( m_key.QueryValue( szValue, szValueName, &dwSize ) != ERROR_SUCCESS )
return E_FAIL;
--- 443,447 ----
TCHAR szValue[ MAX_PATH ];
DWORD dwSize = MAX_PATH;
! if( m_key.QueryStringValue( szValueName, szValue, &dwSize ) != ERROR_SUCCESS )
return E_FAIL;
Index: DecalManager.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/DecalManager.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DecalManager.cpp 25 Apr 2003 04:51:39 -0000 1.15
--- DecalManager.cpp 23 May 2003 02:20:46 -0000 1.16
***************
*** 42,46 ****
CRegKey key;
key.Open( HKEY_LOCAL_MACHINE, pPath->szKey );
! key.QueryValue( szBuffer, pPath->szValue, &dwCount );
strOut += T2A( szBuffer );
--- 42,46 ----
CRegKey key;
key.Open( HKEY_LOCAL_MACHINE, pPath->szKey );
! key.QueryStringValue (pPath->szValue, szBuffer, &dwCount);
strOut += T2A( szBuffer );
Index: DecalRes.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/DecalRes.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DecalRes.cpp 22 Sep 2001 22:50:22 -0000 1.1
--- DecalRes.cpp 23 May 2003 02:20:46 -0000 1.2
***************
*** 42,46 ****
TCHAR szPath[ MAX_PATH ];
DWORD dwPath = MAX_PATH;
! key.QueryValue( szPath, _T( "PluginPath" ), &dwPath );
if( szPath[ ::_tcslen( szPath ) - 1 ] != _T( '\\' ) )
--- 42,46 ----
TCHAR szPath[ MAX_PATH ];
DWORD dwPath = MAX_PATH;
! key.QueryStringValue (_T("PluginPath"), szPath, &dwPath);
if( szPath[ ::_tcslen( szPath ) - 1 ] != _T( '\\' ) )
Index: StdAfx.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp 22 Sep 2001 22:50:22 -0000 1.1
--- StdAfx.cpp 23 May 2003 02:20:46 -0000 1.2
***************
*** 4,12 ****
#include "stdafx.h"
-
- #ifdef _ATL_STATIC_REGISTRY
- #include <statreg.h>
- #include <statreg.cpp>
- #endif
-
- #include <atlimpl.cpp>
--- 4,5 ----
Index: StdAfx.h
===================================================================
RCS file: /cvsroot/decaldev/source/Decal/StdAfx.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StdAfx.h 30 Aug 2002 08:44:57 -0000 1.4
--- StdAfx.h 23 May 2003 02:20:46 -0000 1.5
***************
*** 11,17 ****
#define STRICT
! #ifndef _WIN32_WINNT
! #define _WIN32_WINNT 0x0400
! #endif
#define _ATL_APARTMENT_THREADED
#define DIRECTINPUT_VERSION 0x600
--- 11,15 ----
#define STRICT
! #define _WIN32_WINDOWS 0x0410
#define _ATL_APARTMENT_THREADED
#define DIRECTINPUT_VERSION 0x600
|