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

MxOmni::Create 100% match, make Create calls consistent (#211)

Browse Source 
* Improve MxOmni::Create match, make Create calls consistent

* Match MxEventManager::Create

* Fix MxTickleClientPtrList

* 100% match

* Update mxomnicreateparam.h
This commit is contained in:
Christian Semmler
2023-10-14 20:49:07 -04:00
committed by GitHub
parent 0c8705a9df
commit 37e75703d4
15 changed files with 74 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
LEGO1/mxeventmanager.cpp
View File

@@ -37,29 +37,28 @@ void MxEventManager::Destroy(MxBool p_fromDestructor)
} }
// OFFSET: LEGO1 0x100c04a0 // OFFSET: LEGO1 0x100c04a0
MxResult MxEventManager::CreateEventThread(MxU32 p_frequencyMS, MxBool p_noRegister) MxResult MxEventManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{ {
MxResult status = FAILURE; MxResult status = FAILURE;
MxBool locked = FALSE; MxBool locked = FALSE;
MxResult result = MxMediaManager::InitPresenters(); MxResult result = MxMediaManager::InitPresenters();
if (result == SUCCESS) { if (result == SUCCESS) {
if (p_noRegister) { if (p_createThread) {
this->m_criticalSection.Enter(); this->m_criticalSection.Enter();
locked = TRUE; locked = TRUE;
this->m_thread = new MxTickleThread(this, p_frequencyMS); this->m_thread = new MxTickleThread(this, p_frequencyMS);
if (this->m_thread) { if (!this->m_thread || this->m_thread->Start(0, 0) != SUCCESS)
if (this->m_thread->Start(0, 0) == SUCCESS) goto done;
status = SUCCESS;
} }
} else
else {
TickleManager()->RegisterClient(this, p_frequencyMS); TickleManager()->RegisterClient(this, p_frequencyMS);
status = SUCCESS; status = SUCCESS;
} }
}
done:
if (status != SUCCESS) if (status != SUCCESS)
Destroy(); Destroy();

2
LEGO1/mxeventmanager.h
View File

@@ -13,7 +13,7 @@ public:
virtual ~MxEventManager() override; virtual ~MxEventManager() override;
virtual void Destroy() override; // vtable+18 virtual void Destroy() override; // vtable+18
virtual MxResult CreateEventThread(MxU32 p_frequencyMS, MxBool p_noRegister); // vtable+28 virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+28
private: private:
void Init(); void Init();

2
LEGO1/mxmusicmanager.cpp
View File

@@ -120,7 +120,7 @@ void MxMusicManager::SetVolume(MxS32 p_volume)
} }
// OFFSET: LEGO1 0x100c0840 // OFFSET: LEGO1 0x100c0840
MxResult MxMusicManager::StartMIDIThread(MxU32 p_frequencyMS, MxBool p_createThread) MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{ {
MxResult status = FAILURE; MxResult status = FAILURE;
MxBool locked = FALSE; MxBool locked = FALSE;

2
LEGO1/mxmusicmanager.h
View File

@@ -14,7 +14,7 @@ public:
virtual void Destroy() override; // vtable+18 virtual void Destroy() override; // vtable+18
virtual void SetVolume(MxS32 p_volume) override; // vtable+2c virtual void SetVolume(MxS32 p_volume) override; // vtable+2c
virtual MxResult StartMIDIThread(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+30 virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+30
inline MxBool GetMIDIInitialized() { return m_MIDIInitialized; } inline MxBool GetMIDIInitialized() { return m_MIDIInitialized; }

2
LEGO1/mxnotificationmanager.cpp
View File

@@ -72,7 +72,7 @@ MxResult MxNotificationManager::Tickle()
} }
// OFFSET: LEGO1 0x100ac600 // OFFSET: LEGO1 0x100ac600
MxResult MxNotificationManager::Create(MxS32 p_unk1, MxS32 p_unk2) MxResult MxNotificationManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{ {
MxResult result = SUCCESS; MxResult result = SUCCESS;
m_queue = new MxNotificationPtrList(); m_queue = new MxNotificationPtrList();

2
LEGO1/mxnotificationmanager.h
View File

@@ -45,7 +45,7 @@ public:
virtual MxResult Tickle(); // vtable+0x8 virtual MxResult Tickle(); // vtable+0x8
// TODO: Where does this method come from? // TODO: Where does this method come from?
virtual MxResult Create(MxS32 p_unk1, MxS32 p_unk2); // vtable+0x14 virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); // vtable+0x14
void Register(MxCore *p_listener); void Register(MxCore *p_listener);
void Unregister(MxCore *p_listener); void Unregister(MxCore *p_listener);
MxResult Send(MxCore *p_listener, MxNotificationParam *p_param); MxResult Send(MxCore *p_listener, MxNotificationParam *p_param);

117
LEGO1/mxomni.cpp
View File

@@ -189,118 +189,87 @@ void MxOmni::SetInstance(MxOmni *instance)
MxResult MxOmni::Create(MxOmniCreateParam &p) MxResult MxOmni::Create(MxOmniCreateParam &p)
{ {
MxResult result = FAILURE; MxResult result = FAILURE;
m_atomIdCounterSet = new MxAtomIdCounterSet();
if (m_atomIdCounterSet == NULL) if (!(m_atomIdCounterSet = new MxAtomIdCounterSet()))
{ goto done;
goto failure;
}
m_mediaPath = p.GetMediaPath(); m_mediaPath = p.GetMediaPath();
m_windowHandle = p.GetWindowHandle(); m_windowHandle = p.GetWindowHandle();
if (p.CreateFlags().CreateObjectFactory())
{
MxObjectFactory *objectFactory = new MxObjectFactory();
this->m_objectFactory = objectFactory;
if (objectFactory == NULL) if (p.CreateFlags().CreateObjectFactory()) {
goto failure; if (!(m_objectFactory = new MxObjectFactory()))
goto done;
} }
if (p.CreateFlags().CreateVariableTable()) if (p.CreateFlags().CreateVariableTable()) {
{ if (!(m_variableTable = new MxVariableTable()))
MxVariableTable *variableTable = new MxVariableTable(); goto done;
this->m_variableTable = variableTable;
if (variableTable == NULL)
goto failure;
} }
if (p.CreateFlags().CreateTimer()) if (p.CreateFlags().CreateTimer()) {
{ if (!(m_timer = new MxTimer()))
MxTimer *timer = new MxTimer(); goto done;
this->m_timer = timer;
if (timer == NULL)
return FAILURE;
} }
if (p.CreateFlags().CreateTickleManager()) if (p.CreateFlags().CreateTickleManager()) {
{ if (!(m_tickleManager = new MxTickleManager()))
this->m_tickleManager = new MxTickleManager(); goto done;
if (m_tickleManager == NULL)
goto failure;
} }
if (p.CreateFlags().CreateNotificationManager()) if (p.CreateFlags().CreateNotificationManager()) {
{ if (m_notificationManager = new MxNotificationManager()) {
MxNotificationManager *notificationManager = new MxNotificationManager(); if (m_notificationManager->Create(100, 0) != SUCCESS)
this->m_notificationManager = notificationManager; goto done;
}
if (notificationManager == NULL || notificationManager->Create(100, 0) != SUCCESS) else
goto failure; goto done;
} }
if (p.CreateFlags().CreateStreamer()) if (p.CreateFlags().CreateStreamer()) {
{ if (!(m_streamer = new MxStreamer()) || m_streamer->Create() != SUCCESS)
MxStreamer *streamer = new MxStreamer(); goto done;
this->m_streamer = streamer;
if (streamer == NULL || streamer->Init() != SUCCESS)
goto failure;
} }
if (p.CreateFlags().CreateVideoManager()) if (p.CreateFlags().CreateVideoManager()) {
{ if (m_videoManager = new MxVideoManager()) {
MxVideoManager *videoManager = new MxVideoManager(); if (m_videoManager->Create(p.GetVideoParam(), 100, 0) != SUCCESS) {
this->m_videoManager = videoManager;
if (videoManager && videoManager->Create(p.GetVideoParam(), 100, 0) != SUCCESS) {
delete m_videoManager; delete m_videoManager;
m_videoManager = NULL; m_videoManager = NULL;
} }
} }
}
if (p.CreateFlags().CreateSoundManager()) if (p.CreateFlags().CreateSoundManager()) {
{ if (m_soundManager = new MxSoundManager()) {
MxSoundManager *soundManager = new MxSoundManager(); if (m_soundManager->Create(10, 0) != SUCCESS) {
this->m_soundManager = soundManager;
//TODO
if (soundManager != NULL && soundManager->StartDirectSound(10, 0) != SUCCESS)
{
delete m_soundManager; delete m_soundManager;
m_soundManager = NULL; m_soundManager = NULL;
} }
} }
}
if (p.CreateFlags().CreateMusicManager()) if (p.CreateFlags().CreateMusicManager()) {
{ if (m_musicManager = new MxMusicManager()) {
MxMusicManager *musicManager = new MxMusicManager(); if (m_musicManager->Create(50, 0) != SUCCESS) {
this->m_musicManager = musicManager;
if (musicManager != NULL && musicManager->StartMIDIThread(50, 0) != SUCCESS)
{
delete m_musicManager; delete m_musicManager;
m_musicManager = NULL; m_musicManager = NULL;
} }
} }
}
if (p.CreateFlags().CreateEventManager()) if (p.CreateFlags().CreateEventManager()) {
{ if (m_eventManager = new MxEventManager()) {
MxEventManager *eventManager = new MxEventManager(); if (m_eventManager->Create(50, 0) != SUCCESS) {
this->m_eventManager = eventManager;
if (m_eventManager != NULL && m_eventManager->CreateEventThread(50, 0) != SUCCESS)
{
delete m_eventManager; delete m_eventManager;
m_eventManager = NULL; m_eventManager = NULL;
} }
} }
}
result = SUCCESS; result = SUCCESS;
failure: done:
if (result != SUCCESS) if (result != SUCCESS)
{
Destroy(); Destroy();
}
return result; return result;
} }

2
LEGO1/mxomnicreateparam.h
View File

@@ -14,7 +14,7 @@ public:
__declspec(dllexport) MxOmniCreateParam(const char *mediaPath, struct HWND__ *windowHandle, MxVideoParam &vparam, MxOmniCreateFlags flags); __declspec(dllexport) MxOmniCreateParam(const char *mediaPath, struct HWND__ *windowHandle, MxVideoParam &vparam, MxOmniCreateFlags flags);
const MxOmniCreateFlags& CreateFlags() const { return this->m_createFlags; } const MxOmniCreateFlags& CreateFlags() const { return this->m_createFlags; }
const MxString GetMediaPath() const { return m_mediaPath; } const MxString& GetMediaPath() const { return m_mediaPath; }
const HWND GetWindowHandle() const { return m_windowHandle; } const HWND GetWindowHandle() const { return m_windowHandle; }
MxVideoParam& GetVideoParam() { return m_videoParam; } MxVideoParam& GetVideoParam() { return m_videoParam; }

4
LEGO1/mxsoundmanager.cpp
View File

@@ -49,9 +49,9 @@ void MxSoundManager::Destroy(MxBool p_fromDestructor)
} }
// OFFSET: LEGO1 0x100ae8b0 STUB // OFFSET: LEGO1 0x100ae8b0 STUB
MxResult MxSoundManager::StartDirectSound(undefined4 p_unknown1, MxBool p_unknown2) MxResult MxSoundManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
{ {
// TODO STUB // TODO
return FAILURE; return FAILURE;
} }

2
LEGO1/mxsoundmanager.h
View File

@@ -14,7 +14,7 @@ public:
MxSoundManager(); MxSoundManager();
virtual ~MxSoundManager() override; // vtable+0x0 virtual ~MxSoundManager() override; // vtable+0x0
virtual MxResult StartDirectSound(undefined4 p_unknown1, MxBool p_unknown2); //vtable+0x30 virtual MxResult Create(MxU32 p_frequencyMS, MxBool p_createThread); //vtable+0x30
virtual void vtable0x34(); // vtable+0x34 virtual void vtable0x34(); // vtable+0x34
virtual void vtable0x38(); // vtable+0x38 virtual void vtable0x38(); // vtable+0x38

2
LEGO1/mxstreamer.cpp
View File

@@ -16,7 +16,7 @@ MxStreamer::MxStreamer()
} }
// OFFSET: LEGO1 0x100b9190 // OFFSET: LEGO1 0x100b9190
MxResult MxStreamer::Init() MxResult MxStreamer::Create()
{ {
undefined *b = new undefined[m_subclass1.GetSize() * 0x5800]; undefined *b = new undefined[m_subclass1.GetSize() * 0x5800];
m_subclass1.SetBuffer(b); m_subclass1.SetBuffer(b);

2
LEGO1/mxstreamer.h
View File

@@ -90,7 +90,7 @@ public:
return !strcmp(p_name, MxStreamer::ClassName()) || MxCore::IsA(p_name); return !strcmp(p_name, MxStreamer::ClassName()) || MxCore::IsA(p_name);
} }
virtual MxResult Init(); // vtable+0x14 virtual MxResult Create(); // vtable+0x14
MxStreamController *GetOpenStream(const char *p_name); MxStreamController *GetOpenStream(const char *p_name);

2
LEGO1/mxstring.cpp
View File

@@ -56,7 +56,7 @@ void MxString::ToLowerCase()
} }
// OFFSET: LEGO1 0x100ae4b0 // OFFSET: LEGO1 0x100ae4b0
MxString &MxString::operator=(MxString &param) MxString &MxString::operator=(const MxString &param)
{ {
if (this->m_data != param.m_data) if (this->m_data != param.m_data)
{ {

2
LEGO1/mxstring.h
View File

@@ -15,7 +15,7 @@ public:
MxString(const char *); MxString(const char *);
void ToUpperCase(); void ToUpperCase();
void ToLowerCase(); void ToLowerCase();
MxString& operator=(MxString &); MxString& operator=(const MxString &);
MxString operator+(const char *); MxString operator+(const char *);
MxString& operator+=(const char *); MxString& operator+=(const char *);

5
LEGO1/mxticklemanager.h
View File

@@ -53,14 +53,13 @@ private:
MxU16 m_flags; // 0xc MxU16 m_flags; // 0xc
}; };
class MxTickleClientPtrList : public list<MxTickleClient *> typedef list<MxTickleClient*> MxTickleClientPtrList;
{};
// VTABLE 0x100d86d8 // VTABLE 0x100d86d8
class MxTickleManager : public MxCore class MxTickleManager : public MxCore
{ {
public: public:
inline MxTickleManager() : MxCore(), m_clients() {} inline MxTickleManager() {}
virtual ~MxTickleManager(); // vtable+0x0 (scalar deleting destructor) virtual ~MxTickleManager(); // vtable+0x0 (scalar deleting destructor)
virtual MxResult Tickle(); // vtable+0x8 virtual MxResult Tickle(); // vtable+0x8