From 3e6c70defa139d1e1500d6bfa143374860ce6949 Mon Sep 17 00:00:00 2001 From: "Dr. Chat" Date: Sat, 26 Dec 2015 15:37:37 -0600 Subject: [PATCH] Fixup UserModule::LoadFromFile to use new vfs API --- src/xenia/kernel/user_module.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/xenia/kernel/user_module.cc b/src/xenia/kernel/user_module.cc index 287f80edb..ddbc627d9 100644 --- a/src/xenia/kernel/user_module.cc +++ b/src/xenia/kernel/user_module.cc @@ -53,23 +53,25 @@ X_STATUS UserModule::LoadFromFile(std::string path) { std::vector buffer(fs_entry->size()); // Open file for reading. - object_ref file; - result = - fs_entry->Open(kernel_state(), vfs::FileAccess::kGenericRead, &file); - if (result) { + vfs::File* file = nullptr; + result = fs_entry->Open(vfs::FileAccess::kGenericRead, &file); + if (XFAILED(result)) { return result; } // Read entire file into memory. // Ugh. size_t bytes_read = 0; - result = file->Read(buffer.data(), buffer.size(), 0, &bytes_read); - if (result) { + result = file->ReadSync(buffer.data(), buffer.size(), 0, &bytes_read); + if (XFAILED(result)) { return result; } // Load the module. result = LoadFromMemory(buffer.data(), bytes_read); + + // Close the file. + file->Destroy(); } return result;