From bf050c99a39f5244dc6d203ed667a59d5f228808 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 10 Sep 2023 16:48:55 -0700 Subject: [PATCH] JSUInputStream Not marked as matching; JSURandomInputStream::__vtable isn't being generated in the .obj for some reason, not sure why. --- include/JSystem/JSupport/JSUInputStream.h | 2 +- include/JSystem/JSupport/JSURandomInputStream.h | 6 +++--- src/JSystem/JSupport/JSUInputStream.cpp | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h index d0aa9ce5c..ac36bac18 100644 --- a/include/JSystem/JSupport/JSUInputStream.h +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -67,7 +67,7 @@ public: } // TODO: return value probably wrong - /* 802DC298 */ s32 read(void*, s32); + s32 read(void*, s32); }; // Size = 0x8 // move? diff --git a/include/JSystem/JSupport/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream.h index 4541db53d..49da046eb 100644 --- a/include/JSystem/JSupport/JSURandomInputStream.h +++ b/include/JSystem/JSupport/JSURandomInputStream.h @@ -16,9 +16,9 @@ public: /* vt[8] */ virtual s32 seekPos(s32, JSUStreamSeekFrom) = 0; // TODO: fix return types - /* 802DC370 */ s32 align(s32); - /* 802DC458 */ s32 peek(void*, s32); - /* 802DC4DC */ s32 seek(s32, JSUStreamSeekFrom); + s32 align(s32); + s32 peek(void*, s32); + s32 seek(s32, JSUStreamSeekFrom); }; // Size = 0x8 #endif diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp index 188d1098e..23eb6e9e1 100644 --- a/src/JSystem/JSupport/JSUInputStream.cpp +++ b/src/JSystem/JSupport/JSUInputStream.cpp @@ -5,9 +5,12 @@ #include "JSystem/JSupport/JSUInputStream.h" #include "JSystem/JSupport/JSURandomInputStream.h" +#include "dolphin/os/OS.h" /* 802BF3F4-802BF47C .text __dt__14JSUInputStreamFv */ JSUInputStream::~JSUInputStream() { + if (!isGood()) + OSReport("JSUInputStream: occur error.\n"); } /* 802BF47C-802BF4D4 .text read__14JSUInputStreamFPvl */