isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-26 17:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix more vtables

Browse Source
This commit is contained in:
Christian Semmler 2023-12-12 06:32:33 -05:00
parent a9016e9811
commit a134a8b9e6
15 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/mxdiskstreamcontroller.cpp
View File

@ -58,40 +58,40 @@ MxResult MxDiskStreamController::Open(const char* p_filename)
} }
// FUNCTION: LEGO1 0x100c7880 // FUNCTION: LEGO1 0x100c7880
MxResult MxDiskStreamController::vtable0x18(undefined4 p_unknown, undefined4 p_unknown2) MxResult MxDiskStreamController::VTable0x18(undefined4 p_unknown, undefined4 p_unknown2)
{ {
return SUCCESS; return SUCCESS;
} }
// FUNCTION: LEGO1 0x100c7960 // FUNCTION: LEGO1 0x100c7960
MxResult MxDiskStreamController::vtable0x34(undefined4 p_unknown) MxResult MxDiskStreamController::VTable0x34(undefined4 p_unknown)
{ {
return FAILURE; return FAILURE;
} }
// STUB: LEGO1 0x100c7ac0 // STUB: LEGO1 0x100c7ac0
MxResult MxDiskStreamController::vtable0x28() MxResult MxDiskStreamController::VTable0x28()
{ {
// TODO // TODO
return FAILURE; return FAILURE;
} }
// STUB: LEGO1 0x100c7c00 // STUB: LEGO1 0x100c7c00
MxResult MxDiskStreamController::vtable0x30(undefined4 p_unknown) MxResult MxDiskStreamController::VTable0x30(undefined4 p_unknown)
{ {
// TODO // TODO
return FAILURE; return FAILURE;
} }
// STUB: LEGO1 0x100c7ff0 // STUB: LEGO1 0x100c7ff0
MxResult MxDiskStreamController::vtable0x20(MxDSAction* p_action) MxResult MxDiskStreamController::VTable0x20(MxDSAction* p_action)
{ {
// TODO // TODO
return FAILURE; return FAILURE;
} }
// STUB: LEGO1 0x100c8160 // STUB: LEGO1 0x100c8160
MxResult MxDiskStreamController::vtable0x24(undefined4 p_unknown) MxResult MxDiskStreamController::VTable0x24(undefined4 p_unknown)
{ {
// TODO // TODO
return FAILURE; return FAILURE;

12
LEGO1/mxdiskstreamcontroller.h
View File

@ -18,12 +18,12 @@ class MxDiskStreamController : public MxStreamController {
virtual MxResult Tickle() override; // vtable+0x8 virtual MxResult Tickle() override; // vtable+0x8
virtual MxResult Open(const char* p_filename) override; // vtable+0x14 virtual MxResult Open(const char* p_filename) override; // vtable+0x14
virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2) override; // vtable+0x18 virtual MxResult VTable0x18(undefined4 p_unknown, undefined4 p_unknown2) override; // vtable+0x18
virtual MxResult vtable0x20(MxDSAction* p_action) override; // vtable+0x20 virtual MxResult VTable0x20(MxDSAction* p_action) override; // vtable+0x20
virtual MxResult vtable0x24(undefined4 p_unknown) override; // vtable+0x24 virtual MxResult VTable0x24(undefined4 p_unknown) override; // vtable+0x24
virtual MxResult vtable0x28() override; // vtable+0x28 virtual MxResult VTable0x28() override; // vtable+0x28
virtual MxResult vtable0x30(undefined4 p_unknown) override; // vtable+0x30 virtual MxResult VTable0x30(undefined4 p_unknown) override; // vtable+0x30
virtual MxResult vtable0x34(undefined4 p_unknown); // vtable+0x34 virtual MxResult VTable0x34(undefined4 p_unknown); // vtable+0x34
// FUNCTION: LEGO1 0x100c7360 // FUNCTION: LEGO1 0x100c7360
inline virtual const char* ClassName() const override // vtable+0x0c inline virtual const char* ClassName() const override // vtable+0x0c

2
LEGO1/mxdiskstreamprovider.cpp
View File

@ -71,7 +71,7 @@ MxResult MxDiskStreamProvider::SetResourceToGet(MxStreamController* p_resource)
} }
// STUB: LEGO1 0x100d15e0 // STUB: LEGO1 0x100d15e0
void MxDiskStreamProvider::vtable0x20(undefined4 p_unknown1) void MxDiskStreamProvider::VTable0x20(undefined4 p_unknown1)
{ {
// TODO // TODO
} }

2
LEGO1/mxdiskstreamprovider.h
View File

@ -49,7 +49,7 @@ class MxDiskStreamProvider : public MxStreamProvider {
virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14 virtual MxResult SetResourceToGet(MxStreamController* p_resource) override; // vtable+0x14
virtual MxU32 GetFileSize() override; // vtable+0x18 virtual MxU32 GetFileSize() override; // vtable+0x18
virtual MxU32 GetStreamBuffersNum() override; // vtable+0x1c virtual MxU32 GetStreamBuffersNum() override; // vtable+0x1c
virtual void vtable0x20(undefined4 p_unknown1) override; // vtable+0x20 virtual void VTable0x20(undefined4 p_unknown1) override; // vtable+0x20
virtual MxU32 GetLengthInDWords() override; // vtable+0x24 virtual MxU32 GetLengthInDWords() override; // vtable+0x24
virtual MxU32* GetBufferForDWords() override; // vtable+0x28 virtual MxU32* GetBufferForDWords() override; // vtable+0x28

6
LEGO1/mxramstreamcontroller.cpp
View File

@ -36,14 +36,14 @@ MxResult MxRAMStreamController::Open(const char* p_filename)
} }
// STUB: LEGO1 0x100c6210 // STUB: LEGO1 0x100c6210
MxResult MxRAMStreamController::vtable0x20(MxDSAction* p_action) MxResult MxRAMStreamController::VTable0x20(MxDSAction* p_action)
{ {
// TODO STUB // TODO STUB
return FAILURE; return FAILURE;
} }
// FUNCTION: LEGO1 0x100c6320 // FUNCTION: LEGO1 0x100c6320
MxResult MxRAMStreamController::vtable0x24(MxDSAction* p_action) MxResult MxRAMStreamController::VTable0x24(MxDSAction* p_action)
{ {
MxDSAction action; MxDSAction action;
do { do {
@ -52,7 +52,7 @@ MxResult MxRAMStreamController::vtable0x24(MxDSAction* p_action)
m_action0x60 = NULL; m_action0x60 = NULL;
} }
action = *p_action; action = *p_action;
MxStreamController::vtable0x24(&action); MxStreamController::VTable0x24(&action);
} while (m_action0x60 != NULL); } while (m_action0x60 != NULL);
return SUCCESS; return SUCCESS;
} }

4
LEGO1/mxramstreamcontroller.h
View File

@ -25,8 +25,8 @@ class MxRAMStreamController : public MxStreamController {
} }
virtual MxResult Open(const char* p_filename) override; virtual MxResult Open(const char* p_filename) override;
virtual MxResult vtable0x20(MxDSAction* p_action) override; virtual MxResult VTable0x20(MxDSAction* p_action) override;
virtual MxResult vtable0x24(MxDSAction* p_action) override; virtual MxResult VTable0x24(MxDSAction* p_action) override;
private: private:
MxDSBuffer m_buffer; MxDSBuffer m_buffer;

6
LEGO1/mxstillpresenter.cpp
View File

@ -173,10 +173,10 @@ void MxStillPresenter::VTable0x88(MxS32 p_x, MxS32 p_y)
MxRect32 rect_b(m_location.m_x, m_location.m_y, width + m_location.m_x, height + m_location.m_y); MxRect32 rect_b(m_location.m_x, m_location.m_y, width + m_location.m_x, height + m_location.m_y);
MVideoManager()->InvalidateRect(rect_a); MVideoManager()->InvalidateRect(rect_a);
MVideoManager()->vtable0x34(rect_a.GetLeft(), rect_a.GetTop(), rect_a.GetWidth(), rect_a.GetHeight()); MVideoManager()->VTable0x34(rect_a.GetLeft(), rect_a.GetTop(), rect_a.GetWidth(), rect_a.GetHeight());
MVideoManager()->InvalidateRect(rect_b); MVideoManager()->InvalidateRect(rect_b);
MVideoManager()->vtable0x34(rect_b.GetLeft(), rect_b.GetTop(), rect_b.GetWidth(), rect_b.GetHeight()); MVideoManager()->VTable0x34(rect_b.GetLeft(), rect_b.GetTop(), rect_b.GetWidth(), rect_b.GetHeight());
} }
} }
@ -193,7 +193,7 @@ void MxStillPresenter::Enable(MxBool p_enable)
MxRect32 rect(x, y, width + x, height + y); MxRect32 rect(x, y, width + x, height + y);
MVideoManager()->InvalidateRect(rect); MVideoManager()->InvalidateRect(rect);
MVideoManager()->vtable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight()); MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
} }
} }

16
LEGO1/mxstreamcontroller.cpp
View File

@ -9,7 +9,7 @@ DECOMP_SIZE_ASSERT(MxStreamController, 0x64)
DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14) DECOMP_SIZE_ASSERT(MxNextActionDataStart, 0x14)
// FUNCTION: LEGO1 0x100b9400 // FUNCTION: LEGO1 0x100b9400
MxResult MxStreamController::vtable0x18(undefined4 p_unknown, undefined4 p_unknown2) MxResult MxStreamController::VTable0x18(undefined4 p_unknown, undefined4 p_unknown2)
{ {
return FAILURE; return FAILURE;
} }
@ -21,7 +21,7 @@ MxResult MxStreamController::vtable0x1C(undefined4 p_unknown, undefined4 p_unkno
} }
// FUNCTION: LEGO1 0x100b9420 // FUNCTION: LEGO1 0x100b9420
MxResult MxStreamController::vtable0x28() MxResult MxStreamController::VTable0x28()
{ {
return SUCCESS; return SUCCESS;
} }
@ -96,7 +96,7 @@ MxResult MxStreamController::Open(const char* p_filename)
} }
// FUNCTION: LEGO1 0x100c1690 // FUNCTION: LEGO1 0x100c1690
MxResult MxStreamController::vtable0x20(MxDSAction* p_action) MxResult MxStreamController::VTable0x20(MxDSAction* p_action)
{ {
MxAutoLocker locker(&m_criticalSection); MxAutoLocker locker(&m_criticalSection);
@ -110,7 +110,7 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
offset = provider->GetBufferForDWords()[objectId]; offset = provider->GetBufferForDWords()[objectId];
if (offset) if (offset)
result = vtable0x2c(p_action, offset); result = VTable0x2c(p_action, offset);
else else
result = FAILURE; result = FAILURE;
@ -118,10 +118,10 @@ MxResult MxStreamController::vtable0x20(MxDSAction* p_action)
} }
// FUNCTION: LEGO1 0x100c1740 // FUNCTION: LEGO1 0x100c1740
MxResult MxStreamController::vtable0x24(MxDSAction* p_action) MxResult MxStreamController::VTable0x24(MxDSAction* p_action)
{ {
MxAutoLocker locker(&m_criticalSection); MxAutoLocker locker(&m_criticalSection);
vtable0x30(p_action); VTable0x30(p_action);
m_action0x60 = m_unk0xList0x54.Find(p_action, TRUE); m_action0x60 = m_unk0xList0x54.Find(p_action, TRUE);
if (m_action0x60 == NULL) { if (m_action0x60 == NULL) {
return FAILURE; return FAILURE;
@ -153,7 +153,7 @@ MxResult MxStreamController::FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferva
} }
// FUNCTION: LEGO1 0x100c1c10 // FUNCTION: LEGO1 0x100c1c10
MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval) MxResult MxStreamController::VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
{ {
MxAutoLocker locker(&m_criticalSection); MxAutoLocker locker(&m_criticalSection);
if (FUN_100c1a00(p_action, p_bufferval) != SUCCESS) { if (FUN_100c1a00(p_action, p_bufferval) != SUCCESS) {
@ -163,7 +163,7 @@ MxResult MxStreamController::vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
} }
// FUNCTION: LEGO1 0x100c1ce0 // FUNCTION: LEGO1 0x100c1ce0
MxResult MxStreamController::vtable0x30(MxDSAction* p_unknown) MxResult MxStreamController::VTable0x30(MxDSAction* p_unknown)
{ {
MxAutoLocker locker(&m_criticalSection); MxAutoLocker locker(&m_criticalSection);
MxResult result = FAILURE; MxResult result = FAILURE;

12
LEGO1/mxstreamcontroller.h
View File

@ -33,14 +33,14 @@ class MxStreamController : public MxCore {
} }
virtual MxResult Open(const char* p_filename); // vtable+0x14 virtual MxResult Open(const char* p_filename); // vtable+0x14
virtual MxResult vtable0x18(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x18 virtual MxResult VTable0x18(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x18
virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x1c virtual MxResult vtable0x1C(undefined4 p_unknown, undefined4 p_unknown2); // vtable+0x1c
virtual MxResult vtable0x20(MxDSAction* p_action); // vtable+0x20 virtual MxResult VTable0x20(MxDSAction* p_action); // vtable+0x20
virtual MxResult vtable0x24(MxDSAction* p_unknown); // vtable+0x24 virtual MxResult VTable0x24(MxDSAction* p_unknown); // vtable+0x24
MxResult FUN_100c1800(MxDSAction* p_action, MxU32 p_val); MxResult FUN_100c1800(MxDSAction* p_action, MxU32 p_val);
virtual MxResult vtable0x28(); // vtable+0x28 virtual MxResult VTable0x28(); // vtable+0x28
virtual MxResult vtable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c virtual MxResult VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval); // vtable+0x2c
virtual MxResult vtable0x30(MxDSAction* p_unknown); // vtable+0x30 virtual MxResult VTable0x30(MxDSAction* p_unknown); // vtable+0x30
MxBool FUN_100c20d0(MxDSObject& p_obj); MxBool FUN_100c20d0(MxDSObject& p_obj);
MxResult FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferval); MxResult FUN_100c1a00(MxDSAction* p_action, MxU32 p_bufferval);

2
LEGO1/mxstreamer.cpp
View File

@ -139,7 +139,7 @@ MxResult MxStreamer::FUN_100b99b0(MxDSAction* p_action)
if (controller == NULL) { if (controller == NULL) {
return FAILURE; return FAILURE;
} }
return controller->vtable0x20(p_action); return controller->VTable0x20(p_action);
} }
return FAILURE; return FAILURE;
} }

2
LEGO1/mxstreamprovider.cpp
View File

@ -12,6 +12,6 @@ MxResult MxStreamProvider::SetResourceToGet(MxStreamController* p_resource)
} }
// FUNCTION: LEGO1 0x100d07d0 // FUNCTION: LEGO1 0x100d07d0
void MxStreamProvider::vtable0x20(undefined4 p_unknown1) void MxStreamProvider::VTable0x20(undefined4 p_unknown1)
{ {
} }

2
LEGO1/mxstreamprovider.h
View File

@ -28,7 +28,7 @@ class MxStreamProvider : public MxCore {
virtual MxResult SetResourceToGet(MxStreamController* p_resource); // vtable+0x14 virtual MxResult SetResourceToGet(MxStreamController* p_resource); // vtable+0x14
virtual MxU32 GetFileSize() = 0; // vtable+0x18 virtual MxU32 GetFileSize() = 0; // vtable+0x18
virtual MxU32 GetStreamBuffersNum() = 0; // vtable+0x1c virtual MxU32 GetStreamBuffersNum() = 0; // vtable+0x1c
virtual void vtable0x20(undefined4 p_unknown1); // vtable+0x20 virtual void VTable0x20(undefined4 p_unknown1); // vtable+0x20
virtual MxU32 GetLengthInDWords() = 0; // vtable+0x24 virtual MxU32 GetLengthInDWords() = 0; // vtable+0x24
virtual MxU32* GetBufferForDWords() = 0; // vtable+0x28 virtual MxU32* GetBufferForDWords() = 0; // vtable+0x28

4
LEGO1/mxvideomanager.cpp
View File

@ -14,7 +14,7 @@ MxVideoManager::MxVideoManager()
} }
// FUNCTION: LEGO1 0x100be270 // FUNCTION: LEGO1 0x100be270
void MxVideoManager::vtable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height) void MxVideoManager::VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height)
{ {
} }
@ -115,7 +115,7 @@ void MxVideoManager::SortPresenterList()
} }
// FUNCTION: LEGO1 0x100be600 // FUNCTION: LEGO1 0x100be600
MxResult MxVideoManager::vtable0x28( MxResult MxVideoManager::VTable0x28(
MxVideoParam& p_videoParam, MxVideoParam& p_videoParam,
LPDIRECTDRAW p_pDirectDraw, LPDIRECTDRAW p_pDirectDraw,
LPDIRECTDRAWSURFACE p_pDDSurface, LPDIRECTDRAWSURFACE p_pDDSurface,

4
LEGO1/mxvideomanager.h
View File

@ -16,7 +16,7 @@ class MxVideoManager : public MxMediaManager {
virtual MxResult Tickle() override; // vtable+0x8 virtual MxResult Tickle() override; // vtable+0x8
virtual void Destroy() override; // vtable+0x18 virtual void Destroy() override; // vtable+0x18
virtual MxResult vtable0x28( virtual MxResult VTable0x28(
MxVideoParam& p_videoParam, MxVideoParam& p_videoParam,
LPDIRECTDRAW p_pDirectDraw, LPDIRECTDRAW p_pDirectDraw,
LPDIRECTDRAWSURFACE p_pDDSurface, LPDIRECTDRAWSURFACE p_pDDSurface,
@ -30,7 +30,7 @@ class MxVideoManager : public MxMediaManager {
__declspec(dllexport) void InvalidateRect(MxRect32&); __declspec(dllexport) void InvalidateRect(MxRect32&);
__declspec(dllexport) virtual MxResult RealizePalette(MxPalette*); // vtable+0x30 __declspec(dllexport) virtual MxResult RealizePalette(MxPalette*); // vtable+0x30
virtual void vtable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34 virtual void VTable0x34(MxU32 p_x, MxU32 p_y, MxU32 p_width, MxU32 p_height); // vtable+0x34
MxResult Init(); MxResult Init();
void Destroy(MxBool p_fromDestructor); void Destroy(MxBool p_fromDestructor);

2
LEGO1/mxvideopresenter.cpp
View File

@ -222,7 +222,7 @@ void MxVideoPresenter::Destroy(MxBool p_fromDestructor)
MxRect32 rect(x, y, x + width, y + height); MxRect32 rect(x, y, x + width, y + height);
MVideoManager()->InvalidateRect(rect); MVideoManager()->InvalidateRect(rect);
MVideoManager()->vtable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight()); MVideoManager()->VTable0x34(rect.GetLeft(), rect.GetTop(), rect.GetWidth(), rect.GetHeight());
} }
delete m_bitmap; delete m_bitmap;