archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 10:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #17 from O1L/master

Browse source 
PKG Installer
This commit is contained in:
Alexandro Sánchez Bach 2013-11-14 03:34:28 -08:00
commit 45e58d882e
15 changed files with 2275 additions and 885 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3.sln
View file

@ -95,6 +95,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scetool", "scetool", "{AB33
scetool\zlib.h = scetool\zlib.h scetool\zlib.h = scetool\zlib.h
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unpkg", "unpkg", "{9F2D2094-BA46-4456-8C45-FD9EC108F1EE}"
ProjectSection(SolutionItems) = preProject
unpkg\oddkeys.h = unpkg\oddkeys.h
unpkg\ps3_common.h = unpkg\ps3_common.h
unpkg\unpkg.c = unpkg\unpkg.c
unpkg\unpkg.h = unpkg\unpkg.h
EndProjectSection
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32

72
rpcs3/Emu/SysCalls/Modules/cellPhotoDecodeUtil.cpp Normal file
View file

@ -0,0 +1,72 @@
#include "stdafx.h"
#include "Emu/SysCalls/SysCalls.h"
#include "Emu/SysCalls/SC_FUNC.h"
void cellPhotoDecodeUtil_init ();
Module cellPhotoDecodeUtil ("cellPhotoDecodeUtil", cellPhotoDecodeUtil_init);
//Error codes
enum
{
CELL_PHOTO_DECODE_RET_OK = 0,
CELL_PHOTO_DECODE_RET_CANCEL = 1,
CELL_PHOTO_DECODE_ERROR_BUSY = 0x8002c901,
CELL_PHOTO_DECODE_ERROR_INTERNAL = 0x8002c902,
CELL_PHOTO_DECODE_ERROR_PARAM = 0x8002c903,
CELL_PHOTO_DECODE_ERROR_ACCESS_ERROR = 0x8002c904,
CELL_PHOTO_DECODE_ERROR_INITIALIZE = 0x8002c905,
CELL_PHOTO_DECODE_ERROR_DECODE = 0x8002c906,
};
//datatypes
struct CellPhotoDecodeSetParam
{
void *dstBuffer;
u16 width;
u16 height;
void *reserved1;
void *reserved2;
};
struct CellPhotoDecodeReturnParam
{
u16 width;
u16 height;
void *reserved1;
void *reserved2;
};
int cellPhotoDecodeInitialize () //unsigned int version, sys_memory_container_t container1, sys_memory_container_t container2, CellPhotoDecodeFinishCallback funcFinish, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoDecodeUtil);
return CELL_PHOTO_DECODE_RET_OK;
}
int cellPhotoDecodeInitialize2 () //unsigned int version, sys_memory_container_t container2, CellPhotoDecodeFinishCallback funcFinish, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoDecodeUtil);
return CELL_PHOTO_DECODE_RET_OK;
}
int cellPhotoDecodeFinalize () //CellPhotoDecodeFinishCallback funcFinish, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoDecodeUtil);
return CELL_PHOTO_DECODE_RET_OK;
}
int cellPhotoDecodeFromFile () //const char *srcHddDir, const char *srcHddFile, CellPhotoDecodeSetParam *set_param, CellPhotoDecodeReturnParam *return_param
{
UNIMPLEMENTED_FUNC(cellPhotoDecodeUtil);
return CELL_PHOTO_DECODE_RET_OK;
}
void ( *CellPhotoDecodeFinishCallback) (); //int result, void *userdata
void cellPhotoDecodeUtil_init ()
{
cellPhotoDecodeUtil.AddFunc (0x0f424ecb, cellPhotoDecodeInitialize2);
cellPhotoDecodeUtil.AddFunc (0x28b22e44, cellPhotoDecodeFromFile);
cellPhotoDecodeUtil.AddFunc (0x596f0a56, cellPhotoDecodeInitialize);
cellPhotoDecodeUtil.AddFunc (0xad7d8f38, cellPhotoDecodeFinalize);
}

68
rpcs3/Emu/SysCalls/Modules/cellPhotoImportUtil.cpp Normal file
View file

@ -0,0 +1,68 @@
#include "stdafx.h"
#include "Emu/SysCalls/SysCalls.h"
#include "Emu/SysCalls/SC_FUNC.h"
void cellPhotoImportUtil_init ();
Module cellPhotoImportUtil ("cellPhotoImportUtil", cellPhotoImportUtil_init);
//Error codes
enum
{
CELL_PHOTO_IMPORT_RET_OK = 0,
CELL_PHOTO_IMPORT_RET_CANCEL = 1,
CELL_PHOTO_IMPORT_ERROR_BUSY = 0x8002c701,
CELL_PHOTO_IMPORT_ERROR_INTERNAL = 0x8002c702,
CELL_PHOTO_IMPORT_ERROR_PARAM = 0x8002c703,
CELL_PHOTO_IMPORT_ERROR_ACCESS_ERROR = 0x8002c704,
CELL_PHOTO_IMPORT_ERROR_COPY = 0x8002c705,
CELL_PHOTO_IMPORT_ERROR_INITIALIZE = 0x8002c706,
};
//datatyps
struct CellPhotoImportFileDataSub
{
int width;
int height;
//CellPhotoImportFormatType format;
//CellPhotoImportTexRot rotate;
};
struct CellPhotoImportFileData
{
char dstFileName; //[CELL_FS_MAX_FS_FILE_NAME_LENGTH];
char photo_title; //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3];
char game_title; //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE];
char game_comment; //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE];
CellPhotoImportFileDataSub* data_sub;
void *reserved;
};
struct CellPhotoImportSetParam
{
unsigned int fileSizeMax;
void *reserved1;
void *reserved2;
};
//import API
int cellPhotoImport () //unsigned int version, const char *dstHddPath, CellPhotoImportSetParam *param, sys_memory_container_t container, CellPhotoImportFinishCallback funcFinish, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoImportUtil);
return CELL_PHOTO_IMPORT_RET_OK;
}
int cellPhotoImport2 () //unsigned int version, const char *dstHddPath, CellPhotoImportSetParam *param, CellPhotoImportFinishCallback funcFinish, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoImportUtil);
return CELL_PHOTO_IMPORT_RET_OK;
}
void cellPhotoImportUtil_init ()
{
cellPhotoImportUtil.AddFunc (0x0783bce0, cellPhotoImport);
cellPhotoImportUtil.AddFunc (0x1ab8df55, cellPhotoImport2);
}

90
rpcs3/Emu/SysCalls/Modules/cellPhotoUtility.cpp Normal file
View file

@ -0,0 +1,90 @@
#include "stdafx.h"
#include "Emu/SysCalls/SysCalls.h"
#include "Emu/SysCalls/SC_FUNC.h"
void cellPhotoUtility_init ();
Module cellPhotoUtility ("cellPhotoUtility", cellPhotoUtility_init);
//Error codes
enum
{
CELL_PHOTO_EXPORT_UTIL_RET_OK = 0,
CELL_PHOTO_EXPORT_UTIL_RET_CANCEL = 1,
CELL_PHOTO_EXPORT_UTIL_ERROR_BUSY = 0x8002c201,
CELL_PHOTO_EXPORT_UTIL_ERROR_INTERNAL = 0x8002c202,
CELL_PHOTO_EXPORT_UTIL_ERROR_PARAM = 0x8002c203,
CELL_PHOTO_EXPORT_UTIL_ERROR_ACCESS_ERROR = 0x8002c204,
CELL_PHOTO_EXPORT_UTIL_ERROR_DB_INTERNAL = 0x8002c205,
CELL_PHOTO_EXPORT_UTIL_ERROR_DB_REGIST = 0x8002c206,
CELL_PHOTO_EXPORT_UTIL_ERROR_SET_META = 0x8002c207,
CELL_PHOTO_EXPORT_UTIL_ERROR_FLUSH_META = 0x8002c208,
CELL_PHOTO_EXPORT_UTIL_ERROR_MOVE = 0x8002c209,
CELL_PHOTO_EXPORT_UTIL_ERROR_INITIALIZE = 0x8002c20a,
};
//datatyps
struct CellPhotoExportSetParam
{
char *photo_title;
char *game_title;
char *game_comment;
void *reserved;
};
//export API
int cellPhotoExportInitialize ()
{
UNIMPLEMENTED_FUNC(cellPhotoUtility);
return CELL_PHOTO_EXPORT_UTIL_RET_OK;
}
int cellPhotoExportInitialize2() //unsigned int version, CellPhotoExportUtilFinishCallback func, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoUtility);
return CELL_PHOTO_EXPORT_UTIL_RET_OK;
}
int cellPhotoExportFinalize () //CellPhotoExportUtilFinishCallback func, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoUtility);
return CELL_PHOTO_EXPORT_UTIL_RET_OK;
}
int cellPhotoExportFromFile () //const char *srcHddDir, const char *srcHddFile, CellPhotoExportSetParam *param, CellPhotoExportUtilFinishCallback func,void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoUtility);
return CELL_PHOTO_EXPORT_UTIL_RET_OK;
}
int cellPhotoExportFromFileWithCopy () //const char *srcHddDir, const char *srcHddFile, CellPhotoExportSetParam *param, CellPhotoExportUtilFinishCallback func, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoUtility);
return CELL_PHOTO_EXPORT_UTIL_RET_OK;
}
int cellPhotoExportProgress () //CellPhotoExportUtilFinishCallback func, void *userdata
{
UNIMPLEMENTED_FUNC(cellPhotoUtility);
return CELL_PHOTO_EXPORT_UTIL_RET_OK;
}
void ( * CellPhotoExportUtilFinishCallback ) (); //int result, void *userdata
void ( * CellPhotoImportFinishCallback ) (); //int result, CellPhotoImportFileData *filedata, void *userdata
void cellPhotoUtility_init ()
{
cellPhotoUtility.AddFunc (0x08cbd8e1, cellPhotoExportInitialize2);
cellPhotoUtility.AddFunc (0x09ce84ac, cellPhotoExportFromFile);
//cellPhotoUtility.AddFunc (0x3f7fc0af, cellPhotoFinalize); //TODO
//cellPhotoUtility.AddFunc (0x42a32983, cellPhotoRegistFromFile); //TODO
cellPhotoUtility.AddFunc (0x4357c77f, cellPhotoExportInitialize); //TODO
//cellPhotoUtility.AddFunc (0x55c70783, cellPhotoInitialize); //TODO
cellPhotoUtility.AddFunc (0xde509ead, cellPhotoExportProgress);
cellPhotoUtility.AddFunc (0xed4a0148, cellPhotoExportFinalize);
}

337
rpcs3/Emu/SysCalls/Modules/cellSaveData.cpp
View file

@ -2,10 +2,18 @@
#include "Emu/SysCalls/SysCalls.h" #include "Emu/SysCalls/SysCalls.h"
#include "Emu/SysCalls/SC_FUNC.h" #include "Emu/SysCalls/SC_FUNC.h"
<<<<<<< HEAD
void cellSaveData_init ();
Module cellSaveData ("cellSaveData", cellSaveData_init);
//Error codes
=======
void cellSaveData_init(); void cellSaveData_init();
Module cellSaveData("cellSaveData", cellSaveData_init); Module cellSaveData("cellSaveData", cellSaveData_init);
// Error codes // Error codes
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
enum enum
{ {
CELL_SAVEDATA_RET_OK = 0, CELL_SAVEDATA_RET_OK = 0,
@ -21,68 +29,138 @@ enum
CELL_SAVEDATA_ERROR_NOUSER, CELL_SAVEDATA_ERROR_NOUSER,
}; };
<<<<<<< HEAD
//datatyps
struct CellSaveDataSetList
{
unsigned int sortType;
unsigned int sortOrder;
char *dirNamePrefix;
void *reserved;
=======
// Datatypes // Datatypes
struct CellSaveDataSetList struct CellSaveDataSetList
{ {
unsigned int sortType; unsigned int sortType;
unsigned int sortOrder; unsigned int sortOrder;
char *dirNamePrefix; char *dirNamePrefix;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataSetBuf struct CellSaveDataSetBuf
{ {
<<<<<<< HEAD
unsigned int dirListMax;
unsigned int fileListMax;
unsigned int reserved[6];
unsigned int bufSize;
void *buf;
=======
unsigned int dirListMax; unsigned int dirListMax;
unsigned int fileListMax; unsigned int fileListMax;
unsigned int reserved[6]; unsigned int reserved[6];
unsigned int bufSize; unsigned int bufSize;
void *buf; void *buf;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataNewDataIcon struct CellSaveDataNewDataIcon
{ {
<<<<<<< HEAD
char *title;
unsigned int iconBufSize;
void *iconBuf;
void *reserved;
=======
char *title; char *title;
unsigned int iconBufSize; unsigned int iconBufSize;
void *iconBuf; void *iconBuf;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataListNewData struct CellSaveDataListNewData
{ {
<<<<<<< HEAD
unsigned int iconPosition;
char *dirName;
CellSaveDataNewDataIcon *icon;
void *reserved;
=======
unsigned int iconPosition; unsigned int iconPosition;
char *dirName; char *dirName;
CellSaveDataNewDataIcon *icon; CellSaveDataNewDataIcon *icon;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataDirList struct CellSaveDataDirList
{ {
<<<<<<< HEAD
char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE];
char listParam; //[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
char reserved[8];
=======
char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE]; char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE];
char listParam; //[CELL_SAVEDATA_SYSP_LPARAM_SIZE]; char listParam; //[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataListGet struct CellSaveDataListGet
{ {
<<<<<<< HEAD
unsigned int dirNum;
unsigned int dirListNum;
CellSaveDataDirList *dirList;
char reserved[64];
=======
unsigned int dirNum; unsigned int dirNum;
unsigned int dirListNum; unsigned int dirListNum;
CellSaveDataDirList *dirList; CellSaveDataDirList *dirList;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataListSet struct CellSaveDataListSet
{ {
<<<<<<< HEAD
unsigned int focusPosition;
char *focusDirName;
unsigned int fixedListNum;
CellSaveDataDirList *fixedList;
CellSaveDataListNewData *newData;
void *reserved;
=======
unsigned int focusPosition; unsigned int focusPosition;
char *focusDirName; char *focusDirName;
unsigned int fixedListNum; unsigned int fixedListNum;
CellSaveDataDirList *fixedList; CellSaveDataDirList *fixedList;
CellSaveDataListNewData *newData; CellSaveDataListNewData *newData;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataFixedSet struct CellSaveDataFixedSet
{ {
<<<<<<< HEAD
char *dirName;
CellSaveDataNewDataIcon *newIcon;
unsigned int option;
=======
char *dirName; char *dirName;
CellSaveDataNewDataIcon *newIcon; CellSaveDataNewDataIcon *newIcon;
unsigned int option; unsigned int option;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataSystemFileParam struct CellSaveDataSystemFileParam
{ {
<<<<<<< HEAD
char title; //[CELL_SAVEDATA_SYSP_TITLE_SIZE];
char subTitle; //[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE];
char detail; //[CELL_SAVEDATA_SYSP_DETAIL_SIZE];
unsigned int attribute;
char reserved2[4];
char listParam; //[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
char reserved[256];
=======
char title; //[CELL_SAVEDATA_SYSP_TITLE_SIZE]; char title; //[CELL_SAVEDATA_SYSP_TITLE_SIZE];
char subTitle; //[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE]; char subTitle; //[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE];
char detail; //[CELL_SAVEDATA_SYSP_DETAIL_SIZE]; char detail; //[CELL_SAVEDATA_SYSP_DETAIL_SIZE];
@ -90,18 +168,36 @@ struct CellSaveDataSystemFileParam
char reserved2[4]; char reserved2[4];
char listParam; //[CELL_SAVEDATA_SYSP_LPARAM_SIZE]; char listParam; //[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
char reserved[256]; char reserved[256];
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataDirStat struct CellSaveDataDirStat
{ {
<<<<<<< HEAD
s64 st_atime;
s64 st_mtime;
s64 st_ctime;
char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE];
=======
s64 st_atime; s64 st_atime;
s64 st_mtime; s64 st_mtime;
s64 st_ctime; s64 st_ctime;
char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE]; char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE];
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataFileStat struct CellSaveDataFileStat
{ {
<<<<<<< HEAD
unsigned int fileType;
char reserved1[4];
u64 st_size;
s64 st_atime;
s64 st_mtime;
s64 st_ctime;
char fileName; //[CELL_SAVEDATA_FILENAME_SIZE];
char reserved2[3];
=======
unsigned int fileType; unsigned int fileType;
char reserved1[4]; char reserved1[4];
u64 st_size; u64 st_size;
@ -110,10 +206,24 @@ struct CellSaveDataFileStat
s64 st_ctime; s64 st_ctime;
char fileName; //[CELL_SAVEDATA_FILENAME_SIZE]; char fileName; //[CELL_SAVEDATA_FILENAME_SIZE];
char reserved2[3]; char reserved2[3];
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataStatGet struct CellSaveDataStatGet
{ {
<<<<<<< HEAD
int hddFreeSizeKB;
unsigned int isNewData;
CellSaveDataDirStat dir;
CellSaveDataSystemFileParam getParam;
unsigned int bind;
int sizeKB;
int sysSizeKB;
unsigned int fileNum;
unsigned int fileListNum;
CellSaveDataFileStat *fileList;
char reserved[64];
=======
int hddFreeSizeKB; int hddFreeSizeKB;
unsigned int isNewData; unsigned int isNewData;
CellSaveDataDirStat dir; CellSaveDataDirStat dir;
@ -124,31 +234,63 @@ struct CellSaveDataStatGet
unsigned int fileNum; unsigned int fileNum;
unsigned int fileListNum; unsigned int fileListNum;
CellSaveDataFileStat *fileList; CellSaveDataFileStat *fileList;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataAutoIndicator struct CellSaveDataAutoIndicator
{ {
<<<<<<< HEAD
unsigned int dispPosition;
unsigned int dispMode;
char *dispMsg;
unsigned int picBufSize;
void *picBuf;
void *reserved;
=======
unsigned int dispPosition; unsigned int dispPosition;
unsigned int dispMode; unsigned int dispMode;
char *dispMsg; char *dispMsg;
unsigned int picBufSize; unsigned int picBufSize;
void *picBuf; void *picBuf;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataStatSet struct CellSaveDataStatSet
{ {
<<<<<<< HEAD
CellSaveDataSystemFileParam *setParam;
unsigned int reCreateMode;
CellSaveDataAutoIndicator *indicator;
=======
CellSaveDataSystemFileParam *setParam; CellSaveDataSystemFileParam *setParam;
unsigned int reCreateMode; unsigned int reCreateMode;
CellSaveDataAutoIndicator *indicator; CellSaveDataAutoIndicator *indicator;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataFileGet struct CellSaveDataFileGet
{ {
<<<<<<< HEAD
unsigned int excSize;
char reserved[64];
=======
unsigned int excSize; unsigned int excSize;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataFileSet struct CellSaveDataFileSet
{ {
<<<<<<< HEAD
unsigned int fileOperation;
void *reserved;
unsigned int fileType;
unsigned char secureFileId; //[CELL_SAVEDATA_SECUREFILEID_SIZE];
char *fileName;
unsigned int fileOffset;
unsigned int fileSize;
unsigned int fileBufSize;
void *fileBuf;
=======
unsigned int fileOperation; unsigned int fileOperation;
void *reserved; void *reserved;
unsigned int fileType; unsigned int fileType;
@ -158,19 +300,40 @@ struct CellSaveDataFileSet
unsigned int fileSize; unsigned int fileSize;
unsigned int fileBufSize; unsigned int fileBufSize;
void *fileBuf; void *fileBuf;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataCBResult struct CellSaveDataCBResult
{ {
<<<<<<< HEAD
int result;
unsigned int progressBarInc;
int errNeedSizeKB;
char *invalidMsg;
void *userdata;
=======
int result; int result;
unsigned int progressBarInc; unsigned int progressBarInc;
int errNeedSizeKB; int errNeedSizeKB;
char *invalidMsg; char *invalidMsg;
void *userdata; void *userdata;
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
}; };
struct CellSaveDataDoneGet struct CellSaveDataDoneGet
{ {
<<<<<<< HEAD
int excResult;
char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE];
int sizeKB;
int hddFreeSizeKB;
char reserved[64];
};
//functions
int cellSaveDataListSave2 () //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int excResult; int excResult;
char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE]; char dirName; //[CELL_SAVEDATA_DIRNAME_SIZE];
int sizeKB; int sizeKB;
@ -179,195 +342,368 @@ struct CellSaveDataDoneGet
// Functions // Functions
int cellSaveDataListSave2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataListSave2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataListLoad2 () //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataListLoad2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataListLoad2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataFixedSave2 () //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile,sys_memory_container_t container, void *userdata
=======
int cellSaveDataFixedSave2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile,sys_memory_container_t container, void *userdata int cellSaveDataFixedSave2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile,sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataFixedLoad2 () //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataFixedLoad2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataFixedLoad2() //unsigned int version, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataAutoSave2 () //unsigned int version, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataAutoSave2() //unsigned int version, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataAutoSave2() //unsigned int version, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataAutoLoad2 () //unsigned int version, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataAutoLoad2() //unsigned int version, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataAutoLoad2() //unsigned int version, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataListAutoSave () //unsigned int version, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile,sys_memory_container_t container, void *userdata
=======
int cellSaveDataListAutoSave() //unsigned int version, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile,sys_memory_container_t container, void *userdata int cellSaveDataListAutoSave() //unsigned int version, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile,sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataListAutoLoad () //unsigned int version, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataListAutoLoad() //unsigned int version, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataListAutoLoad() //unsigned int version, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataDelete2 () //sys_memory_container_t container
=======
int cellSaveDataDelete2() //sys_memory_container_t container int cellSaveDataDelete2() //sys_memory_container_t container
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_CANCEL; return CELL_SAVEDATA_RET_CANCEL;
} }
<<<<<<< HEAD
int cellSaveDataFixedDelete () //CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataFixedDelete() //CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataFixedDelete() //CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListSave () //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListSave() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserListSave() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListLoad () //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListLoad() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserListLoad() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserFixedSave () //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserFixedSave() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserFixedSave() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserFixedLoad () //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserFixedLoad() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserFixedLoad() //unsigned int version, CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserAutoSave () //unsigned int version, CellSysutilUserId userId, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserAutoSave() //unsigned int version, CellSysutilUserId userId, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserAutoSave() //unsigned int version, CellSysutilUserId userId, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserAutoLoad () //unsigned int version, CellSysutilUserId userId, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserAutoLoad() //unsigned int version, CellSysutilUserId userId, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserAutoLoad() //unsigned int version, CellSysutilUserId userId, const char *dirName, unsigned int errDialog, CellSaveDataSetBuf *setBuf, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListAutoSave () //unsigned int version, CellSysutilUserId userId, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListAutoSave() //unsigned int version, CellSysutilUserId userId, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserListAutoSave() //unsigned int version, CellSysutilUserId userId, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListAutoLoad () //unsigned int version, CellSysutilUserId userId, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListAutoLoad() //unsigned int version, CellSysutilUserId userId, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata int cellSaveDataUserListAutoLoad() //unsigned int version, CellSysutilUserId userId, unsigned int errDialog, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataStatCallback funcStat, CellSaveDataFileCallback funcFile, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserFixedDelete () //CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserFixedDelete() //CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataUserFixedDelete() //CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataFixedCallback funcFixed, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
//void cellSaveDataEnableOverlay (); //int enable
//Functions (Extensions)
int cellSaveDataListDelete () //CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
//void cellSaveDataEnableOverlay(); //int enable //void cellSaveDataEnableOverlay(); //int enable
// Functions (Extensions) // Functions (Extensions)
int cellSaveDataListDelete() //CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataListDelete() //CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataListImport () //CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataListImport() //CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataListImport() //CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataListExport () //CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataListExport() //CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataListExport() //CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataFixedImport () //const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataFixedImport() //const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataFixedImport() //const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataFixedExport () //const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataFixedExport() //const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataFixedExport() //const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataGetListItem () //const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, unsigned int *bind, int *sizeKB
=======
int cellSaveDataGetListItem() //const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, unsigned int *bind, int *sizeKB int cellSaveDataGetListItem() //const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, unsigned int *bind, int *sizeKB
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListDelete () //CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataDoneCallback funcDone,sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListDelete() //CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataDoneCallback funcDone,sys_memory_container_t container, void *userdata int cellSaveDataUserListDelete() //CellSysutilUserId userId, CellSaveDataSetList *setList, CellSaveDataSetBuf *setBuf, CellSaveDataListCallback funcList, CellSaveDataDoneCallback funcDone,sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListImport () //CellSysutilUserId userId, CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListImport() //CellSysutilUserId userId, CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataUserListImport() //CellSysutilUserId userId, CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserListExport () //CellSysutilUserId userId, CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserListExport() //CellSysutilUserId userId, CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataUserListExport() //CellSysutilUserId userId, CellSaveDataSetList *setList, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserFixedImport () //CellSysutilUserId userId, const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserFixedImport() //CellSysutilUserId userId, const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataUserFixedImport() //CellSysutilUserId userId, const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserFixedExport () //CellSysutilUserId userId, const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
=======
int cellSaveDataUserFixedExport() //CellSysutilUserId userId, const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata int cellSaveDataUserFixedExport() //CellSysutilUserId userId, const char *dirName, unsigned int maxSizeKB, CellSaveDataDoneCallback funcDone, sys_memory_container_t container, void *userdata
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
int cellSaveDataUserGetListItem () //CellSysutilUserId userId, const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, unsigned int *bind, int *sizeKB
=======
int cellSaveDataUserGetListItem() //CellSysutilUserId userId, const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, unsigned int *bind, int *sizeKB int cellSaveDataUserGetListItem() //CellSysutilUserId userId, const char *dirName, CellSaveDataDirStat *dir, CellSaveDataSystemFileParam *sysFileParam, unsigned int *bind, int *sizeKB
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
{ {
UNIMPLEMENTED_FUNC(cellSaveData); UNIMPLEMENTED_FUNC(cellSaveData);
return CELL_SAVEDATA_RET_OK; return CELL_SAVEDATA_RET_OK;
} }
<<<<<<< HEAD
//Callback Functions
void (*CellSaveDataFixedCallback) (); //CellSaveDataCBResult *cbResult, CellSaveDataListGet *get, CellSaveDataFixedSet *set
void (*CellSaveDataListCallback) (); //CellSaveDataCBResult *cbResult, CellSaveDataListGet *get, CellSaveDataListSet *set
void (*CellSaveDataStatCallback) (); //CellSaveDataCBResult *cbResult, CellSaveDataStatGet *get, CellSaveDataStatSet *set
void (*CellSaveDataFileCallback) (); //CellSaveDataCBResult *cbResult, CellSaveDataFileGet *get, CellSaveDataFileSet *set
void (*CellSaveDataDoneCallback) (); //CellSaveDataCBResult *cbResult, CellSaveDataDoneGet *get
void cellSaveData_init ()
{
cellSaveData.AddFunc (0x04c06fc2, cellSaveDataGetListItem);
cellSaveData.AddFunc (0x273d116a, cellSaveDataUserListExport);
cellSaveData.AddFunc (0x27cb8bc2, cellSaveDataListDelete);
cellSaveData.AddFunc (0x39d6ee43, cellSaveDataUserListImport);
cellSaveData.AddFunc (0x46a2d878, cellSaveDataFixedExport);
cellSaveData.AddFunc (0x491cc554, cellSaveDataListExport);
cellSaveData.AddFunc (0x52541151, cellSaveDataFixedImport);
cellSaveData.AddFunc (0x529231b0, cellSaveDataUserFixedImport);
cellSaveData.AddFunc (0x6b4e0de6, cellSaveDataListImport);
cellSaveData.AddFunc (0x7048a9ba, cellSaveDataUserListDelete);
cellSaveData.AddFunc (0x95ae2cde, cellSaveDataUserFixedExport);
cellSaveData.AddFunc (0xf6482036, cellSaveDataUserGetListItem);
cellSaveData.AddFunc (0x2de0d663, cellSaveDataListSave2);
cellSaveData.AddFunc (0x1dfbfdd6, cellSaveDataListLoad2);
cellSaveData.AddFunc (0x2aae9ef5, cellSaveDataFixedSave2);
cellSaveData.AddFunc (0x2a8eada2, cellSaveDataFixedLoad2);
cellSaveData.AddFunc (0x8b7ed64b, cellSaveDataAutoSave2);
cellSaveData.AddFunc (0xfbd5c856, cellSaveDataAutoLoad2);
cellSaveData.AddFunc (0x4dd03a4e, cellSaveDataListAutoSave);
cellSaveData.AddFunc (0x21425307, cellSaveDataListAutoLoad);
cellSaveData.AddFunc (0xedadd797, cellSaveDataDelete2);
cellSaveData.AddFunc (0x0f03cfb0, cellSaveDataUserListSave);
cellSaveData.AddFunc (0x39dd8425, cellSaveDataUserListLoad);
cellSaveData.AddFunc (0x40b34847, cellSaveDataUserFixedSave);
cellSaveData.AddFunc (0x6e7264ed, cellSaveDataUserFixedLoad);
cellSaveData.AddFunc (0x52aac4fa, cellSaveDataUserAutoSave);
cellSaveData.AddFunc (0xcdc6aefd, cellSaveDataUserAutoLoad);
cellSaveData.AddFunc (0x0e091c36, cellSaveDataUserListAutoSave);
//cellSaveData.AddFunc (0xe7fa820b, cellSaveDataEnableOverlay);
=======
// Callback Functions // Callback Functions
void (*CellSaveDataFixedCallback)(); //CellSaveDataCBResult *cbResult, CellSaveDataListGet *get, CellSaveDataFixedSet *set void (*CellSaveDataFixedCallback)(); //CellSaveDataCBResult *cbResult, CellSaveDataListGet *get, CellSaveDataFixedSet *set
@ -410,4 +746,5 @@ void cellSaveData_init()
cellSaveData.AddFunc(0xcdc6aefd, cellSaveDataUserAutoLoad); cellSaveData.AddFunc(0xcdc6aefd, cellSaveDataUserAutoLoad);
cellSaveData.AddFunc(0x0e091c36, cellSaveDataUserListAutoSave); cellSaveData.AddFunc(0x0e091c36, cellSaveDataUserListAutoSave);
//cellSaveData.AddFunc(0xe7fa820b, cellSaveDataEnableOverlay); //cellSaveData.AddFunc(0xe7fa820b, cellSaveDataEnableOverlay);
>>>>>>> 3dd9683b472b89358a697210798c89df5b0e5baa
} }

59
rpcs3/Emu/SysCalls/Modules/cellScreenShotUtility.cpp Normal file
View file

@ -0,0 +1,59 @@
#include "stdafx.h"
#include "Emu/SysCalls/SysCalls.h"
#include "Emu/SysCalls/SC_FUNC.h"
void cellScreenShotUtility_init ();
Module cellScreenShotUtility ("cellScreenShotUtility", cellScreenShotUtility_init);
//Error codes
enum
{
CELL_SCREENSHOT_OK = 0x0,
CELL_SCREENSHOT_ERROR_INTERNAL = 0x8002d101,
CELL_SCREENSHOT_ERROR_PARAM = 0x8002d102,
CELL_SCREENSHOT_ERROR_DECODE = 0x8002d103,
CELL_SCREENSHOT_ERROR_NOSPACE = 0x8002d104,
CELL_SCREENSHOT_ERROR_UNSUPPORTED_COLOR_FORMAT = 0x8002d105,
};
//datatyps
struct CellScreenShotSetParam
{
const char *photo_title;
const char *game_title;
const char *game_comment;
void* reserved;
};
int cellScreenShotSetParameter () //const CellScreenShotSetParam *param
{
UNIMPLEMENTED_FUNC(cellScreenShotUtility);
return CELL_SCREENSHOT_OK;
}
int cellScreenShotSetOverlayImage() //const char *srcDir, const char *srcFile, s32 offset_x, s32 offset_y
{
UNIMPLEMENTED_FUNC(cellScreenShotUtility);
return CELL_SCREENSHOT_OK;
}
int cellScreenShotEnable (void)
{
UNIMPLEMENTED_FUNC(cellScreenShotUtility);
return CELL_SCREENSHOT_OK;
}
int cellScreenShotDisable (void)
{
UNIMPLEMENTED_FUNC(cellScreenShotUtility);
return CELL_SCREENSHOT_OK;
}
void cellScreenShotUtility_init ()
{
cellScreenShotUtility.AddFunc (0x9e33ab8f, cellScreenShotEnable);
cellScreenShotUtility.AddFunc (0xd3ad63e4, cellScreenShotSetParameter);
cellScreenShotUtility.AddFunc (0xfc6f4e74, cellScreenShotDisable);
cellScreenShotUtility.AddFunc (0x7a9c2243, cellScreenShotSetOverlayImage);
}

3
rpcs3/Gui/AboutDialog.cpp
View file

@ -47,7 +47,8 @@ AboutDialog::AboutDialog(wxWindow *parent)
wxBoxSizer* s_panel_credits(new wxBoxSizer(wxHORIZONTAL)); wxBoxSizer* s_panel_credits(new wxBoxSizer(wxHORIZONTAL));
wxStaticText* t_section1 = new wxStaticText(this, wxID_ANY, "\nDevelopers:\n\nDH\nAlexAltea", wxDefaultPosition, wxSize(156,160)); wxStaticText* t_section1 = new wxStaticText(this, wxID_ANY, "\nDevelopers:\n\nDH\nAlexAltea", wxDefaultPosition, wxSize(156,160));
wxStaticText* t_section2 = new wxStaticText(this, wxID_ANY, "\nThanks:\n\nBlackDaemon", wxDefaultPosition, wxSize(156,160)); wxStaticText* t_section2 = new wxStaticText(this, wxID_ANY, "\nThanks:\n\nBlackDaemon", wxDefaultPosition, wxSize(156,160));
wxStaticText* t_section3 = new wxStaticText(this, wxID_ANY, "\nExternal code:\n\n - SELF Decrypter based on scetool (C) 2011-2013 by naehrwert", wxDefaultPosition, wxSize(156,160)); wxStaticText* t_section3 = new wxStaticText(this, wxID_ANY, "\nExternal code:\n\n - SELF Decrypter based on scetool (C) 2011-2013 by naehrwert\n\ - PKG Installer based on ps3pkgtool (C) 2011-2013 by avtolstoy and PKG Finalize (C) by geohot", wxDefaultPosition, wxSize(156,160));
s_panel_credits->AddSpacer(12); s_panel_credits->AddSpacer(12);
s_panel_credits->Add(t_section1); s_panel_credits->Add(t_section1);
s_panel_credits->AddSpacer(8); s_panel_credits->AddSpacer(8);

51
rpcs3/Gui/MainFrame.cpp
View file

@ -12,6 +12,7 @@
#include <wx/dynlib.h> #include <wx/dynlib.h>
#include "scetool/scetool.cpp" #include "scetool/scetool.cpp"
#include "unpkg/unpkg.c"
BEGIN_EVENT_TABLE(MainFrame, FrameBase) BEGIN_EVENT_TABLE(MainFrame, FrameBase)
EVT_CLOSE(MainFrame::OnQuit) EVT_CLOSE(MainFrame::OnQuit)
@ -22,6 +23,7 @@ enum IDs
id_boot_elf = 0x555, id_boot_elf = 0x555,
id_boot_self, id_boot_self,
id_boot_game, id_boot_game,
id_boot_pkg,
id_sys_pause, id_sys_pause,
id_sys_stop, id_sys_stop,
id_sys_send_open_menu, id_sys_send_open_menu,
@ -65,6 +67,7 @@ MainFrame::MainFrame()
menubar.Append(&menu_help, "Help"); menubar.Append(&menu_help, "Help");
menu_boot.Append(id_boot_game, "Boot game"); menu_boot.Append(id_boot_game, "Boot game");
menu_boot.Append(id_boot_pkg, "Install PKG");
menu_boot.AppendSeparator(); menu_boot.AppendSeparator();
menu_boot.Append(id_boot_elf, "Boot ELF"); menu_boot.Append(id_boot_elf, "Boot ELF");
menu_boot.Append(id_boot_self, "Boot SELF"); menu_boot.Append(id_boot_self, "Boot SELF");
@ -88,6 +91,7 @@ MainFrame::MainFrame()
AddPane(m_game_viewer, "Game List", wxAUI_DOCK_BOTTOM); AddPane(m_game_viewer, "Game List", wxAUI_DOCK_BOTTOM);
Connect( id_boot_game, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootGame) ); Connect( id_boot_game, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootGame) );
Connect( id_boot_pkg, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootPkg) );
Connect( id_boot_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootElf) ); Connect( id_boot_elf, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootElf) );
Connect( id_boot_self, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootSelf) ); Connect( id_boot_self, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::BootSelf) );
@ -167,9 +171,19 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event))
{ {
if(wxFile::Access(ctrl.GetPath() + elf[i], wxFile::read)) if(wxFile::Access(ctrl.GetPath() + elf[i], wxFile::read))
{ {
Emu.SetPath(ctrl.GetPath() + elf[i]); ConLog.Write("SELF: booting...");
ConLog.Write("Elf: booting...");
Emu.Stop();
wxString fileIn = ctrl.GetPath()+elf[i];
wxString fileOut = (ctrl.GetPath()+elf[i])+".elf";
scetool_decrypt((scetool::s8 *)fileIn.mb_str(), (scetool::s8 *)fileOut.mb_str());
Emu.SetPath((ctrl.GetPath()+elf[i])+".elf");
Emu.Load(); Emu.Load();
if (!wxRemoveFile((ctrl.GetPath()+elf[i])+".elf"))
ConLog.Warning("Could not delete the decrypted ELF file");
ConLog.Write("Game: boot done."); ConLog.Write("Game: boot done.");
return; return;
} }
@ -179,6 +193,39 @@ void MainFrame::BootGame(wxCommandEvent& WXUNUSED(event))
return; return;
} }
void MainFrame::BootPkg(wxCommandEvent& WXUNUSED(event))
{
bool stopped = false;
if(Emu.IsRunning())
{
Emu.Pause();
stopped = true;
}
wxFileDialog ctrl (this, L"Select PKG", wxEmptyString, wxEmptyString, "*.*",
wxFD_OPEN | wxFD_FILE_MUST_EXIST);
if(ctrl.ShowModal() == wxID_CANCEL)
{
if(stopped) Emu.Resume();
return;
}
ConLog.Write("PKG: extracting...");
Emu.Stop();
wxString fileName = ctrl.GetPath();
pkg_unpack((const char *)fileName.mb_str());
if (!wxRemoveFile(ctrl.GetPath()+".dec"))
ConLog.Warning("Could not delete the decoded DEC file");
ConLog.Write("PKG: extract done.");
}
void MainFrame::BootElf(wxCommandEvent& WXUNUSED(event)) void MainFrame::BootElf(wxCommandEvent& WXUNUSED(event))
{ {
bool stopped = false; bool stopped = false;

1
rpcs3/Gui/MainFrame.h
View file

@ -20,6 +20,7 @@ private:
void OnQuit(wxCloseEvent& event); void OnQuit(wxCloseEvent& event);
void BootGame(wxCommandEvent& event); void BootGame(wxCommandEvent& event);
void BootPkg(wxCommandEvent& event);
void BootElf(wxCommandEvent& event); void BootElf(wxCommandEvent& event);
void BootSelf(wxCommandEvent& event); void BootSelf(wxCommandEvent& event);
void Pause(wxCommandEvent& event); void Pause(wxCommandEvent& event);

732
rpcs3/rpcs3.vcxproj
View file

@ -1,367 +1,367 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}</ProjectGuid> <ProjectGuid>{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>rpcs3</RootNamespace> <RootNamespace>rpcs3</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
<CLRSupport>false</CLRSupport> <CLRSupport>false</CLRSupport>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset> <PlatformToolset>v110</PlatformToolset>
<CLRSupport>false</CLRSupport> <CLRSupport>false</CLRSupport>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath> <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)bin\</OutDir> <OutDir>$(SolutionDir)bin\</OutDir>
<LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath> <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
<TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName> <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath> <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)bin\</OutDir> <OutDir>$(SolutionDir)bin\</OutDir>
<LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath> <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
<TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName> <TargetName>$(ProjectName)-$(PlatformShortName)-dbg</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath> <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)bin\</OutDir> <OutDir>$(SolutionDir)bin\</OutDir>
<LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath> <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
<TargetName>$(ProjectName)-$(PlatformShortName)</TargetName> <TargetName>$(ProjectName)-$(PlatformShortName)</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath> <IncludePath>.\;..\wxWidgets\include;..\SDL-1.3.0-5538\include;..\SDL_image-1.2.10;..\pthreads-2.8.0;..\;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)bin\</OutDir> <OutDir>$(SolutionDir)bin\</OutDir>
<LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath> <LibraryPath>..\libs\$(Configuration)\;$(LibraryPath)</LibraryPath>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
<TargetName>$(ProjectName)-$(PlatformShortName)</TargetName> <TargetName>$(ProjectName)-$(PlatformShortName)</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DataExecutionPrevention>false</DataExecutionPrevention> <DataExecutionPrevention>false</DataExecutionPrevention>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DataExecutionPrevention>false</DataExecutionPrevention> <DataExecutionPrevention>false</DataExecutionPrevention>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command>$(SolutionDir)\Utilities\git-version-gen.cmd</Command> <Command>$(SolutionDir)\Utilities\git-version-gen.cmd</Command>
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>TurnOffAllWarnings</WarningLevel> <WarningLevel>TurnOffAllWarnings</WarningLevel>
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableLanguageExtensions>false</DisableLanguageExtensions> <DisableLanguageExtensions>false</DisableLanguageExtensions>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<ExceptionHandling>Sync</ExceptionHandling> <ExceptionHandling>Sync</ExceptionHandling>
<EnablePREfast>false</EnablePREfast> <EnablePREfast>false</EnablePREfast>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries> </IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DataExecutionPrevention>false</DataExecutionPrevention> <DataExecutionPrevention>false</DataExecutionPrevention>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories> <AdditionalIncludeDirectories>
</AdditionalIncludeDirectories> </AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableLanguageExtensions>false</DisableLanguageExtensions> <DisableLanguageExtensions>false</DisableLanguageExtensions>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<ExceptionHandling>Sync</ExceptionHandling> <ExceptionHandling>Sync</ExceptionHandling>
<EnablePREfast>false</EnablePREfast> <EnablePREfast>false</EnablePREfast>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>adv.lib;base.lib;core.lib;aui.lib;odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregex.lib;wxexpat.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>
</IgnoreAllDefaultLibraries> </IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<DataExecutionPrevention>false</DataExecutionPrevention> <DataExecutionPrevention>false</DataExecutionPrevention>
</Link> </Link>
<PreBuildEvent> <PreBuildEvent>
<Command> <Command>
</Command> </Command>
</PreBuildEvent> </PreBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Utilities\Thread.cpp" /> <ClCompile Include="..\Utilities\Thread.cpp" />
<ClCompile Include="AppConnector.cpp" /> <ClCompile Include="AppConnector.cpp" />
<ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" /> <ClCompile Include="Emu\ARMv7\ARMv7Thread.cpp" />
<ClCompile Include="Emu\Cell\MFC.cpp" /> <ClCompile Include="Emu\Cell\MFC.cpp" />
<ClCompile Include="Emu\Cell\PPCDecoder.cpp" /> <ClCompile Include="Emu\Cell\PPCDecoder.cpp" />
<ClCompile Include="Emu\Cell\PPCThread.cpp" /> <ClCompile Include="Emu\Cell\PPCThread.cpp" />
<ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" /> <ClCompile Include="Emu\Cell\PPUProgramCompiler.cpp" />
<ClCompile Include="Emu\Cell\PPUThread.cpp" /> <ClCompile Include="Emu\Cell\PPUThread.cpp" />
<ClCompile Include="Emu\Cell\RawSPUThread.cpp" /> <ClCompile Include="Emu\Cell\RawSPUThread.cpp" />
<ClCompile Include="Emu\Cell\SPUThread.cpp" /> <ClCompile Include="Emu\Cell\SPUThread.cpp" />
<ClCompile Include="Emu\CPU\CPUThread.cpp" /> <ClCompile Include="Emu\CPU\CPUThread.cpp" />
<ClCompile Include="Emu\CPU\CPUThreadManager.cpp" /> <ClCompile Include="Emu\CPU\CPUThreadManager.cpp" />
<ClCompile Include="Emu\DbgConsole.cpp" /> <ClCompile Include="Emu\DbgConsole.cpp" />
<ClCompile Include="Emu\FS\VFS.cpp" /> <ClCompile Include="Emu\FS\VFS.cpp" />
<ClCompile Include="Emu\FS\vfsDevice.cpp" /> <ClCompile Include="Emu\FS\vfsDevice.cpp" />
<ClCompile Include="Emu\FS\vfsFile.cpp" /> <ClCompile Include="Emu\FS\vfsFile.cpp" />
<ClCompile Include="Emu\FS\vfsFileBase.cpp" /> <ClCompile Include="Emu\FS\vfsFileBase.cpp" />
<ClCompile Include="Emu\FS\vfsLocalFile.cpp" /> <ClCompile Include="Emu\FS\vfsLocalFile.cpp" />
<ClCompile Include="Emu\FS\vfsStream.cpp" /> <ClCompile Include="Emu\FS\vfsStream.cpp" />
<ClCompile Include="Emu\FS\vfsStreamMemory.cpp" /> <ClCompile Include="Emu\FS\vfsStreamMemory.cpp" />
<ClCompile Include="Emu\GS\GL\GLBuffers.cpp" /> <ClCompile Include="Emu\GS\GL\GLBuffers.cpp" />
<ClCompile Include="Emu\GS\GL\GLFragmentProgram.cpp" /> <ClCompile Include="Emu\GS\GL\GLFragmentProgram.cpp" />
<ClCompile Include="Emu\GS\GL\GLGSRender.cpp" /> <ClCompile Include="Emu\GS\GL\GLGSRender.cpp" />
<ClCompile Include="Emu\GS\GL\GLProgram.cpp" /> <ClCompile Include="Emu\GS\GL\GLProgram.cpp" />
<ClCompile Include="Emu\GS\GL\GLProgramBuffer.cpp" /> <ClCompile Include="Emu\GS\GL\GLProgramBuffer.cpp" />
<ClCompile Include="Emu\GS\GL\GLVertexProgram.cpp" /> <ClCompile Include="Emu\GS\GL\GLVertexProgram.cpp" />
<ClCompile Include="Emu\GS\GL\OpenGL.cpp" /> <ClCompile Include="Emu\GS\GL\OpenGL.cpp" />
<ClCompile Include="Emu\GS\GSManager.cpp" /> <ClCompile Include="Emu\GS\GSManager.cpp" />
<ClCompile Include="Emu\GS\GSRender.cpp" /> <ClCompile Include="Emu\GS\GSRender.cpp" />
<ClCompile Include="Emu\GS\RSXThread.cpp" /> <ClCompile Include="Emu\GS\RSXThread.cpp" />
<ClCompile Include="Emu\HDD\HDD.cpp" /> <ClCompile Include="Emu\HDD\HDD.cpp" />
<ClCompile Include="Emu\Io\Keyboard.cpp" /> <ClCompile Include="Emu\Io\Keyboard.cpp" />
<ClCompile Include="Emu\Io\Mouse.cpp" /> <ClCompile Include="Emu\Io\Mouse.cpp" />
<ClCompile Include="Emu\Io\Pad.cpp" /> <ClCompile Include="Emu\Io\Pad.cpp" />
<ClCompile Include="Emu\Memory\Memory.cpp" /> <ClCompile Include="Emu\Memory\Memory.cpp" />
<ClCompile Include="Emu\SysCalls\Callback.cpp" /> <ClCompile Include="Emu\SysCalls\Callback.cpp" />
<ClCompile Include="Emu\SysCalls\FuncList.cpp" /> <ClCompile Include="Emu\SysCalls\FuncList.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Condition.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Condition.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Event.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Event.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_FileSystem.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_FileSystem.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_GCM.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_GCM.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Heap.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Heap.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Keyboard.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Keyboard.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Lwmutex.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Lwmutex.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Memory.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Memory.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Mouse.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Mouse.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Mutex.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Mutex.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Pad.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Pad.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_PPU_Thread.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_PPU_Thread.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Process.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Process.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Resc.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Resc.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_RSX.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_RSX.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Rwlock.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Rwlock.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Semaphore.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Semaphore.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_SPU_Thread.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_SPU_Thread.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil_MsgDialog.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_SysUtil_MsgDialog.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Time.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Time.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Timer.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Timer.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_Trace.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_Trace.cpp" />
<ClCompile Include="Emu\SysCalls\lv2\SC_TTY.cpp" /> <ClCompile Include="Emu\SysCalls\lv2\SC_TTY.cpp" />
<ClCompile Include="Emu\SysCalls\Modules.cpp" /> <ClCompile Include="Emu\SysCalls\Modules.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellAudio.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellGcmSys.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellGifDec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellJpgDec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellPngDec.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellResc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellRtc.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellSysmodule.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\cellSysutil.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\sysPrxForUser.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\sys_fs.cpp" />
<ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" /> <ClCompile Include="Emu\SysCalls\Modules\sys_io.cpp" />
<ClCompile Include="Emu\SysCalls\SysCalls.cpp" /> <ClCompile Include="Emu\SysCalls\SysCalls.cpp" />
<ClCompile Include="Emu\System.cpp" /> <ClCompile Include="Emu\System.cpp" />
<ClCompile Include="Gui\CompilerELF.cpp" /> <ClCompile Include="Gui\CompilerELF.cpp" />
<ClCompile Include="Gui\ConLog.cpp" /> <ClCompile Include="Gui\ConLog.cpp" />
<ClCompile Include="Gui\Debugger.cpp" /> <ClCompile Include="Gui\Debugger.cpp" />
<ClCompile Include="Gui\DisAsmFrame.cpp" /> <ClCompile Include="Gui\DisAsmFrame.cpp" />
<ClCompile Include="Gui\GameViewer.cpp" /> <ClCompile Include="Gui\GameViewer.cpp" />
<ClCompile Include="Gui\InterpreterDisAsm.cpp" /> <ClCompile Include="Gui\InterpreterDisAsm.cpp" />
<ClCompile Include="Gui\MainFrame.cpp" /> <ClCompile Include="Gui\MainFrame.cpp" />
<ClCompile Include="Gui\MemoryViewer.cpp" /> <ClCompile Include="Gui\MemoryViewer.cpp" />
<ClCompile Include="Gui\TextInputDialog.cpp" /> <ClCompile Include="Gui\TextInputDialog.cpp" />
<ClCompile Include="Gui\VFSManager.cpp" /> <ClCompile Include="Gui\VFSManager.cpp" />
<ClCompile Include="Gui\VHDDManager.cpp" /> <ClCompile Include="Gui\VHDDManager.cpp" />
<ClCompile Include="Ini.cpp" /> <ClCompile Include="Ini.cpp" />
<ClCompile Include="Loader\ELF.cpp" /> <ClCompile Include="Loader\ELF.cpp" />
<ClCompile Include="Loader\ELF32.cpp" /> <ClCompile Include="Loader\ELF32.cpp" />
<ClCompile Include="Loader\ELF64.cpp" /> <ClCompile Include="Loader\ELF64.cpp" />
<ClCompile Include="Loader\Loader.cpp" /> <ClCompile Include="Loader\Loader.cpp" />
<ClCompile Include="Loader\PSF.cpp" /> <ClCompile Include="Loader\PSF.cpp" />
<ClCompile Include="Loader\SELF.cpp" /> <ClCompile Include="Loader\SELF.cpp" />
<ClCompile Include="rpcs3.cpp" /> <ClCompile Include="rpcs3.cpp" />
<ClCompile Include="stdafx.cpp"> <ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="rpcs3.rc" /> <ResourceCompile Include="rpcs3.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\Utilities\Array.h" /> <ClInclude Include="..\Utilities\Array.h" />
<ClInclude Include="..\Utilities\BEType.h" /> <ClInclude Include="..\Utilities\BEType.h" />
<ClInclude Include="..\Utilities\IdManager.h" /> <ClInclude Include="..\Utilities\IdManager.h" />
<ClInclude Include="..\Utilities\MTProgressDialog.h" /> <ClInclude Include="..\Utilities\MTProgressDialog.h" />
<ClInclude Include="..\Utilities\Thread.h" /> <ClInclude Include="..\Utilities\Thread.h" />
<ClInclude Include="..\Utilities\Timer.h" /> <ClInclude Include="..\Utilities\Timer.h" />
<ClInclude Include="Emu\Cell\PPCDecoder.h" /> <ClInclude Include="Emu\Cell\PPCDecoder.h" />
<ClInclude Include="Emu\Cell\PPCDisAsm.h" /> <ClInclude Include="Emu\Cell\PPCDisAsm.h" />
<ClInclude Include="Emu\Cell\PPCInstrTable.h" /> <ClInclude Include="Emu\Cell\PPCInstrTable.h" />
<ClInclude Include="Emu\Cell\PPCThread.h" /> <ClInclude Include="Emu\Cell\PPCThread.h" />
<ClInclude Include="Emu\Cell\PPCThreadManager.h" /> <ClInclude Include="Emu\Cell\PPCThreadManager.h" />
<ClInclude Include="Emu\Cell\PPUDecoder.h" /> <ClInclude Include="Emu\Cell\PPUDecoder.h" />
<ClInclude Include="Emu\Cell\PPUDisAsm.h" /> <ClInclude Include="Emu\Cell\PPUDisAsm.h" />
<ClInclude Include="Emu\Cell\PPUInstrTable.h" /> <ClInclude Include="Emu\Cell\PPUInstrTable.h" />
<ClInclude Include="Emu\Cell\PPUInterpreter.h" /> <ClInclude Include="Emu\Cell\PPUInterpreter.h" />
<ClInclude Include="Emu\Cell\PPUOpcodes.h" /> <ClInclude Include="Emu\Cell\PPUOpcodes.h" />
<ClInclude Include="Emu\Cell\PPUProgramCompiler.h" /> <ClInclude Include="Emu\Cell\PPUProgramCompiler.h" />
<ClInclude Include="Emu\Cell\PPUThread.h" /> <ClInclude Include="Emu\Cell\PPUThread.h" />
<ClInclude Include="Emu\Cell\SPUDecoder.h" /> <ClInclude Include="Emu\Cell\SPUDecoder.h" />
<ClInclude Include="Emu\Cell\SPUDisAsm.h" /> <ClInclude Include="Emu\Cell\SPUDisAsm.h" />
<ClInclude Include="Emu\Cell\SPUInterpreter.h" /> <ClInclude Include="Emu\Cell\SPUInterpreter.h" />
<ClInclude Include="Emu\Cell\SPUOpcodes.h" /> <ClInclude Include="Emu\Cell\SPUOpcodes.h" />
<ClInclude Include="Emu\Cell\SPUThread.h" /> <ClInclude Include="Emu\Cell\SPUThread.h" />
<ClInclude Include="Emu\DbgConsole.h" /> <ClInclude Include="Emu\DbgConsole.h" />
<ClInclude Include="Emu\GameInfo.h" /> <ClInclude Include="Emu\GameInfo.h" />
<ClInclude Include="Emu\GS\GCM.h" /> <ClInclude Include="Emu\GS\GCM.h" />
<ClInclude Include="Emu\GS\GL\GLGSRender.h" /> <ClInclude Include="Emu\GS\GL\GLGSRender.h" />
<ClInclude Include="Emu\GS\GSManager.h" /> <ClInclude Include="Emu\GS\GSManager.h" />
<ClInclude Include="Emu\GS\GSRender.h" /> <ClInclude Include="Emu\GS\GSRender.h" />
<ClInclude Include="Emu\GS\Null\NullGSRender.h" /> <ClInclude Include="Emu\GS\Null\NullGSRender.h" />
<ClInclude Include="Emu\Io\Null\NullPadHandler.h" /> <ClInclude Include="Emu\Io\Null\NullPadHandler.h" />
<ClInclude Include="Emu\Io\Pad.h" /> <ClInclude Include="Emu\Io\Pad.h" />
<ClInclude Include="Emu\Io\PadHandler.h" /> <ClInclude Include="Emu\Io\PadHandler.h" />
<ClInclude Include="Emu\Memory\Memory.h" /> <ClInclude Include="Emu\Memory\Memory.h" />
<ClInclude Include="Emu\Memory\MemoryBlock.h" /> <ClInclude Include="Emu\Memory\MemoryBlock.h" />
<ClInclude Include="Emu\SysCalls\ErrorCodes.h" /> <ClInclude Include="Emu\SysCalls\ErrorCodes.h" />
<ClInclude Include="Emu\SysCalls\SysCalls.h" /> <ClInclude Include="Emu\SysCalls\SysCalls.h" />
<ClInclude Include="Emu\System.h" /> <ClInclude Include="Emu\System.h" />
<ClInclude Include="Gui\CompilerELF.h" /> <ClInclude Include="Gui\CompilerELF.h" />
<ClInclude Include="Gui\ConLog.h" /> <ClInclude Include="Gui\ConLog.h" />
<ClInclude Include="Gui\DisAsmFrame.h" /> <ClInclude Include="Gui\DisAsmFrame.h" />
<ClInclude Include="Gui\FrameBase.h" /> <ClInclude Include="Gui\FrameBase.h" />
<ClInclude Include="Gui\GameViewer.h" /> <ClInclude Include="Gui\GameViewer.h" />
<ClInclude Include="Gui\InterpreterDisAsm.h" /> <ClInclude Include="Gui\InterpreterDisAsm.h" />
<ClInclude Include="Gui\MainFrame.h" /> <ClInclude Include="Gui\MainFrame.h" />
<ClInclude Include="Gui\MemoryViewer.h" /> <ClInclude Include="Gui\MemoryViewer.h" />
<ClInclude Include="Ini.h" /> <ClInclude Include="Ini.h" />
<ClInclude Include="Loader\ELF.h" /> <ClInclude Include="Loader\ELF.h" />
<ClInclude Include="Loader\ELF32.h" /> <ClInclude Include="Loader\ELF32.h" />
<ClInclude Include="Loader\ELF64.h" /> <ClInclude Include="Loader\ELF64.h" />
<ClInclude Include="Loader\Loader.h" /> <ClInclude Include="Loader\Loader.h" />
<ClInclude Include="Loader\PSF.h" /> <ClInclude Include="Loader\PSF.h" />
<ClInclude Include="Loader\SELF.h" /> <ClInclude Include="Loader\SELF.h" />
<ClInclude Include="rpcs3.h" /> <ClInclude Include="rpcs3.h" />
<ClInclude Include="stdafx.h" /> <ClInclude Include="stdafx.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

1032
rpcs3/rpcs3.vcxproj.filters
View file

File diff suppressed because it is too large Load diff

20
unpkg/oddkeys.h Normal file
View file

@ -0,0 +1,20 @@
#pragma once
#include "stdafx.h"
u8 retail_pkg_aes_key[] = {0x2E,0x7B,0x71,0xD7,0xC9,0xC9,0xA1,0x4E,0xA3,0x22,0x1F,0x18,0x88,0x28,0xB8,0xF8};
u8 npdrm_keypair_e[] = {
0xA1,0xC0,0x13,0xAB,0xCE,0x98,0xA7,0xE3,0xDC,0x69,0x92,0x3B,0x07,0xC0,0x28,0x5F,
0x75,0x54,0xC5,0x12,0xB0,0xB0,0xA9,0x6F,0x24,0x52,0x40,0xF2,0xFD,0x43,0x3A,0xF2,
0x3F,0x4E,0xFE,0xC6,0xC1,0x83,0xEA,0x37,0x8D,0x1B,0xEC,0xB0,0x9D,0x88,0xDB,0x32,
0x8F,0x2C,0x86,0x37,0xB7,0xAC,0x72,0x05,0x9B,0x15,0x56,0xB0,0xD9,0x5B,0x5B,0xE0};
u8 npdrm_keypair_d[] = {
0x87,0xC7,0x4F,0xFE,0x66,0x93,0x0B,0xAA,0xA1,0x6F,0x86,0x40,0x91,0xC5,0x66,0xFB,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x08,0x28,0xB5,0x8F,0xAC,0xF9,0xDE,0xC8,0xD7,0x0D,0xFE,0xF0,0xF3,0x76,0x63,0xAE,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
u8 npdrm_omac_key1[] = {0x72,0xF9,0x90,0x78,0x8F,0x9C,0xFF,0x74,0x57,0x25,0xF0,0x8E,0x4C,0x12,0x83,0x87};
u8 npdrm_omac_key2[] = {0x6B,0xA5,0x29,0x76,0xEF,0xDA,0x16,0xEF,0x3C,0x33,0x9F,0xB2,0x97,0x1E,0x25,0x6B};
u8 npdrm_omac_key3[] = {0x9B,0x51,0x5F,0xEA,0xCF,0x75,0x06,0x49,0x81,0xAA,0x60,0x4D,0x91,0xA5,0x4E,0x97};

106
unpkg/ps3_common.h Normal file
View file

@ -0,0 +1,106 @@
#pragma once
#include "stdafx.h"
typedef struct {
u32 magic;
u32 debugFlag;
u32 infoOffset;
u32 unknown1;
u32 headSize;
u32 itemCount;
u64 packageSize;
u64 dataOffset;
u64 dataSize;
} pkg_header2;
u64 get_u64(void* vd) {
u8 *d = (u8*)vd;
return ((u64)d[0]<<56) | ((u64)d[1]<<48) | ((u64)d[2]<<40) | ((u64)d[3]<<32) | (d[4]<<24) | (d[5]<<16) | (d[6]<<8) | d[7];
}
void set_u64(void* vd, u64 v) {
u8 *d = (u8*)vd;
d[0] = v>>56;
d[1] = v>>48;
d[2] = v>>40;
d[3] = v>>32;
d[4] = v>>24;
d[5] = v>>16;
d[6] = v>>8;
d[7] = v>>0;
}
void set_u32(void* vd, u32 v) {
u8 *d = (u8*)vd;
d[0] = v>>24;
d[1] = v>>16;
d[2] = v>>8;
d[3] = v>>0;
}
void set_u16(void* vd, u16 v) {
u8 *d = (u8*)vd;
d[0] = v>>8;
d[1] = v>>0;
}
u32 get_u32(void* vd) {
u8 *d = (u8*)vd;
return (d[0]<<24) | (d[1]<<16) | (d[2]<<8) | d[3];
}
float get_float(u8* d) {
float ret;
u32 inter = (d[0]<<24) | (d[1]<<16) | (d[2]<<8) | d[3];
memcpy(&ret, &inter, 4);
return ret;
}
u32 get_u16(void* vd) {
u8 *d = (u8*)vd;
return (d[0]<<8) | d[1];
}
void hexdump(u8* d, int l) {
int i;
for(i=0;i<l;i++) {
if(i!=0 && (i%16)==0) ConLog.Write("\n");
ConLog.Write("%2.2X ", d[i]);
}
ConLog.Write("\n");
}
void hexdump_nl(u8* d, int l) {
int i;
for(i=0;i<l;i++) {
ConLog.Write("%2.2X ", d[i]);
}
ConLog.Write("\n");
}
void hexdump_ns(u8* d, int l) {
int i;
for(i=0;i<l;i++) {
ConLog.Write("%2.2X", d[i]);
}
}
void hexdump_c(u8* d, int l) {
int i;
for(i=0;i<l;i++) {
ConLog.Write("0x%2.2X", d[i]);
if(i!=(l-1)) {
ConLog.Write(",");
}
}
}
void hexdump_32(u8* d, int l) {
int i;
for(i=0;i<l;i+=4) {
if(i!=0 && (i%16)==0) printf("\n");
ConLog.Write("%8X ", get_u32(d+i));
}
ConLog.Write("\n");
}

405
unpkg/unpkg.c Normal file
View file

@ -0,0 +1,405 @@
/*
* Copyright 2011 Andrey Tolstoy <avtolstoy@gmail.com>
*
* 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; either version 2 of
* the License, or (at your option) any later version.
*
* 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 for more details.
*
*/
#include "unpkg.h"
#include "ps3_common.h"
#include "oddkeys.h"
static void hash_tostring(char *str, u8 *hash, u32 len)
{
u8 *p;
memset(str, 0, 2*len+1);
for (p = hash; p-hash < len; p++)
{
str += 2;
}
}
static void *pkg_open(const char *fname)
{
FILE *f;
f = fopen(fname, "rb");
if (f == NULL)
{
ConLog.Error ("UnPkg: Could not open package file!");
return NULL;
}
return f;
}
static int pkg_sanity_check(FILE *f, FILE *g, pkg_header **h_ptr, const char *fname)
{
pkg_header *header = (pkg_header*)malloc(sizeof(pkg_header));
u64 tmp;
if (!fread(header, sizeof(pkg_header), 1, f))
{
ConLog.Error("UnPkg: Package file is too short!");
return 1;
}
// some sanity checks
if (ntohl(header->magic) != PKG_MAGIC)
{
ConLog.Error("UnPkg: Not a package file!");
return 1;
}
switch (ntohl(header->rel_type) >> 16 & (0xffff))
{
case PKG_RELEASE_TYPE_DEBUG:
{
ConLog.Warning ("UnPkg: Debug PKG detected.");
u8* data;
u8 sha_key[0x40];
int i;
f= fopen(fname, "rb");
fseek(f, 0, SEEK_END);
int nlen = ftell(f);
fseek(f, 0, SEEK_SET);
data = (u8*)malloc(nlen);
fread(data, 1, nlen, f);
fclose(f);
pkg_header2 *header = (pkg_header2 *)data;
int data_offset = get_u64(&(header->dataOffset));
int data_size = get_u64(&(header->dataSize));
// decrypt debug
u8 sha_crap[0x40];
memset(sha_crap, 0, 0x40);
memcpy(sha_crap, &data[0x60], 8);
memcpy(sha_crap+0x8, &data[0x60], 8);
memcpy(sha_crap+0x10, &data[0x68], 8);
memcpy(sha_crap+0x18, &data[0x68], 8);
int dptr;
for(dptr = data_offset; dptr < (data_offset+data_size); dptr+=0x10) {
u8 hash[0x14];
sha1(sha_crap, 0x40, hash);
for(i=0;i<0x10;i++) data[dptr+i] ^= hash[i];
set_u64(sha_crap+0x38, get_u64(sha_crap+0x38)+1);
}
// recrypt retail
u8 pkg_key[0x10];
memcpy(pkg_key, &data[0x70], 0x10);
//AES_KEY aes_key;
aes_context aes_key;
aes_setkey_enc(&aes_key, retail_pkg_aes_key, 128);
size_t num=0; u8 ecount_buf[0x10]; memset(ecount_buf, 0, 0x10);
aes_crypt_ctr(&aes_key, data_size, &num, pkg_key, ecount_buf, &data[data_offset], &data[data_offset]);
// write back
g = fopen(fname, "wb");
data[4] = 0x80; // set finalize flag
memset(&data[(data_offset+data_size)], 0, 0x60);
// add hash
sha1(data, nlen-0x20, &data[nlen-0x20]);
fwrite(data, 1, nlen, g);
//fclose(g); // not close the file for continuing
fseek(g, 0, SEEK_END);
tmp = ftell(g);
}
break;
case PKG_RELEASE_TYPE_RELEASE:
{
ConLog.Warning ("UnPkg: Retail PKG detected.");
fseek(f, 0, SEEK_END);
tmp = ftell(f);
}
break;
default:
ConLog.Error("UnPkg: Unknown release type.");
return 1;
}
switch (ntohl(header->rel_type) & (0xffff))
{
case PKG_PLATFORM_TYPE_PS3:
case PKG_PLATFORM_TYPE_PSP:
break;
default:
ConLog.Error("UnPkg: Unknown platform type.");
return 1;
}
if (ntohl(header->header_size) != PKG_HEADER_SIZE)
{
ConLog.Error("UnPkg: Wrong header size: ");
return 1;
}
//fseek(g, 0, SEEK_END);
//tmp = ftell(g);
if (ntohll(header->pkg_size) != tmp)
{
ConLog.Error("UnPkg: File size mismatch.");
return 1;
}
tmp -= ntohll(header->data_offset) + 0x60;
if (ntohll(header->data_size) != tmp)
{
ConLog.Error("UnPkg: Data size mismatch.");
return 1;
}
if (h_ptr != NULL)
{
(*h_ptr) = (pkg_header*) malloc(sizeof(pkg_header));
memcpy(h_ptr, &header, sizeof(pkg_header*));
}
return 0;
}
static void print_pkg_header(pkg_header *header)
{
char qa[33], kl[33];
if (header == NULL)
return;
hash_tostring(qa, header->qa_digest, sizeof(header->qa_digest));
hash_tostring(kl, header->klicensee, sizeof(header->klicensee));
ConLog.Write("Magic: %x\n", ntohl(header->magic));
ConLog.Write("Release Type: %x\n", ntohl(header->rel_type) >> 16 & (0xffff));
ConLog.Write("Platform Type: %x\n", ntohl(header->rel_type) & (0xffff));
ConLog.Write("Header size: %x\n", ntohl(header->header_size));
ConLog.Write("Unk1: %x\n", ntohl(header->unk1));
ConLog.Write("Metadata size: %x\n", ntohl(header->meta_size));
ConLog.Write("File count: %u\n", ntohl(header->file_count));
ConLog.Write("Pkg size: %llu\n", ntohll(header->pkg_size));
ConLog.Write("Data offset: %llx\n", ntohll(header->data_offset));
ConLog.Write("Data size: %llu\n", ntohll(header->data_size));
ConLog.Write("TitleID: %s\n", header->title_id);
ConLog.Write("QA Digest: %s\n", qa);
ConLog.Write( "KLicensee: %s\n", kl);
}
static void *pkg_info(const char *fname, pkg_header **h_ptr)
{
FILE *f;
pkg_header *header;
f = (FILE*) pkg_open(fname);
if (f == NULL)
return NULL;
if (pkg_sanity_check(f, NULL, &header, fname))
return NULL;
print_pkg_header(header);
if (h_ptr != NULL)
{
(*h_ptr) = header;
}
else
{
free(header);
}
return f;
}
static void pkg_crypt(const u8 *key, const u8 *kl, FILE *f,
u64 len, FILE *out)
{
aes_context c;
u32 parts, bits;
u32 i, j;
u8 iv[HASH_LEN];
u8 buf[BUF_SIZE];
u8 ctr[BUF_SIZE];
u8 out_buf[BUF_SIZE];
u32 l;
u64 hi, lo;
parts = len / BUF_SIZE;
if (len % BUF_SIZE != 0)
parts++;
memcpy(iv, kl, sizeof(iv));
aes_setkey_enc(&c, key, 128);
for (i = 0; i<parts; i++)
{
l = fread(buf, 1, BUF_SIZE, f);
bits = l / HASH_LEN;
if (bits % HASH_LEN != 0)
bits++;
for (j = 0; j<bits; j++)
{
aes_crypt_ecb(&c, AES_ENCRYPT, iv, ctr+j*HASH_LEN);
hi = unpack64(iv);
lo = unpack64(iv+8) + 1;
if (lo == 0)
hi++;
pack64(iv, hi);
pack64(iv + 8, lo);
}
memset(out_buf, 0, sizeof(out_buf));
for (j=0; j<l; j++)
{
out_buf[j] = buf[j] ^ ctr[j];
}
fwrite(out_buf, 1, l, out);
}
}
static void pkg_unpack_file(pkg_file_entry *fentry, FILE *dec)
{
FILE *out = NULL;
u64 size;
u32 tmp;
u8 buf[BUF_SIZE];
fseek(dec, fentry->name_offset, SEEK_SET);
memset(buf, 0, sizeof(buf));
fread(buf, fentry->name_size, 1, dec);
switch (fentry->type & (0xffff))
{
case PKG_FILE_ENTRY_NPDRM:
case PKG_FILE_ENTRY_NPDRMEDAT:
case PKG_FILE_ENTRY_SDAT:
case PKG_FILE_ENTRY_REGULAR:
out = fopen((char *)buf, "wb");
fseek(dec, fentry->file_offset, SEEK_SET);
for (size = 0; size < fentry->file_size; )
{
size += fread(buf, sizeof(u8), BUF_SIZE, dec);
if (size > fentry->file_size)
tmp = size - fentry->file_size;
else
tmp = 0;
fwrite(buf, sizeof(u8), BUF_SIZE - tmp, out);
}
fclose(out);
break;
case PKG_FILE_ENTRY_FOLDER:
mkdir ((char *)buf);
break;
}
}
static void pkg_unpack_data(u32 file_count, FILE *dec)
{
u32 i;
pkg_file_entry *file_table = NULL;
fseek(dec, 0, SEEK_SET);
file_table = (pkg_file_entry *)malloc(sizeof(pkg_file_entry)*file_count);
i = fread(file_table, sizeof(pkg_file_entry), file_count, dec);
if (ntohl(file_table->name_offset) / sizeof(pkg_file_entry) != file_count)
{
ConLog.Error("UnPkg: ERROR. Impossiburu!");
return;
}
for (i = 0; i<file_count; i++)
{
(file_table+i)->name_offset = ntohl((file_table+i)->name_offset);
(file_table+i)->name_size = ntohl((file_table+i)->name_size);
(file_table+i)->file_offset = ntohll((file_table+i)->file_offset);
(file_table+i)->file_size = ntohll((file_table+i)->file_size);
(file_table+i)->type = ntohl((file_table+i)->type);
pkg_unpack_file(file_table+i, dec);
}
free(file_table);
}
static void pkg_unpack(const char *fname)
{
FILE *f, *dec;
char *dec_fname;
pkg_header *header;
int ret;
struct stat sb;
f = (FILE*) pkg_info(fname, &header);
if (f == NULL)
return;
fseek(f, ntohll(header->data_offset), SEEK_SET);
dec_fname = (char*)malloc(strlen(fname)+4);
memset(dec_fname, 0, strlen(fname)+4);
sprintf(dec_fname, "%s.dec", fname);
dec = fopen(dec_fname, "wb+");
if (dec == NULL)
{
ConLog.Error("UnPkg: Could not create temp file for decrypted data.");
free(header);
return;
}
unlink(dec_fname);
pkg_crypt(PKG_AES_KEY, header->klicensee, f, ntohll(header->data_size),
dec);
fseek(dec, 0, SEEK_SET);
fclose(f);
if (stat(header->title_id, &sb) != 0)
{
ret = mkdir(header->title_id);
if (ret < 0)
{
ConLog.Error("UnPkg: Could not mkdir.");
free(header);
return;
}
}
chdir(header->title_id);
pkg_unpack_data(ntohl(header->file_count), dec);
fclose(dec);
}

176
unpkg/unpkg.h Normal file
View file

@ -0,0 +1,176 @@
/*
* Copyright 2011 Andrey Tolstoy <avtolstoy@gmail.com>
*
* 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; either version 2 of
* the License, or (at your option) any later version.
*
* 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 for more details.
*
*/
#ifndef UNPKG_H_
#define UNPKG_H_
#include "stdafx.h"
#include "scetool/aes.h"
#include "scetool/sha1.h"
#define ntohll(x) (((u64) ntohl (x) << 32) | (u64) ntohl (x >> 32) )
#define htonll(x) (((u64) htonl (x) << 32) | (u64) htonl (x >> 32) )
#define conv_ntohl(x) { x = ntohl(x); }
#define conv_ntohll(x) { x = ntohll(x); }
#define conv_htonl(x) { x = htonl(x); }
#define conv_htonll(x) { x = htonll(x); }
#define unpack32(x) ((u32) ((u32)*(x) << 24 | \
(u32)*(x+1) << 16 | \
(u32)*(x+2) << 8 | \
(u32)*(x+3) << 0))
#define unpack64(x) ((u64)unpack32(x) << 32 | (u64)unpack32(x+4))
#define pack32(x, p) \
{ \
*(x) = (u8)(p >> 24); \
*((x)+1) = (u8)(p >> 16); \
*((x)+2) = (u8)(p >> 8); \
*((x)+3) = (u8)(p >> 0); \
}
#define pack64(x, p) { pack32((x + 4), p); pack32((x), p >> 32); }
#define HASH_LEN 16
#define BUF_SIZE 4096
typedef struct {
u32 magic; // magic 0x7f504b47
u32 rel_type; // release type
u32 header_size; // 0xc0
u32 unk1; //some pkg version maybe
u32 meta_size; //size of metadata (block after header & hashes)
u32 file_count; // number of files
u64 pkg_size; // pkg size in bytes
u64 data_offset; // encrypted data offset
u64 data_size; // encrypted data size in bytes
char title_id[48]; // title id
u8 qa_digest[16]; // this should be the hash of "files + attribs"
u8 klicensee[16]; // nonce
} pkg_header;
typedef struct {
u8 hash1[16];
u8 hash2[16];
u8 hash3[16];
u8 hash4[16];
} pkg_unk_checksum;
/*
is it in meta or sfo?
# CATEGORY : HG
# BOOTABLE : YES
# VERSION : 01.00
# APP_VER : 01.00
# PS3_SYSTEM_VER : 03.0000
*/
/* meta hell structure */
typedef struct {
u32 unk1;
u32 unk2;
u32 drm_type;
u32 unk3;
u32 unk4;
u32 unk5;
u32 unk6;
u32 unk7;
u32 unk8;
u32 unk9;
u32 unk10;
u32 unk11;
u32 data_size;
u32 unk12;
u32 unk13;
u32 packager;
u8 unk14[64];
} pkg_meta;
typedef struct {
u32 name_offset; // file name offset
u32 name_size; // file name size
u64 file_offset; // file offset
u64 file_size; // file size
u32 type; // file type
/*
0x80000003 - regular file
0x80000001 - npdrm
0x80000004 - folder
0x80000009 - sdat ?
0x80000002 - npdrm.edat ?
*/
u32 pad; // padding (zeros)
} pkg_file_entry;
typedef struct {
pkg_file_entry fe;
char *name;
char *path;
} file_table_tr;
#define PKG_MAGIC 0x7f504b47 // \x7fPKG
#define PKG_HEADER_SIZE sizeof(pkg_header) + sizeof(pkg_unk_checksum)
#define PKG_RELEASE_TYPE_RELEASE 0x8000
#define PKG_RELEASE_TYPE_DEBUG 0x0000
#define PKG_PLATFORM_TYPE_PS3 0x0001
#define PKG_PLATFORM_TYPE_PSP 0x0002
#define PKG_FILE_ENTRY_OVERWRITE 0x80000000
#define PKG_FILE_ENTRY_NPDRM 0x0001
#define PKG_FILE_ENTRY_NPDRMEDAT 0x0002 // npdrm.edat
#define PKG_FILE_ENTRY_REGULAR 0x0003
#define PKG_FILE_ENTRY_FOLDER 0x0004
#define PKG_FILE_ENTRY_SDAT 0x0009 // .sdat ?
static const u8 PKG_AES_KEY[16] = {
0x2e, 0x7b, 0x71, 0xd7,
0xc9, 0xc9, 0xa1, 0x4e,
0xa3, 0x22, 0x1f, 0x18,
0x88, 0x28, 0xb8, 0xf8
};
static void hash_tostring(char *str, u8 *hash, u32 len);
static void *pkg_open(const char *fname);
static int pkg_sanity_check(FILE *f, FILE *g, pkg_header **h_ptr, const char *fname);
static void print_pkg_header(pkg_header *header);
static void *pkg_info(const char *fname, pkg_header **h_ptr);
static void pkg_crypt(const u8 *key, const u8 *kl, FILE *f,
u64 len, FILE *out);
static void pkg_unpack(const char *fname);
static void pkg_unpack_data(u32 file_count, FILE *dec);
static void pkg_unpack_file(pkg_file_entry *fentry, FILE *dec);;
static int pkg_pack_data(file_table_tr *ftr, pkg_file_entry *table,
int file_count, sha1_context *ctx, FILE *out);
static void *pkg_pack_create_filetable(file_table_tr *tr, int file_count,
char **n_table, u32 *n_table_len);
#endif