Menu
▾
▴
[Decaldev-cvscommit] source/DecalInput DecalInput.def,1.1,1.2 DecalInput.vcproj,1.1,1.2 InputService.cpp,1.7,1.8 StdAfx.cpp,1.1,1.2 StdAfx.h,1.2,1.3
|
From: <ma...@us...> - 2003-05-23 02:21:20
|
Update of /cvsroot/decaldev/source/DecalInput
In directory sc8-pr-cvs1:/tmp/cvs-serv7944/DecalInput
Modified Files:
DecalInput.def DecalInput.vcproj InputService.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: DecalInput.def
===================================================================
RCS file: /cvsroot/decaldev/source/DecalInput/DecalInput.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DecalInput.def 22 Sep 2001 22:50:22 -0000 1.1
--- DecalInput.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: DecalInput.vcproj
===================================================================
RCS file: /cvsroot/decaldev/source/DecalInput/DecalInput.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DecalInput.vcproj 13 May 2003 07:16:10 -0000 1.1
--- DecalInput.vcproj 23 May 2003 02:20:47 -0000 1.2
***************
*** 299,302 ****
--- 299,379 ----
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;_USRDLL"
+ StringPooling="TRUE"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="3"
+ PrecompiledHeaderThrough="stdafx.h"
+ PrecompiledHeaderFile=".\ReleaseMinSize/DecalInput.pch"
+ AssemblerListingLocation=".\ReleaseMinSize/"
+ ObjectFile=".\ReleaseMinSize/"
+ ProgramDataBaseFileName=".\ReleaseMinSize/"
+ WarningLevel="3"
+ SuppressStartupBanner="TRUE"
+ DebugInformationFormat="3"
+ CompileAs="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ IgnoreImportLibrary="TRUE"
+ AdditionalDependencies="odbc32.lib odbccp32.lib version.lib winmm.lib"
+ OutputFile=".\..\Release/DecalInput.dll"
+ LinkIncremental="1"
+ SuppressStartupBanner="TRUE"
+ AdditionalLibraryDirectories="..\Release"
+ ModuleDefinitionFile=".\DecalInput.def"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile=".\..\Release/DecalInput.pdb"
+ SubSystem="2"
+ ImportLibrary=".\..\Release/DecalInput.lib"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalIncludeDirectories="..\Include"
+ SuppressStartupBanner="TRUE"
+ TargetEnvironment="1"
+ GenerateStublessProxies="TRUE"
+ TypeLibraryName=".\..\Release/DecalInput.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>
***************
*** 342,345 ****
--- 419,429 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 388,391 ****
--- 472,485 ----
InterfaceIdentifierFileName="..\Include\DecalInput_i.c"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCMIDLTool"
+ AdditionalIncludeDirectories=""
+ TargetEnvironment="1"
+ TypeLibraryName="DecalInput.tlb"
+ HeaderFileName="..\Include\DecalInput.h"
+ InterfaceIdentifierFileName="..\Include\DecalInput_i.c"/>
+ </FileConfiguration>
</File>
<File
***************
*** 419,422 ****
--- 513,523 ----
AdditionalIncludeDirectories="$(OUTDIR)"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions=""
+ AdditionalIncludeDirectories="$(OUTDIR)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 456,459 ****
--- 557,567 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 493,496 ****
--- 601,611 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 530,533 ****
--- 645,655 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 567,570 ****
--- 689,699 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 604,607 ****
--- 733,743 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 641,644 ****
--- 777,787 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 678,681 ****
--- 821,831 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 715,718 ****
--- 865,875 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 756,759 ****
--- 913,924 ----
UsePrecompiledHeader="1"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"
+ UsePrecompiledHeader="1"/>
+ </FileConfiguration>
</File>
<File
***************
*** 793,796 ****
--- 958,968 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 830,833 ****
--- 1002,1012 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 867,870 ****
--- 1046,1056 ----
BasicRuntimeChecks="3"/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
+ </FileConfiguration>
</File>
<File
***************
*** 903,906 ****
--- 1089,1099 ----
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;$(NoInherit)"
BasicRuntimeChecks="3"/>
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release MinDependency|Win32">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="_MBCS;_ATL_DLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;$(NoInherit)"/>
</FileConfiguration>
</File>
Index: InputService.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalInput/InputService.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InputService.cpp 28 Jan 2002 10:32:12 -0000 1.7
--- InputService.cpp 23 May 2003 02:20:47 -0000 1.8
***************
*** 164,169 ****
key.Open( HKEY_LOCAL_MACHINE, _T( "Software\\Decal" ) );
DWORD dwRegMajor, dwRegMinor;
! if( key.QueryValue( dwRegMajor, _T( "ACMajorVersion" ) ) != ERROR_SUCCESS ||
! key.QueryValue( dwRegMinor, _T( "ACMinorVersion" ) ) != ERROR_SUCCESS )
{
m_eWindows = eWindows98NoMemLocs;
--- 164,169 ----
key.Open( HKEY_LOCAL_MACHINE, _T( "Software\\Decal" ) );
DWORD dwRegMajor, dwRegMinor;
! if( key.QueryDWORDValue( _T( "ACMajorVersion" ), dwRegMajor ) != ERROR_SUCCESS ||
! key.QueryDWORDValue( _T( "ACMinorVersion" ), dwRegMinor ) != ERROR_SUCCESS )
{
m_eWindows = eWindows98NoMemLocs;
***************
*** 192,197 ****
{
DWORD dwOffset1, dwOffset2;
! if( key.QueryValue( dwOffset1, _T( "MouseOffset1" ) ) == ERROR_SUCCESS &&
! key.QueryValue( dwOffset2, _T( "MouseOffset2" ) ) == ERROR_SUCCESS )
{
m_eWindows = eWindows98WithMemLocs;
--- 192,197 ----
{
DWORD dwOffset1, dwOffset2;
! if( key.QueryDWORDValue( _T( "MouseOffset1" ), dwOffset1 ) == ERROR_SUCCESS &&
! key.QueryDWORDValue( _T( "MouseOffset2" ), dwOffset2 ) == ERROR_SUCCESS )
{
m_eWindows = eWindows98WithMemLocs;
***************
*** 270,274 ****
TCHAR *pszInsert = szFilename;
DWORD dwSize = MAX_PATH;
! key.QueryValue( szFilename, _T( "Path" ), &dwSize );
pszInsert = &szFilename[dwSize-1];
//pszInsert += dwSize;
--- 270,274 ----
TCHAR *pszInsert = szFilename;
DWORD dwSize = MAX_PATH;
! key.QueryStringValue( _T("Path"), szFilename, &dwSize );
pszInsert = &szFilename[dwSize-1];
//pszInsert += dwSize;
***************
*** 278,282 ****
dwSize = MAX_PATH - ( dwSize + 1 );
! key.QueryValue( pszInsert, _T( "CurrentInputMap" ), &dwSize );
// Looking good, open up the file and load the keys
--- 278,282 ----
dwSize = MAX_PATH - ( dwSize + 1 );
! key.QueryStringValue( _T( "CurrentInputMap" ), pszInsert, &dwSize );
// Looking good, open up the file and load the keys
Index: StdAfx.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/DecalInput/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:47 -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/DecalInput/StdAfx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StdAfx.h 23 Sep 2001 05:55:40 -0000 1.2
--- StdAfx.h 23 May 2003 02:20:47 -0000 1.3
***************
*** 11,17 ****
#define STRICT
! #ifndef _WIN32_WINNT
! #define _WIN32_WINNT 0x0400
! #endif
#define _ATL_APARTMENT_THREADED
--- 11,15 ----
#define STRICT
! #define _WIN32_WINDOWS 0x0410
#define _ATL_APARTMENT_THREADED
|
