Added wad files detection to the GameListCtrl, some changes to ISOProperties, needs a bit more work ?

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

Source/Core/DiscIO/Src/BannerLoader.cpp

@@ -140,11 +140,11 @@ bool IBannerLoader::CopyBeUnicodeToString( std::string& _rDestination, const u16
 }
 
 
-IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem)
+IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume)
 {
-	if (IsVolumeWiiDisc(_rFileSystem.GetVolume()))
+	if (IsVolumeWiiDisc(pVolume) || IsVolumeWadFile(pVolume))
 	{
-		return(new CBannerLoaderWii(_rFileSystem));
+		return(new CBannerLoaderWii(pVolume));
 	}
 
 	return(new CBannerLoaderGC(_rFileSystem));

Source/Core/DiscIO/Src/BannerLoader.h

@@ -57,7 +57,7 @@ class IBannerLoader
 		}
 };
 
-IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem);
+IBannerLoader* CreateBannerLoader(DiscIO::IFileSystem& _rFileSystem, DiscIO::IVolume *pVolume);
 } // namespace
 
 #endif

Source/Core/DiscIO/Src/BannerLoaderWii.cpp

@@ -22,20 +22,25 @@
 #include "Common.h"
 #include "ColorUtil.h"
 #include "BannerLoaderWii.h"
+#include "VolumeCreator.h"
 #include "FileUtil.h"
 #include "FileHandlerARC.h"
 
 namespace DiscIO
 {
 
-CBannerLoaderWii::CBannerLoaderWii(DiscIO::IFileSystem& _rFileSystem)	
+CBannerLoaderWii::CBannerLoaderWii(DiscIO::IVolume *pVolume)	
 	: m_pBannerFile(NULL)
 	, m_IsValid(false)
 {
 	char Filename[260];
 	u64 TitleID;
 
-	_rFileSystem.GetVolume()->RAWRead((u64)0x0F8001DC, 8, (u8*)&TitleID);
+	if (DiscIO::IsVolumeWadFile(pVolume))
+		pVolume->GetTitleID((u8*)&TitleID);
+	else
+		pVolume->RAWRead((u64)0x0F8001DC, 8, (u8*)&TitleID);
+
 	TitleID = Common::swap64(TitleID);
 
 	sprintf(Filename, FULL_WII_USER_DIR "title/%08x/%08x/data/banner.bin",

Source/Core/DiscIO/Src/BannerLoaderWii.h

@@ -27,7 +27,7 @@ class CBannerLoaderWii
 {
 	public:
 
-		CBannerLoaderWii(DiscIO::IFileSystem& _rFileSystem);
+		CBannerLoaderWii(DiscIO::IVolume *pVolume);
 
 		virtual ~CBannerLoaderWii();
 

Source/Core/DiscIO/Src/Volume.h

@@ -39,6 +39,7 @@ class IVolume
 
 		virtual bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
 		virtual bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const = 0;
+		virtual bool GetTitleID(u8* _pBuffer) const { return false; }
 		virtual std::string GetUniqueID() const = 0;
 		virtual std::string GetMakerID() const = 0;
 		virtual std::string GetName() const = 0;

Source/Core/DiscIO/Src/VolumeCreator.cpp

@@ -25,6 +25,7 @@
 #include "VolumeDirectory.h"
 #include "VolumeGC.h"
 #include "VolumeWiiCrypted.h"
+#include "VolumeWad.h"
 
 #include "Hash.h"
 
@@ -35,7 +36,8 @@ enum EDiscType
 	DISC_TYPE_UNK,
 	DISC_TYPE_WII,
 	DISC_TYPE_WII_CONTAINER,
-	DISC_TYPE_GC
+	DISC_TYPE_GC,
+	DISC_TYPE_WAD
 };
 
 #ifndef _WIN32
@@ -80,6 +82,9 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionG
 		case DISC_TYPE_GC:
 			return new CVolumeGC(pReader);
 
+		case DISC_TYPE_WAD:
+			return new CVolumeWAD(pReader);
+
 		case DISC_TYPE_WII_CONTAINER:
 		{
 			u8 region;
@@ -123,6 +128,15 @@ bool IsVolumeWiiDisc(const IVolume *_rVolume)
 	//Gamecube 0xc2339f3d
 }
 
+bool IsVolumeWadFile(const IVolume *_rVolume)
+{
+	u32 MagicWord = 0;
+	_rVolume->Read(0x02, 4, (u8*)&MagicWord);
+
+	return (Common::swap32(MagicWord) == 0x00204973);
+	// That would be 0x00206962 for boot2 wads
+}
+
 IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _PartitionGroup, u32 _VolumeType, u32 _VolumeNum, bool Korean)
 {
 	CBlobBigEndianReader Reader(_rReader);
@@ -209,6 +223,16 @@ EDiscType GetDiscType(IBlobReader& _rReader)
 		}
 	}
 
+	// check for WAD
+	{
+		u32 MagicWord = Reader.Read32(0x02);
+
+		// That would be 0x206962 for boot2 wads
+		// Should we add them too ?
+		if (MagicWord == 0x00204973)
+			return(DISC_TYPE_WAD);
+	}
+
 	// check for GC
 	{
 		u32 MagicWord = Reader.Read32(0x1C);

Source/Core/DiscIO/Src/VolumeCreator.h

@@ -25,6 +25,7 @@ namespace DiscIO
 IVolume* CreateVolumeFromFilename(const std::string& _rFilename, u32 _PartitionGroup = 0, u32 _VolumeNum = -1);
 IVolume* CreateVolumeFromDirectory(const std::string& _rDirectory, bool _bIsWii);
 bool IsVolumeWiiDisc(const IVolume *_rVolume);
+bool IsVolumeWadFile(const IVolume *_rVolume);
 } // namespace
 
 #endif

Source/Core/DiscIO/Src/VolumeWad.cpp

@@ -0,0 +1,204 @@
+// 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 <math.h>
+
+#include "VolumeWad.h"
+#include "StringUtil.h"
+#include "MathUtil.h"
+
+#define ALIGN_40(x) ROUND_UP(Common::swap32(x), 0x40)
+
+namespace DiscIO
+{
+CVolumeWAD::CVolumeWAD(IBlobReader* _pReader)
+	: m_pReader(_pReader), OpeningBnrOffset(0), hdr_size(0), cert_size(0), tick_size(0), tmd_size(0), data_size(0)
+{
+	Read(0x00, 4, (u8*)&hdr_size);
+	Read(0x08, 4, (u8*)&cert_size);
+	Read(0x10, 4, (u8*)&tick_size);
+	Read(0x14, 4, (u8*)&tmd_size);
+	Read(0x18, 4, (u8*)&data_size);
+
+	OpeningBnrOffset = ALIGN_40(hdr_size) + ALIGN_40(cert_size) + ALIGN_40(tick_size) + ALIGN_40(tmd_size) + ALIGN_40(data_size);
+}
+
+CVolumeWAD::~CVolumeWAD()
+{
+	delete m_pReader;
+}
+
+bool CVolumeWAD::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
+{
+	if (m_pReader == NULL)
+		return false;
+
+	return m_pReader->Read(_Offset, _Length, _pBuffer);
+}
+
+IVolume::ECountry CVolumeWAD::GetCountry() const
+{
+	if (!m_pReader)
+		return COUNTRY_UNKNOWN;
+
+	u8 CountryCode;
+
+	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size);
+
+	// read the last digit of the titleID in the ticket
+	Read(Offset + 0x01E3, 1, &CountryCode);
+
+	ECountry country = COUNTRY_UNKNOWN;
+
+	switch (CountryCode)
+	{
+		case 'S':
+			country = COUNTRY_EUROPE;
+			break; // PAL // <- that is shitty :) zelda demo disc
+
+		case 'P':
+			country = COUNTRY_EUROPE;
+			break; // PAL
+
+		case 'D':
+			country = COUNTRY_EUROPE;
+			break; // PAL
+
+		case 'F':
+			country = COUNTRY_FRANCE;
+			break; // PAL
+
+		case 'I':
+			country = COUNTRY_ITALY;
+			break; // PAL
+
+		case 'X':
+			country = COUNTRY_EUROPE;
+			break; // XIII <- uses X but is PAL
+
+		case 'E':
+			country = COUNTRY_USA;
+			break; // USA
+
+		case 'J':
+			country = COUNTRY_JAP;
+			break; // JAP
+
+		case 'O':
+			country = COUNTRY_UNKNOWN;
+			break; // SDK
+
+		default:
+			// PanicAlert("Unknown Country Code!");
+			country = COUNTRY_UNKNOWN;
+			break;
+	}
+
+	return(country);
+}
+
+std::string CVolumeWAD::GetUniqueID() const
+{
+	std::string temp = GetMakerID();
+	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size);
+
+	char GameCode[8];
+	if(!Read(Offset + 0x01E0, 4, (u8*)GameCode))
+		return "0";
+
+	GameCode[4] = temp.at(0);
+	GameCode[5] = temp.at(1);
+	GameCode[6] = 0;
+
+	return GameCode;
+}
+
+std::string CVolumeWAD::GetMakerID() const
+{
+	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size) + ALIGN_40(tick_size);
+
+	char temp[3];
+	if (!Read(0x198 + Offset, 2, (u8*)temp))
+		return "0";
+
+	temp[2] = 0;
+
+	return temp;
+}
+
+bool CVolumeWAD::GetTitleID(u8* _pBuffer) const
+{
+	u32 Offset = ALIGN_40(hdr_size) + ALIGN_40(cert_size);
+
+	if(!Read(Offset + 0x01DC, 8, _pBuffer))
+		return false;
+
+	return true;
+}
+
+std::string CVolumeWAD::GetName() const
+{
+	if (m_pReader == NULL)
+		return "Unknown";
+
+	u32 footer_size;
+	if (!Read(0x1C, 4, (u8*)&footer_size))
+		return "Unknown";
+
+	// Offset to the english title
+	char temp[85];
+	if (!Read(0xF1 + OpeningBnrOffset, 84, (u8*)&temp))
+		return "Unknown";
+
+	char out_temp[43];
+	int j = 0;
+
+	for (int i=0; i < 84; i++)
+	{
+		if (!(i & 1))
+		{
+			if (temp[i] != 0)
+				out_temp[j] = temp[i];
+			else
+			{
+				// Some wads have a few consecutive Null chars followed by text
+				// as i don't know what to do there: replace the frst one with space
+				if (out_temp[j-1] != 32)
+					out_temp[j] = 32;
+				else
+					continue;
+			}
+
+			j++;
+		}
+	}
+
+	out_temp[j] = 0;
+
+	return out_temp;
+}
+
+u64 CVolumeWAD::GetSize() const
+{
+	if (m_pReader)
+		return (size_t)m_pReader->GetDataSize();
+	else
+		return 0;
+}
+
+} // namespace

Source/Core/DiscIO/Src/VolumeWad.h

@@ -0,0 +1,52 @@
+// 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/
+
+#pragma once
+
+#include "Volume.h"
+#include "Blob.h"
+#include "NANDContentLoader.h"
+
+// --- this volume type is used for Wad files ---
+// Some of this code might look redundant with the CNANDContentLoader class, however,
+// We do not do any decryption here, we do raw read, so things are -Faster- 
+
+namespace DiscIO
+{
+class CVolumeWAD : public IVolume
+{
+public:
+	CVolumeWAD(IBlobReader* _pReader);
+	~CVolumeWAD();
+	bool Read(u64 _Offset, u64 _Length, u8* _pBuffer) const;
+	bool RAWRead(u64 _Offset, u64 _Length, u8* _pBuffer) const { return false; }
+	bool GetTitleID(u8* _pBuffer) const;
+	std::string GetUniqueID() const;
+	std::string GetMakerID() const;
+	std::string GetName() const;
+	u32 GetFSTSize() const					{ return 0; }
+	std::string GetApploaderDate() const	{ return "0"; }	
+	ECountry GetCountry() const;
+	u64 GetSize() const;
+
+private:
+	IBlobReader* m_pReader;
+	u64 m_titleID;
+	u32 OpeningBnrOffset, hdr_size, cert_size, tick_size, tmd_size, data_size;
+};
+
+} // namespace