• R/O
  • HTTP
  • SSH
  • HTTPS

コミット

タグ
未設定

よく使われているワード(クリックで追加)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

FLVなど sext styp のついた配信のリレーができない問題を修正するパッチ


コミットメタ情報

リビジョン0d67f511e5ec6233aad5d75594ac859d08cbbe62 (tree)
日時2009-05-31 23:02:22
作者eru <eru01@user...>
コミッターeru

ログメッセージ

IM0037

変更サマリ

差分

--- a/PeerCast.root/PeerCast/core/common/stream.h
+++ b/PeerCast.root/PeerCast/core/common/stream.h
@@ -442,12 +442,15 @@ public:
442442 }
443443
444444 WriteBufferStream(int l, Stream *out_)
445- :buf(new char[l])
445+ :buf(NULL)
446446 ,own(true)
447447 ,len(l)
448448 ,pos(0)
449449 ,out(out_)
450450 {
451+ buf = (char*)malloc(l);
452+ if (!buf)
453+ throw GeneralException("cannot allocate memory", 0x1234);
451454 }
452455
453456 virtual ~WriteBufferStream()
@@ -478,7 +481,7 @@ public:
478481 {
479482 if (own && buf)
480483 {
481- delete buf;
484+ ::free(buf);
482485 buf = NULL;
483486 own = false;
484487 }
--- a/PeerCast.root/PeerCast/core/common/version2.h
+++ b/PeerCast.root/PeerCast/core/common/version2.h
@@ -44,9 +44,9 @@ 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 = 36;
48-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0036)";
49-static const char *PCX_VERSTRING_EX = "v0.1218(IM0036)";
47+static const int PCP_CLIENT_VERSION_EX_NUMBER = 37;
48+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)";
49+static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)";
5050
5151 static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
5252 #endif
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -120,15 +120,14 @@
120120 />
121121 </Configuration>
122122 <Configuration
123- Name="Release|Win32"
124- OutputDirectory=".\Release"
125- IntermediateDirectory=".\Release"
123+ Name="Private Debug|x64"
124+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
125+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
126126 ConfigurationType="1"
127127 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
128128 UseOfMFC="0"
129129 ATLMinimizesCRunTimeLibraryUsage="false"
130130 CharacterSet="2"
131- WholeProgramOptimization="1"
132131 >
133132 <Tool
134133 Name="VCPreBuildEventTool"
@@ -144,30 +143,25 @@
144143 />
145144 <Tool
146145 Name="VCMIDLTool"
147- PreprocessorDefinitions="NDEBUG"
146+ PreprocessorDefinitions="_DEBUG"
148147 MkTypLibCompatible="true"
149148 SuppressStartupBanner="true"
150- TargetEnvironment="1"
151- TypeLibraryName=".\Release/Simple.tlb"
149+ TargetEnvironment="3"
150+ TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
152151 HeaderFileName=""
153152 />
154153 <Tool
155154 Name="VCCLCompilerTool"
156- Optimization="2"
157- InlineFunctionExpansion="1"
158- EnableIntrinsicFunctions="true"
159- FavorSizeOrSpeed="0"
160- EnableFiberSafeOptimizations="true"
155+ Optimization="0"
161156 AdditionalIncludeDirectories="../../../core,../../../core/common"
162- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
163- StringPooling="true"
164- ExceptionHandling="1"
165- RuntimeLibrary="0"
166- EnableFunctionLevelLinking="true"
167- PrecompiledHeaderFile=".\Release/Simple.pch"
168- AssemblerListingLocation=".\Release/"
169- ObjectFile=".\Release/"
170- ProgramDataBaseFileName=".\Release/"
157+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
158+ MinimalRebuild="true"
159+ BasicRuntimeChecks="3"
160+ RuntimeLibrary="1"
161+ PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
162+ AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
163+ ObjectFile=".\Simple___Win32_Private_Debug/"
164+ ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
171165 BrowseInformation="1"
172166 WarningLevel="3"
173167 SuppressStartupBanner="true"
@@ -178,7 +172,7 @@
178172 />
179173 <Tool
180174 Name="VCResourceCompilerTool"
181- PreprocessorDefinitions="NDEBUG"
175+ PreprocessorDefinitions="_DEBUG"
182176 Culture="1033"
183177 />
184178 <Tool
@@ -186,19 +180,16 @@
186180 />
187181 <Tool
188182 Name="VCLinkerTool"
189- AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
190- OutputFile="Release/PeerCast.exe"
183+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
184+ OutputFile="Debug/PeerCast.exe"
191185 LinkIncremental="1"
192186 SuppressStartupBanner="true"
193- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
194187 GenerateDebugInformation="true"
195- ProgramDatabaseFile=".\Release/PeerCast.pdb"
196- StripPrivateSymbols="PeerCast-dist.pdb"
197- GenerateMapFile="true"
188+ ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
198189 SubSystem="2"
199190 RandomizedBaseAddress="1"
200191 DataExecutionPrevention="0"
201- TargetMachine="1"
192+ TargetMachine="17"
202193 />
203194 <Tool
204195 Name="VCALinkTool"
@@ -212,7 +203,7 @@
212203 <Tool
213204 Name="VCBscMakeTool"
214205 SuppressStartupBanner="true"
215- OutputFile=".\Release/Simple.bsc"
206+ OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
216207 />
217208 <Tool
218209 Name="VCFxCopTool"
@@ -222,19 +213,20 @@
222213 />
223214 <Tool
224215 Name="VCPostBuildEventTool"
225- Description="Copy exe to pimp"
226- CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
216+ Description="Copy exe to program files"
217+ CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
227218 />
228219 </Configuration>
229220 <Configuration
230- Name="Private Release|Win32"
231- OutputDirectory=".\Simple___Win32_Private_Release"
232- IntermediateDirectory=".\Simple___Win32_Private_Release"
221+ Name="Release|Win32"
222+ OutputDirectory=".\Release"
223+ IntermediateDirectory=".\Release"
233224 ConfigurationType="1"
234225 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
235226 UseOfMFC="0"
236227 ATLMinimizesCRunTimeLibraryUsage="false"
237228 CharacterSet="2"
229+ WholeProgramOptimization="1"
238230 >
239231 <Tool
240232 Name="VCPreBuildEventTool"
@@ -254,25 +246,30 @@
254246 MkTypLibCompatible="true"
255247 SuppressStartupBanner="true"
256248 TargetEnvironment="1"
257- TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
249+ TypeLibraryName=".\Release/Simple.tlb"
258250 HeaderFileName=""
259251 />
260252 <Tool
261253 Name="VCCLCompilerTool"
262254 Optimization="2"
263255 InlineFunctionExpansion="1"
256+ EnableIntrinsicFunctions="true"
257+ FavorSizeOrSpeed="1"
258+ EnableFiberSafeOptimizations="true"
264259 AdditionalIncludeDirectories="../../../core,../../../core/common"
265- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
260+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
266261 StringPooling="true"
262+ ExceptionHandling="1"
267263 RuntimeLibrary="0"
268264 EnableFunctionLevelLinking="true"
269- PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
270- AssemblerListingLocation=".\Simple___Win32_Private_Release/"
271- ObjectFile=".\Simple___Win32_Private_Release/"
272- ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
265+ PrecompiledHeaderFile=".\Release/Simple.pch"
266+ AssemblerListingLocation=".\Release/"
267+ ObjectFile=".\Release/"
268+ ProgramDataBaseFileName=".\Release/"
273269 BrowseInformation="1"
274270 WarningLevel="3"
275271 SuppressStartupBanner="true"
272+ DebugInformationFormat="3"
276273 />
277274 <Tool
278275 Name="VCManagedResourceCompilerTool"
@@ -287,11 +284,15 @@
287284 />
288285 <Tool
289286 Name="VCLinkerTool"
290- AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
291- OutputFile="PrivRelease/PeerCast.exe"
287+ AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
288+ OutputFile="Release/PeerCast.exe"
292289 LinkIncremental="1"
293290 SuppressStartupBanner="true"
294- ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
291+ AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
292+ GenerateDebugInformation="true"
293+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
294+ StripPrivateSymbols="PeerCast-dist.pdb"
295+ GenerateMapFile="true"
295296 SubSystem="2"
296297 RandomizedBaseAddress="1"
297298 DataExecutionPrevention="0"
@@ -309,7 +310,7 @@
309310 <Tool
310311 Name="VCBscMakeTool"
311312 SuppressStartupBanner="true"
312- OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
313+ OutputFile=".\Release/Simple.bsc"
313314 />
314315 <Tool
315316 Name="VCFxCopTool"
@@ -319,19 +320,20 @@
319320 />
320321 <Tool
321322 Name="VCPostBuildEventTool"
322- Description="Copy exe to pimp &amp; program files"
323- CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
323+ Description="Copy exe to pimp"
324+ CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
324325 />
325326 </Configuration>
326327 <Configuration
327- Name="Debug|Win32"
328- OutputDirectory=".\Debug"
329- IntermediateDirectory=".\Debug"
328+ Name="Release|x64"
329+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
330+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
330331 ConfigurationType="1"
331332 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
332333 UseOfMFC="0"
333334 ATLMinimizesCRunTimeLibraryUsage="false"
334335 CharacterSet="2"
336+ WholeProgramOptimization="1"
335337 >
336338 <Tool
337339 Name="VCPreBuildEventTool"
@@ -347,36 +349,41 @@
347349 />
348350 <Tool
349351 Name="VCMIDLTool"
350- PreprocessorDefinitions="_DEBUG"
352+ PreprocessorDefinitions="NDEBUG"
351353 MkTypLibCompatible="true"
352354 SuppressStartupBanner="true"
353- TargetEnvironment="1"
354- TypeLibraryName=".\Debug/Simple.tlb"
355+ TargetEnvironment="3"
356+ TypeLibraryName=".\Release/Simple.tlb"
355357 HeaderFileName=""
356358 />
357359 <Tool
358360 Name="VCCLCompilerTool"
359- Optimization="0"
361+ Optimization="2"
362+ InlineFunctionExpansion="1"
363+ EnableIntrinsicFunctions="true"
364+ FavorSizeOrSpeed="0"
365+ EnableFiberSafeOptimizations="true"
360366 AdditionalIncludeDirectories="../../../core,../../../core/common"
361- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
362- MinimalRebuild="true"
363- BasicRuntimeChecks="3"
364- RuntimeLibrary="1"
365- PrecompiledHeaderFile=".\Debug/Simple.pch"
366- AssemblerListingLocation=".\Debug/"
367- ObjectFile=".\Debug/"
368- ProgramDataBaseFileName=".\Debug/"
367+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
368+ StringPooling="true"
369+ ExceptionHandling="1"
370+ RuntimeLibrary="0"
371+ EnableFunctionLevelLinking="true"
372+ PrecompiledHeaderFile=".\Release/Simple.pch"
373+ AssemblerListingLocation=".\Release/"
374+ ObjectFile=".\Release/"
375+ ProgramDataBaseFileName=".\Release/"
369376 BrowseInformation="1"
370377 WarningLevel="3"
371378 SuppressStartupBanner="true"
372- DebugInformationFormat="4"
379+ DebugInformationFormat="3"
373380 />
374381 <Tool
375382 Name="VCManagedResourceCompilerTool"
376383 />
377384 <Tool
378385 Name="VCResourceCompilerTool"
379- PreprocessorDefinitions="_DEBUG"
386+ PreprocessorDefinitions="NDEBUG"
380387 Culture="1033"
381388 />
382389 <Tool
@@ -385,17 +392,18 @@
385392 <Tool
386393 Name="VCLinkerTool"
387394 AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
388- OutputFile="Debug/PeerCast.exe"
395+ OutputFile="Release/PeerCast.exe"
389396 LinkIncremental="1"
390397 SuppressStartupBanner="true"
391- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Debug&quot;"
398+ AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
392399 GenerateDebugInformation="true"
393- ProgramDatabaseFile=".\Debug/PeerCast.pdb"
400+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
401+ StripPrivateSymbols="PeerCast-dist.pdb"
402+ GenerateMapFile="true"
394403 SubSystem="2"
395- HeapReserveSize="4194304"
396404 RandomizedBaseAddress="1"
397405 DataExecutionPrevention="0"
398- TargetMachine="1"
406+ TargetMachine="17"
399407 />
400408 <Tool
401409 Name="VCALinkTool"
@@ -409,7 +417,7 @@
409417 <Tool
410418 Name="VCBscMakeTool"
411419 SuppressStartupBanner="true"
412- OutputFile=".\Debug/Simple.bsc"
420+ OutputFile=".\Release/Simple.bsc"
413421 />
414422 <Tool
415423 Name="VCFxCopTool"
@@ -419,14 +427,14 @@
419427 />
420428 <Tool
421429 Name="VCPostBuildEventTool"
422- Description="Copy exe to program files"
423- CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
430+ Description="Copy exe to pimp"
431+ CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
424432 />
425433 </Configuration>
426434 <Configuration
427- Name="Private Debug|x64"
428- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
429- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
435+ Name="Private Release|Win32"
436+ OutputDirectory=".\Simple___Win32_Private_Release"
437+ IntermediateDirectory=".\Simple___Win32_Private_Release"
430438 ConfigurationType="1"
431439 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
432440 UseOfMFC="0"
@@ -447,36 +455,36 @@
447455 />
448456 <Tool
449457 Name="VCMIDLTool"
450- PreprocessorDefinitions="_DEBUG"
458+ PreprocessorDefinitions="NDEBUG"
451459 MkTypLibCompatible="true"
452460 SuppressStartupBanner="true"
453- TargetEnvironment="3"
454- TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
461+ TargetEnvironment="1"
462+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
455463 HeaderFileName=""
456464 />
457465 <Tool
458466 Name="VCCLCompilerTool"
459- Optimization="0"
467+ Optimization="2"
468+ InlineFunctionExpansion="1"
460469 AdditionalIncludeDirectories="../../../core,../../../core/common"
461- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
462- MinimalRebuild="true"
463- BasicRuntimeChecks="3"
464- RuntimeLibrary="1"
465- PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
466- AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
467- ObjectFile=".\Simple___Win32_Private_Debug/"
468- ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
470+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
471+ StringPooling="true"
472+ RuntimeLibrary="0"
473+ EnableFunctionLevelLinking="true"
474+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
475+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
476+ ObjectFile=".\Simple___Win32_Private_Release/"
477+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
469478 BrowseInformation="1"
470479 WarningLevel="3"
471480 SuppressStartupBanner="true"
472- DebugInformationFormat="3"
473481 />
474482 <Tool
475483 Name="VCManagedResourceCompilerTool"
476484 />
477485 <Tool
478486 Name="VCResourceCompilerTool"
479- PreprocessorDefinitions="_DEBUG"
487+ PreprocessorDefinitions="NDEBUG"
480488 Culture="1033"
481489 />
482490 <Tool
@@ -485,15 +493,14 @@
485493 <Tool
486494 Name="VCLinkerTool"
487495 AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
488- OutputFile="Debug/PeerCast.exe"
496+ OutputFile="PrivRelease/PeerCast.exe"
489497 LinkIncremental="1"
490498 SuppressStartupBanner="true"
491- GenerateDebugInformation="true"
492- ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
499+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
493500 SubSystem="2"
494501 RandomizedBaseAddress="1"
495502 DataExecutionPrevention="0"
496- TargetMachine="17"
503+ TargetMachine="1"
497504 />
498505 <Tool
499506 Name="VCALinkTool"
@@ -507,7 +514,7 @@
507514 <Tool
508515 Name="VCBscMakeTool"
509516 SuppressStartupBanner="true"
510- OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
517+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
511518 />
512519 <Tool
513520 Name="VCFxCopTool"
@@ -517,12 +524,12 @@
517524 />
518525 <Tool
519526 Name="VCPostBuildEventTool"
520- Description="Copy exe to program files"
521- CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
527+ Description="Copy exe to pimp &amp; program files"
528+ CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
522529 />
523530 </Configuration>
524531 <Configuration
525- Name="Release|x64"
532+ Name="Private Release|x64"
526533 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
527534 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
528535 ConfigurationType="1"
@@ -530,7 +537,6 @@
530537 UseOfMFC="0"
531538 ATLMinimizesCRunTimeLibraryUsage="false"
532539 CharacterSet="2"
533- WholeProgramOptimization="1"
534540 >
535541 <Tool
536542 Name="VCPreBuildEventTool"
@@ -550,30 +556,25 @@
550556 MkTypLibCompatible="true"
551557 SuppressStartupBanner="true"
552558 TargetEnvironment="3"
553- TypeLibraryName=".\Release/Simple.tlb"
559+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
554560 HeaderFileName=""
555561 />
556562 <Tool
557563 Name="VCCLCompilerTool"
558564 Optimization="2"
559565 InlineFunctionExpansion="1"
560- EnableIntrinsicFunctions="true"
561- FavorSizeOrSpeed="0"
562- EnableFiberSafeOptimizations="true"
563566 AdditionalIncludeDirectories="../../../core,../../../core/common"
564- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
567+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
565568 StringPooling="true"
566- ExceptionHandling="1"
567569 RuntimeLibrary="0"
568570 EnableFunctionLevelLinking="true"
569- PrecompiledHeaderFile=".\Release/Simple.pch"
570- AssemblerListingLocation=".\Release/"
571- ObjectFile=".\Release/"
572- ProgramDataBaseFileName=".\Release/"
571+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
572+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
573+ ObjectFile=".\Simple___Win32_Private_Release/"
574+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
573575 BrowseInformation="1"
574576 WarningLevel="3"
575577 SuppressStartupBanner="true"
576- DebugInformationFormat="3"
577578 />
578579 <Tool
579580 Name="VCManagedResourceCompilerTool"
@@ -588,15 +589,11 @@
588589 />
589590 <Tool
590591 Name="VCLinkerTool"
591- AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
592- OutputFile="Release/PeerCast.exe"
592+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
593+ OutputFile="PrivRelease/PeerCast.exe"
593594 LinkIncremental="1"
594595 SuppressStartupBanner="true"
595- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
596- GenerateDebugInformation="true"
597- ProgramDatabaseFile=".\Release/PeerCast.pdb"
598- StripPrivateSymbols="PeerCast-dist.pdb"
599- GenerateMapFile="true"
596+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
600597 SubSystem="2"
601598 RandomizedBaseAddress="1"
602599 DataExecutionPrevention="0"
@@ -614,7 +611,7 @@
614611 <Tool
615612 Name="VCBscMakeTool"
616613 SuppressStartupBanner="true"
617- OutputFile=".\Release/Simple.bsc"
614+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
618615 />
619616 <Tool
620617 Name="VCFxCopTool"
@@ -624,14 +621,14 @@
624621 />
625622 <Tool
626623 Name="VCPostBuildEventTool"
627- Description="Copy exe to pimp"
628- CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
624+ Description="Copy exe to pimp &amp; program files"
625+ CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
629626 />
630627 </Configuration>
631628 <Configuration
632- Name="Private Release|x64"
633- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
634- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
629+ Name="Debug|Win32"
630+ OutputDirectory=".\Debug"
631+ IntermediateDirectory=".\Debug"
635632 ConfigurationType="1"
636633 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
637634 UseOfMFC="0"
@@ -652,36 +649,36 @@
652649 />
653650 <Tool
654651 Name="VCMIDLTool"
655- PreprocessorDefinitions="NDEBUG"
652+ PreprocessorDefinitions="_DEBUG"
656653 MkTypLibCompatible="true"
657654 SuppressStartupBanner="true"
658- TargetEnvironment="3"
659- TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
655+ TargetEnvironment="1"
656+ TypeLibraryName=".\Debug/Simple.tlb"
660657 HeaderFileName=""
661658 />
662659 <Tool
663660 Name="VCCLCompilerTool"
664- Optimization="2"
665- InlineFunctionExpansion="1"
661+ Optimization="0"
666662 AdditionalIncludeDirectories="../../../core,../../../core/common"
667- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
668- StringPooling="true"
669- RuntimeLibrary="0"
670- EnableFunctionLevelLinking="true"
671- PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
672- AssemblerListingLocation=".\Simple___Win32_Private_Release/"
673- ObjectFile=".\Simple___Win32_Private_Release/"
674- ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
663+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
664+ MinimalRebuild="true"
665+ BasicRuntimeChecks="3"
666+ RuntimeLibrary="1"
667+ PrecompiledHeaderFile=".\Debug/Simple.pch"
668+ AssemblerListingLocation=".\Debug/"
669+ ObjectFile=".\Debug/"
670+ ProgramDataBaseFileName=".\Debug/"
675671 BrowseInformation="1"
676672 WarningLevel="3"
677673 SuppressStartupBanner="true"
674+ DebugInformationFormat="4"
678675 />
679676 <Tool
680677 Name="VCManagedResourceCompilerTool"
681678 />
682679 <Tool
683680 Name="VCResourceCompilerTool"
684- PreprocessorDefinitions="NDEBUG"
681+ PreprocessorDefinitions="_DEBUG"
685682 Culture="1033"
686683 />
687684 <Tool
@@ -689,15 +686,18 @@
689686 />
690687 <Tool
691688 Name="VCLinkerTool"
692- AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
693- OutputFile="PrivRelease/PeerCast.exe"
689+ AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
690+ OutputFile="Debug/PeerCast.exe"
694691 LinkIncremental="1"
695692 SuppressStartupBanner="true"
696- ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
693+ AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Debug&quot;"
694+ GenerateDebugInformation="true"
695+ ProgramDatabaseFile=".\Debug/PeerCast.pdb"
697696 SubSystem="2"
697+ HeapReserveSize="4194304"
698698 RandomizedBaseAddress="1"
699699 DataExecutionPrevention="0"
700- TargetMachine="17"
700+ TargetMachine="1"
701701 />
702702 <Tool
703703 Name="VCALinkTool"
@@ -711,7 +711,7 @@
711711 <Tool
712712 Name="VCBscMakeTool"
713713 SuppressStartupBanner="true"
714- OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
714+ OutputFile=".\Debug/Simple.bsc"
715715 />
716716 <Tool
717717 Name="VCFxCopTool"
@@ -721,8 +721,8 @@
721721 />
722722 <Tool
723723 Name="VCPostBuildEventTool"
724- Description="Copy exe to pimp &amp; program files"
725- CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
724+ Description="Copy exe to program files"
725+ CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
726726 />
727727 </Configuration>
728728 <Configuration
@@ -846,7 +846,7 @@
846846 />
847847 </FileConfiguration>
848848 <FileConfiguration
849- Name="Release|Win32"
849+ Name="Private Debug|x64"
850850 >
851851 <Tool
852852 Name="VCCLCompilerTool"
@@ -855,7 +855,7 @@
855855 />
856856 </FileConfiguration>
857857 <FileConfiguration
858- Name="Private Release|Win32"
858+ Name="Release|Win32"
859859 >
860860 <Tool
861861 Name="VCCLCompilerTool"
@@ -864,7 +864,7 @@
864864 />
865865 </FileConfiguration>
866866 <FileConfiguration
867- Name="Debug|Win32"
867+ Name="Release|x64"
868868 >
869869 <Tool
870870 Name="VCCLCompilerTool"
@@ -873,7 +873,7 @@
873873 />
874874 </FileConfiguration>
875875 <FileConfiguration
876- Name="Private Debug|x64"
876+ Name="Private Release|Win32"
877877 >
878878 <Tool
879879 Name="VCCLCompilerTool"
@@ -882,7 +882,7 @@
882882 />
883883 </FileConfiguration>
884884 <FileConfiguration
885- Name="Release|x64"
885+ Name="Private Release|x64"
886886 >
887887 <Tool
888888 Name="VCCLCompilerTool"
@@ -891,7 +891,7 @@
891891 />
892892 </FileConfiguration>
893893 <FileConfiguration
894- Name="Private Release|x64"
894+ Name="Debug|Win32"
895895 >
896896 <Tool
897897 Name="VCCLCompilerTool"
@@ -922,7 +922,7 @@
922922 />
923923 </FileConfiguration>
924924 <FileConfiguration
925- Name="Release|Win32"
925+ Name="Private Debug|x64"
926926 >
927927 <Tool
928928 Name="VCCLCompilerTool"
@@ -931,7 +931,7 @@
931931 />
932932 </FileConfiguration>
933933 <FileConfiguration
934- Name="Private Release|Win32"
934+ Name="Release|Win32"
935935 >
936936 <Tool
937937 Name="VCCLCompilerTool"
@@ -940,7 +940,7 @@
940940 />
941941 </FileConfiguration>
942942 <FileConfiguration
943- Name="Debug|Win32"
943+ Name="Release|x64"
944944 >
945945 <Tool
946946 Name="VCCLCompilerTool"
@@ -949,7 +949,7 @@
949949 />
950950 </FileConfiguration>
951951 <FileConfiguration
952- Name="Private Debug|x64"
952+ Name="Private Release|Win32"
953953 >
954954 <Tool
955955 Name="VCCLCompilerTool"
@@ -958,7 +958,7 @@
958958 />
959959 </FileConfiguration>
960960 <FileConfiguration
961- Name="Release|x64"
961+ Name="Private Release|x64"
962962 >
963963 <Tool
964964 Name="VCCLCompilerTool"
@@ -967,7 +967,7 @@
967967 />
968968 </FileConfiguration>
969969 <FileConfiguration
970- Name="Private Release|x64"
970+ Name="Debug|Win32"
971971 >
972972 <Tool
973973 Name="VCCLCompilerTool"
@@ -998,7 +998,7 @@
998998 />
999999 </FileConfiguration>
10001000 <FileConfiguration
1001- Name="Release|Win32"
1001+ Name="Private Debug|x64"
10021002 >
10031003 <Tool
10041004 Name="VCCLCompilerTool"
@@ -1007,7 +1007,7 @@
10071007 />
10081008 </FileConfiguration>
10091009 <FileConfiguration
1010- Name="Private Release|Win32"
1010+ Name="Release|Win32"
10111011 >
10121012 <Tool
10131013 Name="VCCLCompilerTool"
@@ -1016,7 +1016,7 @@
10161016 />
10171017 </FileConfiguration>
10181018 <FileConfiguration
1019- Name="Debug|Win32"
1019+ Name="Release|x64"
10201020 >
10211021 <Tool
10221022 Name="VCCLCompilerTool"
@@ -1025,7 +1025,7 @@
10251025 />
10261026 </FileConfiguration>
10271027 <FileConfiguration
1028- Name="Private Debug|x64"
1028+ Name="Private Release|Win32"
10291029 >
10301030 <Tool
10311031 Name="VCCLCompilerTool"
@@ -1034,7 +1034,7 @@
10341034 />
10351035 </FileConfiguration>
10361036 <FileConfiguration
1037- Name="Release|x64"
1037+ Name="Private Release|x64"
10381038 >
10391039 <Tool
10401040 Name="VCCLCompilerTool"
@@ -1043,7 +1043,7 @@
10431043 />
10441044 </FileConfiguration>
10451045 <FileConfiguration
1046- Name="Private Release|x64"
1046+ Name="Debug|Win32"
10471047 >
10481048 <Tool
10491049 Name="VCCLCompilerTool"
@@ -1074,7 +1074,7 @@
10741074 />
10751075 </FileConfiguration>
10761076 <FileConfiguration
1077- Name="Release|Win32"
1077+ Name="Private Debug|x64"
10781078 >
10791079 <Tool
10801080 Name="VCCLCompilerTool"
@@ -1083,7 +1083,7 @@
10831083 />
10841084 </FileConfiguration>
10851085 <FileConfiguration
1086- Name="Private Release|Win32"
1086+ Name="Release|Win32"
10871087 >
10881088 <Tool
10891089 Name="VCCLCompilerTool"
@@ -1092,7 +1092,7 @@
10921092 />
10931093 </FileConfiguration>
10941094 <FileConfiguration
1095- Name="Debug|Win32"
1095+ Name="Release|x64"
10961096 >
10971097 <Tool
10981098 Name="VCCLCompilerTool"
@@ -1101,7 +1101,7 @@
11011101 />
11021102 </FileConfiguration>
11031103 <FileConfiguration
1104- Name="Private Debug|x64"
1104+ Name="Private Release|Win32"
11051105 >
11061106 <Tool
11071107 Name="VCCLCompilerTool"
@@ -1110,7 +1110,7 @@
11101110 />
11111111 </FileConfiguration>
11121112 <FileConfiguration
1113- Name="Release|x64"
1113+ Name="Private Release|x64"
11141114 >
11151115 <Tool
11161116 Name="VCCLCompilerTool"
@@ -1119,7 +1119,7 @@
11191119 />
11201120 </FileConfiguration>
11211121 <FileConfiguration
1122- Name="Private Release|x64"
1122+ Name="Debug|Win32"
11231123 >
11241124 <Tool
11251125 Name="VCCLCompilerTool"
@@ -1149,7 +1149,7 @@
11491149 />
11501150 </FileConfiguration>
11511151 <FileConfiguration
1152- Name="Release|Win32"
1152+ Name="Private Debug|x64"
11531153 >
11541154 <Tool
11551155 Name="VCResourceCompilerTool"
@@ -1157,7 +1157,7 @@
11571157 />
11581158 </FileConfiguration>
11591159 <FileConfiguration
1160- Name="Private Release|Win32"
1160+ Name="Release|Win32"
11611161 >
11621162 <Tool
11631163 Name="VCResourceCompilerTool"
@@ -1165,7 +1165,7 @@
11651165 />
11661166 </FileConfiguration>
11671167 <FileConfiguration
1168- Name="Debug|Win32"
1168+ Name="Release|x64"
11691169 >
11701170 <Tool
11711171 Name="VCResourceCompilerTool"
@@ -1173,7 +1173,7 @@
11731173 />
11741174 </FileConfiguration>
11751175 <FileConfiguration
1176- Name="Private Debug|x64"
1176+ Name="Private Release|Win32"
11771177 >
11781178 <Tool
11791179 Name="VCResourceCompilerTool"
@@ -1181,7 +1181,7 @@
11811181 />
11821182 </FileConfiguration>
11831183 <FileConfiguration
1184- Name="Release|x64"
1184+ Name="Private Release|x64"
11851185 >
11861186 <Tool
11871187 Name="VCResourceCompilerTool"
@@ -1189,7 +1189,7 @@
11891189 />
11901190 </FileConfiguration>
11911191 <FileConfiguration
1192- Name="Private Release|x64"
1192+ Name="Debug|Win32"
11931193 >
11941194 <Tool
11951195 Name="VCResourceCompilerTool"
@@ -1220,7 +1220,7 @@
12201220 />
12211221 </FileConfiguration>
12221222 <FileConfiguration
1223- Name="Release|Win32"
1223+ Name="Private Debug|x64"
12241224 >
12251225 <Tool
12261226 Name="VCCLCompilerTool"
@@ -1231,7 +1231,7 @@
12311231 />
12321232 </FileConfiguration>
12331233 <FileConfiguration
1234- Name="Private Release|Win32"
1234+ Name="Release|Win32"
12351235 >
12361236 <Tool
12371237 Name="VCCLCompilerTool"
@@ -1242,7 +1242,7 @@
12421242 />
12431243 </FileConfiguration>
12441244 <FileConfiguration
1245- Name="Debug|Win32"
1245+ Name="Release|x64"
12461246 >
12471247 <Tool
12481248 Name="VCCLCompilerTool"
@@ -1253,7 +1253,7 @@
12531253 />
12541254 </FileConfiguration>
12551255 <FileConfiguration
1256- Name="Private Debug|x64"
1256+ Name="Private Release|Win32"
12571257 >
12581258 <Tool
12591259 Name="VCCLCompilerTool"
@@ -1264,7 +1264,7 @@
12641264 />
12651265 </FileConfiguration>
12661266 <FileConfiguration
1267- Name="Release|x64"
1267+ Name="Private Release|x64"
12681268 >
12691269 <Tool
12701270 Name="VCCLCompilerTool"
@@ -1275,7 +1275,7 @@
12751275 />
12761276 </FileConfiguration>
12771277 <FileConfiguration
1278- Name="Private Release|x64"
1278+ Name="Debug|Win32"
12791279 >
12801280 <Tool
12811281 Name="VCCLCompilerTool"
@@ -1310,7 +1310,7 @@
13101310 />
13111311 </FileConfiguration>
13121312 <FileConfiguration
1313- Name="Release|Win32"
1313+ Name="Private Debug|x64"
13141314 >
13151315 <Tool
13161316 Name="VCCLCompilerTool"
@@ -1319,7 +1319,7 @@
13191319 />
13201320 </FileConfiguration>
13211321 <FileConfiguration
1322- Name="Private Release|Win32"
1322+ Name="Release|Win32"
13231323 >
13241324 <Tool
13251325 Name="VCCLCompilerTool"
@@ -1328,7 +1328,7 @@
13281328 />
13291329 </FileConfiguration>
13301330 <FileConfiguration
1331- Name="Debug|Win32"
1331+ Name="Release|x64"
13321332 >
13331333 <Tool
13341334 Name="VCCLCompilerTool"
@@ -1337,7 +1337,7 @@
13371337 />
13381338 </FileConfiguration>
13391339 <FileConfiguration
1340- Name="Private Debug|x64"
1340+ Name="Private Release|Win32"
13411341 >
13421342 <Tool
13431343 Name="VCCLCompilerTool"
@@ -1346,7 +1346,7 @@
13461346 />
13471347 </FileConfiguration>
13481348 <FileConfiguration
1349- Name="Release|x64"
1349+ Name="Private Release|x64"
13501350 >
13511351 <Tool
13521352 Name="VCCLCompilerTool"
@@ -1355,7 +1355,7 @@
13551355 />
13561356 </FileConfiguration>
13571357 <FileConfiguration
1358- Name="Private Release|x64"
1358+ Name="Debug|Win32"
13591359 >
13601360 <Tool
13611361 Name="VCCLCompilerTool"
--- a/c:/Git/PeerCast.root/PeerCast/core/common/stream.h
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/stream.h
@@ -442,12 +442,15 @@ public:
442442 }
443443
444444 WriteBufferStream(int l, Stream *out_)
445- :buf(new char[l])
445+ :buf(NULL)
446446 ,own(true)
447447 ,len(l)
448448 ,pos(0)
449449 ,out(out_)
450450 {
451+ buf = (char*)malloc(l);
452+ if (!buf)
453+ throw GeneralException("cannot allocate memory", 0x1234);
451454 }
452455
453456 virtual ~WriteBufferStream()
@@ -478,7 +481,7 @@ public:
478481 {
479482 if (own && buf)
480483 {
481- delete buf;
484+ ::free(buf);
482485 buf = NULL;
483486 own = false;
484487 }
--- a/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
@@ -44,9 +44,9 @@ 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 = 36;
48-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0036)";
49-static const char *PCX_VERSTRING_EX = "v0.1218(IM0036)";
47+static const int PCP_CLIENT_VERSION_EX_NUMBER = 37;
48+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)";
49+static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)";
5050
5151 static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
5252 #endif
--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -120,15 +120,14 @@
120120 />
121121 </Configuration>
122122 <Configuration
123- Name="Release|Win32"
124- OutputDirectory=".\Release"
125- IntermediateDirectory=".\Release"
123+ Name="Private Debug|x64"
124+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
125+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
126126 ConfigurationType="1"
127127 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
128128 UseOfMFC="0"
129129 ATLMinimizesCRunTimeLibraryUsage="false"
130130 CharacterSet="2"
131- WholeProgramOptimization="1"
132131 >
133132 <Tool
134133 Name="VCPreBuildEventTool"
@@ -144,30 +143,25 @@
144143 />
145144 <Tool
146145 Name="VCMIDLTool"
147- PreprocessorDefinitions="NDEBUG"
146+ PreprocessorDefinitions="_DEBUG"
148147 MkTypLibCompatible="true"
149148 SuppressStartupBanner="true"
150- TargetEnvironment="1"
151- TypeLibraryName=".\Release/Simple.tlb"
149+ TargetEnvironment="3"
150+ TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
152151 HeaderFileName=""
153152 />
154153 <Tool
155154 Name="VCCLCompilerTool"
156- Optimization="2"
157- InlineFunctionExpansion="1"
158- EnableIntrinsicFunctions="true"
159- FavorSizeOrSpeed="0"
160- EnableFiberSafeOptimizations="true"
155+ Optimization="0"
161156 AdditionalIncludeDirectories="../../../core,../../../core/common"
162- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
163- StringPooling="true"
164- ExceptionHandling="1"
165- RuntimeLibrary="0"
166- EnableFunctionLevelLinking="true"
167- PrecompiledHeaderFile=".\Release/Simple.pch"
168- AssemblerListingLocation=".\Release/"
169- ObjectFile=".\Release/"
170- ProgramDataBaseFileName=".\Release/"
157+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
158+ MinimalRebuild="true"
159+ BasicRuntimeChecks="3"
160+ RuntimeLibrary="1"
161+ PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
162+ AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
163+ ObjectFile=".\Simple___Win32_Private_Debug/"
164+ ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
171165 BrowseInformation="1"
172166 WarningLevel="3"
173167 SuppressStartupBanner="true"
@@ -178,7 +172,7 @@
178172 />
179173 <Tool
180174 Name="VCResourceCompilerTool"
181- PreprocessorDefinitions="NDEBUG"
175+ PreprocessorDefinitions="_DEBUG"
182176 Culture="1033"
183177 />
184178 <Tool
@@ -186,19 +180,16 @@
186180 />
187181 <Tool
188182 Name="VCLinkerTool"
189- AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
190- OutputFile="Release/PeerCast.exe"
183+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
184+ OutputFile="Debug/PeerCast.exe"
191185 LinkIncremental="1"
192186 SuppressStartupBanner="true"
193- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
194187 GenerateDebugInformation="true"
195- ProgramDatabaseFile=".\Release/PeerCast.pdb"
196- StripPrivateSymbols="PeerCast-dist.pdb"
197- GenerateMapFile="true"
188+ ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
198189 SubSystem="2"
199190 RandomizedBaseAddress="1"
200191 DataExecutionPrevention="0"
201- TargetMachine="1"
192+ TargetMachine="17"
202193 />
203194 <Tool
204195 Name="VCALinkTool"
@@ -212,7 +203,7 @@
212203 <Tool
213204 Name="VCBscMakeTool"
214205 SuppressStartupBanner="true"
215- OutputFile=".\Release/Simple.bsc"
206+ OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
216207 />
217208 <Tool
218209 Name="VCFxCopTool"
@@ -222,19 +213,20 @@
222213 />
223214 <Tool
224215 Name="VCPostBuildEventTool"
225- Description="Copy exe to pimp"
226- CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
216+ Description="Copy exe to program files"
217+ CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
227218 />
228219 </Configuration>
229220 <Configuration
230- Name="Private Release|Win32"
231- OutputDirectory=".\Simple___Win32_Private_Release"
232- IntermediateDirectory=".\Simple___Win32_Private_Release"
221+ Name="Release|Win32"
222+ OutputDirectory=".\Release"
223+ IntermediateDirectory=".\Release"
233224 ConfigurationType="1"
234225 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
235226 UseOfMFC="0"
236227 ATLMinimizesCRunTimeLibraryUsage="false"
237228 CharacterSet="2"
229+ WholeProgramOptimization="1"
238230 >
239231 <Tool
240232 Name="VCPreBuildEventTool"
@@ -254,25 +246,30 @@
254246 MkTypLibCompatible="true"
255247 SuppressStartupBanner="true"
256248 TargetEnvironment="1"
257- TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
249+ TypeLibraryName=".\Release/Simple.tlb"
258250 HeaderFileName=""
259251 />
260252 <Tool
261253 Name="VCCLCompilerTool"
262254 Optimization="2"
263255 InlineFunctionExpansion="1"
256+ EnableIntrinsicFunctions="true"
257+ FavorSizeOrSpeed="1"
258+ EnableFiberSafeOptimizations="true"
264259 AdditionalIncludeDirectories="../../../core,../../../core/common"
265- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
260+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
266261 StringPooling="true"
262+ ExceptionHandling="1"
267263 RuntimeLibrary="0"
268264 EnableFunctionLevelLinking="true"
269- PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
270- AssemblerListingLocation=".\Simple___Win32_Private_Release/"
271- ObjectFile=".\Simple___Win32_Private_Release/"
272- ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
265+ PrecompiledHeaderFile=".\Release/Simple.pch"
266+ AssemblerListingLocation=".\Release/"
267+ ObjectFile=".\Release/"
268+ ProgramDataBaseFileName=".\Release/"
273269 BrowseInformation="1"
274270 WarningLevel="3"
275271 SuppressStartupBanner="true"
272+ DebugInformationFormat="3"
276273 />
277274 <Tool
278275 Name="VCManagedResourceCompilerTool"
@@ -287,11 +284,15 @@
287284 />
288285 <Tool
289286 Name="VCLinkerTool"
290- AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
291- OutputFile="PrivRelease/PeerCast.exe"
287+ AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
288+ OutputFile="Release/PeerCast.exe"
292289 LinkIncremental="1"
293290 SuppressStartupBanner="true"
294- ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
291+ AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
292+ GenerateDebugInformation="true"
293+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
294+ StripPrivateSymbols="PeerCast-dist.pdb"
295+ GenerateMapFile="true"
295296 SubSystem="2"
296297 RandomizedBaseAddress="1"
297298 DataExecutionPrevention="0"
@@ -309,7 +310,7 @@
309310 <Tool
310311 Name="VCBscMakeTool"
311312 SuppressStartupBanner="true"
312- OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
313+ OutputFile=".\Release/Simple.bsc"
313314 />
314315 <Tool
315316 Name="VCFxCopTool"
@@ -319,19 +320,20 @@
319320 />
320321 <Tool
321322 Name="VCPostBuildEventTool"
322- Description="Copy exe to pimp &amp; program files"
323- CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
323+ Description="Copy exe to pimp"
324+ CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
324325 />
325326 </Configuration>
326327 <Configuration
327- Name="Debug|Win32"
328- OutputDirectory=".\Debug"
329- IntermediateDirectory=".\Debug"
328+ Name="Release|x64"
329+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
330+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
330331 ConfigurationType="1"
331332 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
332333 UseOfMFC="0"
333334 ATLMinimizesCRunTimeLibraryUsage="false"
334335 CharacterSet="2"
336+ WholeProgramOptimization="1"
335337 >
336338 <Tool
337339 Name="VCPreBuildEventTool"
@@ -347,36 +349,41 @@
347349 />
348350 <Tool
349351 Name="VCMIDLTool"
350- PreprocessorDefinitions="_DEBUG"
352+ PreprocessorDefinitions="NDEBUG"
351353 MkTypLibCompatible="true"
352354 SuppressStartupBanner="true"
353- TargetEnvironment="1"
354- TypeLibraryName=".\Debug/Simple.tlb"
355+ TargetEnvironment="3"
356+ TypeLibraryName=".\Release/Simple.tlb"
355357 HeaderFileName=""
356358 />
357359 <Tool
358360 Name="VCCLCompilerTool"
359- Optimization="0"
361+ Optimization="2"
362+ InlineFunctionExpansion="1"
363+ EnableIntrinsicFunctions="true"
364+ FavorSizeOrSpeed="0"
365+ EnableFiberSafeOptimizations="true"
360366 AdditionalIncludeDirectories="../../../core,../../../core/common"
361- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
362- MinimalRebuild="true"
363- BasicRuntimeChecks="3"
364- RuntimeLibrary="1"
365- PrecompiledHeaderFile=".\Debug/Simple.pch"
366- AssemblerListingLocation=".\Debug/"
367- ObjectFile=".\Debug/"
368- ProgramDataBaseFileName=".\Debug/"
367+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
368+ StringPooling="true"
369+ ExceptionHandling="1"
370+ RuntimeLibrary="0"
371+ EnableFunctionLevelLinking="true"
372+ PrecompiledHeaderFile=".\Release/Simple.pch"
373+ AssemblerListingLocation=".\Release/"
374+ ObjectFile=".\Release/"
375+ ProgramDataBaseFileName=".\Release/"
369376 BrowseInformation="1"
370377 WarningLevel="3"
371378 SuppressStartupBanner="true"
372- DebugInformationFormat="4"
379+ DebugInformationFormat="3"
373380 />
374381 <Tool
375382 Name="VCManagedResourceCompilerTool"
376383 />
377384 <Tool
378385 Name="VCResourceCompilerTool"
379- PreprocessorDefinitions="_DEBUG"
386+ PreprocessorDefinitions="NDEBUG"
380387 Culture="1033"
381388 />
382389 <Tool
@@ -385,17 +392,18 @@
385392 <Tool
386393 Name="VCLinkerTool"
387394 AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
388- OutputFile="Debug/PeerCast.exe"
395+ OutputFile="Release/PeerCast.exe"
389396 LinkIncremental="1"
390397 SuppressStartupBanner="true"
391- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Debug&quot;"
398+ AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
392399 GenerateDebugInformation="true"
393- ProgramDatabaseFile=".\Debug/PeerCast.pdb"
400+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
401+ StripPrivateSymbols="PeerCast-dist.pdb"
402+ GenerateMapFile="true"
394403 SubSystem="2"
395- HeapReserveSize="4194304"
396404 RandomizedBaseAddress="1"
397405 DataExecutionPrevention="0"
398- TargetMachine="1"
406+ TargetMachine="17"
399407 />
400408 <Tool
401409 Name="VCALinkTool"
@@ -409,7 +417,7 @@
409417 <Tool
410418 Name="VCBscMakeTool"
411419 SuppressStartupBanner="true"
412- OutputFile=".\Debug/Simple.bsc"
420+ OutputFile=".\Release/Simple.bsc"
413421 />
414422 <Tool
415423 Name="VCFxCopTool"
@@ -419,14 +427,14 @@
419427 />
420428 <Tool
421429 Name="VCPostBuildEventTool"
422- Description="Copy exe to program files"
423- CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
430+ Description="Copy exe to pimp"
431+ CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
424432 />
425433 </Configuration>
426434 <Configuration
427- Name="Private Debug|x64"
428- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
429- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
435+ Name="Private Release|Win32"
436+ OutputDirectory=".\Simple___Win32_Private_Release"
437+ IntermediateDirectory=".\Simple___Win32_Private_Release"
430438 ConfigurationType="1"
431439 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
432440 UseOfMFC="0"
@@ -447,36 +455,36 @@
447455 />
448456 <Tool
449457 Name="VCMIDLTool"
450- PreprocessorDefinitions="_DEBUG"
458+ PreprocessorDefinitions="NDEBUG"
451459 MkTypLibCompatible="true"
452460 SuppressStartupBanner="true"
453- TargetEnvironment="3"
454- TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
461+ TargetEnvironment="1"
462+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
455463 HeaderFileName=""
456464 />
457465 <Tool
458466 Name="VCCLCompilerTool"
459- Optimization="0"
467+ Optimization="2"
468+ InlineFunctionExpansion="1"
460469 AdditionalIncludeDirectories="../../../core,../../../core/common"
461- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
462- MinimalRebuild="true"
463- BasicRuntimeChecks="3"
464- RuntimeLibrary="1"
465- PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
466- AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
467- ObjectFile=".\Simple___Win32_Private_Debug/"
468- ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
470+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
471+ StringPooling="true"
472+ RuntimeLibrary="0"
473+ EnableFunctionLevelLinking="true"
474+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
475+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
476+ ObjectFile=".\Simple___Win32_Private_Release/"
477+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
469478 BrowseInformation="1"
470479 WarningLevel="3"
471480 SuppressStartupBanner="true"
472- DebugInformationFormat="3"
473481 />
474482 <Tool
475483 Name="VCManagedResourceCompilerTool"
476484 />
477485 <Tool
478486 Name="VCResourceCompilerTool"
479- PreprocessorDefinitions="_DEBUG"
487+ PreprocessorDefinitions="NDEBUG"
480488 Culture="1033"
481489 />
482490 <Tool
@@ -485,15 +493,14 @@
485493 <Tool
486494 Name="VCLinkerTool"
487495 AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
488- OutputFile="Debug/PeerCast.exe"
496+ OutputFile="PrivRelease/PeerCast.exe"
489497 LinkIncremental="1"
490498 SuppressStartupBanner="true"
491- GenerateDebugInformation="true"
492- ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
499+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
493500 SubSystem="2"
494501 RandomizedBaseAddress="1"
495502 DataExecutionPrevention="0"
496- TargetMachine="17"
503+ TargetMachine="1"
497504 />
498505 <Tool
499506 Name="VCALinkTool"
@@ -507,7 +514,7 @@
507514 <Tool
508515 Name="VCBscMakeTool"
509516 SuppressStartupBanner="true"
510- OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
517+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
511518 />
512519 <Tool
513520 Name="VCFxCopTool"
@@ -517,12 +524,12 @@
517524 />
518525 <Tool
519526 Name="VCPostBuildEventTool"
520- Description="Copy exe to program files"
521- CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
527+ Description="Copy exe to pimp &amp; program files"
528+ CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
522529 />
523530 </Configuration>
524531 <Configuration
525- Name="Release|x64"
532+ Name="Private Release|x64"
526533 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
527534 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
528535 ConfigurationType="1"
@@ -530,7 +537,6 @@
530537 UseOfMFC="0"
531538 ATLMinimizesCRunTimeLibraryUsage="false"
532539 CharacterSet="2"
533- WholeProgramOptimization="1"
534540 >
535541 <Tool
536542 Name="VCPreBuildEventTool"
@@ -550,30 +556,25 @@
550556 MkTypLibCompatible="true"
551557 SuppressStartupBanner="true"
552558 TargetEnvironment="3"
553- TypeLibraryName=".\Release/Simple.tlb"
559+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
554560 HeaderFileName=""
555561 />
556562 <Tool
557563 Name="VCCLCompilerTool"
558564 Optimization="2"
559565 InlineFunctionExpansion="1"
560- EnableIntrinsicFunctions="true"
561- FavorSizeOrSpeed="0"
562- EnableFiberSafeOptimizations="true"
563566 AdditionalIncludeDirectories="../../../core,../../../core/common"
564- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
567+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
565568 StringPooling="true"
566- ExceptionHandling="1"
567569 RuntimeLibrary="0"
568570 EnableFunctionLevelLinking="true"
569- PrecompiledHeaderFile=".\Release/Simple.pch"
570- AssemblerListingLocation=".\Release/"
571- ObjectFile=".\Release/"
572- ProgramDataBaseFileName=".\Release/"
571+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
572+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
573+ ObjectFile=".\Simple___Win32_Private_Release/"
574+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
573575 BrowseInformation="1"
574576 WarningLevel="3"
575577 SuppressStartupBanner="true"
576- DebugInformationFormat="3"
577578 />
578579 <Tool
579580 Name="VCManagedResourceCompilerTool"
@@ -588,15 +589,11 @@
588589 />
589590 <Tool
590591 Name="VCLinkerTool"
591- AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
592- OutputFile="Release/PeerCast.exe"
592+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
593+ OutputFile="PrivRelease/PeerCast.exe"
593594 LinkIncremental="1"
594595 SuppressStartupBanner="true"
595- AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release&quot;"
596- GenerateDebugInformation="true"
597- ProgramDatabaseFile=".\Release/PeerCast.pdb"
598- StripPrivateSymbols="PeerCast-dist.pdb"
599- GenerateMapFile="true"
596+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
600597 SubSystem="2"
601598 RandomizedBaseAddress="1"
602599 DataExecutionPrevention="0"
@@ -614,7 +611,7 @@
614611 <Tool
615612 Name="VCBscMakeTool"
616613 SuppressStartupBanner="true"
617- OutputFile=".\Release/Simple.bsc"
614+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
618615 />
619616 <Tool
620617 Name="VCFxCopTool"
@@ -624,14 +621,14 @@
624621 />
625622 <Tool
626623 Name="VCPostBuildEventTool"
627- Description="Copy exe to pimp"
628- CommandLine="copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
624+ Description="Copy exe to pimp &amp; program files"
625+ CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
629626 />
630627 </Configuration>
631628 <Configuration
632- Name="Private Release|x64"
633- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
634- IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
629+ Name="Debug|Win32"
630+ OutputDirectory=".\Debug"
631+ IntermediateDirectory=".\Debug"
635632 ConfigurationType="1"
636633 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
637634 UseOfMFC="0"
@@ -652,36 +649,36 @@
652649 />
653650 <Tool
654651 Name="VCMIDLTool"
655- PreprocessorDefinitions="NDEBUG"
652+ PreprocessorDefinitions="_DEBUG"
656653 MkTypLibCompatible="true"
657654 SuppressStartupBanner="true"
658- TargetEnvironment="3"
659- TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
655+ TargetEnvironment="1"
656+ TypeLibraryName=".\Debug/Simple.tlb"
660657 HeaderFileName=""
661658 />
662659 <Tool
663660 Name="VCCLCompilerTool"
664- Optimization="2"
665- InlineFunctionExpansion="1"
661+ Optimization="0"
666662 AdditionalIncludeDirectories="../../../core,../../../core/common"
667- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
668- StringPooling="true"
669- RuntimeLibrary="0"
670- EnableFunctionLevelLinking="true"
671- PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
672- AssemblerListingLocation=".\Simple___Win32_Private_Release/"
673- ObjectFile=".\Simple___Win32_Private_Release/"
674- ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
663+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
664+ MinimalRebuild="true"
665+ BasicRuntimeChecks="3"
666+ RuntimeLibrary="1"
667+ PrecompiledHeaderFile=".\Debug/Simple.pch"
668+ AssemblerListingLocation=".\Debug/"
669+ ObjectFile=".\Debug/"
670+ ProgramDataBaseFileName=".\Debug/"
675671 BrowseInformation="1"
676672 WarningLevel="3"
677673 SuppressStartupBanner="true"
674+ DebugInformationFormat="4"
678675 />
679676 <Tool
680677 Name="VCManagedResourceCompilerTool"
681678 />
682679 <Tool
683680 Name="VCResourceCompilerTool"
684- PreprocessorDefinitions="NDEBUG"
681+ PreprocessorDefinitions="_DEBUG"
685682 Culture="1033"
686683 />
687684 <Tool
@@ -689,15 +686,18 @@
689686 />
690687 <Tool
691688 Name="VCLinkerTool"
692- AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
693- OutputFile="PrivRelease/PeerCast.exe"
689+ AdditionalDependencies="ws2_32.lib gdiplus.lib comsuppw.lib Wininet.lib corelib.lib"
690+ OutputFile="Debug/PeerCast.exe"
694691 LinkIncremental="1"
695692 SuppressStartupBanner="true"
696- ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
693+ AdditionalLibraryDirectories="&quot;C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Debug&quot;"
694+ GenerateDebugInformation="true"
695+ ProgramDatabaseFile=".\Debug/PeerCast.pdb"
697696 SubSystem="2"
697+ HeapReserveSize="4194304"
698698 RandomizedBaseAddress="1"
699699 DataExecutionPrevention="0"
700- TargetMachine="17"
700+ TargetMachine="1"
701701 />
702702 <Tool
703703 Name="VCALinkTool"
@@ -711,7 +711,7 @@
711711 <Tool
712712 Name="VCBscMakeTool"
713713 SuppressStartupBanner="true"
714- OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
714+ OutputFile=".\Debug/Simple.bsc"
715715 />
716716 <Tool
717717 Name="VCFxCopTool"
@@ -721,8 +721,8 @@
721721 />
722722 <Tool
723723 Name="VCPostBuildEventTool"
724- Description="Copy exe to pimp &amp; program files"
725- CommandLine="copy release\peercast.exe &quot;c:\program files\peercast&quot;&#x0D;&#x0A;copy release\peercast.exe ..\pimp\&#x0D;&#x0A;"
724+ Description="Copy exe to program files"
725+ CommandLine="copy debug\peercast.exe &quot;c:\program files\peercast&quot;"
726726 />
727727 </Configuration>
728728 <Configuration
@@ -846,7 +846,7 @@
846846 />
847847 </FileConfiguration>
848848 <FileConfiguration
849- Name="Release|Win32"
849+ Name="Private Debug|x64"
850850 >
851851 <Tool
852852 Name="VCCLCompilerTool"
@@ -855,7 +855,7 @@
855855 />
856856 </FileConfiguration>
857857 <FileConfiguration
858- Name="Private Release|Win32"
858+ Name="Release|Win32"
859859 >
860860 <Tool
861861 Name="VCCLCompilerTool"
@@ -864,7 +864,7 @@
864864 />
865865 </FileConfiguration>
866866 <FileConfiguration
867- Name="Debug|Win32"
867+ Name="Release|x64"
868868 >
869869 <Tool
870870 Name="VCCLCompilerTool"
@@ -873,7 +873,7 @@
873873 />
874874 </FileConfiguration>
875875 <FileConfiguration
876- Name="Private Debug|x64"
876+ Name="Private Release|Win32"
877877 >
878878 <Tool
879879 Name="VCCLCompilerTool"
@@ -882,7 +882,7 @@
882882 />
883883 </FileConfiguration>
884884 <FileConfiguration
885- Name="Release|x64"
885+ Name="Private Release|x64"
886886 >
887887 <Tool
888888 Name="VCCLCompilerTool"
@@ -891,7 +891,7 @@
891891 />
892892 </FileConfiguration>
893893 <FileConfiguration
894- Name="Private Release|x64"
894+ Name="Debug|Win32"
895895 >
896896 <Tool
897897 Name="VCCLCompilerTool"
@@ -922,7 +922,7 @@
922922 />
923923 </FileConfiguration>
924924 <FileConfiguration
925- Name="Release|Win32"
925+ Name="Private Debug|x64"
926926 >
927927 <Tool
928928 Name="VCCLCompilerTool"
@@ -931,7 +931,7 @@
931931 />
932932 </FileConfiguration>
933933 <FileConfiguration
934- Name="Private Release|Win32"
934+ Name="Release|Win32"
935935 >
936936 <Tool
937937 Name="VCCLCompilerTool"
@@ -940,7 +940,7 @@
940940 />
941941 </FileConfiguration>
942942 <FileConfiguration
943- Name="Debug|Win32"
943+ Name="Release|x64"
944944 >
945945 <Tool
946946 Name="VCCLCompilerTool"
@@ -949,7 +949,7 @@
949949 />
950950 </FileConfiguration>
951951 <FileConfiguration
952- Name="Private Debug|x64"
952+ Name="Private Release|Win32"
953953 >
954954 <Tool
955955 Name="VCCLCompilerTool"
@@ -958,7 +958,7 @@
958958 />
959959 </FileConfiguration>
960960 <FileConfiguration
961- Name="Release|x64"
961+ Name="Private Release|x64"
962962 >
963963 <Tool
964964 Name="VCCLCompilerTool"
@@ -967,7 +967,7 @@
967967 />
968968 </FileConfiguration>
969969 <FileConfiguration
970- Name="Private Release|x64"
970+ Name="Debug|Win32"
971971 >
972972 <Tool
973973 Name="VCCLCompilerTool"
@@ -998,7 +998,7 @@
998998 />
999999 </FileConfiguration>
10001000 <FileConfiguration
1001- Name="Release|Win32"
1001+ Name="Private Debug|x64"
10021002 >
10031003 <Tool
10041004 Name="VCCLCompilerTool"
@@ -1007,7 +1007,7 @@
10071007 />
10081008 </FileConfiguration>
10091009 <FileConfiguration
1010- Name="Private Release|Win32"
1010+ Name="Release|Win32"
10111011 >
10121012 <Tool
10131013 Name="VCCLCompilerTool"
@@ -1016,7 +1016,7 @@
10161016 />
10171017 </FileConfiguration>
10181018 <FileConfiguration
1019- Name="Debug|Win32"
1019+ Name="Release|x64"
10201020 >
10211021 <Tool
10221022 Name="VCCLCompilerTool"
@@ -1025,7 +1025,7 @@
10251025 />
10261026 </FileConfiguration>
10271027 <FileConfiguration
1028- Name="Private Debug|x64"
1028+ Name="Private Release|Win32"
10291029 >
10301030 <Tool
10311031 Name="VCCLCompilerTool"
@@ -1034,7 +1034,7 @@
10341034 />
10351035 </FileConfiguration>
10361036 <FileConfiguration
1037- Name="Release|x64"
1037+ Name="Private Release|x64"
10381038 >
10391039 <Tool
10401040 Name="VCCLCompilerTool"
@@ -1043,7 +1043,7 @@
10431043 />
10441044 </FileConfiguration>
10451045 <FileConfiguration
1046- Name="Private Release|x64"
1046+ Name="Debug|Win32"
10471047 >
10481048 <Tool
10491049 Name="VCCLCompilerTool"
@@ -1074,7 +1074,7 @@
10741074 />
10751075 </FileConfiguration>
10761076 <FileConfiguration
1077- Name="Release|Win32"
1077+ Name="Private Debug|x64"
10781078 >
10791079 <Tool
10801080 Name="VCCLCompilerTool"
@@ -1083,7 +1083,7 @@
10831083 />
10841084 </FileConfiguration>
10851085 <FileConfiguration
1086- Name="Private Release|Win32"
1086+ Name="Release|Win32"
10871087 >
10881088 <Tool
10891089 Name="VCCLCompilerTool"
@@ -1092,7 +1092,7 @@
10921092 />
10931093 </FileConfiguration>
10941094 <FileConfiguration
1095- Name="Debug|Win32"
1095+ Name="Release|x64"
10961096 >
10971097 <Tool
10981098 Name="VCCLCompilerTool"
@@ -1101,7 +1101,7 @@
11011101 />
11021102 </FileConfiguration>
11031103 <FileConfiguration
1104- Name="Private Debug|x64"
1104+ Name="Private Release|Win32"
11051105 >
11061106 <Tool
11071107 Name="VCCLCompilerTool"
@@ -1110,7 +1110,7 @@
11101110 />
11111111 </FileConfiguration>
11121112 <FileConfiguration
1113- Name="Release|x64"
1113+ Name="Private Release|x64"
11141114 >
11151115 <Tool
11161116 Name="VCCLCompilerTool"
@@ -1119,7 +1119,7 @@
11191119 />
11201120 </FileConfiguration>
11211121 <FileConfiguration
1122- Name="Private Release|x64"
1122+ Name="Debug|Win32"
11231123 >
11241124 <Tool
11251125 Name="VCCLCompilerTool"
@@ -1149,7 +1149,7 @@
11491149 />
11501150 </FileConfiguration>
11511151 <FileConfiguration
1152- Name="Release|Win32"
1152+ Name="Private Debug|x64"
11531153 >
11541154 <Tool
11551155 Name="VCResourceCompilerTool"
@@ -1157,7 +1157,7 @@
11571157 />
11581158 </FileConfiguration>
11591159 <FileConfiguration
1160- Name="Private Release|Win32"
1160+ Name="Release|Win32"
11611161 >
11621162 <Tool
11631163 Name="VCResourceCompilerTool"
@@ -1165,7 +1165,7 @@
11651165 />
11661166 </FileConfiguration>
11671167 <FileConfiguration
1168- Name="Debug|Win32"
1168+ Name="Release|x64"
11691169 >
11701170 <Tool
11711171 Name="VCResourceCompilerTool"
@@ -1173,7 +1173,7 @@
11731173 />
11741174 </FileConfiguration>
11751175 <FileConfiguration
1176- Name="Private Debug|x64"
1176+ Name="Private Release|Win32"
11771177 >
11781178 <Tool
11791179 Name="VCResourceCompilerTool"
@@ -1181,7 +1181,7 @@
11811181 />
11821182 </FileConfiguration>
11831183 <FileConfiguration
1184- Name="Release|x64"
1184+ Name="Private Release|x64"
11851185 >
11861186 <Tool
11871187 Name="VCResourceCompilerTool"
@@ -1189,7 +1189,7 @@
11891189 />
11901190 </FileConfiguration>
11911191 <FileConfiguration
1192- Name="Private Release|x64"
1192+ Name="Debug|Win32"
11931193 >
11941194 <Tool
11951195 Name="VCResourceCompilerTool"
@@ -1220,7 +1220,7 @@
12201220 />
12211221 </FileConfiguration>
12221222 <FileConfiguration
1223- Name="Release|Win32"
1223+ Name="Private Debug|x64"
12241224 >
12251225 <Tool
12261226 Name="VCCLCompilerTool"
@@ -1231,7 +1231,7 @@
12311231 />
12321232 </FileConfiguration>
12331233 <FileConfiguration
1234- Name="Private Release|Win32"
1234+ Name="Release|Win32"
12351235 >
12361236 <Tool
12371237 Name="VCCLCompilerTool"
@@ -1242,7 +1242,7 @@
12421242 />
12431243 </FileConfiguration>
12441244 <FileConfiguration
1245- Name="Debug|Win32"
1245+ Name="Release|x64"
12461246 >
12471247 <Tool
12481248 Name="VCCLCompilerTool"
@@ -1253,7 +1253,7 @@
12531253 />
12541254 </FileConfiguration>
12551255 <FileConfiguration
1256- Name="Private Debug|x64"
1256+ Name="Private Release|Win32"
12571257 >
12581258 <Tool
12591259 Name="VCCLCompilerTool"
@@ -1264,7 +1264,7 @@
12641264 />
12651265 </FileConfiguration>
12661266 <FileConfiguration
1267- Name="Release|x64"
1267+ Name="Private Release|x64"
12681268 >
12691269 <Tool
12701270 Name="VCCLCompilerTool"
@@ -1275,7 +1275,7 @@
12751275 />
12761276 </FileConfiguration>
12771277 <FileConfiguration
1278- Name="Private Release|x64"
1278+ Name="Debug|Win32"
12791279 >
12801280 <Tool
12811281 Name="VCCLCompilerTool"
@@ -1310,7 +1310,7 @@
13101310 />
13111311 </FileConfiguration>
13121312 <FileConfiguration
1313- Name="Release|Win32"
1313+ Name="Private Debug|x64"
13141314 >
13151315 <Tool
13161316 Name="VCCLCompilerTool"
@@ -1319,7 +1319,7 @@
13191319 />
13201320 </FileConfiguration>
13211321 <FileConfiguration
1322- Name="Private Release|Win32"
1322+ Name="Release|Win32"
13231323 >
13241324 <Tool
13251325 Name="VCCLCompilerTool"
@@ -1328,7 +1328,7 @@
13281328 />
13291329 </FileConfiguration>
13301330 <FileConfiguration
1331- Name="Debug|Win32"
1331+ Name="Release|x64"
13321332 >
13331333 <Tool
13341334 Name="VCCLCompilerTool"
@@ -1337,7 +1337,7 @@
13371337 />
13381338 </FileConfiguration>
13391339 <FileConfiguration
1340- Name="Private Debug|x64"
1340+ Name="Private Release|Win32"
13411341 >
13421342 <Tool
13431343 Name="VCCLCompilerTool"
@@ -1346,7 +1346,7 @@
13461346 />
13471347 </FileConfiguration>
13481348 <FileConfiguration
1349- Name="Release|x64"
1349+ Name="Private Release|x64"
13501350 >
13511351 <Tool
13521352 Name="VCCLCompilerTool"
@@ -1355,7 +1355,7 @@
13551355 />
13561356 </FileConfiguration>
13571357 <FileConfiguration
1358- Name="Private Release|x64"
1358+ Name="Debug|Win32"
13591359 >
13601360 <Tool
13611361 Name="VCCLCompilerTool"