OSDN > 軟體搜索 > Multimedia > Sound/Audio > PeerCast IM > SCM > git > PeerCastIM > 提交

PeerCast IM
Fork

R/O
HTTP
SSH
HTTPS

PeerCastIM: 提交

Commit MetaInfo

修訂	fd2c5fc776c35166a1287d70ed4ec4e9d1a02cd4 (tree)
時間	2010-10-23 00:46:31
作者	eru <eru01@user...>
Commiter	eru

Log Message

なんか良く分からんがx64化

Change Summary

modified: PeerCast.root/PeerCast/ui/win32/Simple_vp/Simple_vp.vcproj (diff)
modified: PeerCast.root/PeerCast/ui/win32/Simple_vp/gui_vp.cpp (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/Simple_vp/Simple_vp.vcproj (diff)
modified: c:/Git/PeerCast.root/PeerCast/ui/win32/Simple_vp/gui_vp.cpp (diff)

差異

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

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

		@@ -14,6 +14,9 @@
14	14	<Platform
15	15	Name="Win32"
16	16	/>
	17	+ <Platform
	18	+ Name="x64"
	19	+ />
17	20	</Platforms>
18	21	<ToolFiles>
19	22	</ToolFiles>

		@@ -187,7 +190,401 @@
187	190	LinkTimeCodeGeneration="1"
188	191	RandomizedBaseAddress="1"
189	192	DataExecutionPrevention="0"
190		- TargetMachine="1"
	193	+ TargetMachine="1"
	194	+ />
	195	+ <Tool
	196	+ Name="VCALinkTool"
	197	+ />
	198	+ <Tool
	199	+ Name="VCManifestTool"
	200	+ />
	201	+ <Tool
	202	+ Name="VCXDCMakeTool"
	203	+ />
	204	+ <Tool
	205	+ Name="VCBscMakeTool"
	206	+ SuppressStartupBanner="true"
	207	+ OutputFile=".\Release/Simple.bsc"
	208	+ />
	209	+ <Tool
	210	+ Name="VCFxCopTool"
	211	+ />
	212	+ <Tool
	213	+ Name="VCAppVerifierTool"
	214	+ />
	215	+ <Tool
	216	+ Name="VCPostBuildEventTool"
	217	+ Description="Copy exe to pimp & program files"
	218	+ CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	219	+ ExcludedFromBuild="true"
	220	+ />
	221	+ </Configuration>
	222	+ <Configuration
	223	+ Name="Private Release\|Win32"
	224	+ OutputDirectory=".\Simple___Win32_Private_Release"
	225	+ IntermediateDirectory=".\Simple___Win32_Private_Release"
	226	+ ConfigurationType="1"
	227	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	228	+ UseOfMFC="0"
	229	+ ATLMinimizesCRunTimeLibraryUsage="false"
	230	+ CharacterSet="2"
	231	+ >
	232	+ <Tool
	233	+ Name="VCPreBuildEventTool"
	234	+ />
	235	+ <Tool
	236	+ Name="VCCustomBuildTool"
	237	+ />
	238	+ <Tool
	239	+ Name="VCXMLDataGeneratorTool"
	240	+ />
	241	+ <Tool
	242	+ Name="VCWebServiceProxyGeneratorTool"
	243	+ />
	244	+ <Tool
	245	+ Name="VCMIDLTool"
	246	+ PreprocessorDefinitions="NDEBUG"
	247	+ MkTypLibCompatible="true"
	248	+ SuppressStartupBanner="true"
	249	+ TargetEnvironment="1"
	250	+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
	251	+ HeaderFileName=""
	252	+ />
	253	+ <Tool
	254	+ Name="VCCLCompilerTool"
	255	+ Optimization="2"
	256	+ InlineFunctionExpansion="1"
	257	+ AdditionalIncludeDirectories="../../../core,../../../core/common"
	258	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	259	+ StringPooling="true"
	260	+ RuntimeLibrary="0"
	261	+ EnableFunctionLevelLinking="true"
	262	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
	263	+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
	264	+ ObjectFile=".\Simple___Win32_Private_Release/"
	265	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
	266	+ BrowseInformation="1"
	267	+ WarningLevel="3"
	268	+ SuppressStartupBanner="true"
	269	+ />
	270	+ <Tool
	271	+ Name="VCManagedResourceCompilerTool"
	272	+ />
	273	+ <Tool
	274	+ Name="VCResourceCompilerTool"
	275	+ PreprocessorDefinitions="NDEBUG"
	276	+ Culture="1033"
	277	+ />
	278	+ <Tool
	279	+ Name="VCPreLinkEventTool"
	280	+ />
	281	+ <Tool
	282	+ Name="VCLinkerTool"
	283	+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
	284	+ OutputFile="PrivRelease/PeerCast.exe"
	285	+ LinkIncremental="1"
	286	+ SuppressStartupBanner="true"
	287	+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
	288	+ SubSystem="2"
	289	+ RandomizedBaseAddress="1"
	290	+ DataExecutionPrevention="0"
	291	+ TargetMachine="1"
	292	+ />
	293	+ <Tool
	294	+ Name="VCALinkTool"
	295	+ />
	296	+ <Tool
	297	+ Name="VCManifestTool"
	298	+ />
	299	+ <Tool
	300	+ Name="VCXDCMakeTool"
	301	+ />
	302	+ <Tool
	303	+ Name="VCBscMakeTool"
	304	+ SuppressStartupBanner="true"
	305	+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
	306	+ />
	307	+ <Tool
	308	+ Name="VCFxCopTool"
	309	+ />
	310	+ <Tool
	311	+ Name="VCAppVerifierTool"
	312	+ />
	313	+ <Tool
	314	+ Name="VCPostBuildEventTool"
	315	+ Description="Copy exe to pimp & program files"
	316	+ CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	317	+ />
	318	+ </Configuration>
	319	+ <Configuration
	320	+ Name="Debug\|Win32"
	321	+ OutputDirectory=".\Debug"
	322	+ IntermediateDirectory=".\Debug"
	323	+ ConfigurationType="1"
	324	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	325	+ UseOfMFC="0"
	326	+ ATLMinimizesCRunTimeLibraryUsage="false"
	327	+ CharacterSet="2"
	328	+ >
	329	+ <Tool
	330	+ Name="VCPreBuildEventTool"
	331	+ />
	332	+ <Tool
	333	+ Name="VCCustomBuildTool"
	334	+ />
	335	+ <Tool
	336	+ Name="VCXMLDataGeneratorTool"
	337	+ />
	338	+ <Tool
	339	+ Name="VCWebServiceProxyGeneratorTool"
	340	+ />
	341	+ <Tool
	342	+ Name="VCMIDLTool"
	343	+ PreprocessorDefinitions="_DEBUG"
	344	+ MkTypLibCompatible="true"
	345	+ SuppressStartupBanner="true"
	346	+ TargetEnvironment="1"
	347	+ TypeLibraryName=".\Debug/Simple.tlb"
	348	+ HeaderFileName=""
	349	+ />
	350	+ <Tool
	351	+ Name="VCCLCompilerTool"
	352	+ Optimization="0"
	353	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft Platform SDK\Include""
	354	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
	355	+ MinimalRebuild="true"
	356	+ BasicRuntimeChecks="3"
	357	+ RuntimeLibrary="1"
	358	+ PrecompiledHeaderFile=".\Debug/Simple.pch"
	359	+ AssemblerListingLocation=".\Debug/"
	360	+ ObjectFile=".\Debug/"
	361	+ ProgramDataBaseFileName=".\Debug/"
	362	+ BrowseInformation="1"
	363	+ WarningLevel="3"
	364	+ SuppressStartupBanner="true"
	365	+ DebugInformationFormat="4"
	366	+ />
	367	+ <Tool
	368	+ Name="VCManagedResourceCompilerTool"
	369	+ />
	370	+ <Tool
	371	+ Name="VCResourceCompilerTool"
	372	+ PreprocessorDefinitions="_DEBUG"
	373	+ Culture="1033"
	374	+ />
	375	+ <Tool
	376	+ Name="VCPreLinkEventTool"
	377	+ />
	378	+ <Tool
	379	+ Name="VCLinkerTool"
	380	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib"
	381	+ OutputFile="Debug/PeerCast.exe"
	382	+ LinkIncremental="1"
	383	+ SuppressStartupBanner="true"
	384	+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
	385	+ GenerateDebugInformation="true"
	386	+ ProgramDatabaseFile=".\Debug/PeerCast.pdb"
	387	+ SubSystem="2"
	388	+ RandomizedBaseAddress="1"
	389	+ DataExecutionPrevention="0"
	390	+ TargetMachine="1"
	391	+ />
	392	+ <Tool
	393	+ Name="VCALinkTool"
	394	+ />
	395	+ <Tool
	396	+ Name="VCManifestTool"
	397	+ />
	398	+ <Tool
	399	+ Name="VCXDCMakeTool"
	400	+ />
	401	+ <Tool
	402	+ Name="VCBscMakeTool"
	403	+ SuppressStartupBanner="true"
	404	+ OutputFile=".\Debug/Simple.bsc"
	405	+ />
	406	+ <Tool
	407	+ Name="VCFxCopTool"
	408	+ />
	409	+ <Tool
	410	+ Name="VCAppVerifierTool"
	411	+ />
	412	+ <Tool
	413	+ Name="VCPostBuildEventTool"
	414	+ Description="Copy exe to program files"
	415	+ CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	416	+ />
	417	+ </Configuration>
	418	+ <Configuration
	419	+ Name="Private Debug\|x64"
	420	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	421	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	422	+ ConfigurationType="1"
	423	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	424	+ UseOfMFC="0"
	425	+ ATLMinimizesCRunTimeLibraryUsage="false"
	426	+ CharacterSet="2"
	427	+ >
	428	+ <Tool
	429	+ Name="VCPreBuildEventTool"
	430	+ />
	431	+ <Tool
	432	+ Name="VCCustomBuildTool"
	433	+ />
	434	+ <Tool
	435	+ Name="VCXMLDataGeneratorTool"
	436	+ />
	437	+ <Tool
	438	+ Name="VCWebServiceProxyGeneratorTool"
	439	+ />
	440	+ <Tool
	441	+ Name="VCMIDLTool"
	442	+ PreprocessorDefinitions="_DEBUG"
	443	+ MkTypLibCompatible="true"
	444	+ SuppressStartupBanner="true"
	445	+ TargetEnvironment="3"
	446	+ TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
	447	+ HeaderFileName=""
	448	+ />
	449	+ <Tool
	450	+ Name="VCCLCompilerTool"
	451	+ Optimization="0"
	452	+ AdditionalIncludeDirectories="../../../core,../../../core/common"
	453	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	454	+ MinimalRebuild="true"
	455	+ BasicRuntimeChecks="3"
	456	+ RuntimeLibrary="1"
	457	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
	458	+ AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
	459	+ ObjectFile=".\Simple___Win32_Private_Debug/"
	460	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
	461	+ BrowseInformation="1"
	462	+ WarningLevel="3"
	463	+ SuppressStartupBanner="true"
	464	+ DebugInformationFormat="3"
	465	+ />
	466	+ <Tool
	467	+ Name="VCManagedResourceCompilerTool"
	468	+ />
	469	+ <Tool
	470	+ Name="VCResourceCompilerTool"
	471	+ PreprocessorDefinitions="_DEBUG"
	472	+ Culture="1033"
	473	+ />
	474	+ <Tool
	475	+ Name="VCPreLinkEventTool"
	476	+ />
	477	+ <Tool
	478	+ Name="VCLinkerTool"
	479	+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
	480	+ OutputFile="Debug/PeerCast.exe"
	481	+ LinkIncremental="1"
	482	+ SuppressStartupBanner="true"
	483	+ GenerateDebugInformation="true"
	484	+ ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
	485	+ SubSystem="2"
	486	+ RandomizedBaseAddress="1"
	487	+ DataExecutionPrevention="0"
	488	+ TargetMachine="17"
	489	+ />
	490	+ <Tool
	491	+ Name="VCALinkTool"
	492	+ />
	493	+ <Tool
	494	+ Name="VCManifestTool"
	495	+ />
	496	+ <Tool
	497	+ Name="VCXDCMakeTool"
	498	+ />
	499	+ <Tool
	500	+ Name="VCBscMakeTool"
	501	+ SuppressStartupBanner="true"
	502	+ OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
	503	+ />
	504	+ <Tool
	505	+ Name="VCFxCopTool"
	506	+ />
	507	+ <Tool
	508	+ Name="VCAppVerifierTool"
	509	+ />
	510	+ <Tool
	511	+ Name="VCPostBuildEventTool"
	512	+ Description="Copy exe to program files"
	513	+ CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	514	+ />
	515	+ </Configuration>
	516	+ <Configuration
	517	+ Name="Release\|x64"
	518	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	519	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	520	+ ConfigurationType="1"
	521	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	522	+ UseOfMFC="0"
	523	+ ATLMinimizesCRunTimeLibraryUsage="false"
	524	+ CharacterSet="2"
	525	+ >
	526	+ <Tool
	527	+ Name="VCPreBuildEventTool"
	528	+ />
	529	+ <Tool
	530	+ Name="VCCustomBuildTool"
	531	+ />
	532	+ <Tool
	533	+ Name="VCXMLDataGeneratorTool"
	534	+ />
	535	+ <Tool
	536	+ Name="VCWebServiceProxyGeneratorTool"
	537	+ />
	538	+ <Tool
	539	+ Name="VCMIDLTool"
	540	+ PreprocessorDefinitions="NDEBUG"
	541	+ MkTypLibCompatible="true"
	542	+ SuppressStartupBanner="true"
	543	+ TargetEnvironment="3"
	544	+ TypeLibraryName=".\Release/Simple.tlb"
	545	+ HeaderFileName=""
	546	+ />
	547	+ <Tool
	548	+ Name="VCCLCompilerTool"
	549	+ Optimization="2"
	550	+ InlineFunctionExpansion="1"
	551	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	552	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN64"
	553	+ StringPooling="true"
	554	+ RuntimeLibrary="0"
	555	+ EnableFunctionLevelLinking="true"
	556	+ PrecompiledHeaderFile=".\Release/Simple.pch"
	557	+ AssemblerListingLocation=".\Release/"
	558	+ ObjectFile=".\Release/"
	559	+ ProgramDataBaseFileName=".\Release/"
	560	+ BrowseInformation="1"
	561	+ WarningLevel="3"
	562	+ SuppressStartupBanner="true"
	563	+ />
	564	+ <Tool
	565	+ Name="VCManagedResourceCompilerTool"
	566	+ />
	567	+ <Tool
	568	+ Name="VCResourceCompilerTool"
	569	+ PreprocessorDefinitions="NDEBUG"
	570	+ Culture="1033"
	571	+ />
	572	+ <Tool
	573	+ Name="VCPreLinkEventTool"
	574	+ />
	575	+ <Tool
	576	+ Name="VCLinkerTool"
	577	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib ole32.lib"
	578	+ OutputFile="Release/PeerCast.exe"
	579	+ LinkIncremental="1"
	580	+ SuppressStartupBanner="true"
	581	+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
	582	+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
	583	+ SubSystem="2"
	584	+ LinkTimeCodeGeneration="1"
	585	+ RandomizedBaseAddress="1"
	586	+ DataExecutionPrevention="0"
	587	+ TargetMachine="17"
191	588	/>
192	589	<Tool
193	590	Name="VCALinkTool"

		@@ -217,9 +614,9 @@
217	614	/>
218	615	</Configuration>
219	616	<Configuration
220		- Name="Private Release\|Win32"
221		- OutputDirectory=".\Simple___Win32_Private_Release"
222		- IntermediateDirectory=".\Simple___Win32_Private_Release"
	617	+ Name="Private Release\|x64"
	618	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	619	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
223	620	ConfigurationType="1"
224	621	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
225	622	UseOfMFC="0"

		@@ -243,7 +640,7 @@
243	640	PreprocessorDefinitions="NDEBUG"
244	641	MkTypLibCompatible="true"
245	642	SuppressStartupBanner="true"
246		- TargetEnvironment="1"
	643	+ TargetEnvironment="3"
247	644	TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
248	645	HeaderFileName=""
249	646	/>

		@@ -285,7 +682,7 @@
285	682	SubSystem="2"
286	683	RandomizedBaseAddress="1"
287	684	DataExecutionPrevention="0"
288		- TargetMachine="1"
	685	+ TargetMachine="17"
289	686	/>
290	687	<Tool
291	688	Name="VCALinkTool"

		@@ -314,9 +711,9 @@
314	711	/>
315	712	</Configuration>
316	713	<Configuration
317		- Name="Debug\|Win32"
318		- OutputDirectory=".\Debug"
319		- IntermediateDirectory=".\Debug"
	714	+ Name="Debug\|x64"
	715	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	716	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
320	717	ConfigurationType="1"
321	718	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
322	719	UseOfMFC="0"

		@@ -340,7 +737,7 @@
340	737	PreprocessorDefinitions="_DEBUG"
341	738	MkTypLibCompatible="true"
342	739	SuppressStartupBanner="true"
343		- TargetEnvironment="1"
	740	+ TargetEnvironment="3"
344	741	TypeLibraryName=".\Debug/Simple.tlb"
345	742	HeaderFileName=""
346	743	/>

		@@ -359,7 +756,7 @@
359	756	BrowseInformation="1"
360	757	WarningLevel="3"
361	758	SuppressStartupBanner="true"
362		- DebugInformationFormat="4"
	759	+ DebugInformationFormat="3"
363	760	/>
364	761	<Tool
365	762	Name="VCManagedResourceCompilerTool"

		@@ -384,7 +781,7 @@
384	781	SubSystem="2"
385	782	RandomizedBaseAddress="1"
386	783	DataExecutionPrevention="0"
387		- TargetMachine="1"
	784	+ TargetMachine="17"
388	785	/>
389	786	<Tool
390	787	Name="VCALinkTool"

		@@ -459,9 +856,45 @@
459	856	PreprocessorDefinitions=""
460	857	/>
461	858	</FileConfiguration>
	859	+ <FileConfiguration
	860	+ Name="Private Debug\|x64"
	861	+ >
	862	+ <Tool
	863	+ Name="VCCLCompilerTool"
	864	+ AdditionalIncludeDirectories=""
	865	+ PreprocessorDefinitions=""
	866	+ />
	867	+ </FileConfiguration>
	868	+ <FileConfiguration
	869	+ Name="Release\|x64"
	870	+ >
	871	+ <Tool
	872	+ Name="VCCLCompilerTool"
	873	+ AdditionalIncludeDirectories=""
	874	+ PreprocessorDefinitions=""
	875	+ />
	876	+ </FileConfiguration>
	877	+ <FileConfiguration
	878	+ Name="Private Release\|x64"
	879	+ >
	880	+ <Tool
	881	+ Name="VCCLCompilerTool"
	882	+ AdditionalIncludeDirectories=""
	883	+ PreprocessorDefinitions=""
	884	+ />
	885	+ </FileConfiguration>
	886	+ <FileConfiguration
	887	+ Name="Debug\|x64"
	888	+ >
	889	+ <Tool
	890	+ Name="VCCLCompilerTool"
	891	+ AdditionalIncludeDirectories=""
	892	+ PreprocessorDefinitions=""
	893	+ />
	894	+ </FileConfiguration>
462	895	</File>
463	896	<File
464		- RelativePath="gui.cpp"
	897	+ RelativePath=".\gui_vp.cpp"
465	898	>
466	899	<FileConfiguration
467	900	Name="Private Debug\|Win32"

		@@ -499,6 +932,42 @@
499	932	PreprocessorDefinitions=""
500	933	/>
501	934	</FileConfiguration>
	935	+ <FileConfiguration
	936	+ Name="Private Debug\|x64"
	937	+ >
	938	+ <Tool
	939	+ Name="VCCLCompilerTool"
	940	+ AdditionalIncludeDirectories=""
	941	+ PreprocessorDefinitions=""
	942	+ />
	943	+ </FileConfiguration>
	944	+ <FileConfiguration
	945	+ Name="Release\|x64"
	946	+ >
	947	+ <Tool
	948	+ Name="VCCLCompilerTool"
	949	+ AdditionalIncludeDirectories=""
	950	+ PreprocessorDefinitions=""
	951	+ />
	952	+ </FileConfiguration>
	953	+ <FileConfiguration
	954	+ Name="Private Release\|x64"
	955	+ >
	956	+ <Tool
	957	+ Name="VCCLCompilerTool"
	958	+ AdditionalIncludeDirectories=""
	959	+ PreprocessorDefinitions=""
	960	+ />
	961	+ </FileConfiguration>
	962	+ <FileConfiguration
	963	+ Name="Debug\|x64"
	964	+ >
	965	+ <Tool
	966	+ Name="VCCLCompilerTool"
	967	+ AdditionalIncludeDirectories=""
	968	+ PreprocessorDefinitions=""
	969	+ />
	970	+ </FileConfiguration>
502	971	</File>
503	972	<File
504	973	RelativePath="..\..\..\core\common\identify_encoding.c"

		@@ -539,12 +1008,8 @@
539	1008	PreprocessorDefinitions=""
540	1009	/>
541	1010	</FileConfiguration>
542		- </File>
543		- <File
544		- RelativePath="Simple.cpp"
545		- >
546	1011	<FileConfiguration
547		- Name="Private Debug\|Win32"
	1012	+ Name="Private Debug\|x64"
548	1013	>
549	1014	<Tool
550	1015	Name="VCCLCompilerTool"

		@@ -553,7 +1018,7 @@
553	1018	/>
554	1019	</FileConfiguration>
555	1020	<FileConfiguration
556		- Name="Release\|Win32"
	1021	+ Name="Release\|x64"
557	1022	>
558	1023	<Tool
559	1024	Name="VCCLCompilerTool"

		@@ -562,7 +1027,7 @@
562	1027	/>
563	1028	</FileConfiguration>
564	1029	<FileConfiguration
565		- Name="Private Release\|Win32"
	1030	+ Name="Private Release\|x64"
566	1031	>
567	1032	<Tool
568	1033	Name="VCCLCompilerTool"

		@@ -571,7 +1036,7 @@
571	1036	/>
572	1037	</FileConfiguration>
573	1038	<FileConfiguration
574		- Name="Debug\|Win32"
	1039	+ Name="Debug\|x64"
575	1040	>
576	1041	<Tool
577	1042	Name="VCCLCompilerTool"

		@@ -617,6 +1082,116 @@
617	1082	AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
618	1083	/>
619	1084	</FileConfiguration>
	1085	+ <FileConfiguration
	1086	+ Name="Private Debug\|x64"
	1087	+ >
	1088	+ <Tool
	1089	+ Name="VCResourceCompilerTool"
	1090	+ PreprocessorDefinitions=""
	1091	+ />
	1092	+ </FileConfiguration>
	1093	+ <FileConfiguration
	1094	+ Name="Release\|x64"
	1095	+ >
	1096	+ <Tool
	1097	+ Name="VCResourceCompilerTool"
	1098	+ PreprocessorDefinitions=""
	1099	+ AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	1100	+ />
	1101	+ </FileConfiguration>
	1102	+ <FileConfiguration
	1103	+ Name="Private Release\|x64"
	1104	+ >
	1105	+ <Tool
	1106	+ Name="VCResourceCompilerTool"
	1107	+ PreprocessorDefinitions=""
	1108	+ />
	1109	+ </FileConfiguration>
	1110	+ <FileConfiguration
	1111	+ Name="Debug\|x64"
	1112	+ >
	1113	+ <Tool
	1114	+ Name="VCResourceCompilerTool"
	1115	+ PreprocessorDefinitions=""
	1116	+ AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	1117	+ />
	1118	+ </FileConfiguration>
	1119	+ </File>
	1120	+ <File
	1121	+ RelativePath=".\Simple_vp.cpp"
	1122	+ >
	1123	+ <FileConfiguration
	1124	+ Name="Private Debug\|Win32"
	1125	+ >
	1126	+ <Tool
	1127	+ Name="VCCLCompilerTool"
	1128	+ AdditionalIncludeDirectories=""
	1129	+ PreprocessorDefinitions=""
	1130	+ />
	1131	+ </FileConfiguration>
	1132	+ <FileConfiguration
	1133	+ Name="Release\|Win32"
	1134	+ >
	1135	+ <Tool
	1136	+ Name="VCCLCompilerTool"
	1137	+ AdditionalIncludeDirectories=""
	1138	+ PreprocessorDefinitions=""
	1139	+ />
	1140	+ </FileConfiguration>
	1141	+ <FileConfiguration
	1142	+ Name="Private Release\|Win32"
	1143	+ >
	1144	+ <Tool
	1145	+ Name="VCCLCompilerTool"
	1146	+ AdditionalIncludeDirectories=""
	1147	+ PreprocessorDefinitions=""
	1148	+ />
	1149	+ </FileConfiguration>
	1150	+ <FileConfiguration
	1151	+ Name="Debug\|Win32"
	1152	+ >
	1153	+ <Tool
	1154	+ Name="VCCLCompilerTool"
	1155	+ AdditionalIncludeDirectories=""
	1156	+ PreprocessorDefinitions=""
	1157	+ />
	1158	+ </FileConfiguration>
	1159	+ <FileConfiguration
	1160	+ Name="Private Debug\|x64"
	1161	+ >
	1162	+ <Tool
	1163	+ Name="VCCLCompilerTool"
	1164	+ AdditionalIncludeDirectories=""
	1165	+ PreprocessorDefinitions=""
	1166	+ />
	1167	+ </FileConfiguration>
	1168	+ <FileConfiguration
	1169	+ Name="Release\|x64"
	1170	+ >
	1171	+ <Tool
	1172	+ Name="VCCLCompilerTool"
	1173	+ AdditionalIncludeDirectories=""
	1174	+ PreprocessorDefinitions=""
	1175	+ />
	1176	+ </FileConfiguration>
	1177	+ <FileConfiguration
	1178	+ Name="Private Release\|x64"
	1179	+ >
	1180	+ <Tool
	1181	+ Name="VCCLCompilerTool"
	1182	+ AdditionalIncludeDirectories=""
	1183	+ PreprocessorDefinitions=""
	1184	+ />
	1185	+ </FileConfiguration>
	1186	+ <FileConfiguration
	1187	+ Name="Debug\|x64"
	1188	+ >
	1189	+ <Tool
	1190	+ Name="VCCLCompilerTool"
	1191	+ AdditionalIncludeDirectories=""
	1192	+ PreprocessorDefinitions=""
	1193	+ />
	1194	+ </FileConfiguration>
620	1195	</File>
621	1196	<File
622	1197	RelativePath="StdAfx.cpp"

		@@ -665,6 +1240,50 @@
665	1240	PrecompiledHeaderThrough="stdafx.h"
666	1241	/>
667	1242	</FileConfiguration>
	1243	+ <FileConfiguration
	1244	+ Name="Private Debug\|x64"
	1245	+ >
	1246	+ <Tool
	1247	+ Name="VCCLCompilerTool"
	1248	+ AdditionalIncludeDirectories=""
	1249	+ PreprocessorDefinitions=""
	1250	+ UsePrecompiledHeader="1"
	1251	+ PrecompiledHeaderThrough="stdafx.h"
	1252	+ />
	1253	+ </FileConfiguration>
	1254	+ <FileConfiguration
	1255	+ Name="Release\|x64"
	1256	+ >
	1257	+ <Tool
	1258	+ Name="VCCLCompilerTool"
	1259	+ AdditionalIncludeDirectories=""
	1260	+ PreprocessorDefinitions=""
	1261	+ UsePrecompiledHeader="1"
	1262	+ PrecompiledHeaderThrough="stdafx.h"
	1263	+ />
	1264	+ </FileConfiguration>
	1265	+ <FileConfiguration
	1266	+ Name="Private Release\|x64"
	1267	+ >
	1268	+ <Tool
	1269	+ Name="VCCLCompilerTool"
	1270	+ AdditionalIncludeDirectories=""
	1271	+ PreprocessorDefinitions=""
	1272	+ UsePrecompiledHeader="1"
	1273	+ PrecompiledHeaderThrough="stdafx.h"
	1274	+ />
	1275	+ </FileConfiguration>
	1276	+ <FileConfiguration
	1277	+ Name="Debug\|x64"
	1278	+ >
	1279	+ <Tool
	1280	+ Name="VCCLCompilerTool"
	1281	+ AdditionalIncludeDirectories=""
	1282	+ PreprocessorDefinitions=""
	1283	+ UsePrecompiledHeader="1"
	1284	+ PrecompiledHeaderThrough="stdafx.h"
	1285	+ />
	1286	+ </FileConfiguration>
668	1287	</File>
669	1288	<File
670	1289	RelativePath="..\..\..\core\common\utf8.c"

		@@ -705,6 +1324,42 @@
705	1324	PreprocessorDefinitions=""
706	1325	/>
707	1326	</FileConfiguration>
	1327	+ <FileConfiguration
	1328	+ Name="Private Debug\|x64"
	1329	+ >
	1330	+ <Tool
	1331	+ Name="VCCLCompilerTool"
	1332	+ AdditionalIncludeDirectories=""
	1333	+ PreprocessorDefinitions=""
	1334	+ />
	1335	+ </FileConfiguration>
	1336	+ <FileConfiguration
	1337	+ Name="Release\|x64"
	1338	+ >
	1339	+ <Tool
	1340	+ Name="VCCLCompilerTool"
	1341	+ AdditionalIncludeDirectories=""
	1342	+ PreprocessorDefinitions=""
	1343	+ />
	1344	+ </FileConfiguration>
	1345	+ <FileConfiguration
	1346	+ Name="Private Release\|x64"
	1347	+ >
	1348	+ <Tool
	1349	+ Name="VCCLCompilerTool"
	1350	+ AdditionalIncludeDirectories=""
	1351	+ PreprocessorDefinitions=""
	1352	+ />
	1353	+ </FileConfiguration>
	1354	+ <FileConfiguration
	1355	+ Name="Debug\|x64"
	1356	+ >
	1357	+ <Tool
	1358	+ Name="VCCLCompilerTool"
	1359	+ AdditionalIncludeDirectories=""
	1360	+ PreprocessorDefinitions=""
	1361	+ />
	1362	+ </FileConfiguration>
708	1363	</File>
709	1364	</Filter>
710	1365	<Filter

--- a/PeerCast.root/PeerCast/ui/win32/Simple_vp/gui_vp.cpp

+++ b/PeerCast.root/PeerCast/ui/win32/Simple_vp/gui_vp.cpp

		@@ -1127,12 +1127,21 @@ LRESULT CALLBACK GUIProc (HWND hwnd, UINT message,
1127	1127	HWND hwndList;
1128	1128
1129	1129	hwndList = GetDlgItem(guiWnd, chanID);
	1130	+#ifndef WIN64
1130	1131	wndOldListBox = (WNDPROC)GetWindowLong(hwndList, GWL_WNDPROC);
1131	1132	SetWindowLong(hwndList, GWL_WNDPROC, (DWORD)ListBoxProc);
1132	1133
1133	1134	hwndList = GetDlgItem(guiWnd, statusID);
1134	1135	wndOldConnListBox = (WNDPROC)GetWindowLong(hwndList, GWL_WNDPROC);
1135	1136	SetWindowLong(hwndList, GWL_WNDPROC, (DWORD)ConnListBoxProc);
	1137	+#else
	1138	+ wndOldListBox = (WNDPROC)GetWindowLongPtr(hwndList, GWLP_WNDPROC);
	1139	+ SetWindowLongPtr(hwndList, GWLP_WNDPROC, (DWORD)ListBoxProc);
	1140	+
	1141	+ hwndList = GetDlgItem(guiWnd, statusID);
	1142	+ wndOldConnListBox = (WNDPROC)GetWindowLongPtr(hwndList, GWLP_WNDPROC);
	1143	+ SetWindowLongPtr(hwndList, GWLP_WNDPROC, (DWORD)ConnListBoxProc);
	1144	+#endif
1136	1145	}
1137	1146
1138	1147	break;

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

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

		@@ -14,6 +14,9 @@
14	14	<Platform
15	15	Name="Win32"
16	16	/>
	17	+ <Platform
	18	+ Name="x64"
	19	+ />
17	20	</Platforms>
18	21	<ToolFiles>
19	22	</ToolFiles>

		@@ -187,7 +190,401 @@
187	190	LinkTimeCodeGeneration="1"
188	191	RandomizedBaseAddress="1"
189	192	DataExecutionPrevention="0"
190		- TargetMachine="1"
	193	+ TargetMachine="1"
	194	+ />
	195	+ <Tool
	196	+ Name="VCALinkTool"
	197	+ />
	198	+ <Tool
	199	+ Name="VCManifestTool"
	200	+ />
	201	+ <Tool
	202	+ Name="VCXDCMakeTool"
	203	+ />
	204	+ <Tool
	205	+ Name="VCBscMakeTool"
	206	+ SuppressStartupBanner="true"
	207	+ OutputFile=".\Release/Simple.bsc"
	208	+ />
	209	+ <Tool
	210	+ Name="VCFxCopTool"
	211	+ />
	212	+ <Tool
	213	+ Name="VCAppVerifierTool"
	214	+ />
	215	+ <Tool
	216	+ Name="VCPostBuildEventTool"
	217	+ Description="Copy exe to pimp & program files"
	218	+ CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	219	+ ExcludedFromBuild="true"
	220	+ />
	221	+ </Configuration>
	222	+ <Configuration
	223	+ Name="Private Release\|Win32"
	224	+ OutputDirectory=".\Simple___Win32_Private_Release"
	225	+ IntermediateDirectory=".\Simple___Win32_Private_Release"
	226	+ ConfigurationType="1"
	227	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	228	+ UseOfMFC="0"
	229	+ ATLMinimizesCRunTimeLibraryUsage="false"
	230	+ CharacterSet="2"
	231	+ >
	232	+ <Tool
	233	+ Name="VCPreBuildEventTool"
	234	+ />
	235	+ <Tool
	236	+ Name="VCCustomBuildTool"
	237	+ />
	238	+ <Tool
	239	+ Name="VCXMLDataGeneratorTool"
	240	+ />
	241	+ <Tool
	242	+ Name="VCWebServiceProxyGeneratorTool"
	243	+ />
	244	+ <Tool
	245	+ Name="VCMIDLTool"
	246	+ PreprocessorDefinitions="NDEBUG"
	247	+ MkTypLibCompatible="true"
	248	+ SuppressStartupBanner="true"
	249	+ TargetEnvironment="1"
	250	+ TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
	251	+ HeaderFileName=""
	252	+ />
	253	+ <Tool
	254	+ Name="VCCLCompilerTool"
	255	+ Optimization="2"
	256	+ InlineFunctionExpansion="1"
	257	+ AdditionalIncludeDirectories="../../../core,../../../core/common"
	258	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	259	+ StringPooling="true"
	260	+ RuntimeLibrary="0"
	261	+ EnableFunctionLevelLinking="true"
	262	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Release/Simple.pch"
	263	+ AssemblerListingLocation=".\Simple___Win32_Private_Release/"
	264	+ ObjectFile=".\Simple___Win32_Private_Release/"
	265	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Release/"
	266	+ BrowseInformation="1"
	267	+ WarningLevel="3"
	268	+ SuppressStartupBanner="true"
	269	+ />
	270	+ <Tool
	271	+ Name="VCManagedResourceCompilerTool"
	272	+ />
	273	+ <Tool
	274	+ Name="VCResourceCompilerTool"
	275	+ PreprocessorDefinitions="NDEBUG"
	276	+ Culture="1033"
	277	+ />
	278	+ <Tool
	279	+ Name="VCPreLinkEventTool"
	280	+ />
	281	+ <Tool
	282	+ Name="VCLinkerTool"
	283	+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
	284	+ OutputFile="PrivRelease/PeerCast.exe"
	285	+ LinkIncremental="1"
	286	+ SuppressStartupBanner="true"
	287	+ ProgramDatabaseFile=".\Simple___Win32_Private_Release/PeerCast.pdb"
	288	+ SubSystem="2"
	289	+ RandomizedBaseAddress="1"
	290	+ DataExecutionPrevention="0"
	291	+ TargetMachine="1"
	292	+ />
	293	+ <Tool
	294	+ Name="VCALinkTool"
	295	+ />
	296	+ <Tool
	297	+ Name="VCManifestTool"
	298	+ />
	299	+ <Tool
	300	+ Name="VCXDCMakeTool"
	301	+ />
	302	+ <Tool
	303	+ Name="VCBscMakeTool"
	304	+ SuppressStartupBanner="true"
	305	+ OutputFile=".\Simple___Win32_Private_Release/Simple.bsc"
	306	+ />
	307	+ <Tool
	308	+ Name="VCFxCopTool"
	309	+ />
	310	+ <Tool
	311	+ Name="VCAppVerifierTool"
	312	+ />
	313	+ <Tool
	314	+ Name="VCPostBuildEventTool"
	315	+ Description="Copy exe to pimp & program files"
	316	+ CommandLine="copy release\peercast.exe "c:\program files\peercast" copy release\peercast.exe ..\pimp\ "
	317	+ />
	318	+ </Configuration>
	319	+ <Configuration
	320	+ Name="Debug\|Win32"
	321	+ OutputDirectory=".\Debug"
	322	+ IntermediateDirectory=".\Debug"
	323	+ ConfigurationType="1"
	324	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	325	+ UseOfMFC="0"
	326	+ ATLMinimizesCRunTimeLibraryUsage="false"
	327	+ CharacterSet="2"
	328	+ >
	329	+ <Tool
	330	+ Name="VCPreBuildEventTool"
	331	+ />
	332	+ <Tool
	333	+ Name="VCCustomBuildTool"
	334	+ />
	335	+ <Tool
	336	+ Name="VCXMLDataGeneratorTool"
	337	+ />
	338	+ <Tool
	339	+ Name="VCWebServiceProxyGeneratorTool"
	340	+ />
	341	+ <Tool
	342	+ Name="VCMIDLTool"
	343	+ PreprocessorDefinitions="_DEBUG"
	344	+ MkTypLibCompatible="true"
	345	+ SuppressStartupBanner="true"
	346	+ TargetEnvironment="1"
	347	+ TypeLibraryName=".\Debug/Simple.tlb"
	348	+ HeaderFileName=""
	349	+ />
	350	+ <Tool
	351	+ Name="VCCLCompilerTool"
	352	+ Optimization="0"
	353	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft Platform SDK\Include""
	354	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
	355	+ MinimalRebuild="true"
	356	+ BasicRuntimeChecks="3"
	357	+ RuntimeLibrary="1"
	358	+ PrecompiledHeaderFile=".\Debug/Simple.pch"
	359	+ AssemblerListingLocation=".\Debug/"
	360	+ ObjectFile=".\Debug/"
	361	+ ProgramDataBaseFileName=".\Debug/"
	362	+ BrowseInformation="1"
	363	+ WarningLevel="3"
	364	+ SuppressStartupBanner="true"
	365	+ DebugInformationFormat="4"
	366	+ />
	367	+ <Tool
	368	+ Name="VCManagedResourceCompilerTool"
	369	+ />
	370	+ <Tool
	371	+ Name="VCResourceCompilerTool"
	372	+ PreprocessorDefinitions="_DEBUG"
	373	+ Culture="1033"
	374	+ />
	375	+ <Tool
	376	+ Name="VCPreLinkEventTool"
	377	+ />
	378	+ <Tool
	379	+ Name="VCLinkerTool"
	380	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib"
	381	+ OutputFile="Debug/PeerCast.exe"
	382	+ LinkIncremental="1"
	383	+ SuppressStartupBanner="true"
	384	+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
	385	+ GenerateDebugInformation="true"
	386	+ ProgramDatabaseFile=".\Debug/PeerCast.pdb"
	387	+ SubSystem="2"
	388	+ RandomizedBaseAddress="1"
	389	+ DataExecutionPrevention="0"
	390	+ TargetMachine="1"
	391	+ />
	392	+ <Tool
	393	+ Name="VCALinkTool"
	394	+ />
	395	+ <Tool
	396	+ Name="VCManifestTool"
	397	+ />
	398	+ <Tool
	399	+ Name="VCXDCMakeTool"
	400	+ />
	401	+ <Tool
	402	+ Name="VCBscMakeTool"
	403	+ SuppressStartupBanner="true"
	404	+ OutputFile=".\Debug/Simple.bsc"
	405	+ />
	406	+ <Tool
	407	+ Name="VCFxCopTool"
	408	+ />
	409	+ <Tool
	410	+ Name="VCAppVerifierTool"
	411	+ />
	412	+ <Tool
	413	+ Name="VCPostBuildEventTool"
	414	+ Description="Copy exe to program files"
	415	+ CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	416	+ />
	417	+ </Configuration>
	418	+ <Configuration
	419	+ Name="Private Debug\|x64"
	420	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	421	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	422	+ ConfigurationType="1"
	423	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	424	+ UseOfMFC="0"
	425	+ ATLMinimizesCRunTimeLibraryUsage="false"
	426	+ CharacterSet="2"
	427	+ >
	428	+ <Tool
	429	+ Name="VCPreBuildEventTool"
	430	+ />
	431	+ <Tool
	432	+ Name="VCCustomBuildTool"
	433	+ />
	434	+ <Tool
	435	+ Name="VCXMLDataGeneratorTool"
	436	+ />
	437	+ <Tool
	438	+ Name="VCWebServiceProxyGeneratorTool"
	439	+ />
	440	+ <Tool
	441	+ Name="VCMIDLTool"
	442	+ PreprocessorDefinitions="_DEBUG"
	443	+ MkTypLibCompatible="true"
	444	+ SuppressStartupBanner="true"
	445	+ TargetEnvironment="3"
	446	+ TypeLibraryName=".\Simple___Win32_Private_Debug/Simple.tlb"
	447	+ HeaderFileName=""
	448	+ />
	449	+ <Tool
	450	+ Name="VCCLCompilerTool"
	451	+ Optimization="0"
	452	+ AdditionalIncludeDirectories="../../../core,../../../core/common"
	453	+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRIVATE_BROADCASTER"
	454	+ MinimalRebuild="true"
	455	+ BasicRuntimeChecks="3"
	456	+ RuntimeLibrary="1"
	457	+ PrecompiledHeaderFile=".\Simple___Win32_Private_Debug/Simple.pch"
	458	+ AssemblerListingLocation=".\Simple___Win32_Private_Debug/"
	459	+ ObjectFile=".\Simple___Win32_Private_Debug/"
	460	+ ProgramDataBaseFileName=".\Simple___Win32_Private_Debug/"
	461	+ BrowseInformation="1"
	462	+ WarningLevel="3"
	463	+ SuppressStartupBanner="true"
	464	+ DebugInformationFormat="3"
	465	+ />
	466	+ <Tool
	467	+ Name="VCManagedResourceCompilerTool"
	468	+ />
	469	+ <Tool
	470	+ Name="VCResourceCompilerTool"
	471	+ PreprocessorDefinitions="_DEBUG"
	472	+ Culture="1033"
	473	+ />
	474	+ <Tool
	475	+ Name="VCPreLinkEventTool"
	476	+ />
	477	+ <Tool
	478	+ Name="VCLinkerTool"
	479	+ AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
	480	+ OutputFile="Debug/PeerCast.exe"
	481	+ LinkIncremental="1"
	482	+ SuppressStartupBanner="true"
	483	+ GenerateDebugInformation="true"
	484	+ ProgramDatabaseFile=".\Simple___Win32_Private_Debug/PeerCast.pdb"
	485	+ SubSystem="2"
	486	+ RandomizedBaseAddress="1"
	487	+ DataExecutionPrevention="0"
	488	+ TargetMachine="17"
	489	+ />
	490	+ <Tool
	491	+ Name="VCALinkTool"
	492	+ />
	493	+ <Tool
	494	+ Name="VCManifestTool"
	495	+ />
	496	+ <Tool
	497	+ Name="VCXDCMakeTool"
	498	+ />
	499	+ <Tool
	500	+ Name="VCBscMakeTool"
	501	+ SuppressStartupBanner="true"
	502	+ OutputFile=".\Simple___Win32_Private_Debug/Simple.bsc"
	503	+ />
	504	+ <Tool
	505	+ Name="VCFxCopTool"
	506	+ />
	507	+ <Tool
	508	+ Name="VCAppVerifierTool"
	509	+ />
	510	+ <Tool
	511	+ Name="VCPostBuildEventTool"
	512	+ Description="Copy exe to program files"
	513	+ CommandLine="copy debug\peercast.exe "c:\program files\peercast""
	514	+ />
	515	+ </Configuration>
	516	+ <Configuration
	517	+ Name="Release\|x64"
	518	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	519	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
	520	+ ConfigurationType="1"
	521	+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
	522	+ UseOfMFC="0"
	523	+ ATLMinimizesCRunTimeLibraryUsage="false"
	524	+ CharacterSet="2"
	525	+ >
	526	+ <Tool
	527	+ Name="VCPreBuildEventTool"
	528	+ />
	529	+ <Tool
	530	+ Name="VCCustomBuildTool"
	531	+ />
	532	+ <Tool
	533	+ Name="VCXMLDataGeneratorTool"
	534	+ />
	535	+ <Tool
	536	+ Name="VCWebServiceProxyGeneratorTool"
	537	+ />
	538	+ <Tool
	539	+ Name="VCMIDLTool"
	540	+ PreprocessorDefinitions="NDEBUG"
	541	+ MkTypLibCompatible="true"
	542	+ SuppressStartupBanner="true"
	543	+ TargetEnvironment="3"
	544	+ TypeLibraryName=".\Release/Simple.tlb"
	545	+ HeaderFileName=""
	546	+ />
	547	+ <Tool
	548	+ Name="VCCLCompilerTool"
	549	+ Optimization="2"
	550	+ InlineFunctionExpansion="1"
	551	+ AdditionalIncludeDirectories="../../../core;../../../core/common;"C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	552	+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WIN64"
	553	+ StringPooling="true"
	554	+ RuntimeLibrary="0"
	555	+ EnableFunctionLevelLinking="true"
	556	+ PrecompiledHeaderFile=".\Release/Simple.pch"
	557	+ AssemblerListingLocation=".\Release/"
	558	+ ObjectFile=".\Release/"
	559	+ ProgramDataBaseFileName=".\Release/"
	560	+ BrowseInformation="1"
	561	+ WarningLevel="3"
	562	+ SuppressStartupBanner="true"
	563	+ />
	564	+ <Tool
	565	+ Name="VCManagedResourceCompilerTool"
	566	+ />
	567	+ <Tool
	568	+ Name="VCResourceCompilerTool"
	569	+ PreprocessorDefinitions="NDEBUG"
	570	+ Culture="1033"
	571	+ />
	572	+ <Tool
	573	+ Name="VCPreLinkEventTool"
	574	+ />
	575	+ <Tool
	576	+ Name="VCLinkerTool"
	577	+ AdditionalDependencies="ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib odbc32.lib odbccp32.lib uuid.lib ole32.lib"
	578	+ OutputFile="Release/PeerCast.exe"
	579	+ LinkIncremental="1"
	580	+ SuppressStartupBanner="true"
	581	+ AdditionalLibraryDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Lib""
	582	+ ProgramDatabaseFile=".\Release/PeerCast.pdb"
	583	+ SubSystem="2"
	584	+ LinkTimeCodeGeneration="1"
	585	+ RandomizedBaseAddress="1"
	586	+ DataExecutionPrevention="0"
	587	+ TargetMachine="17"
191	588	/>
192	589	<Tool
193	590	Name="VCALinkTool"

		@@ -217,9 +614,9 @@
217	614	/>
218	615	</Configuration>
219	616	<Configuration
220		- Name="Private Release\|Win32"
221		- OutputDirectory=".\Simple___Win32_Private_Release"
222		- IntermediateDirectory=".\Simple___Win32_Private_Release"
	617	+ Name="Private Release\|x64"
	618	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	619	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
223	620	ConfigurationType="1"
224	621	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
225	622	UseOfMFC="0"

		@@ -243,7 +640,7 @@
243	640	PreprocessorDefinitions="NDEBUG"
244	641	MkTypLibCompatible="true"
245	642	SuppressStartupBanner="true"
246		- TargetEnvironment="1"
	643	+ TargetEnvironment="3"
247	644	TypeLibraryName=".\Simple___Win32_Private_Release/Simple.tlb"
248	645	HeaderFileName=""
249	646	/>

		@@ -285,7 +682,7 @@
285	682	SubSystem="2"
286	683	RandomizedBaseAddress="1"
287	684	DataExecutionPrevention="0"
288		- TargetMachine="1"
	685	+ TargetMachine="17"
289	686	/>
290	687	<Tool
291	688	Name="VCALinkTool"

		@@ -314,9 +711,9 @@
314	711	/>
315	712	</Configuration>
316	713	<Configuration
317		- Name="Debug\|Win32"
318		- OutputDirectory=".\Debug"
319		- IntermediateDirectory=".\Debug"
	714	+ Name="Debug\|x64"
	715	+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
	716	+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
320	717	ConfigurationType="1"
321	718	InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
322	719	UseOfMFC="0"

		@@ -340,7 +737,7 @@
340	737	PreprocessorDefinitions="_DEBUG"
341	738	MkTypLibCompatible="true"
342	739	SuppressStartupBanner="true"
343		- TargetEnvironment="1"
	740	+ TargetEnvironment="3"
344	741	TypeLibraryName=".\Debug/Simple.tlb"
345	742	HeaderFileName=""
346	743	/>

		@@ -359,7 +756,7 @@
359	756	BrowseInformation="1"
360	757	WarningLevel="3"
361	758	SuppressStartupBanner="true"
362		- DebugInformationFormat="4"
	759	+ DebugInformationFormat="3"
363	760	/>
364	761	<Tool
365	762	Name="VCManagedResourceCompilerTool"

		@@ -384,7 +781,7 @@
384	781	SubSystem="2"
385	782	RandomizedBaseAddress="1"
386	783	DataExecutionPrevention="0"
387		- TargetMachine="1"
	784	+ TargetMachine="17"
388	785	/>
389	786	<Tool
390	787	Name="VCALinkTool"

		@@ -459,9 +856,45 @@
459	856	PreprocessorDefinitions=""
460	857	/>
461	858	</FileConfiguration>
	859	+ <FileConfiguration
	860	+ Name="Private Debug\|x64"
	861	+ >
	862	+ <Tool
	863	+ Name="VCCLCompilerTool"
	864	+ AdditionalIncludeDirectories=""
	865	+ PreprocessorDefinitions=""
	866	+ />
	867	+ </FileConfiguration>
	868	+ <FileConfiguration
	869	+ Name="Release\|x64"
	870	+ >
	871	+ <Tool
	872	+ Name="VCCLCompilerTool"
	873	+ AdditionalIncludeDirectories=""
	874	+ PreprocessorDefinitions=""
	875	+ />
	876	+ </FileConfiguration>
	877	+ <FileConfiguration
	878	+ Name="Private Release\|x64"
	879	+ >
	880	+ <Tool
	881	+ Name="VCCLCompilerTool"
	882	+ AdditionalIncludeDirectories=""
	883	+ PreprocessorDefinitions=""
	884	+ />
	885	+ </FileConfiguration>
	886	+ <FileConfiguration
	887	+ Name="Debug\|x64"
	888	+ >
	889	+ <Tool
	890	+ Name="VCCLCompilerTool"
	891	+ AdditionalIncludeDirectories=""
	892	+ PreprocessorDefinitions=""
	893	+ />
	894	+ </FileConfiguration>
462	895	</File>
463	896	<File
464		- RelativePath="gui.cpp"
	897	+ RelativePath=".\gui_vp.cpp"
465	898	>
466	899	<FileConfiguration
467	900	Name="Private Debug\|Win32"

		@@ -499,6 +932,42 @@
499	932	PreprocessorDefinitions=""
500	933	/>
501	934	</FileConfiguration>
	935	+ <FileConfiguration
	936	+ Name="Private Debug\|x64"
	937	+ >
	938	+ <Tool
	939	+ Name="VCCLCompilerTool"
	940	+ AdditionalIncludeDirectories=""
	941	+ PreprocessorDefinitions=""
	942	+ />
	943	+ </FileConfiguration>
	944	+ <FileConfiguration
	945	+ Name="Release\|x64"
	946	+ >
	947	+ <Tool
	948	+ Name="VCCLCompilerTool"
	949	+ AdditionalIncludeDirectories=""
	950	+ PreprocessorDefinitions=""
	951	+ />
	952	+ </FileConfiguration>
	953	+ <FileConfiguration
	954	+ Name="Private Release\|x64"
	955	+ >
	956	+ <Tool
	957	+ Name="VCCLCompilerTool"
	958	+ AdditionalIncludeDirectories=""
	959	+ PreprocessorDefinitions=""
	960	+ />
	961	+ </FileConfiguration>
	962	+ <FileConfiguration
	963	+ Name="Debug\|x64"
	964	+ >
	965	+ <Tool
	966	+ Name="VCCLCompilerTool"
	967	+ AdditionalIncludeDirectories=""
	968	+ PreprocessorDefinitions=""
	969	+ />
	970	+ </FileConfiguration>
502	971	</File>
503	972	<File
504	973	RelativePath="..\..\..\core\common\identify_encoding.c"

		@@ -539,12 +1008,8 @@
539	1008	PreprocessorDefinitions=""
540	1009	/>
541	1010	</FileConfiguration>
542		- </File>
543		- <File
544		- RelativePath="Simple.cpp"
545		- >
546	1011	<FileConfiguration
547		- Name="Private Debug\|Win32"
	1012	+ Name="Private Debug\|x64"
548	1013	>
549	1014	<Tool
550	1015	Name="VCCLCompilerTool"

		@@ -553,7 +1018,7 @@
553	1018	/>
554	1019	</FileConfiguration>
555	1020	<FileConfiguration
556		- Name="Release\|Win32"
	1021	+ Name="Release\|x64"
557	1022	>
558	1023	<Tool
559	1024	Name="VCCLCompilerTool"

		@@ -562,7 +1027,7 @@
562	1027	/>
563	1028	</FileConfiguration>
564	1029	<FileConfiguration
565		- Name="Private Release\|Win32"
	1030	+ Name="Private Release\|x64"
566	1031	>
567	1032	<Tool
568	1033	Name="VCCLCompilerTool"

		@@ -571,7 +1036,7 @@
571	1036	/>
572	1037	</FileConfiguration>
573	1038	<FileConfiguration
574		- Name="Debug\|Win32"
	1039	+ Name="Debug\|x64"
575	1040	>
576	1041	<Tool
577	1042	Name="VCCLCompilerTool"

		@@ -617,6 +1082,116 @@
617	1082	AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
618	1083	/>
619	1084	</FileConfiguration>
	1085	+ <FileConfiguration
	1086	+ Name="Private Debug\|x64"
	1087	+ >
	1088	+ <Tool
	1089	+ Name="VCResourceCompilerTool"
	1090	+ PreprocessorDefinitions=""
	1091	+ />
	1092	+ </FileConfiguration>
	1093	+ <FileConfiguration
	1094	+ Name="Release\|x64"
	1095	+ >
	1096	+ <Tool
	1097	+ Name="VCResourceCompilerTool"
	1098	+ PreprocessorDefinitions=""
	1099	+ AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	1100	+ />
	1101	+ </FileConfiguration>
	1102	+ <FileConfiguration
	1103	+ Name="Private Release\|x64"
	1104	+ >
	1105	+ <Tool
	1106	+ Name="VCResourceCompilerTool"
	1107	+ PreprocessorDefinitions=""
	1108	+ />
	1109	+ </FileConfiguration>
	1110	+ <FileConfiguration
	1111	+ Name="Debug\|x64"
	1112	+ >
	1113	+ <Tool
	1114	+ Name="VCResourceCompilerTool"
	1115	+ PreprocessorDefinitions=""
	1116	+ AdditionalIncludeDirectories=""C:\Program Files\Microsoft SDKs\Windows\v6.0\Include""
	1117	+ />
	1118	+ </FileConfiguration>
	1119	+ </File>
	1120	+ <File
	1121	+ RelativePath=".\Simple_vp.cpp"
	1122	+ >
	1123	+ <FileConfiguration
	1124	+ Name="Private Debug\|Win32"
	1125	+ >
	1126	+ <Tool
	1127	+ Name="VCCLCompilerTool"
	1128	+ AdditionalIncludeDirectories=""
	1129	+ PreprocessorDefinitions=""
	1130	+ />
	1131	+ </FileConfiguration>
	1132	+ <FileConfiguration
	1133	+ Name="Release\|Win32"
	1134	+ >
	1135	+ <Tool
	1136	+ Name="VCCLCompilerTool"
	1137	+ AdditionalIncludeDirectories=""
	1138	+ PreprocessorDefinitions=""
	1139	+ />
	1140	+ </FileConfiguration>
	1141	+ <FileConfiguration
	1142	+ Name="Private Release\|Win32"
	1143	+ >
	1144	+ <Tool
	1145	+ Name="VCCLCompilerTool"
	1146	+ AdditionalIncludeDirectories=""
	1147	+ PreprocessorDefinitions=""
	1148	+ />
	1149	+ </FileConfiguration>
	1150	+ <FileConfiguration
	1151	+ Name="Debug\|Win32"
	1152	+ >
	1153	+ <Tool
	1154	+ Name="VCCLCompilerTool"
	1155	+ AdditionalIncludeDirectories=""
	1156	+ PreprocessorDefinitions=""
	1157	+ />
	1158	+ </FileConfiguration>
	1159	+ <FileConfiguration
	1160	+ Name="Private Debug\|x64"
	1161	+ >
	1162	+ <Tool
	1163	+ Name="VCCLCompilerTool"
	1164	+ AdditionalIncludeDirectories=""
	1165	+ PreprocessorDefinitions=""
	1166	+ />
	1167	+ </FileConfiguration>
	1168	+ <FileConfiguration
	1169	+ Name="Release\|x64"
	1170	+ >
	1171	+ <Tool
	1172	+ Name="VCCLCompilerTool"
	1173	+ AdditionalIncludeDirectories=""
	1174	+ PreprocessorDefinitions=""
	1175	+ />
	1176	+ </FileConfiguration>
	1177	+ <FileConfiguration
	1178	+ Name="Private Release\|x64"
	1179	+ >
	1180	+ <Tool
	1181	+ Name="VCCLCompilerTool"
	1182	+ AdditionalIncludeDirectories=""
	1183	+ PreprocessorDefinitions=""
	1184	+ />
	1185	+ </FileConfiguration>
	1186	+ <FileConfiguration
	1187	+ Name="Debug\|x64"
	1188	+ >
	1189	+ <Tool
	1190	+ Name="VCCLCompilerTool"
	1191	+ AdditionalIncludeDirectories=""
	1192	+ PreprocessorDefinitions=""
	1193	+ />
	1194	+ </FileConfiguration>
620	1195	</File>
621	1196	<File
622	1197	RelativePath="StdAfx.cpp"

		@@ -665,6 +1240,50 @@
665	1240	PrecompiledHeaderThrough="stdafx.h"
666	1241	/>
667	1242	</FileConfiguration>
	1243	+ <FileConfiguration
	1244	+ Name="Private Debug\|x64"
	1245	+ >
	1246	+ <Tool
	1247	+ Name="VCCLCompilerTool"
	1248	+ AdditionalIncludeDirectories=""
	1249	+ PreprocessorDefinitions=""
	1250	+ UsePrecompiledHeader="1"
	1251	+ PrecompiledHeaderThrough="stdafx.h"
	1252	+ />
	1253	+ </FileConfiguration>
	1254	+ <FileConfiguration
	1255	+ Name="Release\|x64"
	1256	+ >
	1257	+ <Tool
	1258	+ Name="VCCLCompilerTool"
	1259	+ AdditionalIncludeDirectories=""
	1260	+ PreprocessorDefinitions=""
	1261	+ UsePrecompiledHeader="1"
	1262	+ PrecompiledHeaderThrough="stdafx.h"
	1263	+ />
	1264	+ </FileConfiguration>
	1265	+ <FileConfiguration
	1266	+ Name="Private Release\|x64"
	1267	+ >
	1268	+ <Tool
	1269	+ Name="VCCLCompilerTool"
	1270	+ AdditionalIncludeDirectories=""
	1271	+ PreprocessorDefinitions=""
	1272	+ UsePrecompiledHeader="1"
	1273	+ PrecompiledHeaderThrough="stdafx.h"
	1274	+ />
	1275	+ </FileConfiguration>
	1276	+ <FileConfiguration
	1277	+ Name="Debug\|x64"
	1278	+ >
	1279	+ <Tool
	1280	+ Name="VCCLCompilerTool"
	1281	+ AdditionalIncludeDirectories=""
	1282	+ PreprocessorDefinitions=""
	1283	+ UsePrecompiledHeader="1"
	1284	+ PrecompiledHeaderThrough="stdafx.h"
	1285	+ />
	1286	+ </FileConfiguration>
668	1287	</File>
669	1288	<File
670	1289	RelativePath="..\..\..\core\common\utf8.c"

		@@ -705,6 +1324,42 @@
705	1324	PreprocessorDefinitions=""
706	1325	/>
707	1326	</FileConfiguration>
	1327	+ <FileConfiguration
	1328	+ Name="Private Debug\|x64"
	1329	+ >
	1330	+ <Tool
	1331	+ Name="VCCLCompilerTool"
	1332	+ AdditionalIncludeDirectories=""
	1333	+ PreprocessorDefinitions=""
	1334	+ />
	1335	+ </FileConfiguration>
	1336	+ <FileConfiguration
	1337	+ Name="Release\|x64"
	1338	+ >
	1339	+ <Tool
	1340	+ Name="VCCLCompilerTool"
	1341	+ AdditionalIncludeDirectories=""
	1342	+ PreprocessorDefinitions=""
	1343	+ />
	1344	+ </FileConfiguration>
	1345	+ <FileConfiguration
	1346	+ Name="Private Release\|x64"
	1347	+ >
	1348	+ <Tool
	1349	+ Name="VCCLCompilerTool"
	1350	+ AdditionalIncludeDirectories=""
	1351	+ PreprocessorDefinitions=""
	1352	+ />
	1353	+ </FileConfiguration>
	1354	+ <FileConfiguration
	1355	+ Name="Debug\|x64"
	1356	+ >
	1357	+ <Tool
	1358	+ Name="VCCLCompilerTool"
	1359	+ AdditionalIncludeDirectories=""
	1360	+ PreprocessorDefinitions=""
	1361	+ />
	1362	+ </FileConfiguration>
708	1363	</File>
709	1364	</Filter>
710	1365	<Filter

--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/Simple_vp/gui_vp.cpp

+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/Simple_vp/gui_vp.cpp

		@@ -1127,12 +1127,21 @@ LRESULT CALLBACK GUIProc (HWND hwnd, UINT message,
1127	1127	HWND hwndList;
1128	1128
1129	1129	hwndList = GetDlgItem(guiWnd, chanID);
	1130	+#ifndef WIN64
1130	1131	wndOldListBox = (WNDPROC)GetWindowLong(hwndList, GWL_WNDPROC);
1131	1132	SetWindowLong(hwndList, GWL_WNDPROC, (DWORD)ListBoxProc);
1132	1133
1133	1134	hwndList = GetDlgItem(guiWnd, statusID);
1134	1135	wndOldConnListBox = (WNDPROC)GetWindowLong(hwndList, GWL_WNDPROC);
1135	1136	SetWindowLong(hwndList, GWL_WNDPROC, (DWORD)ConnListBoxProc);
	1137	+#else
	1138	+ wndOldListBox = (WNDPROC)GetWindowLongPtr(hwndList, GWLP_WNDPROC);
	1139	+ SetWindowLongPtr(hwndList, GWLP_WNDPROC, (DWORD)ListBoxProc);
	1140	+
	1141	+ hwndList = GetDlgItem(guiWnd, statusID);
	1142	+ wndOldConnListBox = (WNDPROC)GetWindowLongPtr(hwndList, GWLP_WNDPROC);
	1143	+ SetWindowLongPtr(hwndList, GWLP_WNDPROC, (DWORD)ConnListBoxProc);
	1144	+#endif
1136	1145	}
1137	1146
1138	1147	break;

Show on old repository browser

PeerCast IM Fork

PeerCastIM: 提交

Commit MetaInfo

Log Message

Change Summary

差異

PeerCast IM
Fork