Fixed CRT linkage options.

Fixed x64 verson of TortoiseProc crash.

diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj
index 7565cdb..9e0c07a 100644 (file)
--- a/ext/hunspell/hunspell.vcproj
+++ b/ext/hunspell/hunspell.vcproj
@@ -197,7 +197,7 @@
                                PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
@@ -272,7 +272,7 @@
                                PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r

diff --git a/ext/scintilla/vcbuild/SciLexer.vcproj b/ext/scintilla/vcbuild/SciLexer.vcproj
index f098831..6de1ebb 100644 (file)
--- a/ext/scintilla/vcbuild/SciLexer.vcproj
+++ b/ext/scintilla/vcbuild/SciLexer.vcproj
@@ -56,7 +56,7 @@
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/SciLexer.pch"\r
                                BrowseInformation="1"\r
                                WarningLevel="4"\r
@@ -147,7 +147,7 @@
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;SCI_LEXER"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/SciLexer.pch"\r
                                BrowseInformation="1"\r
                                WarningLevel="4"\r
@@ -4330,11 +4330,11 @@
                        </File>\r
                </Filter>\r
                <File\r
-                       RelativePath="ReadMe.txt"\r
+                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\..\src\Git\ReadMe.txt"\r
+                       RelativePath="ReadMe.txt"\r
                        >\r
                </File>\r
        </Files>\r

diff --git a/src/ResText/ResText.vcproj b/src/ResText/ResText.vcproj
index 50c8b55..36e63c5 100644 (file)
--- a/src/ResText/ResText.vcproj
+++ b/src/ResText/ResText.vcproj
@@ -47,7 +47,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
@@ -126,7 +126,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r

diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index eeb1b87..a4ecb9f 100644 (file)
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -51,7 +51,7 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                SmallerTypeCheck="true"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
@@ -138,7 +138,7 @@
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                SmallerTypeCheck="true"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="3"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r

diff --git a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
index 188211a..1b81952 100644 (file)
--- a/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
+++ b/src/TortoisePlink/Windows/MSVC/Plink/TortoisePlink.vcproj
@@ -244,7 +244,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"\r
                                AssemblerListingLocation=""\r
                                ObjectFile="$(IntDir)\"\r
@@ -339,7 +339,7 @@
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_BIND_TO_CURRENT_CRT_VERSION"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch"\r
                                AssemblerListingLocation=""\r
                                ObjectFile="$(IntDir)\"\r

diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index cc09e5e..ea58f83 100644 (file)
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -2147,6 +2147,9 @@ void CLogDlg::SetSplitterRange()
 \r
 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)\r
 {\r
+       // FIXME: x64 version would get this function called with unexpected parameters.\r
+       if (!lParam)\r
+               return 0;\r
        RECT * rect = (LPRECT)lParam;\r
        CPoint point;\r
        CString temp;\r

diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcproj b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index 910d186..fa80b31 100644 (file)
--- a/src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/src/TortoiseUDiff/TortoiseUDiff.vcproj
@@ -95,12 +95,11 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseUDiff\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\Debug64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseUDiff\Debug64"\r
                        ConfigurationType="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -116,16 +115,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               RuntimeLibrary="2"\r
+                               PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -138,15 +140,12 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
+                               LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -171,11 +170,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\Debug64\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseUDiff\Debug64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseUDiff\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -191,19 +191,16 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI"\r
-                               PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               RuntimeLibrary="2"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -216,12 +213,15 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               LinkIncremental="2"\r
+                               LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               OptimizeForWindows98="0"\r
                                RandomizedBaseAddress="1"\r
                                DataExecutionPrevention="0"\r
-                               TargetMachine="17"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -366,7 +366,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -374,7 +374,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r