From 3326dfbeb9721e0e4b88a266780c4545ccd9dddf Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Tue, 30 Dec 2008 09:32:38 +0800
Subject: [PATCH] Fix CStringList TortoiseShell build problem

---
 ext/ResizableLib/ResizableLib.vcproj   |  8 ++++----
 ext/hunspell/hunspell.vcproj           |  8 ++++----
 ext/scintilla/vcbuild/SciLexer.vcproj  |  8 ++++----
 src/Git/Git.cpp                        | 12 ++++++------
 src/Git/Git.h                          |  7 ++++---
 src/Git/Git.vcproj                     |  6 +++---
 src/Git/GitRev.cpp                     | 28 ++++++++++++++--------------
 src/TGitCache/CachedDirectory.h        |  2 +-
 src/TGitCache/TSVNCache.vcproj         | 24 ++++++------------------
 src/TortoiseProc/ChooseVersion.h       |  4 ++--
 src/TortoiseProc/FormatPatchDlg.cpp    |  2 +-
 src/TortoiseProc/PushDlg.cpp           | 18 +++++-------------
 src/TortoiseProc/TortoiseProc.vcproj   | 34 +++++++++++++++++-----------------
 src/TortoiseShell/TortoiseShell.vcproj |  8 ++++----
 src/TortoiseUDiff/TortoiseUDiff.vcproj |  8 ++++----
 src/Utils/MiscUI/HistoryCombo.cpp      |  8 +++-----
 src/Utils/MiscUI/HistoryCombo.h        |  3 ++-
 src/Utils/Utils.vcproj                 |  8 ++++----
 18 files changed, 88 insertions(+), 108 deletions(-)

diff --git a/ext/ResizableLib/ResizableLib.vcproj b/ext/ResizableLib/ResizableLib.vcproj
index db50a1e..785463e 100644
--- a/ext/ResizableLib/ResizableLib.vcproj
+++ b/ext/ResizableLib/ResizableLib.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\obj\ResizableLib\Release"
-			IntermediateDirectory="..\..\obj\ResizableLib\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"
 			ConfigurationType="4"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -98,8 +98,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\obj\ResizableLib\Debug"
-			IntermediateDirectory="..\obj\ResizableLib\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\ResizeableLib\$(ConfigurationName)\"
 			ConfigurationType="4"
 			UseOfMFC="2"
 			ATLMinimizesCRunTimeLibraryUsage="false"
diff --git a/ext/hunspell/hunspell.vcproj b/ext/hunspell/hunspell.vcproj
index 8b093e1..e7445c8 100644
--- a/ext/hunspell/hunspell.vcproj
+++ b/ext/hunspell/hunspell.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -91,8 +91,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\hunspell\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
diff --git a/ext/scintilla/vcbuild/SciLexer.vcproj b/ext/scintilla/vcbuild/SciLexer.vcproj
index b81e0a1..f58d9f3 100644
--- a/ext/scintilla/vcbuild/SciLexer.vcproj
+++ b/ext/scintilla/vcbuild/SciLexer.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\../bin"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -113,8 +113,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\../bin"
-			IntermediateDirectory=".\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\SciLexer\$(ConfigurationName)\"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 26891ac..60c81ec 100644
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -288,7 +288,7 @@ git_revnum_t CGit::GetHash(CString &friendname)
 	return out;
 }
 
-int CGit::GetTagList(CStringList &list)
+int CGit::GetTagList(STRING_VECTOR &list)
 {
 	int ret;
 	CString cmd,output;
@@ -303,13 +303,13 @@ int CGit::GetTagList(CStringList &list)
 		{
 			i++;
 			one=output.Tokenize(_T("\n"),pos);
-			list.AddTail(one);
+			list.push_back(one);
 		}
 	}
 	return ret;
 }
 
-int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)
+int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
 {
 	int ret;
 	CString cmd,output;
@@ -330,7 +330,7 @@ int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)
 		{
 			i++;
 			one=output.Tokenize(_T("\n"),pos);
-			list.AddTail(one.Right(one.GetLength()-2));
+			list.push_back(one.Right(one.GetLength()-2));
 			if(one[0] == _T('*'))
 				if(current)
 					*current=i;
@@ -339,7 +339,7 @@ int CGit::GetBranchList(CStringList &list,int *current,BRANCH_TYPE type)
 	return ret;
 }
 
-int CGit::GetRemoteList(CStringList &list)
+int CGit::GetRemoteList(STRING_VECTOR &list)
 {
 	int ret;
 	CString cmd,output;
@@ -359,7 +359,7 @@ int CGit::GetRemoteList(CStringList &list)
 				url=one.Right(one.GetLength()-start-1);
 				one=url;
 				one=one.Left(one.Find(_T("."),0));
-				list.AddTail(one);
+				list.push_back(one);
 			}
 		}
 	}
diff --git a/src/Git/Git.h b/src/Git/Git.h
index 833445a..653a493 100644
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -13,6 +13,7 @@ enum
 typedef std::vector<CString> STRING_VECTOR;
 typedef std::map<CString, STRING_VECTOR> MAP_HASH_NAME;
 
+
 class CGit
 {
 private:
@@ -41,9 +42,9 @@ public:
 		BRANCH_ALL=BRANCH_LOCAL|BRANCH_REMOTE,
 	}BRANCH_TYPE;
 
-	int GetRemoteList(CStringList &list);
-	int GetBranchList(CStringList &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);
-	int GetTagList(CStringList &list);
+	int GetRemoteList(STRING_VECTOR &list);
+	int GetBranchList(STRING_VECTOR &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);
+	int GetTagList(STRING_VECTOR &list);
 	int GetMapHashToFriendName(MAP_HASH_NAME &map);
 	
 	//hash is empty means all. -1 means all
diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj
index 0ca9773..c2bdd05 100644
--- a/src/Git/Git.vcproj
+++ b/src/Git/Git.vcproj
@@ -18,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\$(ConfigurationName)"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
 			IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="2"
@@ -82,8 +82,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="2"
 			CharacterSet="1"
diff --git a/src/Git/GitRev.cpp b/src/Git/GitRev.cpp
index a0bf2da..05fb892 100644
--- a/src/Git/GitRev.cpp
+++ b/src/Git/GitRev.cpp
@@ -141,19 +141,19 @@ CTime GitRev::ConverFromString(CString input)
 
 int GitRev::SafeFetchFullInfo(CGit *git)
 {
-	if(InterlockedExchange(&m_IsUpdateing,TRUE) == FALSE)
-	{
-		//GitRev rev;
-		CString onelog;
-		git->GetLog(onelog,m_CommitHash,1);
-		CString oldhash=m_CommitHash;
-		ParserFromLog(onelog);
-		
-		ASSERT(oldhash==m_CommitHash);
-
-		InterlockedExchange(&m_IsUpdateing,FALSE);
-		InterlockedExchange(&m_IsFull,TRUE);
-		return 0;
-	}
+	if(InterlockedExchange(&m_IsUpdateing,TRUE) == FALSE)
+	{
+		//GitRev rev;
+		CString onelog;
+		git->GetLog(onelog,m_CommitHash,1);
+		CString oldhash=m_CommitHash;
+		ParserFromLog(onelog);
+		
+		//ASSERT(oldhash==m_CommitHash);
+
+		InterlockedExchange(&m_IsUpdateing,FALSE);
+		InterlockedExchange(&m_IsFull,TRUE);
+		return 0;
+	}
 	return -1;
 }
\ No newline at end of file
diff --git a/src/TGitCache/CachedDirectory.h b/src/TGitCache/CachedDirectory.h
index 71e2da6..08e76cc 100644
--- a/src/TGitCache/CachedDirectory.h
+++ b/src/TGitCache/CachedDirectory.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include "StatusCacheEntry.h"
-#include "TSVNPath.h"
+#include "TGitPath.h"
 
 /**
  * \ingroup TSVNCache
diff --git a/src/TGitCache/TSVNCache.vcproj b/src/TGitCache/TSVNCache.vcproj
index 0bfdf05..bc4f210 100644
--- a/src/TGitCache/TSVNCache.vcproj
+++ b/src/TGitCache/TSVNCache.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\Bin\Debug\Bin"
-			IntermediateDirectory="..\..\obj\TSVNCache\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"
 			ConfigurationType="1"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"
+				AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UNICODE;_UNICODE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -104,8 +104,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\Release\bin"
-			IntermediateDirectory="..\..\obj\TGitCache\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TSVNCache\$(ConfigurationName)\"
 			ConfigurationType="1"
 			UseOfATL="1"
 			CharacterSet="1"
@@ -129,7 +129,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="2"
-				AdditionalIncludeDirectories="../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\SVN;..\..\ext\gettext\include"
+				AdditionalIncludeDirectories="&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/apr/include;../Utils;..\TortoiseShell;..\Git;..\..\ext\gettext\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UNICODE;_UNICODE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -433,18 +433,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Svn\SVNAdminDir.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\SVN\SVNGlobal.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\Svn\SVNHelpers.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\Svn\SVNStatus.cpp"
 				>
 			</File>
diff --git a/src/TortoiseProc/ChooseVersion.h b/src/TortoiseProc/ChooseVersion.h
index f4e51b1..128fec0 100644
--- a/src/TortoiseProc/ChooseVersion.h
+++ b/src/TortoiseProc/ChooseVersion.h
@@ -58,11 +58,11 @@ protected:
 
 	void Init()
 	{
-		CStringList list;
+		STRING_VECTOR list;
 		g_Git.GetTagList(list);
 		m_ChooseVersioinTags.AddString(list);
 
-		list.RemoveAll();
+		list.clear();
 		int current;
 		g_Git.GetBranchList(list,&current,CGit::BRANCH_ALL);
 		m_ChooseVersioinBranch.AddString(list);
diff --git a/src/TortoiseProc/FormatPatchDlg.cpp b/src/TortoiseProc/FormatPatchDlg.cpp
index 8087b4f..7528677 100644
--- a/src/TortoiseProc/FormatPatchDlg.cpp
+++ b/src/TortoiseProc/FormatPatchDlg.cpp
@@ -73,7 +73,7 @@ BOOL CFormatPatchDlg::OnInitDialog()
 	m_cDir.LoadHistory(_T("Software\\TortoiseGit\\History\\FormatPatchURLS"), _T("path"));
 	m_cDir.SetCurSel(0);
 
-	CStringList list;
+	STRING_VECTOR list;
 	g_Git.GetBranchList(list,NULL,CGit::BRANCH_ALL);
 	m_cSince.AddString(list);
 
diff --git a/src/TortoiseProc/PushDlg.cpp b/src/TortoiseProc/PushDlg.cpp
index 6330e55..fc10f83 100644
--- a/src/TortoiseProc/PushDlg.cpp
+++ b/src/TortoiseProc/PushDlg.cpp
@@ -67,27 +67,19 @@ BOOL CPushDlg::OnInitDialog()
 	m_RemoteURL.EnableWindow(FALSE);
 	CheckRadioButton(IDC_RD_REMOTE,IDC_RD_URL,IDC_RD_REMOTE);
 
-	CStringList list;
+	STRING_VECTOR list;
 
 	if(!g_Git.GetRemoteList(list))
 	{	
-		POSITION pos;
-		pos=list.GetHeadPosition();
-		while(pos)
-		{
-			m_Remote.AddString(list.GetNext(pos));
-		}
+		for(int i=0;i<list.size();i++)
+			m_Remote.AddString(list[i]);
 	}
 
 	int current=0;
 	if(!g_Git.GetBranchList(list,&current))
 	{
-		POSITION pos;
-		pos=list.GetHeadPosition();
-		while(pos)
-		{
-			m_BranchSource.AddString(list.GetNext(pos));
-		}
+		for(int i=0;i<list.size();i++)
+			m_BranchSource.AddString(list[i]);
 	}
 	m_BranchSource.SetCurSel(current);
 	
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index d2b88c3..d346634 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\Debug\bin"
-			IntermediateDirectory="..\..\obj\TortoiseProc\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			UseOfATL="1"
@@ -108,8 +108,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\Release\bin"
-			IntermediateDirectory="..\..\obj\TortoiseProc\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			CharacterSet="1"
@@ -167,7 +167,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"
+				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -566,11 +566,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\explorer.ico"
+				RelativePath=".\explorer.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\explorer.ico"
+				RelativePath="..\Resources\explorer.ico"
 				>
 			</File>
 			<File
@@ -806,19 +806,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\newfolder.ico"
+				RelativePath=".\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\newfolder.ico"
+				RelativePath="..\Resources\newfolder.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\open.ico"
+				RelativePath=".\open.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\open.ico"
+				RelativePath="..\Resources\open.ico"
 				>
 			</File>
 			<File
@@ -922,19 +922,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\save.ico"
+				RelativePath=".\save.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\save.ico"
+				RelativePath="..\Resources\save.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\saveas.ico"
+				RelativePath=".\saveas.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\saveas.ico"
+				RelativePath="..\Resources\saveas.ico"
 				>
 			</File>
 			<File
@@ -1026,11 +1026,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\up.ico"
+				RelativePath=".\up.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\up.ico"
+				RelativePath="..\Resources\up.ico"
 				>
 			</File>
 			<File
diff --git a/src/TortoiseShell/TortoiseShell.vcproj b/src/TortoiseShell/TortoiseShell.vcproj
index c48e75a..23ed5c1 100644
--- a/src/TortoiseShell/TortoiseShell.vcproj
+++ b/src/TortoiseShell/TortoiseShell.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\Debug\bin"
-			IntermediateDirectory="..\..\obj\TortoiseShell\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			UseOfATL="1"
@@ -126,8 +126,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\Release\bin"
-			IntermediateDirectory="..\..\obj\TortoiseShell\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\TortoiseShell\$(ConfigurationName)\"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			UseOfATL="1"
diff --git a/src/TortoiseUDiff/TortoiseUDiff.vcproj b/src/TortoiseUDiff/TortoiseUDiff.vcproj
index f5e930b..8366d4f 100644
--- a/src/TortoiseUDiff/TortoiseUDiff.vcproj
+++ b/src/TortoiseUDiff/TortoiseUDiff.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\Debug\bin"
-			IntermediateDirectory="..\..\obj\TortoiseUDiff\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\TortoiseUDiff\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -95,8 +95,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\bin\Release\bin"
-			IntermediateDirectory="..\..\obj\TortoiseUDiff\Release"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\TortoiseUDiff\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
diff --git a/src/Utils/MiscUI/HistoryCombo.cpp b/src/Utils/MiscUI/HistoryCombo.cpp
index d669707..e15f7e0 100644
--- a/src/Utils/MiscUI/HistoryCombo.cpp
+++ b/src/Utils/MiscUI/HistoryCombo.cpp
@@ -315,13 +315,11 @@ void CHistoryCombo::SetMaxHistoryItems(int nMaxItems)
 	for (int n = m_nMaxHistoryItems; n < nNumItems; n++)
 		DeleteString(m_nMaxHistoryItems);
 }
-void CHistoryCombo::AddString(CStringList &list)
+void CHistoryCombo::AddString(STRING_VECTOR &list)
 {
-	POSITION pos;
-	pos=list.GetHeadPosition();
-	while(pos)
+	for(int i=0;i<list.size();i++)
 	{
-		AddString(list.GetNext(pos));
+		AddString(list[i]);
 	}
 }
 CString CHistoryCombo::GetString() const
diff --git a/src/Utils/MiscUI/HistoryCombo.h b/src/Utils/MiscUI/HistoryCombo.h
index c5ee1b0..a3f29bd 100644
--- a/src/Utils/MiscUI/HistoryCombo.h
+++ b/src/Utils/MiscUI/HistoryCombo.h
@@ -36,6 +36,7 @@
  * 
  * thats it. 
  */
+#include "git.h"
 class CHistoryCombo : public CComboBoxEx
 {
 // Construction
@@ -111,7 +112,7 @@ public:
 	 */
 	CString GetString() const;
 
-	void AddString(CStringList &list);
+	void AddString(STRING_VECTOR &list);
 
 protected:
 	/**
diff --git a/src/Utils/Utils.vcproj b/src/Utils/Utils.vcproj
index 74ced49..441895a 100644
--- a/src/Utils/Utils.vcproj
+++ b/src/Utils/Utils.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\$(ConfigurationName)"
-			IntermediateDirectory="..\..\obj\$(ConfigurationName)"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"
 			ConfigurationType="4"
 			UseOfMFC="2"
 			UseOfATL="1"
@@ -82,8 +82,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\Utils\$(ConfigurationName)\"
 			ConfigurationType="4"
 			UseOfMFC="2"
 			CharacterSet="1"
-- 
2.11.0