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

Merge branch 'master' of https://github.com/benvanik/xenia

This commit is contained in:
gibbed 2014-01-18 23:45:48 -08:00
parent 8be076df32 50a692d20f
commit f306db970d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/kernel/fs/stfs.cc
View File

@ -42,8 +42,9 @@ bool STFSHeader::Read(const uint8_t* p) {
content_type = (STFSContentType)XEGETUINT32BE(p + 0x344);
metadata_version = XEGETUINT32BE(p + 0x348);
if (metadata_version > 1) {
XELOGE("STFSContainer doesn't support version %d yet", metadata_version);
return false;
// This is a variant of thumbnail data/etc.
// Can just ignore it for now (until we parse thumbnails).
XELOGW("STFSContainer doesn't support version %d yet", metadata_version);
}
content_size = XEGETUINT32BE(p + 0x34C);
media_id = XEGETUINT32BE(p + 0x354);

6
src/xenia/kernel/kernel_state.cc
View File

@ -63,7 +63,11 @@ KernelState* KernelState::shared() {
}
XModule* KernelState::GetModule(const char* name) {
if (xestrcasecmpa(name, "xam.xex") == 0) {
if (!name) {
// NULL name = self.
// TODO(benvanik): lookup module from caller address.
return GetExecutableModule();
} else if (xestrcasecmpa(name, "xam.xex") == 0) {
auto module = emulator_->xam();
module->Retain();
return module;