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

Replace most magic numbers from previous commit with named constants, if the constants names are known.

Browse Source 
Instead of low 32 bits of ptr, use hash of file path for sector information.
This commit is contained in:
chss95cs@gmail.com
2023-05-01 09:32:33 -04:00
parent b270c59d0c
commit dcb98683cf
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/kernel/xboxkrnl/xboxkrnl_io_info.cc
View File

@@ -97,10 +97,9 @@ dword_result_t NtQueryInformationFile_entry(
// arbitrary 4 byte integer most of the time
XELOGW("Stub XFileSectorInformation!");
auto info = info_ptr.as<uint32_t*>();
//low 32 bits of ptr. todo: maybe hash name?
*info = static_cast<uint32_t>(
reinterpret_cast<uintptr_t>(file->file()->entry()));
out_length = 4;
size_t fname_hash = xe::memory::hash_combine(82589933LL, file->path());
*info = static_cast<uint32_t>(fname_hash ^ (fname_hash >> 32));
out_length = sizeof(uint32_t);
break;
}
case XFileXctdCompressionInformation: {
@@ -347,10 +346,9 @@ dword_result_t NtQueryVolumeInformationFile_entry(
auto info = info_ptr.as<X_FILE_FS_DEVICE_INFORMATION*>();
auto file_device = file->device();
XELOGW("Stub XFileFsDeviceInformation!");
//FILE_DEVICE_UNKNOWN
info->device_type = 0x22; // 415608D8 checks for 0x46;
info->device_type = FILE_DEVICE_UNKNOWN; // 415608D8 checks for 0x46;
info->characteristics = 0;
out_length = 8;
out_length = sizeof(X_FILE_FS_DEVICE_INFORMATION);
break;
}
default: {

2
src/xenia/kernel/xboxkrnl/xboxkrnl_rtl.cc
View File

@@ -449,7 +449,7 @@ dword_result_t RtlImageDirectoryEntryToData_entry(dword_t Base, dword_t MappedAs
if (!nt_header) {
return 0;
}
if (nt_header->OptionalHeader.Magic != 0x10B) {
if (nt_header->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) {
return 0;
}
if (DirectoryEntry >= nt_header->OptionalHeader.NumberOfRvaAndSizes) {