piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Volume: Make GetTMD return a vector

Browse Source
This commit is contained in:
Lioncash
2015-12-19 17:52:10 -05:00
parent e638775bc7
commit cbeb7034eb
9 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DiscIO/Volume.h
View File

@ -6,7 +6,6 @@
#include <cstring>
#include <map>
#include <memory>
#include <string>
#include <vector>
@ -82,11 +81,7 @@ public:
}
virtual bool GetTitleID(u64*) const { return false; }
virtual std::unique_ptr<u8[]> GetTMD(u32 *_sz) const
{
*_sz = 0;
return std::unique_ptr<u8[]>();
}
virtual std::vector<u8> GetTMD() const { return {}; }
virtual std::string GetUniqueID() const = 0;
virtual std::string GetMakerID() const = 0;
virtual u16 GetRevision() const = 0;

11
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View File

@ -115,9 +115,8 @@ bool CVolumeWiiCrypted::GetTitleID(u64* buffer) const
return true;
}
std::unique_ptr<u8[]> CVolumeWiiCrypted::GetTMD(u32 *size) const
std::vector<u8> CVolumeWiiCrypted::GetTMD() const
{
*size = 0;
u32 tmd_size;
u32 tmd_address;
@ -136,10 +135,10 @@ std::unique_ptr<u8[]> CVolumeWiiCrypted::GetTMD(u32 *size) const
tmd_size = 1024 * 1024 * 4;
}
std::unique_ptr<u8[]> buf{ new u8[tmd_size] };
Read(m_VolumeOffset + tmd_address, tmd_size, buf.get(), false);
*size = tmd_size;
return buf;
std::vector<u8> buffer(tmd_size);
Read(m_VolumeOffset + tmd_address, tmd_size, buffer.data(), false);
return buffer;
}
std::string CVolumeWiiCrypted::GetUniqueID() const

3
Source/Core/DiscIO/VolumeWiiCrypted.h
View File

@ -7,6 +7,7 @@
#include <map>
#include <memory>
#include <string>
#include <vector>
#include <mbedtls/aes.h>
#include "Common/CommonTypes.h"
@ -25,7 +26,7 @@ public:
~CVolumeWiiCrypted();
bool Read(u64 _Offset, u64 _Length, u8* _pBuffer, bool decrypt) const override;
bool GetTitleID(u64* buffer) const override;
std::unique_ptr<u8[]> GetTMD(u32 *_sz) const override;
std::vector<u8> GetTMD() const override;
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
u16 GetRevision() const override;