OSDN > Find Software > Multimedia > Sound/Audio > PeerCast IM > SCM > git > PeerCastIM > Commit

PeerCast IM
Fork

R/O
HTTP
SSH
HTTPS

PeerCastIM: Commit

Commit MetaInfo

Revision	9a85fa5ff6dfb059e5f0f0e182930eb46a640deb (tree)
Time	2009-09-28 00:42:36
Author	eru <eru01@user...>
Commiter	eru

Log Message

COUT切断機能を追加
学習帳1のマージ

Change Summary

modified: PeerCast.root/PeerCast/core/common/stream.cpp (diff)
modified: PeerCast.root/PeerCast/core/common/version2.h (diff)
modified: PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.rc (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/gui.cpp (diff)
modified: PeerCast.root/PeerCast/ui/win32/simple/gui.h (diff)
modified: c:/Git/PeerCast.root/PeerCast/core/common/stream.cpp (diff)
modified: c:/Git/PeerCast.root/PeerCast/core/common/version2.h (diff)
modified: c:/Git/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.h (diff)

Incremental Difference

--- a/PeerCast.root/PeerCast/core/common/stream.cpp

+++ b/PeerCast.root/PeerCast/core/common/stream.cpp

		@@ -279,12 +279,13 @@ void Stream::writeLineF(const char *fmt,...)
279	279
280	280	write(fmt,ap);
281	281
	282	+ // special thanks: 名無しの誰か
	283	+ va_end(ap);
	284	+
282	285	if (writeCRLF)
283	286	write("\r\n",2);
284	287	else
285	288	write("\n",1);
286		-
287		- va_end(ap);
288	289	}
289	290
290	291	// -------------------------------------

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

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

		@@ -44,11 +44,11 @@ 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 = 38;
48		-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)";
49		-static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)";
	47	+static const int PCP_CLIENT_VERSION_EX_NUMBER = 39;
	48	+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0039)";
	49	+static const char *PCX_VERSTRING_EX = "v0.1218(IM0039)";
50	50
51		-static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
	51	+static const char *PCP_CLIENT_DIST_URL = "http://pecaim.net/";
52	52	#endif
53	53
54	54	// ------------------------------------------------

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

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

		@@ -97,9 +97,9 @@
97	97	/>
98	98	</Configuration>
99	99	<Configuration
100		- Name="Debug\|Win32"
101		- OutputDirectory=".\Debug"
102		- IntermediateDirectory=".\Debug"
	100	+ Name="Private Release\|x64"
	101	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	102	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
103	103	ConfigurationType="4"
104	104	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
105	105	UseOfMFC="0"

		@@ -120,29 +120,30 @@
120	120	/>
121	121	<Tool
122	122	Name="VCMIDLTool"
	123	+ TargetEnvironment="3"
123	124	/>
124	125	<Tool
125	126	Name="VCCLCompilerTool"
126		- Optimization="0"
127		- AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
128		- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
129		- MinimalRebuild="true"
130		- BasicRuntimeChecks="3"
131		- RuntimeLibrary="1"
132		- PrecompiledHeaderFile=".\Debug/corelib.pch"
133		- AssemblerListingLocation=".\Debug/"
134		- ObjectFile=".\Debug/"
135		- ProgramDataBaseFileName=".\Debug/"
	127	+ Optimization="2"
	128	+ InlineFunctionExpansion="1"
	129	+ AdditionalIncludeDirectories="../../,../../common"
	130	+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PRIVATE_BROADCASTER"
	131	+ StringPooling="true"
	132	+ RuntimeLibrary="0"
	133	+ EnableFunctionLevelLinking="true"
	134	+ PrecompiledHeaderFile=".\corelib___Win32_Private_Release/corelib.pch"
	135	+ AssemblerListingLocation=".\corelib___Win32_Private_Release/"
	136	+ ObjectFile=".\corelib___Win32_Private_Release/"
	137	+ ProgramDataBaseFileName=".\corelib___Win32_Private_Release/"
136	138	WarningLevel="3"
137	139	SuppressStartupBanner="true"
138		- DebugInformationFormat="4"
139	140	/>
140	141	<Tool
141	142	Name="VCManagedResourceCompilerTool"
142	143	/>
143	144	<Tool
144	145	Name="VCResourceCompilerTool"
145		- PreprocessorDefinitions="_DEBUG"
	146	+ PreprocessorDefinitions="NDEBUG"
146	147	Culture="1033"
147	148	/>
148	149	<Tool

		@@ -150,7 +151,7 @@
150	151	/>
151	152	<Tool
152	153	Name="VCLibrarianTool"
153		- OutputFile=".\Debug\corelib.lib"
	154	+ OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
154	155	SuppressStartupBanner="true"
155	156	/>
156	157	<Tool

		@@ -162,7 +163,7 @@
162	163	<Tool
163	164	Name="VCBscMakeTool"
164	165	SuppressStartupBanner="true"
165		- OutputFile=".\Debug/corelib.bsc"
	166	+ OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
166	167	/>
167	168	<Tool
168	169	Name="VCFxCopTool"

		@@ -172,15 +173,14 @@
172	173	/>
173	174	</Configuration>
174	175	<Configuration
175		- Name="Release\|Win32"
176		- OutputDirectory=".\Release"
177		- IntermediateDirectory=".\Release"
	176	+ Name="Debug\|Win32"
	177	+ OutputDirectory=".\Debug"
	178	+ IntermediateDirectory=".\Debug"
178	179	ConfigurationType="4"
179	180	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
180	181	UseOfMFC="0"
181	182	ATLMinimizesCRunTimeLibraryUsage="false"
182	183	CharacterSet="2"
183		- WholeProgramOptimization="1"
184	184	>
185	185	<Tool
186	186	Name="VCPreBuildEventTool"

		@@ -199,30 +199,26 @@
199	199	/>
200	200	<Tool
201	201	Name="VCCLCompilerTool"
202		- Optimization="2"
203		- InlineFunctionExpansion="2"
204		- EnableIntrinsicFunctions="true"
205		- FavorSizeOrSpeed="1"
206		- EnableFiberSafeOptimizations="true"
207		- AdditionalIncludeDirectories="../../,../../common"
208		- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
209		- StringPooling="true"
210		- RuntimeLibrary="0"
211		- EnableFunctionLevelLinking="true"
212		- PrecompiledHeaderFile=".\Release/corelib.pch"
213		- AssemblerListingLocation=".\Release/"
214		- ObjectFile=".\Release/"
215		- ProgramDataBaseFileName=".\Release/"
	202	+ Optimization="0"
	203	+ AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
	204	+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
	205	+ MinimalRebuild="true"
	206	+ BasicRuntimeChecks="3"
	207	+ RuntimeLibrary="1"
	208	+ PrecompiledHeaderFile=".\Debug/corelib.pch"
	209	+ AssemblerListingLocation=".\Debug/"
	210	+ ObjectFile=".\Debug/"
	211	+ ProgramDataBaseFileName=".\Debug/"
216	212	WarningLevel="3"
217	213	SuppressStartupBanner="true"
218		- DebugInformationFormat="3"
	214	+ DebugInformationFormat="4"
219	215	/>
220	216	<Tool
221	217	Name="VCManagedResourceCompilerTool"
222	218	/>
223	219	<Tool
224	220	Name="VCResourceCompilerTool"
225		- PreprocessorDefinitions="NDEBUG"
	221	+ PreprocessorDefinitions="_DEBUG"
226	222	Culture="1033"
227	223	/>
228	224	<Tool

		@@ -230,7 +226,7 @@
230	226	/>
231	227	<Tool
232	228	Name="VCLibrarianTool"
233		- OutputFile=".\Release\corelib.lib"
	229	+ OutputFile=".\Debug\corelib.lib"
234	230	SuppressStartupBanner="true"
235	231	/>
236	232	<Tool

		@@ -242,7 +238,7 @@
242	238	<Tool
243	239	Name="VCBscMakeTool"
244	240	SuppressStartupBanner="true"
245		- OutputFile=".\Release/corelib.bsc"
	241	+ OutputFile=".\Debug/corelib.bsc"
246	242	/>
247	243	<Tool
248	244	Name="VCFxCopTool"

		@@ -252,9 +248,9 @@
252	248	/>
253	249	</Configuration>
254	250	<Configuration
255		- Name="Private Debug\|Win32"
256		- OutputDirectory=".\corelib___Win32_Private_Debug"
257		- IntermediateDirectory=".\corelib___Win32_Private_Debug"
	251	+ Name="Debug\|x64"
	252	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	253	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
258	254	ConfigurationType="4"
259	255	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
260	256	UseOfMFC="0"

		@@ -275,22 +271,24 @@
275	271	/>
276	272	<Tool
277	273	Name="VCMIDLTool"
	274	+ TargetEnvironment="3"
278	275	/>
279	276	<Tool
280	277	Name="VCCLCompilerTool"
281	278	Optimization="0"
282		- AdditionalIncludeDirectories="../../,../../common"
283		- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PRIVATE_BROADCASTER"
	279	+ AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
	280	+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
284	281	MinimalRebuild="true"
285	282	BasicRuntimeChecks="3"
286	283	RuntimeLibrary="1"
287		- PrecompiledHeaderFile=".\corelib___Win32_Private_Debug/corelib.pch"
288		- AssemblerListingLocation=".\corelib___Win32_Private_Debug/"
289		- ObjectFile=".\corelib___Win32_Private_Debug/"
290		- ProgramDataBaseFileName=".\corelib___Win32_Private_Debug/"
	284	+ PrecompiledHeaderFile=".\Debug/corelib.pch"
	285	+ AssemblerListingLocation=".\Debug/"
	286	+ ObjectFile=".\Debug/"
	287	+ ProgramDataBaseFileName=".\Debug/"
291	288	WarningLevel="3"
292	289	SuppressStartupBanner="true"
293		- DebugInformationFormat="4"
	290	+ Detect64BitPortabilityProblems="true"
	291	+ DebugInformationFormat="3"
294	292	/>
295	293	<Tool
296	294	Name="VCManagedResourceCompilerTool"

		@@ -305,7 +303,7 @@
305	303	/>
306	304	<Tool
307	305	Name="VCLibrarianTool"
308		- OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
	306	+ OutputFile=".\Debug\corelib.lib"
309	307	SuppressStartupBanner="true"
310	308	/>
311	309	<Tool

		@@ -317,7 +315,7 @@
317	315	<Tool
318	316	Name="VCBscMakeTool"
319	317	SuppressStartupBanner="true"
320		- OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
	318	+ OutputFile=".\Debug/corelib.bsc"
321	319	/>
322	320	<Tool
323	321	Name="VCFxCopTool"

		@@ -327,14 +325,15 @@
327	325	/>
328	326	</Configuration>
329	327	<Configuration
330		- Name="Private Release\|x64"
331		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
332		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	328	+ Name="Release\|Win32"
	329	+ OutputDirectory=".\Release"
	330	+ IntermediateDirectory=".\Release"
333	331	ConfigurationType="4"
334	332	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
335	333	UseOfMFC="0"
336	334	ATLMinimizesCRunTimeLibraryUsage="false"
337	335	CharacterSet="2"
	336	+ WholeProgramOptimization="1"
338	337	>
339	338	<Tool
340	339	Name="VCPreBuildEventTool"

		@@ -350,23 +349,26 @@
350	349	/>
351	350	<Tool
352	351	Name="VCMIDLTool"
353		- TargetEnvironment="3"
354	352	/>
355	353	<Tool
356	354	Name="VCCLCompilerTool"
357	355	Optimization="2"
358		- InlineFunctionExpansion="1"
	356	+ InlineFunctionExpansion="2"
	357	+ EnableIntrinsicFunctions="true"
	358	+ FavorSizeOrSpeed="1"
	359	+ EnableFiberSafeOptimizations="true"
359	360	AdditionalIncludeDirectories="../../,../../common"
360		- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PRIVATE_BROADCASTER"
	361	+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
361	362	StringPooling="true"
362	363	RuntimeLibrary="0"
363	364	EnableFunctionLevelLinking="true"
364		- PrecompiledHeaderFile=".\corelib___Win32_Private_Release/corelib.pch"
365		- AssemblerListingLocation=".\corelib___Win32_Private_Release/"
366		- ObjectFile=".\corelib___Win32_Private_Release/"
367		- ProgramDataBaseFileName=".\corelib___Win32_Private_Release/"
	365	+ PrecompiledHeaderFile=".\Release/corelib.pch"
	366	+ AssemblerListingLocation=".\Release/"
	367	+ ObjectFile=".\Release/"
	368	+ ProgramDataBaseFileName=".\Release/"
368	369	WarningLevel="3"
369	370	SuppressStartupBanner="true"
	371	+ DebugInformationFormat="3"
370	372	/>
371	373	<Tool
372	374	Name="VCManagedResourceCompilerTool"

		@@ -381,7 +383,7 @@
381	383	/>
382	384	<Tool
383	385	Name="VCLibrarianTool"
384		- OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
	386	+ OutputFile=".\Release\corelib.lib"
385	387	SuppressStartupBanner="true"
386	388	/>
387	389	<Tool

		@@ -393,7 +395,7 @@
393	395	<Tool
394	396	Name="VCBscMakeTool"
395	397	SuppressStartupBanner="true"
396		- OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
	398	+ OutputFile=".\Release/corelib.bsc"
397	399	/>
398	400	<Tool
399	401	Name="VCFxCopTool"

		@@ -403,7 +405,7 @@
403	405	/>
404	406	</Configuration>
405	407	<Configuration
406		- Name="Debug\|x64"
	408	+ Name="Release\|x64"
407	409	OutputDirectory="$(PlatformName)\$(ConfigurationName)"
408	410	IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
409	411	ConfigurationType="4"

		@@ -411,6 +413,7 @@
411	413	UseOfMFC="0"
412	414	ATLMinimizesCRunTimeLibraryUsage="false"
413	415	CharacterSet="2"
	416	+ WholeProgramOptimization="1"
414	417	>
415	418	<Tool
416	419	Name="VCPreBuildEventTool"

		@@ -430,18 +433,23 @@
430	433	/>
431	434	<Tool
432	435	Name="VCCLCompilerTool"
433		- Optimization="0"
434		- AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
435		- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
436		- MinimalRebuild="true"
437		- BasicRuntimeChecks="3"
438		- RuntimeLibrary="1"
439		- PrecompiledHeaderFile=".\Debug/corelib.pch"
440		- AssemblerListingLocation=".\Debug/"
441		- ObjectFile=".\Debug/"
442		- ProgramDataBaseFileName=".\Debug/"
	436	+ Optimization="2"
	437	+ InlineFunctionExpansion="2"
	438	+ EnableIntrinsicFunctions="true"
	439	+ FavorSizeOrSpeed="1"
	440	+ EnableFiberSafeOptimizations="true"
	441	+ AdditionalIncludeDirectories="../../,../../common"
	442	+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
	443	+ StringPooling="true"
	444	+ RuntimeLibrary="0"
	445	+ EnableFunctionLevelLinking="true"
	446	+ PrecompiledHeaderFile=".\Release/corelib.pch"
	447	+ AssemblerListingLocation=".\Release/"
	448	+ ObjectFile=".\Release/"
	449	+ ProgramDataBaseFileName=".\Release/"
443	450	WarningLevel="3"
444	451	SuppressStartupBanner="true"
	452	+ Detect64BitPortabilityProblems="true"
445	453	DebugInformationFormat="3"
446	454	/>
447	455	<Tool

		@@ -449,7 +457,7 @@
449	457	/>
450	458	<Tool
451	459	Name="VCResourceCompilerTool"
452		- PreprocessorDefinitions="_DEBUG"
	460	+ PreprocessorDefinitions="NDEBUG"
453	461	Culture="1033"
454	462	/>
455	463	<Tool

		@@ -457,7 +465,7 @@
457	465	/>
458	466	<Tool
459	467	Name="VCLibrarianTool"
460		- OutputFile=".\Debug\corelib.lib"
	468	+ OutputFile=".\Release\corelib.lib"
461	469	SuppressStartupBanner="true"
462	470	/>
463	471	<Tool

		@@ -469,7 +477,7 @@
469	477	<Tool
470	478	Name="VCBscMakeTool"
471	479	SuppressStartupBanner="true"
472		- OutputFile=".\Debug/corelib.bsc"
	480	+ OutputFile=".\Release/corelib.bsc"
473	481	/>
474	482	<Tool
475	483	Name="VCFxCopTool"

		@@ -479,15 +487,14 @@
479	487	/>
480	488	</Configuration>
481	489	<Configuration
482		- Name="Release\|x64"
483		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
484		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	490	+ Name="Private Debug\|Win32"
	491	+ OutputDirectory=".\corelib___Win32_Private_Debug"
	492	+ IntermediateDirectory=".\corelib___Win32_Private_Debug"
485	493	ConfigurationType="4"
486	494	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
487	495	UseOfMFC="0"
488	496	ATLMinimizesCRunTimeLibraryUsage="false"
489	497	CharacterSet="2"
490		- WholeProgramOptimization="1"
491	498	>
492	499	<Tool
493	500	Name="VCPreBuildEventTool"

		@@ -503,34 +510,29 @@
503	510	/>
504	511	<Tool
505	512	Name="VCMIDLTool"
506		- TargetEnvironment="3"
507	513	/>
508	514	<Tool
509	515	Name="VCCLCompilerTool"
510		- Optimization="2"
511		- InlineFunctionExpansion="2"
512		- EnableIntrinsicFunctions="true"
513		- FavorSizeOrSpeed="1"
514		- EnableFiberSafeOptimizations="true"
	516	+ Optimization="0"
515	517	AdditionalIncludeDirectories="../../,../../common"
516		- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
517		- StringPooling="true"
518		- RuntimeLibrary="0"
519		- EnableFunctionLevelLinking="true"
520		- PrecompiledHeaderFile=".\Release/corelib.pch"
521		- AssemblerListingLocation=".\Release/"
522		- ObjectFile=".\Release/"
523		- ProgramDataBaseFileName=".\Release/"
	518	+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PRIVATE_BROADCASTER"
	519	+ MinimalRebuild="true"
	520	+ BasicRuntimeChecks="3"
	521	+ RuntimeLibrary="1"
	522	+ PrecompiledHeaderFile=".\corelib___Win32_Private_Debug/corelib.pch"
	523	+ AssemblerListingLocation=".\corelib___Win32_Private_Debug/"
	524	+ ObjectFile=".\corelib___Win32_Private_Debug/"
	525	+ ProgramDataBaseFileName=".\corelib___Win32_Private_Debug/"
524	526	WarningLevel="3"
525	527	SuppressStartupBanner="true"
526		- DebugInformationFormat="3"
	528	+ DebugInformationFormat="4"
527	529	/>
528	530	<Tool
529	531	Name="VCManagedResourceCompilerTool"
530	532	/>
531	533	<Tool
532	534	Name="VCResourceCompilerTool"
533		- PreprocessorDefinitions="NDEBUG"
	535	+ PreprocessorDefinitions="_DEBUG"
534	536	Culture="1033"
535	537	/>
536	538	<Tool

		@@ -538,7 +540,7 @@
538	540	/>
539	541	<Tool
540	542	Name="VCLibrarianTool"
541		- OutputFile=".\Release\corelib.lib"
	543	+ OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
542	544	SuppressStartupBanner="true"
543	545	/>
544	546	<Tool

		@@ -550,7 +552,7 @@
550	552	<Tool
551	553	Name="VCBscMakeTool"
552	554	SuppressStartupBanner="true"
553		- OutputFile=".\Release/corelib.bsc"
	555	+ OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
554	556	/>
555	557	<Tool
556	558	Name="VCFxCopTool"

		@@ -655,7 +657,7 @@
655	657	/>
656	658	</FileConfiguration>
657	659	<FileConfiguration
658		- Name="Debug\|Win32"
	660	+ Name="Private Release\|x64"
659	661	>
660	662	<Tool
661	663	Name="VCCLCompilerTool"

		@@ -664,7 +666,7 @@
664	666	/>
665	667	</FileConfiguration>
666	668	<FileConfiguration
667		- Name="Release\|Win32"
	669	+ Name="Debug\|Win32"
668	670	>
669	671	<Tool
670	672	Name="VCCLCompilerTool"

		@@ -673,7 +675,7 @@
673	675	/>
674	676	</FileConfiguration>
675	677	<FileConfiguration
676		- Name="Private Debug\|Win32"
	678	+ Name="Debug\|x64"
677	679	>
678	680	<Tool
679	681	Name="VCCLCompilerTool"

		@@ -682,7 +684,7 @@
682	684	/>
683	685	</FileConfiguration>
684	686	<FileConfiguration
685		- Name="Private Release\|x64"
	687	+ Name="Release\|Win32"
686	688	>
687	689	<Tool
688	690	Name="VCCLCompilerTool"

		@@ -691,7 +693,7 @@
691	693	/>
692	694	</FileConfiguration>
693	695	<FileConfiguration
694		- Name="Debug\|x64"
	696	+ Name="Release\|x64"
695	697	>
696	698	<Tool
697	699	Name="VCCLCompilerTool"

		@@ -700,7 +702,7 @@
700	702	/>
701	703	</FileConfiguration>
702	704	<FileConfiguration
703		- Name="Release\|x64"
	705	+ Name="Private Debug\|Win32"
704	706	>
705	707	<Tool
706	708	Name="VCCLCompilerTool"

		@@ -731,7 +733,7 @@
731	733	/>
732	734	</FileConfiguration>
733	735	<FileConfiguration
734		- Name="Debug\|Win32"
	736	+ Name="Private Release\|x64"
735	737	>
736	738	<Tool
737	739	Name="VCCLCompilerTool"

		@@ -740,7 +742,7 @@
740	742	/>
741	743	</FileConfiguration>
742	744	<FileConfiguration
743		- Name="Release\|Win32"
	745	+ Name="Debug\|Win32"
744	746	>
745	747	<Tool
746	748	Name="VCCLCompilerTool"

		@@ -749,7 +751,7 @@
749	751	/>
750	752	</FileConfiguration>
751	753	<FileConfiguration
752		- Name="Private Debug\|Win32"
	754	+ Name="Debug\|x64"
753	755	>
754	756	<Tool
755	757	Name="VCCLCompilerTool"

		@@ -758,7 +760,7 @@
758	760	/>
759	761	</FileConfiguration>
760	762	<FileConfiguration
761		- Name="Private Release\|x64"
	763	+ Name="Release\|Win32"
762	764	>
763	765	<Tool
764	766	Name="VCCLCompilerTool"

		@@ -767,7 +769,7 @@
767	769	/>
768	770	</FileConfiguration>
769	771	<FileConfiguration
770		- Name="Debug\|x64"
	772	+ Name="Release\|x64"
771	773	>
772	774	<Tool
773	775	Name="VCCLCompilerTool"

		@@ -776,7 +778,7 @@
776	778	/>
777	779	</FileConfiguration>
778	780	<FileConfiguration
779		- Name="Release\|x64"
	781	+ Name="Private Debug\|Win32"
780	782	>
781	783	<Tool
782	784	Name="VCCLCompilerTool"

		@@ -807,7 +809,7 @@
807	809	/>
808	810	</FileConfiguration>
809	811	<FileConfiguration
810		- Name="Debug\|Win32"
	812	+ Name="Private Release\|x64"
811	813	>
812	814	<Tool
813	815	Name="VCCLCompilerTool"

		@@ -816,7 +818,7 @@
816	818	/>
817	819	</FileConfiguration>
818	820	<FileConfiguration
819		- Name="Release\|Win32"
	821	+ Name="Debug\|Win32"
820	822	>
821	823	<Tool
822	824	Name="VCCLCompilerTool"

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

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

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

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

		@@ -883,7 +885,7 @@
883	885	/>
884	886	</FileConfiguration>
885	887	<FileConfiguration
886		- Name="Debug\|Win32"
	888	+ Name="Private Release\|x64"
887	889	>
888	890	<Tool
889	891	Name="VCCLCompilerTool"

		@@ -892,7 +894,7 @@
892	894	/>
893	895	</FileConfiguration>
894	896	<FileConfiguration
895		- Name="Release\|Win32"
	897	+ Name="Debug\|Win32"
896	898	>
897	899	<Tool
898	900	Name="VCCLCompilerTool"

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

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

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

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

		@@ -959,7 +961,7 @@
959	961	/>
960	962	</FileConfiguration>
961	963	<FileConfiguration
962		- Name="Debug\|Win32"
	964	+ Name="Private Release\|x64"
963	965	>
964	966	<Tool
965	967	Name="VCCLCompilerTool"

		@@ -968,7 +970,7 @@
968	970	/>
969	971	</FileConfiguration>
970	972	<FileConfiguration
971		- Name="Release\|Win32"
	973	+ Name="Debug\|Win32"
972	974	>
973	975	<Tool
974	976	Name="VCCLCompilerTool"

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

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

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

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

		@@ -1035,7 +1037,7 @@
1035	1037	/>
1036	1038	</FileConfiguration>
1037	1039	<FileConfiguration
1038		- Name="Debug\|Win32"
	1040	+ Name="Private Release\|x64"
1039	1041	>
1040	1042	<Tool
1041	1043	Name="VCCLCompilerTool"

		@@ -1044,7 +1046,7 @@
1044	1046	/>
1045	1047	</FileConfiguration>
1046	1048	<FileConfiguration
1047		- Name="Release\|Win32"
	1049	+ Name="Debug\|Win32"
1048	1050	>
1049	1051	<Tool
1050	1052	Name="VCCLCompilerTool"

		@@ -1053,7 +1055,7 @@
1053	1055	/>
1054	1056	</FileConfiguration>
1055	1057	<FileConfiguration
1056		- Name="Private Debug\|Win32"
	1058	+ Name="Debug\|x64"
1057	1059	>
1058	1060	<Tool
1059	1061	Name="VCCLCompilerTool"

		@@ -1062,7 +1064,7 @@
1062	1064	/>
1063	1065	</FileConfiguration>
1064	1066	<FileConfiguration
1065		- Name="Private Release\|x64"
	1067	+ Name="Release\|Win32"
1066	1068	>
1067	1069	<Tool
1068	1070	Name="VCCLCompilerTool"

		@@ -1071,7 +1073,7 @@
1071	1073	/>
1072	1074	</FileConfiguration>
1073	1075	<FileConfiguration
1074		- Name="Debug\|x64"
	1076	+ Name="Release\|x64"
1075	1077	>
1076	1078	<Tool
1077	1079	Name="VCCLCompilerTool"

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

		@@ -1111,7 +1113,7 @@
1111	1113	/>
1112	1114	</FileConfiguration>
1113	1115	<FileConfiguration
1114		- Name="Debug\|Win32"
	1116	+ Name="Private Release\|x64"
1115	1117	>
1116	1118	<Tool
1117	1119	Name="VCCLCompilerTool"

		@@ -1120,7 +1122,7 @@
1120	1122	/>
1121	1123	</FileConfiguration>
1122	1124	<FileConfiguration
1123		- Name="Release\|Win32"
	1125	+ Name="Debug\|Win32"
1124	1126	>
1125	1127	<Tool
1126	1128	Name="VCCLCompilerTool"

		@@ -1129,7 +1131,7 @@
1129	1131	/>
1130	1132	</FileConfiguration>
1131	1133	<FileConfiguration
1132		- Name="Private Debug\|Win32"
	1134	+ Name="Debug\|x64"
1133	1135	>
1134	1136	<Tool
1135	1137	Name="VCCLCompilerTool"

		@@ -1138,7 +1140,7 @@
1138	1140	/>
1139	1141	</FileConfiguration>
1140	1142	<FileConfiguration
1141		- Name="Private Release\|x64"
	1143	+ Name="Release\|Win32"
1142	1144	>
1143	1145	<Tool
1144	1146	Name="VCCLCompilerTool"

		@@ -1147,7 +1149,7 @@
1147	1149	/>
1148	1150	</FileConfiguration>
1149	1151	<FileConfiguration
1150		- Name="Debug\|x64"
	1152	+ Name="Release\|x64"
1151	1153	>
1152	1154	<Tool
1153	1155	Name="VCCLCompilerTool"

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

		@@ -1187,7 +1189,7 @@
1187	1189	/>
1188	1190	</FileConfiguration>
1189	1191	<FileConfiguration
1190		- Name="Debug\|Win32"
	1192	+ Name="Private Release\|x64"
1191	1193	>
1192	1194	<Tool
1193	1195	Name="VCCLCompilerTool"

		@@ -1196,7 +1198,7 @@
1196	1198	/>
1197	1199	</FileConfiguration>
1198	1200	<FileConfiguration
1199		- Name="Release\|Win32"
	1201	+ Name="Debug\|Win32"
1200	1202	>
1201	1203	<Tool
1202	1204	Name="VCCLCompilerTool"

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

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

		@@ -1223,7 +1225,7 @@
1223	1225	/>
1224	1226	</FileConfiguration>
1225	1227	<FileConfiguration
1226		- Name="Debug\|x64"
	1228	+ Name="Release\|x64"
1227	1229	>
1228	1230	<Tool
1229	1231	Name="VCCLCompilerTool"

		@@ -1232,7 +1234,7 @@
1232	1234	/>
1233	1235	</FileConfiguration>
1234	1236	<FileConfiguration
1235		- Name="Release\|x64"
	1237	+ Name="Private Debug\|Win32"
1236	1238	>
1237	1239	<Tool
1238	1240	Name="VCCLCompilerTool"

		@@ -1263,7 +1265,7 @@
1263	1265	/>
1264	1266	</FileConfiguration>
1265	1267	<FileConfiguration
1266		- Name="Debug\|Win32"
	1268	+ Name="Private Release\|x64"
1267	1269	>
1268	1270	<Tool
1269	1271	Name="VCCLCompilerTool"

		@@ -1272,7 +1274,7 @@
1272	1274	/>
1273	1275	</FileConfiguration>
1274	1276	<FileConfiguration
1275		- Name="Release\|Win32"
	1277	+ Name="Debug\|Win32"
1276	1278	>
1277	1279	<Tool
1278	1280	Name="VCCLCompilerTool"

		@@ -1281,7 +1283,7 @@
1281	1283	/>
1282	1284	</FileConfiguration>
1283	1285	<FileConfiguration
1284		- Name="Private Debug\|Win32"
	1286	+ Name="Debug\|x64"
1285	1287	>
1286	1288	<Tool
1287	1289	Name="VCCLCompilerTool"

		@@ -1290,7 +1292,7 @@
1290	1292	/>
1291	1293	</FileConfiguration>
1292	1294	<FileConfiguration
1293		- Name="Private Release\|x64"
	1295	+ Name="Release\|Win32"
1294	1296	>
1295	1297	<Tool
1296	1298	Name="VCCLCompilerTool"

		@@ -1299,7 +1301,7 @@
1299	1301	/>
1300	1302	</FileConfiguration>
1301	1303	<FileConfiguration
1302		- Name="Debug\|x64"
	1304	+ Name="Release\|x64"
1303	1305	>
1304	1306	<Tool
1305	1307	Name="VCCLCompilerTool"

		@@ -1308,7 +1310,7 @@
1308	1310	/>
1309	1311	</FileConfiguration>
1310	1312	<FileConfiguration
1311		- Name="Release\|x64"
	1313	+ Name="Private Debug\|Win32"
1312	1314	>
1313	1315	<Tool
1314	1316	Name="VCCLCompilerTool"

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

		@@ -1348,7 +1350,7 @@
1348	1350	/>
1349	1351	</FileConfiguration>
1350	1352	<FileConfiguration
1351		- Name="Release\|Win32"
	1353	+ Name="Debug\|Win32"
1352	1354	>
1353	1355	<Tool
1354	1356	Name="VCCLCompilerTool"

		@@ -1357,7 +1359,7 @@
1357	1359	/>
1358	1360	</FileConfiguration>
1359	1361	<FileConfiguration
1360		- Name="Private Debug\|Win32"
	1362	+ Name="Debug\|x64"
1361	1363	>
1362	1364	<Tool
1363	1365	Name="VCCLCompilerTool"

		@@ -1366,7 +1368,7 @@
1366	1368	/>
1367	1369	</FileConfiguration>
1368	1370	<FileConfiguration
1369		- Name="Private Release\|x64"
	1371	+ Name="Release\|Win32"
1370	1372	>
1371	1373	<Tool
1372	1374	Name="VCCLCompilerTool"

		@@ -1375,7 +1377,7 @@
1375	1377	/>
1376	1378	</FileConfiguration>
1377	1379	<FileConfiguration
1378		- Name="Debug\|x64"
	1380	+ Name="Release\|x64"
1379	1381	>
1380	1382	<Tool
1381	1383	Name="VCCLCompilerTool"

		@@ -1384,7 +1386,7 @@
1384	1386	/>
1385	1387	</FileConfiguration>
1386	1388	<FileConfiguration
1387		- Name="Release\|x64"
	1389	+ Name="Private Debug\|Win32"
1388	1390	>
1389	1391	<Tool
1390	1392	Name="VCCLCompilerTool"

		@@ -1415,7 +1417,7 @@
1415	1417	/>
1416	1418	</FileConfiguration>
1417	1419	<FileConfiguration
1418		- Name="Debug\|Win32"
	1420	+ Name="Private Release\|x64"
1419	1421	>
1420	1422	<Tool
1421	1423	Name="VCCLCompilerTool"

		@@ -1424,7 +1426,7 @@
1424	1426	/>
1425	1427	</FileConfiguration>
1426	1428	<FileConfiguration
1427		- Name="Release\|Win32"
	1429	+ Name="Debug\|Win32"
1428	1430	>
1429	1431	<Tool
1430	1432	Name="VCCLCompilerTool"

		@@ -1433,7 +1435,7 @@
1433	1435	/>
1434	1436	</FileConfiguration>
1435	1437	<FileConfiguration
1436		- Name="Private Debug\|Win32"
	1438	+ Name="Debug\|x64"
1437	1439	>
1438	1440	<Tool
1439	1441	Name="VCCLCompilerTool"

		@@ -1442,7 +1444,7 @@
1442	1444	/>
1443	1445	</FileConfiguration>
1444	1446	<FileConfiguration
1445		- Name="Private Release\|x64"
	1447	+ Name="Release\|Win32"
1446	1448	>
1447	1449	<Tool
1448	1450	Name="VCCLCompilerTool"

		@@ -1451,7 +1453,7 @@
1451	1453	/>
1452	1454	</FileConfiguration>
1453	1455	<FileConfiguration
1454		- Name="Debug\|x64"
	1456	+ Name="Release\|x64"
1455	1457	>
1456	1458	<Tool
1457	1459	Name="VCCLCompilerTool"

		@@ -1460,7 +1462,7 @@
1460	1462	/>
1461	1463	</FileConfiguration>
1462	1464	<FileConfiguration
1463		- Name="Release\|x64"
	1465	+ Name="Private Debug\|Win32"
1464	1466	>
1465	1467	<Tool
1466	1468	Name="VCCLCompilerTool"

		@@ -1491,7 +1493,7 @@
1491	1493	/>
1492	1494	</FileConfiguration>
1493	1495	<FileConfiguration
1494		- Name="Debug\|Win32"
	1496	+ Name="Private Release\|x64"
1495	1497	>
1496	1498	<Tool
1497	1499	Name="VCCLCompilerTool"

		@@ -1500,7 +1502,7 @@
1500	1502	/>
1501	1503	</FileConfiguration>
1502	1504	<FileConfiguration
1503		- Name="Release\|Win32"
	1505	+ Name="Debug\|Win32"
1504	1506	>
1505	1507	<Tool
1506	1508	Name="VCCLCompilerTool"

		@@ -1509,7 +1511,7 @@
1509	1511	/>
1510	1512	</FileConfiguration>
1511	1513	<FileConfiguration
1512		- Name="Private Debug\|Win32"
	1514	+ Name="Debug\|x64"
1513	1515	>
1514	1516	<Tool
1515	1517	Name="VCCLCompilerTool"

		@@ -1518,7 +1520,7 @@
1518	1520	/>
1519	1521	</FileConfiguration>
1520	1522	<FileConfiguration
1521		- Name="Private Release\|x64"
	1523	+ Name="Release\|Win32"
1522	1524	>
1523	1525	<Tool
1524	1526	Name="VCCLCompilerTool"

		@@ -1527,7 +1529,7 @@
1527	1529	/>
1528	1530	</FileConfiguration>
1529	1531	<FileConfiguration
1530		- Name="Debug\|x64"
	1532	+ Name="Release\|x64"
1531	1533	>
1532	1534	<Tool
1533	1535	Name="VCCLCompilerTool"

		@@ -1536,7 +1538,7 @@
1536	1538	/>
1537	1539	</FileConfiguration>
1538	1540	<FileConfiguration
1539		- Name="Release\|x64"
	1541	+ Name="Private Debug\|Win32"
1540	1542	>
1541	1543	<Tool
1542	1544	Name="VCCLCompilerTool"

		@@ -1567,7 +1569,7 @@
1567	1569	/>
1568	1570	</FileConfiguration>
1569	1571	<FileConfiguration
1570		- Name="Debug\|Win32"
	1572	+ Name="Private Release\|x64"
1571	1573	>
1572	1574	<Tool
1573	1575	Name="VCCLCompilerTool"

		@@ -1576,7 +1578,7 @@
1576	1578	/>
1577	1579	</FileConfiguration>
1578	1580	<FileConfiguration
1579		- Name="Release\|Win32"
	1581	+ Name="Debug\|Win32"
1580	1582	>
1581	1583	<Tool
1582	1584	Name="VCCLCompilerTool"

		@@ -1585,7 +1587,7 @@
1585	1587	/>
1586	1588	</FileConfiguration>
1587	1589	<FileConfiguration
1588		- Name="Private Debug\|Win32"
	1590	+ Name="Debug\|x64"
1589	1591	>
1590	1592	<Tool
1591	1593	Name="VCCLCompilerTool"

		@@ -1594,7 +1596,7 @@
1594	1596	/>
1595	1597	</FileConfiguration>
1596	1598	<FileConfiguration
1597		- Name="Private Release\|x64"
	1599	+ Name="Release\|Win32"
1598	1600	>
1599	1601	<Tool
1600	1602	Name="VCCLCompilerTool"

		@@ -1603,7 +1605,7 @@
1603	1605	/>
1604	1606	</FileConfiguration>
1605	1607	<FileConfiguration
1606		- Name="Debug\|x64"
	1608	+ Name="Release\|x64"
1607	1609	>
1608	1610	<Tool
1609	1611	Name="VCCLCompilerTool"

		@@ -1612,7 +1614,7 @@
1612	1614	/>
1613	1615	</FileConfiguration>
1614	1616	<FileConfiguration
1615		- Name="Release\|x64"
	1617	+ Name="Private Debug\|Win32"
1616	1618	>
1617	1619	<Tool
1618	1620	Name="VCCLCompilerTool"

		@@ -1643,7 +1645,7 @@
1643	1645	/>
1644	1646	</FileConfiguration>
1645	1647	<FileConfiguration
1646		- Name="Debug\|Win32"
	1648	+ Name="Private Release\|x64"
1647	1649	>
1648	1650	<Tool
1649	1651	Name="VCCLCompilerTool"

		@@ -1652,7 +1654,7 @@
1652	1654	/>
1653	1655	</FileConfiguration>
1654	1656	<FileConfiguration
1655		- Name="Release\|Win32"
	1657	+ Name="Debug\|Win32"
1656	1658	>
1657	1659	<Tool
1658	1660	Name="VCCLCompilerTool"

		@@ -1661,7 +1663,7 @@
1661	1663	/>
1662	1664	</FileConfiguration>
1663	1665	<FileConfiguration
1664		- Name="Private Debug\|Win32"
	1666	+ Name="Debug\|x64"
1665	1667	>
1666	1668	<Tool
1667	1669	Name="VCCLCompilerTool"

		@@ -1670,7 +1672,7 @@
1670	1672	/>
1671	1673	</FileConfiguration>
1672	1674	<FileConfiguration
1673		- Name="Private Release\|x64"
	1675	+ Name="Release\|Win32"
1674	1676	>
1675	1677	<Tool
1676	1678	Name="VCCLCompilerTool"

		@@ -1679,7 +1681,7 @@
1679	1681	/>
1680	1682	</FileConfiguration>
1681	1683	<FileConfiguration
1682		- Name="Debug\|x64"
	1684	+ Name="Release\|x64"
1683	1685	>
1684	1686	<Tool
1685	1687	Name="VCCLCompilerTool"

		@@ -1688,7 +1690,7 @@
1688	1690	/>
1689	1691	</FileConfiguration>
1690	1692	<FileConfiguration
1691		- Name="Release\|x64"
	1693	+ Name="Private Debug\|Win32"
1692	1694	>
1693	1695	<Tool
1694	1696	Name="VCCLCompilerTool"

		@@ -1719,7 +1721,7 @@
1719	1721	/>
1720	1722	</FileConfiguration>
1721	1723	<FileConfiguration
1722		- Name="Debug\|Win32"
	1724	+ Name="Private Release\|x64"
1723	1725	>
1724	1726	<Tool
1725	1727	Name="VCCLCompilerTool"

		@@ -1728,7 +1730,7 @@
1728	1730	/>
1729	1731	</FileConfiguration>
1730	1732	<FileConfiguration
1731		- Name="Release\|Win32"
	1733	+ Name="Debug\|Win32"
1732	1734	>
1733	1735	<Tool
1734	1736	Name="VCCLCompilerTool"

		@@ -1737,7 +1739,7 @@
1737	1739	/>
1738	1740	</FileConfiguration>
1739	1741	<FileConfiguration
1740		- Name="Private Debug\|Win32"
	1742	+ Name="Debug\|x64"
1741	1743	>
1742	1744	<Tool
1743	1745	Name="VCCLCompilerTool"

		@@ -1746,7 +1748,7 @@
1746	1748	/>
1747	1749	</FileConfiguration>
1748	1750	<FileConfiguration
1749		- Name="Private Release\|x64"
	1751	+ Name="Release\|Win32"
1750	1752	>
1751	1753	<Tool
1752	1754	Name="VCCLCompilerTool"

		@@ -1755,7 +1757,7 @@
1755	1757	/>
1756	1758	</FileConfiguration>
1757	1759	<FileConfiguration
1758		- Name="Debug\|x64"
	1760	+ Name="Release\|x64"
1759	1761	>
1760	1762	<Tool
1761	1763	Name="VCCLCompilerTool"

		@@ -1764,7 +1766,7 @@
1764	1766	/>
1765	1767	</FileConfiguration>
1766	1768	<FileConfiguration
1767		- Name="Release\|x64"
	1769	+ Name="Private Debug\|Win32"
1768	1770	>
1769	1771	<Tool
1770	1772	Name="VCCLCompilerTool"

		@@ -1795,7 +1797,7 @@
1795	1797	/>
1796	1798	</FileConfiguration>
1797	1799	<FileConfiguration
1798		- Name="Debug\|Win32"
	1800	+ Name="Private Release\|x64"
1799	1801	>
1800	1802	<Tool
1801	1803	Name="VCCLCompilerTool"

		@@ -1804,7 +1806,7 @@
1804	1806	/>
1805	1807	</FileConfiguration>
1806	1808	<FileConfiguration
1807		- Name="Release\|Win32"
	1809	+ Name="Debug\|Win32"
1808	1810	>
1809	1811	<Tool
1810	1812	Name="VCCLCompilerTool"

		@@ -1813,7 +1815,7 @@
1813	1815	/>
1814	1816	</FileConfiguration>
1815	1817	<FileConfiguration
1816		- Name="Private Debug\|Win32"
	1818	+ Name="Debug\|x64"
1817	1819	>
1818	1820	<Tool
1819	1821	Name="VCCLCompilerTool"

		@@ -1822,7 +1824,7 @@
1822	1824	/>
1823	1825	</FileConfiguration>
1824	1826	<FileConfiguration
1825		- Name="Private Release\|x64"
	1827	+ Name="Release\|Win32"
1826	1828	>
1827	1829	<Tool
1828	1830	Name="VCCLCompilerTool"

		@@ -1831,7 +1833,7 @@
1831	1833	/>
1832	1834	</FileConfiguration>
1833	1835	<FileConfiguration
1834		- Name="Debug\|x64"
	1836	+ Name="Release\|x64"
1835	1837	>
1836	1838	<Tool
1837	1839	Name="VCCLCompilerTool"

		@@ -1840,7 +1842,7 @@
1840	1842	/>
1841	1843	</FileConfiguration>
1842	1844	<FileConfiguration
1843		- Name="Release\|x64"
	1845	+ Name="Private Debug\|Win32"
1844	1846	>
1845	1847	<Tool
1846	1848	Name="VCCLCompilerTool"

		@@ -1871,7 +1873,7 @@
1871	1873	/>
1872	1874	</FileConfiguration>
1873	1875	<FileConfiguration
1874		- Name="Debug\|Win32"
	1876	+ Name="Private Release\|x64"
1875	1877	>
1876	1878	<Tool
1877	1879	Name="VCCLCompilerTool"

		@@ -1880,7 +1882,7 @@
1880	1882	/>
1881	1883	</FileConfiguration>
1882	1884	<FileConfiguration
1883		- Name="Release\|Win32"
	1885	+ Name="Debug\|Win32"
1884	1886	>
1885	1887	<Tool
1886	1888	Name="VCCLCompilerTool"

		@@ -1889,7 +1891,7 @@
1889	1891	/>
1890	1892	</FileConfiguration>
1891	1893	<FileConfiguration
1892		- Name="Private Debug\|Win32"
	1894	+ Name="Debug\|x64"
1893	1895	>
1894	1896	<Tool
1895	1897	Name="VCCLCompilerTool"

		@@ -1898,7 +1900,7 @@
1898	1900	/>
1899	1901	</FileConfiguration>
1900	1902	<FileConfiguration
1901		- Name="Private Release\|x64"
	1903	+ Name="Release\|Win32"
1902	1904	>
1903	1905	<Tool
1904	1906	Name="VCCLCompilerTool"

		@@ -1907,7 +1909,7 @@
1907	1909	/>
1908	1910	</FileConfiguration>
1909	1911	<FileConfiguration
1910		- Name="Debug\|x64"
	1912	+ Name="Release\|x64"
1911	1913	>
1912	1914	<Tool
1913	1915	Name="VCCLCompilerTool"

		@@ -1916,7 +1918,7 @@
1916	1918	/>
1917	1919	</FileConfiguration>
1918	1920	<FileConfiguration
1919		- Name="Release\|x64"
	1921	+ Name="Private Debug\|Win32"
1920	1922	>
1921	1923	<Tool
1922	1924	Name="VCCLCompilerTool"

		@@ -1947,7 +1949,7 @@
1947	1949	/>
1948	1950	</FileConfiguration>
1949	1951	<FileConfiguration
1950		- Name="Debug\|Win32"
	1952	+ Name="Private Release\|x64"
1951	1953	>
1952	1954	<Tool
1953	1955	Name="VCCLCompilerTool"

		@@ -1956,7 +1958,7 @@
1956	1958	/>
1957	1959	</FileConfiguration>
1958	1960	<FileConfiguration
1959		- Name="Release\|Win32"
	1961	+ Name="Debug\|Win32"
1960	1962	>
1961	1963	<Tool
1962	1964	Name="VCCLCompilerTool"

		@@ -1965,7 +1967,7 @@
1965	1967	/>
1966	1968	</FileConfiguration>
1967	1969	<FileConfiguration
1968		- Name="Private Debug\|Win32"
	1970	+ Name="Debug\|x64"
1969	1971	>
1970	1972	<Tool
1971	1973	Name="VCCLCompilerTool"

		@@ -1974,7 +1976,7 @@
1974	1976	/>
1975	1977	</FileConfiguration>
1976	1978	<FileConfiguration
1977		- Name="Private Release\|x64"
	1979	+ Name="Release\|Win32"
1978	1980	>
1979	1981	<Tool
1980	1982	Name="VCCLCompilerTool"

		@@ -1983,7 +1985,7 @@
1983	1985	/>
1984	1986	</FileConfiguration>
1985	1987	<FileConfiguration
1986		- Name="Debug\|x64"
	1988	+ Name="Release\|x64"
1987	1989	>
1988	1990	<Tool
1989	1991	Name="VCCLCompilerTool"

		@@ -1992,7 +1994,7 @@
1992	1994	/>
1993	1995	</FileConfiguration>
1994	1996	<FileConfiguration
1995		- Name="Release\|x64"
	1997	+ Name="Private Debug\|Win32"
1996	1998	>
1997	1999	<Tool
1998	2000	Name="VCCLCompilerTool"

		@@ -2023,7 +2025,7 @@
2023	2025	/>
2024	2026	</FileConfiguration>
2025	2027	<FileConfiguration
2026		- Name="Debug\|Win32"
	2028	+ Name="Private Release\|x64"
2027	2029	>
2028	2030	<Tool
2029	2031	Name="VCCLCompilerTool"

		@@ -2032,7 +2034,7 @@
2032	2034	/>
2033	2035	</FileConfiguration>
2034	2036	<FileConfiguration
2035		- Name="Release\|Win32"
	2037	+ Name="Debug\|Win32"
2036	2038	>
2037	2039	<Tool
2038	2040	Name="VCCLCompilerTool"

		@@ -2041,7 +2043,7 @@
2041	2043	/>
2042	2044	</FileConfiguration>
2043	2045	<FileConfiguration
2044		- Name="Private Debug\|Win32"
	2046	+ Name="Debug\|x64"
2045	2047	>
2046	2048	<Tool
2047	2049	Name="VCCLCompilerTool"

		@@ -2050,7 +2052,7 @@
2050	2052	/>
2051	2053	</FileConfiguration>
2052	2054	<FileConfiguration
2053		- Name="Private Release\|x64"
	2055	+ Name="Release\|Win32"
2054	2056	>
2055	2057	<Tool
2056	2058	Name="VCCLCompilerTool"

		@@ -2059,7 +2061,7 @@
2059	2061	/>
2060	2062	</FileConfiguration>
2061	2063	<FileConfiguration
2062		- Name="Debug\|x64"
	2064	+ Name="Release\|x64"
2063	2065	>
2064	2066	<Tool
2065	2067	Name="VCCLCompilerTool"

		@@ -2068,7 +2070,7 @@
2068	2070	/>
2069	2071	</FileConfiguration>
2070	2072	<FileConfiguration
2071		- Name="Release\|x64"
	2073	+ Name="Private Debug\|Win32"
2072	2074	>
2073	2075	<Tool
2074	2076	Name="VCCLCompilerTool"

		@@ -2099,7 +2101,7 @@
2099	2101	/>
2100	2102	</FileConfiguration>
2101	2103	<FileConfiguration
2102		- Name="Debug\|Win32"
	2104	+ Name="Private Release\|x64"
2103	2105	>
2104	2106	<Tool
2105	2107	Name="VCCLCompilerTool"

		@@ -2108,7 +2110,7 @@
2108	2110	/>
2109	2111	</FileConfiguration>
2110	2112	<FileConfiguration
2111		- Name="Release\|Win32"
	2113	+ Name="Debug\|Win32"
2112	2114	>
2113	2115	<Tool
2114	2116	Name="VCCLCompilerTool"

		@@ -2117,7 +2119,7 @@
2117	2119	/>
2118	2120	</FileConfiguration>
2119	2121	<FileConfiguration
2120		- Name="Private Debug\|Win32"
	2122	+ Name="Debug\|x64"
2121	2123	>
2122	2124	<Tool
2123	2125	Name="VCCLCompilerTool"

		@@ -2126,7 +2128,7 @@
2126	2128	/>
2127	2129	</FileConfiguration>
2128	2130	<FileConfiguration
2129		- Name="Private Release\|x64"
	2131	+ Name="Release\|Win32"
2130	2132	>
2131	2133	<Tool
2132	2134	Name="VCCLCompilerTool"

		@@ -2135,7 +2137,7 @@
2135	2137	/>
2136	2138	</FileConfiguration>
2137	2139	<FileConfiguration
2138		- Name="Debug\|x64"
	2140	+ Name="Release\|x64"
2139	2141	>
2140	2142	<Tool
2141	2143	Name="VCCLCompilerTool"

		@@ -2144,7 +2146,7 @@
2144	2146	/>
2145	2147	</FileConfiguration>
2146	2148	<FileConfiguration
2147		- Name="Release\|x64"
	2149	+ Name="Private Debug\|Win32"
2148	2150	>
2149	2151	<Tool
2150	2152	Name="VCCLCompilerTool"

		@@ -2175,7 +2177,7 @@
2175	2177	/>
2176	2178	</FileConfiguration>
2177	2179	<FileConfiguration
2178		- Name="Debug\|Win32"
	2180	+ Name="Private Release\|x64"
2179	2181	>
2180	2182	<Tool
2181	2183	Name="VCCLCompilerTool"

		@@ -2184,7 +2186,7 @@
2184	2186	/>
2185	2187	</FileConfiguration>
2186	2188	<FileConfiguration
2187		- Name="Release\|Win32"
	2189	+ Name="Debug\|Win32"
2188	2190	>
2189	2191	<Tool
2190	2192	Name="VCCLCompilerTool"

		@@ -2193,7 +2195,7 @@
2193	2195	/>
2194	2196	</FileConfiguration>
2195	2197	<FileConfiguration
2196		- Name="Private Debug\|Win32"
	2198	+ Name="Debug\|x64"
2197	2199	>
2198	2200	<Tool
2199	2201	Name="VCCLCompilerTool"

		@@ -2202,7 +2204,7 @@
2202	2204	/>
2203	2205	</FileConfiguration>
2204	2206	<FileConfiguration
2205		- Name="Private Release\|x64"
	2207	+ Name="Release\|Win32"
2206	2208	>
2207	2209	<Tool
2208	2210	Name="VCCLCompilerTool"

		@@ -2211,7 +2213,7 @@
2211	2213	/>
2212	2214	</FileConfiguration>
2213	2215	<FileConfiguration
2214		- Name="Debug\|x64"
	2216	+ Name="Release\|x64"
2215	2217	>
2216	2218	<Tool
2217	2219	Name="VCCLCompilerTool"

		@@ -2220,7 +2222,7 @@
2220	2222	/>
2221	2223	</FileConfiguration>
2222	2224	<FileConfiguration
2223		- Name="Release\|x64"
	2225	+ Name="Private Debug\|Win32"
2224	2226	>
2225	2227	<Tool
2226	2228	Name="VCCLCompilerTool"

		@@ -2251,7 +2253,7 @@
2251	2253	/>
2252	2254	</FileConfiguration>
2253	2255	<FileConfiguration
2254		- Name="Debug\|Win32"
	2256	+ Name="Private Release\|x64"
2255	2257	>
2256	2258	<Tool
2257	2259	Name="VCCLCompilerTool"

		@@ -2260,7 +2262,7 @@
2260	2262	/>
2261	2263	</FileConfiguration>
2262	2264	<FileConfiguration
2263		- Name="Release\|Win32"
	2265	+ Name="Debug\|Win32"
2264	2266	>
2265	2267	<Tool
2266	2268	Name="VCCLCompilerTool"

		@@ -2269,7 +2271,7 @@
2269	2271	/>
2270	2272	</FileConfiguration>
2271	2273	<FileConfiguration
2272		- Name="Private Debug\|Win32"
	2274	+ Name="Debug\|x64"
2273	2275	>
2274	2276	<Tool
2275	2277	Name="VCCLCompilerTool"

		@@ -2278,7 +2280,7 @@
2278	2280	/>
2279	2281	</FileConfiguration>
2280	2282	<FileConfiguration
2281		- Name="Private Release\|x64"
	2283	+ Name="Release\|Win32"
2282	2284	>
2283	2285	<Tool
2284	2286	Name="VCCLCompilerTool"

		@@ -2287,7 +2289,7 @@
2287	2289	/>
2288	2290	</FileConfiguration>
2289	2291	<FileConfiguration
2290		- Name="Debug\|x64"
	2292	+ Name="Release\|x64"
2291	2293	>
2292	2294	<Tool
2293	2295	Name="VCCLCompilerTool"

		@@ -2296,7 +2298,7 @@
2296	2298	/>
2297	2299	</FileConfiguration>
2298	2300	<FileConfiguration
2299		- Name="Release\|x64"
	2301	+ Name="Private Debug\|Win32"
2300	2302	>
2301	2303	<Tool
2302	2304	Name="VCCLCompilerTool"

		@@ -2327,7 +2329,7 @@
2327	2329	/>
2328	2330	</FileConfiguration>
2329	2331	<FileConfiguration
2330		- Name="Debug\|Win32"
	2332	+ Name="Private Release\|x64"
2331	2333	>
2332	2334	<Tool
2333	2335	Name="VCCLCompilerTool"

		@@ -2336,7 +2338,7 @@
2336	2338	/>
2337	2339	</FileConfiguration>
2338	2340	<FileConfiguration
2339		- Name="Release\|Win32"
	2341	+ Name="Debug\|Win32"
2340	2342	>
2341	2343	<Tool
2342	2344	Name="VCCLCompilerTool"

		@@ -2345,7 +2347,7 @@
2345	2347	/>
2346	2348	</FileConfiguration>
2347	2349	<FileConfiguration
2348		- Name="Private Debug\|Win32"
	2350	+ Name="Debug\|x64"
2349	2351	>
2350	2352	<Tool
2351	2353	Name="VCCLCompilerTool"

		@@ -2354,7 +2356,7 @@
2354	2356	/>
2355	2357	</FileConfiguration>
2356	2358	<FileConfiguration
2357		- Name="Private Release\|x64"
	2359	+ Name="Release\|Win32"
2358	2360	>
2359	2361	<Tool
2360	2362	Name="VCCLCompilerTool"

		@@ -2363,7 +2365,7 @@
2363	2365	/>
2364	2366	</FileConfiguration>
2365	2367	<FileConfiguration
2366		- Name="Debug\|x64"
	2368	+ Name="Release\|x64"
2367	2369	>
2368	2370	<Tool
2369	2371	Name="VCCLCompilerTool"

		@@ -2372,7 +2374,7 @@
2372	2374	/>
2373	2375	</FileConfiguration>
2374	2376	<FileConfiguration
2375		- Name="Release\|x64"
	2377	+ Name="Private Debug\|Win32"
2376	2378	>
2377	2379	<Tool
2378	2380	Name="VCCLCompilerTool"

		@@ -2531,7 +2533,7 @@
2531	2533	/>
2532	2534	</FileConfiguration>
2533	2535	<FileConfiguration
2534		- Name="Debug\|Win32"
	2536	+ Name="Private Release\|x64"
2535	2537	>
2536	2538	<Tool
2537	2539	Name="VCCLCompilerTool"

		@@ -2540,7 +2542,7 @@
2540	2542	/>
2541	2543	</FileConfiguration>
2542	2544	<FileConfiguration
2543		- Name="Release\|Win32"
	2545	+ Name="Debug\|Win32"
2544	2546	>
2545	2547	<Tool
2546	2548	Name="VCCLCompilerTool"

		@@ -2549,7 +2551,7 @@
2549	2551	/>
2550	2552	</FileConfiguration>
2551	2553	<FileConfiguration
2552		- Name="Private Debug\|Win32"
	2554	+ Name="Debug\|x64"
2553	2555	>
2554	2556	<Tool
2555	2557	Name="VCCLCompilerTool"

		@@ -2558,7 +2560,7 @@
2558	2560	/>
2559	2561	</FileConfiguration>
2560	2562	<FileConfiguration
2561		- Name="Private Release\|x64"
	2563	+ Name="Release\|Win32"
2562	2564	>
2563	2565	<Tool
2564	2566	Name="VCCLCompilerTool"

		@@ -2567,7 +2569,7 @@
2567	2569	/>
2568	2570	</FileConfiguration>
2569	2571	<FileConfiguration
2570		- Name="Debug\|x64"
	2572	+ Name="Release\|x64"
2571	2573	>
2572	2574	<Tool
2573	2575	Name="VCCLCompilerTool"

		@@ -2576,7 +2578,7 @@
2576	2578	/>
2577	2579	</FileConfiguration>
2578	2580	<FileConfiguration
2579		- Name="Release\|x64"
	2581	+ Name="Private Debug\|Win32"
2580	2582	>
2581	2583	<Tool
2582	2584	Name="VCCLCompilerTool"

		@@ -2607,7 +2609,7 @@
2607	2609	/>
2608	2610	</FileConfiguration>
2609	2611	<FileConfiguration
2610		- Name="Debug\|Win32"
	2612	+ Name="Private Release\|x64"
2611	2613	>
2612	2614	<Tool
2613	2615	Name="VCCLCompilerTool"

		@@ -2616,7 +2618,7 @@
2616	2618	/>
2617	2619	</FileConfiguration>
2618	2620	<FileConfiguration
2619		- Name="Release\|Win32"
	2621	+ Name="Debug\|Win32"
2620	2622	>
2621	2623	<Tool
2622	2624	Name="VCCLCompilerTool"

		@@ -2625,7 +2627,7 @@
2625	2627	/>
2626	2628	</FileConfiguration>
2627	2629	<FileConfiguration
2628		- Name="Private Debug\|Win32"
	2630	+ Name="Debug\|x64"
2629	2631	>
2630	2632	<Tool
2631	2633	Name="VCCLCompilerTool"

		@@ -2634,7 +2636,7 @@
2634	2636	/>
2635	2637	</FileConfiguration>
2636	2638	<FileConfiguration
2637		- Name="Private Release\|x64"
	2639	+ Name="Release\|Win32"
2638	2640	>
2639	2641	<Tool
2640	2642	Name="VCCLCompilerTool"

		@@ -2643,7 +2645,7 @@
2643	2645	/>
2644	2646	</FileConfiguration>
2645	2647	<FileConfiguration
2646		- Name="Debug\|x64"
	2648	+ Name="Release\|x64"
2647	2649	>
2648	2650	<Tool
2649	2651	Name="VCCLCompilerTool"

		@@ -2652,7 +2654,7 @@
2652	2654	/>
2653	2655	</FileConfiguration>
2654	2656	<FileConfiguration
2655		- Name="Release\|x64"
	2657	+ Name="Private Debug\|Win32"
2656	2658	>
2657	2659	<Tool
2658	2660	Name="VCCLCompilerTool"

		@@ -2688,11 +2690,11 @@
2688	2690	</File>
2689	2691	</Filter>
2690	2692	<Filter
2691		- Name="Unix Source"
	2693	+ Name="Unix Includes"
2692	2694	>
2693	2695	</Filter>
2694	2696	<Filter
2695		- Name="Unix Includes"
	2697	+ Name="Unix Source"
2696	2698	>
2697	2699	</Filter>
2698	2700	</Files>

--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

		@@ -64,6 +64,45 @@ BEGIN
64	64	END
65	65	#endif // APSTUDIO_INVOKED
66	66
	67	+
	68	+/////////////////////////////////////////////////////////////////////////////
	69	+//
	70	+// Version
	71	+//
	72	+
	73	+VS_VERSION_INFO VERSIONINFO
	74	+ FILEVERSION 1,3,9,0
	75	+ PRODUCTVERSION 1,3,9,0
	76	+ FILEFLAGSMASK 0x17L
	77	+#ifdef _DEBUG
	78	+ FILEFLAGS 0x1L
	79	+#else
	80	+ FILEFLAGS 0x0L
	81	+#endif
	82	+ FILEOS 0x4L
	83	+ FILETYPE 0x1L
	84	+ FILESUBTYPE 0x0L
	85	+BEGIN
	86	+ BLOCK "StringFileInfo"
	87	+ BEGIN
	88	+ BLOCK "041104b0"
	89	+ BEGIN
	90	+ VALUE "CompanyName", "PeCa"
	91	+ VALUE "FileDescription", "Peercast IM"
	92	+ VALUE "FileVersion", "1, 3, 9, 0"
	93	+ VALUE "InternalName", "PeCaIM"
	94	+ VALUE "LegalCopyright", "Copyright (C) 2009"
	95	+ VALUE "OriginalFilename", "PeerCast.exe"
	96	+ VALUE "ProductName", "Peercast IM"
	97	+ VALUE "ProductVersion", "1, 3, 9, 0"
	98	+ END
	99	+ END
	100	+ BLOCK "VarFileInfo"
	101	+ BEGIN
	102	+ VALUE "Translation", 0x411, 1200
	103	+ END
	104	+END
	105	+
67	106	#endif // 日本語 resources
68	107	/////////////////////////////////////////////////////////////////////////////
69	108

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

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

		@@ -376,6 +376,7 @@
376	376	BrowseInformation="1"
377	377	WarningLevel="3"
378	378	SuppressStartupBanner="true"
	379	+ Detect64BitPortabilityProblems="true"
379	380	DebugInformationFormat="3"
380	381	/>
381	382	<Tool

		@@ -721,8 +722,8 @@
721	722	/>
722	723	<Tool
723	724	Name="VCPostBuildEventTool"
724		- Description="Copy exe to program files"
725		- CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	725	+ Description="Copy exe to pimp"
	726	+ CommandLine="copy debug\peercast.exe ..\pimp\ "
726	727	/>
727	728	</Configuration>
728	729	<Configuration

		@@ -771,6 +772,7 @@
771	772	BrowseInformation="1"
772	773	WarningLevel="3"
773	774	SuppressStartupBanner="true"
	775	+ Detect64BitPortabilityProblems="true"
774	776	DebugInformationFormat="3"
775	777	/>
776	778	<Tool

		@@ -823,6 +825,7 @@
823	825	Name="VCPostBuildEventTool"
824	826	Description="Copy exe to program files"
825	827	CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	828	+ ExcludedFromBuild="true"
826	829	/>
827	830	</Configuration>
828	831	</Configurations>

--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

		@@ -353,8 +353,11 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
353	353	// ステータス表示
354	354	Gdiplus::Image *img = NULL;
355	355	unsigned int nowTime = sys->getTime();
356		- Channel *ch = chanMgr->findChannelByChannelID(this->channel_id);
357		- switch(this->getStatus()){
	356	+ if (this->type != Servent::T_COUT)
	357	+ {
	358	+ // COUT以外
	359	+ Channel *ch = chanMgr->findChannelByChannelID(this->channel_id);
	360	+ switch(this->getStatus()){
358	361	case Channel::S_IDLE:
359	362	img = img_idle;
360	363	break;

		@@ -401,7 +404,13 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
401	404	default:
402	405	img = img_idle;
403	406	break;
	407	+ }
	408	+ } else
	409	+ {
	410	+ // COUT用
	411	+ img = img_broad_ok;
404	412	}
	413	+
405	414	// 描画基点
406	415	PointF origin(xx, yy);
407	416	// ステータス表示位置

		@@ -430,127 +439,146 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
430	439	strBrush = ::new SolidBrush(Color::Black);
431	440	}
432	441	}
433		- // チャンネル名表示
434		- g->SetTextRenderingHint(TextRenderingHintAntiAlias);
435		- _bstr_t bstr1(getName());
436		- // 文字描画範囲指定
437		- RectF r1(origin.X, origin.Y, 120.0f, 13.0f);
438		- StringFormat format;
439		- format.SetAlignment(StringAlignmentNear);
440		- g->DrawString(bstr1, -1, &font, r1, &format, strBrush);
441		- // 次の基点
442		- origin.X += r1.Width;
443		-
444		- //// 上流IP/リスナー数/リレー数表示
445		- //// NOTE:
446		- //// ぴあかすの動作勉強用。リリースビルドでは元のコードを使用の事。
447		- //// 文字表示範囲は幅220ぐらいでおｋ
448		- //char tmp[512]; // 表示用バッファ
449		- //char hostip[256]; // IPアドレスバッファ
450		- //chDisp.uphost.toStr(hostip); // 上流IP
451		- //sprintf(tmp, "%d/%d - [%d/%d] - %s",
452		- // getTotalListeners(),
453		- // getTotalRelays(),
454		- // getLocalListeners(),
455		- // getLocalRelays(),
456		- // hostip
457		- // );
458		-
459		- // リスナー数/リレー数表示
460		- char tmp[256];
461		- sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());
462		- _bstr_t bstr2(tmp);
463		- // 文字表示範囲指定
464		- RectF r2(origin.X, origin.Y, 100.0f, 13.0f);
465		- format.SetAlignment(StringAlignmentCenter);
466		- g->DrawString(bstr2, -1, &font, r2, &format, strBrush);
467		- // 次の基点
468		- origin.X += r2.Width;
469		-
470		- // bps表示
471		- Font *f;
472		- if (isStayConnected()){
473		- f = ::new Font(L"Arial", 9.0f, FontStyleItalic\|FontStyleBold, UnitPoint);
474		- } else {
475		- f = ::new Font(L"Arial", 9.0f);
476		- }
477		- sprintf(tmp, "%dkbps", getBitRate());
478		- _bstr_t bstr3(tmp);
479		- format.SetAlignment(StringAlignmentFar);
480		- // 文字表示範囲指定
481		- RectF r3(origin.X, origin.Y, 80.0f, 13.0f);
482		- g->DrawString(bstr3, -1, f, r3, &format, strBrush);
483		- // フォント開放
484		- ::delete f;
485		-
486		- // 次の基点
487		- origin.X += r3.Width;
488		-
489		- // ブラシ削除
490		- ::delete strBrush;
491	442
492		-
493		- // Servent表示
494		- if (!openFlg){
495		- int count = getServentCount();
496		- // Servent表示部の背景を白にする
497		- SolidBrush b(Color(160,255,255,255));
498		- g->FillRectangle(&b, (INT)origin.X, (INT)origin.Y, 14*count, 14);
499		-
500		- sd = serventDataTop;
501		- int index = 0;
502		- while(sd){
503		- SolidBrush *serventBrush;
504		- if (sd->getInfoFlg()){
505		- ChanHit *hit = sd->getChanHit();
506		- if (hit->firewalled){
507		- SolidBrush bb(Color(180,255,0,0));
508		- g->FillRectangle(&bb, (INT)origin.X + 14*index, (INT)origin.Y, 14, 14);
509		- }
510		- if (hit->relay){
511		- // リレーＯＫ
512		- serventBrush = ::new SolidBrush(Color::Green);
513		- } else {
514		- // リレー不可
515		- if (hit->numRelays){
516		- // リレー一杯
517		- serventBrush = ::new SolidBrush(Color::Blue);
	443	+ if (this->type != Servent::T_COUT)
	444	+ {
	445	+ // COUT以外
	446	+
	447	+ // チャンネル名表示
	448	+ g->SetTextRenderingHint(TextRenderingHintAntiAlias);
	449	+ _bstr_t bstr1(getName());
	450	+ // 文字描画範囲指定
	451	+ RectF r1(origin.X, origin.Y, 120.0f, 13.0f);
	452	+ StringFormat format;
	453	+ format.SetAlignment(StringAlignmentNear);
	454	+ g->DrawString(bstr1, -1, &font, r1, &format, strBrush);
	455	+ // 次の基点
	456	+ origin.X += r1.Width;
	457	+
	458	+ //// 上流IP/リスナー数/リレー数表示
	459	+ //// NOTE:
	460	+ //// ぴあかすの動作勉強用。リリースビルドでは元のコードを使用の事。
	461	+ //// 文字表示範囲は幅220ぐらいでおｋ
	462	+ //char tmp[512]; // 表示用バッファ
	463	+ //char hostip[256]; // IPアドレスバッファ
	464	+ //chDisp.uphost.toStr(hostip); // 上流IP
	465	+ //sprintf(tmp, "%d/%d - [%d/%d] - %s",
	466	+ // getTotalListeners(),
	467	+ // getTotalRelays(),
	468	+ // getLocalListeners(),
	469	+ // getLocalRelays(),
	470	+ // hostip
	471	+ // );
	472	+
	473	+ // リスナー数/リレー数表示
	474	+ char tmp[256];
	475	+ sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());
	476	+ _bstr_t bstr2(tmp);
	477	+ // 文字表示範囲指定
	478	+ RectF r2(origin.X, origin.Y, 100.0f, 13.0f);
	479	+ format.SetAlignment(StringAlignmentCenter);
	480	+ g->DrawString(bstr2, -1, &font, r2, &format, strBrush);
	481	+ // 次の基点
	482	+ origin.X += r2.Width;
	483	+
	484	+ // bps表示
	485	+ Font *f;
	486	+ if (isStayConnected()){
	487	+ f = ::new Font(L"Arial", 9.0f, FontStyleItalic\|FontStyleBold, UnitPoint);
	488	+ } else {
	489	+ f = ::new Font(L"Arial", 9.0f);
	490	+ }
	491	+ sprintf(tmp, "%dkbps", getBitRate());
	492	+ _bstr_t bstr3(tmp);
	493	+ format.SetAlignment(StringAlignmentFar);
	494	+ // 文字表示範囲指定
	495	+ RectF r3(origin.X, origin.Y, 80.0f, 13.0f);
	496	+ g->DrawString(bstr3, -1, f, r3, &format, strBrush);
	497	+ // フォント開放
	498	+ ::delete f;
	499	+
	500	+ // 次の基点
	501	+ origin.X += r3.Width;
	502	+
	503	+ // ブラシ削除
	504	+ ::delete strBrush;
	505	+
	506	+
	507	+ // Servent表示
	508	+ if (!openFlg){
	509	+ int count = getServentCount();
	510	+ // Servent表示部の背景を白にする
	511	+ SolidBrush b(Color(160,255,255,255));
	512	+ g->FillRectangle(&b, (INT)origin.X, (INT)origin.Y, 14*count, 14);
	513	+
	514	+ sd = serventDataTop;
	515	+ int index = 0;
	516	+ while(sd){
	517	+ SolidBrush *serventBrush;
	518	+ if (sd->getInfoFlg()){
	519	+ ChanHit *hit = sd->getChanHit();
	520	+ if (hit->firewalled){
	521	+ SolidBrush bb(Color(180,255,0,0));
	522	+ g->FillRectangle(&bb, (INT)origin.X + 14*index, (INT)origin.Y, 14, 14);
	523	+ }
	524	+ if (hit->relay){
	525	+ // リレーＯＫ
	526	+ serventBrush = ::new SolidBrush(Color::Green);
518	527	} else {
519		- // リレーなし
520		- serventBrush = ::new SolidBrush(Color::Purple);
	528	+ // リレー不可
	529	+ if (hit->numRelays){
	530	+ // リレー一杯
	531	+ serventBrush = ::new SolidBrush(Color::Blue);
	532	+ } else {
	533	+ // リレーなし
	534	+ serventBrush = ::new SolidBrush(Color::Purple);
	535	+ }
521	536	}
	537	+ } else {
	538	+ // 情報なし
	539	+ serventBrush = ::new SolidBrush(Color::Black);
522	540	}
523		- } else {
524		- // 情報なし
525		- serventBrush = ::new SolidBrush(Color::Black);
526		- }
527		- // 四角描画
528		- backGra->FillRectangle(serventBrush, (INT)origin.X + index*14 + 1, (INT)origin.Y + 1, 12, 12);
	541	+ // 四角描画
	542	+ backGra->FillRectangle(serventBrush, (INT)origin.X + index*14 + 1, (INT)origin.Y + 1, 12, 12);
529	543
530		- ::delete serventBrush;
531		- sd = sd->getNextData();
532		- index++;
	544	+ ::delete serventBrush;
	545	+ sd = sd->getNextData();
	546	+ index++;
	547	+ }
533	548	}
534		- }
535	549
536		- // 次の基点
537		- origin.Y += 15;
	550	+ // 次の基点
	551	+ origin.Y += 15;
538	552
539		- // サイズを保存
540		- setWidth((int)origin.X - posX);
541		- setHeight((int)origin.Y - posY);
	553	+ // サイズを保存
	554	+ setWidth((int)origin.X - posX);
	555	+ setHeight((int)origin.Y - posY);
542	556
543		- // ServentData表示
544		- sd = serventDataTop;
545		- while(sd){
546		- if (openFlg \|\| sd->getSelected()){
547		- sd->drawServent(g, (INT)x+12, (INT)origin.Y);
548		- // 次の基点
549		- origin.Y += 15;
	557	+ // ServentData表示
	558	+ sd = serventDataTop;
	559	+ while(sd){
	560	+ if (openFlg \|\| sd->getSelected()){
	561	+ sd->drawServent(g, (INT)x+12, (INT)origin.Y);
	562	+ // 次の基点
	563	+ origin.Y += 15;
	564	+ }
	565	+ sd = sd->getNextData();
550	566	}
551		- sd = sd->getNextData();
	567	+ } else
	568	+ {
	569	+ // COUT
	570	+ g->SetTextRenderingHint(TextRenderingHintAntiAlias);
	571	+ RectF r1(origin.X, origin.Y, 120.0f+100.0f+80.0f, 13.0f);
	572	+ origin.X += r1.Width;
	573	+ StringFormat format;
	574	+ format.SetAlignment(StringAlignmentNear);
	575	+ _bstr_t bstr1("COUT");
	576	+ g->DrawString(bstr1, -1, &font, r1, &format, strBrush);
	577	+ ::delete strBrush;
	578	+ origin.Y += 15;
	579	+ setWidth((int)origin.X - posX);
	580	+ setHeight((int)origin.Y - posY);
552	581	}
553		-
554	582
555	583	return (int)(origin.Y);
556	584	}

		@@ -881,6 +909,90 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
881	909	c = c->next;
882	910	}
883	911
	912	+#if 1
	913	+ // COUTを検索
	914	+ {
	915	+ bool foundFlg = false;
	916	+ bool foundFlg2 = false;
	917	+ Servent *s = servMgr->servents;
	918	+ while (s)
	919	+ {
	920	+ if (s->type == Servent::T_COUT && s->status == Servent::S_CONNECTED)
	921	+ {
	922	+ foundFlg = true;
	923	+
	924	+ // ChannelData末尾まで探索
	925	+ ChannelData *prev = NULL;
	926	+ cd = channelDataTop;
	927	+ while (cd)
	928	+ {
	929	+ if (cd->type == Servent::T_COUT && cd->servent_id == s->servent_id)
	930	+ {
	931	+ foundFlg2 = true;
	932	+ cd->setEnableFlg(true);
	933	+ break;
	934	+ }
	935	+ prev = cd;
	936	+ cd = cd->getNextData();
	937	+ }
	938	+ cd = prev;
	939	+
	940	+ if (foundFlg2)
	941	+ break;
	942	+
	943	+ // ノード追加
	944	+ if (channelDataTop)
	945	+ {
	946	+ // channelDataが空でない。cdはここでリスト末尾を指してる（はず）
	947	+ cd->setNextData(::new ChannelData());
	948	+ cd = cd->getNextData();
	949	+ memset(cd, 0, sizeof(cd));
	950	+ cd->setNextData(NULL);
	951	+ } else
	952	+ {
	953	+ // channelDataが空
	954	+ channelDataTop = ::new ChannelData();
	955	+ channelDataTop->setNextData(NULL);
	956	+ cd = channelDataTop;
	957	+ }
	958	+
	959	+ // データ設定
	960	+ cd->type = s->type;
	961	+ cd->servent_id = s->servent_id;
	962	+ cd->setEnableFlg(true);
	963	+ }
	964	+
	965	+ s = s->next;
	966	+ }
	967	+
	968	+ // COUTが切れてたら削除
	969	+ if (!foundFlg)
	970	+ {
	971	+ cd = channelDataTop;
	972	+ ChannelData *prev = NULL;
	973	+ while (cd)
	974	+ {
	975	+ // COUTの情報を削除
	976	+ if (cd->type == Servent::T_COUT)
	977	+ {
	978	+ // 先頭
	979	+ if (!prev)
	980	+ {
	981	+ channelDataTop = cd->getNextData();
	982	+ } else
	983	+ {
	984	+ prev->setNextData(cd->getNextData());
	985	+ }
	986	+ //::delete cd;
	987	+ }
	988	+
	989	+ prev = cd;
	990	+ cd = cd->getNextData();
	991	+ }
	992	+ }
	993	+ }
	994	+#endif
	995	+
884	996	// チャンネルがなくなっている場合の処理
885	997	cd = channelDataTop;
886	998	ChannelData *prev = NULL;

		@@ -892,6 +1004,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
892	1004	next = cd->getNextData();
893	1005	if (!prev){
894	1006	// 先頭のデータを削除
	1007	+ // ここメモリリークしそう by えるー
895	1008	channelDataTop = next;
896	1009	} else {
897	1010	// 途中のデータを削除

		@@ -1192,6 +1305,11 @@ void PopupServentMenu(int servent_id){
1192	1305	ServentData *sd = NULL;
1193	1306	ChannelData *cd = channelDataTop;
1194	1307	while(cd){
	1308	+ // COUT
	1309	+ if (cd->type == Servent::T_COUT
	1310	+ && cd->servent_id == servent_id)
	1311	+ break;
	1312	+
1195	1313	sd = cd->findServentData(servent_id);
1196	1314	if (sd){
1197	1315	break;

		@@ -1199,7 +1317,9 @@ void PopupServentMenu(int servent_id){
1199	1317	cd = cd->getNextData();
1200	1318	}
1201	1319
1202		- if (cd == NULL \|\| sd == NULL){
	1320	+ if (cd == NULL \|\| sd == NULL
	1321	+ && cd->type != Servent::T_COUT) // COUT
	1322	+ {
1203	1323	return;
1204	1324	}
1205	1325

		@@ -1216,6 +1336,11 @@ void PopupServentMenu(int servent_id){
1216	1336
1217	1337	cd = channelDataTop;
1218	1338	while(cd){
	1339	+ // COUT
	1340	+ if (cd->type == Servent::T_COUT
	1341	+ && cd->servent_id == servent_id)
	1342	+ break;
	1343	+
1219	1344	sd = cd->findServentData(servent_id);
1220	1345	if (sd){
1221	1346	break;

		@@ -1223,7 +1348,9 @@ void PopupServentMenu(int servent_id){
1223	1348	cd = cd->getNextData();
1224	1349	}
1225	1350
1226		- if (cd == NULL \|\| sd == NULL){
	1351	+ if (cd == NULL \|\| sd == NULL
	1352	+ && cd->type != Servent::T_COUT) // COUT
	1353	+ {
1227	1354	return;
1228	1355	}
1229	1356

		@@ -1236,6 +1363,11 @@ void PopupServentMenu(int servent_id){
1236	1363	switch(dwID){
1237	1364	case 1001: // 切断
1238	1365	s->thread.active = false;
	1366	+
	1367	+ // COUT切断
	1368	+ if (s->type == Servent::T_COUT)
	1369	+ s->thread.finish = true;
	1370	+
1239	1371	break;
1240	1372
1241	1373	}

		@@ -1558,6 +1690,14 @@ void WmRButtonDownProc(HWND hwnd, LPARAM lParam){
1558	1690	cd->setSelected(TRUE);
1559	1691	channel_id = cd->getChannelId();
1560	1692	channel_selected = TRUE;
	1693	+
	1694	+ // COUT識別
	1695	+ if (cd->type == Servent::T_COUT)
	1696	+ {
	1697	+ channel_selected = FALSE;
	1698	+ servent_selected = TRUE;
	1699	+ servent_id = cd->servent_id;
	1700	+ }
1561	1701	} else {
1562	1702	if (cd->isSelected()){
1563	1703	changeFlg = TRUE;

--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.h

+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.h

		@@ -22,6 +22,7 @@
22	22	#include "sys.h"
23	23	#include "gdiplus.h"
24	24	#include "channel.h"
	25	+#include "servent.h"
25	26
26	27	extern LRESULT CALLBACK GUIProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
27	28	extern void ADDLOG(const char str,int id,bool sel,void data, LogBuffer::TYPE type);

		@@ -175,6 +176,8 @@ public:
175	176	selected = FALSE;
176	177	serventDataTop = NULL;
177	178	openFlg = FALSE;
	179	+ type = Servent::T_NONE;
	180	+ servent_id = -1;
178	181	}
179	182	int drawChannel(Gdiplus::Graphics *g, int x, int y);
180	183

		@@ -219,6 +222,9 @@ public:
219	222	int getServentCount();
220	223
221	224	bool checkDown(int x, int y);
	225	+
	226	+ Servent::TYPE type; // COUTのサーバント情報保持用
	227	+ int servent_id; // 同上。channel_idで代用できたけどPublicにしたくない
222	228	};
223	229
224	230

--- a/c:/Git/PeerCast.root/PeerCast/core/common/stream.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/core/common/stream.cpp

		@@ -279,12 +279,13 @@ void Stream::writeLineF(const char *fmt,...)
279	279
280	280	write(fmt,ap);
281	281
	282	+ // special thanks: 名無しの誰か
	283	+ va_end(ap);
	284	+
282	285	if (writeCRLF)
283	286	write("\r\n",2);
284	287	else
285	288	write("\n",1);
286		-
287		- va_end(ap);
288	289	}
289	290
290	291	// -------------------------------------

--- a/c:/Git/PeerCast.root/PeerCast/core/common/version2.h

+++ b/c:/Git/PeerCast.root/PeerCast/core/common/version2.h

		@@ -44,11 +44,11 @@ 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 = 38;
48		-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)";
49		-static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)";
	47	+static const int PCP_CLIENT_VERSION_EX_NUMBER = 39;
	48	+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0039)";
	49	+static const char *PCX_VERSTRING_EX = "v0.1218(IM0039)";
50	50
51		-static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
	51	+static const char *PCP_CLIENT_DIST_URL = "http://pecaim.net/";
52	52	#endif
53	53
54	54	// ------------------------------------------------

--- a/c:/Git/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj

+++ b/c:/Git/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj

		@@ -97,9 +97,9 @@
97	97	/>
98	98	</Configuration>
99	99	<Configuration
100		- Name="Debug\|Win32"
101		- OutputDirectory=".\Debug"
102		- IntermediateDirectory=".\Debug"
	100	+ Name="Private Release\|x64"
	101	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	102	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
103	103	ConfigurationType="4"
104	104	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
105	105	UseOfMFC="0"

		@@ -120,29 +120,30 @@
120	120	/>
121	121	<Tool
122	122	Name="VCMIDLTool"
	123	+ TargetEnvironment="3"
123	124	/>
124	125	<Tool
125	126	Name="VCCLCompilerTool"
126		- Optimization="0"
127		- AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
128		- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
129		- MinimalRebuild="true"
130		- BasicRuntimeChecks="3"
131		- RuntimeLibrary="1"
132		- PrecompiledHeaderFile=".\Debug/corelib.pch"
133		- AssemblerListingLocation=".\Debug/"
134		- ObjectFile=".\Debug/"
135		- ProgramDataBaseFileName=".\Debug/"
	127	+ Optimization="2"
	128	+ InlineFunctionExpansion="1"
	129	+ AdditionalIncludeDirectories="../../,../../common"
	130	+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PRIVATE_BROADCASTER"
	131	+ StringPooling="true"
	132	+ RuntimeLibrary="0"
	133	+ EnableFunctionLevelLinking="true"
	134	+ PrecompiledHeaderFile=".\corelib___Win32_Private_Release/corelib.pch"
	135	+ AssemblerListingLocation=".\corelib___Win32_Private_Release/"
	136	+ ObjectFile=".\corelib___Win32_Private_Release/"
	137	+ ProgramDataBaseFileName=".\corelib___Win32_Private_Release/"
136	138	WarningLevel="3"
137	139	SuppressStartupBanner="true"
138		- DebugInformationFormat="4"
139	140	/>
140	141	<Tool
141	142	Name="VCManagedResourceCompilerTool"
142	143	/>
143	144	<Tool
144	145	Name="VCResourceCompilerTool"
145		- PreprocessorDefinitions="_DEBUG"
	146	+ PreprocessorDefinitions="NDEBUG"
146	147	Culture="1033"
147	148	/>
148	149	<Tool

		@@ -150,7 +151,7 @@
150	151	/>
151	152	<Tool
152	153	Name="VCLibrarianTool"
153		- OutputFile=".\Debug\corelib.lib"
	154	+ OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
154	155	SuppressStartupBanner="true"
155	156	/>
156	157	<Tool

		@@ -162,7 +163,7 @@
162	163	<Tool
163	164	Name="VCBscMakeTool"
164	165	SuppressStartupBanner="true"
165		- OutputFile=".\Debug/corelib.bsc"
	166	+ OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
166	167	/>
167	168	<Tool
168	169	Name="VCFxCopTool"

		@@ -172,15 +173,14 @@
172	173	/>
173	174	</Configuration>
174	175	<Configuration
175		- Name="Release\|Win32"
176		- OutputDirectory=".\Release"
177		- IntermediateDirectory=".\Release"
	176	+ Name="Debug\|Win32"
	177	+ OutputDirectory=".\Debug"
	178	+ IntermediateDirectory=".\Debug"
178	179	ConfigurationType="4"
179	180	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
180	181	UseOfMFC="0"
181	182	ATLMinimizesCRunTimeLibraryUsage="false"
182	183	CharacterSet="2"
183		- WholeProgramOptimization="1"
184	184	>
185	185	<Tool
186	186	Name="VCPreBuildEventTool"

		@@ -199,30 +199,26 @@
199	199	/>
200	200	<Tool
201	201	Name="VCCLCompilerTool"
202		- Optimization="2"
203		- InlineFunctionExpansion="2"
204		- EnableIntrinsicFunctions="true"
205		- FavorSizeOrSpeed="1"
206		- EnableFiberSafeOptimizations="true"
207		- AdditionalIncludeDirectories="../../,../../common"
208		- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
209		- StringPooling="true"
210		- RuntimeLibrary="0"
211		- EnableFunctionLevelLinking="true"
212		- PrecompiledHeaderFile=".\Release/corelib.pch"
213		- AssemblerListingLocation=".\Release/"
214		- ObjectFile=".\Release/"
215		- ProgramDataBaseFileName=".\Release/"
	202	+ Optimization="0"
	203	+ AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
	204	+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
	205	+ MinimalRebuild="true"
	206	+ BasicRuntimeChecks="3"
	207	+ RuntimeLibrary="1"
	208	+ PrecompiledHeaderFile=".\Debug/corelib.pch"
	209	+ AssemblerListingLocation=".\Debug/"
	210	+ ObjectFile=".\Debug/"
	211	+ ProgramDataBaseFileName=".\Debug/"
216	212	WarningLevel="3"
217	213	SuppressStartupBanner="true"
218		- DebugInformationFormat="3"
	214	+ DebugInformationFormat="4"
219	215	/>
220	216	<Tool
221	217	Name="VCManagedResourceCompilerTool"
222	218	/>
223	219	<Tool
224	220	Name="VCResourceCompilerTool"
225		- PreprocessorDefinitions="NDEBUG"
	221	+ PreprocessorDefinitions="_DEBUG"
226	222	Culture="1033"
227	223	/>
228	224	<Tool

		@@ -230,7 +226,7 @@
230	226	/>
231	227	<Tool
232	228	Name="VCLibrarianTool"
233		- OutputFile=".\Release\corelib.lib"
	229	+ OutputFile=".\Debug\corelib.lib"
234	230	SuppressStartupBanner="true"
235	231	/>
236	232	<Tool

		@@ -242,7 +238,7 @@
242	238	<Tool
243	239	Name="VCBscMakeTool"
244	240	SuppressStartupBanner="true"
245		- OutputFile=".\Release/corelib.bsc"
	241	+ OutputFile=".\Debug/corelib.bsc"
246	242	/>
247	243	<Tool
248	244	Name="VCFxCopTool"

		@@ -252,9 +248,9 @@
252	248	/>
253	249	</Configuration>
254	250	<Configuration
255		- Name="Private Debug\|Win32"
256		- OutputDirectory=".\corelib___Win32_Private_Debug"
257		- IntermediateDirectory=".\corelib___Win32_Private_Debug"
	251	+ Name="Debug\|x64"
	252	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	253	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
258	254	ConfigurationType="4"
259	255	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
260	256	UseOfMFC="0"

		@@ -275,22 +271,24 @@
275	271	/>
276	272	<Tool
277	273	Name="VCMIDLTool"
	274	+ TargetEnvironment="3"
278	275	/>
279	276	<Tool
280	277	Name="VCCLCompilerTool"
281	278	Optimization="0"
282		- AdditionalIncludeDirectories="../../,../../common"
283		- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PRIVATE_BROADCASTER"
	279	+ AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
	280	+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
284	281	MinimalRebuild="true"
285	282	BasicRuntimeChecks="3"
286	283	RuntimeLibrary="1"
287		- PrecompiledHeaderFile=".\corelib___Win32_Private_Debug/corelib.pch"
288		- AssemblerListingLocation=".\corelib___Win32_Private_Debug/"
289		- ObjectFile=".\corelib___Win32_Private_Debug/"
290		- ProgramDataBaseFileName=".\corelib___Win32_Private_Debug/"
	284	+ PrecompiledHeaderFile=".\Debug/corelib.pch"
	285	+ AssemblerListingLocation=".\Debug/"
	286	+ ObjectFile=".\Debug/"
	287	+ ProgramDataBaseFileName=".\Debug/"
291	288	WarningLevel="3"
292	289	SuppressStartupBanner="true"
293		- DebugInformationFormat="4"
	290	+ Detect64BitPortabilityProblems="true"
	291	+ DebugInformationFormat="3"
294	292	/>
295	293	<Tool
296	294	Name="VCManagedResourceCompilerTool"

		@@ -305,7 +303,7 @@
305	303	/>
306	304	<Tool
307	305	Name="VCLibrarianTool"
308		- OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
	306	+ OutputFile=".\Debug\corelib.lib"
309	307	SuppressStartupBanner="true"
310	308	/>
311	309	<Tool

		@@ -317,7 +315,7 @@
317	315	<Tool
318	316	Name="VCBscMakeTool"
319	317	SuppressStartupBanner="true"
320		- OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
	318	+ OutputFile=".\Debug/corelib.bsc"
321	319	/>
322	320	<Tool
323	321	Name="VCFxCopTool"

		@@ -327,14 +325,15 @@
327	325	/>
328	326	</Configuration>
329	327	<Configuration
330		- Name="Private Release\|x64"
331		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
332		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	328	+ Name="Release\|Win32"
	329	+ OutputDirectory=".\Release"
	330	+ IntermediateDirectory=".\Release"
333	331	ConfigurationType="4"
334	332	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
335	333	UseOfMFC="0"
336	334	ATLMinimizesCRunTimeLibraryUsage="false"
337	335	CharacterSet="2"
	336	+ WholeProgramOptimization="1"
338	337	>
339	338	<Tool
340	339	Name="VCPreBuildEventTool"

		@@ -350,23 +349,26 @@
350	349	/>
351	350	<Tool
352	351	Name="VCMIDLTool"
353		- TargetEnvironment="3"
354	352	/>
355	353	<Tool
356	354	Name="VCCLCompilerTool"
357	355	Optimization="2"
358		- InlineFunctionExpansion="1"
	356	+ InlineFunctionExpansion="2"
	357	+ EnableIntrinsicFunctions="true"
	358	+ FavorSizeOrSpeed="1"
	359	+ EnableFiberSafeOptimizations="true"
359	360	AdditionalIncludeDirectories="../../,../../common"
360		- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PRIVATE_BROADCASTER"
	361	+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
361	362	StringPooling="true"
362	363	RuntimeLibrary="0"
363	364	EnableFunctionLevelLinking="true"
364		- PrecompiledHeaderFile=".\corelib___Win32_Private_Release/corelib.pch"
365		- AssemblerListingLocation=".\corelib___Win32_Private_Release/"
366		- ObjectFile=".\corelib___Win32_Private_Release/"
367		- ProgramDataBaseFileName=".\corelib___Win32_Private_Release/"
	365	+ PrecompiledHeaderFile=".\Release/corelib.pch"
	366	+ AssemblerListingLocation=".\Release/"
	367	+ ObjectFile=".\Release/"
	368	+ ProgramDataBaseFileName=".\Release/"
368	369	WarningLevel="3"
369	370	SuppressStartupBanner="true"
	371	+ DebugInformationFormat="3"
370	372	/>
371	373	<Tool
372	374	Name="VCManagedResourceCompilerTool"

		@@ -381,7 +383,7 @@
381	383	/>
382	384	<Tool
383	385	Name="VCLibrarianTool"
384		- OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
	386	+ OutputFile=".\Release\corelib.lib"
385	387	SuppressStartupBanner="true"
386	388	/>
387	389	<Tool

		@@ -393,7 +395,7 @@
393	395	<Tool
394	396	Name="VCBscMakeTool"
395	397	SuppressStartupBanner="true"
396		- OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
	398	+ OutputFile=".\Release/corelib.bsc"
397	399	/>
398	400	<Tool
399	401	Name="VCFxCopTool"

		@@ -403,7 +405,7 @@
403	405	/>
404	406	</Configuration>
405	407	<Configuration
406		- Name="Debug\|x64"
	408	+ Name="Release\|x64"
407	409	OutputDirectory="$(PlatformName)\$(ConfigurationName)"
408	410	IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
409	411	ConfigurationType="4"

		@@ -411,6 +413,7 @@
411	413	UseOfMFC="0"
412	414	ATLMinimizesCRunTimeLibraryUsage="false"
413	415	CharacterSet="2"
	416	+ WholeProgramOptimization="1"
414	417	>
415	418	<Tool
416	419	Name="VCPreBuildEventTool"

		@@ -430,18 +433,23 @@
430	433	/>
431	434	<Tool
432	435	Name="VCCLCompilerTool"
433		- Optimization="0"
434		- AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
435		- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
436		- MinimalRebuild="true"
437		- BasicRuntimeChecks="3"
438		- RuntimeLibrary="1"
439		- PrecompiledHeaderFile=".\Debug/corelib.pch"
440		- AssemblerListingLocation=".\Debug/"
441		- ObjectFile=".\Debug/"
442		- ProgramDataBaseFileName=".\Debug/"
	436	+ Optimization="2"
	437	+ InlineFunctionExpansion="2"
	438	+ EnableIntrinsicFunctions="true"
	439	+ FavorSizeOrSpeed="1"
	440	+ EnableFiberSafeOptimizations="true"
	441	+ AdditionalIncludeDirectories="../../,../../common"
	442	+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
	443	+ StringPooling="true"
	444	+ RuntimeLibrary="0"
	445	+ EnableFunctionLevelLinking="true"
	446	+ PrecompiledHeaderFile=".\Release/corelib.pch"
	447	+ AssemblerListingLocation=".\Release/"
	448	+ ObjectFile=".\Release/"
	449	+ ProgramDataBaseFileName=".\Release/"
443	450	WarningLevel="3"
444	451	SuppressStartupBanner="true"
	452	+ Detect64BitPortabilityProblems="true"
445	453	DebugInformationFormat="3"
446	454	/>
447	455	<Tool

		@@ -449,7 +457,7 @@
449	457	/>
450	458	<Tool
451	459	Name="VCResourceCompilerTool"
452		- PreprocessorDefinitions="_DEBUG"
	460	+ PreprocessorDefinitions="NDEBUG"
453	461	Culture="1033"
454	462	/>
455	463	<Tool

		@@ -457,7 +465,7 @@
457	465	/>
458	466	<Tool
459	467	Name="VCLibrarianTool"
460		- OutputFile=".\Debug\corelib.lib"
	468	+ OutputFile=".\Release\corelib.lib"
461	469	SuppressStartupBanner="true"
462	470	/>
463	471	<Tool

		@@ -469,7 +477,7 @@
469	477	<Tool
470	478	Name="VCBscMakeTool"
471	479	SuppressStartupBanner="true"
472		- OutputFile=".\Debug/corelib.bsc"
	480	+ OutputFile=".\Release/corelib.bsc"
473	481	/>
474	482	<Tool
475	483	Name="VCFxCopTool"

		@@ -479,15 +487,14 @@
479	487	/>
480	488	</Configuration>
481	489	<Configuration
482		- Name="Release\|x64"
483		- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
484		- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	490	+ Name="Private Debug\|Win32"
	491	+ OutputDirectory=".\corelib___Win32_Private_Debug"
	492	+ IntermediateDirectory=".\corelib___Win32_Private_Debug"
485	493	ConfigurationType="4"
486	494	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
487	495	UseOfMFC="0"
488	496	ATLMinimizesCRunTimeLibraryUsage="false"
489	497	CharacterSet="2"
490		- WholeProgramOptimization="1"
491	498	>
492	499	<Tool
493	500	Name="VCPreBuildEventTool"

		@@ -503,34 +510,29 @@
503	510	/>
504	511	<Tool
505	512	Name="VCMIDLTool"
506		- TargetEnvironment="3"
507	513	/>
508	514	<Tool
509	515	Name="VCCLCompilerTool"
510		- Optimization="2"
511		- InlineFunctionExpansion="2"
512		- EnableIntrinsicFunctions="true"
513		- FavorSizeOrSpeed="1"
514		- EnableFiberSafeOptimizations="true"
	516	+ Optimization="0"
515	517	AdditionalIncludeDirectories="../../,../../common"
516		- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
517		- StringPooling="true"
518		- RuntimeLibrary="0"
519		- EnableFunctionLevelLinking="true"
520		- PrecompiledHeaderFile=".\Release/corelib.pch"
521		- AssemblerListingLocation=".\Release/"
522		- ObjectFile=".\Release/"
523		- ProgramDataBaseFileName=".\Release/"
	518	+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PRIVATE_BROADCASTER"
	519	+ MinimalRebuild="true"
	520	+ BasicRuntimeChecks="3"
	521	+ RuntimeLibrary="1"
	522	+ PrecompiledHeaderFile=".\corelib___Win32_Private_Debug/corelib.pch"
	523	+ AssemblerListingLocation=".\corelib___Win32_Private_Debug/"
	524	+ ObjectFile=".\corelib___Win32_Private_Debug/"
	525	+ ProgramDataBaseFileName=".\corelib___Win32_Private_Debug/"
524	526	WarningLevel="3"
525	527	SuppressStartupBanner="true"
526		- DebugInformationFormat="3"
	528	+ DebugInformationFormat="4"
527	529	/>
528	530	<Tool
529	531	Name="VCManagedResourceCompilerTool"
530	532	/>
531	533	<Tool
532	534	Name="VCResourceCompilerTool"
533		- PreprocessorDefinitions="NDEBUG"
	535	+ PreprocessorDefinitions="_DEBUG"
534	536	Culture="1033"
535	537	/>
536	538	<Tool

		@@ -538,7 +540,7 @@
538	540	/>
539	541	<Tool
540	542	Name="VCLibrarianTool"
541		- OutputFile=".\Release\corelib.lib"
	543	+ OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
542	544	SuppressStartupBanner="true"
543	545	/>
544	546	<Tool

		@@ -550,7 +552,7 @@
550	552	<Tool
551	553	Name="VCBscMakeTool"
552	554	SuppressStartupBanner="true"
553		- OutputFile=".\Release/corelib.bsc"
	555	+ OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
554	556	/>
555	557	<Tool
556	558	Name="VCFxCopTool"

		@@ -655,7 +657,7 @@
655	657	/>
656	658	</FileConfiguration>
657	659	<FileConfiguration
658		- Name="Debug\|Win32"
	660	+ Name="Private Release\|x64"
659	661	>
660	662	<Tool
661	663	Name="VCCLCompilerTool"

		@@ -664,7 +666,7 @@
664	666	/>
665	667	</FileConfiguration>
666	668	<FileConfiguration
667		- Name="Release\|Win32"
	669	+ Name="Debug\|Win32"
668	670	>
669	671	<Tool
670	672	Name="VCCLCompilerTool"

		@@ -673,7 +675,7 @@
673	675	/>
674	676	</FileConfiguration>
675	677	<FileConfiguration
676		- Name="Private Debug\|Win32"
	678	+ Name="Debug\|x64"
677	679	>
678	680	<Tool
679	681	Name="VCCLCompilerTool"

		@@ -682,7 +684,7 @@
682	684	/>
683	685	</FileConfiguration>
684	686	<FileConfiguration
685		- Name="Private Release\|x64"
	687	+ Name="Release\|Win32"
686	688	>
687	689	<Tool
688	690	Name="VCCLCompilerTool"

		@@ -691,7 +693,7 @@
691	693	/>
692	694	</FileConfiguration>
693	695	<FileConfiguration
694		- Name="Debug\|x64"
	696	+ Name="Release\|x64"
695	697	>
696	698	<Tool
697	699	Name="VCCLCompilerTool"

		@@ -700,7 +702,7 @@
700	702	/>
701	703	</FileConfiguration>
702	704	<FileConfiguration
703		- Name="Release\|x64"
	705	+ Name="Private Debug\|Win32"
704	706	>
705	707	<Tool
706	708	Name="VCCLCompilerTool"

		@@ -731,7 +733,7 @@
731	733	/>
732	734	</FileConfiguration>
733	735	<FileConfiguration
734		- Name="Debug\|Win32"
	736	+ Name="Private Release\|x64"
735	737	>
736	738	<Tool
737	739	Name="VCCLCompilerTool"

		@@ -740,7 +742,7 @@
740	742	/>
741	743	</FileConfiguration>
742	744	<FileConfiguration
743		- Name="Release\|Win32"
	745	+ Name="Debug\|Win32"
744	746	>
745	747	<Tool
746	748	Name="VCCLCompilerTool"

		@@ -749,7 +751,7 @@
749	751	/>
750	752	</FileConfiguration>
751	753	<FileConfiguration
752		- Name="Private Debug\|Win32"
	754	+ Name="Debug\|x64"
753	755	>
754	756	<Tool
755	757	Name="VCCLCompilerTool"

		@@ -758,7 +760,7 @@
758	760	/>
759	761	</FileConfiguration>
760	762	<FileConfiguration
761		- Name="Private Release\|x64"
	763	+ Name="Release\|Win32"
762	764	>
763	765	<Tool
764	766	Name="VCCLCompilerTool"

		@@ -767,7 +769,7 @@
767	769	/>
768	770	</FileConfiguration>
769	771	<FileConfiguration
770		- Name="Debug\|x64"
	772	+ Name="Release\|x64"
771	773	>
772	774	<Tool
773	775	Name="VCCLCompilerTool"

		@@ -776,7 +778,7 @@
776	778	/>
777	779	</FileConfiguration>
778	780	<FileConfiguration
779		- Name="Release\|x64"
	781	+ Name="Private Debug\|Win32"
780	782	>
781	783	<Tool
782	784	Name="VCCLCompilerTool"

		@@ -807,7 +809,7 @@
807	809	/>
808	810	</FileConfiguration>
809	811	<FileConfiguration
810		- Name="Debug\|Win32"
	812	+ Name="Private Release\|x64"
811	813	>
812	814	<Tool
813	815	Name="VCCLCompilerTool"

		@@ -816,7 +818,7 @@
816	818	/>
817	819	</FileConfiguration>
818	820	<FileConfiguration
819		- Name="Release\|Win32"
	821	+ Name="Debug\|Win32"
820	822	>
821	823	<Tool
822	824	Name="VCCLCompilerTool"

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

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

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

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

		@@ -883,7 +885,7 @@
883	885	/>
884	886	</FileConfiguration>
885	887	<FileConfiguration
886		- Name="Debug\|Win32"
	888	+ Name="Private Release\|x64"
887	889	>
888	890	<Tool
889	891	Name="VCCLCompilerTool"

		@@ -892,7 +894,7 @@
892	894	/>
893	895	</FileConfiguration>
894	896	<FileConfiguration
895		- Name="Release\|Win32"
	897	+ Name="Debug\|Win32"
896	898	>
897	899	<Tool
898	900	Name="VCCLCompilerTool"

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

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

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

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

		@@ -959,7 +961,7 @@
959	961	/>
960	962	</FileConfiguration>
961	963	<FileConfiguration
962		- Name="Debug\|Win32"
	964	+ Name="Private Release\|x64"
963	965	>
964	966	<Tool
965	967	Name="VCCLCompilerTool"

		@@ -968,7 +970,7 @@
968	970	/>
969	971	</FileConfiguration>
970	972	<FileConfiguration
971		- Name="Release\|Win32"
	973	+ Name="Debug\|Win32"
972	974	>
973	975	<Tool
974	976	Name="VCCLCompilerTool"

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

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

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

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

		@@ -1035,7 +1037,7 @@
1035	1037	/>
1036	1038	</FileConfiguration>
1037	1039	<FileConfiguration
1038		- Name="Debug\|Win32"
	1040	+ Name="Private Release\|x64"
1039	1041	>
1040	1042	<Tool
1041	1043	Name="VCCLCompilerTool"

		@@ -1044,7 +1046,7 @@
1044	1046	/>
1045	1047	</FileConfiguration>
1046	1048	<FileConfiguration
1047		- Name="Release\|Win32"
	1049	+ Name="Debug\|Win32"
1048	1050	>
1049	1051	<Tool
1050	1052	Name="VCCLCompilerTool"

		@@ -1053,7 +1055,7 @@
1053	1055	/>
1054	1056	</FileConfiguration>
1055	1057	<FileConfiguration
1056		- Name="Private Debug\|Win32"
	1058	+ Name="Debug\|x64"
1057	1059	>
1058	1060	<Tool
1059	1061	Name="VCCLCompilerTool"

		@@ -1062,7 +1064,7 @@
1062	1064	/>
1063	1065	</FileConfiguration>
1064	1066	<FileConfiguration
1065		- Name="Private Release\|x64"
	1067	+ Name="Release\|Win32"
1066	1068	>
1067	1069	<Tool
1068	1070	Name="VCCLCompilerTool"

		@@ -1071,7 +1073,7 @@
1071	1073	/>
1072	1074	</FileConfiguration>
1073	1075	<FileConfiguration
1074		- Name="Debug\|x64"
	1076	+ Name="Release\|x64"
1075	1077	>
1076	1078	<Tool
1077	1079	Name="VCCLCompilerTool"

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

		@@ -1111,7 +1113,7 @@
1111	1113	/>
1112	1114	</FileConfiguration>
1113	1115	<FileConfiguration
1114		- Name="Debug\|Win32"
	1116	+ Name="Private Release\|x64"
1115	1117	>
1116	1118	<Tool
1117	1119	Name="VCCLCompilerTool"

		@@ -1120,7 +1122,7 @@
1120	1122	/>
1121	1123	</FileConfiguration>
1122	1124	<FileConfiguration
1123		- Name="Release\|Win32"
	1125	+ Name="Debug\|Win32"
1124	1126	>
1125	1127	<Tool
1126	1128	Name="VCCLCompilerTool"

		@@ -1129,7 +1131,7 @@
1129	1131	/>
1130	1132	</FileConfiguration>
1131	1133	<FileConfiguration
1132		- Name="Private Debug\|Win32"
	1134	+ Name="Debug\|x64"
1133	1135	>
1134	1136	<Tool
1135	1137	Name="VCCLCompilerTool"

		@@ -1138,7 +1140,7 @@
1138	1140	/>
1139	1141	</FileConfiguration>
1140	1142	<FileConfiguration
1141		- Name="Private Release\|x64"
	1143	+ Name="Release\|Win32"
1142	1144	>
1143	1145	<Tool
1144	1146	Name="VCCLCompilerTool"

		@@ -1147,7 +1149,7 @@
1147	1149	/>
1148	1150	</FileConfiguration>
1149	1151	<FileConfiguration
1150		- Name="Debug\|x64"
	1152	+ Name="Release\|x64"
1151	1153	>
1152	1154	<Tool
1153	1155	Name="VCCLCompilerTool"

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

		@@ -1187,7 +1189,7 @@
1187	1189	/>
1188	1190	</FileConfiguration>
1189	1191	<FileConfiguration
1190		- Name="Debug\|Win32"
	1192	+ Name="Private Release\|x64"
1191	1193	>
1192	1194	<Tool
1193	1195	Name="VCCLCompilerTool"

		@@ -1196,7 +1198,7 @@
1196	1198	/>
1197	1199	</FileConfiguration>
1198	1200	<FileConfiguration
1199		- Name="Release\|Win32"
	1201	+ Name="Debug\|Win32"
1200	1202	>
1201	1203	<Tool
1202	1204	Name="VCCLCompilerTool"

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

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

		@@ -1223,7 +1225,7 @@
1223	1225	/>
1224	1226	</FileConfiguration>
1225	1227	<FileConfiguration
1226		- Name="Debug\|x64"
	1228	+ Name="Release\|x64"
1227	1229	>
1228	1230	<Tool
1229	1231	Name="VCCLCompilerTool"

		@@ -1232,7 +1234,7 @@
1232	1234	/>
1233	1235	</FileConfiguration>
1234	1236	<FileConfiguration
1235		- Name="Release\|x64"
	1237	+ Name="Private Debug\|Win32"
1236	1238	>
1237	1239	<Tool
1238	1240	Name="VCCLCompilerTool"

		@@ -1263,7 +1265,7 @@
1263	1265	/>
1264	1266	</FileConfiguration>
1265	1267	<FileConfiguration
1266		- Name="Debug\|Win32"
	1268	+ Name="Private Release\|x64"
1267	1269	>
1268	1270	<Tool
1269	1271	Name="VCCLCompilerTool"

		@@ -1272,7 +1274,7 @@
1272	1274	/>
1273	1275	</FileConfiguration>
1274	1276	<FileConfiguration
1275		- Name="Release\|Win32"
	1277	+ Name="Debug\|Win32"
1276	1278	>
1277	1279	<Tool
1278	1280	Name="VCCLCompilerTool"

		@@ -1281,7 +1283,7 @@
1281	1283	/>
1282	1284	</FileConfiguration>
1283	1285	<FileConfiguration
1284		- Name="Private Debug\|Win32"
	1286	+ Name="Debug\|x64"
1285	1287	>
1286	1288	<Tool
1287	1289	Name="VCCLCompilerTool"

		@@ -1290,7 +1292,7 @@
1290	1292	/>
1291	1293	</FileConfiguration>
1292	1294	<FileConfiguration
1293		- Name="Private Release\|x64"
	1295	+ Name="Release\|Win32"
1294	1296	>
1295	1297	<Tool
1296	1298	Name="VCCLCompilerTool"

		@@ -1299,7 +1301,7 @@
1299	1301	/>
1300	1302	</FileConfiguration>
1301	1303	<FileConfiguration
1302		- Name="Debug\|x64"
	1304	+ Name="Release\|x64"
1303	1305	>
1304	1306	<Tool
1305	1307	Name="VCCLCompilerTool"

		@@ -1308,7 +1310,7 @@
1308	1310	/>
1309	1311	</FileConfiguration>
1310	1312	<FileConfiguration
1311		- Name="Release\|x64"
	1313	+ Name="Private Debug\|Win32"
1312	1314	>
1313	1315	<Tool
1314	1316	Name="VCCLCompilerTool"

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

		@@ -1348,7 +1350,7 @@
1348	1350	/>
1349	1351	</FileConfiguration>
1350	1352	<FileConfiguration
1351		- Name="Release\|Win32"
	1353	+ Name="Debug\|Win32"
1352	1354	>
1353	1355	<Tool
1354	1356	Name="VCCLCompilerTool"

		@@ -1357,7 +1359,7 @@
1357	1359	/>
1358	1360	</FileConfiguration>
1359	1361	<FileConfiguration
1360		- Name="Private Debug\|Win32"
	1362	+ Name="Debug\|x64"
1361	1363	>
1362	1364	<Tool
1363	1365	Name="VCCLCompilerTool"

		@@ -1366,7 +1368,7 @@
1366	1368	/>
1367	1369	</FileConfiguration>
1368	1370	<FileConfiguration
1369		- Name="Private Release\|x64"
	1371	+ Name="Release\|Win32"
1370	1372	>
1371	1373	<Tool
1372	1374	Name="VCCLCompilerTool"

		@@ -1375,7 +1377,7 @@
1375	1377	/>
1376	1378	</FileConfiguration>
1377	1379	<FileConfiguration
1378		- Name="Debug\|x64"
	1380	+ Name="Release\|x64"
1379	1381	>
1380	1382	<Tool
1381	1383	Name="VCCLCompilerTool"

		@@ -1384,7 +1386,7 @@
1384	1386	/>
1385	1387	</FileConfiguration>
1386	1388	<FileConfiguration
1387		- Name="Release\|x64"
	1389	+ Name="Private Debug\|Win32"
1388	1390	>
1389	1391	<Tool
1390	1392	Name="VCCLCompilerTool"

		@@ -1415,7 +1417,7 @@
1415	1417	/>
1416	1418	</FileConfiguration>
1417	1419	<FileConfiguration
1418		- Name="Debug\|Win32"
	1420	+ Name="Private Release\|x64"
1419	1421	>
1420	1422	<Tool
1421	1423	Name="VCCLCompilerTool"

		@@ -1424,7 +1426,7 @@
1424	1426	/>
1425	1427	</FileConfiguration>
1426	1428	<FileConfiguration
1427		- Name="Release\|Win32"
	1429	+ Name="Debug\|Win32"
1428	1430	>
1429	1431	<Tool
1430	1432	Name="VCCLCompilerTool"

		@@ -1433,7 +1435,7 @@
1433	1435	/>
1434	1436	</FileConfiguration>
1435	1437	<FileConfiguration
1436		- Name="Private Debug\|Win32"
	1438	+ Name="Debug\|x64"
1437	1439	>
1438	1440	<Tool
1439	1441	Name="VCCLCompilerTool"

		@@ -1442,7 +1444,7 @@
1442	1444	/>
1443	1445	</FileConfiguration>
1444	1446	<FileConfiguration
1445		- Name="Private Release\|x64"
	1447	+ Name="Release\|Win32"
1446	1448	>
1447	1449	<Tool
1448	1450	Name="VCCLCompilerTool"

		@@ -1451,7 +1453,7 @@
1451	1453	/>
1452	1454	</FileConfiguration>
1453	1455	<FileConfiguration
1454		- Name="Debug\|x64"
	1456	+ Name="Release\|x64"
1455	1457	>
1456	1458	<Tool
1457	1459	Name="VCCLCompilerTool"

		@@ -1460,7 +1462,7 @@
1460	1462	/>
1461	1463	</FileConfiguration>
1462	1464	<FileConfiguration
1463		- Name="Release\|x64"
	1465	+ Name="Private Debug\|Win32"
1464	1466	>
1465	1467	<Tool
1466	1468	Name="VCCLCompilerTool"

		@@ -1491,7 +1493,7 @@
1491	1493	/>
1492	1494	</FileConfiguration>
1493	1495	<FileConfiguration
1494		- Name="Debug\|Win32"
	1496	+ Name="Private Release\|x64"
1495	1497	>
1496	1498	<Tool
1497	1499	Name="VCCLCompilerTool"

		@@ -1500,7 +1502,7 @@
1500	1502	/>
1501	1503	</FileConfiguration>
1502	1504	<FileConfiguration
1503		- Name="Release\|Win32"
	1505	+ Name="Debug\|Win32"
1504	1506	>
1505	1507	<Tool
1506	1508	Name="VCCLCompilerTool"

		@@ -1509,7 +1511,7 @@
1509	1511	/>
1510	1512	</FileConfiguration>
1511	1513	<FileConfiguration
1512		- Name="Private Debug\|Win32"
	1514	+ Name="Debug\|x64"
1513	1515	>
1514	1516	<Tool
1515	1517	Name="VCCLCompilerTool"

		@@ -1518,7 +1520,7 @@
1518	1520	/>
1519	1521	</FileConfiguration>
1520	1522	<FileConfiguration
1521		- Name="Private Release\|x64"
	1523	+ Name="Release\|Win32"
1522	1524	>
1523	1525	<Tool
1524	1526	Name="VCCLCompilerTool"

		@@ -1527,7 +1529,7 @@
1527	1529	/>
1528	1530	</FileConfiguration>
1529	1531	<FileConfiguration
1530		- Name="Debug\|x64"
	1532	+ Name="Release\|x64"
1531	1533	>
1532	1534	<Tool
1533	1535	Name="VCCLCompilerTool"

		@@ -1536,7 +1538,7 @@
1536	1538	/>
1537	1539	</FileConfiguration>
1538	1540	<FileConfiguration
1539		- Name="Release\|x64"
	1541	+ Name="Private Debug\|Win32"
1540	1542	>
1541	1543	<Tool
1542	1544	Name="VCCLCompilerTool"

		@@ -1567,7 +1569,7 @@
1567	1569	/>
1568	1570	</FileConfiguration>
1569	1571	<FileConfiguration
1570		- Name="Debug\|Win32"
	1572	+ Name="Private Release\|x64"
1571	1573	>
1572	1574	<Tool
1573	1575	Name="VCCLCompilerTool"

		@@ -1576,7 +1578,7 @@
1576	1578	/>
1577	1579	</FileConfiguration>
1578	1580	<FileConfiguration
1579		- Name="Release\|Win32"
	1581	+ Name="Debug\|Win32"
1580	1582	>
1581	1583	<Tool
1582	1584	Name="VCCLCompilerTool"

		@@ -1585,7 +1587,7 @@
1585	1587	/>
1586	1588	</FileConfiguration>
1587	1589	<FileConfiguration
1588		- Name="Private Debug\|Win32"
	1590	+ Name="Debug\|x64"
1589	1591	>
1590	1592	<Tool
1591	1593	Name="VCCLCompilerTool"

		@@ -1594,7 +1596,7 @@
1594	1596	/>
1595	1597	</FileConfiguration>
1596	1598	<FileConfiguration
1597		- Name="Private Release\|x64"
	1599	+ Name="Release\|Win32"
1598	1600	>
1599	1601	<Tool
1600	1602	Name="VCCLCompilerTool"

		@@ -1603,7 +1605,7 @@
1603	1605	/>
1604	1606	</FileConfiguration>
1605	1607	<FileConfiguration
1606		- Name="Debug\|x64"
	1608	+ Name="Release\|x64"
1607	1609	>
1608	1610	<Tool
1609	1611	Name="VCCLCompilerTool"

		@@ -1612,7 +1614,7 @@
1612	1614	/>
1613	1615	</FileConfiguration>
1614	1616	<FileConfiguration
1615		- Name="Release\|x64"
	1617	+ Name="Private Debug\|Win32"
1616	1618	>
1617	1619	<Tool
1618	1620	Name="VCCLCompilerTool"

		@@ -1643,7 +1645,7 @@
1643	1645	/>
1644	1646	</FileConfiguration>
1645	1647	<FileConfiguration
1646		- Name="Debug\|Win32"
	1648	+ Name="Private Release\|x64"
1647	1649	>
1648	1650	<Tool
1649	1651	Name="VCCLCompilerTool"

		@@ -1652,7 +1654,7 @@
1652	1654	/>
1653	1655	</FileConfiguration>
1654	1656	<FileConfiguration
1655		- Name="Release\|Win32"
	1657	+ Name="Debug\|Win32"
1656	1658	>
1657	1659	<Tool
1658	1660	Name="VCCLCompilerTool"

		@@ -1661,7 +1663,7 @@
1661	1663	/>
1662	1664	</FileConfiguration>
1663	1665	<FileConfiguration
1664		- Name="Private Debug\|Win32"
	1666	+ Name="Debug\|x64"
1665	1667	>
1666	1668	<Tool
1667	1669	Name="VCCLCompilerTool"

		@@ -1670,7 +1672,7 @@
1670	1672	/>
1671	1673	</FileConfiguration>
1672	1674	<FileConfiguration
1673		- Name="Private Release\|x64"
	1675	+ Name="Release\|Win32"
1674	1676	>
1675	1677	<Tool
1676	1678	Name="VCCLCompilerTool"

		@@ -1679,7 +1681,7 @@
1679	1681	/>
1680	1682	</FileConfiguration>
1681	1683	<FileConfiguration
1682		- Name="Debug\|x64"
	1684	+ Name="Release\|x64"
1683	1685	>
1684	1686	<Tool
1685	1687	Name="VCCLCompilerTool"

		@@ -1688,7 +1690,7 @@
1688	1690	/>
1689	1691	</FileConfiguration>
1690	1692	<FileConfiguration
1691		- Name="Release\|x64"
	1693	+ Name="Private Debug\|Win32"
1692	1694	>
1693	1695	<Tool
1694	1696	Name="VCCLCompilerTool"

		@@ -1719,7 +1721,7 @@
1719	1721	/>
1720	1722	</FileConfiguration>
1721	1723	<FileConfiguration
1722		- Name="Debug\|Win32"
	1724	+ Name="Private Release\|x64"
1723	1725	>
1724	1726	<Tool
1725	1727	Name="VCCLCompilerTool"

		@@ -1728,7 +1730,7 @@
1728	1730	/>
1729	1731	</FileConfiguration>
1730	1732	<FileConfiguration
1731		- Name="Release\|Win32"
	1733	+ Name="Debug\|Win32"
1732	1734	>
1733	1735	<Tool
1734	1736	Name="VCCLCompilerTool"

		@@ -1737,7 +1739,7 @@
1737	1739	/>
1738	1740	</FileConfiguration>
1739	1741	<FileConfiguration
1740		- Name="Private Debug\|Win32"
	1742	+ Name="Debug\|x64"
1741	1743	>
1742	1744	<Tool
1743	1745	Name="VCCLCompilerTool"

		@@ -1746,7 +1748,7 @@
1746	1748	/>
1747	1749	</FileConfiguration>
1748	1750	<FileConfiguration
1749		- Name="Private Release\|x64"
	1751	+ Name="Release\|Win32"
1750	1752	>
1751	1753	<Tool
1752	1754	Name="VCCLCompilerTool"

		@@ -1755,7 +1757,7 @@
1755	1757	/>
1756	1758	</FileConfiguration>
1757	1759	<FileConfiguration
1758		- Name="Debug\|x64"
	1760	+ Name="Release\|x64"
1759	1761	>
1760	1762	<Tool
1761	1763	Name="VCCLCompilerTool"

		@@ -1764,7 +1766,7 @@
1764	1766	/>
1765	1767	</FileConfiguration>
1766	1768	<FileConfiguration
1767		- Name="Release\|x64"
	1769	+ Name="Private Debug\|Win32"
1768	1770	>
1769	1771	<Tool
1770	1772	Name="VCCLCompilerTool"

		@@ -1795,7 +1797,7 @@
1795	1797	/>
1796	1798	</FileConfiguration>
1797	1799	<FileConfiguration
1798		- Name="Debug\|Win32"
	1800	+ Name="Private Release\|x64"
1799	1801	>
1800	1802	<Tool
1801	1803	Name="VCCLCompilerTool"

		@@ -1804,7 +1806,7 @@
1804	1806	/>
1805	1807	</FileConfiguration>
1806	1808	<FileConfiguration
1807		- Name="Release\|Win32"
	1809	+ Name="Debug\|Win32"
1808	1810	>
1809	1811	<Tool
1810	1812	Name="VCCLCompilerTool"

		@@ -1813,7 +1815,7 @@
1813	1815	/>
1814	1816	</FileConfiguration>
1815	1817	<FileConfiguration
1816		- Name="Private Debug\|Win32"
	1818	+ Name="Debug\|x64"
1817	1819	>
1818	1820	<Tool
1819	1821	Name="VCCLCompilerTool"

		@@ -1822,7 +1824,7 @@
1822	1824	/>
1823	1825	</FileConfiguration>
1824	1826	<FileConfiguration
1825		- Name="Private Release\|x64"
	1827	+ Name="Release\|Win32"
1826	1828	>
1827	1829	<Tool
1828	1830	Name="VCCLCompilerTool"

		@@ -1831,7 +1833,7 @@
1831	1833	/>
1832	1834	</FileConfiguration>
1833	1835	<FileConfiguration
1834		- Name="Debug\|x64"
	1836	+ Name="Release\|x64"
1835	1837	>
1836	1838	<Tool
1837	1839	Name="VCCLCompilerTool"

		@@ -1840,7 +1842,7 @@
1840	1842	/>
1841	1843	</FileConfiguration>
1842	1844	<FileConfiguration
1843		- Name="Release\|x64"
	1845	+ Name="Private Debug\|Win32"
1844	1846	>
1845	1847	<Tool
1846	1848	Name="VCCLCompilerTool"

		@@ -1871,7 +1873,7 @@
1871	1873	/>
1872	1874	</FileConfiguration>
1873	1875	<FileConfiguration
1874		- Name="Debug\|Win32"
	1876	+ Name="Private Release\|x64"
1875	1877	>
1876	1878	<Tool
1877	1879	Name="VCCLCompilerTool"

		@@ -1880,7 +1882,7 @@
1880	1882	/>
1881	1883	</FileConfiguration>
1882	1884	<FileConfiguration
1883		- Name="Release\|Win32"
	1885	+ Name="Debug\|Win32"
1884	1886	>
1885	1887	<Tool
1886	1888	Name="VCCLCompilerTool"

		@@ -1889,7 +1891,7 @@
1889	1891	/>
1890	1892	</FileConfiguration>
1891	1893	<FileConfiguration
1892		- Name="Private Debug\|Win32"
	1894	+ Name="Debug\|x64"
1893	1895	>
1894	1896	<Tool
1895	1897	Name="VCCLCompilerTool"

		@@ -1898,7 +1900,7 @@
1898	1900	/>
1899	1901	</FileConfiguration>
1900	1902	<FileConfiguration
1901		- Name="Private Release\|x64"
	1903	+ Name="Release\|Win32"
1902	1904	>
1903	1905	<Tool
1904	1906	Name="VCCLCompilerTool"

		@@ -1907,7 +1909,7 @@
1907	1909	/>
1908	1910	</FileConfiguration>
1909	1911	<FileConfiguration
1910		- Name="Debug\|x64"
	1912	+ Name="Release\|x64"
1911	1913	>
1912	1914	<Tool
1913	1915	Name="VCCLCompilerTool"

		@@ -1916,7 +1918,7 @@
1916	1918	/>
1917	1919	</FileConfiguration>
1918	1920	<FileConfiguration
1919		- Name="Release\|x64"
	1921	+ Name="Private Debug\|Win32"
1920	1922	>
1921	1923	<Tool
1922	1924	Name="VCCLCompilerTool"

		@@ -1947,7 +1949,7 @@
1947	1949	/>
1948	1950	</FileConfiguration>
1949	1951	<FileConfiguration
1950		- Name="Debug\|Win32"
	1952	+ Name="Private Release\|x64"
1951	1953	>
1952	1954	<Tool
1953	1955	Name="VCCLCompilerTool"

		@@ -1956,7 +1958,7 @@
1956	1958	/>
1957	1959	</FileConfiguration>
1958	1960	<FileConfiguration
1959		- Name="Release\|Win32"
	1961	+ Name="Debug\|Win32"
1960	1962	>
1961	1963	<Tool
1962	1964	Name="VCCLCompilerTool"

		@@ -1965,7 +1967,7 @@
1965	1967	/>
1966	1968	</FileConfiguration>
1967	1969	<FileConfiguration
1968		- Name="Private Debug\|Win32"
	1970	+ Name="Debug\|x64"
1969	1971	>
1970	1972	<Tool
1971	1973	Name="VCCLCompilerTool"

		@@ -1974,7 +1976,7 @@
1974	1976	/>
1975	1977	</FileConfiguration>
1976	1978	<FileConfiguration
1977		- Name="Private Release\|x64"
	1979	+ Name="Release\|Win32"
1978	1980	>
1979	1981	<Tool
1980	1982	Name="VCCLCompilerTool"

		@@ -1983,7 +1985,7 @@
1983	1985	/>
1984	1986	</FileConfiguration>
1985	1987	<FileConfiguration
1986		- Name="Debug\|x64"
	1988	+ Name="Release\|x64"
1987	1989	>
1988	1990	<Tool
1989	1991	Name="VCCLCompilerTool"

		@@ -1992,7 +1994,7 @@
1992	1994	/>
1993	1995	</FileConfiguration>
1994	1996	<FileConfiguration
1995		- Name="Release\|x64"
	1997	+ Name="Private Debug\|Win32"
1996	1998	>
1997	1999	<Tool
1998	2000	Name="VCCLCompilerTool"

		@@ -2023,7 +2025,7 @@
2023	2025	/>
2024	2026	</FileConfiguration>
2025	2027	<FileConfiguration
2026		- Name="Debug\|Win32"
	2028	+ Name="Private Release\|x64"
2027	2029	>
2028	2030	<Tool
2029	2031	Name="VCCLCompilerTool"

		@@ -2032,7 +2034,7 @@
2032	2034	/>
2033	2035	</FileConfiguration>
2034	2036	<FileConfiguration
2035		- Name="Release\|Win32"
	2037	+ Name="Debug\|Win32"
2036	2038	>
2037	2039	<Tool
2038	2040	Name="VCCLCompilerTool"

		@@ -2041,7 +2043,7 @@
2041	2043	/>
2042	2044	</FileConfiguration>
2043	2045	<FileConfiguration
2044		- Name="Private Debug\|Win32"
	2046	+ Name="Debug\|x64"
2045	2047	>
2046	2048	<Tool
2047	2049	Name="VCCLCompilerTool"

		@@ -2050,7 +2052,7 @@
2050	2052	/>
2051	2053	</FileConfiguration>
2052	2054	<FileConfiguration
2053		- Name="Private Release\|x64"
	2055	+ Name="Release\|Win32"
2054	2056	>
2055	2057	<Tool
2056	2058	Name="VCCLCompilerTool"

		@@ -2059,7 +2061,7 @@
2059	2061	/>
2060	2062	</FileConfiguration>
2061	2063	<FileConfiguration
2062		- Name="Debug\|x64"
	2064	+ Name="Release\|x64"
2063	2065	>
2064	2066	<Tool
2065	2067	Name="VCCLCompilerTool"

		@@ -2068,7 +2070,7 @@
2068	2070	/>
2069	2071	</FileConfiguration>
2070	2072	<FileConfiguration
2071		- Name="Release\|x64"
	2073	+ Name="Private Debug\|Win32"
2072	2074	>
2073	2075	<Tool
2074	2076	Name="VCCLCompilerTool"

		@@ -2099,7 +2101,7 @@
2099	2101	/>
2100	2102	</FileConfiguration>
2101	2103	<FileConfiguration
2102		- Name="Debug\|Win32"
	2104	+ Name="Private Release\|x64"
2103	2105	>
2104	2106	<Tool
2105	2107	Name="VCCLCompilerTool"

		@@ -2108,7 +2110,7 @@
2108	2110	/>
2109	2111	</FileConfiguration>
2110	2112	<FileConfiguration
2111		- Name="Release\|Win32"
	2113	+ Name="Debug\|Win32"
2112	2114	>
2113	2115	<Tool
2114	2116	Name="VCCLCompilerTool"

		@@ -2117,7 +2119,7 @@
2117	2119	/>
2118	2120	</FileConfiguration>
2119	2121	<FileConfiguration
2120		- Name="Private Debug\|Win32"
	2122	+ Name="Debug\|x64"
2121	2123	>
2122	2124	<Tool
2123	2125	Name="VCCLCompilerTool"

		@@ -2126,7 +2128,7 @@
2126	2128	/>
2127	2129	</FileConfiguration>
2128	2130	<FileConfiguration
2129		- Name="Private Release\|x64"
	2131	+ Name="Release\|Win32"
2130	2132	>
2131	2133	<Tool
2132	2134	Name="VCCLCompilerTool"

		@@ -2135,7 +2137,7 @@
2135	2137	/>
2136	2138	</FileConfiguration>
2137	2139	<FileConfiguration
2138		- Name="Debug\|x64"
	2140	+ Name="Release\|x64"
2139	2141	>
2140	2142	<Tool
2141	2143	Name="VCCLCompilerTool"

		@@ -2144,7 +2146,7 @@
2144	2146	/>
2145	2147	</FileConfiguration>
2146	2148	<FileConfiguration
2147		- Name="Release\|x64"
	2149	+ Name="Private Debug\|Win32"
2148	2150	>
2149	2151	<Tool
2150	2152	Name="VCCLCompilerTool"

		@@ -2175,7 +2177,7 @@
2175	2177	/>
2176	2178	</FileConfiguration>
2177	2179	<FileConfiguration
2178		- Name="Debug\|Win32"
	2180	+ Name="Private Release\|x64"
2179	2181	>
2180	2182	<Tool
2181	2183	Name="VCCLCompilerTool"

		@@ -2184,7 +2186,7 @@
2184	2186	/>
2185	2187	</FileConfiguration>
2186	2188	<FileConfiguration
2187		- Name="Release\|Win32"
	2189	+ Name="Debug\|Win32"
2188	2190	>
2189	2191	<Tool
2190	2192	Name="VCCLCompilerTool"

		@@ -2193,7 +2195,7 @@
2193	2195	/>
2194	2196	</FileConfiguration>
2195	2197	<FileConfiguration
2196		- Name="Private Debug\|Win32"
	2198	+ Name="Debug\|x64"
2197	2199	>
2198	2200	<Tool
2199	2201	Name="VCCLCompilerTool"

		@@ -2202,7 +2204,7 @@
2202	2204	/>
2203	2205	</FileConfiguration>
2204	2206	<FileConfiguration
2205		- Name="Private Release\|x64"
	2207	+ Name="Release\|Win32"
2206	2208	>
2207	2209	<Tool
2208	2210	Name="VCCLCompilerTool"

		@@ -2211,7 +2213,7 @@
2211	2213	/>
2212	2214	</FileConfiguration>
2213	2215	<FileConfiguration
2214		- Name="Debug\|x64"
	2216	+ Name="Release\|x64"
2215	2217	>
2216	2218	<Tool
2217	2219	Name="VCCLCompilerTool"

		@@ -2220,7 +2222,7 @@
2220	2222	/>
2221	2223	</FileConfiguration>
2222	2224	<FileConfiguration
2223		- Name="Release\|x64"
	2225	+ Name="Private Debug\|Win32"
2224	2226	>
2225	2227	<Tool
2226	2228	Name="VCCLCompilerTool"

		@@ -2251,7 +2253,7 @@
2251	2253	/>
2252	2254	</FileConfiguration>
2253	2255	<FileConfiguration
2254		- Name="Debug\|Win32"
	2256	+ Name="Private Release\|x64"
2255	2257	>
2256	2258	<Tool
2257	2259	Name="VCCLCompilerTool"

		@@ -2260,7 +2262,7 @@
2260	2262	/>
2261	2263	</FileConfiguration>
2262	2264	<FileConfiguration
2263		- Name="Release\|Win32"
	2265	+ Name="Debug\|Win32"
2264	2266	>
2265	2267	<Tool
2266	2268	Name="VCCLCompilerTool"

		@@ -2269,7 +2271,7 @@
2269	2271	/>
2270	2272	</FileConfiguration>
2271	2273	<FileConfiguration
2272		- Name="Private Debug\|Win32"
	2274	+ Name="Debug\|x64"
2273	2275	>
2274	2276	<Tool
2275	2277	Name="VCCLCompilerTool"

		@@ -2278,7 +2280,7 @@
2278	2280	/>
2279	2281	</FileConfiguration>
2280	2282	<FileConfiguration
2281		- Name="Private Release\|x64"
	2283	+ Name="Release\|Win32"
2282	2284	>
2283	2285	<Tool
2284	2286	Name="VCCLCompilerTool"

		@@ -2287,7 +2289,7 @@
2287	2289	/>
2288	2290	</FileConfiguration>
2289	2291	<FileConfiguration
2290		- Name="Debug\|x64"
	2292	+ Name="Release\|x64"
2291	2293	>
2292	2294	<Tool
2293	2295	Name="VCCLCompilerTool"

		@@ -2296,7 +2298,7 @@
2296	2298	/>
2297	2299	</FileConfiguration>
2298	2300	<FileConfiguration
2299		- Name="Release\|x64"
	2301	+ Name="Private Debug\|Win32"
2300	2302	>
2301	2303	<Tool
2302	2304	Name="VCCLCompilerTool"

		@@ -2327,7 +2329,7 @@
2327	2329	/>
2328	2330	</FileConfiguration>
2329	2331	<FileConfiguration
2330		- Name="Debug\|Win32"
	2332	+ Name="Private Release\|x64"
2331	2333	>
2332	2334	<Tool
2333	2335	Name="VCCLCompilerTool"

		@@ -2336,7 +2338,7 @@
2336	2338	/>
2337	2339	</FileConfiguration>
2338	2340	<FileConfiguration
2339		- Name="Release\|Win32"
	2341	+ Name="Debug\|Win32"
2340	2342	>
2341	2343	<Tool
2342	2344	Name="VCCLCompilerTool"

		@@ -2345,7 +2347,7 @@
2345	2347	/>
2346	2348	</FileConfiguration>
2347	2349	<FileConfiguration
2348		- Name="Private Debug\|Win32"
	2350	+ Name="Debug\|x64"
2349	2351	>
2350	2352	<Tool
2351	2353	Name="VCCLCompilerTool"

		@@ -2354,7 +2356,7 @@
2354	2356	/>
2355	2357	</FileConfiguration>
2356	2358	<FileConfiguration
2357		- Name="Private Release\|x64"
	2359	+ Name="Release\|Win32"
2358	2360	>
2359	2361	<Tool
2360	2362	Name="VCCLCompilerTool"

		@@ -2363,7 +2365,7 @@
2363	2365	/>
2364	2366	</FileConfiguration>
2365	2367	<FileConfiguration
2366		- Name="Debug\|x64"
	2368	+ Name="Release\|x64"
2367	2369	>
2368	2370	<Tool
2369	2371	Name="VCCLCompilerTool"

		@@ -2372,7 +2374,7 @@
2372	2374	/>
2373	2375	</FileConfiguration>
2374	2376	<FileConfiguration
2375		- Name="Release\|x64"
	2377	+ Name="Private Debug\|Win32"
2376	2378	>
2377	2379	<Tool
2378	2380	Name="VCCLCompilerTool"

		@@ -2531,7 +2533,7 @@
2531	2533	/>
2532	2534	</FileConfiguration>
2533	2535	<FileConfiguration
2534		- Name="Debug\|Win32"
	2536	+ Name="Private Release\|x64"
2535	2537	>
2536	2538	<Tool
2537	2539	Name="VCCLCompilerTool"

		@@ -2540,7 +2542,7 @@
2540	2542	/>
2541	2543	</FileConfiguration>
2542	2544	<FileConfiguration
2543		- Name="Release\|Win32"
	2545	+ Name="Debug\|Win32"
2544	2546	>
2545	2547	<Tool
2546	2548	Name="VCCLCompilerTool"

		@@ -2549,7 +2551,7 @@
2549	2551	/>
2550	2552	</FileConfiguration>
2551	2553	<FileConfiguration
2552		- Name="Private Debug\|Win32"
	2554	+ Name="Debug\|x64"
2553	2555	>
2554	2556	<Tool
2555	2557	Name="VCCLCompilerTool"

		@@ -2558,7 +2560,7 @@
2558	2560	/>
2559	2561	</FileConfiguration>
2560	2562	<FileConfiguration
2561		- Name="Private Release\|x64"
	2563	+ Name="Release\|Win32"
2562	2564	>
2563	2565	<Tool
2564	2566	Name="VCCLCompilerTool"

		@@ -2567,7 +2569,7 @@
2567	2569	/>
2568	2570	</FileConfiguration>
2569	2571	<FileConfiguration
2570		- Name="Debug\|x64"
	2572	+ Name="Release\|x64"
2571	2573	>
2572	2574	<Tool
2573	2575	Name="VCCLCompilerTool"

		@@ -2576,7 +2578,7 @@
2576	2578	/>
2577	2579	</FileConfiguration>
2578	2580	<FileConfiguration
2579		- Name="Release\|x64"
	2581	+ Name="Private Debug\|Win32"
2580	2582	>
2581	2583	<Tool
2582	2584	Name="VCCLCompilerTool"

		@@ -2607,7 +2609,7 @@
2607	2609	/>
2608	2610	</FileConfiguration>
2609	2611	<FileConfiguration
2610		- Name="Debug\|Win32"
	2612	+ Name="Private Release\|x64"
2611	2613	>
2612	2614	<Tool
2613	2615	Name="VCCLCompilerTool"

		@@ -2616,7 +2618,7 @@
2616	2618	/>
2617	2619	</FileConfiguration>
2618	2620	<FileConfiguration
2619		- Name="Release\|Win32"
	2621	+ Name="Debug\|Win32"
2620	2622	>
2621	2623	<Tool
2622	2624	Name="VCCLCompilerTool"

		@@ -2625,7 +2627,7 @@
2625	2627	/>
2626	2628	</FileConfiguration>
2627	2629	<FileConfiguration
2628		- Name="Private Debug\|Win32"
	2630	+ Name="Debug\|x64"
2629	2631	>
2630	2632	<Tool
2631	2633	Name="VCCLCompilerTool"

		@@ -2634,7 +2636,7 @@
2634	2636	/>
2635	2637	</FileConfiguration>
2636	2638	<FileConfiguration
2637		- Name="Private Release\|x64"
	2639	+ Name="Release\|Win32"
2638	2640	>
2639	2641	<Tool
2640	2642	Name="VCCLCompilerTool"

		@@ -2643,7 +2645,7 @@
2643	2645	/>
2644	2646	</FileConfiguration>
2645	2647	<FileConfiguration
2646		- Name="Debug\|x64"
	2648	+ Name="Release\|x64"
2647	2649	>
2648	2650	<Tool
2649	2651	Name="VCCLCompilerTool"

		@@ -2652,7 +2654,7 @@
2652	2654	/>
2653	2655	</FileConfiguration>
2654	2656	<FileConfiguration
2655		- Name="Release\|x64"
	2657	+ Name="Private Debug\|Win32"
2656	2658	>
2657	2659	<Tool
2658	2660	Name="VCCLCompilerTool"

		@@ -2688,11 +2690,11 @@
2688	2690	</File>
2689	2691	</Filter>
2690	2692	<Filter
2691		- Name="Unix Source"
	2693	+ Name="Unix Includes"
2692	2694	>
2693	2695	</Filter>
2694	2696	<Filter
2695		- Name="Unix Includes"
	2697	+ Name="Unix Source"
2696	2698	>
2697	2699	</Filter>
2698	2700	</Files>

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc

		@@ -64,6 +64,45 @@ BEGIN
64	64	END
65	65	#endif // APSTUDIO_INVOKED
66	66
	67	+
	68	+/////////////////////////////////////////////////////////////////////////////
	69	+//
	70	+// Version
	71	+//
	72	+
	73	+VS_VERSION_INFO VERSIONINFO
	74	+ FILEVERSION 1,3,9,0
	75	+ PRODUCTVERSION 1,3,9,0
	76	+ FILEFLAGSMASK 0x17L
	77	+#ifdef _DEBUG
	78	+ FILEFLAGS 0x1L
	79	+#else
	80	+ FILEFLAGS 0x0L
	81	+#endif
	82	+ FILEOS 0x4L
	83	+ FILETYPE 0x1L
	84	+ FILESUBTYPE 0x0L
	85	+BEGIN
	86	+ BLOCK "StringFileInfo"
	87	+ BEGIN
	88	+ BLOCK "041104b0"
	89	+ BEGIN
	90	+ VALUE "CompanyName", "PeCa"
	91	+ VALUE "FileDescription", "Peercast IM"
	92	+ VALUE "FileVersion", "1, 3, 9, 0"
	93	+ VALUE "InternalName", "PeCaIM"
	94	+ VALUE "LegalCopyright", "Copyright (C) 2009"
	95	+ VALUE "OriginalFilename", "PeerCast.exe"
	96	+ VALUE "ProductName", "Peercast IM"
	97	+ VALUE "ProductVersion", "1, 3, 9, 0"
	98	+ END
	99	+ END
	100	+ BLOCK "VarFileInfo"
	101	+ BEGIN
	102	+ VALUE "Translation", 0x411, 1200
	103	+ END
	104	+END
	105	+
67	106	#endif // 日本語 resources
68	107	/////////////////////////////////////////////////////////////////////////////
69	108

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj

		@@ -376,6 +376,7 @@
376	376	BrowseInformation="1"
377	377	WarningLevel="3"
378	378	SuppressStartupBanner="true"
	379	+ Detect64BitPortabilityProblems="true"
379	380	DebugInformationFormat="3"
380	381	/>
381	382	<Tool

		@@ -721,8 +722,8 @@
721	722	/>
722	723	<Tool
723	724	Name="VCPostBuildEventTool"
724		- Description="Copy exe to program files"
725		- CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	725	+ Description="Copy exe to pimp"
	726	+ CommandLine="copy debug\peercast.exe ..\pimp\ "
726	727	/>
727	728	</Configuration>
728	729	<Configuration

		@@ -771,6 +772,7 @@
771	772	BrowseInformation="1"
772	773	WarningLevel="3"
773	774	SuppressStartupBanner="true"
	775	+ Detect64BitPortabilityProblems="true"
774	776	DebugInformationFormat="3"
775	777	/>
776	778	<Tool

		@@ -823,6 +825,7 @@
823	825	Name="VCPostBuildEventTool"
824	826	Description="Copy exe to program files"
825	827	CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	828	+ ExcludedFromBuild="true"
826	829	/>
827	830	</Configuration>
828	831	</Configurations>

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.cpp

		@@ -353,8 +353,11 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
353	353	// ステータス表示
354	354	Gdiplus::Image *img = NULL;
355	355	unsigned int nowTime = sys->getTime();
356		- Channel *ch = chanMgr->findChannelByChannelID(this->channel_id);
357		- switch(this->getStatus()){
	356	+ if (this->type != Servent::T_COUT)
	357	+ {
	358	+ // COUT以外
	359	+ Channel *ch = chanMgr->findChannelByChannelID(this->channel_id);
	360	+ switch(this->getStatus()){
358	361	case Channel::S_IDLE:
359	362	img = img_idle;
360	363	break;

		@@ -401,7 +404,13 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
401	404	default:
402	405	img = img_idle;
403	406	break;
	407	+ }
	408	+ } else
	409	+ {
	410	+ // COUT用
	411	+ img = img_broad_ok;
404	412	}
	413	+
405	414	// 描画基点
406	415	PointF origin(xx, yy);
407	416	// ステータス表示位置

		@@ -430,127 +439,146 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
430	439	strBrush = ::new SolidBrush(Color::Black);
431	440	}
432	441	}
433		- // チャンネル名表示
434		- g->SetTextRenderingHint(TextRenderingHintAntiAlias);
435		- _bstr_t bstr1(getName());
436		- // 文字描画範囲指定
437		- RectF r1(origin.X, origin.Y, 120.0f, 13.0f);
438		- StringFormat format;
439		- format.SetAlignment(StringAlignmentNear);
440		- g->DrawString(bstr1, -1, &font, r1, &format, strBrush);
441		- // 次の基点
442		- origin.X += r1.Width;
443		-
444		- //// 上流IP/リスナー数/リレー数表示
445		- //// NOTE:
446		- //// ぴあかすの動作勉強用。リリースビルドでは元のコードを使用の事。
447		- //// 文字表示範囲は幅220ぐらいでおｋ
448		- //char tmp[512]; // 表示用バッファ
449		- //char hostip[256]; // IPアドレスバッファ
450		- //chDisp.uphost.toStr(hostip); // 上流IP
451		- //sprintf(tmp, "%d/%d - [%d/%d] - %s",
452		- // getTotalListeners(),
453		- // getTotalRelays(),
454		- // getLocalListeners(),
455		- // getLocalRelays(),
456		- // hostip
457		- // );
458		-
459		- // リスナー数/リレー数表示
460		- char tmp[256];
461		- sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());
462		- _bstr_t bstr2(tmp);
463		- // 文字表示範囲指定
464		- RectF r2(origin.X, origin.Y, 100.0f, 13.0f);
465		- format.SetAlignment(StringAlignmentCenter);
466		- g->DrawString(bstr2, -1, &font, r2, &format, strBrush);
467		- // 次の基点
468		- origin.X += r2.Width;
469		-
470		- // bps表示
471		- Font *f;
472		- if (isStayConnected()){
473		- f = ::new Font(L"Arial", 9.0f, FontStyleItalic\|FontStyleBold, UnitPoint);
474		- } else {
475		- f = ::new Font(L"Arial", 9.0f);
476		- }
477		- sprintf(tmp, "%dkbps", getBitRate());
478		- _bstr_t bstr3(tmp);
479		- format.SetAlignment(StringAlignmentFar);
480		- // 文字表示範囲指定
481		- RectF r3(origin.X, origin.Y, 80.0f, 13.0f);
482		- g->DrawString(bstr3, -1, f, r3, &format, strBrush);
483		- // フォント開放
484		- ::delete f;
485		-
486		- // 次の基点
487		- origin.X += r3.Width;
488		-
489		- // ブラシ削除
490		- ::delete strBrush;
491	442
492		-
493		- // Servent表示
494		- if (!openFlg){
495		- int count = getServentCount();
496		- // Servent表示部の背景を白にする
497		- SolidBrush b(Color(160,255,255,255));
498		- g->FillRectangle(&b, (INT)origin.X, (INT)origin.Y, 14*count, 14);
499		-
500		- sd = serventDataTop;
501		- int index = 0;
502		- while(sd){
503		- SolidBrush *serventBrush;
504		- if (sd->getInfoFlg()){
505		- ChanHit *hit = sd->getChanHit();
506		- if (hit->firewalled){
507		- SolidBrush bb(Color(180,255,0,0));
508		- g->FillRectangle(&bb, (INT)origin.X + 14*index, (INT)origin.Y, 14, 14);
509		- }
510		- if (hit->relay){
511		- // リレーＯＫ
512		- serventBrush = ::new SolidBrush(Color::Green);
513		- } else {
514		- // リレー不可
515		- if (hit->numRelays){
516		- // リレー一杯
517		- serventBrush = ::new SolidBrush(Color::Blue);
	443	+ if (this->type != Servent::T_COUT)
	444	+ {
	445	+ // COUT以外
	446	+
	447	+ // チャンネル名表示
	448	+ g->SetTextRenderingHint(TextRenderingHintAntiAlias);
	449	+ _bstr_t bstr1(getName());
	450	+ // 文字描画範囲指定
	451	+ RectF r1(origin.X, origin.Y, 120.0f, 13.0f);
	452	+ StringFormat format;
	453	+ format.SetAlignment(StringAlignmentNear);
	454	+ g->DrawString(bstr1, -1, &font, r1, &format, strBrush);
	455	+ // 次の基点
	456	+ origin.X += r1.Width;
	457	+
	458	+ //// 上流IP/リスナー数/リレー数表示
	459	+ //// NOTE:
	460	+ //// ぴあかすの動作勉強用。リリースビルドでは元のコードを使用の事。
	461	+ //// 文字表示範囲は幅220ぐらいでおｋ
	462	+ //char tmp[512]; // 表示用バッファ
	463	+ //char hostip[256]; // IPアドレスバッファ
	464	+ //chDisp.uphost.toStr(hostip); // 上流IP
	465	+ //sprintf(tmp, "%d/%d - [%d/%d] - %s",
	466	+ // getTotalListeners(),
	467	+ // getTotalRelays(),
	468	+ // getLocalListeners(),
	469	+ // getLocalRelays(),
	470	+ // hostip
	471	+ // );
	472	+
	473	+ // リスナー数/リレー数表示
	474	+ char tmp[256];
	475	+ sprintf(tmp, "%d/%d - [%d/%d]", getTotalListeners(), getTotalRelays(), getLocalListeners(), getLocalRelays());
	476	+ _bstr_t bstr2(tmp);
	477	+ // 文字表示範囲指定
	478	+ RectF r2(origin.X, origin.Y, 100.0f, 13.0f);
	479	+ format.SetAlignment(StringAlignmentCenter);
	480	+ g->DrawString(bstr2, -1, &font, r2, &format, strBrush);
	481	+ // 次の基点
	482	+ origin.X += r2.Width;
	483	+
	484	+ // bps表示
	485	+ Font *f;
	486	+ if (isStayConnected()){
	487	+ f = ::new Font(L"Arial", 9.0f, FontStyleItalic\|FontStyleBold, UnitPoint);
	488	+ } else {
	489	+ f = ::new Font(L"Arial", 9.0f);
	490	+ }
	491	+ sprintf(tmp, "%dkbps", getBitRate());
	492	+ _bstr_t bstr3(tmp);
	493	+ format.SetAlignment(StringAlignmentFar);
	494	+ // 文字表示範囲指定
	495	+ RectF r3(origin.X, origin.Y, 80.0f, 13.0f);
	496	+ g->DrawString(bstr3, -1, f, r3, &format, strBrush);
	497	+ // フォント開放
	498	+ ::delete f;
	499	+
	500	+ // 次の基点
	501	+ origin.X += r3.Width;
	502	+
	503	+ // ブラシ削除
	504	+ ::delete strBrush;
	505	+
	506	+
	507	+ // Servent表示
	508	+ if (!openFlg){
	509	+ int count = getServentCount();
	510	+ // Servent表示部の背景を白にする
	511	+ SolidBrush b(Color(160,255,255,255));
	512	+ g->FillRectangle(&b, (INT)origin.X, (INT)origin.Y, 14*count, 14);
	513	+
	514	+ sd = serventDataTop;
	515	+ int index = 0;
	516	+ while(sd){
	517	+ SolidBrush *serventBrush;
	518	+ if (sd->getInfoFlg()){
	519	+ ChanHit *hit = sd->getChanHit();
	520	+ if (hit->firewalled){
	521	+ SolidBrush bb(Color(180,255,0,0));
	522	+ g->FillRectangle(&bb, (INT)origin.X + 14*index, (INT)origin.Y, 14, 14);
	523	+ }
	524	+ if (hit->relay){
	525	+ // リレーＯＫ
	526	+ serventBrush = ::new SolidBrush(Color::Green);
518	527	} else {
519		- // リレーなし
520		- serventBrush = ::new SolidBrush(Color::Purple);
	528	+ // リレー不可
	529	+ if (hit->numRelays){
	530	+ // リレー一杯
	531	+ serventBrush = ::new SolidBrush(Color::Blue);
	532	+ } else {
	533	+ // リレーなし
	534	+ serventBrush = ::new SolidBrush(Color::Purple);
	535	+ }
521	536	}
	537	+ } else {
	538	+ // 情報なし
	539	+ serventBrush = ::new SolidBrush(Color::Black);
522	540	}
523		- } else {
524		- // 情報なし
525		- serventBrush = ::new SolidBrush(Color::Black);
526		- }
527		- // 四角描画
528		- backGra->FillRectangle(serventBrush, (INT)origin.X + index*14 + 1, (INT)origin.Y + 1, 12, 12);
	541	+ // 四角描画
	542	+ backGra->FillRectangle(serventBrush, (INT)origin.X + index*14 + 1, (INT)origin.Y + 1, 12, 12);
529	543
530		- ::delete serventBrush;
531		- sd = sd->getNextData();
532		- index++;
	544	+ ::delete serventBrush;
	545	+ sd = sd->getNextData();
	546	+ index++;
	547	+ }
533	548	}
534		- }
535	549
536		- // 次の基点
537		- origin.Y += 15;
	550	+ // 次の基点
	551	+ origin.Y += 15;
538	552
539		- // サイズを保存
540		- setWidth((int)origin.X - posX);
541		- setHeight((int)origin.Y - posY);
	553	+ // サイズを保存
	554	+ setWidth((int)origin.X - posX);
	555	+ setHeight((int)origin.Y - posY);
542	556
543		- // ServentData表示
544		- sd = serventDataTop;
545		- while(sd){
546		- if (openFlg \|\| sd->getSelected()){
547		- sd->drawServent(g, (INT)x+12, (INT)origin.Y);
548		- // 次の基点
549		- origin.Y += 15;
	557	+ // ServentData表示
	558	+ sd = serventDataTop;
	559	+ while(sd){
	560	+ if (openFlg \|\| sd->getSelected()){
	561	+ sd->drawServent(g, (INT)x+12, (INT)origin.Y);
	562	+ // 次の基点
	563	+ origin.Y += 15;
	564	+ }
	565	+ sd = sd->getNextData();
550	566	}
551		- sd = sd->getNextData();
	567	+ } else
	568	+ {
	569	+ // COUT
	570	+ g->SetTextRenderingHint(TextRenderingHintAntiAlias);
	571	+ RectF r1(origin.X, origin.Y, 120.0f+100.0f+80.0f, 13.0f);
	572	+ origin.X += r1.Width;
	573	+ StringFormat format;
	574	+ format.SetAlignment(StringAlignmentNear);
	575	+ _bstr_t bstr1("COUT");
	576	+ g->DrawString(bstr1, -1, &font, r1, &format, strBrush);
	577	+ ::delete strBrush;
	578	+ origin.Y += 15;
	579	+ setWidth((int)origin.X - posX);
	580	+ setHeight((int)origin.Y - posY);
552	581	}
553		-
554	582
555	583	return (int)(origin.Y);
556	584	}

		@@ -881,6 +909,90 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
881	909	c = c->next;
882	910	}
883	911
	912	+#if 1
	913	+ // COUTを検索
	914	+ {
	915	+ bool foundFlg = false;
	916	+ bool foundFlg2 = false;
	917	+ Servent *s = servMgr->servents;
	918	+ while (s)
	919	+ {
	920	+ if (s->type == Servent::T_COUT && s->status == Servent::S_CONNECTED)
	921	+ {
	922	+ foundFlg = true;
	923	+
	924	+ // ChannelData末尾まで探索
	925	+ ChannelData *prev = NULL;
	926	+ cd = channelDataTop;
	927	+ while (cd)
	928	+ {
	929	+ if (cd->type == Servent::T_COUT && cd->servent_id == s->servent_id)
	930	+ {
	931	+ foundFlg2 = true;
	932	+ cd->setEnableFlg(true);
	933	+ break;
	934	+ }
	935	+ prev = cd;
	936	+ cd = cd->getNextData();
	937	+ }
	938	+ cd = prev;
	939	+
	940	+ if (foundFlg2)
	941	+ break;
	942	+
	943	+ // ノード追加
	944	+ if (channelDataTop)
	945	+ {
	946	+ // channelDataが空でない。cdはここでリスト末尾を指してる（はず）
	947	+ cd->setNextData(::new ChannelData());
	948	+ cd = cd->getNextData();
	949	+ memset(cd, 0, sizeof(cd));
	950	+ cd->setNextData(NULL);
	951	+ } else
	952	+ {
	953	+ // channelDataが空
	954	+ channelDataTop = ::new ChannelData();
	955	+ channelDataTop->setNextData(NULL);
	956	+ cd = channelDataTop;
	957	+ }
	958	+
	959	+ // データ設定
	960	+ cd->type = s->type;
	961	+ cd->servent_id = s->servent_id;
	962	+ cd->setEnableFlg(true);
	963	+ }
	964	+
	965	+ s = s->next;
	966	+ }
	967	+
	968	+ // COUTが切れてたら削除
	969	+ if (!foundFlg)
	970	+ {
	971	+ cd = channelDataTop;
	972	+ ChannelData *prev = NULL;
	973	+ while (cd)
	974	+ {
	975	+ // COUTの情報を削除
	976	+ if (cd->type == Servent::T_COUT)
	977	+ {
	978	+ // 先頭
	979	+ if (!prev)
	980	+ {
	981	+ channelDataTop = cd->getNextData();
	982	+ } else
	983	+ {
	984	+ prev->setNextData(cd->getNextData());
	985	+ }
	986	+ //::delete cd;
	987	+ }
	988	+
	989	+ prev = cd;
	990	+ cd = cd->getNextData();
	991	+ }
	992	+ }
	993	+ }
	994	+#endif
	995	+
884	996	// チャンネルがなくなっている場合の処理
885	997	cd = channelDataTop;
886	998	ChannelData *prev = NULL;

		@@ -892,6 +1004,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
892	1004	next = cd->getNextData();
893	1005	if (!prev){
894	1006	// 先頭のデータを削除
	1007	+ // ここメモリリークしそう by えるー
895	1008	channelDataTop = next;
896	1009	} else {
897	1010	// 途中のデータを削除

		@@ -1192,6 +1305,11 @@ void PopupServentMenu(int servent_id){
1192	1305	ServentData *sd = NULL;
1193	1306	ChannelData *cd = channelDataTop;
1194	1307	while(cd){
	1308	+ // COUT
	1309	+ if (cd->type == Servent::T_COUT
	1310	+ && cd->servent_id == servent_id)
	1311	+ break;
	1312	+
1195	1313	sd = cd->findServentData(servent_id);
1196	1314	if (sd){
1197	1315	break;

		@@ -1199,7 +1317,9 @@ void PopupServentMenu(int servent_id){
1199	1317	cd = cd->getNextData();
1200	1318	}
1201	1319
1202		- if (cd == NULL \|\| sd == NULL){
	1320	+ if (cd == NULL \|\| sd == NULL
	1321	+ && cd->type != Servent::T_COUT) // COUT
	1322	+ {
1203	1323	return;
1204	1324	}
1205	1325

		@@ -1216,6 +1336,11 @@ void PopupServentMenu(int servent_id){
1216	1336
1217	1337	cd = channelDataTop;
1218	1338	while(cd){
	1339	+ // COUT
	1340	+ if (cd->type == Servent::T_COUT
	1341	+ && cd->servent_id == servent_id)
	1342	+ break;
	1343	+
1219	1344	sd = cd->findServentData(servent_id);
1220	1345	if (sd){
1221	1346	break;

		@@ -1223,7 +1348,9 @@ void PopupServentMenu(int servent_id){
1223	1348	cd = cd->getNextData();
1224	1349	}
1225	1350
1226		- if (cd == NULL \|\| sd == NULL){
	1351	+ if (cd == NULL \|\| sd == NULL
	1352	+ && cd->type != Servent::T_COUT) // COUT
	1353	+ {
1227	1354	return;
1228	1355	}
1229	1356

		@@ -1236,6 +1363,11 @@ void PopupServentMenu(int servent_id){
1236	1363	switch(dwID){
1237	1364	case 1001: // 切断
1238	1365	s->thread.active = false;
	1366	+
	1367	+ // COUT切断
	1368	+ if (s->type == Servent::T_COUT)
	1369	+ s->thread.finish = true;
	1370	+
1239	1371	break;
1240	1372
1241	1373	}

		@@ -1558,6 +1690,14 @@ void WmRButtonDownProc(HWND hwnd, LPARAM lParam){
1558	1690	cd->setSelected(TRUE);
1559	1691	channel_id = cd->getChannelId();
1560	1692	channel_selected = TRUE;
	1693	+
	1694	+ // COUT識別
	1695	+ if (cd->type == Servent::T_COUT)
	1696	+ {
	1697	+ channel_selected = FALSE;
	1698	+ servent_selected = TRUE;
	1699	+ servent_id = cd->servent_id;
	1700	+ }
1561	1701	} else {
1562	1702	if (cd->isSelected()){
1563	1703	changeFlg = TRUE;

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.h

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/gui.h

		@@ -22,6 +22,7 @@
22	22	#include "sys.h"
23	23	#include "gdiplus.h"
24	24	#include "channel.h"
	25	+#include "servent.h"
25	26
26	27	extern LRESULT CALLBACK GUIProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
27	28	extern void ADDLOG(const char str,int id,bool sel,void data, LogBuffer::TYPE type);

		@@ -175,6 +176,8 @@ public:
175	176	selected = FALSE;
176	177	serventDataTop = NULL;
177	178	openFlg = FALSE;
	179	+ type = Servent::T_NONE;
	180	+ servent_id = -1;
178	181	}
179	182	int drawChannel(Gdiplus::Graphics *g, int x, int y);
180	183

		@@ -219,6 +222,9 @@ public:
219	222	int getServentCount();
220	223
221	224	bool checkDown(int x, int y);
	225	+
	226	+ Servent::TYPE type; // COUTのサーバント情報保持用
	227	+ int servent_id; // 同上。channel_idで代用できたけどPublicにしたくない
222	228	};
223	229
224	230

Show on old repository browser