tiberium/CNC_TS_and_RA2_Mission_Editor
1
0
Fork 0
mirror of https://github.com/electronicarts/CNC_TS_and_RA2_Mission_Editor.git synced 2025-10-15 16:03:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix/overlay refactor mismatch (#101)

Browse source 
* fixed overlay encoding result differs from original .
* some type adjustments to silence compile warning, UT case added .
* escape Chinese comments .
* added compile dependency of UT on MissionPackLib .
This commit is contained in:
Zero Fanker 2024-11-02 18:11:58 -04:00 • committed by GitHub
parent 87d35212f7
commit 9b24232f2e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 214 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

16
MissionEditorPackLib/MissionEditorPackLib.cpp
View file

@ -171,7 +171,7 @@ namespace FSunPackLib
extern "C" int last_succeeded_operation = 0;
BYTE* EncodeBase64(BYTE* sp, UINT len)
BYTE* EncodeBase64(BYTE* sp, const size_t len)
{
auto encoded = encode64(data_ref(sp, std::size_t(len)));
// for now make a copy, we might refactor this
@ -189,13 +189,13 @@ namespace FSunPackLib
INT EncodeF80(BYTE* sp, UINT len, UINT nSections, BYTE** dest)
size_t EncodeF80(BYTE* sp, size_t len, UINT nSections, BYTE** dest)
{
*dest = new(BYTE[len * 4]); // as large as sp, to make sure it works
BYTE* data = *dest;
int length = len / nSections;
auto const length = len / nSections;
// each section has this length
#ifdef DBG2
@ -210,11 +210,11 @@ namespace FSunPackLib
WriteFile(hOut, out.data(), out.size(), &dw, NULL);
#endif
UINT i;
UINT DP = 0;
UINT SP = 0;
size_t i;
size_t DP = 0;
size_t SP = 0;
for (i = 0; i < nSections; i++) {
UINT packLen = encode80(&sp[SP], &data[DP + 4], length); //ConvertToF80(&sp[SP], length, &data[DP+4]);
const size_t packLen = encode80(&sp[SP], &data[DP + 4], length); //ConvertToF80(&sp[SP], length, &data[DP+4]);
memcpy(&data[DP], &packLen, 3);
DP += 3;
@ -255,7 +255,7 @@ namespace FSunPackLib
return DP;
}
bool DecodeF80(const BYTE* const sp, const UINT SourceLength, std::vector<BYTE>& dp, const std::size_t max_size)
bool DecodeF80(const BYTE* const sp, const size_t SourceLength, std::vector<BYTE>& dp, const std::size_t max_size)
{
static_assert(4 == sizeof(t_pack_section_header));

6
MissionEditorPackLib/MissionEditorPackLib.h
View file

@ -116,7 +116,7 @@ namespace FSunPackLib
len - length of hex data
Returns a poINTer to the base64 data. Caller must free this memory.
*/
BYTE* EncodeBase64(BYTE* sp, UINT len);
BYTE* EncodeBase64(BYTE* sp, const size_t len);
/*
Converts Base64 data to hex data.
sp - source poINTer
@ -135,7 +135,7 @@ namespace FSunPackLib
dest - poINTer to dest poINTer. Function allocates memory, caller must free this memory.
Returns the length of the packed data.
*/
INT EncodeF80(BYTE* sp, UINT len, UINT nSections, BYTE** dest);
size_t EncodeF80(BYTE* sp, size_t len, UINT nSections, BYTE** dest);
/*
Extracts a simple format 80 pack like the Overlay & OverlayData-Pack
@ -146,7 +146,7 @@ namespace FSunPackLib
dp - dest buffer
max_size - maximum allowed destination size
*/
bool DecodeF80(const BYTE* sp, UINT SourceLength, std::vector<BYTE>& dp, std::size_t max_size);
bool DecodeF80(const BYTE* sp, size_t SourceLength, std::vector<BYTE>& dp, std::size_t max_size);
// IsoMapPack5
/*