Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -14,70 +14,65 @@
namespace DiscIO
{
class WbfsFileReader : public IBlobReader
{
public:
~WbfsFileReader();
~WbfsFileReader();
static std::unique_ptr<WbfsFileReader> Create(const std::string& filename);
static std::unique_ptr<WbfsFileReader> Create(const std::string& filename);
BlobType GetBlobType() const override { return BlobType::WBFS; }
BlobType GetBlobType() const override { return BlobType::WBFS; }
// The WBFS format does not save the original file size.
// This function returns a constant upper bound
// (the size of a double-layer Wii disc).
u64 GetDataSize() const override;
// The WBFS format does not save the original file size.
// This function returns a constant upper bound
// (the size of a double-layer Wii disc).
u64 GetDataSize() const override;
u64 GetRawSize() const override { return m_size; }
bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
u64 GetRawSize() const override { return m_size; }
bool Read(u64 offset, u64 nbytes, u8* out_ptr) override;
private:
WbfsFileReader(const std::string& filename);
WbfsFileReader(const std::string& filename);
bool OpenFiles(const std::string& filename);
bool ReadHeader();
bool OpenFiles(const std::string& filename);
bool ReadHeader();
File::IOFile& SeekToCluster(u64 offset, u64* available);
bool IsGood() {return m_good;}
File::IOFile& SeekToCluster(u64 offset, u64* available);
bool IsGood() { return m_good; }
struct file_entry
{
File::IOFile file;
u64 base_address;
u64 size;
};
std::vector<std::unique_ptr<file_entry>> m_files;
struct file_entry
{
File::IOFile file;
u64 base_address;
u64 size;
};
u32 m_total_files;
u64 m_size;
std::vector<std::unique_ptr<file_entry>> m_files;
u32 m_total_files;
u64 m_size;
u64 m_hd_sector_size;
u64 m_wbfs_sector_size;
u64 m_wbfs_sector_count;
u64 m_disc_info_size;
u64 m_hd_sector_size;
u64 m_wbfs_sector_size;
u64 m_wbfs_sector_count;
u64 m_disc_info_size;
#pragma pack(1)
struct WbfsHeader
{
char magic[4];
u32 hd_sector_count;
u8 hd_sector_shift;
u8 wbfs_sector_shift;
u8 padding[2];
u8 disc_table[500];
} m_header;
struct WbfsHeader
{
char magic[4];
u32 hd_sector_count;
u8 hd_sector_shift;
u8 wbfs_sector_shift;
u8 padding[2];
u8 disc_table[500];
} m_header;
#pragma pack()
std::vector<u16> m_wlba_table;
u64 m_blocks_per_disc;
std::vector<u16> m_wlba_table;
u64 m_blocks_per_disc;
bool m_good;
bool m_good;
};
bool IsWbfsBlob(const std::string& filename);
} // namespace