mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-02 11:13:23 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

move save/load compression to allocate with re3StreamingAlloc, assert to make sure allocation worked

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-22 18:13:27 +02:00
parent 6b4432fde9
commit ea5698dfe6
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/liberty/save/PCSave.cpp
View File

@@ -17,6 +17,8 @@
#include "vmu/vmu.h" #include "vmu/vmu.h"
void* re3StreamingAlloc(size_t size);
const char* _psGetUserFilesFolder(); const char* _psGetUserFilesFolder();
C_PcSave PcSaveHelper; C_PcSave PcSaveHelper;
@@ -93,16 +95,17 @@ uint32_t C_PcSave::PcClassLoadRoutine(int32 file, uint8 *data) {
return size; return size;
} else { } else {
size &= ~0x80000000; size &= ~0x80000000;
uint8* compressed = (uint8*)malloc(size); uint8* compressed = (uint8*)re3StreamingAlloc(size);
assert(compressed);
err = CFileMgr::Read(file, (const char*)compressed, size) != size; err = CFileMgr::Read(file, (const char*)compressed, size) != size;
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
free(compressed); RwFree(compressed);
return 0; return 0;
} }
lzo_uint decompressed_size = 0; lzo_uint decompressed_size = 0;
auto crv = lzo1x_decompress(compressed, size, data, &decompressed_size, NULL); auto crv = lzo1x_decompress(compressed, size, data, &decompressed_size, NULL);
free(compressed); RwFree(compressed);
if (crv != LZO_E_OK) { if (crv != LZO_E_OK) {
return 0; return 0;
} }
@@ -117,31 +120,37 @@ uint32_t C_PcSave::PcClassLoadRoutine(int32 file, uint8 *data) {
bool bool
C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size) C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size)
{ {
void* wrkmem = malloc(LZO1X_1_MEM_COMPRESS); void* wrkmem = re3StreamingAlloc(LZO1X_1_MEM_COMPRESS);
uint8* compressed = (uint8*)malloc(size*2); assert(wrkmem);
uint8* compressed = (uint8*)re3StreamingAlloc(size*2);
assert(compressed);
lzo_uint compressed_size; lzo_uint compressed_size;
int crv = lzo1x_1_compress(data, size, compressed, &compressed_size, wrkmem); int crv = lzo1x_1_compress(data, size, compressed, &compressed_size, wrkmem);
free(wrkmem); RwFree(wrkmem);
if (crv == LZO_E_OK && compressed_size >= size) {
crv = LZO_E_NOT_COMPRESSIBLE;
}
if (crv == LZO_E_OK) { if (crv == LZO_E_OK) {
uint32_t compressed_size32 = compressed_size | 0x80000000; uint32_t compressed_size32 = compressed_size | 0x80000000;
bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32); bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32);
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
free(compressed); RwFree(compressed);
nErrorCode = SAVESTATUS_ERR_SAVE_WRITE; nErrorCode = SAVESTATUS_ERR_SAVE_WRITE;
strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1); strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1);
return false; return false;
} }
err = CFileMgr::Write(file, (const char*)compressed, compressed_size) != compressed_size; err = CFileMgr::Write(file, (const char*)compressed, compressed_size) != compressed_size;
free(compressed); RwFree(compressed);
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
nErrorCode = SAVESTATUS_ERR_SAVE_WRITE; nErrorCode = SAVESTATUS_ERR_SAVE_WRITE;
strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1); strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1);
return false; return false;
} }
} else if (crv == LZO_E_NOT_COMPRESSIBLE) { } else if (crv == LZO_E_NOT_COMPRESSIBLE) {
free(compressed); RwFree(compressed);
uint32_t compressed_size32 = size; uint32_t compressed_size32 = size;
bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32); bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32);
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
@@ -156,7 +165,7 @@ C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size)
return false; return false;
} }
} else { } else {
free(compressed); RwFree(compressed);
return false; return false;
} }

29
src/miami/save/PCSave.cpp
View File

@@ -17,6 +17,8 @@
#include "vmu/vmu.h" #include "vmu/vmu.h"
void* re3StreamingAlloc(size_t size);
const char* _psGetUserFilesFolder(); const char* _psGetUserFilesFolder();
C_PcSave PcSaveHelper; C_PcSave PcSaveHelper;
@@ -76,31 +78,37 @@ C_PcSave::SaveSlot(int32 slot)
bool bool
C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size) C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size)
{ {
void* wrkmem = malloc(LZO1X_1_MEM_COMPRESS); void* wrkmem = re3StreamingAlloc(LZO1X_1_MEM_COMPRESS);
uint8* compressed = (uint8*)malloc(size*2); assert(wrkmem);
uint8* compressed = (uint8*)re3StreamingAlloc(size*2);
assert(compressed);
lzo_uint compressed_size; lzo_uint compressed_size;
int crv = lzo1x_1_compress(data, size, compressed, &compressed_size, wrkmem); int crv = lzo1x_1_compress(data, size, compressed, &compressed_size, wrkmem);
free(wrkmem); RwFree(wrkmem);
if (crv == LZO_E_OK && compressed_size >= size) {
crv = LZO_E_NOT_COMPRESSIBLE;
}
if (crv == LZO_E_OK) { if (crv == LZO_E_OK) {
uint32_t compressed_size32 = compressed_size | 0x80000000; uint32_t compressed_size32 = compressed_size | 0x80000000;
bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32); bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32);
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
free(compressed); RwFree(compressed);
nErrorCode = SAVESTATUS_ERR_SAVE_WRITE; nErrorCode = SAVESTATUS_ERR_SAVE_WRITE;
strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1); strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1);
return false; return false;
} }
err = CFileMgr::Write(file, (const char*)compressed, compressed_size) != compressed_size; err = CFileMgr::Write(file, (const char*)compressed, compressed_size) != compressed_size;
free(compressed); RwFree(compressed);
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
nErrorCode = SAVESTATUS_ERR_SAVE_WRITE; nErrorCode = SAVESTATUS_ERR_SAVE_WRITE;
strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1); strncpy(SaveFileNameJustSaved, ValidSaveName, sizeof(ValidSaveName) - 1);
return false; return false;
} }
} else if (crv == LZO_E_NOT_COMPRESSIBLE) { } else if (crv == LZO_E_NOT_COMPRESSIBLE) {
free(compressed); RwFree(compressed);
uint32_t compressed_size32 = size; uint32_t compressed_size32 = size;
bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32); bool err = CFileMgr::Write(file, (const char*)&compressed_size32, sizeof(compressed_size32)) != sizeof(compressed_size32);
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
@@ -115,7 +123,7 @@ C_PcSave::PcClassSaveRoutine(int32 file, uint8 *data, uint32 size)
return false; return false;
} }
} else { } else {
free(compressed); RwFree(compressed);
return false; return false;
} }
@@ -153,16 +161,17 @@ uint32_t C_PcSave::PcClassLoadRoutine(int32 file, uint8 *data) {
return size; return size;
} else { } else {
size &= ~0x80000000; size &= ~0x80000000;
uint8* compressed = (uint8*)malloc(size); uint8* compressed = (uint8*)re3StreamingAlloc(size);
assert(compressed);
err = CFileMgr::Read(file, (const char*)compressed, size) != size; err = CFileMgr::Read(file, (const char*)compressed, size) != size;
if (err || CFileMgr::GetErrorReadWrite(file)) { if (err || CFileMgr::GetErrorReadWrite(file)) {
free(compressed); RwFree(compressed);
return 0; return 0;
} }
lzo_uint decompressed_size = 0; lzo_uint decompressed_size = 0;
auto crv = lzo1x_decompress(compressed, size, data, &decompressed_size, NULL); auto crv = lzo1x_decompress(compressed, size, data, &decompressed_size, NULL);
free(compressed); RwFree(compressed);
if (crv != LZO_E_OK) { if (crv != LZO_E_OK) {
return 0; return 0;
} }