piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

GCMemcard: Use BigEndianValue for DEntry.m_comments_address.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2018-11-18 18:27:18 +01:00
parent 8a920dac93
commit 443729d2c3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
View File

@ -533,7 +533,7 @@ u32 GCMemcard::DEntry_CommentsAddress(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return 0xFFFF; return 0xFFFF;
return BE32(CurrentDir->m_dir_entries[index].m_comments_address); return CurrentDir->m_dir_entries[index].m_comments_address;
} }
std::string GCMemcard::GetSaveComment1(u8 index) const std::string GCMemcard::GetSaveComment1(u8 index) const
@ -541,7 +541,7 @@ std::string GCMemcard::GetSaveComment1(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u32 Comment1 = BE32(CurrentDir->m_dir_entries[index].m_comments_address); u32 Comment1 = CurrentDir->m_dir_entries[index].m_comments_address;
u32 DataBlock = CurrentDir->m_dir_entries[index].m_first_block - MC_FST_BLOCKS; u32 DataBlock = CurrentDir->m_dir_entries[index].m_first_block - MC_FST_BLOCKS;
if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF))
{ {
@ -555,7 +555,7 @@ std::string GCMemcard::GetSaveComment2(u8 index) const
if (!m_valid || index >= DIRLEN) if (!m_valid || index >= DIRLEN)
return ""; return "";
u32 Comment1 = BE32(CurrentDir->m_dir_entries[index].m_comments_address); u32 Comment1 = CurrentDir->m_dir_entries[index].m_comments_address;
u32 Comment2 = Comment1 + DENTRY_STRLEN; u32 Comment2 = Comment1 + DENTRY_STRLEN;
u32 DataBlock = CurrentDir->m_dir_entries[index].m_first_block - MC_FST_BLOCKS; u32 DataBlock = CurrentDir->m_dir_entries[index].m_first_block - MC_FST_BLOCKS;
if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF)) if ((DataBlock > maxBlock) || (Comment1 == 0xFFFFFFFF))
@ -1070,8 +1070,11 @@ void GCMemcard::Gcs_SavConvert(DEntry& tempDEntry, int saveType, int length)
memcpy(&tempDEntry.m_block_count, tmp.data(), 2); memcpy(&tempDEntry.m_block_count, tmp.data(), 2);
ArrayByteSwap((tempDEntry.m_unused_2)); ArrayByteSwap((tempDEntry.m_unused_2));
ArrayByteSwap((tempDEntry.m_comments_address));
ArrayByteSwap(&(tempDEntry.m_comments_address[2])); memcpy(tmp.data(), &tempDEntry.m_comments_address, 4);
ByteSwap(&tmp[0], &tmp[1]);
ByteSwap(&tmp[2], &tmp[3]);
memcpy(&tempDEntry.m_comments_address, tmp.data(), 4);
break; break;
default: default:
break; break;

9
Source/Core/Core/HW/GCMemcard/GCMemcard.h
View File

@ -216,10 +216,11 @@ struct DEntry
Common::BigEndianValue<u16> Common::BigEndianValue<u16>
m_first_block; // 0x36 0x02 Block no of first block of file (0 == offset 0) m_first_block; // 0x36 0x02 Block no of first block of file (0 == offset 0)
Common::BigEndianValue<u16> Common::BigEndianValue<u16>
m_block_count; // 0x38 0x02 File-length (number of blocks in file) m_block_count; // 0x38 0x02 File-length (number of blocks in file)
u8 m_unused_2[2]; // 0x3a 0x02 Reserved/unused (always 0xffff, has no effect) u8 m_unused_2[2]; // 0x3a 0x02 Reserved/unused (always 0xffff, has no effect)
u8 m_comments_address[4]; // 0x3c 0x04 Address of the two comments within the file data Common::BigEndianValue<u32>
// (*3) m_comments_address; // 0x3c 0x04 Address of the two comments within the file data
// (*3)
}; };
static_assert(sizeof(DEntry) == DENTRY_SIZE); static_assert(sizeof(DEntry) == DENTRY_SIZE);