The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

many warning fixes

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@422 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-09-01 12:11:08 +00:00
parent cad45aea72
commit 4bbfff3cac
29 changed files with 100 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/Src/MappedFile.cpp
View File

@ -158,7 +158,7 @@ void CMappedFile::Close()
}
u8* CMappedFile::Lock(u64 offset, u64 size)
u8* CMappedFile::Lock(u64 offset, u64 _size)
{
#ifdef _WIN32
if (hFile != INVALID_HANDLE_VALUE)
@ -168,9 +168,9 @@ u8* CMappedFile::Lock(u64 offset, u64 size)
{
u64 realOffset = offset & ~(granularity - 1);
s64 difference = offset - realOffset;
u64 fake_size = (difference + size + granularity - 1) & ~(granularity - 1);
u64 fake_size = (difference + _size + granularity - 1) & ~(granularity - 1);
#ifdef _WIN32
u8* realPtr = (u8*)MapViewOfFile(hFileMapping, FILE_MAP_READ, (DWORD)(realOffset >> 32), (DWORD)realOffset, (SIZE_T)(size));
u8* realPtr = (u8*)MapViewOfFile(hFileMapping, FILE_MAP_READ, (DWORD)(realOffset >> 32), (DWORD)realOffset, (SIZE_T)(_size));
if (realPtr == NULL)
{
@ -192,7 +192,7 @@ u8* CMappedFile::Lock(u64 offset, u64 size)
//add to map
lockMap[fakePtr] = realPtr;
#ifndef _WIN32
sizeMap[fakePtr] = size + difference;
sizeMap[fakePtr] = _size + difference;
#endif
return(fakePtr);
}