コミット: 38620345658c63e840fa77ceea3edbad7549e80f - pecaim (git)

コミットメタ情報

• リビジョン: 38620345658c63e840fa77ceea3edbad7549e80f (tree)
• 日時: 2008-05-08 19:01:49
• 作者: eru <eru01@user...>
• コミッター: eru

ログメッセージ

IM0027-4

変更サマリ

• modified: PeerCast.root/PeerCast/core/common/channel.cpp
• modified: PeerCast.root/PeerCast/core/common/http.cpp
• modified: PeerCast.root/PeerCast/core/common/http.h
• modified: PeerCast.root/PeerCast/core/common/servent.h
• modified: PeerCast.root/PeerCast/core/common/servhs.cpp
• modified: PeerCast.root/PeerCast/core/common/url.cpp
• modified: PeerCast.root/PeerCast/core/common/version2.h
• modified: PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
• modified: PeerCast.root/PeerCast/ui/win32/PeerCast.sln
• modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
• modified: c:/Git/PeerCast.root/PeerCast/core/common/channel.cpp
• modified: c:/Git/PeerCast.root/PeerCast/core/common/http.cpp
• modified: c:/Git/PeerCast.root/PeerCast/core/common/http.h
• modified: c:/Git/PeerCast.root/PeerCast/core/common/servent.h
• modified: c:/Git/PeerCast.root/PeerCast/core/common/servhs.cpp
• modified: c:/Git/PeerCast.root/PeerCast/core/common/url.cpp
• modified: c:/Git/PeerCast.root/PeerCast/core/common/version2.h
• modified: c:/Git/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
• modified: c:/Git/PeerCast.root/PeerCast/ui/win32/PeerCast.sln
• modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

差分

--- a/PeerCast.root/PeerCast/core/common/channel.cpp
+++ b/PeerCast.root/PeerCast/core/common/channel.cpp
@@ -570,7 +570,7 @@ int Channel::handshakeFetch()
 		if (http.isHeader(PCX_HS_POS))
 			streamPos = atoi(arg);
 		else
-			Servent::readICYHeader(http, info, NULL);
+			Servent::readICYHeader(http, info, NULL, 0);
 
 		LOG_CHANNEL("Channel fetch: %s",http.cmdLine);
 	}

--- a/PeerCast.root/PeerCast/core/common/http.cpp
+++ b/PeerCast.root/PeerCast/core/common/http.cpp
@@ -107,7 +107,7 @@ int	HTTP::getArgInt()
 		return 0;
 }
 //-----------------------------------------
-void HTTP::getAuthUserPass(char *user, char *pass)
+void HTTP::getAuthUserPass(char *user, char *pass, size_t szUser, size_t szPass)
 {
 	if (arg)
 	{
@@ -125,9 +125,15 @@ void HTTP::getAuthUserPass(char *user, char *pass)
 			{
 				*s = 0;
 				if (user)
-					strcpy(user,str.cstr());
+				{
+					strncpy(user, str.cstr(), szUser);
+					user[szUser-1] = '\0';
+				}
 				if (pass)
-					strcpy(pass,s+1);
+				{
+					strncpy(pass, s+1, szPass);
+					pass[szPass-1] = '\0';
+				}
 			}			
 		}
 	}

--- a/PeerCast.root/PeerCast/core/common/http.h
+++ b/PeerCast.root/PeerCast/core/common/http.h
@@ -176,7 +176,7 @@ public:
 	char	*getArgStr();
 	int		getArgInt();
 
-	void	getAuthUserPass(char *, char *);
+	void	getAuthUserPass(char *, char *, size_t, size_t);
 
 	char	cmdLine[8192],*arg;
 

--- a/PeerCast.root/PeerCast/core/common/servent.h
+++ b/PeerCast.root/PeerCast/core/common/servent.h
@@ -213,7 +213,7 @@ public:
 	void	sendPCPChannel();
 	void	checkPCPComms(Channel *, AtomStream &);
 
-	static void	readICYHeader(HTTP &, ChanInfo &, char *);
+	static void	readICYHeader(HTTP &, ChanInfo &, char *, size_t);
 	bool	canStream(Channel *);
 
 	bool	isConnected() {return status == S_CONNECTED;}

--- a/PeerCast.root/PeerCast/core/common/servhs.cpp
+++ b/PeerCast.root/PeerCast/core/common/servhs.cpp
@@ -726,7 +726,7 @@ bool Servent::handshakeAuth(HTTP &http,const char *args,bool local)
 		{
 			case ServMgr::AUTH_HTTPBASIC:
 				if (http.isHeader("Authorization"))
-					http.getAuthUserPass(user,pass);
+					http.getAuthUserPass(user, pass, sizeof(user), sizeof(pass));
 				break;
 			case ServMgr::AUTH_COOKIE:
 				if (http.isHeader("Cookie"))
@@ -1708,7 +1708,7 @@ void Servent::handshakeXML()
 
 }
 // -----------------------------------
-void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd)
+void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd, size_t szPwd)
 {
 	char *arg = http.getArgStr();
 	if (!arg) return;
@@ -1733,7 +1733,7 @@ void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd)
 		info.desc.convertTo(String::T_UNICODE);
 
 	}else if (http.isHeader("Authorization"))
-		http.getAuthUserPass(NULL,pwd);
+		http.getAuthUserPass(NULL, pwd, 0, sizeof(pwd));
 	else if (http.isHeader(PCX_HS_CHANNELID))
 		info.id.fromStr(arg);
 	else if (http.isHeader("ice-password"))
@@ -1804,7 +1804,7 @@ void Servent::handshakeICY(Channel::SRC_TYPE type, bool isHTTP)
 	while (http.nextHeader())
 	{
 		LOG_DEBUG("ICY %s",http.cmdLine);
-		readICYHeader(http,info,loginPassword.cstr());
+		readICYHeader(http, info, loginPassword.cstr(), loginPassword.MAX_LEN);
 	}
 
 

--- a/PeerCast.root/PeerCast/core/common/url.cpp
+++ b/PeerCast.root/PeerCast/core/common/url.cpp
@@ -180,7 +180,7 @@ int URLSource::getSourceRate()
 				LOG_CHANNEL("Fetch HTTP: %s",http.cmdLine);
 
 				ChanInfo tmpInfo = ch->info;
-				Servent::readICYHeader(http,ch->info,NULL);
+				Servent::readICYHeader(http, ch->info, NULL, 0);
 
 				if (!tmpInfo.name.isEmpty())
 					ch->info.name = tmpInfo.name;

--- a/PeerCast.root/PeerCast/core/common/version2.h
+++ b/PeerCast.root/PeerCast/core/common/version2.h
@@ -45,8 +45,8 @@ extern int version_ex; // PP
 //#define VERSION_EX 1
 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
 static const int  PCP_CLIENT_VERSION_EX_NUMBER = 27;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0027-3)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0027-3)";
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0027-4)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0027-4)";
 #endif
 
 // ------------------------------------------------

--- a/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
+++ b/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="corelib"
 	ProjectGUID="{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}"
 	RootNamespace="corelib"
 	SccProjectName="&quot;$/PeerCast.root/PeerCast&quot;, JCAAAAAA"
 	SccLocalPath="..\..\.."
 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -196,8 +197,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories="../../,../../common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"

--- a/PeerCast.root/PeerCast/ui/win32/PeerCast.sln
+++ b/PeerCast.root/PeerCast/ui/win32/PeerCast.sln
@@ -1,6 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00D364AE-DB2F-4109-A925-31B4F129D613}"
+	ProjectSection(SolutionItems) = preProject
+		memo.txt = memo.txt
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corelib", "..\..\core\win32\lib\corelib.vcproj", "{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple", "simple\Simple.vcproj", "{7D4833CE-1286-4587-9470-52E098B29C12}"
@@ -8,11 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple", "simple\Simple.vcp
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1} = {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00D364AE-DB2F-4109-A925-31B4F129D613}"
-	ProjectSection(SolutionItems) = preProject
-		memo.txt = memo.txt
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SourceCodeControl) = preSolution
 		SccNumberOfProjects = 3

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="Simple"
 	ProjectGUID="{7D4833CE-1286-4587-9470-52E098B29C12}"
 	RootNamespace="Simple"
 	SccProjectName="&quot;$/PeerCast.root/PeerCast&quot;, JCAAAAAA"
 	SccLocalPath="..\..\.."
 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -85,6 +86,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -108,9 +111,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to program files"
 				CommandLine="copy           debug\peercast.exe           &quot;c:\program files\peercast&quot;"
@@ -154,6 +154,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="0"
+				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories="../../../core,../../../core/common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
@@ -187,6 +188,8 @@
 				AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
 				ProgramDatabaseFile=".\Release/PeerCast.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -210,9 +213,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to pimp"
 				CommandLine="copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
@@ -285,6 +285,8 @@
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -308,9 +310,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to pimp &amp; program files"
 				CommandLine="copy                   release\peercast.exe                   &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
@@ -386,6 +385,8 @@
 				ProgramDatabaseFile=".\Debug/PeerCast.pdb"
 				SubSystem="2"
 				HeapReserveSize="4194304"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -409,9 +410,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to program files"
 				CommandLine="copy           debug\peercast.exe           &quot;c:\program files\peercast&quot;"

--- a/c:/Git/PeerCast.root/PeerCast/core/common/channel.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/channel.cpp
@@ -570,7 +570,7 @@ int Channel::handshakeFetch()
 		if (http.isHeader(PCX_HS_POS))
 			streamPos = atoi(arg);
 		else
-			Servent::readICYHeader(http, info, NULL);
+			Servent::readICYHeader(http, info, NULL, 0);
 
 		LOG_CHANNEL("Channel fetch: %s",http.cmdLine);
 	}

--- a/c:/Git/PeerCast.root/PeerCast/core/common/http.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/http.cpp
@@ -107,7 +107,7 @@ int	HTTP::getArgInt()
 		return 0;
 }
 //-----------------------------------------
-void HTTP::getAuthUserPass(char *user, char *pass)
+void HTTP::getAuthUserPass(char *user, char *pass, size_t szUser, size_t szPass)
 {
 	if (arg)
 	{
@@ -125,9 +125,15 @@ void HTTP::getAuthUserPass(char *user, char *pass)
 			{
 				*s = 0;
 				if (user)
-					strcpy(user,str.cstr());
+				{
+					strncpy(user, str.cstr(), szUser);
+					user[szUser-1] = '\0';
+				}
 				if (pass)
-					strcpy(pass,s+1);
+				{
+					strncpy(pass, s+1, szPass);
+					pass[szPass-1] = '\0';
+				}
 			}			
 		}
 	}

--- a/c:/Git/PeerCast.root/PeerCast/core/common/http.h
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/http.h
@@ -176,7 +176,7 @@ public:
 	char	*getArgStr();
 	int		getArgInt();
 
-	void	getAuthUserPass(char *, char *);
+	void	getAuthUserPass(char *, char *, size_t, size_t);
 
 	char	cmdLine[8192],*arg;
 

--- a/c:/Git/PeerCast.root/PeerCast/core/common/servent.h
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/servent.h
@@ -213,7 +213,7 @@ public:
 	void	sendPCPChannel();
 	void	checkPCPComms(Channel *, AtomStream &);
 
-	static void	readICYHeader(HTTP &, ChanInfo &, char *);
+	static void	readICYHeader(HTTP &, ChanInfo &, char *, size_t);
 	bool	canStream(Channel *);
 
 	bool	isConnected() {return status == S_CONNECTED;}

--- a/c:/Git/PeerCast.root/PeerCast/core/common/servhs.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/servhs.cpp
@@ -726,7 +726,7 @@ bool Servent::handshakeAuth(HTTP &http,const char *args,bool local)
 		{
 			case ServMgr::AUTH_HTTPBASIC:
 				if (http.isHeader("Authorization"))
-					http.getAuthUserPass(user,pass);
+					http.getAuthUserPass(user, pass, sizeof(user), sizeof(pass));
 				break;
 			case ServMgr::AUTH_COOKIE:
 				if (http.isHeader("Cookie"))
@@ -1708,7 +1708,7 @@ void Servent::handshakeXML()
 
 }
 // -----------------------------------
-void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd)
+void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd, size_t szPwd)
 {
 	char *arg = http.getArgStr();
 	if (!arg) return;
@@ -1733,7 +1733,7 @@ void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd)
 		info.desc.convertTo(String::T_UNICODE);
 
 	}else if (http.isHeader("Authorization"))
-		http.getAuthUserPass(NULL,pwd);
+		http.getAuthUserPass(NULL, pwd, 0, sizeof(pwd));
 	else if (http.isHeader(PCX_HS_CHANNELID))
 		info.id.fromStr(arg);
 	else if (http.isHeader("ice-password"))
@@ -1804,7 +1804,7 @@ void Servent::handshakeICY(Channel::SRC_TYPE type, bool isHTTP)
 	while (http.nextHeader())
 	{
 		LOG_DEBUG("ICY %s",http.cmdLine);
-		readICYHeader(http,info,loginPassword.cstr());
+		readICYHeader(http, info, loginPassword.cstr(), loginPassword.MAX_LEN);
 	}
 
 

--- a/c:/Git/PeerCast.root/PeerCast/core/common/url.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/url.cpp
@@ -180,7 +180,7 @@ int URLSource::getSourceRate()
 				LOG_CHANNEL("Fetch HTTP: %s",http.cmdLine);
 
 				ChanInfo tmpInfo = ch->info;
-				Servent::readICYHeader(http,ch->info,NULL);
+				Servent::readICYHeader(http, ch->info, NULL, 0);
 
 				if (!tmpInfo.name.isEmpty())
 					ch->info.name = tmpInfo.name;

--- a/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
@@ -45,8 +45,8 @@ extern int version_ex; // PP
 //#define VERSION_EX 1
 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
 static const int  PCP_CLIENT_VERSION_EX_NUMBER = 27;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0027-3)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0027-3)";
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0027-4)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0027-4)";
 #endif
 
 // ------------------------------------------------

--- a/c:/Git/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
+++ b/c:/Git/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="corelib"
 	ProjectGUID="{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}"
 	RootNamespace="corelib"
 	SccProjectName="&quot;$/PeerCast.root/PeerCast&quot;, JCAAAAAA"
 	SccLocalPath="..\..\.."
 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -196,8 +197,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="1"
+				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories="../../,../../common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/PeerCast.sln
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/PeerCast.sln
@@ -1,6 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00D364AE-DB2F-4109-A925-31B4F129D613}"
+	ProjectSection(SolutionItems) = preProject
+		memo.txt = memo.txt
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "corelib", "..\..\core\win32\lib\corelib.vcproj", "{7BCFE65B-8757-45F3-8DFB-1E7D683950D1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple", "simple\Simple.vcproj", "{7D4833CE-1286-4587-9470-52E098B29C12}"
@@ -8,11 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Simple", "simple\Simple.vcp
 		{7BCFE65B-8757-45F3-8DFB-1E7D683950D1} = {7BCFE65B-8757-45F3-8DFB-1E7D683950D1}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00D364AE-DB2F-4109-A925-31B4F129D613}"
-	ProjectSection(SolutionItems) = preProject
-		memo.txt = memo.txt
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SourceCodeControl) = preSolution
 		SccNumberOfProjects = 3

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="Simple"
 	ProjectGUID="{7D4833CE-1286-4587-9470-52E098B29C12}"
 	RootNamespace="Simple"
 	SccProjectName="&quot;$/PeerCast.root/PeerCast&quot;, JCAAAAAA"
 	SccLocalPath="..\..\.."
 	SccProvider="MSSCCI:Microsoft Visual SourceSafe"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -85,6 +86,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -108,9 +111,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to program files"
 				CommandLine="copy           debug\peercast.exe           &quot;c:\program files\peercast&quot;"
@@ -154,6 +154,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="0"
+				EnableFiberSafeOptimizations="true"
 				AdditionalIncludeDirectories="../../../core,../../../core/common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
@@ -187,6 +188,8 @@
 				AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
 				ProgramDatabaseFile=".\Release/PeerCast.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -210,9 +213,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to pimp"
 				CommandLine="copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
@@ -285,6 +285,8 @@
 				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -308,9 +310,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to pimp &amp; program files"
 				CommandLine="copy                   release\peercast.exe                   &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy                   release\peercast.exe                   ..\pimp\&#x0D;&#x0A;"
@@ -386,6 +385,8 @@
 				ProgramDatabaseFile=".\Debug/PeerCast.pdb"
 				SubSystem="2"
 				HeapReserveSize="4194304"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -409,9 +410,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy exe to program files"
 				CommandLine="copy           debug\peercast.exe           &quot;c:\program files\peercast&quot;"