Some warning and code cleanup.

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

31 files changed, 110 insertions, 92 deletions

diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj
index 8e1c43c000..94f460401e 100644
--- a/Source/Core/Common/Common.vcproj
+++ b/Source/Core/Common/Common.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Common"

 	ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"

 	RootNamespace="Common"

@@ -293,7 +293,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="wsock32.lib winmm.lib"

+				AdditionalDependencies="winmm.lib"

 				OutputFile="$(OutDir)/Common.lib"

 			/>

 			<Tool

diff --git a/Source/Core/Common/Src/ChunkFile.h b/Source/Core/Common/Src/ChunkFile.h
index a892f8528b..8aa18ba618 100644
--- a/Source/Core/Common/Src/ChunkFile.h
+++ b/Source/Core/Common/Src/ChunkFile.h
@@ -172,7 +172,7 @@ public:
 			}
 
 			// get size
-			int sz = FileSize - sizeof(SChunkHeader);
+			int sz = (int)(FileSize - sizeof(SChunkHeader));
 			if (Header.ExpectedSize != sz)
 			{
 				fclose(pFile);
@@ -213,7 +213,7 @@ public:
 			SChunkHeader Header;
 			Header.Compress = 0;
 			Header.Revision = _Revision;
-			Header.ExpectedSize = sz;
+			Header.ExpectedSize = (int)sz;
 
 			fwrite(&Header, sizeof(SChunkHeader), 1, pFile);
 			fwrite(buffer, sz, 1, pFile);
diff --git a/Source/Core/Common/Src/ConsoleWindow.cpp b/Source/Core/Common/Src/ConsoleWindow.cpp
index 0a921d3686..773a047bf7 100644
--- a/Source/Core/Common/Src/ConsoleWindow.cpp
+++ b/Source/Core/Common/Src/ConsoleWindow.cpp
@@ -126,7 +126,7 @@ int Print(const char *fmt, ...)
 		// ----------------

 		if(__hStdOut)

 		{

-			WriteConsole(__hStdOut, s, strlen(s), &cCharsWritten, NULL);

+			WriteConsole(__hStdOut, s, (DWORD)strlen(s), &cCharsWritten, NULL);

 		}

 

 		// ----------------------------------------

diff --git a/Source/Core/Common/Src/ExtendedTrace.cpp b/Source/Core/Common/Src/ExtendedTrace.cpp
index 2c119a1d86..ac774a5b42 100644
--- a/Source/Core/Common/Src/ExtendedTrace.cpp
+++ b/Source/Core/Common/Src/ExtendedTrace.cpp
@@ -325,8 +325,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file )
 		etfprint(file, "Call stack info: \n");
 		etfprint(file, lpszMessage);
 
-		GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo );
-		GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo );
+		GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo );
+		GetSourceInfoFromAddress( (ULONG)callStack.AddrPC.Offset, srcInfo );
 		etfprint(file, string("     ") + srcInfo + string(" : ") + symInfo + string("\n"));
 
 		for( ULONG index = 0; ; index++ ) 
@@ -348,8 +348,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file )
 			if( !bResult || callStack.AddrFrame.Offset == 0 ) 
 				break;
 
-			GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo );
-			GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo );
+			GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo );
+			GetSourceInfoFromAddress( (UINT)callStack.AddrPC.Offset, srcInfo );
 			etfprint(file, string("     ") + srcInfo + string(" : ") + symInfo + string("\n"));
 
 		}
@@ -386,8 +386,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file, DWORD eip, DWO
 		etfprint(file, "Call stack info: \n");
 		etfprint(file, lpszMessage);
 
-		GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo );
-		GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo );
+		GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo );
+		GetSourceInfoFromAddress( (UINT)callStack.AddrPC.Offset, srcInfo );
 		etfprint(file, string("     ") + srcInfo + string(" : ") + symInfo + string("\n"));
 
 		for( ULONG index = 0; ; index++ ) 
@@ -409,8 +409,8 @@ void StackTrace( HANDLE hThread, LPCTSTR lpszMessage, FILE *file, DWORD eip, DWO
 			if( !bResult || callStack.AddrFrame.Offset == 0 ) 
 				break;
 
-			GetFunctionInfoFromAddresses( callStack.AddrPC.Offset, callStack.AddrFrame.Offset, symInfo );
-			GetSourceInfoFromAddress( callStack.AddrPC.Offset, srcInfo );
+			GetFunctionInfoFromAddresses( (ULONG)callStack.AddrPC.Offset, (ULONG)callStack.AddrFrame.Offset, symInfo );
+			GetSourceInfoFromAddress( (UINT)callStack.AddrPC.Offset, srcInfo );
 			etfprint(file, string("     ") + srcInfo + string(" : ") + symInfo + string("\n"));
 
 		}
diff --git a/Source/Core/Core/Src/ARDecrypt.cpp b/Source/Core/Core/Src/ARDecrypt.cpp
index 7ec28254f2..7bf21ac94e 100644
--- a/Source/Core/Core/Src/ARDecrypt.cpp
+++ b/Source/Core/Core/Src/ARDecrypt.cpp
@@ -406,7 +406,7 @@ int GetVal(const char *flt, char chr)
 {
 	int ret;
 
-	ret = (strchr(flt,chr) - flt);
+	ret = (int)(strchr(flt,chr) - flt);
 	switch (ret)
 	{
 	case 32: // 'I'
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
index ee02797f7c..1a7dc05d67 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
@@ -655,7 +655,7 @@
 		int s = inst.RS;
 		if (gpr.R(s).IsImm() && !inst.Rc)
 		{
-			unsigned result = gpr.R(s).offset;
+			unsigned result = (int)gpr.R(s).offset;
 			if (inst.SH != 0)
 				result = _rotl(result, inst.SH);
 			result &= Helper_Mask(inst.MB, inst.ME);
diff --git a/Source/Core/DebuggerWX/DebuggerWX.vcproj b/Source/Core/DebuggerWX/DebuggerWX.vcproj
index f71ee20ce3..055de87318 100644
--- a/Source/Core/DebuggerWX/DebuggerWX.vcproj
+++ b/Source/Core/DebuggerWX/DebuggerWX.vcproj
@@ -265,7 +265,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="comctl32.lib rpcrt4.lib"

+				AdditionalDependencies="rpcrt4.lib"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -464,22 +464,62 @@
 			<File

 				RelativePath=".\resources\toolbar_add_breakpoint.c"

 				>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\resources\toolbar_add_memorycheck.c"

 				>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\resources\toolbar_delete.c"

 				>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\resources\toolbar_pause.c"

 				>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\resources\toolbar_play.c"

 				>

+				<FileConfiguration

+					Name="Release|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 		</Filter>

 		<File

@@ -551,10 +591,6 @@
 			>

 		</File>

 		<File

-			RelativePath=".\src\Debugger.cpp"

-			>

-		</File>

-		<File

 			RelativePath=".\src\Debugger.h"

 			>

 		</File>

diff --git a/Source/Core/DebuggerWX/Src/Debugger.cpp b/Source/Core/DebuggerWX/Src/Debugger.cpp
deleted file mode 100644
index 2bf8df55ff..0000000000
--- a/Source/Core/DebuggerWX/Src/Debugger.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2003-2008 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Debugger.h"
-
diff --git a/Source/Core/DebuggerWX/Src/MemoryView.cpp b/Source/Core/DebuggerWX/Src/MemoryView.cpp
index 020caa29c4..338bbeef94 100644
--- a/Source/Core/DebuggerWX/Src/MemoryView.cpp
+++ b/Source/Core/DebuggerWX/Src/MemoryView.cpp
@@ -212,7 +212,7 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
 		int src, dst, srcAddr;
 	};
 
-	branch branches[256];
+	// branch branches[256]; // TODO: This is not being used
 	int numBranches = 0;
 	// TODO: Add any drawing code here...
 	int width   = rc.width;
diff --git a/Source/Core/DebuggerWX/Src/SConscript b/Source/Core/DebuggerWX/Src/SConscript
index 59ec56c32a..044509d665 100644
--- a/Source/Core/DebuggerWX/Src/SConscript
+++ b/Source/Core/DebuggerWX/Src/SConscript
@@ -13,7 +13,6 @@ files = ["LogWindow.cpp",
          "CodeWindow.cpp",
          "CodeWindowSJP.cpp",
          "CodeView.cpp",
-         "Debugger.cpp",
          "MemoryCheckDlg.cpp",
          "MemoryView.cpp",
          "MemoryWindow.cpp",
diff --git a/Source/Core/DiscIO/Src/BannerLoader.cpp b/Source/Core/DiscIO/Src/BannerLoader.cpp
index a45a286c4d..d14d40363f 100644
--- a/Source/Core/DiscIO/Src/BannerLoader.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoader.cpp
@@ -101,7 +101,7 @@ bool IBannerLoader::CopySJISToString( std::string& _rDestination, const char* _s
 	// HyperIris: because dolphin using "Use Multi-Byte Character Set",
 	// we must convert the SJIS chars to unicode then to our windows local by hand
 	u32 unicodeNameSize = MultiByteToWideChar(932, MB_PRECOMPOSED, 
-		_src, strlen(_src),	NULL, NULL);
+		_src, (int)strlen(_src),	NULL, NULL);
 	if (unicodeNameSize > 0)
 	{
 		u16* pUnicodeStrBuffer = new u16[unicodeNameSize + 1];
@@ -109,7 +109,7 @@ bool IBannerLoader::CopySJISToString( std::string& _rDestination, const char* _s
 		{
 			memset(pUnicodeStrBuffer, 0, (unicodeNameSize + 1) * sizeof(u16));
 			if (MultiByteToWideChar(932, MB_PRECOMPOSED, 
-				_src, strlen(_src),
+				_src, (int)strlen(_src),
 				(LPWSTR)pUnicodeStrBuffer, unicodeNameSize))
 			{
 				u32 ansiNameSize = WideCharToMultiByte(CP_ACP, 0, 
@@ -150,7 +150,7 @@ bool IBannerLoader::CopyUnicodeToString( std::string& _rDestination, const u16*
 	if (_src)
 	{
 		u32 ansiNameSize = WideCharToMultiByte(CP_ACP, 0, 
-			(LPCWSTR)_src, wcslen((const wchar_t*)_src),
+			(LPCWSTR)_src, (int)wcslen((const wchar_t*)_src),
 			NULL, NULL, NULL, NULL);
 		if (ansiNameSize > 0)
 		{
@@ -159,7 +159,7 @@ bool IBannerLoader::CopyUnicodeToString( std::string& _rDestination, const u16*
 			{
 				memset(pAnsiStrBuffer, 0, (ansiNameSize + 1) * sizeof(char));
 				if (WideCharToMultiByte(CP_ACP, 0, 
-					(LPCWSTR)_src, wcslen((const wchar_t*)_src),
+					(LPCWSTR)_src, (int)wcslen((const wchar_t*)_src),
 					pAnsiStrBuffer, ansiNameSize, NULL, NULL))
 				{
 					_rDestination = pAnsiStrBuffer;
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
index e30513adeb..37fe0b8f4d 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
@@ -145,7 +145,7 @@ void CVolumeDirectory::SetUniqueID(std::string _ID)
 {
 	_dbg_assert_(DVDINTERFACE, m_diskHeader);
 
-	u32 length = _ID.length();
+	u32 length = (u32)_ID.length();
 	if(length > 6)
 		length = 6;
 
@@ -218,7 +218,7 @@ void CVolumeDirectory::SetName(std::string _Name)
 {
 	_dbg_assert_(DVDINTERFACE, m_diskHeader);
 
-	u32 length = _Name.length();
+	u32 length = (u32)_Name.length();
 	if(length > MAX_NAME_LENGTH)
 		length = MAX_NAME_LENGTH;
 
@@ -410,7 +410,7 @@ void CVolumeDirectory::WriteEntryName(u32& nameOffset, const std::string& name)
 {
 	strncpy((char*)(m_FSTData + nameOffset + m_fstNameOffset), name.c_str(), name.length() + 1);
 	
-	nameOffset += (name.length() + 1);
+	nameOffset += (u32)(name.length() + 1);
 }
 
 void CVolumeDirectory::WriteEntry(const File::FSTEntry& entry, u32& fstOffset, u32& nameOffset, u64& dataOffset, u32 parentEntryNum)
@@ -454,7 +454,7 @@ static u32 ComputeNameSize(const File::FSTEntry& parentEntry)
 		{
 			nameSize += ComputeNameSize(entry);
 		}
-		nameSize += entry.virtualName.length() + 1;
+		nameSize += (u32)entry.virtualName.length() + 1;
 	}
 	return nameSize;
 }
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index 5108c0e80c..ad86e7f9ae 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -380,7 +380,7 @@ void CGameListCtrl::ScanForISOs(bool bUpdateCache)
 	{
 		wxProgressDialog dialog(_T("Scanning for ISOs"),
 					_T("Scanning..."),
-					rFilenames.size(), // range
+					(int)rFilenames.size(), // range
 					this, // parent
 					wxPD_APP_MODAL |
 					// wxPD_AUTO_HIDE | -- try this as well
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index d8c2fc89f6..018d8194c0 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -679,7 +679,7 @@ void CISOProperties::PatchButtonClicked(wxCommandEvent& event)
 		if (dlg.ShowModal() == wxID_OK)
 		{
 			Patches->Append(wxString::FromAscii(onFrame.back().name.c_str()));
-			Patches->Check(onFrame.size() - 1, onFrame.back().active);
+			Patches->Check((unsigned int)(onFrame.size() - 1), onFrame.back().active);
 		}
 		}
 		break;
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 3c68f8438f..da74ce9e6d 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -312,7 +312,7 @@ void DolphinApp::OnEndSession()
 ///////////////////////////////////////  Main window created
 
 #if defined HAVE_WX && HAVE_WX
-bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int Style)
+bool wxMsgAlert(const char* caption, const char* text, bool yes_no, int /*Style*/)
 {
     return wxYES == wxMessageBox(wxString::FromAscii(text), 
 				 wxString::FromAscii(caption),
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index 8ebe2dc720..b848aa1f41 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -157,7 +157,7 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 				}
 				Video_SendFifoData(uData, distToSend);
                 Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadPointer, readPtr);
-                Common::SyncInterlockedExchangeAdd((LONG*)&_fifo.CPReadWriteDistance, -distToSend);
+                Common::SyncInterlockedExchangeAdd((LONG*)&_fifo.CPReadWriteDistance, -(__int64)distToSend);
 			}
 			//video_initialize.pLog("..........................IDLE",FALSE);
 			Common::SyncInterlockedExchange((LONG*)&_fifo.CPReadIdle, 1);
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
index ab0741db17..1ddecefa8d 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
@@ -218,7 +218,7 @@ if(m_frame->ScanMails)
 	if(addnew == m_frame->sMail.size())
 	{		
 		//Console::Print("%i  |  %i\n", addnew, m_frame->sMail.size());
-		u32 resizeTo = m_frame->sMail.size() + 1;		
+		u32 resizeTo = (u32)(m_frame->sMail.size() + 1);		
 
 		// ------------------------------------
 		// get timestamp
diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/disassemble.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/disassemble.cpp
index 99968a6f21..b29289fdad 100644
--- a/Source/Plugins/Plugin_DSP_LLE/Src/disassemble.cpp
+++ b/Source/Plugins/Plugin_DSP_LLE/Src/disassemble.cpp
@@ -520,7 +520,7 @@ bool gd_dis_file(gd_globals_t* gdg, char* name, FILE* output)
 	}
 
 	fseek(in, 0, SEEK_END);
-	size = ftell(in);
+	size = (int)ftell(in);
 	fseek(in, 0, SEEK_SET);
 	gdg->binbuf = (uint16*)malloc(size);
 	fread(gdg->binbuf, 1, size, in);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp b/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
index c4d8b6ba40..0fd5b7c0cf 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/rasterfont.cpp
@@ -199,7 +199,7 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
 			//todo: add tabs every something like 4*char_width
 			*t=0;
 
-			int cpos = strlen(temp);
+			int cpos = (int)strlen(temp);
 
                         int newpos = (cpos+4)&(~3);
 
diff --git a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj
index 931493e29c..25f48fd05c 100644
--- a/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj
+++ b/Source/Plugins/Plugin_Wiimote/Plugin_Wiimote.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Plugin_Wiimote"

 	ProjectGUID="{8D612734-FAA5-4B8A-804F-4DEA2367D495}"

 	RootNamespace="Plugin_Wiimote"

@@ -296,13 +296,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

diff --git a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
index 6d91cc07a9..17d8c0fa1a 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
@@ -164,7 +164,7 @@ void CreateAckDelay(u8 _ChannelID, u16 _ReportID)
 	wm_ackdelay Tmp;
 	Tmp.Delay = GlobalDelay;
 	Tmp.ChannelID = _ChannelID;
-	Tmp.ReportID = _ReportID;
+	Tmp.ReportID = (u8)_ReportID;
 	AckDelay.push_back(Tmp);
 }
 
@@ -267,7 +267,7 @@ void InterruptChannel(u16 _channelID, const void* _pData, u32 _Size)
 					//if((data[1] == WM_WRITE_DATA  || data[1] == WM_READ_DATA)
 					//	&& data[3] == 0xa4)
 					//{
-						CreateAckDelay(_channelID, sr->channel);
+						CreateAckDelay((u8)_channelID, (u16)sr->channel);
 					//}
 					//else
 					//{
diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
index 853fb1d9c5..838088c93b 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
@@ -180,7 +180,7 @@ void FillReportAcc(wm_accel& _acc)
 		|| shake > 0
 		);	
 #endif
-	if(yhistsize > yhist.size()) yhistsize = yhist.size();
+	if(yhistsize > yhist.size()) yhistsize = (int)yhist.size();
 	for (int i = 1; i < yhistsize; i++)
 	{
 		yhist[i-1] = yhist[i];
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
index e7ebb69766..2a50ecafb4 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
+++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Plugin_nJoy_SDL"

 	ProjectGUID="{521498BE-6089-4780-8223-E67C22F4E068}"

 	RootNamespace="Plugin_nJoy_SDL"

@@ -283,7 +283,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\Include_1.2;..\..\Core\Common\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
index cbb66d2f94..69e37e640e 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/Config.cpp
@@ -38,6 +38,7 @@
 

 Config g_Config;

 extern ConfigBox* m_frame;

+

 //////////////////////////////////

 

 

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp
index e55e42ca2c..27cc6f86dc 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/AboutBox.cpp
@@ -33,7 +33,6 @@
 #include "../nJoy.h"
 #include "Images/njoy.xpm"
 
-
 BEGIN_EVENT_TABLE(AboutBox,wxDialog)
 	EVT_CLOSE(AboutBox::OnClose)
 	EVT_BUTTON(ID_OK, AboutBox::OKClick)
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
index 40d79bcc6b..68ea0142e2 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigBox.cpp
@@ -455,7 +455,7 @@ void ConfigBox::UpdateGUI(int _notebookpage)
 	LogMsg("Update: %i\n", g_Config.bSaveByID);
 
 	// Disabled pages
-	bool Enabled = PadMapping[_notebookpage].enabled;
+	bool Enabled = PadMapping[_notebookpage].enabled  == 1 ? true : false;
 	// There is no FindItem in linux so this doesn't work
 	#ifdef _WIN32
 		// Enable or disable all buttons
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
index 1e17eaf215..5dbedf7676 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/GUI/ConfigJoypad.cpp
@@ -56,7 +56,7 @@ void ConfigBox::UpdateGUIKeys(int controller)
 	m_Joyname[controller]->SetSelection(PadMapping[controller].ID);

 

 	// Update the enabled checkbox

-	m_Joyattach[controller]->SetValue(PadMapping[controller].enabled);

+	m_Joyattach[controller]->SetValue(PadMapping[controller].enabled == 1 ? true : false);

 

 	tmp << PadMapping[controller].buttons[CTL_L_SHOULDER]; m_JoyShoulderL[controller]->SetValue(tmp); tmp.clear();

 	tmp << PadMapping[controller].buttons[CTL_R_SHOULDER]; m_JoyShoulderR[controller]->SetValue(tmp); tmp.clear();

@@ -203,28 +203,32 @@ wxString ConfigBox::GetButtonText(int id)
 

 	switch(id)

 	{

+		// D-Pad

 		case IDB_DPAD_RIGHT: return m_JoyDpadRight[controller]->GetValue();

-		case IDB_DPAD_UP: return m_JoyDpadUp[controller]->GetValue(); break;

-		case IDB_DPAD_DOWN: return m_JoyDpadDown[controller]->GetValue(); break;

-		case IDB_DPAD_LEFT: return m_JoyDpadLeft[controller]->GetValue();	break;

-

-		case IDB_ANALOG_MAIN_X: return m_JoyAnalogMainX[controller]->GetValue(); break;

-		case IDB_ANALOG_MAIN_Y: return m_JoyAnalogMainY[controller]->GetValue(); break;

-		case IDB_ANALOG_SUB_X: return m_JoyAnalogSubX[controller]->GetValue(); break;

-		case IDB_ANALOG_SUB_Y: return m_JoyAnalogSubY[controller]->GetValue(); break;

-

-		case IDB_SHOULDER_L: return m_JoyShoulderL[controller]->GetValue(); break;

-		case IDB_SHOULDER_R: return m_JoyShoulderR[controller]->GetValue(); break;

+		case IDB_DPAD_UP: return m_JoyDpadUp[controller]->GetValue();

+		case IDB_DPAD_DOWN: return m_JoyDpadDown[controller]->GetValue();

+		case IDB_DPAD_LEFT: return m_JoyDpadLeft[controller]->GetValue();

+

+		// Analog Stick

+		case IDB_ANALOG_MAIN_X: return m_JoyAnalogMainX[controller]->GetValue();

+		case IDB_ANALOG_MAIN_Y: return m_JoyAnalogMainY[controller]->GetValue();

+		case IDB_ANALOG_SUB_X: return m_JoyAnalogSubX[controller]->GetValue();

+		case IDB_ANALOG_SUB_Y: return m_JoyAnalogSubY[controller]->GetValue();

+

+		// Shoulder Buttons

+		case IDB_SHOULDER_L: return m_JoyShoulderL[controller]->GetValue();

+		case IDB_SHOULDER_R: return m_JoyShoulderR[controller]->GetValue();

 		

-		case IDB_BUTTON_A: return m_JoyButtonA[controller]->GetValue(); break;		

-		case IDB_BUTTON_B: return m_JoyButtonB[controller]->GetValue(); break;

-		case IDB_BUTTON_X: return m_JoyButtonX[controller]->GetValue(); break;

-		case IDB_BUTTON_Y: return m_JoyButtonY[controller]->GetValue(); break;

-		case IDB_BUTTON_Z: return m_JoyButtonZ[controller]->GetValue(); break;

-		case IDB_BUTTONSTART: return m_JoyButtonStart[controller]->GetValue(); break;

-

-		case IDB_BUTTONHALFPRESS: return m_JoyButtonHalfpress[controller]->GetValue(); break;

-		default: break;

+		// Buttons

+		case IDB_BUTTON_A: return m_JoyButtonA[controller]->GetValue();		

+		case IDB_BUTTON_B: return m_JoyButtonB[controller]->GetValue();

+		case IDB_BUTTON_X: return m_JoyButtonX[controller]->GetValue();

+		case IDB_BUTTON_Y: return m_JoyButtonY[controller]->GetValue();

+		case IDB_BUTTON_Z: return m_JoyButtonZ[controller]->GetValue();

+		case IDB_BUTTONSTART: return m_JoyButtonStart[controller]->GetValue();

+

+		case IDB_BUTTONHALFPRESS: return m_JoyButtonHalfpress[controller]->GetValue();

+		default: return wxString("");

 	}

 }

 

diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
index d4ae404180..143a56eb86 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp
@@ -666,7 +666,7 @@ std::vector<int> Pad_Square_to_Circle(int _x, int _y, int _pad)
 	float SquareDist = SquareDistance(deg);
 	float adj_ratio1; // The original-to-square distance adjustment
 	float adj_ratio2 = SquareDist; // The circle-to-square distance adjustment
-	float final_ratio; // The final adjustment to the current distance
+	// float final_ratio; // The final adjustment to the current distance //TODO: This is not used
 	float result_dist; // The resulting distance
 
 	// Calculate the corner-to-square adjustment ratio
diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
index f960fec7a6..999e94d80a 100644
--- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
+++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h
@@ -64,7 +64,6 @@
 
 #ifdef _WIN32
 	#include <tchar.h>
-	#define _CRT_SECURE_NO_WARNINGS
 	#define DIRECTINPUT_VERSION 0x0800
 	#define WIN32_LEAN_AND_MEAN
 
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj b/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
index 9498ba134a..efd42c4a45 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
+++ b/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Plugin_nJoy_SDL_Test"

 	ProjectGUID="{ADF64291-57ED-4B7A-AB76-37B4A991504B}"

 	RootNamespace="Plugin_nJoy_SDL"

@@ -286,7 +286,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\PluginSpecs;..\..\..\Externals\SDL\include;..\..\Core\Common\Src;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_NJOY_SDL_EXPORTS;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h
index b1b5e559cf..a0b27d2bcd 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h
@@ -51,7 +51,6 @@
 #pragma comment(lib, "comctl32.lib")
 #include <tchar.h>
 #include <math.h>
-#define _CRT_SECURE_NO_WARNINGS
 #define DIRECTINPUT_VERSION 0x0800
 #define WIN32_LEAN_AND_MEAN