From bf1f70db0a4b9af8c4515a91519dfb7cd89b7d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 9 Feb 2017 14:07:36 +0100 Subject: Move the ticket code to ESFormats This moves some parsing code for tickets and ticket views to ESFormats instead of duplicating it over DiscIO and Core. --- Source/Core/DiscIO/WiiWad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DiscIO/WiiWad.cpp') diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index 9e85669204..04e4ff8a7c 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -88,7 +88,7 @@ bool WiiWAD::ParseWAD(IBlobReader& reader) u32 offset = 0x40; m_certificate_chain = CreateWADEntry(reader, certificate_chain_size, offset); offset += Common::AlignUp(certificate_chain_size, 0x40); - m_ticket = CreateWADEntry(reader, ticket_size, offset); + m_ticket.SetBytes(CreateWADEntry(reader, ticket_size, offset)); offset += Common::AlignUp(ticket_size, 0x40); m_tmd = CreateWADEntry(reader, tmd_size, offset); offset += Common::AlignUp(tmd_size, 0x40); -- cgit v1.2.3 From c1a139e8ace17e45e8ca6977b6f6b19a1a4195f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 11 Feb 2017 08:57:47 +0100 Subject: Use ESFormats for TMDs We already have a TMDReader, so let's actually use it. And move ESFormats to IOS::ES, since it's definitely part of IOS. This adds a DiscIO dependency on Core which will be fixed in a follow-up PR. --- Source/Core/DiscIO/WiiWad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DiscIO/WiiWad.cpp') diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp index 04e4ff8a7c..2576dac41f 100644 --- a/Source/Core/DiscIO/WiiWad.cpp +++ b/Source/Core/DiscIO/WiiWad.cpp @@ -90,7 +90,7 @@ bool WiiWAD::ParseWAD(IBlobReader& reader) offset += Common::AlignUp(certificate_chain_size, 0x40); m_ticket.SetBytes(CreateWADEntry(reader, ticket_size, offset)); offset += Common::AlignUp(ticket_size, 0x40); - m_tmd = CreateWADEntry(reader, tmd_size, offset); + m_tmd.SetBytes(CreateWADEntry(reader, tmd_size, offset)); offset += Common::AlignUp(tmd_size, 0x40); m_data_app = CreateWADEntry(reader, data_app_size, offset); offset += Common::AlignUp(data_app_size, 0x40); -- cgit v1.2.3