• R/O
  • HTTP
  • SSH
  • HTTPS

PeerCastIM: Commit


Commit MetaInfo

Revisão9a85fa5ff6dfb059e5f0f0e182930eb46a640deb (tree)
Hora2009-09-28 00:42:36
Autoreru <eru01@user...>
Commitereru

Mensagem de Log

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

Mudança Sumário

Diff

--- 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,...)
279279
280280 write(fmt,ap);
281281
282+ // special thanks: 名無しの誰か
283+ va_end(ap);
284+
282285 if (writeCRLF)
283286 write("\r\n",2);
284287 else
285288 write("\n",1);
286-
287- va_end(ap);
288289 }
289290
290291 // -------------------------------------
--- 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
4444 #if 1 /* for VP extend version */
4545 //#define VERSION_EX 1
4646 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)";
5050
51-static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
51+static const char *PCP_CLIENT_DIST_URL = "http://pecaim.net/";
5252 #endif
5353
5454 // ------------------------------------------------
--- a/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
+++ b/PeerCast.root/PeerCast/core/win32/lib/corelib.vcproj
@@ -97,9 +97,9 @@
9797 />
9898 </Configuration>
9999 <Configuration
100- Name="Debug|Win32"
101- OutputDirectory=".\Debug"
102- IntermediateDirectory=".\Debug"
100+ Name="Private Release|x64"
101+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
102+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
103103 ConfigurationType="4"
104104 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
105105 UseOfMFC="0"
@@ -120,29 +120,30 @@
120120 />
121121 <Tool
122122 Name="VCMIDLTool"
123+ TargetEnvironment="3"
123124 />
124125 <Tool
125126 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/"
136138 WarningLevel="3"
137139 SuppressStartupBanner="true"
138- DebugInformationFormat="4"
139140 />
140141 <Tool
141142 Name="VCManagedResourceCompilerTool"
142143 />
143144 <Tool
144145 Name="VCResourceCompilerTool"
145- PreprocessorDefinitions="_DEBUG"
146+ PreprocessorDefinitions="NDEBUG"
146147 Culture="1033"
147148 />
148149 <Tool
@@ -150,7 +151,7 @@
150151 />
151152 <Tool
152153 Name="VCLibrarianTool"
153- OutputFile=".\Debug\corelib.lib"
154+ OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
154155 SuppressStartupBanner="true"
155156 />
156157 <Tool
@@ -162,7 +163,7 @@
162163 <Tool
163164 Name="VCBscMakeTool"
164165 SuppressStartupBanner="true"
165- OutputFile=".\Debug/corelib.bsc"
166+ OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
166167 />
167168 <Tool
168169 Name="VCFxCopTool"
@@ -172,15 +173,14 @@
172173 />
173174 </Configuration>
174175 <Configuration
175- Name="Release|Win32"
176- OutputDirectory=".\Release"
177- IntermediateDirectory=".\Release"
176+ Name="Debug|Win32"
177+ OutputDirectory=".\Debug"
178+ IntermediateDirectory=".\Debug"
178179 ConfigurationType="4"
179180 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
180181 UseOfMFC="0"
181182 ATLMinimizesCRunTimeLibraryUsage="false"
182183 CharacterSet="2"
183- WholeProgramOptimization="1"
184184 >
185185 <Tool
186186 Name="VCPreBuildEventTool"
@@ -199,30 +199,26 @@
199199 />
200200 <Tool
201201 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/"
216212 WarningLevel="3"
217213 SuppressStartupBanner="true"
218- DebugInformationFormat="3"
214+ DebugInformationFormat="4"
219215 />
220216 <Tool
221217 Name="VCManagedResourceCompilerTool"
222218 />
223219 <Tool
224220 Name="VCResourceCompilerTool"
225- PreprocessorDefinitions="NDEBUG"
221+ PreprocessorDefinitions="_DEBUG"
226222 Culture="1033"
227223 />
228224 <Tool
@@ -230,7 +226,7 @@
230226 />
231227 <Tool
232228 Name="VCLibrarianTool"
233- OutputFile=".\Release\corelib.lib"
229+ OutputFile=".\Debug\corelib.lib"
234230 SuppressStartupBanner="true"
235231 />
236232 <Tool
@@ -242,7 +238,7 @@
242238 <Tool
243239 Name="VCBscMakeTool"
244240 SuppressStartupBanner="true"
245- OutputFile=".\Release/corelib.bsc"
241+ OutputFile=".\Debug/corelib.bsc"
246242 />
247243 <Tool
248244 Name="VCFxCopTool"
@@ -252,9 +248,9 @@
252248 />
253249 </Configuration>
254250 <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)"
258254 ConfigurationType="4"
259255 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
260256 UseOfMFC="0"
@@ -275,22 +271,24 @@
275271 />
276272 <Tool
277273 Name="VCMIDLTool"
274+ TargetEnvironment="3"
278275 />
279276 <Tool
280277 Name="VCCLCompilerTool"
281278 Optimization="0"
282- AdditionalIncludeDirectories="../../,../../common"
283- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PRIVATE_BROADCASTER"
279+ AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
280+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
284281 MinimalRebuild="true"
285282 BasicRuntimeChecks="3"
286283 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/"
291288 WarningLevel="3"
292289 SuppressStartupBanner="true"
293- DebugInformationFormat="4"
290+ Detect64BitPortabilityProblems="true"
291+ DebugInformationFormat="3"
294292 />
295293 <Tool
296294 Name="VCManagedResourceCompilerTool"
@@ -305,7 +303,7 @@
305303 />
306304 <Tool
307305 Name="VCLibrarianTool"
308- OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
306+ OutputFile=".\Debug\corelib.lib"
309307 SuppressStartupBanner="true"
310308 />
311309 <Tool
@@ -317,7 +315,7 @@
317315 <Tool
318316 Name="VCBscMakeTool"
319317 SuppressStartupBanner="true"
320- OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
318+ OutputFile=".\Debug/corelib.bsc"
321319 />
322320 <Tool
323321 Name="VCFxCopTool"
@@ -327,14 +325,15 @@
327325 />
328326 </Configuration>
329327 <Configuration
330- Name="Private Release|x64"
331- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
332- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
328+ Name="Release|Win32"
329+ OutputDirectory=".\Release"
330+ IntermediateDirectory=".\Release"
333331 ConfigurationType="4"
334332 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
335333 UseOfMFC="0"
336334 ATLMinimizesCRunTimeLibraryUsage="false"
337335 CharacterSet="2"
336+ WholeProgramOptimization="1"
338337 >
339338 <Tool
340339 Name="VCPreBuildEventTool"
@@ -350,23 +349,26 @@
350349 />
351350 <Tool
352351 Name="VCMIDLTool"
353- TargetEnvironment="3"
354352 />
355353 <Tool
356354 Name="VCCLCompilerTool"
357355 Optimization="2"
358- InlineFunctionExpansion="1"
356+ InlineFunctionExpansion="2"
357+ EnableIntrinsicFunctions="true"
358+ FavorSizeOrSpeed="1"
359+ EnableFiberSafeOptimizations="true"
359360 AdditionalIncludeDirectories="../../,../../common"
360- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PRIVATE_BROADCASTER"
361+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
361362 StringPooling="true"
362363 RuntimeLibrary="0"
363364 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/"
368369 WarningLevel="3"
369370 SuppressStartupBanner="true"
371+ DebugInformationFormat="3"
370372 />
371373 <Tool
372374 Name="VCManagedResourceCompilerTool"
@@ -381,7 +383,7 @@
381383 />
382384 <Tool
383385 Name="VCLibrarianTool"
384- OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
386+ OutputFile=".\Release\corelib.lib"
385387 SuppressStartupBanner="true"
386388 />
387389 <Tool
@@ -393,7 +395,7 @@
393395 <Tool
394396 Name="VCBscMakeTool"
395397 SuppressStartupBanner="true"
396- OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
398+ OutputFile=".\Release/corelib.bsc"
397399 />
398400 <Tool
399401 Name="VCFxCopTool"
@@ -403,7 +405,7 @@
403405 />
404406 </Configuration>
405407 <Configuration
406- Name="Debug|x64"
408+ Name="Release|x64"
407409 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
408410 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
409411 ConfigurationType="4"
@@ -411,6 +413,7 @@
411413 UseOfMFC="0"
412414 ATLMinimizesCRunTimeLibraryUsage="false"
413415 CharacterSet="2"
416+ WholeProgramOptimization="1"
414417 >
415418 <Tool
416419 Name="VCPreBuildEventTool"
@@ -430,18 +433,23 @@
430433 />
431434 <Tool
432435 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/"
443450 WarningLevel="3"
444451 SuppressStartupBanner="true"
452+ Detect64BitPortabilityProblems="true"
445453 DebugInformationFormat="3"
446454 />
447455 <Tool
@@ -449,7 +457,7 @@
449457 />
450458 <Tool
451459 Name="VCResourceCompilerTool"
452- PreprocessorDefinitions="_DEBUG"
460+ PreprocessorDefinitions="NDEBUG"
453461 Culture="1033"
454462 />
455463 <Tool
@@ -457,7 +465,7 @@
457465 />
458466 <Tool
459467 Name="VCLibrarianTool"
460- OutputFile=".\Debug\corelib.lib"
468+ OutputFile=".\Release\corelib.lib"
461469 SuppressStartupBanner="true"
462470 />
463471 <Tool
@@ -469,7 +477,7 @@
469477 <Tool
470478 Name="VCBscMakeTool"
471479 SuppressStartupBanner="true"
472- OutputFile=".\Debug/corelib.bsc"
480+ OutputFile=".\Release/corelib.bsc"
473481 />
474482 <Tool
475483 Name="VCFxCopTool"
@@ -479,15 +487,14 @@
479487 />
480488 </Configuration>
481489 <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"
485493 ConfigurationType="4"
486494 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
487495 UseOfMFC="0"
488496 ATLMinimizesCRunTimeLibraryUsage="false"
489497 CharacterSet="2"
490- WholeProgramOptimization="1"
491498 >
492499 <Tool
493500 Name="VCPreBuildEventTool"
@@ -503,34 +510,29 @@
503510 />
504511 <Tool
505512 Name="VCMIDLTool"
506- TargetEnvironment="3"
507513 />
508514 <Tool
509515 Name="VCCLCompilerTool"
510- Optimization="2"
511- InlineFunctionExpansion="2"
512- EnableIntrinsicFunctions="true"
513- FavorSizeOrSpeed="1"
514- EnableFiberSafeOptimizations="true"
516+ Optimization="0"
515517 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/"
524526 WarningLevel="3"
525527 SuppressStartupBanner="true"
526- DebugInformationFormat="3"
528+ DebugInformationFormat="4"
527529 />
528530 <Tool
529531 Name="VCManagedResourceCompilerTool"
530532 />
531533 <Tool
532534 Name="VCResourceCompilerTool"
533- PreprocessorDefinitions="NDEBUG"
535+ PreprocessorDefinitions="_DEBUG"
534536 Culture="1033"
535537 />
536538 <Tool
@@ -538,7 +540,7 @@
538540 />
539541 <Tool
540542 Name="VCLibrarianTool"
541- OutputFile=".\Release\corelib.lib"
543+ OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
542544 SuppressStartupBanner="true"
543545 />
544546 <Tool
@@ -550,7 +552,7 @@
550552 <Tool
551553 Name="VCBscMakeTool"
552554 SuppressStartupBanner="true"
553- OutputFile=".\Release/corelib.bsc"
555+ OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
554556 />
555557 <Tool
556558 Name="VCFxCopTool"
@@ -655,7 +657,7 @@
655657 />
656658 </FileConfiguration>
657659 <FileConfiguration
658- Name="Debug|Win32"
660+ Name="Private Release|x64"
659661 >
660662 <Tool
661663 Name="VCCLCompilerTool"
@@ -664,7 +666,7 @@
664666 />
665667 </FileConfiguration>
666668 <FileConfiguration
667- Name="Release|Win32"
669+ Name="Debug|Win32"
668670 >
669671 <Tool
670672 Name="VCCLCompilerTool"
@@ -673,7 +675,7 @@
673675 />
674676 </FileConfiguration>
675677 <FileConfiguration
676- Name="Private Debug|Win32"
678+ Name="Debug|x64"
677679 >
678680 <Tool
679681 Name="VCCLCompilerTool"
@@ -682,7 +684,7 @@
682684 />
683685 </FileConfiguration>
684686 <FileConfiguration
685- Name="Private Release|x64"
687+ Name="Release|Win32"
686688 >
687689 <Tool
688690 Name="VCCLCompilerTool"
@@ -691,7 +693,7 @@
691693 />
692694 </FileConfiguration>
693695 <FileConfiguration
694- Name="Debug|x64"
696+ Name="Release|x64"
695697 >
696698 <Tool
697699 Name="VCCLCompilerTool"
@@ -700,7 +702,7 @@
700702 />
701703 </FileConfiguration>
702704 <FileConfiguration
703- Name="Release|x64"
705+ Name="Private Debug|Win32"
704706 >
705707 <Tool
706708 Name="VCCLCompilerTool"
@@ -731,7 +733,7 @@
731733 />
732734 </FileConfiguration>
733735 <FileConfiguration
734- Name="Debug|Win32"
736+ Name="Private Release|x64"
735737 >
736738 <Tool
737739 Name="VCCLCompilerTool"
@@ -740,7 +742,7 @@
740742 />
741743 </FileConfiguration>
742744 <FileConfiguration
743- Name="Release|Win32"
745+ Name="Debug|Win32"
744746 >
745747 <Tool
746748 Name="VCCLCompilerTool"
@@ -749,7 +751,7 @@
749751 />
750752 </FileConfiguration>
751753 <FileConfiguration
752- Name="Private Debug|Win32"
754+ Name="Debug|x64"
753755 >
754756 <Tool
755757 Name="VCCLCompilerTool"
@@ -758,7 +760,7 @@
758760 />
759761 </FileConfiguration>
760762 <FileConfiguration
761- Name="Private Release|x64"
763+ Name="Release|Win32"
762764 >
763765 <Tool
764766 Name="VCCLCompilerTool"
@@ -767,7 +769,7 @@
767769 />
768770 </FileConfiguration>
769771 <FileConfiguration
770- Name="Debug|x64"
772+ Name="Release|x64"
771773 >
772774 <Tool
773775 Name="VCCLCompilerTool"
@@ -776,7 +778,7 @@
776778 />
777779 </FileConfiguration>
778780 <FileConfiguration
779- Name="Release|x64"
781+ Name="Private Debug|Win32"
780782 >
781783 <Tool
782784 Name="VCCLCompilerTool"
@@ -807,7 +809,7 @@
807809 />
808810 </FileConfiguration>
809811 <FileConfiguration
810- Name="Debug|Win32"
812+ Name="Private Release|x64"
811813 >
812814 <Tool
813815 Name="VCCLCompilerTool"
@@ -816,7 +818,7 @@
816818 />
817819 </FileConfiguration>
818820 <FileConfiguration
819- Name="Release|Win32"
821+ Name="Debug|Win32"
820822 >
821823 <Tool
822824 Name="VCCLCompilerTool"
@@ -825,7 +827,7 @@
825827 />
826828 </FileConfiguration>
827829 <FileConfiguration
828- Name="Private Debug|Win32"
830+ Name="Debug|x64"
829831 >
830832 <Tool
831833 Name="VCCLCompilerTool"
@@ -834,7 +836,7 @@
834836 />
835837 </FileConfiguration>
836838 <FileConfiguration
837- Name="Private Release|x64"
839+ Name="Release|Win32"
838840 >
839841 <Tool
840842 Name="VCCLCompilerTool"
@@ -843,7 +845,7 @@
843845 />
844846 </FileConfiguration>
845847 <FileConfiguration
846- Name="Debug|x64"
848+ Name="Release|x64"
847849 >
848850 <Tool
849851 Name="VCCLCompilerTool"
@@ -852,7 +854,7 @@
852854 />
853855 </FileConfiguration>
854856 <FileConfiguration
855- Name="Release|x64"
857+ Name="Private Debug|Win32"
856858 >
857859 <Tool
858860 Name="VCCLCompilerTool"
@@ -883,7 +885,7 @@
883885 />
884886 </FileConfiguration>
885887 <FileConfiguration
886- Name="Debug|Win32"
888+ Name="Private Release|x64"
887889 >
888890 <Tool
889891 Name="VCCLCompilerTool"
@@ -892,7 +894,7 @@
892894 />
893895 </FileConfiguration>
894896 <FileConfiguration
895- Name="Release|Win32"
897+ Name="Debug|Win32"
896898 >
897899 <Tool
898900 Name="VCCLCompilerTool"
@@ -901,7 +903,7 @@
901903 />
902904 </FileConfiguration>
903905 <FileConfiguration
904- Name="Private Debug|Win32"
906+ Name="Debug|x64"
905907 >
906908 <Tool
907909 Name="VCCLCompilerTool"
@@ -910,7 +912,7 @@
910912 />
911913 </FileConfiguration>
912914 <FileConfiguration
913- Name="Private Release|x64"
915+ Name="Release|Win32"
914916 >
915917 <Tool
916918 Name="VCCLCompilerTool"
@@ -919,7 +921,7 @@
919921 />
920922 </FileConfiguration>
921923 <FileConfiguration
922- Name="Debug|x64"
924+ Name="Release|x64"
923925 >
924926 <Tool
925927 Name="VCCLCompilerTool"
@@ -928,7 +930,7 @@
928930 />
929931 </FileConfiguration>
930932 <FileConfiguration
931- Name="Release|x64"
933+ Name="Private Debug|Win32"
932934 >
933935 <Tool
934936 Name="VCCLCompilerTool"
@@ -959,7 +961,7 @@
959961 />
960962 </FileConfiguration>
961963 <FileConfiguration
962- Name="Debug|Win32"
964+ Name="Private Release|x64"
963965 >
964966 <Tool
965967 Name="VCCLCompilerTool"
@@ -968,7 +970,7 @@
968970 />
969971 </FileConfiguration>
970972 <FileConfiguration
971- Name="Release|Win32"
973+ Name="Debug|Win32"
972974 >
973975 <Tool
974976 Name="VCCLCompilerTool"
@@ -977,7 +979,7 @@
977979 />
978980 </FileConfiguration>
979981 <FileConfiguration
980- Name="Private Debug|Win32"
982+ Name="Debug|x64"
981983 >
982984 <Tool
983985 Name="VCCLCompilerTool"
@@ -986,7 +988,7 @@
986988 />
987989 </FileConfiguration>
988990 <FileConfiguration
989- Name="Private Release|x64"
991+ Name="Release|Win32"
990992 >
991993 <Tool
992994 Name="VCCLCompilerTool"
@@ -995,7 +997,7 @@
995997 />
996998 </FileConfiguration>
997999 <FileConfiguration
998- Name="Debug|x64"
1000+ Name="Release|x64"
9991001 >
10001002 <Tool
10011003 Name="VCCLCompilerTool"
@@ -1004,7 +1006,7 @@
10041006 />
10051007 </FileConfiguration>
10061008 <FileConfiguration
1007- Name="Release|x64"
1009+ Name="Private Debug|Win32"
10081010 >
10091011 <Tool
10101012 Name="VCCLCompilerTool"
@@ -1035,7 +1037,7 @@
10351037 />
10361038 </FileConfiguration>
10371039 <FileConfiguration
1038- Name="Debug|Win32"
1040+ Name="Private Release|x64"
10391041 >
10401042 <Tool
10411043 Name="VCCLCompilerTool"
@@ -1044,7 +1046,7 @@
10441046 />
10451047 </FileConfiguration>
10461048 <FileConfiguration
1047- Name="Release|Win32"
1049+ Name="Debug|Win32"
10481050 >
10491051 <Tool
10501052 Name="VCCLCompilerTool"
@@ -1053,7 +1055,7 @@
10531055 />
10541056 </FileConfiguration>
10551057 <FileConfiguration
1056- Name="Private Debug|Win32"
1058+ Name="Debug|x64"
10571059 >
10581060 <Tool
10591061 Name="VCCLCompilerTool"
@@ -1062,7 +1064,7 @@
10621064 />
10631065 </FileConfiguration>
10641066 <FileConfiguration
1065- Name="Private Release|x64"
1067+ Name="Release|Win32"
10661068 >
10671069 <Tool
10681070 Name="VCCLCompilerTool"
@@ -1071,7 +1073,7 @@
10711073 />
10721074 </FileConfiguration>
10731075 <FileConfiguration
1074- Name="Debug|x64"
1076+ Name="Release|x64"
10751077 >
10761078 <Tool
10771079 Name="VCCLCompilerTool"
@@ -1080,7 +1082,7 @@
10801082 />
10811083 </FileConfiguration>
10821084 <FileConfiguration
1083- Name="Release|x64"
1085+ Name="Private Debug|Win32"
10841086 >
10851087 <Tool
10861088 Name="VCCLCompilerTool"
@@ -1111,7 +1113,7 @@
11111113 />
11121114 </FileConfiguration>
11131115 <FileConfiguration
1114- Name="Debug|Win32"
1116+ Name="Private Release|x64"
11151117 >
11161118 <Tool
11171119 Name="VCCLCompilerTool"
@@ -1120,7 +1122,7 @@
11201122 />
11211123 </FileConfiguration>
11221124 <FileConfiguration
1123- Name="Release|Win32"
1125+ Name="Debug|Win32"
11241126 >
11251127 <Tool
11261128 Name="VCCLCompilerTool"
@@ -1129,7 +1131,7 @@
11291131 />
11301132 </FileConfiguration>
11311133 <FileConfiguration
1132- Name="Private Debug|Win32"
1134+ Name="Debug|x64"
11331135 >
11341136 <Tool
11351137 Name="VCCLCompilerTool"
@@ -1138,7 +1140,7 @@
11381140 />
11391141 </FileConfiguration>
11401142 <FileConfiguration
1141- Name="Private Release|x64"
1143+ Name="Release|Win32"
11421144 >
11431145 <Tool
11441146 Name="VCCLCompilerTool"
@@ -1147,7 +1149,7 @@
11471149 />
11481150 </FileConfiguration>
11491151 <FileConfiguration
1150- Name="Debug|x64"
1152+ Name="Release|x64"
11511153 >
11521154 <Tool
11531155 Name="VCCLCompilerTool"
@@ -1156,7 +1158,7 @@
11561158 />
11571159 </FileConfiguration>
11581160 <FileConfiguration
1159- Name="Release|x64"
1161+ Name="Private Debug|Win32"
11601162 >
11611163 <Tool
11621164 Name="VCCLCompilerTool"
@@ -1187,7 +1189,7 @@
11871189 />
11881190 </FileConfiguration>
11891191 <FileConfiguration
1190- Name="Debug|Win32"
1192+ Name="Private Release|x64"
11911193 >
11921194 <Tool
11931195 Name="VCCLCompilerTool"
@@ -1196,7 +1198,7 @@
11961198 />
11971199 </FileConfiguration>
11981200 <FileConfiguration
1199- Name="Release|Win32"
1201+ Name="Debug|Win32"
12001202 >
12011203 <Tool
12021204 Name="VCCLCompilerTool"
@@ -1205,7 +1207,7 @@
12051207 />
12061208 </FileConfiguration>
12071209 <FileConfiguration
1208- Name="Private Debug|Win32"
1210+ Name="Debug|x64"
12091211 >
12101212 <Tool
12111213 Name="VCCLCompilerTool"
@@ -1214,7 +1216,7 @@
12141216 />
12151217 </FileConfiguration>
12161218 <FileConfiguration
1217- Name="Private Release|x64"
1219+ Name="Release|Win32"
12181220 >
12191221 <Tool
12201222 Name="VCCLCompilerTool"
@@ -1223,7 +1225,7 @@
12231225 />
12241226 </FileConfiguration>
12251227 <FileConfiguration
1226- Name="Debug|x64"
1228+ Name="Release|x64"
12271229 >
12281230 <Tool
12291231 Name="VCCLCompilerTool"
@@ -1232,7 +1234,7 @@
12321234 />
12331235 </FileConfiguration>
12341236 <FileConfiguration
1235- Name="Release|x64"
1237+ Name="Private Debug|Win32"
12361238 >
12371239 <Tool
12381240 Name="VCCLCompilerTool"
@@ -1263,7 +1265,7 @@
12631265 />
12641266 </FileConfiguration>
12651267 <FileConfiguration
1266- Name="Debug|Win32"
1268+ Name="Private Release|x64"
12671269 >
12681270 <Tool
12691271 Name="VCCLCompilerTool"
@@ -1272,7 +1274,7 @@
12721274 />
12731275 </FileConfiguration>
12741276 <FileConfiguration
1275- Name="Release|Win32"
1277+ Name="Debug|Win32"
12761278 >
12771279 <Tool
12781280 Name="VCCLCompilerTool"
@@ -1281,7 +1283,7 @@
12811283 />
12821284 </FileConfiguration>
12831285 <FileConfiguration
1284- Name="Private Debug|Win32"
1286+ Name="Debug|x64"
12851287 >
12861288 <Tool
12871289 Name="VCCLCompilerTool"
@@ -1290,7 +1292,7 @@
12901292 />
12911293 </FileConfiguration>
12921294 <FileConfiguration
1293- Name="Private Release|x64"
1295+ Name="Release|Win32"
12941296 >
12951297 <Tool
12961298 Name="VCCLCompilerTool"
@@ -1299,7 +1301,7 @@
12991301 />
13001302 </FileConfiguration>
13011303 <FileConfiguration
1302- Name="Debug|x64"
1304+ Name="Release|x64"
13031305 >
13041306 <Tool
13051307 Name="VCCLCompilerTool"
@@ -1308,7 +1310,7 @@
13081310 />
13091311 </FileConfiguration>
13101312 <FileConfiguration
1311- Name="Release|x64"
1313+ Name="Private Debug|Win32"
13121314 >
13131315 <Tool
13141316 Name="VCCLCompilerTool"
@@ -1339,7 +1341,7 @@
13391341 />
13401342 </FileConfiguration>
13411343 <FileConfiguration
1342- Name="Debug|Win32"
1344+ Name="Private Release|x64"
13431345 >
13441346 <Tool
13451347 Name="VCCLCompilerTool"
@@ -1348,7 +1350,7 @@
13481350 />
13491351 </FileConfiguration>
13501352 <FileConfiguration
1351- Name="Release|Win32"
1353+ Name="Debug|Win32"
13521354 >
13531355 <Tool
13541356 Name="VCCLCompilerTool"
@@ -1357,7 +1359,7 @@
13571359 />
13581360 </FileConfiguration>
13591361 <FileConfiguration
1360- Name="Private Debug|Win32"
1362+ Name="Debug|x64"
13611363 >
13621364 <Tool
13631365 Name="VCCLCompilerTool"
@@ -1366,7 +1368,7 @@
13661368 />
13671369 </FileConfiguration>
13681370 <FileConfiguration
1369- Name="Private Release|x64"
1371+ Name="Release|Win32"
13701372 >
13711373 <Tool
13721374 Name="VCCLCompilerTool"
@@ -1375,7 +1377,7 @@
13751377 />
13761378 </FileConfiguration>
13771379 <FileConfiguration
1378- Name="Debug|x64"
1380+ Name="Release|x64"
13791381 >
13801382 <Tool
13811383 Name="VCCLCompilerTool"
@@ -1384,7 +1386,7 @@
13841386 />
13851387 </FileConfiguration>
13861388 <FileConfiguration
1387- Name="Release|x64"
1389+ Name="Private Debug|Win32"
13881390 >
13891391 <Tool
13901392 Name="VCCLCompilerTool"
@@ -1415,7 +1417,7 @@
14151417 />
14161418 </FileConfiguration>
14171419 <FileConfiguration
1418- Name="Debug|Win32"
1420+ Name="Private Release|x64"
14191421 >
14201422 <Tool
14211423 Name="VCCLCompilerTool"
@@ -1424,7 +1426,7 @@
14241426 />
14251427 </FileConfiguration>
14261428 <FileConfiguration
1427- Name="Release|Win32"
1429+ Name="Debug|Win32"
14281430 >
14291431 <Tool
14301432 Name="VCCLCompilerTool"
@@ -1433,7 +1435,7 @@
14331435 />
14341436 </FileConfiguration>
14351437 <FileConfiguration
1436- Name="Private Debug|Win32"
1438+ Name="Debug|x64"
14371439 >
14381440 <Tool
14391441 Name="VCCLCompilerTool"
@@ -1442,7 +1444,7 @@
14421444 />
14431445 </FileConfiguration>
14441446 <FileConfiguration
1445- Name="Private Release|x64"
1447+ Name="Release|Win32"
14461448 >
14471449 <Tool
14481450 Name="VCCLCompilerTool"
@@ -1451,7 +1453,7 @@
14511453 />
14521454 </FileConfiguration>
14531455 <FileConfiguration
1454- Name="Debug|x64"
1456+ Name="Release|x64"
14551457 >
14561458 <Tool
14571459 Name="VCCLCompilerTool"
@@ -1460,7 +1462,7 @@
14601462 />
14611463 </FileConfiguration>
14621464 <FileConfiguration
1463- Name="Release|x64"
1465+ Name="Private Debug|Win32"
14641466 >
14651467 <Tool
14661468 Name="VCCLCompilerTool"
@@ -1491,7 +1493,7 @@
14911493 />
14921494 </FileConfiguration>
14931495 <FileConfiguration
1494- Name="Debug|Win32"
1496+ Name="Private Release|x64"
14951497 >
14961498 <Tool
14971499 Name="VCCLCompilerTool"
@@ -1500,7 +1502,7 @@
15001502 />
15011503 </FileConfiguration>
15021504 <FileConfiguration
1503- Name="Release|Win32"
1505+ Name="Debug|Win32"
15041506 >
15051507 <Tool
15061508 Name="VCCLCompilerTool"
@@ -1509,7 +1511,7 @@
15091511 />
15101512 </FileConfiguration>
15111513 <FileConfiguration
1512- Name="Private Debug|Win32"
1514+ Name="Debug|x64"
15131515 >
15141516 <Tool
15151517 Name="VCCLCompilerTool"
@@ -1518,7 +1520,7 @@
15181520 />
15191521 </FileConfiguration>
15201522 <FileConfiguration
1521- Name="Private Release|x64"
1523+ Name="Release|Win32"
15221524 >
15231525 <Tool
15241526 Name="VCCLCompilerTool"
@@ -1527,7 +1529,7 @@
15271529 />
15281530 </FileConfiguration>
15291531 <FileConfiguration
1530- Name="Debug|x64"
1532+ Name="Release|x64"
15311533 >
15321534 <Tool
15331535 Name="VCCLCompilerTool"
@@ -1536,7 +1538,7 @@
15361538 />
15371539 </FileConfiguration>
15381540 <FileConfiguration
1539- Name="Release|x64"
1541+ Name="Private Debug|Win32"
15401542 >
15411543 <Tool
15421544 Name="VCCLCompilerTool"
@@ -1567,7 +1569,7 @@
15671569 />
15681570 </FileConfiguration>
15691571 <FileConfiguration
1570- Name="Debug|Win32"
1572+ Name="Private Release|x64"
15711573 >
15721574 <Tool
15731575 Name="VCCLCompilerTool"
@@ -1576,7 +1578,7 @@
15761578 />
15771579 </FileConfiguration>
15781580 <FileConfiguration
1579- Name="Release|Win32"
1581+ Name="Debug|Win32"
15801582 >
15811583 <Tool
15821584 Name="VCCLCompilerTool"
@@ -1585,7 +1587,7 @@
15851587 />
15861588 </FileConfiguration>
15871589 <FileConfiguration
1588- Name="Private Debug|Win32"
1590+ Name="Debug|x64"
15891591 >
15901592 <Tool
15911593 Name="VCCLCompilerTool"
@@ -1594,7 +1596,7 @@
15941596 />
15951597 </FileConfiguration>
15961598 <FileConfiguration
1597- Name="Private Release|x64"
1599+ Name="Release|Win32"
15981600 >
15991601 <Tool
16001602 Name="VCCLCompilerTool"
@@ -1603,7 +1605,7 @@
16031605 />
16041606 </FileConfiguration>
16051607 <FileConfiguration
1606- Name="Debug|x64"
1608+ Name="Release|x64"
16071609 >
16081610 <Tool
16091611 Name="VCCLCompilerTool"
@@ -1612,7 +1614,7 @@
16121614 />
16131615 </FileConfiguration>
16141616 <FileConfiguration
1615- Name="Release|x64"
1617+ Name="Private Debug|Win32"
16161618 >
16171619 <Tool
16181620 Name="VCCLCompilerTool"
@@ -1643,7 +1645,7 @@
16431645 />
16441646 </FileConfiguration>
16451647 <FileConfiguration
1646- Name="Debug|Win32"
1648+ Name="Private Release|x64"
16471649 >
16481650 <Tool
16491651 Name="VCCLCompilerTool"
@@ -1652,7 +1654,7 @@
16521654 />
16531655 </FileConfiguration>
16541656 <FileConfiguration
1655- Name="Release|Win32"
1657+ Name="Debug|Win32"
16561658 >
16571659 <Tool
16581660 Name="VCCLCompilerTool"
@@ -1661,7 +1663,7 @@
16611663 />
16621664 </FileConfiguration>
16631665 <FileConfiguration
1664- Name="Private Debug|Win32"
1666+ Name="Debug|x64"
16651667 >
16661668 <Tool
16671669 Name="VCCLCompilerTool"
@@ -1670,7 +1672,7 @@
16701672 />
16711673 </FileConfiguration>
16721674 <FileConfiguration
1673- Name="Private Release|x64"
1675+ Name="Release|Win32"
16741676 >
16751677 <Tool
16761678 Name="VCCLCompilerTool"
@@ -1679,7 +1681,7 @@
16791681 />
16801682 </FileConfiguration>
16811683 <FileConfiguration
1682- Name="Debug|x64"
1684+ Name="Release|x64"
16831685 >
16841686 <Tool
16851687 Name="VCCLCompilerTool"
@@ -1688,7 +1690,7 @@
16881690 />
16891691 </FileConfiguration>
16901692 <FileConfiguration
1691- Name="Release|x64"
1693+ Name="Private Debug|Win32"
16921694 >
16931695 <Tool
16941696 Name="VCCLCompilerTool"
@@ -1719,7 +1721,7 @@
17191721 />
17201722 </FileConfiguration>
17211723 <FileConfiguration
1722- Name="Debug|Win32"
1724+ Name="Private Release|x64"
17231725 >
17241726 <Tool
17251727 Name="VCCLCompilerTool"
@@ -1728,7 +1730,7 @@
17281730 />
17291731 </FileConfiguration>
17301732 <FileConfiguration
1731- Name="Release|Win32"
1733+ Name="Debug|Win32"
17321734 >
17331735 <Tool
17341736 Name="VCCLCompilerTool"
@@ -1737,7 +1739,7 @@
17371739 />
17381740 </FileConfiguration>
17391741 <FileConfiguration
1740- Name="Private Debug|Win32"
1742+ Name="Debug|x64"
17411743 >
17421744 <Tool
17431745 Name="VCCLCompilerTool"
@@ -1746,7 +1748,7 @@
17461748 />
17471749 </FileConfiguration>
17481750 <FileConfiguration
1749- Name="Private Release|x64"
1751+ Name="Release|Win32"
17501752 >
17511753 <Tool
17521754 Name="VCCLCompilerTool"
@@ -1755,7 +1757,7 @@
17551757 />
17561758 </FileConfiguration>
17571759 <FileConfiguration
1758- Name="Debug|x64"
1760+ Name="Release|x64"
17591761 >
17601762 <Tool
17611763 Name="VCCLCompilerTool"
@@ -1764,7 +1766,7 @@
17641766 />
17651767 </FileConfiguration>
17661768 <FileConfiguration
1767- Name="Release|x64"
1769+ Name="Private Debug|Win32"
17681770 >
17691771 <Tool
17701772 Name="VCCLCompilerTool"
@@ -1795,7 +1797,7 @@
17951797 />
17961798 </FileConfiguration>
17971799 <FileConfiguration
1798- Name="Debug|Win32"
1800+ Name="Private Release|x64"
17991801 >
18001802 <Tool
18011803 Name="VCCLCompilerTool"
@@ -1804,7 +1806,7 @@
18041806 />
18051807 </FileConfiguration>
18061808 <FileConfiguration
1807- Name="Release|Win32"
1809+ Name="Debug|Win32"
18081810 >
18091811 <Tool
18101812 Name="VCCLCompilerTool"
@@ -1813,7 +1815,7 @@
18131815 />
18141816 </FileConfiguration>
18151817 <FileConfiguration
1816- Name="Private Debug|Win32"
1818+ Name="Debug|x64"
18171819 >
18181820 <Tool
18191821 Name="VCCLCompilerTool"
@@ -1822,7 +1824,7 @@
18221824 />
18231825 </FileConfiguration>
18241826 <FileConfiguration
1825- Name="Private Release|x64"
1827+ Name="Release|Win32"
18261828 >
18271829 <Tool
18281830 Name="VCCLCompilerTool"
@@ -1831,7 +1833,7 @@
18311833 />
18321834 </FileConfiguration>
18331835 <FileConfiguration
1834- Name="Debug|x64"
1836+ Name="Release|x64"
18351837 >
18361838 <Tool
18371839 Name="VCCLCompilerTool"
@@ -1840,7 +1842,7 @@
18401842 />
18411843 </FileConfiguration>
18421844 <FileConfiguration
1843- Name="Release|x64"
1845+ Name="Private Debug|Win32"
18441846 >
18451847 <Tool
18461848 Name="VCCLCompilerTool"
@@ -1871,7 +1873,7 @@
18711873 />
18721874 </FileConfiguration>
18731875 <FileConfiguration
1874- Name="Debug|Win32"
1876+ Name="Private Release|x64"
18751877 >
18761878 <Tool
18771879 Name="VCCLCompilerTool"
@@ -1880,7 +1882,7 @@
18801882 />
18811883 </FileConfiguration>
18821884 <FileConfiguration
1883- Name="Release|Win32"
1885+ Name="Debug|Win32"
18841886 >
18851887 <Tool
18861888 Name="VCCLCompilerTool"
@@ -1889,7 +1891,7 @@
18891891 />
18901892 </FileConfiguration>
18911893 <FileConfiguration
1892- Name="Private Debug|Win32"
1894+ Name="Debug|x64"
18931895 >
18941896 <Tool
18951897 Name="VCCLCompilerTool"
@@ -1898,7 +1900,7 @@
18981900 />
18991901 </FileConfiguration>
19001902 <FileConfiguration
1901- Name="Private Release|x64"
1903+ Name="Release|Win32"
19021904 >
19031905 <Tool
19041906 Name="VCCLCompilerTool"
@@ -1907,7 +1909,7 @@
19071909 />
19081910 </FileConfiguration>
19091911 <FileConfiguration
1910- Name="Debug|x64"
1912+ Name="Release|x64"
19111913 >
19121914 <Tool
19131915 Name="VCCLCompilerTool"
@@ -1916,7 +1918,7 @@
19161918 />
19171919 </FileConfiguration>
19181920 <FileConfiguration
1919- Name="Release|x64"
1921+ Name="Private Debug|Win32"
19201922 >
19211923 <Tool
19221924 Name="VCCLCompilerTool"
@@ -1947,7 +1949,7 @@
19471949 />
19481950 </FileConfiguration>
19491951 <FileConfiguration
1950- Name="Debug|Win32"
1952+ Name="Private Release|x64"
19511953 >
19521954 <Tool
19531955 Name="VCCLCompilerTool"
@@ -1956,7 +1958,7 @@
19561958 />
19571959 </FileConfiguration>
19581960 <FileConfiguration
1959- Name="Release|Win32"
1961+ Name="Debug|Win32"
19601962 >
19611963 <Tool
19621964 Name="VCCLCompilerTool"
@@ -1965,7 +1967,7 @@
19651967 />
19661968 </FileConfiguration>
19671969 <FileConfiguration
1968- Name="Private Debug|Win32"
1970+ Name="Debug|x64"
19691971 >
19701972 <Tool
19711973 Name="VCCLCompilerTool"
@@ -1974,7 +1976,7 @@
19741976 />
19751977 </FileConfiguration>
19761978 <FileConfiguration
1977- Name="Private Release|x64"
1979+ Name="Release|Win32"
19781980 >
19791981 <Tool
19801982 Name="VCCLCompilerTool"
@@ -1983,7 +1985,7 @@
19831985 />
19841986 </FileConfiguration>
19851987 <FileConfiguration
1986- Name="Debug|x64"
1988+ Name="Release|x64"
19871989 >
19881990 <Tool
19891991 Name="VCCLCompilerTool"
@@ -1992,7 +1994,7 @@
19921994 />
19931995 </FileConfiguration>
19941996 <FileConfiguration
1995- Name="Release|x64"
1997+ Name="Private Debug|Win32"
19961998 >
19971999 <Tool
19982000 Name="VCCLCompilerTool"
@@ -2023,7 +2025,7 @@
20232025 />
20242026 </FileConfiguration>
20252027 <FileConfiguration
2026- Name="Debug|Win32"
2028+ Name="Private Release|x64"
20272029 >
20282030 <Tool
20292031 Name="VCCLCompilerTool"
@@ -2032,7 +2034,7 @@
20322034 />
20332035 </FileConfiguration>
20342036 <FileConfiguration
2035- Name="Release|Win32"
2037+ Name="Debug|Win32"
20362038 >
20372039 <Tool
20382040 Name="VCCLCompilerTool"
@@ -2041,7 +2043,7 @@
20412043 />
20422044 </FileConfiguration>
20432045 <FileConfiguration
2044- Name="Private Debug|Win32"
2046+ Name="Debug|x64"
20452047 >
20462048 <Tool
20472049 Name="VCCLCompilerTool"
@@ -2050,7 +2052,7 @@
20502052 />
20512053 </FileConfiguration>
20522054 <FileConfiguration
2053- Name="Private Release|x64"
2055+ Name="Release|Win32"
20542056 >
20552057 <Tool
20562058 Name="VCCLCompilerTool"
@@ -2059,7 +2061,7 @@
20592061 />
20602062 </FileConfiguration>
20612063 <FileConfiguration
2062- Name="Debug|x64"
2064+ Name="Release|x64"
20632065 >
20642066 <Tool
20652067 Name="VCCLCompilerTool"
@@ -2068,7 +2070,7 @@
20682070 />
20692071 </FileConfiguration>
20702072 <FileConfiguration
2071- Name="Release|x64"
2073+ Name="Private Debug|Win32"
20722074 >
20732075 <Tool
20742076 Name="VCCLCompilerTool"
@@ -2099,7 +2101,7 @@
20992101 />
21002102 </FileConfiguration>
21012103 <FileConfiguration
2102- Name="Debug|Win32"
2104+ Name="Private Release|x64"
21032105 >
21042106 <Tool
21052107 Name="VCCLCompilerTool"
@@ -2108,7 +2110,7 @@
21082110 />
21092111 </FileConfiguration>
21102112 <FileConfiguration
2111- Name="Release|Win32"
2113+ Name="Debug|Win32"
21122114 >
21132115 <Tool
21142116 Name="VCCLCompilerTool"
@@ -2117,7 +2119,7 @@
21172119 />
21182120 </FileConfiguration>
21192121 <FileConfiguration
2120- Name="Private Debug|Win32"
2122+ Name="Debug|x64"
21212123 >
21222124 <Tool
21232125 Name="VCCLCompilerTool"
@@ -2126,7 +2128,7 @@
21262128 />
21272129 </FileConfiguration>
21282130 <FileConfiguration
2129- Name="Private Release|x64"
2131+ Name="Release|Win32"
21302132 >
21312133 <Tool
21322134 Name="VCCLCompilerTool"
@@ -2135,7 +2137,7 @@
21352137 />
21362138 </FileConfiguration>
21372139 <FileConfiguration
2138- Name="Debug|x64"
2140+ Name="Release|x64"
21392141 >
21402142 <Tool
21412143 Name="VCCLCompilerTool"
@@ -2144,7 +2146,7 @@
21442146 />
21452147 </FileConfiguration>
21462148 <FileConfiguration
2147- Name="Release|x64"
2149+ Name="Private Debug|Win32"
21482150 >
21492151 <Tool
21502152 Name="VCCLCompilerTool"
@@ -2175,7 +2177,7 @@
21752177 />
21762178 </FileConfiguration>
21772179 <FileConfiguration
2178- Name="Debug|Win32"
2180+ Name="Private Release|x64"
21792181 >
21802182 <Tool
21812183 Name="VCCLCompilerTool"
@@ -2184,7 +2186,7 @@
21842186 />
21852187 </FileConfiguration>
21862188 <FileConfiguration
2187- Name="Release|Win32"
2189+ Name="Debug|Win32"
21882190 >
21892191 <Tool
21902192 Name="VCCLCompilerTool"
@@ -2193,7 +2195,7 @@
21932195 />
21942196 </FileConfiguration>
21952197 <FileConfiguration
2196- Name="Private Debug|Win32"
2198+ Name="Debug|x64"
21972199 >
21982200 <Tool
21992201 Name="VCCLCompilerTool"
@@ -2202,7 +2204,7 @@
22022204 />
22032205 </FileConfiguration>
22042206 <FileConfiguration
2205- Name="Private Release|x64"
2207+ Name="Release|Win32"
22062208 >
22072209 <Tool
22082210 Name="VCCLCompilerTool"
@@ -2211,7 +2213,7 @@
22112213 />
22122214 </FileConfiguration>
22132215 <FileConfiguration
2214- Name="Debug|x64"
2216+ Name="Release|x64"
22152217 >
22162218 <Tool
22172219 Name="VCCLCompilerTool"
@@ -2220,7 +2222,7 @@
22202222 />
22212223 </FileConfiguration>
22222224 <FileConfiguration
2223- Name="Release|x64"
2225+ Name="Private Debug|Win32"
22242226 >
22252227 <Tool
22262228 Name="VCCLCompilerTool"
@@ -2251,7 +2253,7 @@
22512253 />
22522254 </FileConfiguration>
22532255 <FileConfiguration
2254- Name="Debug|Win32"
2256+ Name="Private Release|x64"
22552257 >
22562258 <Tool
22572259 Name="VCCLCompilerTool"
@@ -2260,7 +2262,7 @@
22602262 />
22612263 </FileConfiguration>
22622264 <FileConfiguration
2263- Name="Release|Win32"
2265+ Name="Debug|Win32"
22642266 >
22652267 <Tool
22662268 Name="VCCLCompilerTool"
@@ -2269,7 +2271,7 @@
22692271 />
22702272 </FileConfiguration>
22712273 <FileConfiguration
2272- Name="Private Debug|Win32"
2274+ Name="Debug|x64"
22732275 >
22742276 <Tool
22752277 Name="VCCLCompilerTool"
@@ -2278,7 +2280,7 @@
22782280 />
22792281 </FileConfiguration>
22802282 <FileConfiguration
2281- Name="Private Release|x64"
2283+ Name="Release|Win32"
22822284 >
22832285 <Tool
22842286 Name="VCCLCompilerTool"
@@ -2287,7 +2289,7 @@
22872289 />
22882290 </FileConfiguration>
22892291 <FileConfiguration
2290- Name="Debug|x64"
2292+ Name="Release|x64"
22912293 >
22922294 <Tool
22932295 Name="VCCLCompilerTool"
@@ -2296,7 +2298,7 @@
22962298 />
22972299 </FileConfiguration>
22982300 <FileConfiguration
2299- Name="Release|x64"
2301+ Name="Private Debug|Win32"
23002302 >
23012303 <Tool
23022304 Name="VCCLCompilerTool"
@@ -2327,7 +2329,7 @@
23272329 />
23282330 </FileConfiguration>
23292331 <FileConfiguration
2330- Name="Debug|Win32"
2332+ Name="Private Release|x64"
23312333 >
23322334 <Tool
23332335 Name="VCCLCompilerTool"
@@ -2336,7 +2338,7 @@
23362338 />
23372339 </FileConfiguration>
23382340 <FileConfiguration
2339- Name="Release|Win32"
2341+ Name="Debug|Win32"
23402342 >
23412343 <Tool
23422344 Name="VCCLCompilerTool"
@@ -2345,7 +2347,7 @@
23452347 />
23462348 </FileConfiguration>
23472349 <FileConfiguration
2348- Name="Private Debug|Win32"
2350+ Name="Debug|x64"
23492351 >
23502352 <Tool
23512353 Name="VCCLCompilerTool"
@@ -2354,7 +2356,7 @@
23542356 />
23552357 </FileConfiguration>
23562358 <FileConfiguration
2357- Name="Private Release|x64"
2359+ Name="Release|Win32"
23582360 >
23592361 <Tool
23602362 Name="VCCLCompilerTool"
@@ -2363,7 +2365,7 @@
23632365 />
23642366 </FileConfiguration>
23652367 <FileConfiguration
2366- Name="Debug|x64"
2368+ Name="Release|x64"
23672369 >
23682370 <Tool
23692371 Name="VCCLCompilerTool"
@@ -2372,7 +2374,7 @@
23722374 />
23732375 </FileConfiguration>
23742376 <FileConfiguration
2375- Name="Release|x64"
2377+ Name="Private Debug|Win32"
23762378 >
23772379 <Tool
23782380 Name="VCCLCompilerTool"
@@ -2531,7 +2533,7 @@
25312533 />
25322534 </FileConfiguration>
25332535 <FileConfiguration
2534- Name="Debug|Win32"
2536+ Name="Private Release|x64"
25352537 >
25362538 <Tool
25372539 Name="VCCLCompilerTool"
@@ -2540,7 +2542,7 @@
25402542 />
25412543 </FileConfiguration>
25422544 <FileConfiguration
2543- Name="Release|Win32"
2545+ Name="Debug|Win32"
25442546 >
25452547 <Tool
25462548 Name="VCCLCompilerTool"
@@ -2549,7 +2551,7 @@
25492551 />
25502552 </FileConfiguration>
25512553 <FileConfiguration
2552- Name="Private Debug|Win32"
2554+ Name="Debug|x64"
25532555 >
25542556 <Tool
25552557 Name="VCCLCompilerTool"
@@ -2558,7 +2560,7 @@
25582560 />
25592561 </FileConfiguration>
25602562 <FileConfiguration
2561- Name="Private Release|x64"
2563+ Name="Release|Win32"
25622564 >
25632565 <Tool
25642566 Name="VCCLCompilerTool"
@@ -2567,7 +2569,7 @@
25672569 />
25682570 </FileConfiguration>
25692571 <FileConfiguration
2570- Name="Debug|x64"
2572+ Name="Release|x64"
25712573 >
25722574 <Tool
25732575 Name="VCCLCompilerTool"
@@ -2576,7 +2578,7 @@
25762578 />
25772579 </FileConfiguration>
25782580 <FileConfiguration
2579- Name="Release|x64"
2581+ Name="Private Debug|Win32"
25802582 >
25812583 <Tool
25822584 Name="VCCLCompilerTool"
@@ -2607,7 +2609,7 @@
26072609 />
26082610 </FileConfiguration>
26092611 <FileConfiguration
2610- Name="Debug|Win32"
2612+ Name="Private Release|x64"
26112613 >
26122614 <Tool
26132615 Name="VCCLCompilerTool"
@@ -2616,7 +2618,7 @@
26162618 />
26172619 </FileConfiguration>
26182620 <FileConfiguration
2619- Name="Release|Win32"
2621+ Name="Debug|Win32"
26202622 >
26212623 <Tool
26222624 Name="VCCLCompilerTool"
@@ -2625,7 +2627,7 @@
26252627 />
26262628 </FileConfiguration>
26272629 <FileConfiguration
2628- Name="Private Debug|Win32"
2630+ Name="Debug|x64"
26292631 >
26302632 <Tool
26312633 Name="VCCLCompilerTool"
@@ -2634,7 +2636,7 @@
26342636 />
26352637 </FileConfiguration>
26362638 <FileConfiguration
2637- Name="Private Release|x64"
2639+ Name="Release|Win32"
26382640 >
26392641 <Tool
26402642 Name="VCCLCompilerTool"
@@ -2643,7 +2645,7 @@
26432645 />
26442646 </FileConfiguration>
26452647 <FileConfiguration
2646- Name="Debug|x64"
2648+ Name="Release|x64"
26472649 >
26482650 <Tool
26492651 Name="VCCLCompilerTool"
@@ -2652,7 +2654,7 @@
26522654 />
26532655 </FileConfiguration>
26542656 <FileConfiguration
2655- Name="Release|x64"
2657+ Name="Private Debug|Win32"
26562658 >
26572659 <Tool
26582660 Name="VCCLCompilerTool"
@@ -2688,11 +2690,11 @@
26882690 </File>
26892691 </Filter>
26902692 <Filter
2691- Name="Unix Source"
2693+ Name="Unix Includes"
26922694 >
26932695 </Filter>
26942696 <Filter
2695- Name="Unix Includes"
2697+ Name="Unix Source"
26962698 >
26972699 </Filter>
26982700 </Files>
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
@@ -64,6 +64,45 @@ BEGIN
6464 END
6565 #endif // APSTUDIO_INVOKED
6666
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+
67106 #endif // 日本語 resources
68107 /////////////////////////////////////////////////////////////////////////////
69108
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -376,6 +376,7 @@
376376 BrowseInformation="1"
377377 WarningLevel="3"
378378 SuppressStartupBanner="true"
379+ Detect64BitPortabilityProblems="true"
379380 DebugInformationFormat="3"
380381 />
381382 <Tool
@@ -721,8 +722,8 @@
721722 />
722723 <Tool
723724 Name="VCPostBuildEventTool"
724- Description="Copy exe to program files"
725- CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
725+ Description="Copy exe to pimp"
726+ CommandLine="copy debug\peercast.exe ..\pimp\&#x0D;&#x0A;"
726727 />
727728 </Configuration>
728729 <Configuration
@@ -771,6 +772,7 @@
771772 BrowseInformation="1"
772773 WarningLevel="3"
773774 SuppressStartupBanner="true"
775+ Detect64BitPortabilityProblems="true"
774776 DebugInformationFormat="3"
775777 />
776778 <Tool
@@ -823,6 +825,7 @@
823825 Name="VCPostBuildEventTool"
824826 Description="Copy exe to program files"
825827 CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
828+ ExcludedFromBuild="true"
826829 />
827830 </Configuration>
828831 </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){
353353 // ステータス表示
354354 Gdiplus::Image *img = NULL;
355355 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()){
358361 case Channel::S_IDLE:
359362 img = img_idle;
360363 break;
@@ -401,7 +404,13 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
401404 default:
402405 img = img_idle;
403406 break;
407+ }
408+ } else
409+ {
410+ // COUT用
411+ img = img_broad_ok;
404412 }
413+
405414 // 描画基点
406415 PointF origin(xx, yy);
407416 // ステータス表示位置
@@ -430,127 +439,146 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
430439 strBrush = ::new SolidBrush(Color::Black);
431440 }
432441 }
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ぐらいでおk
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;
491442
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- // リレーOK
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ぐらいでおk
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+ // リレーOK
526+ serventBrush = ::new SolidBrush(Color::Green);
518527 } 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+ }
521536 }
537+ } else {
538+ // 情報なし
539+ serventBrush = ::new SolidBrush(Color::Black);
522540 }
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);
529543
530- ::delete serventBrush;
531- sd = sd->getNextData();
532- index++;
544+ ::delete serventBrush;
545+ sd = sd->getNextData();
546+ index++;
547+ }
533548 }
534- }
535549
536- // 次の基点
537- origin.Y += 15;
550+ // 次の基点
551+ origin.Y += 15;
538552
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);
542556
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();
550566 }
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);
552581 }
553-
554582
555583 return (int)(origin.Y);
556584 }
@@ -881,6 +909,90 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
881909 c = c->next;
882910 }
883911
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+
884996 // チャンネルがなくなっている場合の処理
885997 cd = channelDataTop;
886998 ChannelData *prev = NULL;
@@ -892,6 +1004,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
8921004 next = cd->getNextData();
8931005 if (!prev){
8941006 // 先頭のデータを削除
1007+ // ここメモリリークしそう by えるー
8951008 channelDataTop = next;
8961009 } else {
8971010 // 途中のデータを削除
@@ -1192,6 +1305,11 @@ void PopupServentMenu(int servent_id){
11921305 ServentData *sd = NULL;
11931306 ChannelData *cd = channelDataTop;
11941307 while(cd){
1308+ // COUT
1309+ if (cd->type == Servent::T_COUT
1310+ && cd->servent_id == servent_id)
1311+ break;
1312+
11951313 sd = cd->findServentData(servent_id);
11961314 if (sd){
11971315 break;
@@ -1199,7 +1317,9 @@ void PopupServentMenu(int servent_id){
11991317 cd = cd->getNextData();
12001318 }
12011319
1202- if (cd == NULL || sd == NULL){
1320+ if (cd == NULL || sd == NULL
1321+ && cd->type != Servent::T_COUT) // COUT
1322+ {
12031323 return;
12041324 }
12051325
@@ -1216,6 +1336,11 @@ void PopupServentMenu(int servent_id){
12161336
12171337 cd = channelDataTop;
12181338 while(cd){
1339+ // COUT
1340+ if (cd->type == Servent::T_COUT
1341+ && cd->servent_id == servent_id)
1342+ break;
1343+
12191344 sd = cd->findServentData(servent_id);
12201345 if (sd){
12211346 break;
@@ -1223,7 +1348,9 @@ void PopupServentMenu(int servent_id){
12231348 cd = cd->getNextData();
12241349 }
12251350
1226- if (cd == NULL || sd == NULL){
1351+ if (cd == NULL || sd == NULL
1352+ && cd->type != Servent::T_COUT) // COUT
1353+ {
12271354 return;
12281355 }
12291356
@@ -1236,6 +1363,11 @@ void PopupServentMenu(int servent_id){
12361363 switch(dwID){
12371364 case 1001: // 切断
12381365 s->thread.active = false;
1366+
1367+ // COUT切断
1368+ if (s->type == Servent::T_COUT)
1369+ s->thread.finish = true;
1370+
12391371 break;
12401372
12411373 }
@@ -1558,6 +1690,14 @@ void WmRButtonDownProc(HWND hwnd, LPARAM lParam){
15581690 cd->setSelected(TRUE);
15591691 channel_id = cd->getChannelId();
15601692 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+ }
15611701 } else {
15621702 if (cd->isSelected()){
15631703 changeFlg = TRUE;
--- a/PeerCast.root/PeerCast/ui/win32/simple/gui.h
+++ b/PeerCast.root/PeerCast/ui/win32/simple/gui.h
@@ -22,6 +22,7 @@
2222 #include "sys.h"
2323 #include "gdiplus.h"
2424 #include "channel.h"
25+#include "servent.h"
2526
2627 extern LRESULT CALLBACK GUIProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
2728 extern void ADDLOG(const char *str,int id,bool sel,void *data, LogBuffer::TYPE type);
@@ -175,6 +176,8 @@ public:
175176 selected = FALSE;
176177 serventDataTop = NULL;
177178 openFlg = FALSE;
179+ type = Servent::T_NONE;
180+ servent_id = -1;
178181 }
179182 int drawChannel(Gdiplus::Graphics *g, int x, int y);
180183
@@ -219,6 +222,9 @@ public:
219222 int getServentCount();
220223
221224 bool checkDown(int x, int y);
225+
226+ Servent::TYPE type; // COUTのサーバント情報保持用
227+ int servent_id; // 同上。channel_idで代用できたけどPublicにしたくない
222228 };
223229
224230
--- 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,...)
279279
280280 write(fmt,ap);
281281
282+ // special thanks: 名無しの誰か
283+ va_end(ap);
284+
282285 if (writeCRLF)
283286 write("\r\n",2);
284287 else
285288 write("\n",1);
286-
287- va_end(ap);
288289 }
289290
290291 // -------------------------------------
--- 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
4444 #if 1 /* for VP extend version */
4545 //#define VERSION_EX 1
4646 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)";
5050
51-static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
51+static const char *PCP_CLIENT_DIST_URL = "http://pecaim.net/";
5252 #endif
5353
5454 // ------------------------------------------------
--- 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 @@
9797 />
9898 </Configuration>
9999 <Configuration
100- Name="Debug|Win32"
101- OutputDirectory=".\Debug"
102- IntermediateDirectory=".\Debug"
100+ Name="Private Release|x64"
101+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
102+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
103103 ConfigurationType="4"
104104 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
105105 UseOfMFC="0"
@@ -120,29 +120,30 @@
120120 />
121121 <Tool
122122 Name="VCMIDLTool"
123+ TargetEnvironment="3"
123124 />
124125 <Tool
125126 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/"
136138 WarningLevel="3"
137139 SuppressStartupBanner="true"
138- DebugInformationFormat="4"
139140 />
140141 <Tool
141142 Name="VCManagedResourceCompilerTool"
142143 />
143144 <Tool
144145 Name="VCResourceCompilerTool"
145- PreprocessorDefinitions="_DEBUG"
146+ PreprocessorDefinitions="NDEBUG"
146147 Culture="1033"
147148 />
148149 <Tool
@@ -150,7 +151,7 @@
150151 />
151152 <Tool
152153 Name="VCLibrarianTool"
153- OutputFile=".\Debug\corelib.lib"
154+ OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
154155 SuppressStartupBanner="true"
155156 />
156157 <Tool
@@ -162,7 +163,7 @@
162163 <Tool
163164 Name="VCBscMakeTool"
164165 SuppressStartupBanner="true"
165- OutputFile=".\Debug/corelib.bsc"
166+ OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
166167 />
167168 <Tool
168169 Name="VCFxCopTool"
@@ -172,15 +173,14 @@
172173 />
173174 </Configuration>
174175 <Configuration
175- Name="Release|Win32"
176- OutputDirectory=".\Release"
177- IntermediateDirectory=".\Release"
176+ Name="Debug|Win32"
177+ OutputDirectory=".\Debug"
178+ IntermediateDirectory=".\Debug"
178179 ConfigurationType="4"
179180 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
180181 UseOfMFC="0"
181182 ATLMinimizesCRunTimeLibraryUsage="false"
182183 CharacterSet="2"
183- WholeProgramOptimization="1"
184184 >
185185 <Tool
186186 Name="VCPreBuildEventTool"
@@ -199,30 +199,26 @@
199199 />
200200 <Tool
201201 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/"
216212 WarningLevel="3"
217213 SuppressStartupBanner="true"
218- DebugInformationFormat="3"
214+ DebugInformationFormat="4"
219215 />
220216 <Tool
221217 Name="VCManagedResourceCompilerTool"
222218 />
223219 <Tool
224220 Name="VCResourceCompilerTool"
225- PreprocessorDefinitions="NDEBUG"
221+ PreprocessorDefinitions="_DEBUG"
226222 Culture="1033"
227223 />
228224 <Tool
@@ -230,7 +226,7 @@
230226 />
231227 <Tool
232228 Name="VCLibrarianTool"
233- OutputFile=".\Release\corelib.lib"
229+ OutputFile=".\Debug\corelib.lib"
234230 SuppressStartupBanner="true"
235231 />
236232 <Tool
@@ -242,7 +238,7 @@
242238 <Tool
243239 Name="VCBscMakeTool"
244240 SuppressStartupBanner="true"
245- OutputFile=".\Release/corelib.bsc"
241+ OutputFile=".\Debug/corelib.bsc"
246242 />
247243 <Tool
248244 Name="VCFxCopTool"
@@ -252,9 +248,9 @@
252248 />
253249 </Configuration>
254250 <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)"
258254 ConfigurationType="4"
259255 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
260256 UseOfMFC="0"
@@ -275,22 +271,24 @@
275271 />
276272 <Tool
277273 Name="VCMIDLTool"
274+ TargetEnvironment="3"
278275 />
279276 <Tool
280277 Name="VCCLCompilerTool"
281278 Optimization="0"
282- AdditionalIncludeDirectories="../../,../../common"
283- PreprocessorDefinitions="WIN32;_DEBUG;_LIB;PRIVATE_BROADCASTER"
279+ AdditionalIncludeDirectories="../../,../../common,../../../ui/win32/simple"
280+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
284281 MinimalRebuild="true"
285282 BasicRuntimeChecks="3"
286283 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/"
291288 WarningLevel="3"
292289 SuppressStartupBanner="true"
293- DebugInformationFormat="4"
290+ Detect64BitPortabilityProblems="true"
291+ DebugInformationFormat="3"
294292 />
295293 <Tool
296294 Name="VCManagedResourceCompilerTool"
@@ -305,7 +303,7 @@
305303 />
306304 <Tool
307305 Name="VCLibrarianTool"
308- OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
306+ OutputFile=".\Debug\corelib.lib"
309307 SuppressStartupBanner="true"
310308 />
311309 <Tool
@@ -317,7 +315,7 @@
317315 <Tool
318316 Name="VCBscMakeTool"
319317 SuppressStartupBanner="true"
320- OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
318+ OutputFile=".\Debug/corelib.bsc"
321319 />
322320 <Tool
323321 Name="VCFxCopTool"
@@ -327,14 +325,15 @@
327325 />
328326 </Configuration>
329327 <Configuration
330- Name="Private Release|x64"
331- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
332- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
328+ Name="Release|Win32"
329+ OutputDirectory=".\Release"
330+ IntermediateDirectory=".\Release"
333331 ConfigurationType="4"
334332 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
335333 UseOfMFC="0"
336334 ATLMinimizesCRunTimeLibraryUsage="false"
337335 CharacterSet="2"
336+ WholeProgramOptimization="1"
338337 >
339338 <Tool
340339 Name="VCPreBuildEventTool"
@@ -350,23 +349,26 @@
350349 />
351350 <Tool
352351 Name="VCMIDLTool"
353- TargetEnvironment="3"
354352 />
355353 <Tool
356354 Name="VCCLCompilerTool"
357355 Optimization="2"
358- InlineFunctionExpansion="1"
356+ InlineFunctionExpansion="2"
357+ EnableIntrinsicFunctions="true"
358+ FavorSizeOrSpeed="1"
359+ EnableFiberSafeOptimizations="true"
359360 AdditionalIncludeDirectories="../../,../../common"
360- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;PRIVATE_BROADCASTER"
361+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
361362 StringPooling="true"
362363 RuntimeLibrary="0"
363364 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/"
368369 WarningLevel="3"
369370 SuppressStartupBanner="true"
371+ DebugInformationFormat="3"
370372 />
371373 <Tool
372374 Name="VCManagedResourceCompilerTool"
@@ -381,7 +383,7 @@
381383 />
382384 <Tool
383385 Name="VCLibrarianTool"
384- OutputFile=".\corelib___Win32_Private_Release\corelib.lib"
386+ OutputFile=".\Release\corelib.lib"
385387 SuppressStartupBanner="true"
386388 />
387389 <Tool
@@ -393,7 +395,7 @@
393395 <Tool
394396 Name="VCBscMakeTool"
395397 SuppressStartupBanner="true"
396- OutputFile=".\corelib___Win32_Private_Release/corelib.bsc"
398+ OutputFile=".\Release/corelib.bsc"
397399 />
398400 <Tool
399401 Name="VCFxCopTool"
@@ -403,7 +405,7 @@
403405 />
404406 </Configuration>
405407 <Configuration
406- Name="Debug|x64"
408+ Name="Release|x64"
407409 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
408410 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
409411 ConfigurationType="4"
@@ -411,6 +413,7 @@
411413 UseOfMFC="0"
412414 ATLMinimizesCRunTimeLibraryUsage="false"
413415 CharacterSet="2"
416+ WholeProgramOptimization="1"
414417 >
415418 <Tool
416419 Name="VCPreBuildEventTool"
@@ -430,18 +433,23 @@
430433 />
431434 <Tool
432435 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/"
443450 WarningLevel="3"
444451 SuppressStartupBanner="true"
452+ Detect64BitPortabilityProblems="true"
445453 DebugInformationFormat="3"
446454 />
447455 <Tool
@@ -449,7 +457,7 @@
449457 />
450458 <Tool
451459 Name="VCResourceCompilerTool"
452- PreprocessorDefinitions="_DEBUG"
460+ PreprocessorDefinitions="NDEBUG"
453461 Culture="1033"
454462 />
455463 <Tool
@@ -457,7 +465,7 @@
457465 />
458466 <Tool
459467 Name="VCLibrarianTool"
460- OutputFile=".\Debug\corelib.lib"
468+ OutputFile=".\Release\corelib.lib"
461469 SuppressStartupBanner="true"
462470 />
463471 <Tool
@@ -469,7 +477,7 @@
469477 <Tool
470478 Name="VCBscMakeTool"
471479 SuppressStartupBanner="true"
472- OutputFile=".\Debug/corelib.bsc"
480+ OutputFile=".\Release/corelib.bsc"
473481 />
474482 <Tool
475483 Name="VCFxCopTool"
@@ -479,15 +487,14 @@
479487 />
480488 </Configuration>
481489 <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"
485493 ConfigurationType="4"
486494 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
487495 UseOfMFC="0"
488496 ATLMinimizesCRunTimeLibraryUsage="false"
489497 CharacterSet="2"
490- WholeProgramOptimization="1"
491498 >
492499 <Tool
493500 Name="VCPreBuildEventTool"
@@ -503,34 +510,29 @@
503510 />
504511 <Tool
505512 Name="VCMIDLTool"
506- TargetEnvironment="3"
507513 />
508514 <Tool
509515 Name="VCCLCompilerTool"
510- Optimization="2"
511- InlineFunctionExpansion="2"
512- EnableIntrinsicFunctions="true"
513- FavorSizeOrSpeed="1"
514- EnableFiberSafeOptimizations="true"
516+ Optimization="0"
515517 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/"
524526 WarningLevel="3"
525527 SuppressStartupBanner="true"
526- DebugInformationFormat="3"
528+ DebugInformationFormat="4"
527529 />
528530 <Tool
529531 Name="VCManagedResourceCompilerTool"
530532 />
531533 <Tool
532534 Name="VCResourceCompilerTool"
533- PreprocessorDefinitions="NDEBUG"
535+ PreprocessorDefinitions="_DEBUG"
534536 Culture="1033"
535537 />
536538 <Tool
@@ -538,7 +540,7 @@
538540 />
539541 <Tool
540542 Name="VCLibrarianTool"
541- OutputFile=".\Release\corelib.lib"
543+ OutputFile=".\corelib___Win32_Private_Debug\corelib.lib"
542544 SuppressStartupBanner="true"
543545 />
544546 <Tool
@@ -550,7 +552,7 @@
550552 <Tool
551553 Name="VCBscMakeTool"
552554 SuppressStartupBanner="true"
553- OutputFile=".\Release/corelib.bsc"
555+ OutputFile=".\corelib___Win32_Private_Debug/corelib.bsc"
554556 />
555557 <Tool
556558 Name="VCFxCopTool"
@@ -655,7 +657,7 @@
655657 />
656658 </FileConfiguration>
657659 <FileConfiguration
658- Name="Debug|Win32"
660+ Name="Private Release|x64"
659661 >
660662 <Tool
661663 Name="VCCLCompilerTool"
@@ -664,7 +666,7 @@
664666 />
665667 </FileConfiguration>
666668 <FileConfiguration
667- Name="Release|Win32"
669+ Name="Debug|Win32"
668670 >
669671 <Tool
670672 Name="VCCLCompilerTool"
@@ -673,7 +675,7 @@
673675 />
674676 </FileConfiguration>
675677 <FileConfiguration
676- Name="Private Debug|Win32"
678+ Name="Debug|x64"
677679 >
678680 <Tool
679681 Name="VCCLCompilerTool"
@@ -682,7 +684,7 @@
682684 />
683685 </FileConfiguration>
684686 <FileConfiguration
685- Name="Private Release|x64"
687+ Name="Release|Win32"
686688 >
687689 <Tool
688690 Name="VCCLCompilerTool"
@@ -691,7 +693,7 @@
691693 />
692694 </FileConfiguration>
693695 <FileConfiguration
694- Name="Debug|x64"
696+ Name="Release|x64"
695697 >
696698 <Tool
697699 Name="VCCLCompilerTool"
@@ -700,7 +702,7 @@
700702 />
701703 </FileConfiguration>
702704 <FileConfiguration
703- Name="Release|x64"
705+ Name="Private Debug|Win32"
704706 >
705707 <Tool
706708 Name="VCCLCompilerTool"
@@ -731,7 +733,7 @@
731733 />
732734 </FileConfiguration>
733735 <FileConfiguration
734- Name="Debug|Win32"
736+ Name="Private Release|x64"
735737 >
736738 <Tool
737739 Name="VCCLCompilerTool"
@@ -740,7 +742,7 @@
740742 />
741743 </FileConfiguration>
742744 <FileConfiguration
743- Name="Release|Win32"
745+ Name="Debug|Win32"
744746 >
745747 <Tool
746748 Name="VCCLCompilerTool"
@@ -749,7 +751,7 @@
749751 />
750752 </FileConfiguration>
751753 <FileConfiguration
752- Name="Private Debug|Win32"
754+ Name="Debug|x64"
753755 >
754756 <Tool
755757 Name="VCCLCompilerTool"
@@ -758,7 +760,7 @@
758760 />
759761 </FileConfiguration>
760762 <FileConfiguration
761- Name="Private Release|x64"
763+ Name="Release|Win32"
762764 >
763765 <Tool
764766 Name="VCCLCompilerTool"
@@ -767,7 +769,7 @@
767769 />
768770 </FileConfiguration>
769771 <FileConfiguration
770- Name="Debug|x64"
772+ Name="Release|x64"
771773 >
772774 <Tool
773775 Name="VCCLCompilerTool"
@@ -776,7 +778,7 @@
776778 />
777779 </FileConfiguration>
778780 <FileConfiguration
779- Name="Release|x64"
781+ Name="Private Debug|Win32"
780782 >
781783 <Tool
782784 Name="VCCLCompilerTool"
@@ -807,7 +809,7 @@
807809 />
808810 </FileConfiguration>
809811 <FileConfiguration
810- Name="Debug|Win32"
812+ Name="Private Release|x64"
811813 >
812814 <Tool
813815 Name="VCCLCompilerTool"
@@ -816,7 +818,7 @@
816818 />
817819 </FileConfiguration>
818820 <FileConfiguration
819- Name="Release|Win32"
821+ Name="Debug|Win32"
820822 >
821823 <Tool
822824 Name="VCCLCompilerTool"
@@ -825,7 +827,7 @@
825827 />
826828 </FileConfiguration>
827829 <FileConfiguration
828- Name="Private Debug|Win32"
830+ Name="Debug|x64"
829831 >
830832 <Tool
831833 Name="VCCLCompilerTool"
@@ -834,7 +836,7 @@
834836 />
835837 </FileConfiguration>
836838 <FileConfiguration
837- Name="Private Release|x64"
839+ Name="Release|Win32"
838840 >
839841 <Tool
840842 Name="VCCLCompilerTool"
@@ -843,7 +845,7 @@
843845 />
844846 </FileConfiguration>
845847 <FileConfiguration
846- Name="Debug|x64"
848+ Name="Release|x64"
847849 >
848850 <Tool
849851 Name="VCCLCompilerTool"
@@ -852,7 +854,7 @@
852854 />
853855 </FileConfiguration>
854856 <FileConfiguration
855- Name="Release|x64"
857+ Name="Private Debug|Win32"
856858 >
857859 <Tool
858860 Name="VCCLCompilerTool"
@@ -883,7 +885,7 @@
883885 />
884886 </FileConfiguration>
885887 <FileConfiguration
886- Name="Debug|Win32"
888+ Name="Private Release|x64"
887889 >
888890 <Tool
889891 Name="VCCLCompilerTool"
@@ -892,7 +894,7 @@
892894 />
893895 </FileConfiguration>
894896 <FileConfiguration
895- Name="Release|Win32"
897+ Name="Debug|Win32"
896898 >
897899 <Tool
898900 Name="VCCLCompilerTool"
@@ -901,7 +903,7 @@
901903 />
902904 </FileConfiguration>
903905 <FileConfiguration
904- Name="Private Debug|Win32"
906+ Name="Debug|x64"
905907 >
906908 <Tool
907909 Name="VCCLCompilerTool"
@@ -910,7 +912,7 @@
910912 />
911913 </FileConfiguration>
912914 <FileConfiguration
913- Name="Private Release|x64"
915+ Name="Release|Win32"
914916 >
915917 <Tool
916918 Name="VCCLCompilerTool"
@@ -919,7 +921,7 @@
919921 />
920922 </FileConfiguration>
921923 <FileConfiguration
922- Name="Debug|x64"
924+ Name="Release|x64"
923925 >
924926 <Tool
925927 Name="VCCLCompilerTool"
@@ -928,7 +930,7 @@
928930 />
929931 </FileConfiguration>
930932 <FileConfiguration
931- Name="Release|x64"
933+ Name="Private Debug|Win32"
932934 >
933935 <Tool
934936 Name="VCCLCompilerTool"
@@ -959,7 +961,7 @@
959961 />
960962 </FileConfiguration>
961963 <FileConfiguration
962- Name="Debug|Win32"
964+ Name="Private Release|x64"
963965 >
964966 <Tool
965967 Name="VCCLCompilerTool"
@@ -968,7 +970,7 @@
968970 />
969971 </FileConfiguration>
970972 <FileConfiguration
971- Name="Release|Win32"
973+ Name="Debug|Win32"
972974 >
973975 <Tool
974976 Name="VCCLCompilerTool"
@@ -977,7 +979,7 @@
977979 />
978980 </FileConfiguration>
979981 <FileConfiguration
980- Name="Private Debug|Win32"
982+ Name="Debug|x64"
981983 >
982984 <Tool
983985 Name="VCCLCompilerTool"
@@ -986,7 +988,7 @@
986988 />
987989 </FileConfiguration>
988990 <FileConfiguration
989- Name="Private Release|x64"
991+ Name="Release|Win32"
990992 >
991993 <Tool
992994 Name="VCCLCompilerTool"
@@ -995,7 +997,7 @@
995997 />
996998 </FileConfiguration>
997999 <FileConfiguration
998- Name="Debug|x64"
1000+ Name="Release|x64"
9991001 >
10001002 <Tool
10011003 Name="VCCLCompilerTool"
@@ -1004,7 +1006,7 @@
10041006 />
10051007 </FileConfiguration>
10061008 <FileConfiguration
1007- Name="Release|x64"
1009+ Name="Private Debug|Win32"
10081010 >
10091011 <Tool
10101012 Name="VCCLCompilerTool"
@@ -1035,7 +1037,7 @@
10351037 />
10361038 </FileConfiguration>
10371039 <FileConfiguration
1038- Name="Debug|Win32"
1040+ Name="Private Release|x64"
10391041 >
10401042 <Tool
10411043 Name="VCCLCompilerTool"
@@ -1044,7 +1046,7 @@
10441046 />
10451047 </FileConfiguration>
10461048 <FileConfiguration
1047- Name="Release|Win32"
1049+ Name="Debug|Win32"
10481050 >
10491051 <Tool
10501052 Name="VCCLCompilerTool"
@@ -1053,7 +1055,7 @@
10531055 />
10541056 </FileConfiguration>
10551057 <FileConfiguration
1056- Name="Private Debug|Win32"
1058+ Name="Debug|x64"
10571059 >
10581060 <Tool
10591061 Name="VCCLCompilerTool"
@@ -1062,7 +1064,7 @@
10621064 />
10631065 </FileConfiguration>
10641066 <FileConfiguration
1065- Name="Private Release|x64"
1067+ Name="Release|Win32"
10661068 >
10671069 <Tool
10681070 Name="VCCLCompilerTool"
@@ -1071,7 +1073,7 @@
10711073 />
10721074 </FileConfiguration>
10731075 <FileConfiguration
1074- Name="Debug|x64"
1076+ Name="Release|x64"
10751077 >
10761078 <Tool
10771079 Name="VCCLCompilerTool"
@@ -1080,7 +1082,7 @@
10801082 />
10811083 </FileConfiguration>
10821084 <FileConfiguration
1083- Name="Release|x64"
1085+ Name="Private Debug|Win32"
10841086 >
10851087 <Tool
10861088 Name="VCCLCompilerTool"
@@ -1111,7 +1113,7 @@
11111113 />
11121114 </FileConfiguration>
11131115 <FileConfiguration
1114- Name="Debug|Win32"
1116+ Name="Private Release|x64"
11151117 >
11161118 <Tool
11171119 Name="VCCLCompilerTool"
@@ -1120,7 +1122,7 @@
11201122 />
11211123 </FileConfiguration>
11221124 <FileConfiguration
1123- Name="Release|Win32"
1125+ Name="Debug|Win32"
11241126 >
11251127 <Tool
11261128 Name="VCCLCompilerTool"
@@ -1129,7 +1131,7 @@
11291131 />
11301132 </FileConfiguration>
11311133 <FileConfiguration
1132- Name="Private Debug|Win32"
1134+ Name="Debug|x64"
11331135 >
11341136 <Tool
11351137 Name="VCCLCompilerTool"
@@ -1138,7 +1140,7 @@
11381140 />
11391141 </FileConfiguration>
11401142 <FileConfiguration
1141- Name="Private Release|x64"
1143+ Name="Release|Win32"
11421144 >
11431145 <Tool
11441146 Name="VCCLCompilerTool"
@@ -1147,7 +1149,7 @@
11471149 />
11481150 </FileConfiguration>
11491151 <FileConfiguration
1150- Name="Debug|x64"
1152+ Name="Release|x64"
11511153 >
11521154 <Tool
11531155 Name="VCCLCompilerTool"
@@ -1156,7 +1158,7 @@
11561158 />
11571159 </FileConfiguration>
11581160 <FileConfiguration
1159- Name="Release|x64"
1161+ Name="Private Debug|Win32"
11601162 >
11611163 <Tool
11621164 Name="VCCLCompilerTool"
@@ -1187,7 +1189,7 @@
11871189 />
11881190 </FileConfiguration>
11891191 <FileConfiguration
1190- Name="Debug|Win32"
1192+ Name="Private Release|x64"
11911193 >
11921194 <Tool
11931195 Name="VCCLCompilerTool"
@@ -1196,7 +1198,7 @@
11961198 />
11971199 </FileConfiguration>
11981200 <FileConfiguration
1199- Name="Release|Win32"
1201+ Name="Debug|Win32"
12001202 >
12011203 <Tool
12021204 Name="VCCLCompilerTool"
@@ -1205,7 +1207,7 @@
12051207 />
12061208 </FileConfiguration>
12071209 <FileConfiguration
1208- Name="Private Debug|Win32"
1210+ Name="Debug|x64"
12091211 >
12101212 <Tool
12111213 Name="VCCLCompilerTool"
@@ -1214,7 +1216,7 @@
12141216 />
12151217 </FileConfiguration>
12161218 <FileConfiguration
1217- Name="Private Release|x64"
1219+ Name="Release|Win32"
12181220 >
12191221 <Tool
12201222 Name="VCCLCompilerTool"
@@ -1223,7 +1225,7 @@
12231225 />
12241226 </FileConfiguration>
12251227 <FileConfiguration
1226- Name="Debug|x64"
1228+ Name="Release|x64"
12271229 >
12281230 <Tool
12291231 Name="VCCLCompilerTool"
@@ -1232,7 +1234,7 @@
12321234 />
12331235 </FileConfiguration>
12341236 <FileConfiguration
1235- Name="Release|x64"
1237+ Name="Private Debug|Win32"
12361238 >
12371239 <Tool
12381240 Name="VCCLCompilerTool"
@@ -1263,7 +1265,7 @@
12631265 />
12641266 </FileConfiguration>
12651267 <FileConfiguration
1266- Name="Debug|Win32"
1268+ Name="Private Release|x64"
12671269 >
12681270 <Tool
12691271 Name="VCCLCompilerTool"
@@ -1272,7 +1274,7 @@
12721274 />
12731275 </FileConfiguration>
12741276 <FileConfiguration
1275- Name="Release|Win32"
1277+ Name="Debug|Win32"
12761278 >
12771279 <Tool
12781280 Name="VCCLCompilerTool"
@@ -1281,7 +1283,7 @@
12811283 />
12821284 </FileConfiguration>
12831285 <FileConfiguration
1284- Name="Private Debug|Win32"
1286+ Name="Debug|x64"
12851287 >
12861288 <Tool
12871289 Name="VCCLCompilerTool"
@@ -1290,7 +1292,7 @@
12901292 />
12911293 </FileConfiguration>
12921294 <FileConfiguration
1293- Name="Private Release|x64"
1295+ Name="Release|Win32"
12941296 >
12951297 <Tool
12961298 Name="VCCLCompilerTool"
@@ -1299,7 +1301,7 @@
12991301 />
13001302 </FileConfiguration>
13011303 <FileConfiguration
1302- Name="Debug|x64"
1304+ Name="Release|x64"
13031305 >
13041306 <Tool
13051307 Name="VCCLCompilerTool"
@@ -1308,7 +1310,7 @@
13081310 />
13091311 </FileConfiguration>
13101312 <FileConfiguration
1311- Name="Release|x64"
1313+ Name="Private Debug|Win32"
13121314 >
13131315 <Tool
13141316 Name="VCCLCompilerTool"
@@ -1339,7 +1341,7 @@
13391341 />
13401342 </FileConfiguration>
13411343 <FileConfiguration
1342- Name="Debug|Win32"
1344+ Name="Private Release|x64"
13431345 >
13441346 <Tool
13451347 Name="VCCLCompilerTool"
@@ -1348,7 +1350,7 @@
13481350 />
13491351 </FileConfiguration>
13501352 <FileConfiguration
1351- Name="Release|Win32"
1353+ Name="Debug|Win32"
13521354 >
13531355 <Tool
13541356 Name="VCCLCompilerTool"
@@ -1357,7 +1359,7 @@
13571359 />
13581360 </FileConfiguration>
13591361 <FileConfiguration
1360- Name="Private Debug|Win32"
1362+ Name="Debug|x64"
13611363 >
13621364 <Tool
13631365 Name="VCCLCompilerTool"
@@ -1366,7 +1368,7 @@
13661368 />
13671369 </FileConfiguration>
13681370 <FileConfiguration
1369- Name="Private Release|x64"
1371+ Name="Release|Win32"
13701372 >
13711373 <Tool
13721374 Name="VCCLCompilerTool"
@@ -1375,7 +1377,7 @@
13751377 />
13761378 </FileConfiguration>
13771379 <FileConfiguration
1378- Name="Debug|x64"
1380+ Name="Release|x64"
13791381 >
13801382 <Tool
13811383 Name="VCCLCompilerTool"
@@ -1384,7 +1386,7 @@
13841386 />
13851387 </FileConfiguration>
13861388 <FileConfiguration
1387- Name="Release|x64"
1389+ Name="Private Debug|Win32"
13881390 >
13891391 <Tool
13901392 Name="VCCLCompilerTool"
@@ -1415,7 +1417,7 @@
14151417 />
14161418 </FileConfiguration>
14171419 <FileConfiguration
1418- Name="Debug|Win32"
1420+ Name="Private Release|x64"
14191421 >
14201422 <Tool
14211423 Name="VCCLCompilerTool"
@@ -1424,7 +1426,7 @@
14241426 />
14251427 </FileConfiguration>
14261428 <FileConfiguration
1427- Name="Release|Win32"
1429+ Name="Debug|Win32"
14281430 >
14291431 <Tool
14301432 Name="VCCLCompilerTool"
@@ -1433,7 +1435,7 @@
14331435 />
14341436 </FileConfiguration>
14351437 <FileConfiguration
1436- Name="Private Debug|Win32"
1438+ Name="Debug|x64"
14371439 >
14381440 <Tool
14391441 Name="VCCLCompilerTool"
@@ -1442,7 +1444,7 @@
14421444 />
14431445 </FileConfiguration>
14441446 <FileConfiguration
1445- Name="Private Release|x64"
1447+ Name="Release|Win32"
14461448 >
14471449 <Tool
14481450 Name="VCCLCompilerTool"
@@ -1451,7 +1453,7 @@
14511453 />
14521454 </FileConfiguration>
14531455 <FileConfiguration
1454- Name="Debug|x64"
1456+ Name="Release|x64"
14551457 >
14561458 <Tool
14571459 Name="VCCLCompilerTool"
@@ -1460,7 +1462,7 @@
14601462 />
14611463 </FileConfiguration>
14621464 <FileConfiguration
1463- Name="Release|x64"
1465+ Name="Private Debug|Win32"
14641466 >
14651467 <Tool
14661468 Name="VCCLCompilerTool"
@@ -1491,7 +1493,7 @@
14911493 />
14921494 </FileConfiguration>
14931495 <FileConfiguration
1494- Name="Debug|Win32"
1496+ Name="Private Release|x64"
14951497 >
14961498 <Tool
14971499 Name="VCCLCompilerTool"
@@ -1500,7 +1502,7 @@
15001502 />
15011503 </FileConfiguration>
15021504 <FileConfiguration
1503- Name="Release|Win32"
1505+ Name="Debug|Win32"
15041506 >
15051507 <Tool
15061508 Name="VCCLCompilerTool"
@@ -1509,7 +1511,7 @@
15091511 />
15101512 </FileConfiguration>
15111513 <FileConfiguration
1512- Name="Private Debug|Win32"
1514+ Name="Debug|x64"
15131515 >
15141516 <Tool
15151517 Name="VCCLCompilerTool"
@@ -1518,7 +1520,7 @@
15181520 />
15191521 </FileConfiguration>
15201522 <FileConfiguration
1521- Name="Private Release|x64"
1523+ Name="Release|Win32"
15221524 >
15231525 <Tool
15241526 Name="VCCLCompilerTool"
@@ -1527,7 +1529,7 @@
15271529 />
15281530 </FileConfiguration>
15291531 <FileConfiguration
1530- Name="Debug|x64"
1532+ Name="Release|x64"
15311533 >
15321534 <Tool
15331535 Name="VCCLCompilerTool"
@@ -1536,7 +1538,7 @@
15361538 />
15371539 </FileConfiguration>
15381540 <FileConfiguration
1539- Name="Release|x64"
1541+ Name="Private Debug|Win32"
15401542 >
15411543 <Tool
15421544 Name="VCCLCompilerTool"
@@ -1567,7 +1569,7 @@
15671569 />
15681570 </FileConfiguration>
15691571 <FileConfiguration
1570- Name="Debug|Win32"
1572+ Name="Private Release|x64"
15711573 >
15721574 <Tool
15731575 Name="VCCLCompilerTool"
@@ -1576,7 +1578,7 @@
15761578 />
15771579 </FileConfiguration>
15781580 <FileConfiguration
1579- Name="Release|Win32"
1581+ Name="Debug|Win32"
15801582 >
15811583 <Tool
15821584 Name="VCCLCompilerTool"
@@ -1585,7 +1587,7 @@
15851587 />
15861588 </FileConfiguration>
15871589 <FileConfiguration
1588- Name="Private Debug|Win32"
1590+ Name="Debug|x64"
15891591 >
15901592 <Tool
15911593 Name="VCCLCompilerTool"
@@ -1594,7 +1596,7 @@
15941596 />
15951597 </FileConfiguration>
15961598 <FileConfiguration
1597- Name="Private Release|x64"
1599+ Name="Release|Win32"
15981600 >
15991601 <Tool
16001602 Name="VCCLCompilerTool"
@@ -1603,7 +1605,7 @@
16031605 />
16041606 </FileConfiguration>
16051607 <FileConfiguration
1606- Name="Debug|x64"
1608+ Name="Release|x64"
16071609 >
16081610 <Tool
16091611 Name="VCCLCompilerTool"
@@ -1612,7 +1614,7 @@
16121614 />
16131615 </FileConfiguration>
16141616 <FileConfiguration
1615- Name="Release|x64"
1617+ Name="Private Debug|Win32"
16161618 >
16171619 <Tool
16181620 Name="VCCLCompilerTool"
@@ -1643,7 +1645,7 @@
16431645 />
16441646 </FileConfiguration>
16451647 <FileConfiguration
1646- Name="Debug|Win32"
1648+ Name="Private Release|x64"
16471649 >
16481650 <Tool
16491651 Name="VCCLCompilerTool"
@@ -1652,7 +1654,7 @@
16521654 />
16531655 </FileConfiguration>
16541656 <FileConfiguration
1655- Name="Release|Win32"
1657+ Name="Debug|Win32"
16561658 >
16571659 <Tool
16581660 Name="VCCLCompilerTool"
@@ -1661,7 +1663,7 @@
16611663 />
16621664 </FileConfiguration>
16631665 <FileConfiguration
1664- Name="Private Debug|Win32"
1666+ Name="Debug|x64"
16651667 >
16661668 <Tool
16671669 Name="VCCLCompilerTool"
@@ -1670,7 +1672,7 @@
16701672 />
16711673 </FileConfiguration>
16721674 <FileConfiguration
1673- Name="Private Release|x64"
1675+ Name="Release|Win32"
16741676 >
16751677 <Tool
16761678 Name="VCCLCompilerTool"
@@ -1679,7 +1681,7 @@
16791681 />
16801682 </FileConfiguration>
16811683 <FileConfiguration
1682- Name="Debug|x64"
1684+ Name="Release|x64"
16831685 >
16841686 <Tool
16851687 Name="VCCLCompilerTool"
@@ -1688,7 +1690,7 @@
16881690 />
16891691 </FileConfiguration>
16901692 <FileConfiguration
1691- Name="Release|x64"
1693+ Name="Private Debug|Win32"
16921694 >
16931695 <Tool
16941696 Name="VCCLCompilerTool"
@@ -1719,7 +1721,7 @@
17191721 />
17201722 </FileConfiguration>
17211723 <FileConfiguration
1722- Name="Debug|Win32"
1724+ Name="Private Release|x64"
17231725 >
17241726 <Tool
17251727 Name="VCCLCompilerTool"
@@ -1728,7 +1730,7 @@
17281730 />
17291731 </FileConfiguration>
17301732 <FileConfiguration
1731- Name="Release|Win32"
1733+ Name="Debug|Win32"
17321734 >
17331735 <Tool
17341736 Name="VCCLCompilerTool"
@@ -1737,7 +1739,7 @@
17371739 />
17381740 </FileConfiguration>
17391741 <FileConfiguration
1740- Name="Private Debug|Win32"
1742+ Name="Debug|x64"
17411743 >
17421744 <Tool
17431745 Name="VCCLCompilerTool"
@@ -1746,7 +1748,7 @@
17461748 />
17471749 </FileConfiguration>
17481750 <FileConfiguration
1749- Name="Private Release|x64"
1751+ Name="Release|Win32"
17501752 >
17511753 <Tool
17521754 Name="VCCLCompilerTool"
@@ -1755,7 +1757,7 @@
17551757 />
17561758 </FileConfiguration>
17571759 <FileConfiguration
1758- Name="Debug|x64"
1760+ Name="Release|x64"
17591761 >
17601762 <Tool
17611763 Name="VCCLCompilerTool"
@@ -1764,7 +1766,7 @@
17641766 />
17651767 </FileConfiguration>
17661768 <FileConfiguration
1767- Name="Release|x64"
1769+ Name="Private Debug|Win32"
17681770 >
17691771 <Tool
17701772 Name="VCCLCompilerTool"
@@ -1795,7 +1797,7 @@
17951797 />
17961798 </FileConfiguration>
17971799 <FileConfiguration
1798- Name="Debug|Win32"
1800+ Name="Private Release|x64"
17991801 >
18001802 <Tool
18011803 Name="VCCLCompilerTool"
@@ -1804,7 +1806,7 @@
18041806 />
18051807 </FileConfiguration>
18061808 <FileConfiguration
1807- Name="Release|Win32"
1809+ Name="Debug|Win32"
18081810 >
18091811 <Tool
18101812 Name="VCCLCompilerTool"
@@ -1813,7 +1815,7 @@
18131815 />
18141816 </FileConfiguration>
18151817 <FileConfiguration
1816- Name="Private Debug|Win32"
1818+ Name="Debug|x64"
18171819 >
18181820 <Tool
18191821 Name="VCCLCompilerTool"
@@ -1822,7 +1824,7 @@
18221824 />
18231825 </FileConfiguration>
18241826 <FileConfiguration
1825- Name="Private Release|x64"
1827+ Name="Release|Win32"
18261828 >
18271829 <Tool
18281830 Name="VCCLCompilerTool"
@@ -1831,7 +1833,7 @@
18311833 />
18321834 </FileConfiguration>
18331835 <FileConfiguration
1834- Name="Debug|x64"
1836+ Name="Release|x64"
18351837 >
18361838 <Tool
18371839 Name="VCCLCompilerTool"
@@ -1840,7 +1842,7 @@
18401842 />
18411843 </FileConfiguration>
18421844 <FileConfiguration
1843- Name="Release|x64"
1845+ Name="Private Debug|Win32"
18441846 >
18451847 <Tool
18461848 Name="VCCLCompilerTool"
@@ -1871,7 +1873,7 @@
18711873 />
18721874 </FileConfiguration>
18731875 <FileConfiguration
1874- Name="Debug|Win32"
1876+ Name="Private Release|x64"
18751877 >
18761878 <Tool
18771879 Name="VCCLCompilerTool"
@@ -1880,7 +1882,7 @@
18801882 />
18811883 </FileConfiguration>
18821884 <FileConfiguration
1883- Name="Release|Win32"
1885+ Name="Debug|Win32"
18841886 >
18851887 <Tool
18861888 Name="VCCLCompilerTool"
@@ -1889,7 +1891,7 @@
18891891 />
18901892 </FileConfiguration>
18911893 <FileConfiguration
1892- Name="Private Debug|Win32"
1894+ Name="Debug|x64"
18931895 >
18941896 <Tool
18951897 Name="VCCLCompilerTool"
@@ -1898,7 +1900,7 @@
18981900 />
18991901 </FileConfiguration>
19001902 <FileConfiguration
1901- Name="Private Release|x64"
1903+ Name="Release|Win32"
19021904 >
19031905 <Tool
19041906 Name="VCCLCompilerTool"
@@ -1907,7 +1909,7 @@
19071909 />
19081910 </FileConfiguration>
19091911 <FileConfiguration
1910- Name="Debug|x64"
1912+ Name="Release|x64"
19111913 >
19121914 <Tool
19131915 Name="VCCLCompilerTool"
@@ -1916,7 +1918,7 @@
19161918 />
19171919 </FileConfiguration>
19181920 <FileConfiguration
1919- Name="Release|x64"
1921+ Name="Private Debug|Win32"
19201922 >
19211923 <Tool
19221924 Name="VCCLCompilerTool"
@@ -1947,7 +1949,7 @@
19471949 />
19481950 </FileConfiguration>
19491951 <FileConfiguration
1950- Name="Debug|Win32"
1952+ Name="Private Release|x64"
19511953 >
19521954 <Tool
19531955 Name="VCCLCompilerTool"
@@ -1956,7 +1958,7 @@
19561958 />
19571959 </FileConfiguration>
19581960 <FileConfiguration
1959- Name="Release|Win32"
1961+ Name="Debug|Win32"
19601962 >
19611963 <Tool
19621964 Name="VCCLCompilerTool"
@@ -1965,7 +1967,7 @@
19651967 />
19661968 </FileConfiguration>
19671969 <FileConfiguration
1968- Name="Private Debug|Win32"
1970+ Name="Debug|x64"
19691971 >
19701972 <Tool
19711973 Name="VCCLCompilerTool"
@@ -1974,7 +1976,7 @@
19741976 />
19751977 </FileConfiguration>
19761978 <FileConfiguration
1977- Name="Private Release|x64"
1979+ Name="Release|Win32"
19781980 >
19791981 <Tool
19801982 Name="VCCLCompilerTool"
@@ -1983,7 +1985,7 @@
19831985 />
19841986 </FileConfiguration>
19851987 <FileConfiguration
1986- Name="Debug|x64"
1988+ Name="Release|x64"
19871989 >
19881990 <Tool
19891991 Name="VCCLCompilerTool"
@@ -1992,7 +1994,7 @@
19921994 />
19931995 </FileConfiguration>
19941996 <FileConfiguration
1995- Name="Release|x64"
1997+ Name="Private Debug|Win32"
19961998 >
19971999 <Tool
19982000 Name="VCCLCompilerTool"
@@ -2023,7 +2025,7 @@
20232025 />
20242026 </FileConfiguration>
20252027 <FileConfiguration
2026- Name="Debug|Win32"
2028+ Name="Private Release|x64"
20272029 >
20282030 <Tool
20292031 Name="VCCLCompilerTool"
@@ -2032,7 +2034,7 @@
20322034 />
20332035 </FileConfiguration>
20342036 <FileConfiguration
2035- Name="Release|Win32"
2037+ Name="Debug|Win32"
20362038 >
20372039 <Tool
20382040 Name="VCCLCompilerTool"
@@ -2041,7 +2043,7 @@
20412043 />
20422044 </FileConfiguration>
20432045 <FileConfiguration
2044- Name="Private Debug|Win32"
2046+ Name="Debug|x64"
20452047 >
20462048 <Tool
20472049 Name="VCCLCompilerTool"
@@ -2050,7 +2052,7 @@
20502052 />
20512053 </FileConfiguration>
20522054 <FileConfiguration
2053- Name="Private Release|x64"
2055+ Name="Release|Win32"
20542056 >
20552057 <Tool
20562058 Name="VCCLCompilerTool"
@@ -2059,7 +2061,7 @@
20592061 />
20602062 </FileConfiguration>
20612063 <FileConfiguration
2062- Name="Debug|x64"
2064+ Name="Release|x64"
20632065 >
20642066 <Tool
20652067 Name="VCCLCompilerTool"
@@ -2068,7 +2070,7 @@
20682070 />
20692071 </FileConfiguration>
20702072 <FileConfiguration
2071- Name="Release|x64"
2073+ Name="Private Debug|Win32"
20722074 >
20732075 <Tool
20742076 Name="VCCLCompilerTool"
@@ -2099,7 +2101,7 @@
20992101 />
21002102 </FileConfiguration>
21012103 <FileConfiguration
2102- Name="Debug|Win32"
2104+ Name="Private Release|x64"
21032105 >
21042106 <Tool
21052107 Name="VCCLCompilerTool"
@@ -2108,7 +2110,7 @@
21082110 />
21092111 </FileConfiguration>
21102112 <FileConfiguration
2111- Name="Release|Win32"
2113+ Name="Debug|Win32"
21122114 >
21132115 <Tool
21142116 Name="VCCLCompilerTool"
@@ -2117,7 +2119,7 @@
21172119 />
21182120 </FileConfiguration>
21192121 <FileConfiguration
2120- Name="Private Debug|Win32"
2122+ Name="Debug|x64"
21212123 >
21222124 <Tool
21232125 Name="VCCLCompilerTool"
@@ -2126,7 +2128,7 @@
21262128 />
21272129 </FileConfiguration>
21282130 <FileConfiguration
2129- Name="Private Release|x64"
2131+ Name="Release|Win32"
21302132 >
21312133 <Tool
21322134 Name="VCCLCompilerTool"
@@ -2135,7 +2137,7 @@
21352137 />
21362138 </FileConfiguration>
21372139 <FileConfiguration
2138- Name="Debug|x64"
2140+ Name="Release|x64"
21392141 >
21402142 <Tool
21412143 Name="VCCLCompilerTool"
@@ -2144,7 +2146,7 @@
21442146 />
21452147 </FileConfiguration>
21462148 <FileConfiguration
2147- Name="Release|x64"
2149+ Name="Private Debug|Win32"
21482150 >
21492151 <Tool
21502152 Name="VCCLCompilerTool"
@@ -2175,7 +2177,7 @@
21752177 />
21762178 </FileConfiguration>
21772179 <FileConfiguration
2178- Name="Debug|Win32"
2180+ Name="Private Release|x64"
21792181 >
21802182 <Tool
21812183 Name="VCCLCompilerTool"
@@ -2184,7 +2186,7 @@
21842186 />
21852187 </FileConfiguration>
21862188 <FileConfiguration
2187- Name="Release|Win32"
2189+ Name="Debug|Win32"
21882190 >
21892191 <Tool
21902192 Name="VCCLCompilerTool"
@@ -2193,7 +2195,7 @@
21932195 />
21942196 </FileConfiguration>
21952197 <FileConfiguration
2196- Name="Private Debug|Win32"
2198+ Name="Debug|x64"
21972199 >
21982200 <Tool
21992201 Name="VCCLCompilerTool"
@@ -2202,7 +2204,7 @@
22022204 />
22032205 </FileConfiguration>
22042206 <FileConfiguration
2205- Name="Private Release|x64"
2207+ Name="Release|Win32"
22062208 >
22072209 <Tool
22082210 Name="VCCLCompilerTool"
@@ -2211,7 +2213,7 @@
22112213 />
22122214 </FileConfiguration>
22132215 <FileConfiguration
2214- Name="Debug|x64"
2216+ Name="Release|x64"
22152217 >
22162218 <Tool
22172219 Name="VCCLCompilerTool"
@@ -2220,7 +2222,7 @@
22202222 />
22212223 </FileConfiguration>
22222224 <FileConfiguration
2223- Name="Release|x64"
2225+ Name="Private Debug|Win32"
22242226 >
22252227 <Tool
22262228 Name="VCCLCompilerTool"
@@ -2251,7 +2253,7 @@
22512253 />
22522254 </FileConfiguration>
22532255 <FileConfiguration
2254- Name="Debug|Win32"
2256+ Name="Private Release|x64"
22552257 >
22562258 <Tool
22572259 Name="VCCLCompilerTool"
@@ -2260,7 +2262,7 @@
22602262 />
22612263 </FileConfiguration>
22622264 <FileConfiguration
2263- Name="Release|Win32"
2265+ Name="Debug|Win32"
22642266 >
22652267 <Tool
22662268 Name="VCCLCompilerTool"
@@ -2269,7 +2271,7 @@
22692271 />
22702272 </FileConfiguration>
22712273 <FileConfiguration
2272- Name="Private Debug|Win32"
2274+ Name="Debug|x64"
22732275 >
22742276 <Tool
22752277 Name="VCCLCompilerTool"
@@ -2278,7 +2280,7 @@
22782280 />
22792281 </FileConfiguration>
22802282 <FileConfiguration
2281- Name="Private Release|x64"
2283+ Name="Release|Win32"
22822284 >
22832285 <Tool
22842286 Name="VCCLCompilerTool"
@@ -2287,7 +2289,7 @@
22872289 />
22882290 </FileConfiguration>
22892291 <FileConfiguration
2290- Name="Debug|x64"
2292+ Name="Release|x64"
22912293 >
22922294 <Tool
22932295 Name="VCCLCompilerTool"
@@ -2296,7 +2298,7 @@
22962298 />
22972299 </FileConfiguration>
22982300 <FileConfiguration
2299- Name="Release|x64"
2301+ Name="Private Debug|Win32"
23002302 >
23012303 <Tool
23022304 Name="VCCLCompilerTool"
@@ -2327,7 +2329,7 @@
23272329 />
23282330 </FileConfiguration>
23292331 <FileConfiguration
2330- Name="Debug|Win32"
2332+ Name="Private Release|x64"
23312333 >
23322334 <Tool
23332335 Name="VCCLCompilerTool"
@@ -2336,7 +2338,7 @@
23362338 />
23372339 </FileConfiguration>
23382340 <FileConfiguration
2339- Name="Release|Win32"
2341+ Name="Debug|Win32"
23402342 >
23412343 <Tool
23422344 Name="VCCLCompilerTool"
@@ -2345,7 +2347,7 @@
23452347 />
23462348 </FileConfiguration>
23472349 <FileConfiguration
2348- Name="Private Debug|Win32"
2350+ Name="Debug|x64"
23492351 >
23502352 <Tool
23512353 Name="VCCLCompilerTool"
@@ -2354,7 +2356,7 @@
23542356 />
23552357 </FileConfiguration>
23562358 <FileConfiguration
2357- Name="Private Release|x64"
2359+ Name="Release|Win32"
23582360 >
23592361 <Tool
23602362 Name="VCCLCompilerTool"
@@ -2363,7 +2365,7 @@
23632365 />
23642366 </FileConfiguration>
23652367 <FileConfiguration
2366- Name="Debug|x64"
2368+ Name="Release|x64"
23672369 >
23682370 <Tool
23692371 Name="VCCLCompilerTool"
@@ -2372,7 +2374,7 @@
23722374 />
23732375 </FileConfiguration>
23742376 <FileConfiguration
2375- Name="Release|x64"
2377+ Name="Private Debug|Win32"
23762378 >
23772379 <Tool
23782380 Name="VCCLCompilerTool"
@@ -2531,7 +2533,7 @@
25312533 />
25322534 </FileConfiguration>
25332535 <FileConfiguration
2534- Name="Debug|Win32"
2536+ Name="Private Release|x64"
25352537 >
25362538 <Tool
25372539 Name="VCCLCompilerTool"
@@ -2540,7 +2542,7 @@
25402542 />
25412543 </FileConfiguration>
25422544 <FileConfiguration
2543- Name="Release|Win32"
2545+ Name="Debug|Win32"
25442546 >
25452547 <Tool
25462548 Name="VCCLCompilerTool"
@@ -2549,7 +2551,7 @@
25492551 />
25502552 </FileConfiguration>
25512553 <FileConfiguration
2552- Name="Private Debug|Win32"
2554+ Name="Debug|x64"
25532555 >
25542556 <Tool
25552557 Name="VCCLCompilerTool"
@@ -2558,7 +2560,7 @@
25582560 />
25592561 </FileConfiguration>
25602562 <FileConfiguration
2561- Name="Private Release|x64"
2563+ Name="Release|Win32"
25622564 >
25632565 <Tool
25642566 Name="VCCLCompilerTool"
@@ -2567,7 +2569,7 @@
25672569 />
25682570 </FileConfiguration>
25692571 <FileConfiguration
2570- Name="Debug|x64"
2572+ Name="Release|x64"
25712573 >
25722574 <Tool
25732575 Name="VCCLCompilerTool"
@@ -2576,7 +2578,7 @@
25762578 />
25772579 </FileConfiguration>
25782580 <FileConfiguration
2579- Name="Release|x64"
2581+ Name="Private Debug|Win32"
25802582 >
25812583 <Tool
25822584 Name="VCCLCompilerTool"
@@ -2607,7 +2609,7 @@
26072609 />
26082610 </FileConfiguration>
26092611 <FileConfiguration
2610- Name="Debug|Win32"
2612+ Name="Private Release|x64"
26112613 >
26122614 <Tool
26132615 Name="VCCLCompilerTool"
@@ -2616,7 +2618,7 @@
26162618 />
26172619 </FileConfiguration>
26182620 <FileConfiguration
2619- Name="Release|Win32"
2621+ Name="Debug|Win32"
26202622 >
26212623 <Tool
26222624 Name="VCCLCompilerTool"
@@ -2625,7 +2627,7 @@
26252627 />
26262628 </FileConfiguration>
26272629 <FileConfiguration
2628- Name="Private Debug|Win32"
2630+ Name="Debug|x64"
26292631 >
26302632 <Tool
26312633 Name="VCCLCompilerTool"
@@ -2634,7 +2636,7 @@
26342636 />
26352637 </FileConfiguration>
26362638 <FileConfiguration
2637- Name="Private Release|x64"
2639+ Name="Release|Win32"
26382640 >
26392641 <Tool
26402642 Name="VCCLCompilerTool"
@@ -2643,7 +2645,7 @@
26432645 />
26442646 </FileConfiguration>
26452647 <FileConfiguration
2646- Name="Debug|x64"
2648+ Name="Release|x64"
26472649 >
26482650 <Tool
26492651 Name="VCCLCompilerTool"
@@ -2652,7 +2654,7 @@
26522654 />
26532655 </FileConfiguration>
26542656 <FileConfiguration
2655- Name="Release|x64"
2657+ Name="Private Debug|Win32"
26562658 >
26572659 <Tool
26582660 Name="VCCLCompilerTool"
@@ -2688,11 +2690,11 @@
26882690 </File>
26892691 </Filter>
26902692 <Filter
2691- Name="Unix Source"
2693+ Name="Unix Includes"
26922694 >
26932695 </Filter>
26942696 <Filter
2695- Name="Unix Includes"
2697+ Name="Unix Source"
26962698 >
26972699 </Filter>
26982700 </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
6464 END
6565 #endif // APSTUDIO_INVOKED
6666
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+
67106 #endif // 日本語 resources
68107 /////////////////////////////////////////////////////////////////////////////
69108
--- 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 @@
376376 BrowseInformation="1"
377377 WarningLevel="3"
378378 SuppressStartupBanner="true"
379+ Detect64BitPortabilityProblems="true"
379380 DebugInformationFormat="3"
380381 />
381382 <Tool
@@ -721,8 +722,8 @@
721722 />
722723 <Tool
723724 Name="VCPostBuildEventTool"
724- Description="Copy exe to program files"
725- CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
725+ Description="Copy exe to pimp"
726+ CommandLine="copy debug\peercast.exe ..\pimp\&#x0D;&#x0A;"
726727 />
727728 </Configuration>
728729 <Configuration
@@ -771,6 +772,7 @@
771772 BrowseInformation="1"
772773 WarningLevel="3"
773774 SuppressStartupBanner="true"
775+ Detect64BitPortabilityProblems="true"
774776 DebugInformationFormat="3"
775777 />
776778 <Tool
@@ -823,6 +825,7 @@
823825 Name="VCPostBuildEventTool"
824826 Description="Copy exe to program files"
825827 CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
828+ ExcludedFromBuild="true"
826829 />
827830 </Configuration>
828831 </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){
353353 // ステータス表示
354354 Gdiplus::Image *img = NULL;
355355 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()){
358361 case Channel::S_IDLE:
359362 img = img_idle;
360363 break;
@@ -401,7 +404,13 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
401404 default:
402405 img = img_idle;
403406 break;
407+ }
408+ } else
409+ {
410+ // COUT用
411+ img = img_broad_ok;
404412 }
413+
405414 // 描画基点
406415 PointF origin(xx, yy);
407416 // ステータス表示位置
@@ -430,127 +439,146 @@ int ChannelData::drawChannel(Graphics *g, int x, int y){
430439 strBrush = ::new SolidBrush(Color::Black);
431440 }
432441 }
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ぐらいでおk
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;
491442
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- // リレーOK
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ぐらいでおk
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+ // リレーOK
526+ serventBrush = ::new SolidBrush(Color::Green);
518527 } 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+ }
521536 }
537+ } else {
538+ // 情報なし
539+ serventBrush = ::new SolidBrush(Color::Black);
522540 }
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);
529543
530- ::delete serventBrush;
531- sd = sd->getNextData();
532- index++;
544+ ::delete serventBrush;
545+ sd = sd->getNextData();
546+ index++;
547+ }
533548 }
534- }
535549
536- // 次の基点
537- origin.Y += 15;
550+ // 次の基点
551+ origin.Y += 15;
538552
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);
542556
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();
550566 }
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);
552581 }
553-
554582
555583 return (int)(origin.Y);
556584 }
@@ -881,6 +909,90 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
881909 c = c->next;
882910 }
883911
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+
884996 // チャンネルがなくなっている場合の処理
885997 cd = channelDataTop;
886998 ChannelData *prev = NULL;
@@ -892,6 +1004,7 @@ THREAD_PROC GUIDataUpdate(ThreadInfo *thread){
8921004 next = cd->getNextData();
8931005 if (!prev){
8941006 // 先頭のデータを削除
1007+ // ここメモリリークしそう by えるー
8951008 channelDataTop = next;
8961009 } else {
8971010 // 途中のデータを削除
@@ -1192,6 +1305,11 @@ void PopupServentMenu(int servent_id){
11921305 ServentData *sd = NULL;
11931306 ChannelData *cd = channelDataTop;
11941307 while(cd){
1308+ // COUT
1309+ if (cd->type == Servent::T_COUT
1310+ && cd->servent_id == servent_id)
1311+ break;
1312+
11951313 sd = cd->findServentData(servent_id);
11961314 if (sd){
11971315 break;
@@ -1199,7 +1317,9 @@ void PopupServentMenu(int servent_id){
11991317 cd = cd->getNextData();
12001318 }
12011319
1202- if (cd == NULL || sd == NULL){
1320+ if (cd == NULL || sd == NULL
1321+ && cd->type != Servent::T_COUT) // COUT
1322+ {
12031323 return;
12041324 }
12051325
@@ -1216,6 +1336,11 @@ void PopupServentMenu(int servent_id){
12161336
12171337 cd = channelDataTop;
12181338 while(cd){
1339+ // COUT
1340+ if (cd->type == Servent::T_COUT
1341+ && cd->servent_id == servent_id)
1342+ break;
1343+
12191344 sd = cd->findServentData(servent_id);
12201345 if (sd){
12211346 break;
@@ -1223,7 +1348,9 @@ void PopupServentMenu(int servent_id){
12231348 cd = cd->getNextData();
12241349 }
12251350
1226- if (cd == NULL || sd == NULL){
1351+ if (cd == NULL || sd == NULL
1352+ && cd->type != Servent::T_COUT) // COUT
1353+ {
12271354 return;
12281355 }
12291356
@@ -1236,6 +1363,11 @@ void PopupServentMenu(int servent_id){
12361363 switch(dwID){
12371364 case 1001: // 切断
12381365 s->thread.active = false;
1366+
1367+ // COUT切断
1368+ if (s->type == Servent::T_COUT)
1369+ s->thread.finish = true;
1370+
12391371 break;
12401372
12411373 }
@@ -1558,6 +1690,14 @@ void WmRButtonDownProc(HWND hwnd, LPARAM lParam){
15581690 cd->setSelected(TRUE);
15591691 channel_id = cd->getChannelId();
15601692 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+ }
15611701 } else {
15621702 if (cd->isSelected()){
15631703 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 @@
2222 #include "sys.h"
2323 #include "gdiplus.h"
2424 #include "channel.h"
25+#include "servent.h"
2526
2627 extern LRESULT CALLBACK GUIProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
2728 extern void ADDLOG(const char *str,int id,bool sel,void *data, LogBuffer::TYPE type);
@@ -175,6 +176,8 @@ public:
175176 selected = FALSE;
176177 serventDataTop = NULL;
177178 openFlg = FALSE;
179+ type = Servent::T_NONE;
180+ servent_id = -1;
178181 }
179182 int drawChannel(Gdiplus::Graphics *g, int x, int y);
180183
@@ -219,6 +222,9 @@ public:
219222 int getServentCount();
220223
221224 bool checkDown(int x, int y);
225+
226+ Servent::TYPE type; // COUTのサーバント情報保持用
227+ int servent_id; // 同上。channel_idで代用できたけどPublicにしたくない
222228 };
223229
224230
Show on old repository browser