From 3f681101f614c81184a475cc12baf9409e9debe9 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 26 Sep 2022 12:02:33 +0930 Subject: [PATCH] Project64: Missed some files in code cleanup --- .../Settings/SettingsPage-Game-Plugin.h | 86 +++++++++++++------ .../Settings/SettingsPage-Game-Recompiler.h | 44 ++++++---- .../Settings/SettingsPage-Game-Status.h | 39 +++++---- .../Settings/SettingsPage-GameBrowser.h | 56 ++++++------ Source/Project64/WTLApp.h | 18 ++-- 5 files changed, 149 insertions(+), 94 deletions(-) diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h index 5763ac20e..b14077c60 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.h @@ -1,48 +1,80 @@ #pragma once +#include "SettingsPage.h" #include #include -#include "SettingsPage.h" class CGamePluginPage : public CSettingsPageImpl, public CSettingsPage { BEGIN_MSG_MAP_EX(CGamePluginPage) - COMMAND_HANDLER_EX(GFX_LIST, LBN_SELCHANGE, GfxPluginChanged) - COMMAND_HANDLER_EX(AUDIO_LIST, LBN_SELCHANGE, AudioPluginChanged) - COMMAND_HANDLER_EX(CONT_LIST, LBN_SELCHANGE, ControllerPluginChanged) - COMMAND_HANDLER_EX(RSP_LIST, LBN_SELCHANGE, RspPluginChanged) - COMMAND_ID_HANDLER_EX(GFX_ABOUT, GfxPluginAbout) - COMMAND_ID_HANDLER_EX(AUDIO_ABOUT, AudioPluginAbout) - COMMAND_ID_HANDLER_EX(CONT_ABOUT, ControllerPluginAbout) - COMMAND_ID_HANDLER_EX(RSP_ABOUT, RspPluginAbout) - COMMAND_ID_HANDLER_EX(IDC_HLE_GFX, HleGfxChanged) - COMMAND_ID_HANDLER_EX(IDC_HLE_AUDIO, HleAudioChanged) + { + COMMAND_HANDLER_EX(GFX_LIST, LBN_SELCHANGE, GfxPluginChanged); + COMMAND_HANDLER_EX(AUDIO_LIST, LBN_SELCHANGE, AudioPluginChanged); + COMMAND_HANDLER_EX(CONT_LIST, LBN_SELCHANGE, ControllerPluginChanged); + COMMAND_HANDLER_EX(RSP_LIST, LBN_SELCHANGE, RspPluginChanged); + COMMAND_ID_HANDLER_EX(GFX_ABOUT, GfxPluginAbout); + COMMAND_ID_HANDLER_EX(AUDIO_ABOUT, AudioPluginAbout); + COMMAND_ID_HANDLER_EX(CONT_ABOUT, ControllerPluginAbout); + COMMAND_ID_HANDLER_EX(RSP_ABOUT, RspPluginAbout); + COMMAND_ID_HANDLER_EX(IDC_HLE_GFX, HleGfxChanged); + COMMAND_ID_HANDLER_EX(IDC_HLE_AUDIO, HleAudioChanged); + } END_MSG_MAP() - enum { IDD = IDD_Settings_GamePlugin }; + enum + { + IDD = IDD_Settings_GamePlugin + }; public: CGamePluginPage(HWND hParent, const RECT & rcDispay); - LanguageStringID PageTitle(void) { return TAB_PLUGIN; } - void HidePage(void); - void ShowPage(void); - void ApplySettings(bool UpdateScreen); - bool EnableReset(void); - void ResetPage(void); + LanguageStringID PageTitle(void) + { + return TAB_PLUGIN; + } + void HidePage(void); + void ShowPage(void); + void ApplySettings(bool UpdateScreen); + bool EnableReset(void); + void ResetPage(void); private: - void GfxPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(GFX_LIST); } - void AudioPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(AUDIO_LIST); } - void ControllerPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(CONT_LIST); } - void RspPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { ShowAboutButton(RSP_LIST); } + void GfxPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + ShowAboutButton(GFX_LIST); + } + void AudioPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + ShowAboutButton(AUDIO_LIST); + } + void ControllerPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + ShowAboutButton(CONT_LIST); + } + void RspPluginAbout(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + ShowAboutButton(RSP_LIST); + } - void GfxPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(GFX_LIST, GFX_ABOUT); } - void AudioPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(AUDIO_LIST, AUDIO_ABOUT); } - void ControllerPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(CONT_LIST, CONT_ABOUT); } - void RspPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) { PluginItemChanged(RSP_LIST, RSP_ABOUT); } + void GfxPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + PluginItemChanged(GFX_LIST, GFX_ABOUT); + } + void AudioPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + PluginItemChanged(AUDIO_LIST, AUDIO_ABOUT); + } + void ControllerPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + PluginItemChanged(CONT_LIST, CONT_ABOUT); + } + void RspPluginChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/) + { + PluginItemChanged(RSP_LIST, RSP_ABOUT); + } void HleGfxChanged(UINT Code, int id, HWND ctl); void HleAudioChanged(UINT Code, int id, HWND ctl); @@ -56,5 +88,5 @@ private: bool ResetComboBox(CModifiedComboBox & ComboBox, SettingID Type); CPartialGroupBox m_GfxGroup, m_AudioGroup, m_ControlGroup, m_RspGroup; - CPluginList m_PluginList; + CPluginList m_PluginList; }; diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h index 7e9ea5c69..e88d9143e 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Recompiler.h @@ -6,30 +6,38 @@ class CGameRecompilePage : public CSettingsPage { BEGIN_MSG_MAP_EX(CGameRecompilePage) - COMMAND_HANDLER_EX(IDC_CPU_TYPE, LBN_SELCHANGE, ComboBoxChanged) - COMMAND_HANDLER_EX(IDC_FUNCFIND, LBN_SELCHANGE, ComboBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_ROM_REGCACHE, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_ROM_FASTSP, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_BLOCK_LINKING, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_CACHE, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_DMA, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_VALIDATE, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_TLB, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_PROTECT, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SMM_STORE, CheckBoxChanged) + { + COMMAND_HANDLER_EX(IDC_CPU_TYPE, LBN_SELCHANGE, ComboBoxChanged); + COMMAND_HANDLER_EX(IDC_FUNCFIND, LBN_SELCHANGE, ComboBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_ROM_REGCACHE, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_ROM_FASTSP, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_BLOCK_LINKING, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SMM_CACHE, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SMM_DMA, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SMM_VALIDATE, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SMM_TLB, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SMM_PROTECT, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SMM_STORE, CheckBoxChanged); + } END_MSG_MAP() - enum { IDD = IDD_Settings_GameRecompiler }; + enum + { + IDD = IDD_Settings_GameRecompiler + }; public: CGameRecompilePage(HWND hParent, const RECT & rcDispay); - LanguageStringID PageTitle(void) { return TAB_RECOMPILER; } - void HidePage(void); - void ShowPage(void); - void ApplySettings(bool UpdateScreen); - bool EnableReset(void); - void ResetPage(void); + LanguageStringID PageTitle(void) + { + return TAB_RECOMPILER; + } + void HidePage(void); + void ShowPage(void); + void ApplySettings(bool UpdateScreen); + bool EnableReset(void); + void ResetPage(void); private: CPartialGroupBox m_SelfModGroup; diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Status.h b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Status.h index a3dc1f52f..f7b05f7f9 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-Game-Status.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-Game-Status.h @@ -2,26 +2,33 @@ #include "SettingsPage.h" class CGameStatusPage : - public CSettingsPageImpl, - public CSettingsPage + public CSettingsPageImpl, + public CSettingsPage { - BEGIN_MSG_MAP_EX(CGameStatusPage) - COMMAND_HANDLER_EX(IDC_STATUS_TYPE,LBN_SELCHANGE,ComboBoxChanged) - COMMAND_HANDLER_EX(IDC_NOTES_CORE,EN_UPDATE,EditBoxChanged) - COMMAND_HANDLER_EX(IDC_NOTES_PLUGIN,EN_UPDATE,EditBoxChanged) - END_MSG_MAP() + BEGIN_MSG_MAP_EX(CGameStatusPage) + { + COMMAND_HANDLER_EX(IDC_STATUS_TYPE, LBN_SELCHANGE, ComboBoxChanged); + COMMAND_HANDLER_EX(IDC_NOTES_CORE, EN_UPDATE, EditBoxChanged); + COMMAND_HANDLER_EX(IDC_NOTES_PLUGIN, EN_UPDATE, EditBoxChanged); + } + END_MSG_MAP() - enum { IDD = IDD_Settings_GameStatus }; + enum + { + IDD = IDD_Settings_GameStatus + }; public: - CGameStatusPage(HWND hParent, const RECT & rcDispay ); + CGameStatusPage(HWND hParent, const RECT & rcDispay); - LanguageStringID PageTitle ( void ) { return TAB_ROMNOTES; } - void HidePage ( void ); - void ShowPage ( void ); - void ApplySettings ( bool UpdateScreen ); - bool EnableReset ( void ); - void ResetPage ( void ); - + LanguageStringID PageTitle(void) + { + return TAB_ROMNOTES; + } + void HidePage(void); + void ShowPage(void); + void ApplySettings(bool UpdateScreen); + bool EnableReset(void); + void ResetPage(void); }; diff --git a/Source/Project64/UserInterface/Settings/SettingsPage-GameBrowser.h b/Source/Project64/UserInterface/Settings/SettingsPage-GameBrowser.h index 85af44949..abf15d432 100644 --- a/Source/Project64/UserInterface/Settings/SettingsPage-GameBrowser.h +++ b/Source/Project64/UserInterface/Settings/SettingsPage-GameBrowser.h @@ -5,38 +5,46 @@ class COptionsGameBrowserPage : public CSettingsPage { BEGIN_MSG_MAP_EX(COptionsGameBrowserPage) - COMMAND_HANDLER_EX(IDC_ADD, BN_CLICKED, AddFieldClicked) - COMMAND_HANDLER_EX(IDC_REMOVE, BN_CLICKED, RemoveFieldClicked) - COMMAND_HANDLER_EX(IDC_UP, BN_CLICKED, MoveFieldUpClicked) - COMMAND_HANDLER_EX(IDC_DOWN, BN_CLICKED, MoveFieldDownClicked) - COMMAND_ID_HANDLER_EX(IDC_USE_ROMBROWSER, UseRomBrowserChanged) - COMMAND_ID_HANDLER_EX(IDC_RECURSION, CheckBoxChanged) - COMMAND_ID_HANDLER_EX(IDC_SHOW_FILE_EXTENSIONS, CheckBoxChanged) + { + COMMAND_HANDLER_EX(IDC_ADD, BN_CLICKED, AddFieldClicked); + COMMAND_HANDLER_EX(IDC_REMOVE, BN_CLICKED, RemoveFieldClicked); + COMMAND_HANDLER_EX(IDC_UP, BN_CLICKED, MoveFieldUpClicked); + COMMAND_HANDLER_EX(IDC_DOWN, BN_CLICKED, MoveFieldDownClicked); + COMMAND_ID_HANDLER_EX(IDC_USE_ROMBROWSER, UseRomBrowserChanged); + COMMAND_ID_HANDLER_EX(IDC_RECURSION, CheckBoxChanged); + COMMAND_ID_HANDLER_EX(IDC_SHOW_FILE_EXTENSIONS, CheckBoxChanged); + } END_MSG_MAP() - enum { IDD = IDD_Settings_RomBrowser }; + enum + { + IDD = IDD_Settings_RomBrowser + }; public: COptionsGameBrowserPage(HWND hParent, const RECT & rcDispay); - LanguageStringID PageTitle(void) { return TAB_ROMSELECTION; } - void HidePage(void); - void ShowPage(void); - void ApplySettings(bool UpdateScreen); - bool EnableReset(void); - void ResetPage(void); + LanguageStringID PageTitle(void) + { + return TAB_ROMSELECTION; + } + void HidePage(void); + void ShowPage(void); + void ApplySettings(bool UpdateScreen); + bool EnableReset(void); + void ResetPage(void); private: - void UpdatePageSettings(void); - void UpdateFieldList(const ROMBROWSER_FIELDS_LIST & Fields); - void AddFieldClicked(UINT Code, int id, HWND ctl); - void RemoveFieldClicked(UINT Code, int id, HWND ctl); - void MoveFieldUpClicked(UINT Code, int id, HWND ctl); - void MoveFieldDownClicked(UINT Code, int id, HWND ctl); - void UseRomBrowserChanged(UINT Code, int id, HWND ctl); - void FixCtrlState(void); + void UpdatePageSettings(void); + void UpdateFieldList(const ROMBROWSER_FIELDS_LIST & Fields); + void AddFieldClicked(UINT Code, int id, HWND ctl); + void RemoveFieldClicked(UINT Code, int id, HWND ctl); + void MoveFieldUpClicked(UINT Code, int id, HWND ctl); + void MoveFieldDownClicked(UINT Code, int id, HWND ctl); + void UseRomBrowserChanged(UINT Code, int id, HWND ctl); + void FixCtrlState(void); ROMBROWSER_FIELDS_LIST m_Fields; - CListBox m_Avaliable, m_Using; - bool m_OrderChanged, m_OrderReset; + CListBox m_Avaliable, m_Using; + bool m_OrderChanged, m_OrderReset; }; diff --git a/Source/Project64/WTLApp.h b/Source/Project64/WTLApp.h index 4fd83e0eb..30a38acce 100644 --- a/Source/Project64/WTLApp.h +++ b/Source/Project64/WTLApp.h @@ -11,19 +11,19 @@ #pragma warning(disable : 4838) // warning C4838: conversion from 'int' to 'UINT' requires a narrowing conversion #pragma warning(disable : 4996) // warning C4996: 'GetVersionExA': was declared deprecated #define _ATL_DISABLE_NOTHROW_NEW -#include #include +#include #include +#include #include #include -#include #define _WTL_NO_CSTRING #include -#include #include +#include #pragma warning(pop) @@ -45,11 +45,11 @@ extern CPj64Module _Module; #include -#include "UserInterface/resource.h" -#include "UserInterface/WTLControls/GetCWindowText.h" -#include "UserInterface/WTLControls/EditNumber32.h" #include "UserInterface/WTLControls/ClistCtrl/ListCtrl.h" -#include "UserInterface/WTLControls/ModifiedComboBox.h" -#include "UserInterface/WTLControls/PartialGroupBox.h" -#include "UserInterface/WTLControls/ModifiedEditBox.h" +#include "UserInterface/WTLControls/EditNumber32.h" +#include "UserInterface/WTLControls/GetCWindowText.h" #include "UserInterface/WTLControls/ModifiedCheckBox.h" +#include "UserInterface/WTLControls/ModifiedComboBox.h" +#include "UserInterface/WTLControls/ModifiedEditBox.h" +#include "UserInterface/WTLControls/PartialGroupBox.h" +#include "UserInterface/resource.h"