OSDN > Trouver un logiciel > Multimédia > Sound/Audio > PeerCast IM > SCM > git > PeerCastIM > Commit

PeerCast IM
Fork

R/O
HTTP
SSH
HTTPS

PeerCastIM: Commit

Commit MetaInfo

Révision	598c4f7e6b2d078f236540943eea14e69b6e8486 (tree)
l'heure	2012-05-06 20:31:04
Auteur	eru <eru01@user...>
Commiter	eru

Message de Log

ＤｏＳ耐性を向上

Change Summary

modified: PeerCast.sln (diff)
add: core/common/addrCont.h (diff)
modified: core/common/servent.cpp (diff)
modified: core/common/servent.h (diff)
modified: core/common/servhs.cpp (diff)
modified: core/common/servmgr.cpp (diff)
modified: core/common/servmgr.h (diff)
add: core/common/ts_vector.h (diff)
modified: core/common/version2.h (diff)
modified: core/win32/lib/corelib.vcproj (diff)
add: core/win32/ts_vector.h (diff)
modified: ui/win32/Simple_vp/Simple_vp.vcproj (diff)
modified: ui/win32/simple/Simple.vcproj (diff)
modified: (diff)

Modification

--- a/PeerCast.sln

+++ b/PeerCast.sln

		@@ -73,7 +73,6 @@ Global
73	73	{7D4833CE-1286-4587-9470-52E098B29C12}.Release\|x64.ActiveCfg = Release\|x64
74	74	{7D4833CE-1286-4587-9470-52E098B29C12}.Release\|x64.Build.0 = Release\|x64
75	75	{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug\|Win32.ActiveCfg = Debug\|Win32
76		- {E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug\|Win32.Build.0 = Debug\|Win32
77	76	{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Debug\|x64.ActiveCfg = Debug\|Win32
78	77	{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug\|Win32.ActiveCfg = Private Debug\|Win32
79	78	{E60173A7-1FC8-444B-BBAB-BB3D663D5C05}.Private Debug\|Win32.Build.0 = Private Debug\|Win32

--- /dev/null

+++ b/core/common/addrCont.h

		@@ -0,0 +1,45 @@
	1	+/*
	2	+ * Container type for IP-addr blacklist
	3	+ *
	4	+ * Impl. by Eru
	5	+ */
	6	+
	7	+#ifndef _CORELIB_COMMON_ADDRCONT_H_
	8	+#define _CORELIB_COMMON_ADDRCONT_H_
	9	+
	10	+#include <limits.h>
	11	+
	12	+class addrCont
	13	+{
	14	+public:
	15	+ unsigned int addr;
	16	+ unsigned int count;
	17	+
	18	+ addrCont() : addr(0), count(0)
	19	+ {
	20	+ }
	21	+
	22	+ addrCont(unsigned int addr) : addr(addr), count(0)
	23	+ {
	24	+ }
	25	+
	26	+ addrCont& operator++()
	27	+ {
	28	+ if (this->count < UINT_MAX)
	29	+ ++(this->count);
	30	+
	31	+ return *this;
	32	+ }
	33	+
	34	+ inline bool operator==(const addrCont &op)
	35	+ {
	36	+ return this->addr == op.addr;
	37	+ }
	38	+
	39	+ inline bool operator==(const unsigned int op)
	40	+ {
	41	+ return this->addr == op;
	42	+ }
	43	+};
	44	+
	45	+#endif

--- a/core/common/servent.cpp

+++ b/core/common/servent.cpp

		@@ -380,7 +380,6 @@ void Servent::initIncoming(ClientSocket *s, unsigned int a)
380	380	sock->host.toStr(ipStr);
381	381	LOG_DEBUG("Incoming from %s",ipStr);
382	382
383		-
384	383	if (!sys->startThread(&thread))
385	384	throw StreamException("Can`t start thread");
386	385	}catch(StreamException &e)

		@@ -3051,7 +3050,46 @@ int Servent::serverProcMain(ThreadInfo *thread)
3051	3050	peercastApp->notifyMessage(ServMgr::NT_PEERCAST, "reject multicast address");
3052	3051	} else
3053	3052	if (cs)
3054		- {
	3053	+ {
	3054	+ // countermeasure against DoS Atk
	3055	+ if (cs->host.ip != (0x7F000001)) // bypass loopback
	3056	+ {
	3057	+ // check blacklist
	3058	+ addrCont clientAddr(cs->host.ip);
	3059	+ servMgr->IP_blacklist->lock();
	3060	+ if (servMgr->IP_blacklist->find(clientAddr))
	3061	+ {
	3062	+ // blacklisted
	3063	+ servMgr->IP_blacklist->unlock();
	3064	+
	3065	+ LOG_DEBUG("REFUSED: %d.%d.%d.%d", (cs->host.ip >> 24), (cs->host.ip >> 16) & 0xFF, (cs->host.ip >> 8) & 0xFF, cs->host.ip & 0xFF);
	3066	+ cs->close();
	3067	+ sys->sleep(100);
	3068	+
	3069	+ continue;
	3070	+ }
	3071	+
	3072	+ servMgr->IP_blacklist->unlock();
	3073	+ LOG_DEBUG("ACCEPT: %d.%d.%d.%d", (cs->host.ip >> 24), (cs->host.ip >> 16) & 0xFF, (cs->host.ip >> 8) & 0xFF, cs->host.ip & 0xFF);
	3074	+
	3075	+
	3076	+ // check graylist
	3077	+ servMgr->IP_graylist->lock();
	3078	+ size_t idx;
	3079	+ if (servMgr->IP_graylist->find(clientAddr, &idx))
	3080	+ {
	3081	+ // update
	3082	+ ++(servMgr->IP_graylist->at(idx));
	3083	+ LOG_DEBUG("UPDATE: %d.%d.%d.%d", (cs->host.ip >> 24), (cs->host.ip >> 16) & 0xFF, (cs->host.ip >> 8) & 0xFF, cs->host.ip & 0xFF);
	3084	+ } else
	3085	+ {
	3086	+ // graylisted
	3087	+ servMgr->IP_graylist->push_back(clientAddr);
	3088	+ LOG_DEBUG("GRAYED: %d.%d.%d.%d", (cs->host.ip >> 24), (cs->host.ip >> 16) & 0xFF, (cs->host.ip >> 8) & 0xFF, cs->host.ip & 0xFF);
	3089	+ }
	3090	+ servMgr->IP_graylist->unlock();
	3091	+ }
	3092	+
3055	3093	LOG_DEBUG("accepted incoming");
3056	3094	Servent *ns = servMgr->allocServent();
3057	3095	if (ns)

		@@ -3064,7 +3102,7 @@ int Servent::serverProcMain(ThreadInfo *thread)
3064	3102	LOG_ERROR("Out of servents");
3065	3103	}
3066	3104	}
3067		- sys->sleep(100);
	3105	+ sys->sleep(10);
3068	3106	}
3069	3107	}catch(StreamException &e)
3070	3108	{

--- a/core/common/servent.h

+++ b/core/common/servent.h

		@@ -29,6 +29,10 @@
29	29	#include "http.h"
30	30	#include "rtsp.h"
31	31	#include "pcp.h"
	32	+#include "addrCont.h"
	33	+#ifdef _WIN32
	34	+#include "win32/ts_vector.h"
	35	+#endif
32	36
33	37	class HTML;
34	38

--- a/core/common/servhs.cpp

+++ b/core/common/servhs.cpp

		@@ -540,19 +540,19 @@ void Servent::handshakeIncoming()
540	540
541	541	if (stristr(buf,RTSP_PROTO1))
542	542	{
543		- LOG_DEBUG("RTSP from %s '%s'",sb,buf);
	543	+ LOG_DEBUG("RTSP from %s '%.100s'",sb,buf);
544	544	RTSP rtsp(*sock);
545	545	rtsp.initRequest(buf);
546	546	handshakeRTSP(rtsp);
547	547	}else if (stristr(buf,HTTP_PROTO1))
548	548	{
549		- LOG_DEBUG("HTTP from %s '%s'",sb,buf);
	549	+ LOG_DEBUG("HTTP from %s '%.100s'",sb,buf);
550	550	HTTP http(*sock);
551	551	http.initRequest(buf);
552	552	handshakeHTTP(http,true);
553	553	}else
554	554	{
555		- LOG_DEBUG("Connect from %s '%s'",sb,buf);
	555	+ LOG_DEBUG("Connect from %s '%.100s'",sb,buf);
556	556	HTTP http(*sock);
557	557	http.initRequest(buf);
558	558	handshakeHTTP(http,false);

		@@ -1868,7 +1868,7 @@ void Servent::handshakeICY(Channel::SRC_TYPE type, bool isHTTP)
1868	1868
1869	1869	while (http.nextHeader())
1870	1870	{
1871		- LOG_DEBUG("ICY %s",http.cmdLine);
	1871	+ LOG_DEBUG("ICY %.100s",http.cmdLine);
1872	1872	readICYHeader(http, info, loginPassword.cstr(), loginPassword.MAX_LEN);
1873	1873	}
1874	1874

--- a/core/common/servmgr.cpp

+++ b/core/common/servmgr.cpp

		@@ -160,6 +160,16 @@ ServMgr::ServMgr()
160	160	versionDNS = 0;
161	161	#endif
162	162
	163	+ // init gray/black-lists
	164	+#ifdef _WIN32
	165	+ IP_graylist = new WTSVector<addrCont>();
	166	+ IP_blacklist = new WTSVector<addrCont>();
	167	+#else
	168	+ // TODO for linux
	169	+#endif
	170	+ dosInterval = 30;
	171	+ dosThreashold = 20;
	172	+
163	173	chanLog="";
164	174
165	175	maxRelaysIndexTxt = 1; // for PCRaw (relay)

		@@ -183,6 +193,15 @@ ServMgr::ServMgr()
183	193	disableAutoBumpIfDirect = 1;
184	194	asxDetailedMode = 1;
185	195	}
	196	+
	197	+ // start thread (graylist)
	198	+ {
	199	+ ThreadInfo t;
	200	+
	201	+ t.func = ServMgr::graylistThreadFunc;
	202	+ t.active = true;
	203	+ sys->startThread(&t);
	204	+ }
186	205	}
187	206	// -----------------------------------
188	207	BCID *ServMgr::findValidBCID(int index)

		@@ -2847,3 +2866,41 @@ int ServMgr::kickUnrelayableHost(GnuID &chid, ChanHit &sendhit)
2847	2866
2848	2867	return 0;
2849	2868	}
	2869	+
	2870	+int WINAPI ServMgr::graylistThreadFunc(ThreadInfo *t)
	2871	+{
	2872	+ while (t->active)
	2873	+ {
	2874	+ LOG_DEBUG("******************** check graylist: begin");
	2875	+
	2876	+ servMgr->IP_graylist->lock();
	2877	+ servMgr->IP_blacklist->lock();
	2878	+
	2879	+
	2880	+ for (size_t i=0; i<servMgr->IP_graylist->count; ++i)
	2881	+ {
	2882	+ addrCont addr = servMgr->IP_graylist->at(i);
	2883	+ LOG_NETWORK("######## %d.%d.%d.%d # %d", (addr.addr >> 24), (addr.addr >> 16) & 0xFF, (addr.addr >> 8) & 0xFF, addr.addr & 0xFF, addr.count);
	2884	+ if (addr.count >= servMgr->dosThreashold)
	2885	+ {
	2886	+ servMgr->IP_blacklist->push_back(addr);
	2887	+ LOG_DEBUG("BANNED: %d.%d.%d.%d", (addr.addr >> 24), (addr.addr >> 16) & 0xFF, (addr.addr >> 8) & 0xFF, addr.addr & 0xFF);
	2888	+ }
	2889	+ }
	2890	+
	2891	+ servMgr->IP_graylist->clear();
	2892	+
	2893	+
	2894	+ servMgr->IP_graylist->unlock();
	2895	+ servMgr->IP_blacklist->unlock();
	2896	+
	2897	+ LOG_DEBUG("******************** check graylist: end");
	2898	+
	2899	+ sys->sleep(servMgr->dosInterval*1000);
	2900	+ }
	2901	+
	2902	+ t->finish = true;
	2903	+ sys->endThread(t);
	2904	+
	2905	+ return 0;
	2906	+}

--- a/core/common/servmgr.h

+++ b/core/common/servmgr.h

		@@ -113,8 +113,6 @@ public:
113	113	class ServMgr
114	114	{
115	115
116		-
117		-
118	116	public:
119	117
120	118	enum NOTIFY_TYPE

		@@ -322,6 +320,9 @@ public:
322	320	return maxBitrateOut ? (BYTES_TO_KBPS(totalOutput(false))+br) > maxBitrateOut : false;
323	321	}
324	322
	323	+ // thread func (graylist)
	324	+ static int WINAPI graylistThreadFunc(ThreadInfo *t);
	325	+
325	326	unsigned int totalOutput(bool);
326	327	unsigned int totalInput(bool);
327	328

		@@ -424,6 +425,11 @@ public:
424	425
425	426	int versionDNS; // DNSから取得した最新バージョンの番号
426	427
	428	+ ITSVector<addrCont> *IP_graylist; // gray/black-lists for DoS atk
	429	+ ITSVector<addrCont> *IP_blacklist;
	430	+ unsigned dosThreashold;
	431	+ unsigned dosInterval;
	432	+
427	433	int maxRelaysIndexTxt; // for PCRaw (relay)
428	434
429	435	#ifdef WIN32 //JP-MOD

--- /dev/null

+++ b/core/common/ts_vector.h

		@@ -0,0 +1,125 @@
	1	+/*
	2	+ * Simple vector (Thread safe implementation)
	3	+ *
	4	+ * Impl. by Eru
	5	+ */
	6	+
	7	+#ifndef _CORELIB_COMMON_TS_VECTOR_H_
	8	+#define _CORELIB_COMMON_TS_VECTOR_H_
	9	+
	10	+
	11	+// Interface
	12	+template <class T> class ITSVector
	13	+{
	14	+protected:
	15	+ size_t capacity;
	16	+ T **ary;
	17	+
	18	+public:
	19	+ size_t count;
	20	+
	21	+ ITSVector() : count(0), capacity(32)
	22	+ {
	23	+ ary = new T*[capacity];
	24	+ }
	25	+
	26	+ ~ITSVector()
	27	+ {
	28	+ for (size_t i=0; i<count; ++i)
	29	+ delete ary[i];
	30	+ delete[] ary;
	31	+ }
	32	+
	33	+ virtual bool empty()
	34	+ {
	35	+ return count == 0;
	36	+ }
	37	+
	38	+ virtual void lock() = 0;
	39	+ virtual void unlock() = 0;
	40	+
	41	+ virtual bool erase(size_t idx)
	42	+ {
	43	+ delete ary[idx];
	44	+// for (size_t i=idx+1; i<count; ++i)
	45	+// ary[i-1] = ary[i];
	46	+ memmove(&ary[idx], &ary[idx+1], sizeof(T) (--count - idx));
	47	+
	48	+ return true;
	49	+ }
	50	+
	51	+ virtual bool clear()
	52	+ {
	53	+ for (size_t i=0; i<count; ++i)
	54	+ {
	55	+ delete ary[i];
	56	+ }
	57	+ count = 0;
	58	+
	59	+ return true;
	60	+ }
	61	+
	62	+ virtual bool find(const T& tgt)
	63	+ {
	64	+ for (size_t i=0; i<count; ++i)
	65	+ {
	66	+ if (*ary[i] == tgt)
	67	+ return true;
	68	+ }
	69	+
	70	+ return false;
	71	+ }
	72	+
	73	+ virtual bool find(const T& tgt, size_t* idx)
	74	+ {
	75	+ for (size_t i=0; i<count; ++i)
	76	+ {
	77	+ if (*ary[i] == tgt)
	78	+ {
	79	+ *idx = i;
	80	+ return true;
	81	+ }
	82	+ }
	83	+
	84	+ return false;
	85	+ }
	86	+
	87	+ virtual bool push_back(const T& val)
	88	+ {
	89	+ T *ptr = new T(val);
	90	+
	91	+ if (count + 1 > capacity)
	92	+ {
	93	+ T *ptr = new T[capacity * 2];
	94	+ if (!ptr)
	95	+ return false;
	96	+
	97	+ for (size_t i=0; i<capacity; ++i)
	98	+ ptr[i] = ary[i];
	99	+ delete[] ary;
	100	+
	101	+ ary = ptr;
	102	+ capacity <<= 1;
	103	+ }
	104	+
	105	+ ary[count++] = ptr;
	106	+
	107	+ return true;
	108	+ }
	109	+
	110	+ virtual T& at(size_t idx)
	111	+ {
	112	+ if (idx >= count)
	113	+ throw std::out_of_range("out of bounds");
	114	+
	115	+ return *ary[idx];
	116	+ }
	117	+
	118	+ virtual T& operator[](size_t idx)
	119	+ {
	120	+ return at(idx);
	121	+ }
	122	+};
	123	+
	124	+
	125	+#endif

--- a/core/common/version2.h

+++ b/core/common/version2.h

		@@ -44,9 +44,9 @@ extern int version_ex; // VERSION_EX
44	44	#if 1 /* for VP extend version */
45	45	//#define VERSION_EX 1
46	46	static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
47		-static const int PCP_CLIENT_VERSION_EX_NUMBER = 44;
48		-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0044)";
49		-static const char *PCX_VERSTRING_EX = "v0.1218(IM0044)";
	47	+static const int PCP_CLIENT_VERSION_EX_NUMBER = 45;
	48	+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0045)";
	49	+static const char *PCX_VERSTRING_EX = "v0.1218(IM0045)";
50	50
51	51	static const char *PCP_CLIENT_DIST_URL = "http://pecaim.net/";
52	52	static const char *PCP_CLIENT_VERSION_URL = "version.pecaim.net";

--- a/core/win32/lib/corelib.vcproj

+++ b/core/win32/lib/corelib.vcproj

		@@ -4456,6 +4456,10 @@
4456	4456	Name="Core Includes"
4457	4457	>
4458	4458	<File
	4459	+ RelativePath="..\..\common\addrCont.h"
	4460	+ >
	4461	+ </File>
	4462	+ <File
4459	4463	RelativePath="..\..\common\asf.h"
4460	4464	>
4461	4465	</File>

		@@ -4560,6 +4564,10 @@
4560	4564	>
4561	4565	</File>
4562	4566	<File
	4567	+ RelativePath="..\..\common\ts_vector.h"
	4568	+ >
	4569	+ </File>
	4570	+ <File
4563	4571	RelativePath="..\..\common\url.h"
4564	4572	>
4565	4573	</File>

		@@ -4866,6 +4874,10 @@
4866	4874	>
4867	4875	</File>
4868	4876	<File
	4877	+ RelativePath="..\ts_vector.h"
	4878	+ >
	4879	+ </File>
	4880	+ <File
4869	4881	RelativePath="..\wsocket.h"
4870	4882	>
4871	4883	</File>

--- /dev/null

+++ b/core/win32/ts_vector.h

		@@ -0,0 +1,44 @@
	1	+/*
	2	+ * Simple vector (Thread safe implementation)
	3	+ * for Windows w/ VC++
	4	+ *
	5	+ * Impl. by Eru
	6	+ */
	7	+
	8	+#ifndef _CORELIB_WIN32_TS_VECTOR_H_
	9	+#define _CORELIB_WIN32_TS_VECTOR_H_
	10	+
	11	+#include <stdlib.h>
	12	+#include <stdexcept>
	13	+#include <windows.h>
	14	+#include "common/ts_vector.h"
	15	+
	16	+template <class T>
	17	+class WTSVector : public ITSVector<T>
	18	+{
	19	+private:
	20	+ CRITICAL_SECTION csec;
	21	+
	22	+public:
	23	+ WTSVector()
	24	+ {
	25	+ InitializeCriticalSection(&csec);
	26	+ }
	27	+
	28	+ ~WTSVector()
	29	+ {
	30	+ DeleteCriticalSection(&csec);
	31	+ }
	32	+
	33	+ inline virtual void lock()
	34	+ {
	35	+ EnterCriticalSection(&csec);
	36	+ }
	37	+
	38	+ inline virtual void unlock()
	39	+ {
	40	+ LeaveCriticalSection(&csec);
	41	+ }
	42	+};
	43	+
	44	+#endif

--- a/ui/win32/Simple_vp/Simple_vp.vcproj

+++ b/ui/win32/Simple_vp/Simple_vp.vcproj

		@@ -117,9 +117,9 @@
117	117	/>
118	118	</Configuration>
119	119	<Configuration
120		- Name="Release\|Win32"
121		- OutputDirectory=".\Release"
122		- IntermediateDirectory=".\Release"
	120	+ Name="Private Debug\|x64"
	121	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	122	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
123	123	ConfigurationType="1"
124	124	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
125	125	UseOfMFC="0"

		@@ -140,36 +140,36 @@
140	140	/>
141	141	<Tool
142	142	Name="VCMIDLTool"
143		- PreprocessorDefinitions="NDEBUG"
	143	+ PreprocessorDefinitions="_DEBUG"
144	144	MkTypLibCompatible="true"
145	145	SuppressStartupBanner="true"
146		- TargetEnvironment="1"
147		- TypeLibraryName=".\Release/Simple.tlb"
	146	+ TargetEnvironment="3"
	147	+ TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
148	148	HeaderFileName=""
149	149	/>
150	150	<Tool
151	151	Name="VCCLCompilerTool"
152		- Optimization="2"
153		- InlineFunctionExpansion="1"
154		- AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
155		- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
156		- StringPooling="true"
157		- RuntimeLibrary="0"
158		- EnableFunctionLevelLinking="true"
159		- PrecompiledHeaderFile=".\Release/Simple.pch"
160		- AssemblerListingLocation=".\Release/"
161		- ObjectFile=".\Release/"
162		- ProgramDataBaseFileName=".\Release/"
	152	+ Optimization="0"
	153	+ AdditionalIncludeDirectories="../../../core,../../../core/common"
	154	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	155	+ MinimalRebuild="true"
	156	+ BasicRuntimeChecks="3"
	157	+ RuntimeLibrary="1"
	158	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
	159	+ AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
	160	+ ObjectFile=".\Simple___Win32_Private_Debug/"
	161	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
163	162	BrowseInformation="1"
164	163	WarningLevel="3"
165	164	SuppressStartupBanner="true"
	165	+ DebugInformationFormat="3"
166	166	/>
167	167	<Tool
168	168	Name="VCManagedResourceCompilerTool"
169	169	/>
170	170	<Tool
171	171	Name="VCResourceCompilerTool"
172		- PreprocessorDefinitions="NDEBUG"
	172	+ PreprocessorDefinitions="_DEBUG"
173	173	Culture="1033"
174	174	/>
175	175	<Tool

		@@ -177,17 +177,16 @@
177	177	/>
178	178	<Tool
179	179	Name="VCLinkerTool"
180		- AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib ole32.lib"
181		- OutputFile="Release/PeerCast.exe"
	180	+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
	181	+ OutputFile="Debug/PeerCast.exe"
182	182	LinkIncremental="1"
183	183	SuppressStartupBanner="true"
184		- AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
185		- ProgramDatabaseFile=".\Release/PeerCast.pdb"
	184	+ GenerateDebugInformation="true"
	185	+ ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
186	186	SubSystem="2"
187		- LinkTimeCodeGeneration="1"
188	187	RandomizedBaseAddress="1"
189	188	DataExecutionPrevention="0"
190		- TargetMachine="1"
	189	+ TargetMachine="17"
191	190	/>
192	191	<Tool
193	192	Name="VCALinkTool"

		@@ -201,7 +200,7 @@
201	200	<Tool
202	201	Name="VCBscMakeTool"
203	202	SuppressStartupBanner="true"
204		- OutputFile=".\Release/Simple.bsc"
	203	+ OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
205	204	/>
206	205	<Tool
207	206	Name="VCFxCopTool"

		@@ -211,15 +210,14 @@
211	210	/>
212	211	<Tool
213	212	Name="VCPostBuildEventTool"
214		- Description="Copy exe to pimp & program files"
215		- CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
216		- ExcludedFromBuild="true"
	213	+ Description="Copy exe to program files"
	214	+ CommandLine="copy debug\peercast.exe "c:\program files\peercast""
217	215	/>
218	216	</Configuration>
219	217	<Configuration
220		- Name="Private Release\|Win32"
221		- OutputDirectory=".\Simple___Win32_Private_Release"
222		- IntermediateDirectory=".\Simple___Win32_Private_Release"
	218	+ Name="Release\|Win32"
	219	+ OutputDirectory=".\Release"
	220	+ IntermediateDirectory=".\Release"
223	221	ConfigurationType="1"
224	222	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
225	223	UseOfMFC="0"

		@@ -244,22 +242,22 @@
244	242	MkTypLibCompatible="true"
245	243	SuppressStartupBanner="true"
246	244	TargetEnvironment="1"
247		- TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
	245	+ TypeLibraryName=".\Release/Simple.tlb"
248	246	HeaderFileName=""
249	247	/>
250	248	<Tool
251	249	Name="VCCLCompilerTool"
252	250	Optimization="2"
253	251	InlineFunctionExpansion="1"
254		- AdditionalIncludeDirectories="../../../core,../../../core/common"
255		- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	252	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	253	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
256	254	StringPooling="true"
257	255	RuntimeLibrary="0"
258	256	EnableFunctionLevelLinking="true"
259		- PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
260		- AssemblerListingLocation=".\Simple___Win32_Private_Release/"
261		- ObjectFile=".\Simple___Win32_Private_Release/"
262		- ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
	257	+ PrecompiledHeaderFile=".\Release/Simple.pch"
	258	+ AssemblerListingLocation=".\Release/"
	259	+ ObjectFile=".\Release/"
	260	+ ProgramDataBaseFileName=".\Release/"
263	261	BrowseInformation="1"
264	262	WarningLevel="3"
265	263	SuppressStartupBanner="true"

		@@ -277,12 +275,14 @@
277	275	/>
278	276	<Tool
279	277	Name="VCLinkerTool"
280		- AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
281		- OutputFile="PrivRelease/PeerCast.exe"
	278	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib ole32.lib"
	279	+ OutputFile="Release/PeerCast.exe"
282	280	LinkIncremental="1"
283	281	SuppressStartupBanner="true"
284		- ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
	282	+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
	283	+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
285	284	SubSystem="2"
	285	+ LinkTimeCodeGeneration="1"
286	286	RandomizedBaseAddress="1"
287	287	DataExecutionPrevention="0"
288	288	TargetMachine="1"

		@@ -299,7 +299,7 @@
299	299	<Tool
300	300	Name="VCBscMakeTool"
301	301	SuppressStartupBanner="true"
302		- OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
	302	+ OutputFile=".\Release/Simple.bsc"
303	303	/>
304	304	<Tool
305	305	Name="VCFxCopTool"

		@@ -311,12 +311,13 @@
311	311	Name="VCPostBuildEventTool"
312	312	Description="Copy exe to pimp & program files"
313	313	CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	314	+ ExcludedFromBuild="true"
314	315	/>
315	316	</Configuration>
316	317	<Configuration
317		- Name="Debug\|Win32"
318		- OutputDirectory=".\Debug"
319		- IntermediateDirectory=".\Debug"
	318	+ Name="Release\|x64"
	319	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	320	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
320	321	ConfigurationType="1"
321	322	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
322	323	UseOfMFC="0"

		@@ -337,36 +338,36 @@
337	338	/>
338	339	<Tool
339	340	Name="VCMIDLTool"
340		- PreprocessorDefinitions="_DEBUG"
	341	+ PreprocessorDefinitions="NDEBUG"
341	342	MkTypLibCompatible="true"
342	343	SuppressStartupBanner="true"
343		- TargetEnvironment="1"
344		- TypeLibraryName=".\Debug/Simple.tlb"
	344	+ TargetEnvironment="3"
	345	+ TypeLibraryName=".\Release/Simple.tlb"
345	346	HeaderFileName=""
346	347	/>
347	348	<Tool
348	349	Name="VCCLCompilerTool"
349		- Optimization="0"
350		- AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft Platform SDK\Include""
351		- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
352		- MinimalRebuild="true"
353		- BasicRuntimeChecks="3"
354		- RuntimeLibrary="1"
355		- PrecompiledHeaderFile=".\Debug/Simple.pch"
356		- AssemblerListingLocation=".\Debug/"
357		- ObjectFile=".\Debug/"
358		- ProgramDataBaseFileName=".\Debug/"
	350	+ Optimization="2"
	351	+ InlineFunctionExpansion="1"
	352	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	353	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN64"
	354	+ StringPooling="true"
	355	+ RuntimeLibrary="0"
	356	+ EnableFunctionLevelLinking="true"
	357	+ PrecompiledHeaderFile=".\Release/Simple.pch"
	358	+ AssemblerListingLocation=".\Release/"
	359	+ ObjectFile=".\Release/"
	360	+ ProgramDataBaseFileName=".\Release/"
359	361	BrowseInformation="1"
360	362	WarningLevel="3"
361	363	SuppressStartupBanner="true"
362		- DebugInformationFormat="4"
363	364	/>
364	365	<Tool
365	366	Name="VCManagedResourceCompilerTool"
366	367	/>
367	368	<Tool
368	369	Name="VCResourceCompilerTool"
369		- PreprocessorDefinitions="_DEBUG"
	370	+ PreprocessorDefinitions="NDEBUG"
370	371	Culture="1033"
371	372	/>
372	373	<Tool

		@@ -374,17 +375,17 @@
374	375	/>
375	376	<Tool
376	377	Name="VCLinkerTool"
377		- AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib"
378		- OutputFile="Debug/PeerCast.exe"
	378	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib ole32.lib"
	379	+ OutputFile="Release/PeerCast.exe"
379	380	LinkIncremental="1"
380	381	SuppressStartupBanner="true"
381	382	AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
382		- GenerateDebugInformation="true"
383		- ProgramDatabaseFile=".\Debug/PeerCast.pdb"
	383	+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
384	384	SubSystem="2"
	385	+ LinkTimeCodeGeneration="1"
385	386	RandomizedBaseAddress="1"
386	387	DataExecutionPrevention="0"
387		- TargetMachine="1"
	388	+ TargetMachine="17"
388	389	/>
389	390	<Tool
390	391	Name="VCALinkTool"

		@@ -398,7 +399,7 @@
398	399	<Tool
399	400	Name="VCBscMakeTool"
400	401	SuppressStartupBanner="true"
401		- OutputFile=".\Debug/Simple.bsc"
	402	+ OutputFile=".\Release/Simple.bsc"
402	403	/>
403	404	<Tool
404	405	Name="VCFxCopTool"

		@@ -408,14 +409,15 @@
408	409	/>
409	410	<Tool
410	411	Name="VCPostBuildEventTool"
411		- Description="Copy exe to program files"
412		- CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	412	+ Description="Copy exe to pimp & program files"
	413	+ CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	414	+ ExcludedFromBuild="true"
413	415	/>
414	416	</Configuration>
415	417	<Configuration
416		- Name="Private Debug\|x64"
417		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
418		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	418	+ Name="Private Release\|Win32"
	419	+ OutputDirectory=".\Simple___Win32_Private_Release"
	420	+ IntermediateDirectory=".\Simple___Win32_Private_Release"
419	421	ConfigurationType="1"
420	422	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
421	423	UseOfMFC="0"

		@@ -436,36 +438,36 @@
436	438	/>
437	439	<Tool
438	440	Name="VCMIDLTool"
439		- PreprocessorDefinitions="_DEBUG"
	441	+ PreprocessorDefinitions="NDEBUG"
440	442	MkTypLibCompatible="true"
441	443	SuppressStartupBanner="true"
442		- TargetEnvironment="3"
443		- TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
	444	+ TargetEnvironment="1"
	445	+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
444	446	HeaderFileName=""
445	447	/>
446	448	<Tool
447	449	Name="VCCLCompilerTool"
448		- Optimization="0"
	450	+ Optimization="2"
	451	+ InlineFunctionExpansion="1"
449	452	AdditionalIncludeDirectories="../../../core,../../../core/common"
450		- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
451		- MinimalRebuild="true"
452		- BasicRuntimeChecks="3"
453		- RuntimeLibrary="1"
454		- PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
455		- AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
456		- ObjectFile=".\Simple___Win32_Private_Debug/"
457		- ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
	453	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	454	+ StringPooling="true"
	455	+ RuntimeLibrary="0"
	456	+ EnableFunctionLevelLinking="true"
	457	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
	458	+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
	459	+ ObjectFile=".\Simple___Win32_Private_Release/"
	460	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
458	461	BrowseInformation="1"
459	462	WarningLevel="3"
460	463	SuppressStartupBanner="true"
461		- DebugInformationFormat="3"
462	464	/>
463	465	<Tool
464	466	Name="VCManagedResourceCompilerTool"
465	467	/>
466	468	<Tool
467	469	Name="VCResourceCompilerTool"
468		- PreprocessorDefinitions="_DEBUG"
	470	+ PreprocessorDefinitions="NDEBUG"
469	471	Culture="1033"
470	472	/>
471	473	<Tool

		@@ -474,15 +476,14 @@
474	476	<Tool
475	477	Name="VCLinkerTool"
476	478	AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
477		- OutputFile="Debug/PeerCast.exe"
	479	+ OutputFile="PrivRelease/PeerCast.exe"
478	480	LinkIncremental="1"
479	481	SuppressStartupBanner="true"
480		- GenerateDebugInformation="true"
481		- ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
	482	+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
482	483	SubSystem="2"
483	484	RandomizedBaseAddress="1"
484	485	DataExecutionPrevention="0"
485		- TargetMachine="17"
	486	+ TargetMachine="1"
486	487	/>
487	488	<Tool
488	489	Name="VCALinkTool"

		@@ -496,7 +497,7 @@
496	497	<Tool
497	498	Name="VCBscMakeTool"
498	499	SuppressStartupBanner="true"
499		- OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
	500	+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
500	501	/>
501	502	<Tool
502	503	Name="VCFxCopTool"

		@@ -506,12 +507,12 @@
506	507	/>
507	508	<Tool
508	509	Name="VCPostBuildEventTool"
509		- Description="Copy exe to program files"
510		- CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	510	+ Description="Copy exe to pimp & program files"
	511	+ CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
511	512	/>
512	513	</Configuration>
513	514	<Configuration
514		- Name="Release\|x64"
	515	+ Name="Private Release\|x64"
515	516	OutputDirectory="$(PlatformName)\$(ConfigurationName)"
516	517	IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
517	518	ConfigurationType="1"

		@@ -538,22 +539,22 @@
538	539	MkTypLibCompatible="true"
539	540	SuppressStartupBanner="true"
540	541	TargetEnvironment="3"
541		- TypeLibraryName=".\Release/Simple.tlb"
	542	+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
542	543	HeaderFileName=""
543	544	/>
544	545	<Tool
545	546	Name="VCCLCompilerTool"
546	547	Optimization="2"
547	548	InlineFunctionExpansion="1"
548		- AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
549		- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN64"
	549	+ AdditionalIncludeDirectories="../../../core,../../../core/common"
	550	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
550	551	StringPooling="true"
551	552	RuntimeLibrary="0"
552	553	EnableFunctionLevelLinking="true"
553		- PrecompiledHeaderFile=".\Release/Simple.pch"
554		- AssemblerListingLocation=".\Release/"
555		- ObjectFile=".\Release/"
556		- ProgramDataBaseFileName=".\Release/"
	554	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
	555	+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
	556	+ ObjectFile=".\Simple___Win32_Private_Release/"
	557	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
557	558	BrowseInformation="1"
558	559	WarningLevel="3"
559	560	SuppressStartupBanner="true"

		@@ -571,14 +572,12 @@
571	572	/>
572	573	<Tool
573	574	Name="VCLinkerTool"
574		- AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib ole32.lib"
575		- OutputFile="Release/PeerCast.exe"
	575	+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
	576	+ OutputFile="PrivRelease/PeerCast.exe"
576	577	LinkIncremental="1"
577	578	SuppressStartupBanner="true"
578		- AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
579		- ProgramDatabaseFile=".\Release/PeerCast.pdb"
	579	+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
580	580	SubSystem="2"
581		- LinkTimeCodeGeneration="1"
582	581	RandomizedBaseAddress="1"
583	582	DataExecutionPrevention="0"
584	583	TargetMachine="17"

		@@ -595,7 +594,7 @@
595	594	<Tool
596	595	Name="VCBscMakeTool"
597	596	SuppressStartupBanner="true"
598		- OutputFile=".\Release/Simple.bsc"
	597	+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
599	598	/>
600	599	<Tool
601	600	Name="VCFxCopTool"

		@@ -607,13 +606,12 @@
607	606	Name="VCPostBuildEventTool"
608	607	Description="Copy exe to pimp & program files"
609	608	CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
610		- ExcludedFromBuild="true"
611	609	/>
612	610	</Configuration>
613	611	<Configuration
614		- Name="Private Release\|x64"
615		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
616		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	612	+ Name="Debug\|Win32"
	613	+ OutputDirectory=".\Debug"
	614	+ IntermediateDirectory=".\Debug"
617	615	ConfigurationType="1"
618	616	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
619	617	UseOfMFC="0"

		@@ -634,36 +632,36 @@
634	632	/>
635	633	<Tool
636	634	Name="VCMIDLTool"
637		- PreprocessorDefinitions="NDEBUG"
	635	+ PreprocessorDefinitions="_DEBUG"
638	636	MkTypLibCompatible="true"
639	637	SuppressStartupBanner="true"
640		- TargetEnvironment="3"
641		- TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
	638	+ TargetEnvironment="1"
	639	+ TypeLibraryName=".\Debug/Simple.tlb"
642	640	HeaderFileName=""
643	641	/>
644	642	<Tool
645	643	Name="VCCLCompilerTool"
646		- Optimization="2"
647		- InlineFunctionExpansion="1"
648		- AdditionalIncludeDirectories="../../../core,../../../core/common"
649		- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
650		- StringPooling="true"
651		- RuntimeLibrary="0"
652		- EnableFunctionLevelLinking="true"
653		- PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
654		- AssemblerListingLocation=".\Simple___Win32_Private_Release/"
655		- ObjectFile=".\Simple___Win32_Private_Release/"
656		- ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
	644	+ Optimization="0"
	645	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft Platform SDK\Include""
	646	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
	647	+ MinimalRebuild="true"
	648	+ BasicRuntimeChecks="3"
	649	+ RuntimeLibrary="1"
	650	+ PrecompiledHeaderFile=".\Debug/Simple.pch"
	651	+ AssemblerListingLocation=".\Debug/"
	652	+ ObjectFile=".\Debug/"
	653	+ ProgramDataBaseFileName=".\Debug/"
657	654	BrowseInformation="1"
658	655	WarningLevel="3"
659	656	SuppressStartupBanner="true"
	657	+ DebugInformationFormat="4"
660	658	/>
661	659	<Tool
662	660	Name="VCManagedResourceCompilerTool"
663	661	/>
664	662	<Tool
665	663	Name="VCResourceCompilerTool"
666		- PreprocessorDefinitions="NDEBUG"
	664	+ PreprocessorDefinitions="_DEBUG"
667	665	Culture="1033"
668	666	/>
669	667	<Tool

		@@ -671,15 +669,17 @@
671	669	/>
672	670	<Tool
673	671	Name="VCLinkerTool"
674		- AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
675		- OutputFile="PrivRelease/PeerCast.exe"
	672	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib"
	673	+ OutputFile="Debug/PeerCast.exe"
676	674	LinkIncremental="1"
677	675	SuppressStartupBanner="true"
678		- ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
	676	+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
	677	+ GenerateDebugInformation="true"
	678	+ ProgramDatabaseFile=".\Debug/PeerCast.pdb"
679	679	SubSystem="2"
680	680	RandomizedBaseAddress="1"
681	681	DataExecutionPrevention="0"
682		- TargetMachine="17"
	682	+ TargetMachine="1"
683	683	/>
684	684	<Tool
685	685	Name="VCALinkTool"

		@@ -693,7 +693,7 @@
693	693	<Tool
694	694	Name="VCBscMakeTool"
695	695	SuppressStartupBanner="true"
696		- OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
	696	+ OutputFile=".\Debug/Simple.bsc"
697	697	/>
698	698	<Tool
699	699	Name="VCFxCopTool"

		@@ -703,8 +703,8 @@
703	703	/>
704	704	<Tool
705	705	Name="VCPostBuildEventTool"
706		- Description="Copy exe to pimp & program files"
707		- CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	706	+ Description=""
	707	+ CommandLine=""
708	708	/>
709	709	</Configuration>
710	710	<Configuration

		@@ -827,7 +827,7 @@
827	827	/>
828	828	</FileConfiguration>
829	829	<FileConfiguration
830		- Name="Release\|Win32"
	830	+ Name="Private Debug\|x64"
831	831	>
832	832	<Tool
833	833	Name="VCCLCompilerTool"

		@@ -836,7 +836,7 @@
836	836	/>
837	837	</FileConfiguration>
838	838	<FileConfiguration
839		- Name="Private Release\|Win32"
	839	+ Name="Release\|Win32"
840	840	>
841	841	<Tool
842	842	Name="VCCLCompilerTool"

		@@ -845,7 +845,7 @@
845	845	/>
846	846	</FileConfiguration>
847	847	<FileConfiguration
848		- Name="Debug\|Win32"
	848	+ Name="Release\|x64"
849	849	>
850	850	<Tool
851	851	Name="VCCLCompilerTool"

		@@ -854,7 +854,7 @@
854	854	/>
855	855	</FileConfiguration>
856	856	<FileConfiguration
857		- Name="Private Debug\|x64"
	857	+ Name="Private Release\|Win32"
858	858	>
859	859	<Tool
860	860	Name="VCCLCompilerTool"

		@@ -863,7 +863,7 @@
863	863	/>
864	864	</FileConfiguration>
865	865	<FileConfiguration
866		- Name="Release\|x64"
	866	+ Name="Private Release\|x64"
867	867	>
868	868	<Tool
869	869	Name="VCCLCompilerTool"

		@@ -872,7 +872,7 @@
872	872	/>
873	873	</FileConfiguration>
874	874	<FileConfiguration
875		- Name="Private Release\|x64"
	875	+ Name="Debug\|Win32"
876	876	>
877	877	<Tool
878	878	Name="VCCLCompilerTool"

		@@ -903,7 +903,7 @@
903	903	/>
904	904	</FileConfiguration>
905	905	<FileConfiguration
906		- Name="Release\|Win32"
	906	+ Name="Private Debug\|x64"
907	907	>
908	908	<Tool
909	909	Name="VCCLCompilerTool"

		@@ -912,7 +912,7 @@
912	912	/>
913	913	</FileConfiguration>
914	914	<FileConfiguration
915		- Name="Private Release\|Win32"
	915	+ Name="Release\|Win32"
916	916	>
917	917	<Tool
918	918	Name="VCCLCompilerTool"

		@@ -921,7 +921,7 @@
921	921	/>
922	922	</FileConfiguration>
923	923	<FileConfiguration
924		- Name="Debug\|Win32"
	924	+ Name="Release\|x64"
925	925	>
926	926	<Tool
927	927	Name="VCCLCompilerTool"

		@@ -930,7 +930,7 @@
930	930	/>
931	931	</FileConfiguration>
932	932	<FileConfiguration
933		- Name="Private Debug\|x64"
	933	+ Name="Private Release\|Win32"
934	934	>
935	935	<Tool
936	936	Name="VCCLCompilerTool"

		@@ -939,7 +939,7 @@
939	939	/>
940	940	</FileConfiguration>
941	941	<FileConfiguration
942		- Name="Release\|x64"
	942	+ Name="Private Release\|x64"
943	943	>
944	944	<Tool
945	945	Name="VCCLCompilerTool"

		@@ -948,7 +948,7 @@
948	948	/>
949	949	</FileConfiguration>
950	950	<FileConfiguration
951		- Name="Private Release\|x64"
	951	+ Name="Debug\|Win32"
952	952	>
953	953	<Tool
954	954	Name="VCCLCompilerTool"

		@@ -979,7 +979,7 @@
979	979	/>
980	980	</FileConfiguration>
981	981	<FileConfiguration
982		- Name="Release\|Win32"
	982	+ Name="Private Debug\|x64"
983	983	>
984	984	<Tool
985	985	Name="VCCLCompilerTool"

		@@ -988,7 +988,7 @@
988	988	/>
989	989	</FileConfiguration>
990	990	<FileConfiguration
991		- Name="Private Release\|Win32"
	991	+ Name="Release\|Win32"
992	992	>
993	993	<Tool
994	994	Name="VCCLCompilerTool"

		@@ -997,7 +997,7 @@
997	997	/>
998	998	</FileConfiguration>
999	999	<FileConfiguration
1000		- Name="Debug\|Win32"
	1000	+ Name="Release\|x64"
1001	1001	>
1002	1002	<Tool
1003	1003	Name="VCCLCompilerTool"

		@@ -1006,7 +1006,7 @@
1006	1006	/>
1007	1007	</FileConfiguration>
1008	1008	<FileConfiguration
1009		- Name="Private Debug\|x64"
	1009	+ Name="Private Release\|Win32"
1010	1010	>
1011	1011	<Tool
1012	1012	Name="VCCLCompilerTool"

		@@ -1015,7 +1015,7 @@
1015	1015	/>
1016	1016	</FileConfiguration>
1017	1017	<FileConfiguration
1018		- Name="Release\|x64"
	1018	+ Name="Private Release\|x64"
1019	1019	>
1020	1020	<Tool
1021	1021	Name="VCCLCompilerTool"

		@@ -1024,7 +1024,7 @@
1024	1024	/>
1025	1025	</FileConfiguration>
1026	1026	<FileConfiguration
1027		- Name="Private Release\|x64"
	1027	+ Name="Debug\|Win32"
1028	1028	>
1029	1029	<Tool
1030	1030	Name="VCCLCompilerTool"

		@@ -1054,24 +1054,24 @@
1054	1054	/>
1055	1055	</FileConfiguration>
1056	1056	<FileConfiguration
1057		- Name="Release\|Win32"
	1057	+ Name="Private Debug\|x64"
1058	1058	>
1059	1059	<Tool
1060	1060	Name="VCResourceCompilerTool"
1061	1061	PreprocessorDefinitions=""
1062		- AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
1063	1062	/>
1064	1063	</FileConfiguration>
1065	1064	<FileConfiguration
1066		- Name="Private Release\|Win32"
	1065	+ Name="Release\|Win32"
1067	1066	>
1068	1067	<Tool
1069	1068	Name="VCResourceCompilerTool"
1070	1069	PreprocessorDefinitions=""
	1070	+ AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
1071	1071	/>
1072	1072	</FileConfiguration>
1073	1073	<FileConfiguration
1074		- Name="Debug\|Win32"
	1074	+ Name="Release\|x64"
1075	1075	>
1076	1076	<Tool
1077	1077	Name="VCResourceCompilerTool"

		@@ -1080,7 +1080,7 @@
1080	1080	/>
1081	1081	</FileConfiguration>
1082	1082	<FileConfiguration
1083		- Name="Private Debug\|x64"
	1083	+ Name="Private Release\|Win32"
1084	1084	>
1085	1085	<Tool
1086	1086	Name="VCResourceCompilerTool"

		@@ -1088,20 +1088,20 @@
1088	1088	/>
1089	1089	</FileConfiguration>
1090	1090	<FileConfiguration
1091		- Name="Release\|x64"
	1091	+ Name="Private Release\|x64"
1092	1092	>
1093	1093	<Tool
1094	1094	Name="VCResourceCompilerTool"
1095	1095	PreprocessorDefinitions=""
1096		- AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
1097	1096	/>
1098	1097	</FileConfiguration>
1099	1098	<FileConfiguration
1100		- Name="Private Release\|x64"
	1099	+ Name="Debug\|Win32"
1101	1100	>
1102	1101	<Tool
1103	1102	Name="VCResourceCompilerTool"
1104	1103	PreprocessorDefinitions=""
	1104	+ AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
1105	1105	/>
1106	1106	</FileConfiguration>
1107	1107	<FileConfiguration

		@@ -1127,7 +1127,7 @@
1127	1127	/>
1128	1128	</FileConfiguration>
1129	1129	<FileConfiguration
1130		- Name="Release\|Win32"
	1130	+ Name="Private Debug\|x64"
1131	1131	>
1132	1132	<Tool
1133	1133	Name="VCCLCompilerTool"

		@@ -1136,7 +1136,7 @@
1136	1136	/>
1137	1137	</FileConfiguration>
1138	1138	<FileConfiguration
1139		- Name="Private Release\|Win32"
	1139	+ Name="Release\|Win32"
1140	1140	>
1141	1141	<Tool
1142	1142	Name="VCCLCompilerTool"

		@@ -1145,7 +1145,7 @@
1145	1145	/>
1146	1146	</FileConfiguration>
1147	1147	<FileConfiguration
1148		- Name="Debug\|Win32"
	1148	+ Name="Release\|x64"
1149	1149	>
1150	1150	<Tool
1151	1151	Name="VCCLCompilerTool"

		@@ -1154,7 +1154,7 @@
1154	1154	/>
1155	1155	</FileConfiguration>
1156	1156	<FileConfiguration
1157		- Name="Private Debug\|x64"
	1157	+ Name="Private Release\|Win32"
1158	1158	>
1159	1159	<Tool
1160	1160	Name="VCCLCompilerTool"

		@@ -1163,7 +1163,7 @@
1163	1163	/>
1164	1164	</FileConfiguration>
1165	1165	<FileConfiguration
1166		- Name="Release\|x64"
	1166	+ Name="Private Release\|x64"
1167	1167	>
1168	1168	<Tool
1169	1169	Name="VCCLCompilerTool"

		@@ -1172,7 +1172,7 @@
1172	1172	/>
1173	1173	</FileConfiguration>
1174	1174	<FileConfiguration
1175		- Name="Private Release\|x64"
	1175	+ Name="Debug\|Win32"
1176	1176	>
1177	1177	<Tool
1178	1178	Name="VCCLCompilerTool"

		@@ -1205,7 +1205,7 @@
1205	1205	/>
1206	1206	</FileConfiguration>
1207	1207	<FileConfiguration
1208		- Name="Release\|Win32"
	1208	+ Name="Private Debug\|x64"
1209	1209	>
1210	1210	<Tool
1211	1211	Name="VCCLCompilerTool"

		@@ -1216,7 +1216,7 @@
1216	1216	/>
1217	1217	</FileConfiguration>
1218	1218	<FileConfiguration
1219		- Name="Private Release\|Win32"
	1219	+ Name="Release\|Win32"
1220	1220	>
1221	1221	<Tool
1222	1222	Name="VCCLCompilerTool"

		@@ -1227,7 +1227,7 @@
1227	1227	/>
1228	1228	</FileConfiguration>
1229	1229	<FileConfiguration
1230		- Name="Debug\|Win32"
	1230	+ Name="Release\|x64"
1231	1231	>
1232	1232	<Tool
1233	1233	Name="VCCLCompilerTool"

		@@ -1238,7 +1238,7 @@
1238	1238	/>
1239	1239	</FileConfiguration>
1240	1240	<FileConfiguration
1241		- Name="Private Debug\|x64"
	1241	+ Name="Private Release\|Win32"
1242	1242	>
1243	1243	<Tool
1244	1244	Name="VCCLCompilerTool"

		@@ -1249,7 +1249,7 @@
1249	1249	/>
1250	1250	</FileConfiguration>
1251	1251	<FileConfiguration
1252		- Name="Release\|x64"
	1252	+ Name="Private Release\|x64"
1253	1253	>
1254	1254	<Tool
1255	1255	Name="VCCLCompilerTool"

		@@ -1260,7 +1260,7 @@
1260	1260	/>
1261	1261	</FileConfiguration>
1262	1262	<FileConfiguration
1263		- Name="Private Release\|x64"
	1263	+ Name="Debug\|Win32"
1264	1264	>
1265	1265	<Tool
1266	1266	Name="VCCLCompilerTool"

		@@ -1295,7 +1295,7 @@
1295	1295	/>
1296	1296	</FileConfiguration>
1297	1297	<FileConfiguration
1298		- Name="Release\|Win32"
	1298	+ Name="Private Debug\|x64"
1299	1299	>
1300	1300	<Tool
1301	1301	Name="VCCLCompilerTool"

		@@ -1304,7 +1304,7 @@
1304	1304	/>
1305	1305	</FileConfiguration>
1306	1306	<FileConfiguration
1307		- Name="Private Release\|Win32"
	1307	+ Name="Release\|Win32"
1308	1308	>
1309	1309	<Tool
1310	1310	Name="VCCLCompilerTool"

		@@ -1313,7 +1313,7 @@
1313	1313	/>
1314	1314	</FileConfiguration>
1315	1315	<FileConfiguration
1316		- Name="Debug\|Win32"
	1316	+ Name="Release\|x64"
1317	1317	>
1318	1318	<Tool
1319	1319	Name="VCCLCompilerTool"

		@@ -1322,7 +1322,7 @@
1322	1322	/>
1323	1323	</FileConfiguration>
1324	1324	<FileConfiguration
1325		- Name="Private Debug\|x64"
	1325	+ Name="Private Release\|Win32"
1326	1326	>
1327	1327	<Tool
1328	1328	Name="VCCLCompilerTool"

		@@ -1331,7 +1331,7 @@
1331	1331	/>
1332	1332	</FileConfiguration>
1333	1333	<FileConfiguration
1334		- Name="Release\|x64"
	1334	+ Name="Private Release\|x64"
1335	1335	>
1336	1336	<Tool
1337	1337	Name="VCCLCompilerTool"

		@@ -1340,7 +1340,7 @@
1340	1340	/>
1341	1341	</FileConfiguration>
1342	1342	<FileConfiguration
1343		- Name="Private Release\|x64"
	1343	+ Name="Debug\|Win32"
1344	1344	>
1345	1345	<Tool
1346	1346	Name="VCCLCompilerTool"

--- a/ui/win32/simple/Simple.vcproj

+++ b/ui/win32/simple/Simple.vcproj

		@@ -1014,7 +1014,7 @@
1014	1014	OutputFile="Debug/PeerCast.exe"
1015	1015	LinkIncremental="1"
1016	1016	SuppressStartupBanner="true"
1017		- AdditionalLibraryDirectories=""C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Debug""
	1017	+ AdditionalLibraryDirectories="../../../core\win32\lib\Release"
1018	1018	GenerateDebugInformation="true"
1019	1019	ProgramDatabaseFile=".\Debug/PeerCast.pdb"
1020	1020	SubSystem="2"

		@@ -1045,8 +1045,8 @@
1045	1045	/>
1046	1046	<Tool
1047	1047	Name="VCPostBuildEventTool"
1048		- Description="Copy exe to pimp"
1049		- CommandLine="copy debug\peercast.exe ..\pimp\ "
	1048	+ Description=""
	1049	+ CommandLine=""
1050	1050	/>
1051	1051	</Configuration>
1052	1052	<Configuration

--- a/れどめ.txt

+++ b/れどめ.txt

		@@ -1,4 +1,4 @@
1		-PeerCast IM0044 (released on 20110309 by 縺医ｋ繝ｼ)
	1	+PeerCast IM0045 (released on 20120506 by 縺医ｋ繝ｼ)
2	2	based on PeerCast IM7651 by Trill, Original: (c) 2005-2007 giles/peercast.org
3	3
4	4

		@@ -46,6 +46,9 @@ based on PeerCast IM7651 by Trill, Original: (c) 2005-2007 giles/peercast.org
46	46
47	47
48	48	= 謾ｹ險ょｱ･豁ｴ
	49	+ - IM0045 (120506)
	50	+ + DoS謾ｻ謦?∈縺ｮ閠先?ｧ繧貞髄荳翫?
	51	+
49	52	- IM0044 (110309)
50	53	+ GUI縺ｮ蜿ｳ繧ｯ繝ｪ繝?け繝｡繝九Η繝ｼ縺九ｉ繝ｪ繝ｬ繝ｼ縺励※縺?↑縺?メ繝｣繝ｳ繝阪Ν諠??ｱ繧
51	54	荳?諡ｬ蜑企勁縺ｧ縺阪ｋ繧医≧縺ｫ縺ｪ繧翫∪縺励◆縲

Afficher sur ancien navigateur de dépôt.

PeerCast IM Fork

PeerCastIM: Commit

Commit MetaInfo

Message de Log

Change Summary

Modification

PeerCast IM
Fork