Added the ability to install WADs (such as DLC WADs). Currently it just installs a WAD when booting it fails (when it's not bootable), I'm not sure whether there should be a menu option specially for installing WADS...

note: If you previously manually installed WADS by creating a *file* called "CONTENT", trying to reinstall that WAD automatically will fail unless you delete the file.

Added some empty log files that some games require for DLC to be recognized.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3474 8ced0084-cf51-0410-be5f-012b33b47a6e

5 files changed, 255 insertions, 112 deletions

diff --git a/Source/Core/DiscIO/DiscIO.vcproj b/Source/Core/DiscIO/DiscIO.vcproj
index 503f26b77d..049bb90a08 100644
--- a/Source/Core/DiscIO/DiscIO.vcproj
+++ b/Source/Core/DiscIO/DiscIO.vcproj
@@ -1160,6 +1160,14 @@
 				RelativePath=".\Src\NANDContentLoader.h"

 				>

 			</File>

+			<File

+				RelativePath=".\Src\WiiWAD.cpp"

+				>

+			</File>

+			<File

+				RelativePath=".\Src\WiiWAD.h"

+				>

+			</File>

 		</Filter>

 		<Filter

 			Name="DiscScrubber"

diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
index 34640c5534..4f89f56090 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp
@@ -24,6 +24,7 @@
 #include "MathUtil.h"
 #include "FileUtil.h"
 #include "Log.h"
+#include "WiiWad.h"
 
 namespace DiscIO
 {
@@ -95,23 +96,6 @@ std::string CSharedContent::GetFilenameFromSHA1(u8* _pHash)
 
 
 
-class CBlobBigEndianReader
-{
-public:
-	CBlobBigEndianReader(DiscIO::IBlobReader& _rReader) : m_rReader(_rReader) {}
-
-	u32 Read32(u64 _Offset)
-	{
-		u32 Temp;
-		m_rReader.Read(_Offset, 4, (u8*)&Temp);
-		return(Common::swap32(Temp));
-	}
-
-private:
-	DiscIO::IBlobReader& m_rReader;
-};
-
-
 // this classes must be created by the CNANDContentManager
 class CNANDContentLoader : public INANDContentLoader
 {
@@ -127,7 +111,7 @@ public:
     u32 GetBootIndex() const  { return m_BootIndex; }
     size_t GetContentSize() const { return m_Content.size(); }
     const SNANDContent* GetContentByIndex(int _Index) const;
-    const u8* GetTicket() const { return m_TicketView; }
+    const u8* GetTicketView() const { return m_TicketView; }
     const u8* GetTmdHeader() const { return m_TmdHeader; }
 
     const std::vector<SNANDContent>& GetContent() const { return m_Content; }
@@ -153,12 +137,8 @@ private:
     bool CreateFromDirectory(const std::string& _rPath);
     bool CreateFromWAD(const std::string& _rName);
 
-    bool ParseWAD(DiscIO::IBlobReader& _rReader);    
-
     void AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8* _pDest);
 
-    u8* CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset);
-
     void GetKeyFromTicket(u8* pTicket, u8* pTicketKey);
 
     bool ParseTMD(u8* pDataApp, u32 pDataAppSize, u8* pTicket, u8* pTMD);
@@ -208,13 +188,11 @@ const SNANDContent* CNANDContentLoader::GetContentByIndex(int _Index) const
 
 bool CNANDContentLoader::CreateFromWAD(const std::string& _rName)
 {
-    DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-    if (pReader == NULL)
+	WiiWAD Wad(_rName);
+	if (!Wad.IsValid())
 		return false;
 
-    bool Result = ParseWAD(*pReader);
-    delete pReader;
-    return Result;
+	return ParseTMD(Wad.GetDataApp(), Wad.GetDataAppSize(), Wad.GetTicket(), Wad.GetTMD());
 }
 
 bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath)
@@ -254,6 +232,7 @@ bool CNANDContentLoader::CreateFromDirectory(const std::string& _rPath)
         rContent.m_Type = Common::swap16(pTMD + 0x01ea + 0x24*i);
         rContent.m_Size = (u32)Common::swap64(pTMD + 0x01ec + 0x24*i);
         memcpy(rContent.m_SHA1Hash, pTMD + 0x01f4 + 0x24*i, 20);
+        memcpy(rContent.m_Header, pTMD + 0x01e4 + 0x24*i, 36);
 
         rContent.m_pData = NULL;         
         char szFilename[1024];
@@ -298,23 +277,6 @@ void CNANDContentLoader::AESDecode(u8* _pKey, u8* _IV, u8* _pSrc, u32 _Size, u8*
     AES_cbc_encrypt(_pSrc, _pDest, _Size, &AESKey, _IV, AES_DECRYPT);
 }
 
-u8* CNANDContentLoader::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)
-{
-    if (_Size > 0)
-    {
-        u8* pTmpBuffer = new u8[_Size];
-        _dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");
-
-        if (!_rReader.Read(_Offset, _Size, pTmpBuffer))
-        {
-			ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");
-            PanicAlert("WiiWAD: Could not read from file");
-        }
-        return pTmpBuffer;
-    }
-	return NULL;
-}
-
 void CNANDContentLoader::GetKeyFromTicket(u8* pTicket, u8* pTicketKey)
 {
 	u8 CommonKey[16] = {0xeb,0xe4,0x2a,0x22,0x5e,0x85,0x93,0xe4,0x48,0xd9,0xc5,0x45,0x73,0x81,0xaa,0xf7};	
@@ -352,6 +314,8 @@ bool CNANDContentLoader::ParseTMD(u8* pDataApp, u32 pDataAppSize, u8* pTicket, u
 		rContent.m_Index = Common::swap16(pTMD + 0x01e8 + 0x24*i);
 		rContent.m_Type = Common::swap16(pTMD + 0x01ea + 0x24*i);
         rContent.m_Size= (u32)Common::swap64(pTMD + 0x01ec + 0x24*i);
+        memcpy(rContent.m_SHA1Hash, pTMD + 0x01f4 + 0x24*i, 20);
+        memcpy(rContent.m_Header, pTMD + 0x01e4 + 0x24*i, 36);
 
         u32 RoundedSize = ROUND_UP(rContent.m_Size, 0x40);
 		rContent.m_pData = new u8[RoundedSize];
@@ -426,44 +390,6 @@ const DiscIO::IVolume::ECountry CNANDContentLoader::GetCountry() const
     return(country);
 }
 
-bool CNANDContentLoader::ParseWAD(DiscIO::IBlobReader& _rReader)
-{
-    CBlobBigEndianReader ReaderBig(_rReader);
-
-    // get header size	
-	u32 HeaderSize = ReaderBig.Read32(0);
-    if (HeaderSize != 0x20) 
-    {
-        _dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");
-        return false;
-    }    
-
-    // get header 
-    u8 Header[0x20];
-    _rReader.Read(0, HeaderSize, Header);
-	u32 HeaderType = ReaderBig.Read32(0x4);
-    if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))
-        return false;
-
-    u32 CertificateChainSize    = ReaderBig.Read32(0x8);
-    u32 Reserved                = ReaderBig.Read32(0xC);
-    u32 TicketSize              = ReaderBig.Read32(0x10);
-    u32 TMDSize                 = ReaderBig.Read32(0x14);
-    u32 DataAppSize             = ReaderBig.Read32(0x18);
-    u32 FooterSize              = ReaderBig.Read32(0x1C);
-    _dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");
-
-    u32 Offset = 0x40;
-    u8* pCertificateChain   = CreateWADEntry(_rReader, CertificateChainSize, Offset);  Offset += ROUND_UP(CertificateChainSize, 0x40);
-    u8* pTicket             = CreateWADEntry(_rReader, TicketSize, Offset);            Offset += ROUND_UP(TicketSize, 0x40);
-    u8* pTMD                = CreateWADEntry(_rReader, TMDSize, Offset);               Offset += ROUND_UP(TMDSize, 0x40);
-    u8* pDataApp            = CreateWADEntry(_rReader, DataAppSize, Offset);           Offset += ROUND_UP(DataAppSize, 0x40);
-    u8* pFooter             = CreateWADEntry(_rReader, FooterSize, Offset);            Offset += ROUND_UP(FooterSize, 0x40);
-
-    bool Result = ParseTMD(pDataApp, DataAppSize, pTicket, pTMD);
-
-    return Result;
-}
 
 ///////////////////
 
@@ -499,32 +425,6 @@ const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string&
 }
 
 
-bool CNANDContentManager::IsWiiWAD(const std::string& _rName)
-{
-    DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());
-    if (pReader == NULL)
-        return false;
-
-    CBlobBigEndianReader Reader(*pReader);
-    bool Result = false;
-
-    // check for wii wad
-    if (Reader.Read32(0x00) == 0x20)
-    {
-        u32 WADTYpe = Reader.Read32(0x04);
-        switch(WADTYpe)
-        {
-        case 0x49730000:
-        case 0x69620000:
-            Result = true;
-        }
-    }
-
-    delete pReader;
-
-    return Result;
-}
-
 
 
 
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h
index c324bdbc7c..0494eba5c7 100644
--- a/Source/Core/DiscIO/Src/NANDContentLoader.h
+++ b/Source/Core/DiscIO/Src/NANDContentLoader.h
@@ -36,6 +36,8 @@ struct SNANDContent
     u16 m_Type;

     u32 m_Size;

     u8 m_SHA1Hash[20];

+    u8 m_Header[36]; //all of the above

+

     u8* m_pData;

 };

 

@@ -54,7 +56,7 @@ public:
     virtual u32 GetBootIndex() const = 0;

     virtual size_t GetContentSize() const = 0;

     virtual const SNANDContent* GetContentByIndex(int _Index) const = 0;

-    virtual const u8* GetTicket() const = 0;

+    virtual const u8* GetTicketView() const = 0;

     virtual const u8* GetTmdHeader() const = 0;

     virtual const std::vector<SNANDContent>& GetContent() const = 0;    

     virtual const u16 GetTitleVersion() const = 0;

@@ -64,7 +66,8 @@ public:
     enum

     {

         TICKET_VIEW_SIZE = 0x58,

-        TMD_HEADER_SIZE = 0x1e4

+        TMD_HEADER_SIZE = 0x1e4,

+		CONTENT_HEADER_SIZE = 0x24

     };

 };

 

@@ -78,8 +81,6 @@ public:
 

     const INANDContentLoader& GetNANDLoader(const std::string& _rName);

 

-    static bool IsWiiWAD(const std::string& _rName);

-

 private:

 

     CNANDContentManager() {};

diff --git a/Source/Core/DiscIO/Src/WiiWad.cpp b/Source/Core/DiscIO/Src/WiiWad.cpp
new file mode 100644
index 0000000000..73f22f31b5
--- /dev/null
+++ b/Source/Core/DiscIO/Src/WiiWad.cpp
@@ -0,0 +1,156 @@
+// Copyright (C) 2003-2009 Dolphin Project.

+

+// This program is free software: you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation, version 2.0.

+

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License 2.0 for more details.

+

+// A copy of the GPL 2.0 should have been included with the program.

+// If not, see http://www.gnu.org/licenses/

+

+// Official SVN repository and contact information can be found at

+// http://code.google.com/p/dolphin-emu/

+

+#include "stdafx.h"

+#include "NANDContentLoader.h"

+

+#include <algorithm>

+#include <cctype> 

+#include "MathUtil.h"

+#include "FileUtil.h"

+#include "Log.h"

+#include "WiiWad.h"

+

+namespace DiscIO

+{

+

+class CBlobBigEndianReader

+{

+public:

+	CBlobBigEndianReader(DiscIO::IBlobReader& _rReader) : m_rReader(_rReader) {}

+

+	u32 Read32(u64 _Offset)

+	{

+		u32 Temp;

+		m_rReader.Read(_Offset, 4, (u8*)&Temp);

+		return(Common::swap32(Temp));

+	}

+

+private:

+	DiscIO::IBlobReader& m_rReader;

+};

+

+WiiWAD::WiiWAD(const std::string& _rName)

+{

+    DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());

+    if (pReader == NULL)

+	{

+		m_Valid = false;

+		return;

+	}

+

+	m_Valid = ParseWAD(*pReader);

+	delete pReader;

+}

+

+WiiWAD::~WiiWAD()

+{

+	if (m_Valid)

+	{

+		delete m_pCertificateChain;

+		delete m_pTicket;

+		delete m_pTMD;

+		delete m_pDataApp;

+		delete m_pFooter;

+	}

+}

+

+u8* WiiWAD::CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset)

+{

+    if (_Size > 0)

+    {

+        u8* pTmpBuffer = new u8[_Size];

+        _dbg_assert_msg_(BOOT, pTmpBuffer!=0, "WiiWAD: Cant allocate memory for WAD entry");

+

+        if (!_rReader.Read(_Offset, _Size, pTmpBuffer))

+        {

+			ERROR_LOG(DISCIO, "WiiWAD: Could not read from file");

+            PanicAlert("WiiWAD: Could not read from file");

+        }

+        return pTmpBuffer;

+    }

+	return NULL;

+}

+

+

+bool WiiWAD::ParseWAD(DiscIO::IBlobReader& _rReader)

+{

+    CBlobBigEndianReader ReaderBig(_rReader);

+

+    // get header size	

+	u32 HeaderSize = ReaderBig.Read32(0);

+    if (HeaderSize != 0x20) 

+    {

+        _dbg_assert_msg_(BOOT, (HeaderSize==0x20), "WiiWAD: Header size != 0x20");

+        return false;

+    }    

+

+    // get header 

+    u8 Header[0x20];

+    _rReader.Read(0, HeaderSize, Header);

+	u32 HeaderType = ReaderBig.Read32(0x4);

+    if ((0x49730000 != HeaderType) && (0x69620000 != HeaderType))

+        return false;

+

+    m_CertificateChainSize    = ReaderBig.Read32(0x8);

+    u32 Reserved              = ReaderBig.Read32(0xC);

+    m_TicketSize              = ReaderBig.Read32(0x10);

+    m_TMDSize                 = ReaderBig.Read32(0x14);

+    m_DataAppSize             = ReaderBig.Read32(0x18);

+    m_FooterSize              = ReaderBig.Read32(0x1C);

+    _dbg_assert_msg_(BOOT, Reserved==0x00, "WiiWAD: Reserved must be 0x00");

+

+    u32 Offset = 0x40;

+    m_pCertificateChain   = CreateWADEntry(_rReader, m_CertificateChainSize, Offset);  Offset += ROUND_UP(m_CertificateChainSize, 0x40);

+    m_pTicket             = CreateWADEntry(_rReader, m_TicketSize, Offset);            Offset += ROUND_UP(m_TicketSize, 0x40);

+    m_pTMD                = CreateWADEntry(_rReader, m_TMDSize, Offset);               Offset += ROUND_UP(m_TMDSize, 0x40);

+    m_pDataApp            = CreateWADEntry(_rReader, m_DataAppSize, Offset);           Offset += ROUND_UP(m_DataAppSize, 0x40);

+    m_pFooter             = CreateWADEntry(_rReader, m_FooterSize, Offset);            Offset += ROUND_UP(m_FooterSize, 0x40);

+

+	return true;

+}

+

+bool WiiWAD::IsWiiWAD(const std::string& _rName)

+{

+    DiscIO::IBlobReader* pReader = DiscIO::CreateBlobReader(_rName.c_str());

+    if (pReader == NULL)

+        return false;

+

+    CBlobBigEndianReader Reader(*pReader);

+    bool Result = false;

+

+    // check for wii wad

+    if (Reader.Read32(0x00) == 0x20)

+    {

+        u32 WADTYpe = Reader.Read32(0x04);

+        switch(WADTYpe)

+        {

+        case 0x49730000:

+        case 0x69620000:

+            Result = true;

+        }

+    }

+

+    delete pReader;

+

+    return Result;

+}

+

+

+

+} // namespace end

+

diff --git a/Source/Core/DiscIO/Src/WiiWad.h b/Source/Core/DiscIO/Src/WiiWad.h
new file mode 100644
index 0000000000..10b2ad867e
--- /dev/null
+++ b/Source/Core/DiscIO/Src/WiiWad.h
@@ -0,0 +1,78 @@
+// Copyright (C) 2003-2009 Dolphin Project.

+

+// This program is free software: you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation, version 2.0.

+

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License 2.0 for more details.

+

+// A copy of the GPL 2.0 should have been included with the program.

+// If not, see http://www.gnu.org/licenses/

+

+// Official SVN repository and contact information can be found at

+// http://code.google.com/p/dolphin-emu/

+

+#ifndef _WII_WAD_H

+#define _WII_WAD_H

+

+#include <string>

+#include <vector>

+#include <map>

+

+#include "Common.h"

+#include "Blob.h"

+#include "Volume.h"

+

+namespace DiscIO

+{

+

+class WiiWAD

+{

+public:

+

+    WiiWAD(const std::string& _rName);

+

+	~WiiWAD();

+

+	bool IsValid() const { return m_Valid; }

+	u32 GetCertificateChainSize() const { return m_CertificateChainSize; }

+	u32 GetTicketSize() const { return m_TicketSize; }

+	u32 GetTMDSize() const { return m_TMDSize; }

+	u32 GetDataAppSize() const { return m_DataAppSize; }

+	u32 GetFooterSize() const { return m_FooterSize; }

+	

+	u8* GetCertificateChain() const { return m_pCertificateChain; }

+	u8* GetTicket() const { return m_pTicket; }

+	u8* GetTMD() const { return m_pTMD; }

+	u8* GetDataApp() const { return m_pDataApp; }

+	u8* GetFooter() const { return m_pFooter; }

+	

+    static bool IsWiiWAD(const std::string& _rName);

+

+private:

+

+	bool m_Valid;

+

+	u32 m_CertificateChainSize;

+	u32 m_TicketSize;

+	u32 m_TMDSize;

+	u32 m_DataAppSize;

+	u32 m_FooterSize;

+

+	u8* m_pCertificateChain;

+	u8* m_pTicket;

+	u8* m_pTMD;

+	u8* m_pDataApp;

+	u8* m_pFooter;

+

+	u8* CreateWADEntry(DiscIO::IBlobReader& _rReader, u32 _Size, u64 _Offset);

+	bool ParseWAD(DiscIO::IBlobReader& _rReader);

+};

+

+}

+

+#endif

+