From f70d1eb495767e7a20ac09461a9e444a41dab104 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Tue, 6 Feb 2024 22:45:23 +0100 Subject: [PATCH] Add a few assertions on MFC classes --- CONFIG/AboutDlg.cpp | 1 + CONFIG/ConfigCommandLineInfo.cpp | 1 + CONFIG/MainDlg.cpp | 1 + CONFIG/config.cpp | 2 +- CONFIG/config.h | 5 ++--- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONFIG/AboutDlg.cpp b/CONFIG/AboutDlg.cpp index 16b1aab2..f07667e5 100644 --- a/CONFIG/AboutDlg.cpp +++ b/CONFIG/AboutDlg.cpp @@ -2,6 +2,7 @@ #include "decomp.h" +DECOMP_SIZE_ASSERT(CDialog, 0x60) DECOMP_SIZE_ASSERT(CAboutDialog, 0x60) // FUNCTION: CONFIG 0x00403c20 diff --git a/CONFIG/ConfigCommandLineInfo.cpp b/CONFIG/ConfigCommandLineInfo.cpp index f0cacd11..0e376e6d 100644 --- a/CONFIG/ConfigCommandLineInfo.cpp +++ b/CONFIG/ConfigCommandLineInfo.cpp @@ -2,6 +2,7 @@ #include "decomp.h" +DECOMP_SIZE_ASSERT(CCommandLineInfo, 0x24) DECOMP_SIZE_ASSERT(CConfigCommandLineInfo, 0x24) // FUNCTION: CONFIG 0x00403b10 diff --git a/CONFIG/MainDlg.cpp b/CONFIG/MainDlg.cpp index dd62eda3..17509d0f 100644 --- a/CONFIG/MainDlg.cpp +++ b/CONFIG/MainDlg.cpp @@ -6,6 +6,7 @@ #include +DECOMP_SIZE_ASSERT(CDialog, 0x60) DECOMP_SIZE_ASSERT(CMainDialog, 0x70) // FUNCTION: CONFIG 0x00403d50 diff --git a/CONFIG/config.cpp b/CONFIG/config.cpp index ccc01522..cd1f86fc 100644 --- a/CONFIG/config.cpp +++ b/CONFIG/config.cpp @@ -9,7 +9,7 @@ #include // _spawnl DECOMP_SIZE_ASSERT(CWinApp, 0xc4) -DECOMP_SIZE_ASSERT(CConfigApp, 0x10c) +DECOMP_SIZE_ASSERT(CConfigApp, 0x108) DECOMP_STATIC_ASSERT(offsetof(CConfigApp, m_display_bit_depth) == 0xd0) diff --git a/CONFIG/config.h b/CONFIG/config.h index 76bdfca5..06e3e1ac 100644 --- a/CONFIG/config.h +++ b/CONFIG/config.h @@ -13,7 +13,7 @@ struct MxDriver; #define currentConfigApp ((CConfigApp*) afxCurrentWinApp) -// SIZE 0x10c +// SIZE 0x108 class CConfigApp : public CWinApp { public: CConfigApp(); @@ -58,7 +58,7 @@ class CConfigApp : public CWinApp { public: MxDeviceEnumerate* m_device_enumerator; // 0x0c4 MxDriver* m_driver; // 0x0c8 - MxDevice* m_device; // 0x0cc + MxDevice* m_device; // 0x0cc int m_display_bit_depth; // 0x0d0 BOOL m_flip_surfaces; // 0x0d4 BOOL m_full_screen; // 0x0d8 @@ -73,7 +73,6 @@ class CConfigApp : public CWinApp { int m_texture_quality; // 0x0fc undefined m_unk0x100[4]; // 0x100 BOOL m_music; // 0x104 - undefined m_unk[4]; }; #endif // !defined(AFX_CONFIG_H)