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

Renamed XFileSystemAttributeInfo to X_FILE_FS_ATTRIBUTE_INFORMATION.

This commit is contained in:
gibbed 2015-05-24 03:44:12 -05:00
parent cbbaae7867
commit de844a3db9
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/kernel/fs/device.cc
View File

@ -39,7 +39,7 @@ X_STATUS Device::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t leng
} }
// TODO(gibbed): call into HostPathDevice? // TODO(gibbed): call into HostPathDevice?
X_STATUS Device::QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info, X_STATUS Device::QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) { size_t length) {
assert_not_null(out_info); assert_not_null(out_info);
const char* name = "test"; // TODO(gibbed): actual value const char* name = "test"; // TODO(gibbed): actual value

2
src/xenia/kernel/fs/device.h
View File

@ -31,7 +31,7 @@ class Device {
virtual std::unique_ptr<Entry> ResolvePath(const char* path) = 0; virtual std::unique_ptr<Entry> ResolvePath(const char* path) = 0;
virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length); virtual X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length);
virtual X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info, virtual X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length); size_t length);
protected: protected:

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

@ -45,7 +45,7 @@ X_STATUS DiscImageFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size
} }
X_STATUS DiscImageFile::QueryFileSystemAttributes( X_STATUS DiscImageFile::QueryFileSystemAttributes(
XFileSystemAttributeInfo* out_info, size_t length) { X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryFileSystemAttributes(out_info, length); return entry_->device()->QueryFileSystemAttributes(out_info, length);
} }

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

@ -33,7 +33,7 @@ class DiscImageFile : public XFile {
X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length, X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) override; const char* file_name, bool restart) override;
X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override; X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info, X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) override; size_t length) override;
protected: protected:

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

@ -45,7 +45,7 @@ X_STATUS HostPathFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_
} }
X_STATUS HostPathFile::QueryFileSystemAttributes( X_STATUS HostPathFile::QueryFileSystemAttributes(
XFileSystemAttributeInfo* out_info, size_t length) { X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryFileSystemAttributes(out_info, length); return entry_->device()->QueryFileSystemAttributes(out_info, length);
} }

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

@ -35,7 +35,7 @@ class HostPathFile : public XFile {
X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length, X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) override; const char* file_name, bool restart) override;
X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override; X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info, X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) override; size_t length) override;
protected: protected:

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

@ -46,7 +46,7 @@ X_STATUS STFSContainerFile::QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info,
} }
X_STATUS STFSContainerFile::QueryFileSystemAttributes( X_STATUS STFSContainerFile::QueryFileSystemAttributes(
XFileSystemAttributeInfo* out_info, size_t length) { X_FILE_FS_ATTRIBUTE_INFORMATION* out_info, size_t length) {
return entry_->device()->QueryFileSystemAttributes(out_info, length); return entry_->device()->QueryFileSystemAttributes(out_info, length);
} }

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

@ -33,7 +33,7 @@ class STFSContainerFile : public XFile {
X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length, X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) override; const char* file_name, bool restart) override;
X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override; X_STATUS QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) override;
X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info, X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) override; size_t length) override;
protected: protected:

2
src/xenia/kernel/fs/entry.h
View File

@ -20,7 +20,7 @@ namespace kernel {
class KernelState; class KernelState;
class XFile; class XFile;
class X_FILE_NETWORK_OPEN_INFORMATION; class X_FILE_NETWORK_OPEN_INFORMATION;
class XFileSystemAttributeInfo; class X_FILE_FS_ATTRIBUTE_INFORMATION;
class X_FILE_DIRECTORY_INFORMATION; class X_FILE_DIRECTORY_INFORMATION;
class X_FILE_FS_VOLUME_INFORMATION; class X_FILE_FS_VOLUME_INFORMATION;
} // namespace kernel } // namespace kernel

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

@ -125,7 +125,7 @@ class X_FILE_FS_SIZE_INFORMATION {
static_assert_size(X_FILE_FS_SIZE_INFORMATION, 24); static_assert_size(X_FILE_FS_SIZE_INFORMATION, 24);
// http://msdn.microsoft.com/en-us/library/windows/hardware/ff540251(v=vs.85).aspx // http://msdn.microsoft.com/en-us/library/windows/hardware/ff540251(v=vs.85).aspx
class XFileSystemAttributeInfo { class X_FILE_FS_ATTRIBUTE_INFORMATION {
public: public:
// FILE_FS_ATTRIBUTE_INFORMATION // FILE_FS_ATTRIBUTE_INFORMATION
uint32_t attributes; uint32_t attributes;
@ -141,7 +141,7 @@ class XFileSystemAttributeInfo {
memcpy(dst + 12, this->fs_name, this->fs_name_length); memcpy(dst + 12, this->fs_name, this->fs_name_length);
} }
}; };
static_assert_size(XFileSystemAttributeInfo, 16); static_assert_size(X_FILE_FS_ATTRIBUTE_INFORMATION, 16);
class XFile : public XObject { class XFile : public XObject {
public: public:
@ -159,7 +159,7 @@ class XFile : public XObject {
virtual X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length, virtual X_STATUS QueryDirectory(X_FILE_DIRECTORY_INFORMATION* out_info, size_t length,
const char* file_name, bool restart) = 0; 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 QueryVolume(X_FILE_FS_VOLUME_INFORMATION* out_info, size_t length) = 0;
virtual X_STATUS QueryFileSystemAttributes(XFileSystemAttributeInfo* out_info, virtual X_STATUS QueryFileSystemAttributes(X_FILE_FS_ATTRIBUTE_INFORMATION* out_info,
size_t length) = 0; size_t length) = 0;
X_STATUS Read(void* buffer, size_t buffer_length, size_t byte_offset, X_STATUS Read(void* buffer, size_t buffer_length, size_t byte_offset,

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

@ -626,7 +626,7 @@ SHIM_CALL NtQueryVolumeInformationFile_shim(PPCContext* ppc_state,
break; break;
} }
case 5: { // FileFsAttributeInformation case 5: { // FileFsAttributeInformation
auto fs_attribute_info = (XFileSystemAttributeInfo*)calloc(length, 1); auto fs_attribute_info = (X_FILE_FS_ATTRIBUTE_INFORMATION*)calloc(length, 1);
result = file->QueryFileSystemAttributes(fs_attribute_info, length); result = file->QueryFileSystemAttributes(fs_attribute_info, length);
if (XSUCCEEDED(result)) { if (XSUCCEEDED(result)) {
fs_attribute_info->Write(SHIM_MEM_BASE, fs_info_ptr); fs_attribute_info->Write(SHIM_MEM_BASE, fs_info_ptr);