Add Show Whole Project Button at commitDialog

diff --git a/Languages/TortoiseLang.vcproj b/Languages/TortoiseLang.vcproj
index 3a87a3e..7ed9b03 100644 (file)
--- a/Languages/TortoiseLang.vcproj
+++ b/Languages/TortoiseLang.vcproj
@@ -40,18 +40,18 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="adfad"\r
-                               ReBuildCommandLine=""\r
-                               CleanCommandLine=""\r
-                               Output="TortoiseLangs.exe"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
+                               BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               CleanCommandLine="nmake /f Makefile clean "\r
+                               Output=""\r
+                               PreprocessorDefinitions="WIN32;_DEBUG"\r
                                IncludeSearchPath=""\r
                                ForcedIncludes=""\r
                                AssemblySearchPath=""\r
@@ -60,18 +60,18 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
-                               ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
-                               CleanCommandLine="nmake /f Makefile clean "\r
-                               Output=""\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
+                               BuildCommandLine="adfad"\r
+                               ReBuildCommandLine=""\r
+                               CleanCommandLine=""\r
+                               Output="TortoiseLangs.exe"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG"\r
                                IncludeSearchPath=""\r
                                ForcedIncludes=""\r
                                AssemblySearchPath=""\r
@@ -81,8 +81,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="../bin/$(ConfigurationName)/bin"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r

diff --git a/ext/ResizableLib/ResizableLib.vcproj b/ext/ResizableLib/ResizableLib.vcproj
index 1f501c2..d60a260 100644 (file)
--- a/ext/ResizableLib/ResizableLib.vcproj
+++ b/ext/ResizableLib/ResizableLib.vcproj
@@ -98,13 +98,14 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
+                       Name="Release|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -120,14 +121,17 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
-                               BasicRuntimeChecks="0"\r
-                               RuntimeLibrary="3"\r
-                               DisableLanguageExtensions="false"\r
+                               Optimization="3"\r
+                               InlineFunctionExpansion="1"\r
+                               FavorSizeOrSpeed="2"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
@@ -138,15 +142,13 @@
                                ProgramDataBaseFileName="$(IntDir)/vc70.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
+                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
                                Culture="0"\r
                        />\r
                        <Tool\r
@@ -174,14 +176,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="..\..\obj\ResizableLib\Release64"\r
-                       IntermediateDirectory="..\..\obj\ResizableLib\Release64"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -197,17 +198,14 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="3"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"\r
+                               BasicRuntimeChecks="0"\r
+                               RuntimeLibrary="3"\r
+                               DisableLanguageExtensions="false"\r
                                TreatWChar_tAsBuiltInType="true"\r
                                ForceConformanceInForLoopScope="true"\r
                                UsePrecompiledHeader="2"\r
@@ -218,13 +216,15 @@
                                ProgramDataBaseFileName="$(IntDir)/vc70.pdb"\r
                                WarningLevel="4"\r
                                SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_AFXDLL;NDEBUG"\r
+                               PreprocessorDefinitions="_AFXDLL;_DEBUG"\r
                                Culture="0"\r
                        />\r
                        <Tool\r
@@ -253,8 +253,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="..\..\obj\ResizableLib\Debug64"\r
-                       IntermediateDirectory="..\..\obj\ResizableLib\Debug64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        ATLMinimizesCRunTimeLibraryUsage="false"\r
@@ -427,7 +427,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -435,7 +435,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r

diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj
index a16c63a..7565cdb 100644 (file)
--- a/ext/hunspell/hunspell.vcproj
+++ b/ext/hunspell/hunspell.vcproj
@@ -93,9 +93,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
+                       Name="Release|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -116,28 +116,28 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
-                               PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
+                               Optimization="2"\r
+                               InlineFunctionExpansion="1"\r
+                               PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
+                               StringPooling="true"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="true"\r
+                               PrecompiledHeaderFile=".\Release/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
-                               DebugInformationFormat="4"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1038"\r
                        />\r
                        <Tool\r
@@ -157,7 +157,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Debug/hunspell.bsc"\r
+                               OutputFile=".\Release/hunspell.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -167,9 +167,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -190,28 +190,28 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               InlineFunctionExpansion="1"\r
-                               PreprocessorDefinitions="W32;NDEBUG;_LIB"\r
-                               StringPooling="true"\r
-                               RuntimeLibrary="0"\r
-                               EnableFunctionLevelLinking="true"\r
-                               PrecompiledHeaderFile=".\Release/hunspell.pch"\r
+                               Optimization="0"\r
+                               PreprocessorDefinitions="W32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug/hunspell.pch"\r
                                AssemblerListingLocation="$(IntDir)\"\r
                                ObjectFile="$(IntDir)\"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="true"\r
+                               DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1038"\r
                        />\r
                        <Tool\r
@@ -231,7 +231,7 @@
                        <Tool\r
                                Name="VCBscMakeTool"\r
                                SuppressStartupBanner="true"\r
-                               OutputFile=".\Release/hunspell.bsc"\r
+                               OutputFile=".\Debug/hunspell.bsc"\r
                        />\r
                        <Tool\r
                                Name="VCFxCopTool"\r
@@ -242,8 +242,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -334,7 +334,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -342,7 +342,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -370,7 +370,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -378,7 +378,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -406,7 +406,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -414,7 +414,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -442,7 +442,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -450,7 +450,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -478,7 +478,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -486,7 +486,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -514,7 +514,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -522,7 +522,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -554,7 +554,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|Win32"\r
+                                       Name="Release|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -562,7 +562,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|x64"\r
+                                       Name="Debug|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r

diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index eed787b..c957810 100644 (file)
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -85,13 +85,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -107,19 +107,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -132,7 +132,6 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -151,13 +150,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
-                       UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -173,19 +172,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -198,6 +197,7 @@
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -217,8 +217,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
@@ -325,7 +325,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -333,7 +333,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r

diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index a32d859..dc19db7 100644 (file)
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -287,7 +287,7 @@ bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
        return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);\r
 }\r
 \r
-BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList\r
+BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList\r
                                    , bool bUpdate /* = FALSE */\r
                                    , bool bShowIgnores /* = false */\r
                                                                   , bool bShowUnRev\r
@@ -299,7 +299,7 @@ BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList
                mask|= CGitStatusListCtrl::FILELIST_IGNORE;\r
        if(bShowUnRev)\r
                mask|= CGitStatusListCtrl::FILELIST_UNVER;\r
-       this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);\r
+       this->UpdateFileList(mask,bUpdate,pathList);\r
 \r
 \r
 #if 0\r
@@ -5346,7 +5346,7 @@ bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
        TCHAR groupname[1024];\r
        int groupindex = 0;\r
 \r
-       if(bHasGroups);\r
+       if(bHasGroups)\r
        {\r
                LVGROUP grp = {0};\r
                grp.cbSize = sizeof(LVGROUP);\r

diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h
index 70938f3..cf230ab 100644 (file)
--- a/src/Git/GitStatusListCtrl.h
+++ b/src/Git/GitStatusListCtrl.h
@@ -514,7 +514,7 @@ public:
         * \param bUpdate TRUE if the remote status is requested too.\r
         * \return TRUE on success.\r
         */\r
-       BOOL GetStatus ( const CTGitPathList& pathList\r
+       BOOL GetStatus ( const CTGitPathList* pathList=NULL\r
                    , bool bUpdate = false\r
                    , bool bShowIgnores = false\r
                                   , bool bShowUnRev=false\r

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 85ca9d1..2d98442 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 53df0ad..3a51403 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -104,13 +104,12 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -126,30 +125,28 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                MkTypLibCompatible="false"\r
-                               ValidateParameters="true"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
-                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
-                               MinimalRebuild="false"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG"\r
+                               PreprocessorDefinitions="_DEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                        />\r
@@ -159,13 +156,11 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="../../ext/wingit"\r
+                               LinkIncremental="2"\r
+                               IgnoreDefaultLibraryNames="LIBCMTD"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
+                               TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -190,12 +185,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\debug64\bin"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
                        IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -211,28 +207,30 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                MkTypLibCompatible="false"\r
-                               TargetEnvironment="3"\r
+                               ValidateParameters="true"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
-                               PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
+                               MinimalRebuild="false"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG"\r
+                               PreprocessorDefinitions="NDEBUG"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                        />\r
@@ -242,11 +240,13 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
-                               LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="LIBCMTD"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="../../ext/wingit"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
-                               TargetMachine="17"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               TargetMachine="1"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
@@ -272,8 +272,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="..\..\bin\Release64\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)64"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
@@ -447,7 +447,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -455,7 +455,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -544,19 +544,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
+                               RelativePath=".\res\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
+                               RelativePath=".\res\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\output_wnd_hc.ico"\r
+                               RelativePath="..\Resources\blameres\output_wnd_hc.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -568,19 +568,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_hc.bmp"\r
+                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_hc.bmp"\r
+                               RelativePath=".\res\properties_hc.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\properties_wnd.ico"\r
+                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\properties_wnd.ico"\r
+                               RelativePath=".\res\properties_wnd.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -592,19 +592,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar.bmp"\r
+                               RelativePath=".\res\Toolbar.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\Toolbar256.bmp"\r
+                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\Toolbar256.bmp"\r
+                               RelativePath=".\res\Toolbar256.bmp"\r
                                >\r
                        </File>\r
                        <File\r
@@ -627,7 +627,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCResourceCompilerTool"\r
@@ -635,7 +635,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCResourceCompilerTool"\r
@@ -652,11 +652,11 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
+                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
+                               RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1061,7 +1061,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r
@@ -1072,7 +1072,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCustomBuildTool"\r

diff --git a/src/TortoiseProc/AddDlg.cpp b/src/TortoiseProc/AddDlg.cpp
index 4bf10c1..7cc1135 100644 (file)
--- a/src/TortoiseProc/AddDlg.cpp
+++ b/src/TortoiseProc/AddDlg.cpp
@@ -139,7 +139,7 @@ UINT CAddDlg::AddThread()
        DialogEnableWindow(IDOK, false);\r
        m_bCancelled = false;\r
        m_addListCtrl.Clear();\r
-       if (!m_addListCtrl.GetStatus(m_pathList,false,false,true,true))\r
+       if (!m_addListCtrl.GetStatus(&m_pathList,false,false,true,true))\r
        {\r
                m_addListCtrl.SetEmptyString(m_addListCtrl.GetLastErrorMessage());\r
        }\r

diff --git a/src/TortoiseProc/ChangedDlg.cpp b/src/TortoiseProc/ChangedDlg.cpp
index 0ed86b3..37529d3 100644 (file)
--- a/src/TortoiseProc/ChangedDlg.cpp
+++ b/src/TortoiseProc/ChangedDlg.cpp
@@ -138,7 +138,7 @@ UINT CChangedDlg::ChangedStatusThread()
        DialogEnableWindow(IDC_SHOWIGNORED, FALSE);\r
     DialogEnableWindow(IDC_SHOWUSERPROPS, FALSE);\r
        CString temp;\r
-       if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
+       if (!m_FileListCtrl.GetStatus(&m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
        {\r
                if (!m_FileListCtrl.GetLastErrorMessage().IsEmpty())\r
                        m_FileListCtrl.SetEmptyString(m_FileListCtrl.GetLastErrorMessage());\r

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 8a5c182..024ea20 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -50,7 +50,7 @@ CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
        , m_bThreadRunning(FALSE)\r
        , m_bRunThread(FALSE)\r
        , m_pThread(NULL)\r
-       , m_bKeepLocks(FALSE)\r
+       , m_bWholeProject(FALSE)\r
        , m_bKeepChangeList(TRUE)\r
        , m_itemsCount(0)\r
        , m_bSelectFilesForCommit(TRUE)\r
@@ -73,7 +73,7 @@ void CCommitDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
        DDX_Control(pDX, IDC_SELECTALL, m_SelectAll);\r
        DDX_Text(pDX, IDC_BUGID, m_sBugID);\r
-       DDX_Check(pDX, IDC_KEEPLOCK, m_bKeepLocks);\r
+       DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);\r
        DDX_Control(pDX, IDC_SPLITTER, m_wndSplitter);\r
        DDX_Check(pDX, IDC_KEEPLISTS, m_bKeepChangeList);\r
        DDX_Check(pDX,IDC_COMMIT_AMEND,m_bCommitAmend);\r
@@ -112,7 +112,7 @@ BOOL CCommitDlg::OnInitDialog()
        m_bKeepChangeList = m_regKeepChangelists;\r
 \r
 //     GitConfig config;\r
-//     m_bKeepLocks = config.KeepLocks();\r
+//     m_bWholeProject = config.KeepLocks();\r
 \r
        UpdateData(FALSE);\r
        \r
@@ -198,7 +198,7 @@ BOOL CCommitDlg::OnInitDialog()
        \r
        AdjustControlSize(IDC_SHOWUNVERSIONED);\r
        AdjustControlSize(IDC_SELECTALL);\r
-       AdjustControlSize(IDC_KEEPLOCK);\r
+       AdjustControlSize(IDC_WHOLE_PROJECT);\r
 \r
        GetClientRect(m_DlgOrigRect);\r
        m_cLogMessage.GetClientRect(m_LogMsgOrigRect);\r
@@ -219,7 +219,7 @@ BOOL CCommitDlg::OnInitDialog()
        AddAnchor(IDC_SELECTALL, BOTTOM_LEFT);\r
        AddAnchor(IDC_EXTERNALWARNING, BOTTOM_RIGHT);\r
        AddAnchor(IDC_STATISTICS, BOTTOM_LEFT, BOTTOM_RIGHT);\r
-       AddAnchor(IDC_KEEPLOCK, BOTTOM_LEFT);\r
+       AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);\r
        AddAnchor(IDC_KEEPLISTS, BOTTOM_LEFT);\r
        AddAnchor(IDOK, BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
@@ -597,8 +597,8 @@ void CCommitDlg::OnOK()
 #endif\r
        UpdateData();\r
        m_regAddBeforeCommit = m_bShowUnversioned;\r
-       if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())\r
-               m_bKeepLocks = FALSE;\r
+       if (!GetDlgItem(IDC_WHOLE_PROJECT)->IsWindowEnabled())\r
+               m_bWholeProject = FALSE;\r
        m_regKeepChangelists = m_bKeepChangeList;\r
        if (!GetDlgItem(IDC_KEEPLISTS)->IsWindowEnabled())\r
                m_bKeepChangeList = FALSE;\r
@@ -673,7 +673,7 @@ UINT CCommitDlg::StatusThread()
 #endif\r
     // Initialise the list control with the status of the files/folders below us\r
        m_ListCtrl.Clear();\r
-       BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
+       BOOL success = m_ListCtrl.GetStatus(&m_pathList);\r
 \r
        //m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
        if(this->m_bShowUnversioned)\r
@@ -746,7 +746,7 @@ UINT CCommitDlg::StatusThread()
                if (m_ListCtrl.HasChangeLists())\r
                        DialogEnableWindow(IDC_KEEPLISTS, true);\r
                if (m_ListCtrl.HasLocks())\r
-                       DialogEnableWindow(IDC_KEEPLOCK, true);\r
+                       DialogEnableWindow(IDC_WHOLE_PROJECT, true);\r
                // we have the list, now signal the main thread about it\r
                SendMessage(WM_AUTOLISTREADY);  // only send the message if the thread wasn't told to quit!\r
        }\r
@@ -890,7 +890,7 @@ void CCommitDlg::OnBnClickedShowunversioned()
                        dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
                if(dwShow & SVNSLC_SHOWUNVERSIONED)\r
                {\r
-                       m_ListCtrl.GetStatus(this->m_pathList,false,false,true);\r
+                       m_ListCtrl.GetStatus(&this->m_pathList,false,false,true);\r
                }\r
                m_ListCtrl.Show(dwShow);\r
        }\r

diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index be38eea..8a235b1 100644 (file)
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -103,7 +103,7 @@ public:
        BOOL                            m_bRecursive;\r
        CSciEdit                        m_cLogMessage;\r
        CString                         m_sLogMessage;\r
-       BOOL                            m_bKeepLocks;\r
+       BOOL                            m_bWholeProject;\r
        CString                         m_sBugID;\r
        CString                         m_sChangeList;\r
        BOOL                            m_bKeepChangeList;\r

diff --git a/src/TortoiseProc/RevertDlg.cpp b/src/TortoiseProc/RevertDlg.cpp
index 7b6a017..b37d254 100644 (file)
--- a/src/TortoiseProc/RevertDlg.cpp
+++ b/src/TortoiseProc/RevertDlg.cpp
@@ -108,7 +108,7 @@ UINT CRevertDlg::RevertThread()
        DialogEnableWindow(IDOK, false);\r
        m_bCancelled = false;\r
 \r
-       if (!m_RevertList.GetStatus(m_pathList))\r
+       if (!m_RevertList.GetStatus(&m_pathList))\r
        {\r
                m_RevertList.SetEmptyString(m_RevertList.GetLastErrorMessage());\r
        }\r

diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index b2e05d7..3dbd7b3 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ

diff --git a/src/Utils/Utils.vcproj b/src/Utils/Utils.vcproj
index e239d1a..ae0a085 100644 (file)
--- a/src/Utils/Utils.vcproj
+++ b/src/Utils/Utils.vcproj
@@ -85,13 +85,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -107,19 +107,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -150,13 +150,13 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
-                       UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -172,19 +172,19 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -216,8 +216,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Release|x64"\r
-                       OutputDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)64\"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\r
@@ -364,7 +364,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
@@ -372,7 +372,7 @@
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r