From fd3ca6789503e7bbb085d311c9743bae5de83cb7 Mon Sep 17 00:00:00 2001 From: Marcus Wanners Date: Wed, 25 Mar 2009 00:46:00 +0000 Subject: [PATCH] Fixed a few MSVC compiler warnings, and added some switches to the readme. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2752 8ced0084-cf51-0410-be5f-012b33b47a6e --- Readme.txt | 4 +++- Source/Core/DiscIO/Src/NANDContentLoader.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Readme.txt b/Readme.txt index 238582481d..9f021571ce 100644 --- a/Readme.txt +++ b/Readme.txt @@ -23,7 +23,9 @@ System Requirements: [Windows Version] DolphinWx.exe: The main program Arguments: --d Run Dolphin with the debugger tools +-d Run Dolphin with the debugger tools +-l Run Dolphin with the logmanager enabled +-e= Open an elf file cg.dll/cgGL.dll: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html) wiiuse.dll: Wiimote Bluetooth API (http://www.wiiuse.net/) diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index f4121cac5b..7b25b535c8 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -223,8 +223,8 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) return false; } u64 Size = File::GetSize(TMDFileName.c_str()); - u8* pTMD = new u8[Size]; - fread(pTMD, Size, 1, pTMDFile); + u8* pTMD = new u8[(u32)Size]; + fread(pTMD, (size_t)Size, 1, pTMDFile); fclose(pTMDFile); memcpy(m_TicketView, pTMD + 0x180, TICKET_VIEW_SIZE); @@ -266,11 +266,11 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath) if (pFile != NULL) { u64 Size = File::GetSize(szFilename); - rContent.m_pData = new u8[Size]; + rContent.m_pData = new u8[(u32)Size]; _dbg_assert_msg_(BOOT, rContent.m_Size==Size, "TMDLoader: Filesize doesnt fit (%s %i)... prolly you have a bad dump", szFilename, i); - fread(rContent.m_pData, Size, 1, pFile); + fread(rContent.m_pData, (size_t)Size, 1, pFile); fclose(pFile); } else