Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3890 from unknownbrackets/io-minor

Browse source 
Improve error handling in sceIoLseek*()
This commit is contained in:
Henrik Rydgård 2013-09-23 00:02:52 -07:00
commit c01fb845aa
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Core/HLE/sceIo.cpp
View file

@ -973,6 +973,8 @@ s64 __IoLseek(SceUID id, s64 offset, int whence) {
newPos = f->info.size + offset; newPos = f->info.size + offset;
seek = FILEMOVE_END; seek = FILEMOVE_END;
break; break;
default:
return (s32)SCE_KERNEL_ERROR_INVAL;
} }
if(f->npdrm) if(f->npdrm)
@ -989,7 +991,7 @@ s64 __IoLseek(SceUID id, s64 offset, int whence) {
s64 sceIoLseek(int id, s64 offset, int whence) { s64 sceIoLseek(int id, s64 offset, int whence) {
s64 result = __IoLseek(id, offset, whence); s64 result = __IoLseek(id, offset, whence);
if (result >= 0) { if (result >= 0 || result == -1) {
DEBUG_LOG(SCEIO, "%lli = sceIoLseek(%d, %llx, %i)", result, id, offset, whence); DEBUG_LOG(SCEIO, "%lli = sceIoLseek(%d, %llx, %i)", result, id, offset, whence);
// Educated guess at timing. // Educated guess at timing.
return hleDelayResult(result, "io seek", 100); return hleDelayResult(result, "io seek", 100);
@ -1001,12 +1003,12 @@ s64 sceIoLseek(int id, s64 offset, int whence) {
u32 sceIoLseek32(int id, int offset, int whence) { u32 sceIoLseek32(int id, int offset, int whence) {
s32 result = (s32) __IoLseek(id, offset, whence); s32 result = (s32) __IoLseek(id, offset, whence);
if (result >= 0) { if (result >= 0 || result == -1) {
DEBUG_LOG(SCEIO, "%i = sceIoLseek(%d, %x, %i)", result, id, offset, whence); DEBUG_LOG(SCEIO, "%i = sceIoLseek32(%d, %x, %i)", result, id, offset, whence);
// Educated guess at timing. // Educated guess at timing.
return hleDelayResult(result, "io seek", 100); return hleDelayResult(result, "io seek", 100);
} else { } else {
ERROR_LOG(SCEIO, "sceIoLseek(%d, %x, %i) - ERROR: invalid file", id, offset, whence); ERROR_LOG(SCEIO, "sceIoLseek32(%d, %x, %i) - ERROR: invalid file", id, offset, whence);
return result; return result;
} }
} }
@ -1015,6 +1017,10 @@ u32 sceIoLseekAsync(int id, s64 offset, int whence) {
u32 error; u32 error;
FileNode *f = __IoGetFd(id, error); FileNode *f = __IoGetFd(id, error);
if (f) { if (f) {
if (whence < 0 || whence > 2) {
WARN_LOG(SCEIO, "sceIoLseekAsync(%d, %llx, %i): invalid whence", id, offset, whence);
return SCE_KERNEL_ERROR_INVAL;
}
f->asyncResult = __IoLseek(id, offset, whence); f->asyncResult = __IoLseek(id, offset, whence);
// Educated guess at timing. // Educated guess at timing.
__IoSchedAsync(f, id, 100); __IoSchedAsync(f, id, 100);
@ -1031,6 +1037,10 @@ u32 sceIoLseek32Async(int id, int offset, int whence) {
u32 error; u32 error;
FileNode *f = __IoGetFd(id, error); FileNode *f = __IoGetFd(id, error);
if (f) { if (f) {
if (whence < 0 || whence > 2) {
WARN_LOG(SCEIO, "sceIoLseek32Async(%d, %x, %i): invalid whence", id, offset, whence);
return SCE_KERNEL_ERROR_INVAL;
}
f->asyncResult = __IoLseek(id, offset, whence); f->asyncResult = __IoLseek(id, offset, whence);
// Educated guess at timing. // Educated guess at timing.
__IoSchedAsync(f, id, 100); __IoSchedAsync(f, id, 100);