Implement/match more of MxCompositePresenter (#315)

* Implement/match more of MxCompositePresenter

* Use parameter to `DeleteAll` instead of separate function

* StartAction match
This commit is contained in:
Christian Semmler
2023-12-11 16:35:50 -05:00
committed by GitHub
parent a7194266b3
commit 4dd0d60dec
11 changed files with 141 additions and 39 deletions

View File

@@ -1,7 +1,11 @@
#include "mxcompositepresenter.h"
#include "decomp.h"
#include "mxactionnotificationparam.h"
#include "mxautolocker.h"
#include "mxdsmultiaction.h"
#include "mxnotificationmanager.h"
#include "mxobjectfactory.h"
DECOMP_SIZE_ASSERT(MxCompositePresenter, 0x4c);
@@ -13,6 +17,9 @@ MxBool MxCompositePresenter::VTable0x64(undefined4 p_unknown)
return TRUE;
}
// TEMPLATE: LEGO1 0x1004ae90
// list<MxPresenter *,allocator<MxPresenter *> >::_Buynode
// FUNCTION: LEGO1 0x100b60b0
MxCompositePresenter::MxCompositePresenter()
{
@@ -43,34 +50,106 @@ MxCompositePresenter::~MxCompositePresenter()
NotificationManager()->Unregister(this);
}
// STUB: LEGO1 0x100b6410
MxResult MxCompositePresenter::StartAction(MxStreamController*, MxDSAction*)
// FUNCTION: LEGO1 0x100b6410
MxResult MxCompositePresenter::StartAction(MxStreamController* p_controller, MxDSAction* p_action)
{
// TODO
return SUCCESS;
MxAutoLocker lock(&m_criticalSection);
MxResult result = FAILURE;
MxDSActionList* actions = ((MxDSMultiAction*) p_action)->GetActionList();
MxObjectFactory* factory = ObjectFactory();
MxDSActionListCursor cursor(actions);
MxDSAction* action;
if (MxPresenter::StartAction(p_controller, p_action) == SUCCESS) {
// The usual cursor.Next() loop doesn't match here, even though
// the logic is the same. It does match when "deconstructed" into
// the following Head(), Current() and NextFragment() calls,
// but this seems unlikely to be the original code.
// The alpha debug build also uses Next().
cursor.Head();
while (cursor.Current(action)) {
cursor.NextFragment();
MxBool success = FALSE;
action->CopyFlags(m_action->GetFlags());
const char* presenterName = PresenterNameDispatch(*action);
MxPresenter* presenter = (MxPresenter*) factory->Create(presenterName);
if (presenter && presenter->AddToManager() == SUCCESS) {
presenter->SetCompositePresenter(this);
if (presenter->StartAction(p_controller, action) == SUCCESS)
success = TRUE;
}
if (success) {
action->SetOrigin(this);
m_list.push_back(presenter);
}
else if (presenter)
delete presenter;
}
result = SUCCESS;
}
return result;
}
// STUB: LEGO1 0x100b65e0
// FUNCTION: LEGO1 0x100b65e0
void MxCompositePresenter::EndAction()
{
// TODO
MxAutoLocker lock(&m_criticalSection);
if (!m_action)
return;
((MxDSMultiAction*) m_action)->GetActionList()->DeleteAll(FALSE);
while (!m_list.empty()) {
MxPresenter* presenter = m_list.front();
m_list.pop_front();
presenter->SetCompositePresenter(NULL);
presenter->EndAction();
}
MxDSAction* action = m_action;
MxPresenter::EndAction();
if (action && action->GetOrigin()) {
NotificationManager()->Send(
action->GetOrigin(),
&MxEndActionNotificationParam(c_notificationEndAction, this, action, FALSE)
);
}
}
// STUB: LEGO1 0x100b6760
// FUNCTION: LEGO1 0x100b6760
MxLong MxCompositePresenter::Notify(MxParam& p)
{
// TODO
MxAutoLocker lock(&m_criticalSection);
switch (((MxNotificationParam&) p).GetNotification()) {
case c_notificationEndAction:
VTable0x58(p);
break;
case MXPRESENTER_NOTIFICATION:
VTable0x5c(p);
}
return 0;
}
// STUB: LEGO1 0x100b67f0
void MxCompositePresenter::VTable0x58()
void MxCompositePresenter::VTable0x58(MxParam& p)
{
// TODO
}
// STUB: LEGO1 0x100b69b0
void MxCompositePresenter::VTable0x5c()
void MxCompositePresenter::VTable0x5c(MxParam& p)
{
// TODO
}