diff --git a/rpcs3/Emu/SysCalls/ErrorCodes.h b/rpcs3/Emu/SysCalls/ErrorCodes.h index 9cedbc510b..373c806539 100644 --- a/rpcs3/Emu/SysCalls/ErrorCodes.h +++ b/rpcs3/Emu/SysCalls/ErrorCodes.h @@ -1,66 +1,69 @@ #pragma once -enum ErrorCode -{ - CELL_OK = 0x00000000, - CELL_EAGAIN = 0x80010001, //The resource is temporarily unavailable - CELL_EINVAL = 0x80010002, //An invalid argument value is specified - CELL_ENOSYS = 0x80010003, //The feature is not yet implemented - CELL_ENOMEM = 0x80010004, //Memory allocation failure - CELL_ESRCH = 0x80010005, //The resource with the specified identifier does not exist - CELL_ENOENT = 0x80010006, //The file does not exist - CELL_ENOEXEC = 0x80010007, //The file is in unrecognized format - CELL_EDEADLK = 0x80010008, //Resource deadlock is avoided - CELL_EPERM = 0x80010009, //The operation is not permitted - CELL_EBUSY = 0x8001000A, //The device or resource is busy - CELL_ETIMEDOUT = 0x8001000B, //The operation is timed out - CELL_EABORT = 0x8001000C, //The operation is aborted - CELL_EFAULT = 0x8001000D, //Invalid memory access - CELL_ESTAT = 0x8001000F, //State of the target thread is invalid - CELL_EALIGN = 0x80010010, //Alignment is invalid. - CELL_EKRESOURCE = 0x80010011, //Shortage of the kernel resources - CELL_EISDIR = 0x80010012, //The file is a directory - CELL_ECANCELED = 0x80010013, //Operation canceled - CELL_EEXIST = 0x80010014, //Entry already exists - CELL_EISCONN = 0x80010015, //Port is already connected - CELL_ENOTCONN = 0x80010016, //Port is not connected - CELL_EAUTHFAIL = 0x80010017, //Program authentication fail - CELL_ENOTMSELF = 0x80010018, //The file is not a MSELF - CELL_ESYSVER = 0x80010019, //System version error - CELL_EAUTHFATAL = 0x8001001A, //Fatal system error - CELL_EDOM = 0x8001001B, - CELL_ERANGE = 0x8001001C, - CELL_EILSEQ = 0x8001001D, - CELL_EFPOS = 0x8001001E, - CELL_EINTR = 0x8001001F, - CELL_EFBIG = 0x80010020, - CELL_EMLINK = 0x80010021, - CELL_ENFILE = 0x80010022, - CELL_ENOSPC = 0x80010023, - CELL_ENOTTY = 0x80010024, - CELL_EPIPE = 0x80010025, - CELL_EROFS = 0x80010026, - CELL_ESPIPE = 0x80010027, - CELL_E2BIG = 0x80010028, - CELL_EACCES = 0x80010029, - CELL_EBADF = 0x8001002A, - CELL_EIO = 0x8001002B, - CELL_EMFILE = 0x8001002C, - CELL_ENODEV = 0x8001002D, - CELL_ENOTDIR = 0x8001002E, - CELL_ENXIO = 0x8001002F, - CELL_EXDEV = 0x80010030, - CELL_EBADMSG = 0x80010031, - CELL_EINPROGRESS = 0x80010032, - CELL_EMSGSIZE = 0x80010033, - CELL_ENAMETOOLONG = 0x80010034, - CELL_ENOLCK = 0x80010035, - CELL_ENOTEMPTY = 0x80010036, - CELL_ENOTSUP = 0x80010037, - CELL_EFSSPECIFIC = 0x80010038, - CELL_EOVERFLOW = 0x80010039, - CELL_ENOTMOUNTED = 0x8001003A, - CELL_ENOTSDATA = 0x8001003B, +#define ERROR_CODE(code) static_cast(code) - CELL_UNKNOWN_ERROR = 0xFFFFFFFF, -}; \ No newline at end of file +enum : s32 +{ + CELL_OK = 0, + + CELL_EAGAIN = ERROR_CODE(0x80010001), // The resource is temporarily unavailable + CELL_EINVAL = ERROR_CODE(0x80010002), // An invalid argument value is specified + CELL_ENOSYS = ERROR_CODE(0x80010003), // The feature is not yet implemented + CELL_ENOMEM = ERROR_CODE(0x80010004), // Memory allocation failure + CELL_ESRCH = ERROR_CODE(0x80010005), // The resource with the specified identifier does not exist + CELL_ENOENT = ERROR_CODE(0x80010006), // The file does not exist + CELL_ENOEXEC = ERROR_CODE(0x80010007), // The file is in unrecognized format + CELL_EDEADLK = ERROR_CODE(0x80010008), // Resource deadlock is avoided + CELL_EPERM = ERROR_CODE(0x80010009), // The operation is not permitted + CELL_EBUSY = ERROR_CODE(0x8001000A), // The device or resource is busy + CELL_ETIMEDOUT = ERROR_CODE(0x8001000B), // The operation is timed out + CELL_EABORT = ERROR_CODE(0x8001000C), // The operation is aborted + CELL_EFAULT = ERROR_CODE(0x8001000D), // Invalid memory access + CELL_ESTAT = ERROR_CODE(0x8001000F), // State of the target thread is invalid + CELL_EALIGN = ERROR_CODE(0x80010010), // Alignment is invalid. + CELL_EKRESOURCE = ERROR_CODE(0x80010011), // Shortage of the kernel resources + CELL_EISDIR = ERROR_CODE(0x80010012), // The file is a directory + CELL_ECANCELED = ERROR_CODE(0x80010013), // Operation canceled + CELL_EEXIST = ERROR_CODE(0x80010014), // Entry already exists + CELL_EISCONN = ERROR_CODE(0x80010015), // Port is already connected + CELL_ENOTCONN = ERROR_CODE(0x80010016), // Port is not connected + CELL_EAUTHFAIL = ERROR_CODE(0x80010017), // Program authentication fail + CELL_ENOTMSELF = ERROR_CODE(0x80010018), // The file is not a MSELF + CELL_ESYSVER = ERROR_CODE(0x80010019), // System version error + CELL_EAUTHFATAL = ERROR_CODE(0x8001001A), // Fatal system error + CELL_EDOM = ERROR_CODE(0x8001001B), + CELL_ERANGE = ERROR_CODE(0x8001001C), + CELL_EILSEQ = ERROR_CODE(0x8001001D), + CELL_EFPOS = ERROR_CODE(0x8001001E), + CELL_EINTR = ERROR_CODE(0x8001001F), + CELL_EFBIG = ERROR_CODE(0x80010020), + CELL_EMLINK = ERROR_CODE(0x80010021), + CELL_ENFILE = ERROR_CODE(0x80010022), + CELL_ENOSPC = ERROR_CODE(0x80010023), + CELL_ENOTTY = ERROR_CODE(0x80010024), + CELL_EPIPE = ERROR_CODE(0x80010025), + CELL_EROFS = ERROR_CODE(0x80010026), + CELL_ESPIPE = ERROR_CODE(0x80010027), + CELL_E2BIG = ERROR_CODE(0x80010028), + CELL_EACCES = ERROR_CODE(0x80010029), + CELL_EBADF = ERROR_CODE(0x8001002A), + CELL_EIO = ERROR_CODE(0x8001002B), + CELL_EMFILE = ERROR_CODE(0x8001002C), + CELL_ENODEV = ERROR_CODE(0x8001002D), + CELL_ENOTDIR = ERROR_CODE(0x8001002E), + CELL_ENXIO = ERROR_CODE(0x8001002F), + CELL_EXDEV = ERROR_CODE(0x80010030), + CELL_EBADMSG = ERROR_CODE(0x80010031), + CELL_EINPROGRESS = ERROR_CODE(0x80010032), + CELL_EMSGSIZE = ERROR_CODE(0x80010033), + CELL_ENAMETOOLONG = ERROR_CODE(0x80010034), + CELL_ENOLCK = ERROR_CODE(0x80010035), + CELL_ENOTEMPTY = ERROR_CODE(0x80010036), + CELL_ENOTSUP = ERROR_CODE(0x80010037), + CELL_EFSSPECIFIC = ERROR_CODE(0x80010038), + CELL_EOVERFLOW = ERROR_CODE(0x80010039), + CELL_ENOTMOUNTED = ERROR_CODE(0x8001003A), + CELL_ENOTSDATA = ERROR_CODE(0x8001003B), + + CELL_UNKNOWN_ERROR = -1, +}; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index 6020324200..2b201f20a0 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -145,7 +145,7 @@ s32 pngReadHeader( { auto file = Emu.GetIdManager().GetIDData(stream->fd); file->Seek(0); - file->Read(buffer, buffer.size()); + file->Read(buffer.begin(), buffer.size()); break; } }