ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Large blob code cleanup. Compressed ISO ("gcz") support reactivated. Beginnings of raw drive reading code. Deprecate file mapping in an ugly way. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@566 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-09-17 23:25:35 +00:00
parent 2cd7acfaee
commit cb90e61368
31 changed files with 1209 additions and 844 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

332
Source/Core/Common/Common.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Common" Name="Common"
ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}" ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
RootNamespace="Common" RootNamespace="Common"
@ -88,151 +88,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="&quot;$(ProjectDir)SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)\src\svnrev_template.h&quot; &quot;$(ProjectDir)\src\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="&quot;$(ProjectDir)SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)\src\svnrev_template.h&quot; &quot;$(ProjectDir)\src\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@ -307,6 +162,80 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="&quot;$(ProjectDir)SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)\src\svnrev_template.h&quot; &quot;$(ProjectDir)\src\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="2"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
FloatingPointModel="0"
RuntimeTypeInfo="false"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@ -382,6 +311,77 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="&quot;$(ProjectDir)SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)\src\svnrev_template.h&quot; &quot;$(ProjectDir)\src\svnrev.h&quot;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="3"
FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;LOGGING"
RuntimeLibrary="0"
BufferSecurityCheck="false"
EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
AssemblerListingLocation="$(IntDir)\"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
ForcedIncludeFiles="stdafx.h"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="wsock32.lib"
OutputFile="$(OutDir)/Common.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="DebugFast|x64" Name="DebugFast|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@ -489,6 +489,14 @@
RelativePath=".\Src\CPUDetect.h" RelativePath=".\Src\CPUDetect.h"
> >
</File> </File>
<File
RelativePath=".\Src\DriveUtil.cpp"
>
</File>
<File
RelativePath=".\Src\DriveUtil.h"
>
</File>
<File <File
RelativePath=".\Src\DynamicLibrary.cpp" RelativePath=".\Src\DynamicLibrary.cpp"
> >
@ -596,22 +604,6 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|x64" Name="Debug|x64"
> >
@ -620,6 +612,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|x64" Name="Release|x64"
> >
@ -628,6 +628,14 @@
UsePrecompiledHeader="1" UsePrecompiledHeader="1"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="DebugFast|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="1"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="DebugFast|x64" Name="DebugFast|x64"
> >

7
Source/Core/Common/Src/Common.h
View File

@ -18,7 +18,14 @@
#ifndef _COMMON_H #ifndef _COMMON_H
#define _COMMON_H #define _COMMON_H
#define _CRTDBG_MAP_ALLOC
#define _CRTDBG_MAP_ALLOC_NEW
#ifdef _WIN32 #ifdef _WIN32
#ifdef _DEBUG
#include <crtdbg.h>
#endif
#include "../../../PluginSpecs/CommonTypes.h" #include "../../../PluginSpecs/CommonTypes.h"
#else #else
#include "CommonTypes.h" #include "CommonTypes.h"

57
Source/Core/Common/Src/DriveUtil.cpp Normal file
View File

@ -0,0 +1,57 @@
// Copyright (C) 2003-2008 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 "Common.h"
#ifdef _WIN32
#include <windows.h>
#include <winioctl.h>
#endif
void GetAllRemovableDrives(std::vector<std::string> *drives) {
drives->clear();
#ifdef _WIN32
HANDLE hDisk;
DISK_GEOMETRY diskGeometry;
for (int i = 'A'; i < 'Z'; i++)
{
char path[MAX_PATH];
sprintf(path, "\\\\.\\%c:", i);
hDisk = CreateFile(path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
if (hDisk != INVALID_HANDLE_VALUE)
{
DWORD dwBytes;
DeviceIoControl(hDisk, IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0, &diskGeometry, sizeof(DISK_GEOMETRY), &dwBytes, NULL);
// Only proceed if disk is a removable media
if (diskGeometry.MediaType == RemovableMedia)
{
if (diskGeometry.BytesPerSector == 2048) {
// Probably CD/DVD drive.
// "Remove" the "\\.\" part of the path and return it.
drives->push_back(path + 4);
}
}
}
CloseHandle(hDisk);
}
#else
// TODO
// stat("/media/cdrom") or whatever etc etc
#endif
}

28
Source/Core/Common/Src/DriveUtil.h Normal file
View File

@ -0,0 +1,28 @@
// Copyright (C) 2003-2008 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 _DRIVEUTIL_H
#define _DRIVEUTIL_H
#include <string>
#include <vector>
// Tools to enumerate drives (HDD, DVD, CD) in a platform-independent manner.
void GetAllRemovableDrives(std::vector<std::string> *drives);
#endif

2
Source/Core/Common/Src/FileUtil.h
View File

@ -28,7 +28,7 @@ public:
static void Explore(const std::string &path); static void Explore(const std::string &path);
static bool IsDirectory(const std::string &filename); static bool IsDirectory(const std::string &filename);
static bool CreateDir(const std::string &filename); static bool CreateDir(const std::string &filename);
static std::string GetUserDirectory(); static std::string GetUserDirectory();
}; };
#endif #endif

2
Source/Core/Common/Src/Hash.h
View File

@ -19,7 +19,7 @@
#include "Common.h" #include "Common.h"
u32 HashFletcher(const u8* data_u8, size_t length); // FAST u32 HashFletcher(const u8* data_u8, size_t length); // FAST. Length & 1 == 0.
u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower u32 HashAdler32(const u8* data, size_t len); // Fairly accurate, slightly slower
u32 HashFNV(const u8* ptr, int length); // Another fast and decent hash u32 HashFNV(const u8* ptr, int length); // Another fast and decent hash
u32 HashEctor(const u8* ptr, int length); // JUNK. DO NOT USE FOR NEW THINGS u32 HashEctor(const u8* ptr, int length); // JUNK. DO NOT USE FOR NEW THINGS

2
Source/Core/Common/Src/MappedFile.cpp
View File

@ -226,7 +226,7 @@ void CMappedFile::Unlock(u8* ptr)
} }
IMappedFile* IMappedFile::CreateMappedFile(void) IMappedFile* IMappedFile::CreateMappedFileDEPRECATED(void)
{ {
return(new CMappedFile); return(new CMappedFile);
} }

2
Source/Core/Common/Src/MappedFile.h
View File

@ -43,7 +43,7 @@ class IMappedFile
virtual u8* Lock(u64 _offset, u64 _size) = 0; virtual u8* Lock(u64 _offset, u64 _size) = 0;
virtual void Unlock(u8* ptr) = 0; virtual void Unlock(u8* ptr) = 0;
static IMappedFile* CreateMappedFile(); static IMappedFile* CreateMappedFileDEPRECATED();
}; };
} // end of namespace DiscIO } // end of namespace DiscIO

4
Source/Core/Core/Src/Boot/Boot.cpp
View File

@ -49,7 +49,7 @@
bool CBoot::Boot_BIN(const std::string& _rFilename) bool CBoot::Boot_BIN(const std::string& _rFilename)
{ {
Common::IMappedFile* pFile = Common::IMappedFile::CreateMappedFile(); Common::IMappedFile* pFile = Common::IMappedFile::CreateMappedFileDEPRECATED();
if (pFile->Open(_rFilename.c_str())) if (pFile->Open(_rFilename.c_str()))
{ {
@ -443,7 +443,7 @@ bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_game
bool CBoot::Load_BIOS(const std::string& _rBiosFilename) bool CBoot::Load_BIOS(const std::string& _rBiosFilename)
{ {
bool bResult = false; bool bResult = false;
Common::IMappedFile* pFile = Common::IMappedFile::CreateMappedFile(); Common::IMappedFile* pFile = Common::IMappedFile::CreateMappedFileDEPRECATED();
if (pFile->Open(_rBiosFilename.c_str())) if (pFile->Open(_rBiosFilename.c_str()))
{ {
if (pFile->GetSize() >= 1024*1024*2) if (pFile->GetSize() >= 1024*1024*2)

4
Source/Core/Core/Src/Boot/Boot_ELF.cpp
View File

@ -7,7 +7,7 @@
bool CBoot::IsElfWii(const char *filename) bool CBoot::IsElfWii(const char *filename)
{ {
Common::IMappedFile *mapfile = Common::IMappedFile::CreateMappedFile(); Common::IMappedFile *mapfile = Common::IMappedFile::CreateMappedFileDEPRECATED();
bool ok = mapfile->Open(filename); bool ok = mapfile->Open(filename);
if (!ok) if (!ok)
return false; return false;
@ -29,7 +29,7 @@ bool CBoot::IsElfWii(const char *filename)
bool CBoot::Boot_ELF(const char *filename) bool CBoot::Boot_ELF(const char *filename)
{ {
Common::IMappedFile *mapfile = Common::IMappedFile::CreateMappedFile(); Common::IMappedFile *mapfile = Common::IMappedFile::CreateMappedFileDEPRECATED();
mapfile->Open(filename); mapfile->Open(filename);
u8 *ptr = mapfile->Lock(0, mapfile->GetSize()); u8 *ptr = mapfile->Lock(0, mapfile->GetSize());
u8 *mem = new u8[(size_t)mapfile->GetSize()]; u8 *mem = new u8[(size_t)mapfile->GetSize()];

2
Source/Core/Core/Src/HLE/HLE.cpp
View File

@ -60,7 +60,7 @@ static const SPatch OSPatches[] =
{ "OSPanic", HLE_OS::HLE_OSPanic }, { "OSPanic", HLE_OS::HLE_OSPanic },
{ "vprintf", HLE_OS::HLE_vprintf }, { "vprintf", HLE_OS::HLE_vprintf },
{ "printf", HLE_OS::HLE_printf }, { "printf", HLE_OS::HLE_printf },
{ "puts", HLE_OS::HLE_printf }, //gcc-optimized printf? { "puts", HLE_OS::HLE_printf }, //gcc-optimized printf?
// wii only // wii only
{ "SCCheckStatus", HLE_Misc::UnimplementedFunctionFalse }, { "SCCheckStatus", HLE_Misc::UnimplementedFunctionFalse },

2
Source/Core/Core/Src/PowerPC/Jit64/JitBackpatch.cpp
View File

@ -60,6 +60,7 @@ void BackPatchError(const std::string &text, u8 *codePtr, u32 emAddress) {
// that many of them in a typical program/game. // that many of them in a typical program/game.
void BackPatch(u8 *codePtr, int accessType, u32 emAddress) void BackPatch(u8 *codePtr, int accessType, u32 emAddress)
{ {
#ifdef _M_X64
if (!IsInJitCode(codePtr)) if (!IsInJitCode(codePtr))
return; // this will become a regular crash real soon after this return; // this will become a regular crash real soon after this
@ -135,6 +136,7 @@ void BackPatch(u8 *codePtr, int accessType, u32 emAddress)
CALL(trampoline); CALL(trampoline);
NOP((int)info.instructionSize + bswapNopCount - 5); NOP((int)info.instructionSize + bswapNopCount - 5);
SetCodePtr(oldCodePtr); SetCodePtr(oldCodePtr);
#endif
} }
} // namespace } // namespace

42
Source/Core/Core/Src/PowerPC/SymbolDB.cpp
View File

@ -28,6 +28,14 @@
SymbolDB g_symbolDB; SymbolDB g_symbolDB;
SymbolDB::SymbolDB()
{
}
SymbolDB::~SymbolDB()
{
}
void SymbolDB::List() void SymbolDB::List()
{ {
for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++) for (XFuncMap::iterator iter = functions.begin(); iter != functions.end(); iter++)
@ -232,27 +240,27 @@ bool SymbolDB::LoadMap(const char *filename)
bool started = false; bool started = false;
while (!feof(f)) while (!feof(f))
{ {
char line[512],temp[256]; char line[512], temp[256];
fgets(line, 511, f); fgets(line, 511, f);
if (strlen(line) < 4) if (strlen(line) < 4)
continue; continue;
sscanf(line,"%s",temp); sscanf(line, "%s", temp);
if (strcmp(temp,"UNUSED")==0) continue; if (strcmp(temp, "UNUSED")==0) continue;
if (strcmp(temp,".text")==0) {started = true; continue;}; if (strcmp(temp, ".text")==0) {started = true; continue;};
if (strcmp(temp,".init")==0) {started = true; continue;}; if (strcmp(temp, ".init")==0) {started = true; continue;};
if (strcmp(temp,"Starting")==0) continue; if (strcmp(temp, "Starting")==0) continue;
if (strcmp(temp,"extab")==0) continue; if (strcmp(temp, "extab")==0) continue;
if (strcmp(temp,".ctors")==0) break; //uh? if (strcmp(temp, ".ctors")==0) break; //uh?
if (strcmp(temp,".dtors")==0) break; if (strcmp(temp, ".dtors")==0) break;
if (strcmp(temp,".rodata")==0) continue; if (strcmp(temp, ".rodata")==0) continue;
if (strcmp(temp,".data")==0) continue; if (strcmp(temp, ".data")==0) continue;
if (strcmp(temp,".sbss")==0) continue; if (strcmp(temp, ".sbss")==0) continue;
if (strcmp(temp,".sdata")==0) continue; if (strcmp(temp, ".sdata")==0) continue;
if (strcmp(temp,".sdata2")==0) continue; if (strcmp(temp, ".sdata2")==0) continue;
if (strcmp(temp,"address")==0) continue; if (strcmp(temp, "address")==0) continue;
if (strcmp(temp,"-----------------------")==0) continue; if (strcmp(temp, "-----------------------")==0) continue;
if (strcmp(temp,".sbss2")==0) break; if (strcmp(temp, ".sbss2")==0) break;
if (temp[1] == ']') continue; if (temp[1] == ']') continue;
if (!started) continue; if (!started) continue;

3
Source/Core/Core/Src/PowerPC/SymbolDB.h
View File

@ -93,7 +93,8 @@ private:
public: public:
typedef void (*functionGetterCallback)(Symbol *f); typedef void (*functionGetterCallback)(Symbol *f);
SymbolDB() {} SymbolDB();
~SymbolDB();
Symbol *AddFunction(u32 startAddr); Symbol *AddFunction(u32 startAddr);
void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION); void AddKnownSymbol(u32 startAddr, u32 size, const char *name, int type = Symbol::SYMBOL_FUNCTION);

28
Source/Core/DiscIO/DiscIO.vcproj
View File

@ -768,6 +768,30 @@
RelativePath=".\Src\Blob.h" RelativePath=".\Src\Blob.h"
> >
</File> </File>
<File
RelativePath=".\Src\CompressedBlob.cpp"
>
</File>
<File
RelativePath=".\Src\CompressedBlob.h"
>
</File>
<File
RelativePath=".\Src\DriveBlob.cpp"
>
</File>
<File
RelativePath=".\Src\DriveBlob.h"
>
</File>
<File
RelativePath=".\Src\FileBlob.cpp"
>
</File>
<File
RelativePath=".\Src\FileBlob.h"
>
</File>
</Filter> </Filter>
</Filter> </Filter>
<Filter <Filter
@ -1114,6 +1138,10 @@
> >
</File> </File>
</Filter> </Filter>
<File
RelativePath=".\Src\SConscript"
>
</File>
<File <File
RelativePath=".\Src\stdafx.cpp" RelativePath=".\Src\stdafx.cpp"
> >

607
Source/Core/DiscIO/Src/Blob.cpp
View File

@ -1,567 +1,110 @@
#ifdef WIN32 // Copyright (C) 2003-2008 Dolphin Project.
#include <io.h>
#include <windows.h>
#else
#include <unistd.h>
#endif
#include "stdafx.h" // This program is free software: you can redistribute it and/or modify
#include "../../../../Externals/zlib/zlib.h" // 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 "Common.h"
#include "FileUtil.h"
#include "Blob.h" #include "Blob.h"
#include "CompressedBlob.h"
#include "FileBlob.h"
#include "DriveBlob.h"
#include "MappedFile.h" #include "MappedFile.h"
namespace DiscIO namespace DiscIO
{ {
const u32 kBlobCookie = 0xB10BC001;
// A blob file structure: // Provides caching and split-operation-to-block-operations facilities.
// BlobHeader // Used for compressed blob reading and direct drive reading.
// u64 offsetsToBlocks[n], top bit specifies whether the block is compressed, or not.
// compressed data
// Blocks that won't compress to less than 97% of the original size are stored as-is. void SectorReader::SetSectorSize(int blocksize)
struct BlobHeader // 32 bytes
{ {
u32 magic_cookie; //0xB10BB10B for (int i = 0; i < CACHE_SIZE; i++)
u32 sub_type; // gc image, whatever
u64 compressed_data_size;
u64 data_size;
u32 block_size;
u32 num_blocks;
};
#ifdef _WIN32
class PlainFileReader
: public IBlobReader
{
HANDLE hFile;
s64 size;
private:
PlainFileReader(HANDLE hFile_)
{
hFile = hFile_;
DWORD size_low, size_high;
size_low = GetFileSize(hFile, &size_high);
size = ((u64)size_low) | ((u64)size_high << 32);
}
public:
static PlainFileReader* Create(const char* filename)
{
HANDLE hFile = CreateFile(
filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL
);
if (hFile != INVALID_HANDLE_VALUE)
{
return new PlainFileReader(hFile);
}
return 0;
}
~PlainFileReader()
{
CloseHandle(hFile);
}
u64 GetDataSize() const {return(size);}
u64 GetRawSize() const {return(size);}
bool Read(u64 offset, u64 size, u8* out_ptr)
{
LONG offset_high = (LONG)(offset >> 32);
SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN);
if (size >= 0x100000000ULL)
{
return(false); // WTF, does windows really have this limitation?
}
DWORD unused;
if (!ReadFile(hFile, out_ptr, DWORD(size & 0xFFFFFFFF), &unused, NULL))
{
return(false);
}
else
{
return(true);
}
}
};
#else // linux, 64-bit. We do not yet care about linux32
// Not optimal - will keep recreating mappings.
class PlainFileReader : public IBlobReader
{
FILE* file_;
s64 size;
private:
PlainFileReader(FILE* file__)
{
file_ = file__;
#if 0
fseek64(file_, 0, SEEK_END);
#else
fseek(file_, 0, SEEK_END); // I don't have fseek64 with gcc 4.3
#endif
size = ftell(file_);
fseek(file_, 0, SEEK_SET);
}
public:
static PlainFileReader* Create(const char* filename)
{
FILE* file_ = fopen(filename, "rb");
if (file_)
{
return new PlainFileReader(file_);
}
return 0;
}
~PlainFileReader()
{
fclose(file_);
}
u64 GetDataSize() const
{
return(size);
}
u64 GetRawSize() const
{
return(size);
}
bool Read(u64 offset, u64 nbytes, u8* out_ptr)
{
fseek(file_, offset, SEEK_SET);
fread(out_ptr, nbytes, 1, file_);
return(true);
}
};
#endif
class CompressedBlobReader
: public IBlobReader
{
enum { CACHE_SIZE = 32 };
BlobHeader header;
u64* block_pointers;
int data_offset;
u8* cache[CACHE_SIZE];
u64 cache_tags[CACHE_SIZE];
int cache_age[CACHE_SIZE];
u64 counter;
Common::IMappedFile* mapped_file;
private:
CompressedBlobReader(Common::IMappedFile* mapped_file_)
{
mapped_file = mapped_file_;
counter = 0;
u8* start = mapped_file->Lock(0, sizeof(BlobHeader));
memcpy(&header, start, sizeof(BlobHeader));
mapped_file->Unlock(start);
block_pointers = (u64*)mapped_file->Lock(sizeof(BlobHeader), sizeof(u64) * header.num_blocks);
data_offset = sizeof(BlobHeader) + sizeof(u64) * header.num_blocks;
for (int i = 0; i < CACHE_SIZE; i++)
{
cache[i] = new u8[header.block_size];
cache_tags[i] = (u64)(s64) - 1;
}
}
public:
static CompressedBlobReader* Create(const char* filename)
{
Common::IMappedFile* mapped_file =
Common::IMappedFile::CreateMappedFile();
if (mapped_file)
{
bool ok = mapped_file->Open(filename);
if (ok)
{
return new CompressedBlobReader(mapped_file);
}
else
{
delete mapped_file;
}
}
return 0;
}
~CompressedBlobReader()
{
for (int i = 0; i < CACHE_SIZE; i++)
{
delete[] cache[i];
}
mapped_file->Unlock((u8*)block_pointers);
mapped_file->Close();
delete mapped_file;
}
const BlobHeader& GetHeader() const
{
return(header);
}
u64 GetDataSize() const
{
return(header.data_size);
}
u64 GetRawSize() const
{
return(mapped_file->GetSize());
}
u64 GetBlockCompressedSize(u64 block_num) const
{
u64 start = block_pointers[block_num];
if (block_num != header.num_blocks - 1)
{
return(block_pointers[block_num + 1] - start);
}
else
{
return(header.compressed_data_size - start);
}
}
// IMPORTANT: Calling this function invalidates all earlier pointers gotten from this function.
u8* GetBlock(u64 block_num)
{
if (cache_tags[0] != block_num)
{
cache_tags[0] = block_num;
//PanicAlert("here2");
// let's begin with a super naive implementation.
// let's just use the start of the cache for now.
bool uncompressed = false;
u32 comp_block_size = (u32)GetBlockCompressedSize(block_num);
u64 offset = block_pointers[block_num] + data_offset;
if (offset & (1ULL << 63))
{
if (comp_block_size != header.block_size)
{
PanicAlert("Uncompressed block with wrong size");
}
uncompressed = true;
offset &= ~(1ULL << 63);
}
u8* source = mapped_file->Lock(offset, comp_block_size + 64*1024);
u8* dest = cache[0];
if (uncompressed)
{
memcpy(dest, source, comp_block_size);
}
else
{
z_stream z;
memset(&z, 0, sizeof(z));
z.next_in = source;
z.avail_in = comp_block_size;
if (z.avail_in > header.block_size)
{
PanicAlert("We have a problem");
}
z.next_out = dest;
z.avail_out = header.block_size;
inflateInit(&z);
int status = inflate(&z, Z_FULL_FLUSH);
u32 uncomp_size = header.block_size - z.avail_out;
if (status != Z_STREAM_END)
{
// this seem to fire wrongly from time to time
// to be sure, don't use compressed isos :P
//PanicAlert("Failure reading block %i", block_num);
}
if (uncomp_size != header.block_size)
{
PanicAlert("Wrong block size");
}
inflateEnd(&z);
}
mapped_file->Unlock(source);
}
//PanicAlert("here3");
return(cache[0]);
}
bool Read(u64 offset, u64 size, u8* out_ptr)
{
u64 startingBlock = offset / header.block_size;
u64 remain = size;
int positionInBlock = (int)(offset % header.block_size);
u64 block = startingBlock;
while (remain > 0)
{
u8* data = GetBlock(block);
if (!data)
{
return(false);
}
u32 toCopy = header.block_size - positionInBlock;
if (toCopy >= remain)
{
// yay, we are done!
memcpy(out_ptr, data + positionInBlock, (size_t)remain);
return(true);
}
else
{
memcpy(out_ptr, data + positionInBlock, toCopy);
out_ptr += toCopy;
remain -= toCopy;
positionInBlock = 0;
block++;
}
}
PanicAlert("here4");
return(true);
}
};
bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type, int block_size,
CompressCB callback, void* arg)
{
//Common::IMappedFile *in = Common::IMappedFile::CreateMappedFile();
if (IsCompressedBlob(infile))
{ {
PanicAlert("%s is already compressed!", infile); cache[i] = new u8[blocksize];
return(false); cache_tags[i] = (u64)(s64) - 1;
} }
m_blocksize = blocksize;
}
FILE* inf = fopen(infile, "rb"); SectorReader::~SectorReader() {
for (int i = 0; i < CACHE_SIZE; i++)
delete[] cache[i];
}
if (!inf) const u8 *SectorReader::GetBlockData(u64 block_num)
{
if (cache_tags[0] == block_num)
{ {
return(false); return cache[0];
} }
else
FILE* f = fopen(outfile, "wb");
if (!f)
{ {
return(false); GetBlock(block_num, cache[0]);
cache_tags[0] = block_num;
return cache[0];
} }
}
callback("Files opened, ready to compress.", 0, arg); bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr)
{
u64 startingBlock = offset / m_blocksize;
u64 remain = size;
fseek(inf, 0, SEEK_END); int positionInBlock = (int)(offset % m_blocksize);
int insize = ftell(inf); u64 block = startingBlock;
fseek(inf, 0, SEEK_SET);
BlobHeader header;
header.magic_cookie = kBlobCookie;
header.sub_type = sub_type;
header.block_size = block_size;
header.data_size = insize;
// round upwards! while (remain > 0)
header.num_blocks = (u32)((header.data_size + (block_size - 1)) / block_size);
u64* offsets = new u64[header.num_blocks];
u8* out_buf = new u8[block_size];
u8* in_buf = new u8[block_size];
// seek past the header (we will write it at the end)
fseek(f, sizeof(BlobHeader), SEEK_CUR);
// seek past the offset table (we will write it at the end)
fseek(f, sizeof(u64) * header.num_blocks, SEEK_CUR);
// Now we are ready to write compressed data!
u64 position = 0;
int num_compressed = 0;
int num_stored = 0;
for (u32 i = 0; i < header.num_blocks; i++)
{ {
if (i % (header.num_blocks / 1000) == 0) const u8* data = GetBlockData(block);
if (!data)
return false;
u32 toCopy = m_blocksize - positionInBlock;
if (toCopy >= remain)
{ {
u64 inpos = ftell(inf); // yay, we are done!
int ratio = 0; memcpy(out_ptr, data + positionInBlock, (size_t)remain);
if (inpos != 0) return true;
{
ratio = (int)(100 * position / inpos);
}
char temp[512];
sprintf(temp, "%i of %i blocks. compression ratio %i%%", i, header.num_blocks, ratio);
callback(temp, (float)i / (float)header.num_blocks, arg);
}
offsets[i] = position;
// u64 start = i * header.block_size;
// u64 size = header.block_size;
memset(in_buf, 0, header.block_size);
fread(in_buf, header.block_size, 1, inf);
z_stream z;
memset(&z, 0, sizeof(z));
z.zalloc = Z_NULL;
z.zfree = Z_NULL;
z.opaque = Z_NULL;
z.next_in = in_buf;
z.avail_in = header.block_size;
z.next_out = out_buf;
z.avail_out = block_size;
int retval = deflateInit(&z, 9);
if (retval != Z_OK)
{
PanicAlert("Deflate failed");
goto cleanup;
}
int status = deflate(&z, Z_FINISH);
int comp_size = block_size - z.avail_out;
if ((status != Z_STREAM_END) || (z.avail_out < 10))
{
//PanicAlert("%i %i Store %i", i*block_size, position, comp_size);
// let's store uncompressed
offsets[i] |= 0x8000000000000000ULL;
fwrite(in_buf, block_size, 1, f);
position += block_size;
num_stored++;
} }
else else
{ {
// let's store compressed memcpy(out_ptr, data + positionInBlock, toCopy);
//PanicAlert("Comp %i to %i", block_size, comp_size); out_ptr += toCopy;
fwrite(out_buf, comp_size, 1, f); remain -= toCopy;
position += comp_size; positionInBlock = 0;
num_compressed++; block++;
} }
deflateEnd(&z);
} }
return true;
header.compressed_data_size = position;
// Okay, go back and fill in headers
fseek(f, 0, SEEK_SET);
fwrite(&header, sizeof(header), 1, f);
fwrite(offsets, sizeof(u64), header.num_blocks, f);
cleanup:
// Cleanup
delete[] in_buf;
delete[] out_buf;
delete[] offsets;
fclose(f);
fclose(inf);
callback("Done.", 1.0f, arg);
return(true);
}
bool DecompressBlobToFile(const char* infile, const char* outfile,
CompressCB callback, void* arg)
{
if (!IsCompressedBlob(infile))
{
PanicAlert("File not compressed");
return(false);
}
CompressedBlobReader* reader = CompressedBlobReader::Create(infile);
if (!reader) return false;
FILE* f = fopen(outfile, "wb");
const BlobHeader& header = reader->GetHeader();
u8* buffer = new u8[header.block_size];
for (u64 i = 0; i < header.num_blocks; i++)
{
if (i % (header.num_blocks / 100) == 0)
{
callback("Unpacking", (float)i / (float)header.num_blocks, arg);
}
reader->Read(i * header.block_size, header.block_size, buffer);
fwrite(buffer, header.block_size, 1, f);
}
delete reader;
delete[] buffer;
#ifdef _WIN32
// TODO(ector): _chsize sucks, not 64-bit safe
// F|RES: changed to _chsize_s. i think it is 64-bit safe
_chsize_s(_fileno(f), (long)header.data_size);
#else
ftruncate(fileno(f), header.data_size);
#endif
fclose(f);
return(true);
}
bool IsCompressedBlob(const char* filename)
{
FILE* f = fopen(filename, "rb");
if (!f)
{
return(0);
}
BlobHeader header;
fread(&header, sizeof(header), 1, f);
fclose(f);
return(header.magic_cookie == kBlobCookie);
} }
IBlobReader* CreateBlobReader(const char* filename) IBlobReader* CreateBlobReader(const char* filename)
{ {
return IsCompressedBlob(filename) //if (strlen(filename) < 4 && filename[1] == ':') // Drive, for sure.
? static_cast<IBlobReader*>(CompressedBlobReader::Create(filename)) // return DriveReader::Create(filename);
: static_cast<IBlobReader*>(PlainFileReader::Create(filename));
if (!File::Exists(filename))
return 0;
if (IsCompressedBlob(filename))
return CompressedBlobReader::Create(filename);
// Still here? Assume plain file.
return PlainFileReader::Create(filename);
} }
} // namespace } // namespace

88
Source/Core/DiscIO/Src/Blob.h
View File

@ -1,54 +1,73 @@
// Copyright (C) 2003-2008 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 _BLOB_H #ifndef _BLOB_H
#define _BLOB_H #define _BLOB_H
/* // BLOB
Code not big-endian safe.
BLOB // Blobs in Dolphin are read only Binary Large OBjects. For example, a typical DVD image.
// Often, you may want to store these things in a highly compressed format, but still
// allow random access. Or you may store them on an odd device, like raw on a DVD.
Blobs are Binary Large OBjects. For example, a typical DVD image. // Always read your BLOBs using an interface returned by CreateBlobReader(). It will
Often, you may want to store these things in a highly compressed format, but still // detect whether the file is a compressed blob, or just a big hunk of data, and
allow random access. // automatically do the right thing.
Always read your BLOBs using an interface returned by CreateBlobReader(). It will
detect whether the file is a compressed blob, or just a big hunk of data, and
automatically do the right thing.
To create new BLOBs, use CompressFileToBlob.
Right now caching of decompressed chunks doesn't work, so it's a bit slow.
*/
#include "Common.h" #include "Common.h"
namespace DiscIO namespace DiscIO
{ {
class IBlobReader class IBlobReader
{ {
public: public:
virtual ~IBlobReader() {}
virtual ~IBlobReader() {} virtual u64 GetRawSize() const = 0;
virtual u64 GetDataSize() const = 0;
virtual bool Read(u64 offset, u64 size, u8* out_ptr) = 0;
protected:
virtual u64 GetRawSize() const = 0; IBlobReader() {}
virtual u64 GetDataSize() const = 0;
virtual bool Read(u64 offset, u64 size, u8* out_ptr) = 0;
protected:
IBlobReader() {}
private:
IBlobReader(const IBlobReader& /*other*/) {}
}; };
IBlobReader* CreateBlobReader(const char* filename); // Provides caching and split-operation-to-block-operations facilities.
bool IsCompressedBlob(const char* filename); // Used for compressed blob reading and direct drive reading.
class SectorReader : public IBlobReader
{
private:
virtual void GetBlock(u64 block_num, u8 *out) = 0;
enum { CACHE_SIZE = 32 };
int m_blocksize;
u8* cache[CACHE_SIZE];
u64 cache_tags[CACHE_SIZE];
int cache_age[CACHE_SIZE];
protected:
void SetSectorSize(int blocksize);
public:
~SectorReader();
const u8 *GetBlockData(u64 block_num);
bool Read(u64 offset, u64 size, u8* out_ptr);
};
// Factory function - examines the path to choose the right type of IBlobReader, and returns one.
IBlobReader* CreateBlobReader(const char* filename);
typedef void (*CompressCB)(const char* text, float percent, void* arg); typedef void (*CompressCB)(const char* text, float percent, void* arg);
@ -56,7 +75,8 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type =
CompressCB callback = 0, void* arg = 0); CompressCB callback = 0, void* arg = 0);
bool DecompressBlobToFile(const char* infile, const char* outfile, bool DecompressBlobToFile(const char* infile, const char* outfile,
CompressCB callback = 0, void* arg = 0); CompressCB callback = 0, void* arg = 0);
}
} // namespace
#endif #endif

339
Source/Core/DiscIO/Src/CompressedBlob.cpp Normal file
View File

@ -0,0 +1,339 @@
// Copyright (C) 2003-2008 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"
#ifdef _WIN32
#include <io.h>
#include <windows.h>
#else
#include <unistd.h>
#endif
#include "Common.h"
#include "CompressedBlob.h"
#include "Hash.h"
#ifdef _WIN32
#include "../../../../Externals/zlib/zlib.h"
#else
// TODO: Include generic zlib.h
#include "../../../../Externals/zlib/zlib.h"
#endif
#ifdef _WIN32
#define fseek _fseeki64
#endif
namespace DiscIO
{
CompressedBlobReader::CompressedBlobReader(const char *filename)
{
file = fopen(filename, "rb");
fseek(file, 0, SEEK_END);
file_size = ftell(file);
fseek(file, 0, SEEK_SET);
fread(&header, sizeof(CompressedBlobHeader), 1, file);
SetSectorSize(header.block_size);
// cache block pointers and hashes
block_pointers = new u64[header.num_blocks];
fread(block_pointers, sizeof(u64), header.num_blocks, file);
hashes = new u32[header.num_blocks];
fread(hashes, sizeof(u32), header.num_blocks, file);
data_offset = (sizeof(CompressedBlobHeader))
+ (sizeof(u64)) * header.num_blocks // skip block pointers
+ (sizeof(u32)) * header.num_blocks; // skip hashes
// A compressed block is never ever longer than a decompressed block, so just header.block_size should be fine.
// I still add some safety margin.
zlib_buffer_size = header.block_size + 64;
zlib_buffer = new u8[zlib_buffer_size];
memset(zlib_buffer, 0, zlib_buffer_size);
}
CompressedBlobReader* CompressedBlobReader::Create(const char* filename)
{
if (IsCompressedBlob(filename))
return new CompressedBlobReader(filename);
else
return 0;
}
CompressedBlobReader::~CompressedBlobReader()
{
delete [] zlib_buffer;
delete [] block_pointers;
delete [] hashes;
fclose(file);
file = 0;
}
// IMPORTANT: Calling this function invalidates all earlier pointers gotten from this function.
u64 CompressedBlobReader::GetBlockCompressedSize(u64 block_num) const
{
u64 start = block_pointers[block_num];
if (block_num < header.num_blocks - 1)
return block_pointers[block_num + 1] - start;
else if (block_num == header.num_blocks - 1)
return header.compressed_data_size - start;
else
PanicAlert("GetBlockCompressedSize - illegal block number %i", (int)block_num);
return 0;
}
void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr)
{
bool uncompressed = false;
u32 comp_block_size = (u32)GetBlockCompressedSize(block_num);
u64 offset = block_pointers[block_num] + data_offset;
if (offset & (1ULL << 63))
{
if (comp_block_size != header.block_size)
PanicAlert("Uncompressed block with wrong size");
uncompressed = true;
offset &= ~(1ULL << 63);
}
// clear unused part of zlib buffer. maybe this can be deleted when it works fully.
memset(zlib_buffer + comp_block_size, 0, zlib_buffer_size - comp_block_size);
fseek(file, offset, SEEK_SET);
fread(zlib_buffer, 1, comp_block_size, file);
u8* source = zlib_buffer;
u8* dest = out_ptr;
// First, check hash.
u32 block_hash = HashAdler32(source, comp_block_size);
if (block_hash != hashes[block_num])
PanicAlert("Hash of block %i is %08x instead of %08x. Your ISO is corrupt.",
block_num, block_hash, hashes[block_num]);
if (uncompressed)
{
memcpy(dest, source, comp_block_size);
}
else
{
z_stream z;
memset(&z, 0, sizeof(z));
z.next_in = source;
z.avail_in = comp_block_size;
if (z.avail_in > header.block_size)
{
PanicAlert("We have a problem");
}
z.next_out = dest;
z.avail_out = header.block_size;
inflateInit(&z);
int status = inflate(&z, Z_FULL_FLUSH);
u32 uncomp_size = header.block_size - z.avail_out;
if (status != Z_STREAM_END)
{
// this seem to fire wrongly from time to time
// to be sure, don't use compressed isos :P
PanicAlert("Failure reading block %i - out of data and not at end.", block_num);
}
inflateEnd(&z);
if (uncomp_size != header.block_size)
PanicAlert("Wrong block size");
}
}
bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
int block_size, CompressCB callback, void* arg)
{
if (IsCompressedBlob(infile))
{
PanicAlert("%s is already compressed! Cannot compress it further.", infile);
return false;
}
FILE* inf = fopen(infile, "rb");
if (!inf)
return false;
FILE* f = fopen(outfile, "wb");
if (!f)
return false;
callback("Files opened, ready to compress.", 0, arg);
fseek(inf, 0, SEEK_END);
int insize = ftell(inf);
fseek(inf, 0, SEEK_SET);
CompressedBlobHeader header;
header.magic_cookie = kBlobCookie;
header.sub_type = sub_type;
header.block_size = block_size;
header.data_size = insize;
// round upwards!
header.num_blocks = (u32)((header.data_size + (block_size - 1)) / block_size);
u64* offsets = new u64[header.num_blocks];
u32* hashes = new u32[header.num_blocks];
u8* out_buf = new u8[block_size];
u8* in_buf = new u8[block_size];
// seek past the header (we will write it at the end)
fseek(f, sizeof(CompressedBlobHeader), SEEK_CUR);
// seek past the offset and hash tables (we will write them at the end)
fseek(f, (sizeof(u64) + sizeof(u32)) * header.num_blocks, SEEK_CUR);
// Now we are ready to write compressed data!
u64 position = 0;
int num_compressed = 0;
int num_stored = 0;
for (u32 i = 0; i < header.num_blocks; i++)
{
if (i % (header.num_blocks / 1000) == 0)
{
u64 inpos = ftell(inf);
int ratio = 0;
if (inpos != 0)
ratio = (int)(100 * position / inpos);
char temp[512];
sprintf(temp, "%i of %i blocks. compression ratio %i%%", i, header.num_blocks, ratio);
callback(temp, (float)i / (float)header.num_blocks, arg);
}
offsets[i] = position;
// u64 start = i * header.block_size;
// u64 size = header.block_size;
memset(in_buf, 0, header.block_size);
fread(in_buf, header.block_size, 1, inf);
z_stream z;
memset(&z, 0, sizeof(z));
z.zalloc = Z_NULL;
z.zfree = Z_NULL;
z.opaque = Z_NULL;
z.next_in = in_buf;
z.avail_in = header.block_size;
z.next_out = out_buf;
z.avail_out = block_size;
int retval = deflateInit(&z, 9);
if (retval != Z_OK)
{
PanicAlert("Deflate failed");
goto cleanup;
}
int status = deflate(&z, Z_FINISH);
int comp_size = block_size - z.avail_out;
if ((status != Z_STREAM_END) || (z.avail_out < 10))
{
//PanicAlert("%i %i Store %i", i*block_size, position, comp_size);
// let's store uncompressed
offsets[i] |= 0x8000000000000000ULL;
fwrite(in_buf, block_size, 1, f);
hashes[i] = HashAdler32(in_buf, block_size);
position += block_size;
num_stored++;
}
else
{
// let's store compressed
//PanicAlert("Comp %i to %i", block_size, comp_size);
fwrite(out_buf, comp_size, 1, f);
hashes[i] = HashAdler32(out_buf, comp_size);
position += comp_size;
num_compressed++;
}
deflateEnd(&z);
}
header.compressed_data_size = position;
// Okay, go back and fill in headers
fseek(f, 0, SEEK_SET);
fwrite(&header, sizeof(header), 1, f);
fwrite(offsets, sizeof(u64), header.num_blocks, f);
fwrite(hashes, sizeof(u32), header.num_blocks, f);
cleanup:
// Cleanup
delete[] in_buf;
delete[] out_buf;
delete[] offsets;
fclose(f);
fclose(inf);
callback("Done compressing disc image.", 1.0f, arg);
return true;
}
bool DecompressBlobToFile(const char* infile, const char* outfile, CompressCB callback, void* arg)
{
if (!IsCompressedBlob(infile))
{
PanicAlert("File not compressed");
return false;
}
CompressedBlobReader* reader = CompressedBlobReader::Create(infile);
if (!reader) return false;
FILE* f = fopen(outfile, "wb");
const CompressedBlobHeader &header = reader->GetHeader();
u8* buffer = new u8[header.block_size];
for (u64 i = 0; i < header.num_blocks; i++)
{
if (i % (header.num_blocks / 100) == 0)
{
callback("Unpacking", (float)i / (float)header.num_blocks, arg);
}
reader->Read(i * header.block_size, header.block_size, buffer);
fwrite(buffer, header.block_size, 1, f);
}
delete reader;
delete[] buffer;
#ifdef _WIN32
// ector: _chsize sucks, not 64-bit safe
// F|RES: changed to _chsize_s. i think it is 64-bit safe
_chsize_s(_fileno(f), (long)header.data_size);
#else
ftruncate(fileno(f), header.data_size);
#endif
fclose(f);
return true;
}
bool IsCompressedBlob(const char* filename)
{
FILE* f = fopen(filename, "rb");
if (!f)
return false;
CompressedBlobHeader header;
fread(&header, sizeof(header), 1, f);
fclose(f);
return header.magic_cookie == kBlobCookie;
}
} // namespace

83
Source/Core/DiscIO/Src/CompressedBlob.h Normal file
View File

@ -0,0 +1,83 @@
// Copyright (C) 2003-2008 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/
// WARNING Code not big-endian safe.
// To create new compressed BLOBs, use CompressFileToBlob.
// File format
// * Header
// * [Block Pointers interleaved with block hashes (hash of decompressed data)]
// * [Data]
#ifndef COMPRESSED_BLOB_H_
#define COMPRESSED_BLOB_H_
#include <stdio.h>
#include "Blob.h"
namespace DiscIO
{
bool IsCompressedBlob(const char* filename);
const u32 kBlobCookie = 0xB10BC001;
// A blob file structure:
// BlobHeader
// u64 offsetsToBlocks[n], top bit specifies whether the block is compressed, or not.
// compressed data
// Blocks that won't compress to less than 97% of the original size are stored as-is.
struct CompressedBlobHeader // 32 bytes
{
u32 magic_cookie; //0xB10BB10B
u32 sub_type; // gc image, whatever
u64 compressed_data_size;
u64 data_size;
u32 block_size;
u32 num_blocks;
};
class CompressedBlobReader : public SectorReader
{
private:
CompressedBlobHeader header;
u64 *block_pointers;
u32 *hashes;
int data_offset;
FILE *file;
u64 file_size;
u8 *zlib_buffer;
int zlib_buffer_size;
CompressedBlobReader(const char *filename);
public:
static CompressedBlobReader* Create(const char *filename);
~CompressedBlobReader();
const CompressedBlobHeader &GetHeader() const { return header; }
u64 GetDataSize() const { return header.data_size; }
u64 GetRawSize() const { return file_size; }
u64 GetBlockCompressedSize(u64 block_num) const;
void GetBlock(u64 block_num, u8 *out_ptr);
};
} // namespace
#endif // COMPRESSED_BLOB_H_

25
Source/Core/DiscIO/Src/DriveBlob.cpp Normal file
View File

@ -0,0 +1,25 @@
// Copyright (C) 2003-2008 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 "DriveBlob.h"
namespace DiscIO
{
} // namespace

60
Source/Core/DiscIO/Src/DriveBlob.h Normal file
View File

@ -0,0 +1,60 @@
// Copyright (C) 2003-2008 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 _DRIVE_BLOB_H
#define _DRIVE_BLOB_H
#include "Blob.h"
#ifdef _WIN32
#include <windows.h>
#endif
namespace DiscIO
{
#ifdef _WIN32
class DriveReader : public SectorReader
{
HANDLE hDisc;
private:
DriveReader(const char *drive) {
/*
char path[MAX_PATH];
strncpy(path, drive, 3);
path[2] = 0;
sprintf(path, "\\\\.\\%s", drive);
hDisc = CreateFile(path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
SetSectorSize(2048);
*/
}
public:
static DriveReader *Create(const char *drive) {
return NULL;// new DriveReader(drive);
}
};
#endif
} // namespace
#endif // _DRIVE_BLOB_H

121
Source/Core/DiscIO/Src/FileBlob.cpp Normal file
View File

@ -0,0 +1,121 @@
// Copyright (C) 2003-2008 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 "Blob.h"
#include "FileBlob.h"
#ifdef _WIN32
#include <windows.h>
namespace DiscIO
{
PlainFileReader::PlainFileReader(HANDLE hFile_)
{
hFile = hFile_;
DWORD size_low, size_high;
size_low = GetFileSize(hFile, &size_high);
size = ((u64)size_low) | ((u64)size_high << 32);
}
PlainFileReader* PlainFileReader::Create(const char* filename)
{
HANDLE hFile = CreateFile(
filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_RANDOM_ACCESS, NULL);
if (hFile != INVALID_HANDLE_VALUE)
return new PlainFileReader(hFile);
else
return 0;
}
PlainFileReader::~PlainFileReader()
{
CloseHandle(hFile);
}
bool PlainFileReader::Read(u64 offset, u64 size, u8* out_ptr)
{
LONG offset_high = (LONG)(offset >> 32);
SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN);
if (size >= 0x100000000ULL)
return false; // WTF, does windows really have this limitation?
DWORD unused;
if (!ReadFile(hFile, out_ptr, DWORD(size & 0xFFFFFFFF), &unused, NULL))
return false;
else
return true;
}
} // namespace
#else // linux, 64-bit. We do not yet care about linux32
namespace DiscIO
{
class PlainFileReader : public IBlobReader
{
FILE* file_;
s64 size;
private:
PlainFileReader(FILE* file__)
{
file_ = file__;
#if 0
fseek64(file_, 0, SEEK_END);
#else
fseek(file_, 0, SEEK_END); // I don't have fseek64 with gcc 4.3
#endif
size = ftell(file_);
fseek(file_, 0, SEEK_SET);
}
public:
static PlainFileReader* Create(const char* filename)
{
FILE* file_ = fopen(filename, "rb");
if (file_)
{
return new PlainFileReader(file_);
}
return 0;
}
~PlainFileReader()
{
fclose(file_);
}
u64 GetDataSize() const { return(size); }
u64 GetRawSize() const { return(size); }
bool Read(u64 offset, u64 nbytes, u8* out_ptr)
{
fseek(file_, offset, SEEK_SET);
fread(out_ptr, nbytes, 1, file_);
return true;
}
};
} // namespace
#endif

48
Source/Core/DiscIO/Src/FileBlob.h Normal file
View File

@ -0,0 +1,48 @@
// Copyright (C) 2003-2008 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 _FILE_BLOB_H
#define _FILE_BLOB_H
#include "Blob.h"
#ifdef _WIN32
#include <windows.h>
#endif
namespace DiscIO
{
class PlainFileReader : public IBlobReader
{
#ifdef _WIN32
HANDLE hFile;
s64 size;
PlainFileReader(HANDLE hFile_);
#endif
public:
static PlainFileReader* Create(const char* filename);
~PlainFileReader();
u64 GetDataSize() const { return size; }
u64 GetRawSize() const { return size; }
bool Read(u64 offset, u64 size, u8* out_ptr);
};
} // namespace
#endif // _FILE_BLOB_H

3
Source/Core/DiscIO/Src/SConscript
View File

@ -4,6 +4,9 @@ files = ["BannerLoader.cpp",
"BannerLoaderGC.cpp", "BannerLoaderGC.cpp",
"BannerLoaderWii.cpp", "BannerLoaderWii.cpp",
"Blob.cpp", "Blob.cpp",
"CompressedBlob.cpp",
"DriveBlob.cpp",
"FileBlob.cpp",
"FileHandlerARC.cpp", "FileHandlerARC.cpp",
"Filesystem.cpp", "Filesystem.cpp",
"FileSystemGCWii.cpp", "FileSystemGCWii.cpp",

1
Source/Core/DiscIO/Src/Volume.h
View File

@ -14,6 +14,7 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#ifndef _VOLUME_H #ifndef _VOLUME_H
#define _VOLUME_H #define _VOLUME_H

82
Source/Core/DiscIO/Src/VolumeCreator.cpp
View File

@ -27,7 +27,6 @@
#include "Hash.h" #include "Hash.h"
namespace DiscIO namespace DiscIO
{ {
enum EDiscType enum EDiscType
@ -37,33 +36,29 @@ enum EDiscType
DISC_TYPE_WII_CONTAINER, DISC_TYPE_WII_CONTAINER,
DISC_TYPE_GC DISC_TYPE_GC
}; };
#ifndef _WIN32 #ifndef _WIN32
struct SPartition struct SPartition
{ {
u64 Offset; u64 Offset;
u32 Type; u32 Type;
}; //gcc 4.3 cries if it's local }; //gcc 4.3 cries if it's local
#endif #endif
class CBlobBigEndianReader class CBlobBigEndianReader
{ {
public: public:
CBlobBigEndianReader(IBlobReader& _rReader) : m_rReader(_rReader) {}
CBlobBigEndianReader(IBlobReader& _rReader) u32 Read32(u64 _Offset)
: m_rReader(_rReader) {
{} u32 Temp;
m_rReader.Read(_Offset, 4, (u8*)&Temp);
return(Common::swap32(Temp));
}
private:
u32 Read32(u64 _Offset) IBlobReader& m_rReader;
{
u32 Temp;
m_rReader.Read(_Offset, 4, (u8*)&Temp);
return(Common::swap32(Temp));
}
private:
IBlobReader& m_rReader;
}; };
unsigned char g_MasterKey[16]; unsigned char g_MasterKey[16];
@ -72,15 +67,12 @@ bool g_MasterKeyInit = false;
IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType); IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType);
EDiscType GetDiscType(IBlobReader& _rReader); EDiscType GetDiscType(IBlobReader& _rReader);
IVolume* CreateVolumeFromFilename(const std::string& _rFilename) IVolume* CreateVolumeFromFilename(const std::string& _rFilename)
{ {
IBlobReader* pReader = CreateBlobReader(_rFilename.c_str()); IBlobReader* pReader = CreateBlobReader(_rFilename.c_str());
if (pReader == NULL) if (pReader == NULL)
{ return NULL;
return(NULL);
}
switch (GetDiscType(*pReader)) switch (GetDiscType(*pReader))
{ {
@ -104,53 +96,40 @@ IVolume* CreateVolumeFromFilename(const std::string& _rFilename)
case DISC_TYPE_UNK: case DISC_TYPE_UNK:
default: default:
delete pReader; delete pReader;
return(NULL); return NULL;
} }
// unreachable code // unreachable code
return(NULL); return NULL;
} }
bool IsVolumeWiiDisc(const IVolume& _rVolume) bool IsVolumeWiiDisc(const IVolume& _rVolume)
{ {
u32 MagicWord = 0; u32 MagicWord = 0;
_rVolume.Read(0x18, 4, (u8*)&MagicWord); _rVolume.Read(0x18, 4, (u8*)&MagicWord);
if (Common::swap32(MagicWord) == 0x5D1C9EA3) return (Common::swap32(MagicWord) == 0x5D1C9EA3);
{
return(true);
}
return(false);
} }
IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType) IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType)
{ {
if (!g_MasterKeyInit) if (!g_MasterKeyInit)
{ {
FILE* pT = fopen("WII/masterkey.bin", "rb"); FILE* pT = fopen("WII/masterkey.bin", "rb");
if (pT == NULL) if (pT == NULL)
{ {
PanicAlert("Can't open WII/masterkey.bin"); PanicAlert("Can't open WII/masterkey.bin");
return(NULL); return NULL;
} }
fread(g_MasterKey, 16, 1, pT); fread(g_MasterKey, 16, 1, pT);
fclose(pT); fclose(pT);
const u32 keyhash = 0x4bc30936; const u32 keyhash = 0x4bc30936;
u32 hash = HashAdler32(g_MasterKey, 16); u32 hash = HashAdler32(g_MasterKey, 16);
if (hash != keyhash) if (hash != keyhash)
{
PanicAlert("Your Wii disc decryption key is bad.", keyhash, hash); PanicAlert("Your Wii disc decryption key is bad.", keyhash, hash);
}
else else
{
g_MasterKeyInit = true; g_MasterKeyInit = true;
}
} }
CBlobBigEndianReader Reader(_rReader); CBlobBigEndianReader Reader(_rReader);
@ -164,7 +143,7 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType)
u32 Type; u32 Type;
}; };
#endif #endif
std::vector<SPartition>PartitionsVec; std::vector<SPartition> PartitionsVec;
// read all partitions // read all partitions
for (u32 i = 0; i < numPartitions; i++) for (u32 i = 0; i < numPartitions; i++)
@ -195,14 +174,13 @@ IVolume* CreateVolumeFromCryptedWiiImage(IBlobReader& _rReader, u32 _VolumeType)
u8 VolumeKey[16]; u8 VolumeKey[16];
AES_cbc_encrypt(SubKey, VolumeKey, 16, &AES_KEY, IV, AES_DECRYPT); AES_cbc_encrypt(SubKey, VolumeKey, 16, &AES_KEY, IV, AES_DECRYPT);
return(new CVolumeWiiCrypted(&_rReader, rPartition.Offset + 0x20000, VolumeKey)); return new CVolumeWiiCrypted(&_rReader, rPartition.Offset + 0x20000, VolumeKey);
} }
} }
return(NULL); return NULL;
} }
EDiscType GetDiscType(IBlobReader& _rReader) EDiscType GetDiscType(IBlobReader& _rReader)
{ {
CBlobBigEndianReader Reader(_rReader); CBlobBigEndianReader Reader(_rReader);
@ -214,13 +192,9 @@ EDiscType GetDiscType(IBlobReader& _rReader)
if (MagicWord == 0x5D1C9EA3) if (MagicWord == 0x5D1C9EA3)
{ {
if (Reader.Read32(0x60) != 0) if (Reader.Read32(0x60) != 0)
{
return(DISC_TYPE_WII); return(DISC_TYPE_WII);
}
else else
{
return(DISC_TYPE_WII_CONTAINER); return(DISC_TYPE_WII_CONTAINER);
}
} }
} }
@ -229,12 +203,10 @@ EDiscType GetDiscType(IBlobReader& _rReader)
u32 MagicWord = Reader.Read32(0x1C); u32 MagicWord = Reader.Read32(0x1C);
if (MagicWord == 0xC2339F3D) if (MagicWord == 0xC2339F3D)
{
return(DISC_TYPE_GC); return(DISC_TYPE_GC);
}
} }
return(DISC_TYPE_UNK); return DISC_TYPE_UNK;
} }
} // namespace
} // namespace

4
Source/Core/DolphinWX/DolphinWX.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="DolphinWX" Name="DolphinWX"
ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}" ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
RootNamespace="DolphinWX" RootNamespace="DolphinWX"
@ -95,6 +95,8 @@
AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib;..\..\..\Externals\LZO\win32\$(ConfigurationName)" AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib;..\..\..\Externals\LZO\win32\$(ConfigurationName)"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
GenerateMapFile="true"
MapFileName="$(TargetDir)linkermap.map"
SubSystem="2" SubSystem="2"
BaseAddress="0x00400000" BaseAddress="0x00400000"
TargetMachine="1" TargetMachine="1"

15
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -368,9 +368,9 @@ void CGameListCtrl::ScanForISOs()
CISOFile ISOFile(rFilenames[i]); CISOFile ISOFile(rFilenames[i]);
if (ISOFile.IsValid()) if (ISOFile.IsValid())
{
m_ISOFiles.push_back(ISOFile); m_ISOFiles.push_back(ISOFile);
} else
PanicAlert("Invalid ISO file %s", rFilenames[i].c_str());
} }
} }
std::sort(m_ISOFiles.begin(), m_ISOFiles.end()); std::sort(m_ISOFiles.begin(), m_ISOFiles.end());
@ -475,11 +475,10 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
//popupMenu.Append(IDM_FILESYSTEMVIEWER, wxString::FromAscii("Open in ISO viewer/dumper")); //popupMenu.Append(IDM_FILESYSTEMVIEWER, wxString::FromAscii("Open in ISO viewer/dumper"));
// F|RES: compression doesn't work and will be rewritten ... if it is fixed the gui is ready :D // F|RES: compression doesn't work and will be rewritten ... if it is fixed the gui is ready :D
/*if (selected_iso->IsCompressed()) if (selected_iso->IsCompressed())
popupMenu.Append(IDM_COMPRESSGCM, wxString::FromAscii("Decompress ISO... (UNTESTED)")); popupMenu.Append(IDM_COMPRESSGCM, wxString::FromAscii("Decompress ISO... (UNTESTED)"));
else else
popupMenu.Append(IDM_COMPRESSGCM, wxString::FromAscii("Compress ISO... (UNTESTED)")); popupMenu.Append(IDM_COMPRESSGCM, wxString::FromAscii("Compress ISO... (UNTESTED)"));
*/
PopupMenu(&popupMenu); PopupMenu(&popupMenu);
} }
@ -552,7 +551,7 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) {
if (iso->IsCompressed()) if (iso->IsCompressed())
{ {
path = wxFileSelector( path = wxFileSelector(
_T("Select the file to save"), _T("Save decompressed ISO"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -571,7 +570,7 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) {
else else
{ {
path = wxFileSelector( path = wxFileSelector(
_T("Select the file to save"), _T("Save compressed ISO"),
wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString, wxEmptyString,
wxString::Format wxString::Format
( (
@ -588,8 +587,8 @@ void CGameListCtrl::OnCompressGCM(wxCommandEvent& WXUNUSED (event)) {
} }
} }
wxProgressDialog dialog(_T("Scanning for ISOs"), wxProgressDialog dialog(iso->IsCompressed() ? _T("Decompressing ISO") : _T("Compressing ISO"),
_T("Scanning..."), _T("Working..."),
1000, // range 1000, // range
this, // parent this, // parent
wxPD_APP_MODAL | wxPD_APP_MODAL |

2
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -25,7 +25,7 @@
#include "Filesystem.h" #include "Filesystem.h"
#include "BannerLoader.h" #include "BannerLoader.h"
#include "FileSearch.h" #include "FileSearch.h"
#include "Blob.h" #include "CompressedBlob.h"
#define DVD_BANNER_WIDTH 96 #define DVD_BANNER_WIDTH 96
#define DVD_BANNER_HEIGHT 32 #define DVD_BANNER_HEIGHT 32

51
Source/Dolphin.sln
View File

@ -2,16 +2,16 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcproj", "{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcproj", "{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}
{3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63}
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimple", "Plugins\Plugin_PadSimple\Plugin_PadSimple.vcproj", "{9A183B48-ECC2-4121-876A-9B3793686073}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimple", "Plugins\Plugin_PadSimple\Plugin_PadSimple.vcproj", "{9A183B48-ECC2-4121-876A-9B3793686073}"
@ -29,28 +29,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_LLE", "Plugins\P
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcproj", "{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcproj", "{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}"
ProjectSection(ProjectDependencies) = postProject
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcproj", "{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcproj", "{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcproj", "{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcproj", "{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinWX", "Core\DolphinWX\DolphinWX.vcproj", "{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinWX", "Core\DolphinWX\DolphinWX.vcproj", "{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63}
{33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF}
{3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}
{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcproj", "{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcproj", "{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}"
@ -59,11 +62,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wx
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebuggerWX", "Core\DebuggerWX\DebuggerWX.vcproj", "{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DebuggerWX", "Core\DebuggerWX\DebuggerWX.vcproj", "{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcproj", "{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcproj", "{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"
@ -75,9 +78,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadDX9", "Plugins\Pl
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL", "Plugins\Plugin_nJoy_SDL\Plugin_nJoy_SDL.vcproj", "{521498BE-6089-4780-8223-E67C22F4E068}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL", "Plugins\Plugin_nJoy_SDL\Plugin_nJoy_SDL.vcproj", "{521498BE-6089-4780-8223-E67C22F4E068}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_HLE", "Plugins\Plugin_DSP_HLE\Plugin_DSP_HLE.vcproj", "{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_HLE", "Plugins\Plugin_DSP_HLE\Plugin_DSP_HLE.vcproj", "{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}"
@ -87,11 +90,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_HLE", "Plugins\P
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcproj", "{33546D62-7F34-4EA6-A88E-D538B36E16BF}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcproj", "{33546D62-7F34-4EA6-A88E-D538B36E16BF}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote_Test", "Plugins\Plugin_Wiimote_Test\Plugin_Wiimote_Test.vcproj", "{8D612734-FAA5-4B8A-804F-4DEA2367D495}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote", "Plugins\Plugin_Wiimote_Test\Plugin_Wiimote_Test.vcproj", "{8D612734-FAA5-4B8A-804F-4DEA2367D495}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
EndProjectSection EndProjectSection
EndProject EndProject
Global Global

7
Source/Plugins/Plugin_DSP_LLE/Src/main.cpp
View File

@ -337,3 +337,10 @@ void DSP_SendAIBuffer(unsigned int address, int sample_rate)
g_LastDMAAddress = address; g_LastDMAAddress = address;
g_LastDMASize = 32; g_LastDMASize = 32;
} }
void __Log(int, const char *fmt, ...)
{
//DebugLog(fmt);
}