mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-10 03:01:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid overlay files overflowing solid heaps (#2387)

Browse Source
This commit is contained in:
Luke Street
2026-09-04 00:33:47 -06:00
committed by GitHub
parent 3efba4ccbd
commit d94135f785
7 changed files with 131 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_alink.cpp
+11 -1
View File
@@ -4313,7 +4313,9 @@ int daAlink_c::createHeap() {
return 0;
}
JKRReadIdxResource(mFaceBckHeap.getBuffer(), 0xC00, dRes_ID_ALANM_BCK_FAT_e, dComIfGp_getAnmArchive());
IF_DUSK(mFaceBckHeap.reserveBuffer(dRes_ID_ALANM_BCK_FAT_e);)
JKRReadIdxResource(mFaceBckHeap.getBuffer(), DUSK_IF_ELSE(mFaceBckHeap.getBufferSize(), 0xC00),
dRes_ID_ALANM_BCK_FAT_e, dComIfGp_getAnmArchive());
J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mFaceBckHeap.getBuffer());
if (!mFaceBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
return 0;
@@ -14307,7 +14309,11 @@ BOOL daAlink_c::checkMagicArmorWearAbility() const {
J3DModelData* daAlink_c::loadAramBmd(u16 i_resIdx, u32 i_bufSize) {
JKRArchive* anmArchive = dComIfGp_getAnmArchive();
#if TARGET_PC
u8* tmpBuffer = (u8*)mItemHeap[field_0x2fa0].allocTempBuffer(i_resIdx, &i_bufSize);
#else
u8* tmpBuffer = JKR_NEW_ARRAY_ARGS(u8, i_bufSize, 0x20);
#endif
JKRReadIdxResource(tmpBuffer, i_bufSize, i_resIdx, anmArchive);
#if DEBUG
@@ -14328,7 +14334,11 @@ J3DModelData* daAlink_c::loadAramBmd(u16 i_resIdx, u32 i_bufSize) {
}
void* daAlink_c::loadAram(u16 i_resIdx, u32 i_bufSize) {
#if TARGET_PC
u8* tmpBuffer = (u8*)mItemHeap[field_0x2fa0].allocTempBuffer(i_resIdx, &i_bufSize);
#else
u8* tmpBuffer = JKR_NEW_ARRAY_ARGS(u8, i_bufSize, 0x20);
#endif
JKRReadIdxResource(tmpBuffer, i_bufSize, i_resIdx, dComIfGp_getAnmArchive());
#if DEBUG
daPy_aramBufferCheck(tmpBuffer, i_bufSize);
src/d/actor/d_a_alink_swindow.inc
+32
View File
@@ -11,6 +11,16 @@ static int daAlink_modelCallBack(J3DJoint* i_joint, int param_1);
static int daAlink_headModelCallBack(J3DJoint* i_joint, int param_1);
static int daAlink_wolfModelCallBack(J3DJoint* i_joint, int param_1);
#if TARGET_PC
static void* read_anm_resource(void** o_buffer, u16 i_resIdx, u32 i_fixedSize) {
u32 size = daPy_getAnmResourceSize(i_resIdx, i_fixedSize);
*o_buffer = JKRAllocFromSysHeap(size, 0x20);
JUT_ASSERT(__LINE__, *o_buffer);
JKRReadIdxResource(*o_buffer, size, i_resIdx, dComIfGp_getAnmArchive());
return *o_buffer;
}
#endif
void daAlink_c::setArcName(BOOL i_isWolf) {
if (i_isWolf) {
mArcName = l_wArcName;
@@ -247,8 +257,10 @@ void daAlink_c::changeModelDataDirectWolf(int param_0) {
void daAlink_c::initStatusWindow() {
onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW);
#if !TARGET_PC
void* tmpBuffer = JKR_NEW_ARRAY_ARGS(void*, 0x500, 0x20);
JUT_ASSERT(394, tmpBuffer);
#endif
u16 bckResIdx, btpResIdx, btkResIdx;
if (checkWolf()) {
@@ -268,7 +280,11 @@ void daAlink_c::initStatusWindow() {
changeModelDataDirect(0);
}
#if TARGET_PC
void* tmpBuffer = read_anm_resource(&mAnmBuffers[0], bckResIdx, 0x1400);
#else
JKRReadIdxResource(tmpBuffer, 0x1400, bckResIdx, dComIfGp_getAnmArchive());
#endif
m_sWindowBck = JKR_NEW mDoExt_bckAnm();
JUT_ASSERT(428, m_sWindowBck);
@@ -276,20 +292,28 @@ void daAlink_c::initStatusWindow() {
JUT_ASSERT(433, FALSE);
}
#if TARGET_PC
tmpBuffer = read_anm_resource(&mAnmBuffers[1], btpResIdx, 0x400);
#else
tmpBuffer = JKR_NEW_ARRAY_ARGS(void*, 0x100, 0x20);
JUT_ASSERT(437, tmpBuffer);
JKRReadIdxResource(tmpBuffer, 0x400, btpResIdx, dComIfGp_getAnmArchive());
#endif
// this should call J3DAnmLoaderDataBase::load(const void*) but it breaks retail
J3DAnmTexPattern* btp = (J3DAnmTexPattern*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0);
btp->setFrame(0.0f);
btp->searchUpdateMaterialID(field_0x06c0);
field_0x06c0->entryTexNoAnimator(btp);
#if TARGET_PC
tmpBuffer = read_anm_resource(&mAnmBuffers[2], btkResIdx, 0x400);
#else
tmpBuffer = JKR_NEW_ARRAY_ARGS(void*, 0x100, 0x20);
JUT_ASSERT(449, tmpBuffer);
JKRReadIdxResource(tmpBuffer, 0x400, btkResIdx, dComIfGp_getAnmArchive());
#endif
// this should call J3DAnmLoaderDataBase::load(const void*) but it breaks retail
J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0);
btk->setFrame(0.0f);
@@ -387,4 +411,12 @@ void daAlink_c::resetStatusWindow() {
offNoResetFlg2(FLG2_STATUS_WINDOW_DRAW);
m_sWindowBck = NULL;
#if TARGET_PC
for (int i = 0; i < 3; i++) {
if (mAnmBuffers[i] != NULL) {
JKRFreeToSysHeap(mAnmBuffers[i]);
mAnmBuffers[i] = NULL;
}
}
#endif
}
src/d/actor/d_a_midna.cpp
+1
View File
@@ -496,6 +496,7 @@ int daMidna_c::createHeap() {
}
}
IF_DUSK(mBckHeap[0].reserveBuffer(0x1DC);)
JKRReadIdxResource(mBckHeap[0].getBuffer(), mBckHeap[0].getBufferSize(), 0x1DC, dComIfGp_getAnmArchive());
J3DAnmTransform* md_anm = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mBckHeap[0].getBuffer());
modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 14);
src/d/actor/d_a_player.cpp
+58
View File
@@ -224,6 +224,12 @@ daPy_anmHeap_c::~daPy_anmHeap_c() {
if (mAnimeHeap != NULL) {
mDoExt_destroySolidHeap(mAnimeHeap);
}
#if TARGET_PC
freeTempBuffers();
if (mOwnedBuffer != NULL) {
JKRFreeToSysHeap(mOwnedBuffer);
}
#endif
}
void daPy_anmHeap_c::initData() {
@@ -237,6 +243,56 @@ void* daPy_anmHeap_c::mallocBuffer() {
return mBuffer;
}
#if TARGET_PC
constexpr u32 kAlignment = 0x20;
void daPy_anmHeap_c::reserveBuffer(u16 i_resId) {
// Ensure mBuffer is large enough to hold the resource
u32 size = daPy_getAnmResourceSize(i_resId, mBufferSize);
if (size <= mBufferSize) {
return;
}
// If not, replace it with a new buffer allocated from the system heap. Callers still copy
// archive data in on every load: setAnmTransform bswaps key tables in place, so we can't point
// it at the archive's cached copy directly.
u8* buffer = static_cast<u8*>(JKRAllocFromSysHeap(size, kAlignment));
JUT_ASSERT(__LINE__, buffer != NULL);
if (mOwnedBuffer != NULL) {
JKRFreeToSysHeap(mOwnedBuffer);
}
mOwnedBuffer = buffer; // Mark it as owned so we release it later
mBuffer = buffer;
mBufferSize = size;
}
void* daPy_anmHeap_c::allocTempBuffer(u16 i_resId, u32* io_size) {
// Check if the resource can fit in io_size
u32 size = daPy_getAnmResourceSize(i_resId, *io_size);
if (size <= *io_size) {
return JKR_NEW_ARRAY_ARGS(u8, *io_size, kAlignment);
}
// If not, allocate a new temp buffer from the system heap, plus kAlignment extra bytes.
// We stash a pointer to the next buffer at the beginning, forming a chain so we can free
// them all later.
void** temp = static_cast<void**>(JKRAllocFromSysHeap(kAlignment + size, kAlignment));
JUT_ASSERT(__LINE__, temp != NULL);
*temp = mTempBuffers;
mTempBuffers = temp;
*io_size = size;
return reinterpret_cast<u8*>(temp) + kAlignment;
}
void daPy_anmHeap_c::freeTempBuffers() {
while (mTempBuffers != NULL) {
void** temp = mTempBuffers;
mTempBuffers = static_cast<void**>(*temp);
JKRFreeToSysHeap(temp);
}
}
#endif
void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType, const char* name) {
u32 size;
@@ -310,6 +366,7 @@ void* daPy_anmHeap_c::loadData(u16 i_resId) {
};
if (mArcNo == 0xFFFF) {
IF_DUSK(reserveBuffer(i_resId);)
JKRReadIdxResource(mBuffer, mBufferSize, i_resId, dComIfGp_getAnmArchive());
#if DEBUG
daPy_aramBufferCheck(mBuffer, mBufferSize);
@@ -363,6 +420,7 @@ void* daPy_anmHeap_c::loadDataDemoRID(u16 i_resID, u16 i_arcNo) {
JKRHeap* daPy_anmHeap_c::setAnimeHeap() {
mAnimeHeap->freeAll();
IF_DUSK(freeTempBuffers();)
return mDoExt_setCurrentHeap(mAnimeHeap);
}