OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2406fd1)
Merge from rev.7128:7151 (2)
authorsdottaka <none@none>
Sun, 23 May 2010 13:18:41 +0000 (22:18 +0900)
committersdottaka <none@none>
Sun, 23 May 2010 13:18:41 +0000 (22:18 +0900)
ArchiveSupport/Merge7z/Merge7z457X64.vcproj patch | blob | history
ArchiveSupport/Merge7z/Merge7zX64.sln patch | blob | history
Installer/InnoSetup/WinMergeX64.iss patch | blob | history
Src/HexMergeFrm.cpp patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z457X64.vcproj b/ArchiveSupport/Merge7z/Merge7z457X64.vcproj
index 8285d7b..627e335 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z457X64.vcproj
+++ b/ArchiveSupport/Merge7z/Merge7z457X64.vcproj
@@ -116,14 +116,14 @@
                        />
                </Configuration>
                <Configuration
-                       Name="UnicodeRelease|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease"
+                       Name="Release|x64"
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -142,25 +142,26 @@
                                PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="1"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="$(SRC7Z)\7z457\CPP"
-                               PreprocessorDefinitions="Merge7z457_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
+                               AdditionalIncludeDirectories="$(SRC7Z)\7z457,$(SRC7Z)\7z457\CPP"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7z457_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
-                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.pch"
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_Release/"
+                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_Release/"
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_Release/"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                        />
@@ -178,14 +179,14 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeUnicodeRelease/Merge7z457U.dll"
+                               OutputFile="../../Build/X64/MergeRelease/Merge7z457.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                ModuleDefinitionFile=".\Merge7z.def"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457U.lib"
-                               TargetMachine="1"
+                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.lib"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -199,7 +200,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.bsc"
+                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
@@ -212,14 +213,14 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7z457___Win32_Debug"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7z457___Win32_Debug"
+                       Name="UnicodeRelease|Win32"
+                       OutputDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease"
+                       IntermediateDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
+                       CharacterSet="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -235,37 +236,37 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.tlb"
+                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="$(SRC7Z)\7z457,$(SRC7Z)\7z457\CPP"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7z457_EXPORTS"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               Optimization="1"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="$(SRC7Z)\7z457\CPP"
+                               PreprocessorDefinitions="Merge7z457_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
+                               StringPooling="true"
+                               RuntimeLibrary="0"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_Debug/"
-                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_Debug/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_Debug/"
-                               BrowseInformation="1"
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.pch"
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
+                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="1"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1031"
                        />
                        <Tool
@@ -274,15 +275,13 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeDebug/Merge7z457.dll"
+                               OutputFile="../../Build/MergeUnicodeRelease/Merge7z457U.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                ModuleDefinitionFile=".\Merge7z.def"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../Build/MergeDebug/Merge7z457.pdb"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.lib"
+                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457U.lib"
                                TargetMachine="1"
                        />
                        <Tool
@@ -297,7 +296,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.bsc"
+                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
@@ -310,9 +309,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="UnicodeDebug|Win32"
-                       OutputDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug"
-                       IntermediateDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug"
+                       Name="UnicodeRelease|x64"
+                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
@@ -333,37 +332,37 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="$(SRC7Z)\7z457,$(SRC7Z)\7z457\CPP"
-                               PreprocessorDefinitions="Merge7z457_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               Optimization="1"
+                               InlineFunctionExpansion="1"
+                               AdditionalIncludeDirectories="$(SRC7Z)\7z457\CPP"
+                               PreprocessorDefinitions="Merge7z457_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
+                               StringPooling="true"
+                               RuntimeLibrary="0"
+                               EnableFunctionLevelLinking="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/"
-                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/"
-                               BrowseInformation="1"
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.pch"
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
+                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               DebugInformationFormat="1"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1031"
                        />
                        <Tool
@@ -372,16 +371,14 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/MergeUnicodeDebug/Merge7z457U.dll"
+                               OutputFile="../../Build/X64/MergeUnicodeRelease/Merge7z457U.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                ModuleDefinitionFile=".\Merge7z.def"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../Build/MergeUnicodeDebug/Merge7z457U.pdb"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457U.lib"
-                               TargetMachine="1"
+                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457U.lib"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -395,7 +392,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457.bsc"
+                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
@@ -408,9 +405,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       Name="Debug|Win32"
+                       OutputDirectory=".\..\BuildTmp\Merge7z457___Win32_Debug"
+                       IntermediateDirectory=".\..\BuildTmp\Merge7z457___Win32_Debug"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
@@ -431,38 +428,37 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="1"
-                               InlineFunctionExpansion="1"
+                               Optimization="0"
                                AdditionalIncludeDirectories="$(SRC7Z)\7z457,$(SRC7Z)\7z457\CPP"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;Merge7z457_EXPORTS"
-                               StringPooling="true"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7z457_EXPORTS"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_Release/"
-                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_Release/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_Release/"
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.pch"
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_Debug/"
+                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_Debug/"
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_Debug/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="1"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1031"
                        />
                        <Tool
@@ -471,14 +467,16 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/X64/MergeRelease/Merge7z457.dll"
+                               OutputFile="../../Build/MergeDebug/Merge7z457.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                ModuleDefinitionFile=".\Merge7z.def"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="../../Build/MergeDebug/Merge7z457.pdb"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.lib"
-                               TargetMachine="17"
+                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.lib"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -492,7 +490,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_Release/Merge7z457.bsc"
+                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
@@ -505,14 +503,14 @@
                        />
                </Configuration>
                <Configuration
-                       Name="UnicodeRelease|x64"
+                       Name="Debug|x64"
                        OutputDirectory="$(PlatformName)\$(ConfigurationName)"
                        IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -528,37 +526,37 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.tlb"
+                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="1"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="$(SRC7Z)\7z457\CPP"
-                               PreprocessorDefinitions="Merge7z457_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;UNICODE"
-                               StringPooling="true"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="true"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="$(SRC7Z)\7z457,$(SRC7Z)\7z457\CPP"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7z457_EXPORTS"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
-                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/"
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.pch"
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_Debug/"
+                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_Debug/"
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_Debug/"
+                               BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
+                               DebugInformationFormat="1"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1031"
                        />
                        <Tool
@@ -567,13 +565,15 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/X64/MergeUnicodeRelease/Merge7z457U.dll"
+                               OutputFile="../../Build/X64/MergeDebug/Merge7z457.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                ModuleDefinitionFile=".\Merge7z.def"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile="../../Build/MergeDebug/Merge7z457.pdb"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457U.lib"
+                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.lib"
                                TargetMachine="17"
                        />
                        <Tool
@@ -588,7 +588,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeRelease/Merge7z457.bsc"
+                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
@@ -601,14 +601,14 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       Name="UnicodeDebug|Win32"
+                       OutputDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug"
+                       IntermediateDirectory=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
+                       CharacterSet="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -627,23 +627,23 @@
                                PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457.tlb"
                                HeaderFileName=""
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="$(SRC7Z)\7z457,$(SRC7Z)\7z457\CPP"
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;Merge7z457_EXPORTS"
+                               PreprocessorDefinitions="Merge7z457_EXPORTS;WIN32;_DEBUG;_WINDOWS;_USRDLL;UNICODE"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="stdafx.h"
-                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.pch"
-                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_Debug/"
-                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_Debug/"
-                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_Debug/"
+                               PrecompiledHeaderFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457.pch"
+                               AssemblerListingLocation=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/"
+                               ObjectFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/"
+                               ProgramDataBaseFileName=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/"
                                BrowseInformation="1"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
@@ -663,16 +663,16 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="shlwapi.lib odbc32.lib odbccp32.lib"
-                               OutputFile="../../Build/X64/MergeDebug/Merge7z457.dll"
+                               OutputFile="../../Build/MergeUnicodeDebug/Merge7z457U.dll"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                                ModuleDefinitionFile=".\Merge7z.def"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile="../../Build/MergeDebug/Merge7z457.pdb"
+                               ProgramDatabaseFile="../../Build/MergeUnicodeDebug/Merge7z457U.pdb"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.lib"
-                               TargetMachine="17"
+                               ImportLibrary=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457U.lib"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -686,7 +686,7 @@
                        <Tool
                                Name="VCBscMakeTool"
                                SuppressStartupBanner="true"
-                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_Debug/Merge7z457.bsc"
+                               OutputFile=".\..\BuildTmp\Merge7z457___Win32_UnicodeDebug/Merge7z457.bsc"
                        />
                        <Tool
                                Name="VCFxCopTool"
@@ -805,7 +805,7 @@
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
                        >
                        <File
-                               RelativePath="Merge7z.def"
+                               RelativePath=".\Merge7z.def"
                                >
                        </File>
                        <File
@@ -825,7 +825,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -834,7 +834,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -843,7 +843,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -852,7 +852,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -861,7 +861,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -870,7 +870,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -889,83 +889,11 @@
                                </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="Merge7zCommon.cpp"
+                               RelativePath=".\Merge7zCommon453.cpp"
                                >
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="UnicodeRelease|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="UnicodeDebug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               AdditionalIncludeDirectories=""
-                                               PreprocessorDefinitions=""
-                                       />
-                               </FileConfiguration>
                        </File>
                        <File
-                               RelativePath="Merge7zCommon.h"
+                               RelativePath=".\Merge7zCommon453.h"
                                >
                        </File>
                        <File
@@ -982,7 +910,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -992,7 +920,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1002,7 +930,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1012,7 +940,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1022,7 +950,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1032,7 +960,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1069,7 +997,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1078,7 +1006,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1087,7 +1015,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1096,7 +1024,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1105,7 +1033,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1114,7 +1042,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1162,7 +1090,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
@@ -1171,7 +1099,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
@@ -1180,7 +1108,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
@@ -1189,7 +1117,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
@@ -1198,7 +1126,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
@@ -1207,7 +1135,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCResourceCompilerTool"
@@ -1242,7 +1170,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1251,7 +1179,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1260,7 +1188,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1269,7 +1197,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1278,7 +1206,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1287,7 +1215,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1322,7 +1250,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1331,7 +1259,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1340,7 +1268,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1349,7 +1277,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1358,7 +1286,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1367,7 +1295,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1402,7 +1330,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1411,7 +1339,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1420,7 +1348,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1429,7 +1357,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1438,7 +1366,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1447,7 +1375,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1482,7 +1410,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1491,7 +1419,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1500,7 +1428,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1509,7 +1437,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1518,7 +1446,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1527,7 +1455,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1562,7 +1490,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1571,7 +1499,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1580,7 +1508,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1589,7 +1517,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1598,7 +1526,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1607,7 +1535,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1642,7 +1570,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1651,7 +1579,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1660,7 +1588,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1669,7 +1597,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1678,7 +1606,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1687,7 +1615,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1722,7 +1650,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1731,7 +1659,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1740,7 +1668,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1749,7 +1677,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1758,7 +1686,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1767,7 +1695,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1806,7 +1734,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1815,7 +1743,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1824,7 +1752,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1833,7 +1761,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1842,7 +1770,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1851,7 +1779,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1886,7 +1814,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1895,7 +1823,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1904,7 +1832,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1913,7 +1841,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1922,7 +1850,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1931,7 +1859,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1966,7 +1894,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1975,7 +1903,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1984,7 +1912,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -1993,7 +1921,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2002,7 +1930,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2011,7 +1939,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2046,7 +1974,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2055,7 +1983,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2064,7 +1992,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2073,7 +2001,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2082,7 +2010,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2091,7 +2019,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2126,7 +2054,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2135,7 +2063,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2144,7 +2072,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2153,7 +2081,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2162,7 +2090,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2171,7 +2099,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2206,7 +2134,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2215,7 +2143,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2224,7 +2152,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2233,7 +2161,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2242,7 +2170,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2251,7 +2179,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2286,7 +2214,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2295,7 +2223,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2304,7 +2232,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2313,7 +2241,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2322,7 +2250,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2331,7 +2259,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2366,7 +2294,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2375,7 +2303,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2384,7 +2312,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2393,7 +2321,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2402,7 +2330,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2411,7 +2339,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2450,7 +2378,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2459,7 +2387,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2468,7 +2396,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2477,7 +2405,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2486,7 +2414,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2495,7 +2423,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2530,7 +2458,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2539,7 +2467,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2548,7 +2476,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2557,7 +2485,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2566,7 +2494,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2575,7 +2503,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2610,7 +2538,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2619,7 +2547,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2628,7 +2556,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2637,7 +2565,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2646,7 +2574,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2655,7 +2583,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2690,7 +2618,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2699,7 +2627,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2708,7 +2636,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2717,7 +2645,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2726,7 +2654,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2735,7 +2663,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2770,7 +2698,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2779,7 +2707,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2788,7 +2716,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2797,7 +2725,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2806,7 +2734,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2815,7 +2743,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2850,7 +2778,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2859,7 +2787,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2868,7 +2796,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2877,7 +2805,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2886,7 +2814,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2895,7 +2823,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2930,7 +2858,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2939,7 +2867,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2948,7 +2876,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2957,7 +2885,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2966,7 +2894,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -2975,7 +2903,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3010,7 +2938,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3019,7 +2947,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3028,7 +2956,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3037,7 +2965,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3046,7 +2974,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3055,7 +2983,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3090,7 +3018,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3099,7 +3027,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3108,7 +3036,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3117,7 +3045,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3126,7 +3054,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3135,7 +3063,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3170,7 +3098,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3179,7 +3107,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3188,7 +3116,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3197,7 +3125,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3206,7 +3134,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3215,7 +3143,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3250,7 +3178,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3259,7 +3187,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3268,7 +3196,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3277,7 +3205,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3286,7 +3214,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3295,7 +3223,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3330,7 +3258,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3339,7 +3267,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3348,7 +3276,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3357,7 +3285,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3366,7 +3294,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3375,7 +3303,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3410,7 +3338,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3419,7 +3347,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3428,7 +3356,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3437,7 +3365,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3446,7 +3374,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3455,7 +3383,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3490,7 +3418,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3499,7 +3427,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3508,7 +3436,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3517,7 +3445,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3526,7 +3454,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3535,7 +3463,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3570,7 +3498,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3579,7 +3507,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3588,7 +3516,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3597,7 +3525,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3606,7 +3534,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3615,7 +3543,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3646,7 +3574,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3655,7 +3583,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3664,7 +3592,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3673,7 +3601,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3682,7 +3610,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3691,7 +3619,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3726,7 +3654,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3735,7 +3663,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3744,7 +3672,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3753,7 +3681,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3762,7 +3690,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3771,7 +3699,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3806,7 +3734,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3815,7 +3743,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3824,7 +3752,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3833,7 +3761,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3842,7 +3770,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3851,7 +3779,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3886,7 +3814,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3895,7 +3823,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3904,7 +3832,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3913,7 +3841,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3922,7 +3850,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3931,7 +3859,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3966,7 +3894,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3975,7 +3903,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3984,7 +3912,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -3993,7 +3921,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4002,7 +3930,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4011,7 +3939,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4050,7 +3978,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4059,7 +3987,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4068,7 +3996,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4077,7 +4005,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4086,7 +4014,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4095,7 +4023,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4130,7 +4058,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4139,7 +4067,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4148,7 +4076,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4157,7 +4085,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4166,7 +4094,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4175,7 +4103,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4210,7 +4138,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4219,7 +4147,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4228,7 +4156,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4237,7 +4165,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4246,7 +4174,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4255,7 +4183,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4290,7 +4218,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4299,7 +4227,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4308,7 +4236,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4317,7 +4245,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4326,7 +4254,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4335,7 +4263,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4370,7 +4298,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4379,7 +4307,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4388,7 +4316,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4397,7 +4325,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4406,7 +4334,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4415,7 +4343,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4450,7 +4378,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4459,7 +4387,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4468,7 +4396,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4477,7 +4405,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4486,7 +4414,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4495,7 +4423,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4530,7 +4458,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4539,7 +4467,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4548,7 +4476,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4557,7 +4485,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4566,7 +4494,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4575,7 +4503,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4615,7 +4543,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|Win32"
+                                       Name="Release|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4625,7 +4553,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|Win32"
+                                       Name="UnicodeRelease|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4635,7 +4563,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeDebug|Win32"
+                                       Name="UnicodeRelease|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4645,7 +4573,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release|x64"
+                                       Name="Debug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4655,7 +4583,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="UnicodeRelease|x64"
+                                       Name="Debug|x64"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
@@ -4665,7 +4593,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Debug|x64"
+                                       Name="UnicodeDebug|Win32"
                                        >
                                        <Tool
                                                Name="VCCLCompilerTool"
diff --git a/ArchiveSupport/Merge7z/Merge7zX64.sln b/ArchiveSupport/Merge7z/Merge7zX64.sln
index 45b7ccd..3e35f03 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7zX64.sln
+++ b/ArchiveSupport/Merge7z/Merge7zX64.sln
@@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z457", "Merge7z457X64.vcproj", "{01E54CFB-5414-43E4-B53D-86F0F903C9BC}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z465", "Merge7z465X64.vcproj", "{34C32ABA-B317-406A-9F7A-598550CB855C}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -30,6 +32,22 @@ Global
                {01E54CFB-5414-43E4-B53D-86F0F903C9BC}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32
                {01E54CFB-5414-43E4-B53D-86F0F903C9BC}.UnicodeRelease|x64.ActiveCfg = UnicodeRelease|x64
                {01E54CFB-5414-43E4-B53D-86F0F903C9BC}.UnicodeRelease|x64.Build.0 = UnicodeRelease|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Debug|Win32.ActiveCfg = Debug|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Debug|Win32.Build.0 = Debug|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Debug|x64.ActiveCfg = Debug|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Debug|x64.Build.0 = Debug|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Release|Win32.ActiveCfg = Release|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Release|Win32.Build.0 = Release|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Release|x64.ActiveCfg = Release|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.Release|x64.Build.0 = Release|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeDebug|Win32.ActiveCfg = UnicodeDebug|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeDebug|Win32.Build.0 = UnicodeDebug|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeDebug|x64.ActiveCfg = UnicodeDebug|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeDebug|x64.Build.0 = UnicodeDebug|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeRelease|Win32.ActiveCfg = UnicodeRelease|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeRelease|Win32.Build.0 = UnicodeRelease|Win32
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeRelease|x64.ActiveCfg = UnicodeRelease|x64
+               {34C32ABA-B317-406A-9F7A-598550CB855C}.UnicodeRelease|x64.Build.0 = UnicodeRelease|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss
index c5fc857..457d80e 100644 (file)
--- a/Installer/InnoSetup/WinMergeX64.iss
+++ b/Installer/InnoSetup/WinMergeX64.iss
@@ -295,6 +295,9 @@ Name: {app}\WinMergeU.exe.manifest; Type: files
 Name: {app}\Merge7z457.dll; Type: files
 Name: {app}\Merge7z457U.dll; Type: files; MinVersion: 0, 4
 
+Name: {app}\Merge7z465.dll; Type: files
+Name: {app}\Merge7z465U.dll; Type: files; MinVersion: 0, 4
+
 ;This won't work, because the file has to be unregistered, and explorer closed, first.
 ;Name: {app}\ShellExtension.dll; Type: files; Check: TaskDisabled('ShellExtension')
 
@@ -392,6 +395,7 @@ Source: "\Program Files\Microsoft Visual Studio 9.0\vc\redist\amd64\Microsoft.VC
 Source: ..\..\Build\ShellExtensionX64\ShellExtensionX64.dll; DestDir: {app}; Flags: regserver uninsrestartdelete restartreplace promptifolder 64bit; MinVersion: 0,5.01.2600; Check: IsWin64
 
 ;Please do not reorder the 7z Dlls by version they compress better ordered by platform and then by version
+Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z465U.dll; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Check: Install7ZipDll('465')
 Source: ..\..\Build\X64\MergeUnicodeRelease\Merge7z457U.dll; DestDir: {app}; Flags: promptifolder; MinVersion: 0, 4; Check: Install7ZipDll('457')
 
 ; Expat dll
@@ -794,7 +798,7 @@ begin
 
       {Stops analyzing the version number since we already know it's inadequate and returns False (inadequate)}
       exit;
-    end
+    end;
 
 
   {Starts detecting the Minor version of the Version Installed}
@@ -963,12 +967,20 @@ Begin
                                                                                                                                                                                Begin
                                                                                                                                                                                        {If the user has 4.57 or higher installed then...}
                                                                                                                                                                                        If VersionAtLeast(str7Zip_Version, 4, 57, 0, 0) = True Then
+                                                                                                                                                                                               Begin
+                                                                                                                                                                                                       {If the user has 465 or higher installed then...}
+                                                                                                                                                                                                       If VersionAtLeast(str7Zip_Version, 4, 65, 0, 0) = True Then
                                                                                                                                                                                                {We record the version of 7-Zip installed as 4.42 regardless of whether or not it's actually 4.21, 4.22, etc..}
+                                                                                                                                                                                                               int7Zip_Version := 465
+                                                                                                                                                                                                       Else
                                                                                                                                                                                                int7Zip_Version := 457
+                                                                                                                                                                                               end
                                                                                                                                                                                        Else
+                                                                                                                                                                                               {Since it was at least 4.42, but not 4.57 then it must be 4.42}
                                                                                                                                                                                                int7Zip_Version := 442
                                                                                                                                                                                end
                                                                                                                                                                        Else
+                                                                                                                                                                               {Since it was at least 4.32, but not 4.42 then it must be 4.32}
                                                                                                                                                                                int7Zip_Version := 432
                                                                                                                                                                end
                                                                                                                                                        Else
diff --git a/Src/HexMergeFrm.cpp b/Src/HexMergeFrm.cpp
index 0e42dcf..d4a630f 100644 (file)
--- a/Src/HexMergeFrm.cpp
+++ b/Src/HexMergeFrm.cpp
@@ -243,6 +243,15 @@ void CHexMergeFrame::ActivateFrame(int nCmdShow)
        CMDIChildWnd::ActivateFrame(nCmdShow);
 }
 
+void CHexMergeFrame::ActivateFrame(int nCmdShow) 
+{
+       if (!GetMDIFrame()->MDIGetActive() && theApp.GetProfileInt(_T("Settings"), _T("ActiveFrameMax"), FALSE))
+       {
+               nCmdShow = SW_SHOWMAXIMIZED;
+       }
+       CMDIChildWnd::ActivateFrame(nCmdShow);
+}
+
 /**
  * @brief Save the window's position, free related resources, and destroy the window
  */
About OSDN
Find Software
Develop Software
Help