some more warning cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1999 8ced0084-cf51-0410-be5f-012b33b47a6e

Externals/wxWidgets/build/msw/wx_base.vcproj

@@ -49,6 +49,7 @@
 				AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib"
 				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="false"
 				RuntimeTypeInfo="true"
@@ -127,6 +128,7 @@
 				AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib"
 				PreprocessorDefinitions="WIN32;_LIB;__WXMSW__;wxUSE_GUI=0;wxUSE_BASE=1;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
 				StringPooling="true"
+				ExceptionHandling="2"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="true"
@@ -139,7 +141,7 @@
 				WarningLevel="3"
 				WarnAsError="false"
 				SuppressStartupBanner="true"
-				DisableSpecificWarnings="4267;4535;"
+				DisableSpecificWarnings="4267"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -5732,6 +5734,10 @@
 		<Filter
 			Name="Setup Headers"
 			>
+			<File
+				RelativePath="..\..\include\wx\univ\setup.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\msw\setup.h"
 				>
@@ -5796,10 +5802,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\univ\setup.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="MSW Headers"

Source/Core/DebuggerWX/DebuggerWX.vcproj

@@ -200,7 +200,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="comctl32.lib rpcrt4.lib"
+				AdditionalDependencies="rpcrt4.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -464,6 +464,14 @@
 			<File
 				RelativePath=".\resources\toolbar_add_breakpoint.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					ExcludedFromBuild="true"
@@ -476,6 +484,14 @@
 			<File
 				RelativePath=".\resources\toolbar_add_memorycheck.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					ExcludedFromBuild="true"
@@ -488,6 +504,14 @@
 			<File
 				RelativePath=".\resources\toolbar_delete.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					ExcludedFromBuild="true"
@@ -500,6 +524,14 @@
 			<File
 				RelativePath=".\resources\toolbar_pause.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					ExcludedFromBuild="true"
@@ -512,6 +544,14 @@
 			<File
 				RelativePath=".\resources\toolbar_play.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					ExcludedFromBuild="true"

Source/Core/DiscIO/Src/FileHandlerARC.cpp

@@ -92,7 +92,7 @@ CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBuffe
 		return(0);
 	}
 
-	memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], pFileInfo->m_FileSize);
+	memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], (size_t)pFileInfo->m_FileSize);
 	return((size_t) pFileInfo->m_FileSize);
 }
 
@@ -156,7 +156,7 @@ CARCFile::ParseBuffer()
 
 	if (Root.IsDirectory())
 	{
-		m_FileInfoVector.resize(Root.m_FileSize);
+		m_FileInfoVector.resize((unsigned int)Root.m_FileSize);
 		const char* szNameTable = (char*)(m_pBuffer + FSTOffset);
 
 		for (size_t i = 0; i < m_FileInfoVector.size(); i++)

Source/Core/DiscIO/Src/FileSystemGCWii.cpp

@@ -187,7 +187,7 @@ bool CFileSystemGCWii::InitFileSystem()
 			PanicAlert("Wtf?");
 		u64 NameTableOffset = FSTOffset;
 
-		m_FileInfoVector.reserve(Root.m_FileSize);
+		m_FileInfoVector.reserve((unsigned int)Root.m_FileSize);
 		for (u32 i = 0; i < Root.m_FileSize; i++)
 		{
 			SFileInfo sfi;

Source/Plugins/Plugin_DSP_LLE/Src/Logging/Logging.cpp

@@ -327,9 +327,9 @@ void Logging()
 			iupdonce = true;
 		}
 
-		for (int i = 0; i < viupd.size(); i++) // 0, 1,..., 9
+		for (int i = 0; i < (int)viupd.size(); i++) // 0, 1,..., 9
 		{
-			if (i < viupd.size()-1)
+			if (i < (int)viupd.size()-1)
 			{
 				viupd.at(viupd.size()-i-1) = viupd.at(viupd.size()-i-2);		// move all forward	
 			}
@@ -349,7 +349,7 @@ void Logging()
 			}				
 		}
 
-		for (int i = 0; i < viupd.size(); i++)
+		for (int i = 0; i < (int)viupd.size(); i++)
 		{
 			if(viupd.at(i) == 0)
 				sbuff = sbuff + " ";

Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj

@@ -212,13 +212,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\Core\Common\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\WiiUse\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_WIIMOTE_TEST_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				AssemblerListingLocation="$(IntDir)\"
 				ProgramDataBaseFileName="$(IntDir)\"
 				WarningLevel="3"
 				WarnAsError="false"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool

Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp

@@ -171,7 +171,7 @@ void CreateAckDelay(u8 _ChannelID, u16 _ReportID)
 
 void CheckAckDelay()
 {
-	for (int i = 0; i < AckDelay.size(); i++)
+	for (int i = 0; i < (int)AckDelay.size(); i++)
 	{
 		// See if there are any acks to send
 		if (AckDelay.at(i).Delay >= 0)

Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp

@@ -180,7 +180,7 @@ void FillReportAcc(wm_accel& _acc)
 		|| shake > 0
 		);	
 #endif
-	if(yhistsize > yhist.size()) yhistsize = (int)yhist.size();
+	if(yhistsize > (int)yhist.size()) yhistsize = (int)yhist.size();
 	for (int i = 1; i < yhistsize; i++)
 	{
 		yhist[i-1] = yhist[i];