mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Move JPEG error codes to the big enum, some include cleanup
This commit is contained in:
parent
999bf59ae1
commit
0f840e6240
43 changed files with 82 additions and 45 deletions
|
@ -24,6 +24,7 @@
|
|||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/Util/PPGeDraw.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/sceCtrl.h"
|
||||
#include "Core/HLE/sceUtility.h"
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "Core/HLE/sceCtrl.h"
|
||||
#include "Core/HLE/sceUtility.h"
|
||||
#include "Core/HLE/sceNp.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/Dialog/PSPNpSigninDialog.h"
|
||||
#include "Common/Data/Encoding/Utf8.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "Core/Dialog/PSPDialog.h"
|
||||
#include "Core/Dialog/PSPScreenshotDialog.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/MemMap.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "Core/ELF/ElfReader.h"
|
||||
#include "Core/Debugger/MemBlockInfo.h"
|
||||
#include "Core/Debugger/SymbolMap.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/sceKernelModule.h"
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "Common.h"
|
||||
#include "Common/File/Path.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
|
||||
enum FileAccess {
|
||||
FILEACCESS_NONE = 0,
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/System.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceAtrac.h"
|
||||
#include "Core/HLE/AtracCtx.h"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
#include "Common/Log.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/System.h"
|
||||
#include "Core/HLE/AtracCtx2.h"
|
||||
|
|
|
@ -433,6 +433,15 @@ enum PSPErrorCode : u32 {
|
|||
SCE_PSMFPLAYER_ERROR_INVALID_PARAM = 0x80616008,
|
||||
SCE_PSMFPLAYER_ERROR_NO_MORE_DATA = 0x8061600c,
|
||||
|
||||
SCE_JPEG_ERROR_INVALID_DATA = 0x80650004,
|
||||
SCE_JPEG_ERROR_INVALID_COLORSPACE = 0x80650013,
|
||||
SCE_JPEG_ERROR_INVALID_SIZE = 0x80650020,
|
||||
SCE_JPEG_ERROR_NO_SOI = 0x80650023,
|
||||
SCE_JPEG_ERROR_INVALID_STATE = 0x80650039,
|
||||
SCE_JPEG_ERROR_OUT_OF_MEMORY = 0x80650041,
|
||||
SCE_JPEG_ERROR_ALREADY_INIT = 0x80650042,
|
||||
SCE_JPEG_ERROR_INVALID_VALUE = 0x80650051,
|
||||
|
||||
SCE_FONT_ERROR_OUT_OF_MEMORY = 0x80460001,
|
||||
SCE_FONT_ERROR_INVALID_LIBID = 0x80460002,
|
||||
SCE_FONT_ERROR_INVALID_PARAMETER = 0x80460003,
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/MIPS/MIPSCodeUtils.h"
|
||||
#include "Core/HLE/HLETables.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
#include "Core/HLE/sceKernelInterrupt.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/HLEHelperThread.h"
|
||||
#include "Core/HLE/KernelWaitHelpers.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
#include "Common/StringUtils.h"
|
||||
#include "Core/HLE/NetInetConstants.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#ifdef __MINGW32__
|
||||
#include <mswsock.h>
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include "Core/WaveFile.h"
|
||||
#include "Core/ELF/ParamSFO.h"
|
||||
#include "Core/HLE/sceKernelTime.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "StringUtils.h"
|
||||
#endif
|
||||
#include "Core/HLE/__sceAudio.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "Common/Serialize/Serializer.h"
|
||||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
#include "Core/HLE/sceAudio.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "Common/Math/math_util.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceCtrl.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
#include "Core/Core.h"
|
||||
#include "Core/System.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceDisplay.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/Reporting.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceDmac.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "Common/Serialize/SerializeMap.h"
|
||||
#include "Common/Data/Collections/ThreadSafeList.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/CoreParameter.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "Core/MemMap.h"
|
||||
#include "Core/Reporting.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/sceHeap.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Core/Debugger/MemBlockInfo.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceJpeg.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
|
@ -56,17 +57,6 @@ void __JpegInit() {
|
|||
mjpegHeight = 0;
|
||||
}
|
||||
|
||||
enum : uint32_t {
|
||||
ERROR_JPEG_INVALID_DATA = 0x80650004,
|
||||
ERROR_JPEG_INVALID_COLORSPACE = 0x80650013,
|
||||
ERROR_JPEG_INVALID_SIZE = 0x80650020,
|
||||
ERROR_JPEG_NO_SOI = 0x80650023,
|
||||
ERROR_JPEG_INVALID_STATE = 0x80650039,
|
||||
ERROR_JPEG_OUT_OF_MEMORY = 0x80650041,
|
||||
ERROR_JPEG_ALREADY_INIT = 0x80650042,
|
||||
ERROR_JPEG_INVALID_VALUE = 0x80650051,
|
||||
};
|
||||
|
||||
void __JpegDoState(PointerWrap &p) {
|
||||
auto s = p.Section("sceJpeg", 1, 2);
|
||||
if (!s)
|
||||
|
@ -112,7 +102,7 @@ static u32 convertYCbCrToABGR(int y, int cb, int cr) {
|
|||
|
||||
static int JpegCsc(u32 imageAddr, u32 yCbCrAddr, int widthHeight, int bufferWidth, uint32_t chroma, int &usec) {
|
||||
if ((chroma & 0x000FFFFF) != 0x00020202 && (chroma & 0x000FFFFF) != 0x00020201 && (chroma & 0x000FFFFF) != 0x00020101)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_COLORSPACE, "invalid colorspace");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_COLORSPACE, "invalid colorspace");
|
||||
if (bufferWidth < 0)
|
||||
bufferWidth = 0;
|
||||
|
||||
|
@ -128,9 +118,9 @@ static int JpegCsc(u32 imageAddr, u32 yCbCrAddr, int widthHeight, int bufferWidt
|
|||
|
||||
uint64_t destSize = ((uint64_t)bufferWidth * (height - 1) + width) * 4;
|
||||
if (destSize > 0x3FFFFFFF || !Memory::IsValidRange(imageAddr, (uint32_t)destSize))
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_VALUE, "invalid dest address or size");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_VALUE, "invalid dest address or size");
|
||||
if (sizeY > 0x3FFFFFFF || !Memory::IsValidRange(yCbCrAddr, sizeY + sizeCb + sizeCb))
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_VALUE, "invalid src address or size");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_VALUE, "invalid src address or size");
|
||||
|
||||
u32_le *imageBuffer = (u32_le *)Memory::GetPointerWriteUnchecked(imageAddr);
|
||||
const u8 *Y = (const u8 *)Memory::GetPointerUnchecked(yCbCrAddr);
|
||||
|
@ -188,9 +178,9 @@ static int JpegMJpegCsc(u32 imageAddr, u32 yCbCrAddr, int widthHeight, int buffe
|
|||
int sizeCb = sizeY >> 2;
|
||||
|
||||
if (width > 720 || height > 480)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "invalid size, max 720x480");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "invalid size, max 720x480");
|
||||
if (bufferWidth > 1024)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "invalid stride, max 1024");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "invalid stride, max 1024");
|
||||
uint32_t destSize = (bufferWidth * (height - 1) + width) * 4;
|
||||
if (!Memory::IsValidRange(imageAddr, destSize))
|
||||
return hleLogError(Log::ME, SCE_KERNEL_ERROR_INVALID_POINTER, "invalid dest address or size");
|
||||
|
@ -271,15 +261,15 @@ static u32 convertARGBtoABGR(u32 argb) {
|
|||
|
||||
static int DecodeJpeg(u32 jpegAddr, int jpegSize, u32 imageAddr, int &usec) {
|
||||
if (!Memory::IsValidRange(jpegAddr, jpegSize))
|
||||
return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "invalid jpeg address");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "invalid jpeg address");
|
||||
if (jpegSize == 0)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "invalid jpeg data");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "invalid jpeg data");
|
||||
|
||||
NotifyMemInfo(MemBlockFlags::READ, jpegAddr, jpegSize, "JpegDecodeMJpeg");
|
||||
|
||||
const u8 *buf = Memory::GetPointerUnchecked(jpegAddr);
|
||||
if (jpegSize < 2 || buf[0] != 0xFF || buf[1] != 0xD8)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "no SOI found, invalid data");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "no SOI found, invalid data");
|
||||
|
||||
int width, height, actual_components;
|
||||
unsigned char *jpegBuf = jpgd::decompress_jpeg_image_from_memory(buf, jpegSize, &width, &height, &actual_components, 3);
|
||||
|
@ -292,7 +282,7 @@ static int DecodeJpeg(u32 jpegAddr, int jpegSize, u32 imageAddr, int &usec) {
|
|||
}
|
||||
|
||||
if (jpegBuf == nullptr) {
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "unable to decompress jpeg");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "unable to decompress jpeg");
|
||||
}
|
||||
|
||||
usec += (width * height) / 14;
|
||||
|
@ -304,7 +294,7 @@ static int DecodeJpeg(u32 jpegAddr, int jpegSize, u32 imageAddr, int &usec) {
|
|||
// Note: even if you Delete, the size is still allowed.
|
||||
if (width > mjpegWidth || height > mjpegHeight) {
|
||||
free(jpegBuf);
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "invalid output address");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "invalid output address");
|
||||
}
|
||||
if (mjpegInited == 0) {
|
||||
// If you finish after setting the size, then call this - you get an interesting error.
|
||||
|
@ -368,15 +358,15 @@ static int getYCbCrBufferSize(int w, int h) {
|
|||
|
||||
static int JpegGetOutputInfo(u32 jpegAddr, int jpegSize, u32 colourInfoAddr) {
|
||||
if (!Memory::IsValidRange(jpegAddr, jpegSize))
|
||||
return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "invalid jpeg address");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "invalid jpeg address");
|
||||
if (jpegSize == 0)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "invalid jpeg data");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "invalid jpeg data");
|
||||
|
||||
NotifyMemInfo(MemBlockFlags::READ, jpegAddr, jpegSize, "JpegGetOutputInfo");
|
||||
|
||||
const u8 *buf = Memory::GetPointerUnchecked(jpegAddr);
|
||||
if (jpegSize < 2 || buf[0] != 0xFF || buf[1] != 0xD8)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "no SOI found, invalid data");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "no SOI found, invalid data");
|
||||
|
||||
int width, height, actual_components;
|
||||
unsigned char *jpegBuf = jpgd::decompress_jpeg_image_from_memory(buf, jpegSize, &width, &height, &actual_components, 3);
|
||||
|
@ -389,7 +379,7 @@ static int JpegGetOutputInfo(u32 jpegAddr, int jpegSize, u32 colourInfoAddr) {
|
|||
}
|
||||
|
||||
if (jpegBuf == nullptr) {
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "unable to decompress jpeg");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "unable to decompress jpeg");
|
||||
}
|
||||
|
||||
free(jpegBuf);
|
||||
|
@ -506,15 +496,15 @@ static int JpegConvertRGBToYCbCr(const void *data, u8 *output, int width, int he
|
|||
|
||||
static int JpegDecodeMJpegYCbCr(u32 jpegAddr, int jpegSize, u32 yCbCrAddr, int yCbCrSize, int &usec) {
|
||||
if (!Memory::IsValidRange(jpegAddr, jpegSize))
|
||||
return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "invalid jpeg address");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "invalid jpeg address");
|
||||
if (jpegSize == 0)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "invalid jpeg data");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "invalid jpeg data");
|
||||
|
||||
NotifyMemInfo(MemBlockFlags::READ, jpegAddr, jpegSize, "JpegDecodeMJpegYCbCr");
|
||||
|
||||
const u8 *buf = Memory::GetPointerUnchecked(jpegAddr);
|
||||
if (jpegSize < 2 || buf[0] != 0xFF || buf[1] != 0xD8)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_NO_SOI, "no SOI found, invalid data");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_NO_SOI, "no SOI found, invalid data");
|
||||
|
||||
int width, height, actual_components;
|
||||
unsigned char *jpegBuf = jpgd::decompress_jpeg_image_from_memory(buf, jpegSize, &width, &height, &actual_components, 3);
|
||||
|
@ -527,12 +517,12 @@ static int JpegDecodeMJpegYCbCr(u32 jpegAddr, int jpegSize, u32 yCbCrAddr, int y
|
|||
}
|
||||
|
||||
if (jpegBuf == nullptr) {
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_DATA, "unable to decompress jpeg");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_DATA, "unable to decompress jpeg");
|
||||
}
|
||||
|
||||
if (yCbCrSize < getYCbCrBufferSize(width, height)) {
|
||||
free(jpegBuf);
|
||||
return hleLogError(Log::ME, ERROR_JPEG_OUT_OF_MEMORY, "buffer not large enough");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_OUT_OF_MEMORY, "buffer not large enough");
|
||||
}
|
||||
|
||||
// Technically, it seems like the PSP doesn't support grayscale, but we might as well.
|
||||
|
@ -559,7 +549,7 @@ static int sceJpegDecodeMJpegYCbCr(u32 jpegAddr, int jpegSize, u32 yCbCrAddr, in
|
|||
if ((yCbCrAddr | yCbCrSize | (yCbCrAddr + yCbCrSize)) & 0x80000000)
|
||||
return hleLogError(Log::ME, SCE_KERNEL_ERROR_PRIV_REQUIRED, "invalid output address");
|
||||
if (!Memory::IsValidRange(jpegAddr, jpegSize))
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_VALUE, "invalid jpeg address");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_VALUE, "invalid jpeg address");
|
||||
|
||||
int usec = 300;
|
||||
int result = JpegDecodeMJpegYCbCr(jpegAddr, jpegSize, yCbCrAddr, yCbCrSize, usec);
|
||||
|
@ -585,11 +575,11 @@ static int sceJpeg_9B36444C() {
|
|||
|
||||
static int sceJpegCreateMJpeg(int width, int height) {
|
||||
if (mjpegInited == 0)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "not yet inited");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "not yet inited");
|
||||
if (mjpegInited == 2)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "already created");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "already created");
|
||||
if (width > 1024)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_SIZE, "width outside bounds");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_SIZE, "width outside bounds");
|
||||
|
||||
mjpegInited = 2;
|
||||
mjpegWidth = width;
|
||||
|
@ -600,9 +590,9 @@ static int sceJpegCreateMJpeg(int width, int height) {
|
|||
|
||||
static int sceJpegDeleteMJpeg() {
|
||||
if (mjpegInited == 0)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "not yet inited");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "not yet inited");
|
||||
if (mjpegInited == 1)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "not yet created");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "not yet created");
|
||||
|
||||
mjpegInited = 1;
|
||||
return hleLogInfo(Log::ME, 0);
|
||||
|
@ -610,7 +600,7 @@ static int sceJpegDeleteMJpeg() {
|
|||
|
||||
static int sceJpegInitMJpeg() {
|
||||
if (mjpegInited == 1 || mjpegInited == 2)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_ALREADY_INIT, "already inited");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_ALREADY_INIT, "already inited");
|
||||
|
||||
// If it was -1, it's from an old save state, avoid double init error but assume inited.
|
||||
if (mjpegInited == 0)
|
||||
|
@ -620,9 +610,9 @@ static int sceJpegInitMJpeg() {
|
|||
|
||||
static int sceJpegFinishMJpeg() {
|
||||
if (mjpegInited == 0)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "already inited");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "already inited");
|
||||
if (mjpegInited == 2)
|
||||
return hleLogError(Log::ME, ERROR_JPEG_INVALID_STATE, "mjpeg not deleted");
|
||||
return hleLogError(Log::ME, SCE_JPEG_ERROR_INVALID_STATE, "mjpeg not deleted");
|
||||
|
||||
// Even from an old save state, if we see this we leave compat mode.
|
||||
mjpegInited = 0;
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/MIPS/MIPSCodeUtils.h"
|
||||
#include "Core/MIPS/MIPSInt.h"
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
#include "Common/Log.h"
|
||||
#include "Common/Swap.h"
|
||||
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
|
||||
class PointerWrap;
|
||||
|
||||
// If you add to this, make sure to check KernelObjectPool::CreateByIDType().
|
||||
|
@ -193,7 +191,7 @@ public:
|
|||
outError = T::GetMissingErrorCode();
|
||||
return nullptr;
|
||||
}
|
||||
outError = SCE_KERNEL_ERROR_OK;
|
||||
outError = 0; // SCE_KERNEL_ERROR_OK but don't want to include the header here.
|
||||
return t;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "Core/HLE/sceKernelAlarm.h"
|
||||
#include "Core/HLE/sceKernelInterrupt.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/MemMap.h"
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Common/Serialize/SerializeMap.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Common/StringUtils.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/sceKernelHeap.h"
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "Core/Reporting.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
|
||||
#include "Core/Debugger/MemBlockInfo.h"
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include "Core/HLE/sceKernelThread.h"
|
||||
#include "Core/HLE/sceKernelMbx.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "Core/CoreTiming.h"
|
||||
#include "Core/Debugger/MemBlockInfo.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include "Core/CoreTiming.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/sceKernelMsgPipe.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Common/Serialize/SerializeMap.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/MemMapHelpers.h"
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "Common/Serialize/SerializeList.h"
|
||||
#include "Common/Serialize/SerializeMap.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/HLETables.h"
|
||||
#include "Core/MIPS/MIPSAnalyst.h"
|
||||
#include "Core/MIPS/MIPSCodeUtils.h"
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/sceKernelVTimer.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
|
||||
static int vtimerTimer = -1;
|
||||
static SceUID runningVTimer = 0;
|
||||
|
|
|
@ -72,6 +72,7 @@
|
|||
#include "Core/Config.h"
|
||||
#include "Core/Debugger/MemBlockInfo.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/sceMp3.h"
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "Common/Serialize/SerializeMap.h"
|
||||
#include "Common/Data/Format/JSONReader.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
|
|
|
@ -41,6 +41,7 @@
|
|||
#include "Core/MemMapHelpers.h"
|
||||
|
||||
#include "Core/HLE/HLEHelperThread.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
#include <algorithm>
|
||||
|
||||
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Common/Thread/ThreadUtil.h"
|
||||
#include "Common/TimeUtil.h"
|
||||
#include "Core/Core.h"
|
||||
|
@ -35,7 +34,9 @@
|
|||
#include "Core/MemMapHelpers.h"
|
||||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
|
||||
|
||||
std::vector<SceUID> matchingThreads;
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/MemMap.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Common/TimeUtil.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
|
|
@ -38,13 +38,14 @@
|
|||
#include "Common/Log.h"
|
||||
#include "Core/Config.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
#include "Core/HW/SasAudio.h"
|
||||
#include "Core/MemMap.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/sceSas.h"
|
||||
#include "Core/HLE/sceKernel.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
#include "Common/Serialize/SerializeFuncs.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/KernelWaitHelpers.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include "Core/Config.h"
|
||||
#include "Core/CoreTiming.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/HLEHelperThread.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/MIPS/MIPS.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "Core/Reporting.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/FunctionWrappers.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceVaudio.h"
|
||||
#include "Core/HLE/sceAudio.h"
|
||||
#include "Core/HLE/__sceAudio.h"
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include "Core/MemMap.h"
|
||||
#include "Core/Reporting.h"
|
||||
#include "Core/HLE/HLE.h"
|
||||
#include "Core/HLE/ErrorCodes.h"
|
||||
#include "Core/HLE/sceKernelMemory.h"
|
||||
#include "Core/HLE/sceKernelInterrupt.h"
|
||||
#include "Core/HLE/sceKernelThread.h"
|
||||
|
|
Loading…
Add table
Reference in a new issue