midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FileSys: Add static asserts for the Directory struct, and fix its fields position.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2014-09-27 19:41:21 +00:00
parent 0be5c03176
commit 19c2a96ab0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/file_sys/directory.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <cstddef>
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
@ -17,9 +19,9 @@ namespace FileSys {
const size_t FILENAME_LENGTH = 0x20C / 2; const size_t FILENAME_LENGTH = 0x20C / 2;
struct Entry { struct Entry {
char16_t filename[FILENAME_LENGTH]; // Entry name (UTF-16, null-terminated) char16_t filename[FILENAME_LENGTH]; // Entry name (UTF-16, null-terminated)
char short_name[8]; // 8.3 file name ('longfilename' -> 'LONGFI~1') char short_name[9]; // 8.3 file name ('longfilename' -> 'LONGFI~1', null-terminated)
char unknown1; // unknown (observed values: 0x0A, 0x70, 0xFD) char unknown1; // unknown (observed values: 0x0A, 0x70, 0xFD)
char extension[3]; // 8.3 file extension (set to spaces for directories) char extension[4]; // 8.3 file extension (set to spaces for directories, null-terminated)
char unknown2; // unknown (always 0x01) char unknown2; // unknown (always 0x01)
char unknown3; // unknown (0x00 or 0x08) char unknown3; // unknown (0x00 or 0x08)
char is_directory; // directory flag char is_directory; // directory flag
@ -29,6 +31,10 @@ struct Entry {
u64 file_size; // file size (for files only) u64 file_size; // file size (for files only)
}; };
static_assert(sizeof(Entry) == 0x228, "Directory Entry struct isn't exactly 0x228 bytes long!"); static_assert(sizeof(Entry) == 0x228, "Directory Entry struct isn't exactly 0x228 bytes long!");
static_assert(offsetof(Entry, short_name) == 0x20C, "Wrong offset for short_name in Entry.");
static_assert(offsetof(Entry, extension) == 0x216, "Wrong offset for extension in Entry.");
static_assert(offsetof(Entry, is_archive) == 0x21E, "Wrong offset for is_archive in Entry.");
static_assert(offsetof(Entry, file_size) == 0x220, "Wrong offset for file_size in Entry.");
class Directory : NonCopyable { class Directory : NonCopyable {
public: public: