Merge pull request #5589 from unknownbrackets/mpeg-version

Track the sceMpeg_library version for behavior differences
This commit is contained in:
Henrik Rydgård committed 2014-03-02 23:14:36 +07:00
commit 8f90681994
4 files changed
+109 -86

No files matched your search

+9
View File
@@ -46,6 +46,7 @@
#include "Core/HLE/sceKernelModule.h"
#include "Core/HLE/sceKernelThread.h"
#include "Core/HLE/sceKernelMemory.h"
#include "Core/HLE/sceMpeg.h"
#include "Core/HLE/sceIo.h"
#include "Core/HLE/KernelWaitHelpers.h"
#include "Core/ELF/ParamSFO.h"
@@ -822,6 +823,10 @@ Module *__KernelLoadELFFromPtr(const u8 *ptr, u32 loadAddress, std::string *erro
char temp[256];
snprintf(temp, sizeof(temp), "Loading module %s with version %%04x", head->modname);
INFO_LOG_REPORT(SCEMODULE,temp, ver);
if (!strcmp(head->modname, "sceMpeg_library")) {
__MpegLoadModule(ver);
}
}
const u8 *in = ptr;
@@ -926,6 +931,10 @@ Module *__KernelLoadELFFromPtr(const u8 *ptr, u32 loadAddress, std::string *erro
char temp[256];
snprintf(temp, sizeof(temp), "Loading module %s with version %%04x", modinfo->name);
INFO_LOG_REPORT(SCEMODULE, temp, modinfo->moduleVersion);
if (!strcmp(modinfo->name, "sceMpeg_library")) {
__MpegLoadModule(modinfo->moduleVersion);
}
}
// Check for module blacklist - we don't allow games to load these modules from disc