diff --git a/Source/Project64/UserInterface/Debugger/Debugger-DMALogView.cpp b/Source/Project64/UserInterface/Debugger/Debugger-DMALogView.cpp index 7584ad027..fcda8abdd 100644 --- a/Source/Project64/UserInterface/Debugger/Debugger-DMALogView.cpp +++ b/Source/Project64/UserInterface/Debugger/Debugger-DMALogView.cpp @@ -193,7 +193,7 @@ void CDebugDMALogView::RefreshDMALogWindow(bool bReset) LRESULT CDebugDMALogView::OnRefresh(UINT /*uMsg*/, WPARAM wParam, LPARAM /*lParam*/, BOOL& /*bHandled*/) { - bool bReset = (bool)wParam; + bool bReset = (wParam != 0); if (bReset) { diff --git a/Source/Project64/UserInterface/Debugger/Debugger-ExceptionBreakpoints.cpp b/Source/Project64/UserInterface/Debugger/Debugger-ExceptionBreakpoints.cpp index 49744e230..4203f56c9 100644 --- a/Source/Project64/UserInterface/Debugger/Debugger-ExceptionBreakpoints.cpp +++ b/Source/Project64/UserInterface/Debugger/Debugger-ExceptionBreakpoints.cpp @@ -84,9 +84,12 @@ LRESULT CDebugExcBreakpoints::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPA InitCheckboxes(IntrCheckboxMap, Debugger_IntrBreakpoints); InitCheckboxes(RcpIntrCheckboxMap, Debugger_RcpIntrBreakpoints); - bool intrEnabled = g_Settings->LoadDword(Debugger_ExceptionBreakpoints) & 0x01; - bool rcpIntrEnabled = g_Settings->LoadDword(Debugger_IntrBreakpoints) & 0x04; - bool fpExcEnabled = g_Settings->LoadDword(Debugger_ExceptionBreakpoints) & (1 << 15); + uint32_t excBreakpoints = g_Settings->LoadDword(Debugger_ExceptionBreakpoints); + uint32_t intrBreakpoints = g_Settings->LoadDword(Debugger_IntrBreakpoints); + + bool intrEnabled = (excBreakpoints & 0x01) != 0; + bool rcpIntrEnabled = (intrBreakpoints & 0x04) != 0; + bool fpExcEnabled = (excBreakpoints & (1 << 15)) != 0; EnableCheckboxes(IntrCheckboxMap, intrEnabled); EnableCheckboxes(RcpIntrCheckboxMap, intrEnabled && rcpIntrEnabled); diff --git a/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp b/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp index 1f811752a..d2bf61ea2 100644 --- a/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp +++ b/Source/Project64/UserInterface/Debugger/Debugger-TLB.cpp @@ -32,47 +32,47 @@ LRESULT CDebugTlb::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lPara col.fmt = LVCFMT_LEFT; col.pszText = "Index"; - col.cx = 40 * DPIScale; + col.cx = (int)(40 * DPIScale); col.iSubItem = 0; ListView_InsertColumn(GetDlgItem(IDC_LIST), 0, &col); col.pszText = "Page Mask"; - col.cx = 90 * DPIScale; + col.cx = (int)(90 * DPIScale); col.iSubItem = 1; ListView_InsertColumn(GetDlgItem(IDC_LIST), 1, &col); col.pszText = "Entry Hi"; - col.cx = 90 * DPIScale; + col.cx = (int)(90 * DPIScale); col.iSubItem = 2; ListView_InsertColumn(GetDlgItem(IDC_LIST), 2, &col); col.pszText = "Entry Lo0"; - col.cx = 90 * DPIScale; + col.cx = (int)(90 * DPIScale); col.iSubItem = 3; ListView_InsertColumn(GetDlgItem(IDC_LIST), 3, &col); col.pszText = "Entry Lo1"; - col.cx = 90 * DPIScale; + col.cx = (int)(90 * DPIScale); col.iSubItem = 4; ListView_InsertColumn(GetDlgItem(IDC_LIST), 4, &col); col.pszText = "Index"; - col.cx = 40 * DPIScale; + col.cx = (int)(40 * DPIScale); col.iSubItem = 0; ListView_InsertColumn(GetDlgItem(IDC_LIST2), 0, &col); col.pszText = "Valid"; - col.cx = 40 * DPIScale; + col.cx = (int)(40 * DPIScale); col.iSubItem = 1; ListView_InsertColumn(GetDlgItem(IDC_LIST2), 1, &col); col.pszText = "Dirty"; - col.cx = 40 * DPIScale; + col.cx = (int)(40 * DPIScale); col.iSubItem = 2; ListView_InsertColumn(GetDlgItem(IDC_LIST2), 2, &col); col.pszText = "Rule"; - col.cx = 270 * DPIScale; + col.cx = (int)(270 * DPIScale); col.iSubItem = 3; ListView_InsertColumn(GetDlgItem(IDC_LIST2), 3, &col); diff --git a/Source/Project64/UserInterface/WTLControls/HexEditCtrl.cpp b/Source/Project64/UserInterface/WTLControls/HexEditCtrl.cpp index e1497bb0d..2c256406c 100644 --- a/Source/Project64/UserInterface/WTLControls/HexEditCtrl.cpp +++ b/Source/Project64/UserInterface/WTLControls/HexEditCtrl.cpp @@ -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; if (strcmp(lplf->lfFaceName, name) == 0)