fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move NtCreateFile/NtOpenFile to VFS, implement (mostly) for real.

Browse Source 
Progress on #305.
This commit is contained in:
Ben Vanik
2015-06-29 10:33:36 -07:00
parent 0104a2290f
commit cc08e9019a
25 changed files with 459 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/kernel/objects/xfile.cc
View File

@@ -16,10 +16,10 @@
namespace xe {
namespace kernel {
XFile::XFile(KernelState* kernel_state, vfs::Mode mode, vfs::Entry* entry)
XFile::XFile(KernelState* kernel_state, uint32_t file_access, vfs::Entry* entry)
: XObject(kernel_state, kTypeFile),
entry_(entry),
mode_(mode),
file_access_(file_access),
position_(0),
find_index_(0) {
async_event_ = new XEvent(kernel_state);

5
src/xenia/kernel/objects/xfile.h
View File

@@ -81,6 +81,7 @@ class XFile : public XObject {
vfs::Device* device() const { return entry_->device(); }
vfs::Entry* entry() const { return entry_; }
uint32_t file_access() const { return file_access_; }
const std::string& path() const { return entry_->path(); }
const std::string& name() const { return entry_->name(); }
@@ -102,7 +103,7 @@ class XFile : public XObject {
virtual void* GetWaitHandle();
protected:
XFile(KernelState* kernel_state, vfs::Mode mode, vfs::Entry* entry);
XFile(KernelState* kernel_state, uint32_t file_access, vfs::Entry* entry);
virtual X_STATUS ReadSync(void* buffer, size_t buffer_length,
size_t byte_offset, size_t* out_bytes_read) = 0;
virtual X_STATUS WriteSync(const void* buffer, size_t buffer_length,
@@ -112,7 +113,7 @@ class XFile : public XObject {
private:
vfs::Entry* entry_;
vfs::Mode mode_;
uint32_t file_access_;
XEvent* async_event_;
// TODO(benvanik): create flags, open state, etc.

6
src/xenia/kernel/objects/xuser_module.cc
View File

@@ -57,9 +57,9 @@ X_STATUS XUserModule::LoadFromFile(std::string path) {
std::vector<uint8_t> buffer(fs_entry->size());
// Open file for reading.
XFile* file_ptr = nullptr;
result = fs_entry->Open(kernel_state(), vfs::Mode::READ, false, &file_ptr);
object_ref<XFile> file(file_ptr);
object_ref<XFile> file;
result =
fs_entry->Open(kernel_state(), vfs::FileAccess::kGenericRead, &file);
if (result) {
return result;
}