- Janitorial tasks

- Bugfix in ARCode/Patch editor


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

6 files changed, 12 insertions, 9 deletions

diff --git a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
index 2480739979..994dbadcf0 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderGC.cpp
@@ -42,7 +42,7 @@ CBannerLoaderGC::CBannerLoaderGC(DiscIO::IFileSystem& _rFileSystem)
 	}
 
 	// load the opening.bnr
-	size_t FileSize = _rFileSystem.GetFileSize("opening.bnr");
+	size_t FileSize = (size_t) _rFileSystem.GetFileSize("opening.bnr");
 
 	if (FileSize > 0)
 	{
diff --git a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
index e9048fc41d..f58e98b93c 100644
--- a/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
+++ b/Source/Core/DiscIO/Src/BannerLoaderWii.cpp
@@ -38,7 +38,7 @@ CBannerLoaderWii::CBannerLoaderWii(DiscIO::IFileSystem& _rFileSystem)
 	sprintf(Filename, FULL_WII_USER_DIR "title/00010000/%02x%02x%02x%02x/data/banner.bin", (u8)TitleID[0], (u8)TitleID[1], (u8)TitleID[2], (u8)TitleID[3]);
 
 	// load the opening.bnr
-	size_t FileSize = File::GetSize(Filename);
+	size_t FileSize = (size_t) File::GetSize(Filename);
 
 	if (FileSize > 0)
 	{
diff --git a/Source/Core/DiscIO/Src/FileHandlerARC.cpp b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
index e9a7b96044..5b05c6ae31 100644
--- a/Source/Core/DiscIO/Src/FileHandlerARC.cpp
+++ b/Source/Core/DiscIO/Src/FileHandlerARC.cpp
@@ -65,7 +65,7 @@ CARCFile::GetFileSize(const std::string& _rFullPath)
 
 	if (pFileInfo != NULL)
 	{
-		return(pFileInfo->m_FileSize);
+		return((size_t) pFileInfo->m_FileSize);
 	}
 
 	return(0);
@@ -93,7 +93,7 @@ CARCFile::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBuffe
 	}
 
 	memcpy(_pBuffer, &m_pBuffer[pFileInfo->m_Offset], pFileInfo->m_FileSize);
-	return(pFileInfo->m_FileSize);
+	return((size_t) pFileInfo->m_FileSize);
 }
 
 
@@ -119,7 +119,7 @@ CARCFile::ExportFile(const std::string& _rFullPath, const std::string& _rExportF
 		return(false);
 	}
 
-	fwrite(&m_pBuffer[pFileInfo->m_Offset], pFileInfo->m_FileSize, 1, pFile);
+	fwrite(&m_pBuffer[pFileInfo->m_Offset], (size_t) pFileInfo->m_FileSize, 1, pFile);
 	fclose(pFile);
 	return(true);
 }
@@ -199,7 +199,7 @@ CARCFile::BuildFilenames(const size_t _FirstIndex, const size_t _LastIndex, cons
 				sprintf(rFileInfo.m_FullPath, "%s\\", &_szNameTable[uOffset]);
 			}
 
-			CurrentIndex = BuildFilenames(CurrentIndex + 1, rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable);
+			CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo.m_FileSize, rFileInfo.m_FullPath, _szNameTable);
 		}
 		else
 		{
diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
index 13376e447c..f9478fe5dd 100644
--- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp
@@ -88,7 +88,7 @@ u64 CFileSystemGCWii::ReadFile(const char* _rFullPath, u8* _pBuffer, size_t _Max
 
 bool CFileSystemGCWii::ExportFile(const char* _rFullPath, const char* _rExportFilename) const
 {
-	size_t filesize = GetFileSize(_rFullPath);
+	size_t filesize = (size_t) GetFileSize(_rFullPath);
 
 	if (filesize == 0)
 		return false;
@@ -229,7 +229,7 @@ size_t CFileSystemGCWii::BuildFilenames(const size_t _FirstIndex, const size_t _
 			else
 				CharArrayFromFormat(rFileInfo->m_FullPath, "%s\\", filename);
 
-			CurrentIndex = BuildFilenames(CurrentIndex + 1, rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset);
+			CurrentIndex = BuildFilenames(CurrentIndex + 1, (size_t) rFileInfo->m_FileSize, rFileInfo->m_FullPath, _NameTableOffset);
 		}
 		else
 		{
diff --git a/Source/Core/DiscIO/Src/VolumeCreator.cpp b/Source/Core/DiscIO/Src/VolumeCreator.cpp
index 2ff5e8471b..029bcbaf86 100644
--- a/Source/Core/DiscIO/Src/VolumeCreator.cpp
+++ b/Source/Core/DiscIO/Src/VolumeCreator.cpp
@@ -150,7 +150,7 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType)
 				for(int i=0;i<16;i++)
 				{
 					char h[3]={*(t++),*(t++),0};
-					binkey[i] = strtol(h,NULL,16);
+					binkey[i] = (char) strtol(h,NULL,16);
 				}
 
 				pT = fopen(WII_MASTERKEY_FILE, "wb");
diff --git a/Source/Core/DiscIO/Src/stdafx.h b/Source/Core/DiscIO/Src/stdafx.h
index 2949974115..cd41c1e39e 100644
--- a/Source/Core/DiscIO/Src/stdafx.h
+++ b/Source/Core/DiscIO/Src/stdafx.h
@@ -23,7 +23,10 @@
 
 #define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
 
+#ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE
+#endif
+
 #define _SCL_SECURE_NO_DEPRECATE