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

Making stateless file IO platform-agnostic.

Browse Source
This commit is contained in:
Ben Vanik
2015-07-15 18:01:09 -07:00
parent 376307cfa2
commit 42400d06a9
6 changed files with 149 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/xenia/vfs/devices/host_path_entry.cc
View File

@@ -9,10 +9,10 @@
#include "xenia/vfs/devices/host_path_entry.h"
#include "xenia/base/filesystem.h"
#include "xenia/base/logging.h"
#include "xenia/base/mapped_memory.h"
#include "xenia/base/math.h"
#include "xenia/base/platform_win.h"
#include "xenia/base/string.h"
#include "xenia/vfs/devices/host_path_file.h"
@@ -54,41 +54,14 @@ X_STATUS HostPathEntry::Open(KernelState* kernel_state, uint32_t desired_access,
XELOGE("Attempting to open file for write access on read-only device");
return X_STATUS_ACCESS_DENIED;
}
DWORD open_access = 0;
if (desired_access & FileAccess::kGenericRead) {
open_access |= GENERIC_READ;
}
if (desired_access & FileAccess::kGenericWrite) {
open_access |= GENERIC_WRITE;
}
if (desired_access & FileAccess::kGenericExecute) {
open_access |= GENERIC_EXECUTE;
}
if (desired_access & FileAccess::kGenericAll) {
open_access |= GENERIC_ALL;
}
if (desired_access & FileAccess::kFileReadData) {
open_access |= FILE_READ_DATA;
}
if (desired_access & FileAccess::kFileWriteData) {
open_access |= FILE_WRITE_DATA;
}
if (desired_access & FileAccess::kFileAppendData) {
open_access |= FILE_APPEND_DATA;
}
DWORD share_mode = FILE_SHARE_READ;
// We assume we've already created the file in the caller.
DWORD creation_disposition = OPEN_EXISTING;
HANDLE file =
CreateFileW(local_path_.c_str(), desired_access, share_mode, NULL,
creation_disposition, FILE_FLAG_BACKUP_SEMANTICS, NULL);
if (file == INVALID_HANDLE_VALUE) {
auto file_handle =
xe::filesystem::FileHandle::OpenExisting(local_path_, desired_access);
if (!file_handle) {
// TODO(benvanik): pick correct response.
return X_STATUS_NO_SUCH_FILE;
}
*out_file = object_ref<XFile>(
new HostPathFile(kernel_state, desired_access, this, file));
*out_file = object_ref<XFile>(new HostPathFile(kernel_state, desired_access,
this, std::move(file_handle)));
return X_STATUS_SUCCESS;
}

29
src/xenia/vfs/devices/host_path_file.cc
View File

@@ -9,19 +9,19 @@
#include "xenia/vfs/devices/host_path_file.h"
#include "xenia/base/platform_win.h"
#include "xenia/vfs/devices/host_path_entry.h"
namespace xe {
namespace vfs {
HostPathFile::HostPathFile(KernelState* kernel_state, uint32_t file_access,
HostPathEntry* entry, HANDLE file_handle)
HostPathFile::HostPathFile(
KernelState* kernel_state, uint32_t file_access, HostPathEntry* entry,
std::unique_ptr<xe::filesystem::FileHandle> file_handle)
: XFile(kernel_state, file_access, entry),
entry_(entry),
file_handle_(file_handle) {}
file_handle_(std::move(file_handle)) {}
HostPathFile::~HostPathFile() { CloseHandle(file_handle_); }
HostPathFile::~HostPathFile() = default;
X_STATUS HostPathFile::ReadSync(void* buffer, size_t buffer_length,
size_t byte_offset, size_t* out_bytes_read) {
@@ -29,14 +29,7 @@ X_STATUS HostPathFile::ReadSync(void* buffer, size_t buffer_length,
return X_STATUS_ACCESS_DENIED;
}
OVERLAPPED overlapped;
overlapped.Pointer = (PVOID)byte_offset;
overlapped.hEvent = NULL;
DWORD bytes_read = 0;
BOOL read = ReadFile(file_handle_, buffer, (DWORD)buffer_length, &bytes_read,
&overlapped);
if (read) {
*out_bytes_read = bytes_read;
if (file_handle_->Read(byte_offset, buffer, buffer_length, out_bytes_read)) {
return X_STATUS_SUCCESS;
} else {
return X_STATUS_END_OF_FILE;
@@ -51,14 +44,8 @@ X_STATUS HostPathFile::WriteSync(const void* buffer, size_t buffer_length,
return X_STATUS_ACCESS_DENIED;
}
OVERLAPPED overlapped;
overlapped.Pointer = (PVOID)byte_offset;
overlapped.hEvent = NULL;
DWORD bytes_written = 0;
BOOL wrote = WriteFile(file_handle_, buffer, (DWORD)buffer_length,
&bytes_written, &overlapped);
if (wrote) {
*out_bytes_written = bytes_written;
if (file_handle_->Write(byte_offset, buffer, buffer_length,
out_bytes_written)) {
return X_STATUS_SUCCESS;
} else {
return X_STATUS_END_OF_FILE;

6
src/xenia/vfs/devices/host_path_file.h
View File

@@ -12,6 +12,7 @@
#include <string>
#include "xenia/base/filesystem.h"
#include "xenia/kernel/objects/xfile.h"
typedef void* HANDLE;
@@ -24,7 +25,8 @@ class HostPathEntry;
class HostPathFile : public XFile {
public:
HostPathFile(KernelState* kernel_state, uint32_t file_access,
HostPathEntry* entry, HANDLE file_handle);
HostPathEntry* entry,
std::unique_ptr<xe::filesystem::FileHandle> file_handle);
~HostPathFile() override;
protected:
@@ -35,7 +37,7 @@ class HostPathFile : public XFile {
private:
HostPathEntry* entry_;
HANDLE file_handle_;
std::unique_ptr<xe::filesystem::FileHandle> file_handle_;
};
} // namespace vfs

14
src/xenia/vfs/entry.h
View File

@@ -14,6 +14,7 @@
#include <string>
#include <vector>
#include "xenia/base/filesystem.h"
#include "xenia/base/mapped_memory.h"
#include "xenia/base/string_buffer.h"
#include "xenia/kernel/xobject.h"
@@ -61,17 +62,8 @@ enum class FileDisposition {
kOverwriteIf = 5,
};
struct FileAccess {
// Implies kFileReadData.
static const uint32_t kGenericRead = 0x80000000;
// Implies kFileWriteData.
static const uint32_t kGenericWrite = 0x40000000;
static const uint32_t kGenericExecute = 0x20000000;
static const uint32_t kGenericAll = 0x10000000;
static const uint32_t kFileReadData = 0x00000001;
static const uint32_t kFileWriteData = 0x00000002;
static const uint32_t kFileAppendData = 0x00000004;
};
// Reuse xe::filesystem definition.
using FileAccess = xe::filesystem::FileAccess;
enum FileAttributeFlags : uint32_t {
kFileAttributeNone = 0x0000,