ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Debugger] Clean up debugger commands attach/detach

This commit is contained in:
zilmar 2017-09-13 20:52:18 +10:00
parent 7bb70c2a49
commit fda0ce24e6
3 changed files with 126 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Source/Project64/N64System/Debugger/Debugger-Commands.cpp
View File

@ -40,12 +40,23 @@ CDebugCommandsView::~CDebugCommandsView(void)
LRESULT CDebugCommandsView::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)
{
m_CommandList.Attach(GetDlgItem(IDC_CMD_LIST));
m_BreakpointList.Attach(GetDlgItem(IDC_BP_LIST));
m_AddressEdit.Attach(GetDlgItem(IDC_ADDR_EDIT));
m_PCEdit.Attach(GetDlgItem(IDC_PC_EDIT));
m_ViewPCButton.Attach(GetDlgItem(IDC_VIEWPC_BTN));
m_StepButton.Attach(GetDlgItem(IDC_STEP_BTN));
m_SkipButton.Attach(GetDlgItem(IDC_SKIP_BTN));
m_GoButton.Attach(GetDlgItem(IDC_GO_BTN));
m_RegisterTabs.Attach(GetDlgItem(IDC_REG_TABS));
m_Scrollbar.Attach(GetDlgItem(IDC_SCRL_BAR));
m_BackButton.Attach(GetDlgItem(IDC_BACK_BTN));
m_ForwardButton.Attach(GetDlgItem(IDC_FORWARD_BTN));
m_OpEdit.Attach(GetDlgItem(IDC_OP_EDIT));
DlgResize_Init(false, true);
DlgToolTip_Init();
//m_ptMinTrackSize.x = 580;
//m_ptMinTrackSize.y = 495;
m_CommandListRows = 39;
CheckCPUType();
@ -53,14 +64,10 @@ LRESULT CDebugCommandsView::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARA
GetWindowRect(&m_DefaultWindowRect);
// Setup address input
m_AddressEdit.Attach(GetDlgItem(IDC_ADDR_EDIT));
m_AddressEdit.SetDisplayType(CEditNumber::DisplayHex);
m_AddressEdit.SetLimitText(8);
// Setup PC register input
m_PCEdit.Attach(GetDlgItem(IDC_PC_EDIT));
m_PCEdit.SetDisplayType(CEditNumber::DisplayHex);
m_PCEdit.SetLimitText(8);
@ -68,49 +75,23 @@ LRESULT CDebugCommandsView::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARA
m_PCEdit.SetValue(0x80000180, false, true);
// Setup View PC button
m_ViewPCButton.Attach(GetDlgItem(IDC_VIEWPC_BTN));
m_ViewPCButton.EnableWindow(FALSE);
// Setup debugging buttons
m_StepButton.Attach(GetDlgItem(IDC_STEP_BTN));
m_StepButton.EnableWindow(FALSE);
m_SkipButton.Attach(GetDlgItem(IDC_SKIP_BTN));
m_SkipButton.EnableWindow(FALSE);
m_GoButton.Attach(GetDlgItem(IDC_GO_BTN));
m_GoButton.EnableWindow(FALSE);
// Setup register tabs & inputs
m_RegisterTabs.Attach(GetDlgItem(IDC_REG_TABS));
// Setup breakpoint list
m_BreakpointList.Attach(GetDlgItem(IDC_BP_LIST));
m_BreakpointList.ModifyStyle(NULL, LBS_NOTIFY);
RefreshBreakpointList();
// Setup list scrollbar
m_Scrollbar.Attach(GetDlgItem(IDC_SCRL_BAR));
m_Scrollbar.SetScrollRange(0, 100, FALSE);
m_Scrollbar.SetScrollPos(50, TRUE);
//m_Scrollbar.GetScrollInfo(); // todo bigger thumb size
//m_Scrollbar.SetScrollInfo();
// Setup history buttons
m_BackButton.Attach(GetDlgItem(IDC_BACK_BTN));
m_ForwardButton.Attach(GetDlgItem(IDC_FORWARD_BTN));
ToggleHistoryButtons();
// Setup command list
m_CommandList.Attach(GetDlgItem(IDC_CMD_LIST));
// Op editor
m_OpEdit.Attach(GetDlgItem(IDC_OP_EDIT));
m_OpEdit.SetCommandsWindow(this);
m_bIgnoreAddrChange = true;
@ -137,10 +118,23 @@ LRESULT CDebugCommandsView::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARA
LRESULT CDebugCommandsView::OnDestroy(void)
{
UnhookWindowsHookEx(hWinMessageHook);
m_OpEdit.Detach();
m_ForwardButton.Detach();
m_BackButton.Detach();
m_Scrollbar.Detach();
m_RegisterTabs.Detach();
m_GoButton.Detach();
m_SkipButton.Detach();
m_StepButton.Detach();
m_ViewPCButton.Detach();
m_PCEdit.Detach();
m_AddressEdit.Detach();
m_BreakpointList.Detach();
m_CommandList.Detach();
return 0;
}
void CDebugCommandsView::InterceptKeyDown(WPARAM wParam, LPARAM lParam)
void CDebugCommandsView::InterceptKeyDown(WPARAM wParam, LPARAM /*lParam*/)
{
switch (wParam)
{
@ -153,7 +147,7 @@ void CDebugCommandsView::InterceptKeyDown(WPARAM wParam, LPARAM lParam)
}
}
void CDebugCommandsView::InterceptMouseWheel(WPARAM wParam, LPARAM lParam)
void CDebugCommandsView::InterceptMouseWheel(WPARAM wParam, LPARAM /*lParam*/)
{
uint32_t newAddress = m_StartAddress - ((short)HIWORD(wParam) / WHEEL_DELTA) * 4;
@ -172,7 +166,6 @@ LRESULT CALLBACK CDebugCommandsView::HookProc(int nCode, WPARAM wParam, LPARAM l
}
else if (pMsg->message == WM_MOUSEWHEEL)
{
BOOL bHandled = TRUE;
_this->InterceptMouseWheel(pMsg->wParam, pMsg->lParam);
}
@ -184,7 +177,7 @@ LRESULT CALLBACK CDebugCommandsView::HookProc(int nCode, WPARAM wParam, LPARAM l
return 0;
}
LRESULT CDebugCommandsView::OnOpKeyDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
LRESULT CDebugCommandsView::OnOpKeyDown(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& bHandled)
{
if (wParam == VK_UP)
{
@ -200,9 +193,8 @@ LRESULT CDebugCommandsView::OnOpKeyDown(UINT uMsg, WPARAM wParam, LPARAM lParam,
}
else if (wParam == VK_RETURN)
{
int textLen = m_OpEdit.GetWindowTextLengthA();
char text[256];
m_OpEdit.GetWindowTextA(text, 255);
char text[256] = { 0 };
m_OpEdit.GetWindowTextA(text, sizeof(text) - 1);
uint32_t op;
bool bValid = CAssembler::AssembleLine(text, &op, m_SelectedAddress);
if (bValid)
@ -1536,22 +1528,14 @@ LRESULT CDebugCommandsView::OnRegisterTabChange(NMHDR* pNMHDR)
void CDebugCommandsView::ToggleHistoryButtons()
{
if (m_History.size() != 0 && m_HistoryIndex > 0)
if (m_BackButton.m_hWnd != NULL)
{
m_BackButton.EnableWindow(TRUE);
}
else
{
m_BackButton.EnableWindow(FALSE);
m_BackButton.EnableWindow(m_History.size() != 0 && m_HistoryIndex > 0 ? TRUE : FALSE);
}
if (m_History.size() != 0 && m_HistoryIndex < m_History.size() - 1)
if (m_ForwardButton.m_hWnd != NULL)
{
m_ForwardButton.EnableWindow(TRUE);
}
else
{
m_ForwardButton.EnableWindow(FALSE);
m_ForwardButton.EnableWindow(m_History.size() != 0 && m_HistoryIndex < m_History.size() - 1 ? TRUE : FALSE);
}
}