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

[Debugger] Clean up compiler warnings

This commit is contained in:
shygoo 2020-01-22 00:34:27 -06:00
parent bbabbc7b28
commit 277f1c4a31
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64/UserInterface/Debugger/Debugger-DMALogView.cpp
View File

@ -193,7 +193,7 @@ void CDebugDMALogView::RefreshDMALogWindow(bool bReset)
LRESULT CDebugDMALogView::OnRefresh(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) LRESULT CDebugDMALogView::OnRefresh(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/)
{ {
bool bReset = (bool)wParam; bool bReset = (wParam != 0);
if (bReset) if (bReset)
{ {

9
Source/Project64/UserInterface/Debugger/Debugger-ExceptionBreakpoints.cpp
View File

@ -84,9 +84,12 @@ LRESULT CDebugExcBreakpoints::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPA
InitCheckboxes(IntrCheckboxMap, Debugger_IntrBreakpoints); InitCheckboxes(IntrCheckboxMap, Debugger_IntrBreakpoints);
InitCheckboxes(RcpIntrCheckboxMap, Debugger_RcpIntrBreakpoints); InitCheckboxes(RcpIntrCheckboxMap, Debugger_RcpIntrBreakpoints);
bool intrEnabled = g_Settings->LoadDword(Debugger_ExceptionBreakpoints) & 0x01; uint32_t excBreakpoints = g_Settings->LoadDword(Debugger_ExceptionBreakpoints);
bool rcpIntrEnabled = g_Settings->LoadDword(Debugger_IntrBreakpoints) & 0x04; uint32_t intrBreakpoints = g_Settings->LoadDword(Debugger_IntrBreakpoints);
bool fpExcEnabled = g_Settings->LoadDword(Debugger_ExceptionBreakpoints) & (1 << 15);
bool intrEnabled = (excBreakpoints & 0x01) != 0;
bool rcpIntrEnabled = (intrBreakpoints & 0x04) != 0;
bool fpExcEnabled = (excBreakpoints & (1 << 15)) != 0;
EnableCheckboxes(IntrCheckboxMap, intrEnabled); EnableCheckboxes(IntrCheckboxMap, intrEnabled);
EnableCheckboxes(RcpIntrCheckboxMap, intrEnabled && rcpIntrEnabled); EnableCheckboxes(RcpIntrCheckboxMap, intrEnabled && rcpIntrEnabled);

18
Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp
View File

@ -32,47 +32,47 @@ LRESULT CDebugTlb::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara
col.fmt = LVCFMT_LEFT; col.fmt = LVCFMT_LEFT;
col.pszText = "Index"; col.pszText = "Index";
col.cx = 40 * DPIScale; col.cx = (int)(40 * DPIScale);
col.iSubItem = 0; col.iSubItem = 0;
ListView_InsertColumn(GetDlgItem(IDC_LIST), 0, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST), 0, &col);
col.pszText = "Page Mask"; col.pszText = "Page Mask";
col.cx = 90 * DPIScale; col.cx = (int)(90 * DPIScale);
col.iSubItem = 1; col.iSubItem = 1;
ListView_InsertColumn(GetDlgItem(IDC_LIST), 1, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST), 1, &col);
col.pszText = "Entry Hi"; col.pszText = "Entry Hi";
col.cx = 90 * DPIScale; col.cx = (int)(90 * DPIScale);
col.iSubItem = 2; col.iSubItem = 2;
ListView_InsertColumn(GetDlgItem(IDC_LIST), 2, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST), 2, &col);
col.pszText = "Entry Lo0"; col.pszText = "Entry Lo0";
col.cx = 90 * DPIScale; col.cx = (int)(90 * DPIScale);
col.iSubItem = 3; col.iSubItem = 3;
ListView_InsertColumn(GetDlgItem(IDC_LIST), 3, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST), 3, &col);
col.pszText = "Entry Lo1"; col.pszText = "Entry Lo1";
col.cx = 90 * DPIScale; col.cx = (int)(90 * DPIScale);
col.iSubItem = 4; col.iSubItem = 4;
ListView_InsertColumn(GetDlgItem(IDC_LIST), 4, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST), 4, &col);
col.pszText = "Index"; col.pszText = "Index";
col.cx = 40 * DPIScale; col.cx = (int)(40 * DPIScale);
col.iSubItem = 0; col.iSubItem = 0;
ListView_InsertColumn(GetDlgItem(IDC_LIST2), 0, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST2), 0, &col);
col.pszText = "Valid"; col.pszText = "Valid";
col.cx = 40 * DPIScale; col.cx = (int)(40 * DPIScale);
col.iSubItem = 1; col.iSubItem = 1;
ListView_InsertColumn(GetDlgItem(IDC_LIST2), 1, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST2), 1, &col);
col.pszText = "Dirty"; col.pszText = "Dirty";
col.cx = 40 * DPIScale; col.cx = (int)(40 * DPIScale);
col.iSubItem = 2; col.iSubItem = 2;
ListView_InsertColumn(GetDlgItem(IDC_LIST2), 2, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST2), 2, &col);
col.pszText = "Rule"; col.pszText = "Rule";
col.cx = 270 * DPIScale; col.cx = (int)(270 * DPIScale);
col.iSubItem = 3; col.iSubItem = 3;
ListView_InsertColumn(GetDlgItem(IDC_LIST2), 3, &col); ListView_InsertColumn(GetDlgItem(IDC_LIST2), 3, &col);

2
Source/Project64/UserInterface/WTLControls/HexEditCtrl.cpp
View File

@ -54,7 +54,7 @@ CHexEditCtrl::~CHexEditCtrl(void)
{ {
} }
int CALLBACK CHexEditCtrl::HaveFontCb(CONST LOGFONTA *lplf, CONST TEXTMETRICA *lptm, DWORD FontType, LPARAM lParam) int CALLBACK CHexEditCtrl::HaveFontCb(CONST LOGFONTA* lplf, CONST TEXTMETRICA* /*lptm*/, DWORD /*FontType*/, LPARAM lParam)
{ {
const char* name = (const char*)lParam; const char* name = (const char*)lParam;
if (strcmp(lplf->lfFaceName, name) == 0) if (strcmp(lplf->lfFaceName, name) == 0)