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

Remove Blob nullptr checks from Volume code

Browse Source 
There's no point in creating a volume without a blob,
since essentially all the functionality of a volume
requires a blob to be used.

Also, VolumeCreator doesn't support creating volumes
without blobs (it can't even figure out the volume type
unless it gets a blob), so it's currently impossible
for a volume to be created without a blob.
This commit is contained in:
JosJuice
2016-10-30 23:39:12 +01:00
parent f63d40270d
commit acec02ffc6
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
#include <utility>
#include <vector>
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
@ -33,6 +34,8 @@ CVolumeWiiCrypted::CVolumeWiiCrypted(std::unique_ptr<IBlobReader> reader, u64 _V
: m_pReader(std::move(reader)), m_AES_ctx(std::make_unique<mbedtls_aes_context>()),
m_VolumeOffset(_VolumeOffset), m_dataOffset(0x20000), m_LastDecryptedBlockOffset(-1)
{
_assert_(m_pReader);
mbedtls_aes_setkey_dec(m_AES_ctx.get(), _pVolumeKey, 128);
}
@ -53,9 +56,6 @@ CVolumeWiiCrypted::~CVolumeWiiCrypted()
bool CVolumeWiiCrypted::Read(u64 _ReadOffset, u64 _Length, u8* _pBuffer, bool decrypt) const
{
if (m_pReader == nullptr)
return false;
if (!decrypt)
return m_pReader->Read(_ReadOffset, _Length, _pBuffer);
@ -275,17 +275,17 @@ u8 CVolumeWiiCrypted::GetDiscNumber() const
BlobType CVolumeWiiCrypted::GetBlobType() const
{
return m_pReader ? m_pReader->GetBlobType() : BlobType::PLAIN;
return m_pReader->GetBlobType();
}
u64 CVolumeWiiCrypted::GetSize() const
{
return m_pReader ? m_pReader->GetDataSize() : 0;
return m_pReader->GetDataSize();
}
u64 CVolumeWiiCrypted::GetRawSize() const
{
return m_pReader ? m_pReader->GetRawSize() : 0;
return m_pReader->GetRawSize();
}
bool CVolumeWiiCrypted::CheckIntegrity() const