ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2154 from CookiePLMonster/section-unload-fixup 

Fix XeUnloadSection errorerously zeroing memory
This commit is contained in:
PatrickvL 2021-03-05 23:03:08 +01:00 committed by GitHub
parent 84cd4e3ba4 9ea0051d92
commit fb4ca717e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/common/xbe/Xbe.cpp
View File

@ -194,25 +194,18 @@ Xbe::Xbe(const char *x_szFilename, bool bFromGUI)
// read Xbe section headers
{
printf("Xbe::Xbe: Reading Section Headers...\n");
printf("Xbe::Xbe: Reading Section Headers...");
fseek(XbeFile, m_Header.dwSectionHeadersAddr - m_Header.dwBaseAddr, SEEK_SET);
m_SectionHeader = new SectionHeader[m_Header.dwSections];
for(uint32_t v=0;v<m_Header.dwSections;v++)
if (fread(m_SectionHeader, sizeof(*m_SectionHeader), m_Header.dwSections, XbeFile) != m_Header.dwSections)
{
printf("Xbe::Xbe: Reading Section Header 0x%.04X...", v);
if(fread(&m_SectionHeader[v], sizeof(*m_SectionHeader), 1, XbeFile) != 1)
{
sprintf(szBuffer, "Unexpected end of file while reading Xbe Section Header %d (%Xh)", v, v);
SetFatalError(szBuffer);
goto cleanup;
}
printf("OK\n");
SetFatalError("Unexpected end of file while reading Xbe Section Headers");
goto cleanup;
}
printf("OK\n");
}
// read Xbe section names
@ -246,25 +239,18 @@ Xbe::Xbe(const char *x_szFilename, bool bFromGUI)
// read Xbe library versions
if (m_Header.dwLibraryVersionsAddr != 0)
{
printf("Xbe::Xbe: Reading Library Versions...\n");
printf("Xbe::Xbe: Reading Library Versions...");
fseek(XbeFile, m_Header.dwLibraryVersionsAddr - m_Header.dwBaseAddr, SEEK_SET);
m_LibraryVersion = new LibraryVersion[m_Header.dwLibraryVersions];
for (uint32_t v = 0; v < m_Header.dwLibraryVersions; v++)
if (fread(m_LibraryVersion, sizeof(*m_LibraryVersion), m_Header.dwLibraryVersions, XbeFile) != m_Header.dwLibraryVersions)
{
printf("Xbe::Xbe: Reading Library Version 0x%.04X...", v);
if (fread(&m_LibraryVersion[v], sizeof(*m_LibraryVersion), 1, XbeFile) != 1)
{
sprintf(szBuffer, "Unexpected end of file while reading Xbe Library Version %d (%Xh)", v, v);
SetFatalError(szBuffer);
goto cleanup;
}
printf("OK\n");
SetFatalError("Unexpected end of file while reading Xbe Library Versions");
goto cleanup;
}
printf("OK\n");
}
// read Xbe sections

3
src/core/kernel/exports/EmuKrnlXe.cpp
View File

@ -126,9 +126,8 @@ XBSYSAPI EXPORTNUM(328) xbox::ntstatus_xt NTAPI xbox::XeUnloadSection
// Free the section and the physical memory in use if necessary
if (Section->SectionReferenceCount == 0) {
memset(Section->VirtualAddress, 0, Section->VirtualSize);
// REMARK: the following can be tested with Broken Sword - The Sleeping Dragon, RalliSport Challenge, ...
// Test-case: Apex/Racing Evoluzione requires the memory NOT to be zeroed
VAddr BaseAddress = (VAddr)Section->VirtualAddress;
VAddr EndingAddress = (VAddr)Section->VirtualAddress + Section->VirtualSize;