mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add MXIOINFO::CreateChunk (#1306)

Browse Source
This commit is contained in:
MS
2025-01-01 13:23:16 -05:00
committed by GitHub
parent 70e72de20f
commit a7f008568a
2 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/omni/include/mxio.h
View File

@@ -29,6 +29,7 @@ public:
MxU16 Advance(MxU16); MxU16 Advance(MxU16);
MxU16 Descend(MMCKINFO*, const MMCKINFO*, MxU16); MxU16 Descend(MMCKINFO*, const MMCKINFO*, MxU16);
MxU16 Ascend(MMCKINFO*, MxU16); MxU16 Ascend(MMCKINFO*, MxU16);
MxU16 CreateChunk(MMCKINFO* p_chunkInfo, MxU16 p_create);
// NOTE: In MXIOINFO, the `hmmio` member of MMIOINFO is used like // NOTE: In MXIOINFO, the `hmmio` member of MMIOINFO is used like
// an HFILE (int) instead of an HMMIO (WORD). // an HFILE (int) instead of an HMMIO (WORD).

56
LEGO1/omni/src/stream/mxio.cpp
View File

@@ -38,7 +38,7 @@ MXIOINFO::~MXIOINFO()
MxU16 MXIOINFO::Open(const char* p_filename, MxULong p_flags) MxU16 MXIOINFO::Open(const char* p_filename, MxULong p_flags)
{ {
OFSTRUCT unused; OFSTRUCT unused;
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
m_info.lDiskOffset = m_info.lBufOffset = 0; m_info.lDiskOffset = m_info.lBufOffset = 0;
@@ -84,7 +84,7 @@ MxU16 MXIOINFO::Open(const char* p_filename, MxULong p_flags)
// FUNCTION: BETA10 0x1015e30b // FUNCTION: BETA10 0x1015e30b
MxU16 MXIOINFO::Close(MxLong p_unused) MxU16 MXIOINFO::Close(MxLong p_unused)
{ {
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
if (RAW_M_FILE) { if (RAW_M_FILE) {
result = Flush(0); result = Flush(0);
@@ -317,7 +317,7 @@ MxLong MXIOINFO::Seek(MxLong p_offset, MxLong p_origin)
// FUNCTION: BETA10 0x1015e9ad // FUNCTION: BETA10 0x1015e9ad
MxU16 MXIOINFO::SetBuffer(char* p_buf, MxLong p_len, MxLong p_unused) MxU16 MXIOINFO::SetBuffer(char* p_buf, MxLong p_len, MxLong p_unused)
{ {
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
result = Flush(0); result = Flush(0);
if (m_info.dwFlags & MMIO_ALLOCBUF) { if (m_info.dwFlags & MMIO_ALLOCBUF) {
@@ -337,7 +337,7 @@ MxU16 MXIOINFO::SetBuffer(char* p_buf, MxLong p_len, MxLong p_unused)
// FUNCTION: BETA10 0x1015ea3e // FUNCTION: BETA10 0x1015ea3e
MxU16 MXIOINFO::Flush(MxU16 p_unused) MxU16 MXIOINFO::Flush(MxU16 p_unused)
{ {
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
MxLong bytesWritten; MxLong bytesWritten;
// if buffer is dirty // if buffer is dirty
@@ -389,7 +389,7 @@ MxU16 MXIOINFO::Flush(MxU16 p_unused)
// FUNCTION: BETA10 0x1015eb8f // FUNCTION: BETA10 0x1015eb8f
MxU16 MXIOINFO::Advance(MxU16 p_option) MxU16 MXIOINFO::Advance(MxU16 p_option)
{ {
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
MxULong rwmode = m_info.dwFlags & MMIO_RWMODE; MxULong rwmode = m_info.dwFlags & MMIO_RWMODE;
if (m_info.pchBuffer) { if (m_info.pchBuffer) {
@@ -463,7 +463,7 @@ MxU16 MXIOINFO::Advance(MxU16 p_option)
// FUNCTION: BETA10 0x1015edef // FUNCTION: BETA10 0x1015edef
MxU16 MXIOINFO::Descend(MMCKINFO* p_chunkInfo, const MMCKINFO* p_parentInfo, MxU16 p_descend) MxU16 MXIOINFO::Descend(MMCKINFO* p_chunkInfo, const MMCKINFO* p_parentInfo, MxU16 p_descend)
{ {
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
MxULong ofs; MxULong ofs;
BOOL readOk; BOOL readOk;
@@ -554,7 +554,7 @@ MxU16 MXIOINFO::Ascend(MMCKINFO* p_chunkInfo, MxU16 p_ascend)
{ {
MxLong ofs; MxLong ofs;
MxULong size; MxULong size;
MxU16 result = 0; MxU16 result = MMSYSERR_NOERROR;
if (p_chunkInfo == NULL) { if (p_chunkInfo == NULL) {
return MMIOERR_BASE; return MMIOERR_BASE;
@@ -605,10 +605,50 @@ MxU16 MXIOINFO::Ascend(MMCKINFO* p_chunkInfo, MxU16 p_ascend)
} }
// Seek past the end of the chunk (plus optional pad byte if size is odd) // Seek past the end of the chunk (plus optional pad byte if size is odd)
if (result == 0 && if (result == MMSYSERR_NOERROR &&
Seek((p_chunkInfo->cksize & 1) + p_chunkInfo->cksize + p_chunkInfo->dwDataOffset, SEEK_SET) == -1) { Seek((p_chunkInfo->cksize & 1) + p_chunkInfo->cksize + p_chunkInfo->dwDataOffset, SEEK_SET) == -1) {
result = MMIOERR_CANNOTSEEK; result = MMIOERR_CANNOTSEEK;
} }
return result; return result;
} }
// FUNCTION: BETA10 0x1015f28b
MxU16 MXIOINFO::CreateChunk(MMCKINFO* p_chunkInfo, MxU16 p_create)
{
MxU16 result = MMSYSERR_NOERROR;
if (p_chunkInfo == NULL) {
return MMIOERR_BASE;
}
if (p_create == MMIO_CREATERIFF) {
p_chunkInfo->ckid = FOURCC_RIFF;
}
if (p_create == MMIO_CREATELIST) {
p_chunkInfo->ckid = FOURCC_LIST;
}
p_chunkInfo->dwDataOffset = Seek(0, SEEK_CUR);
if (p_chunkInfo->dwDataOffset == -1) {
result = MMIOERR_CANNOTSEEK;
}
else {
p_chunkInfo->dwDataOffset += 8;
}
MxU32 size;
if (p_chunkInfo->ckid == FOURCC_RIFF || p_chunkInfo->ckid == FOURCC_LIST) {
size = 12;
}
else {
size = 8;
}
if (Write(p_chunkInfo, size) != size) {
result = MMIOERR_CANNOTWRITE;
}
p_chunkInfo->dwFlags = MMIO_DIRTY;
return result;
}