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

Removing unnecessary indirection from XFile.

This commit is contained in:
gibbed 2015-05-24 04:16:59 -05:00
parent de844a3db9
commit 3e55b590b1
8 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/kernel/fs/devices/disc_image_file.cc
View File

@ -40,15 +40,6 @@ X_STATUS DiscImageFile::QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, s
return entry_->QueryDirectory(out_info, length, file_name, restart);
}
X_STATUS DiscImageFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryVolume(out_info, length);
}
X_STATUS DiscImageFile::QueryFileSystemAttributes(
X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryFileSystemAttributes(out_info, length);
}
X_STATUS DiscImageFile::ReadSync(void* buffer, size_t buffer_length,
size_t byte_offset, size_t* out_bytes_read) {
GDFXEntry* gdfx_entry = entry_->gdfx_entry();

3
src/xenia/kernel/fs/devices/disc_image_file.h
View File

@ -32,9 +32,6 @@ class DiscImageFile : public XFile {
X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) override;
X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) override;
X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) override;
protected:
X_STATUS ReadSync(void* buffer, size_t buffer_length, size_t byte_offset,

9
src/xenia/kernel/fs/devices/host_path_file.cc
View File

@ -40,15 +40,6 @@ X_STATUS HostPathFile::QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, si
return entry_->QueryDirectory(out_info, length, file_name, restart);
}
X_STATUS HostPathFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryVolume(out_info, length);
}
X_STATUS HostPathFile::QueryFileSystemAttributes(
X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryFileSystemAttributes(out_info, length);
}
X_STATUS HostPathFile::ReadSync(void* buffer, size_t buffer_length,
size_t byte_offset, size_t* out_bytes_read) {
OVERLAPPED overlapped;

3
src/xenia/kernel/fs/devices/host_path_file.h
View File

@ -34,9 +34,6 @@ class HostPathFile : public XFile {
X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) override;
X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) override;
X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) override;
protected:
X_STATUS ReadSync(void* buffer, size_t buffer_length, size_t byte_offset,

9
src/xenia/kernel/fs/devices/stfs_container_file.cc
View File

@ -41,15 +41,6 @@ X_STATUS STFSContainerFile::QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_inf
return entry_->QueryDirectory(out_info, length, file_name, restart);
}
X_STATUS STFSContainerFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryVolume(out_info, length);
}
X_STATUS STFSContainerFile::QueryFileSystemAttributes(
X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryFileSystemAttributes(out_info, length);
}
X_STATUS STFSContainerFile::ReadSync(void* buffer, size_t buffer_length,
size_t byte_offset,
size_t* out_bytes_read) {

3
src/xenia/kernel/fs/devices/stfs_container_file.h
View File

@ -32,9 +32,6 @@ class STFSContainerFile : public XFile {
X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) override;
X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) override;
X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) override;
protected:
X_STATUS ReadSync(void* buffer, size_t buffer_length, size_t byte_offset,

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

@ -158,9 +158,6 @@ class XFile : public XObject {
virtual X_STATUS QueryInfo(X_FILE_NETWORK_OPEN_INFORMATION* out_info) = 0;
virtual X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) = 0;
virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) = 0;
virtual X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) = 0;
X_STATUS Read(void* buffer, size_t buffer_length, size_t byte_offset,
size_t* out_bytes_read);

4
src/xenia/kernel/xboxkrnl_io.cc
View File

@ -617,7 +617,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
switch (fs_info_class) {
case 1: { // FileFsVolumeInformation
auto volume_info = (X_FILE_FS_VOLUME_INFORMATION*)calloc(length, 1);
result = file->QueryVolume(volume_info, length);
result = file->device()->QueryVolume(volume_info, length);
if (XSUCCEEDED(result)) {
volume_info->Write(SHIM_MEM_BASE, fs_info_ptr);
info = length;
@ -627,7 +627,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
}
case 5: { // FileFsAttributeInformation
auto fs_attribute_info = (X_FILE_FS_ATTRIBUTE_INFORMATION*)calloc(length, 1);
result = file->QueryFileSystemAttributes(fs_attribute_info, length);
result = file->device()->QueryFileSystemAttributes(fs_attribute_info, length);
if (XSUCCEEDED(result)) {
fs_attribute_info->Write(SHIM_MEM_BASE, fs_info_ptr);
info = length;