From 3a7de999309d2afe3660527a4e34b3a38af173ea Mon Sep 17 00:00:00 2001 From: oddMLan Date: Tue, 15 Jan 2019 01:11:28 -0700 Subject: [PATCH 1/5] Delete Project64.exe.manifest It is no longer necessary, Visual Studio will generate and embed an intermediate on compilation time. --- Source/Project64/Project64.exe.manifest | 28 ---------------------- Source/Project64/Project64.vcxproj | 5 +--- Source/Project64/Project64.vcxproj.filters | 3 --- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 Source/Project64/Project64.exe.manifest diff --git a/Source/Project64/Project64.exe.manifest b/Source/Project64/Project64.exe.manifest deleted file mode 100644 index 5cfc9b622..000000000 --- a/Source/Project64/Project64.exe.manifest +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj index e61ca502a..baf3dedac 100644 --- a/Source/Project64/Project64.vcxproj +++ b/Source/Project64/Project64.vcxproj @@ -32,7 +32,7 @@ - false + true @@ -243,9 +243,6 @@ - - - diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters index fc73718f7..af0bab4a3 100644 --- a/Source/Project64/Project64.vcxproj.filters +++ b/Source/Project64/Project64.vcxproj.filters @@ -487,7 +487,4 @@ Resource Files - - - \ No newline at end of file From 46ddb4201797af5bf39b2b00ae55b3da398f57b0 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Tue, 15 Jan 2019 01:14:56 -0700 Subject: [PATCH 2/5] [Debugger] Fix DList/Alist and Recompiler Code Buffer Size status bar clear Before they wouldn't clear the status bar message properly when toggling them off --- Source/Project64/UserInterface/MainMenu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Project64/UserInterface/MainMenu.cpp b/Source/Project64/UserInterface/MainMenu.cpp index 73ae7a2df..847d836db 100644 --- a/Source/Project64/UserInterface/MainMenu.cpp +++ b/Source/Project64/UserInterface/MainMenu.cpp @@ -449,8 +449,8 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI g_Settings->SaveBool(Debugger_ShowPifErrors, !g_Settings->LoadBool(Debugger_ShowPifErrors)); break; case ID_DEBUG_SHOW_DLIST_COUNT: - g_Notify->DisplayMessage(0, ""); g_Settings->SaveBool(Debugger_ShowDListAListCount, !g_Settings->LoadBool(Debugger_ShowDListAListCount)); + g_Notify->DisplayMessage(0, ""); break; case ID_DEBUG_LANGUAGE: g_Settings->SaveBool(Debugger_DebugLanguage, !g_Settings->LoadBool(Debugger_DebugLanguage)); @@ -458,8 +458,8 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI m_Gui->ResetRomBrowserColomuns(); break; case ID_DEBUG_SHOW_RECOMP_MEM_SIZE: - g_Notify->DisplayMessage(0, ""); g_Settings->SaveBool(Debugger_ShowRecompMemSize, !g_Settings->LoadBool(Debugger_ShowRecompMemSize)); + g_Notify->DisplayMessage(0, ""); break; case ID_DEBUG_SHOW_DIV_BY_ZERO: g_Settings->SaveBool(Debugger_ShowDivByZero, !g_Settings->LoadBool(Debugger_ShowDivByZero)); From ad314925858ad177cb0b4b6218a4868b6e3124c2 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Tue, 15 Jan 2019 01:17:35 -0700 Subject: [PATCH 3/5] [RSP] Update resource file RSP Command showed a maximize button that when used would glitch the RSP window. Now the RSP Command and RSP Register window both use WS_MINIMIZEBOX. --- Source/RSP/RSP.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/RSP/RSP.rc b/Source/RSP/RSP.rc index 3171aeb95..093bdca03 100644 --- a/Source/RSP/RSP.rc +++ b/Source/RSP/RSP.rc @@ -29,16 +29,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS // Dialog // -RSPCOMMAND DIALOG 0, 0, 187, 94 -STYLE DS_SETFONT | DS_MODALFRAME | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -FONT 8, "MS Sans Serif" +RSPCOMMAND DIALOGEX 0, 0, 187, 94 +STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN END -RSPREGISTERS DIALOG 0, 0, 186, 95 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +RSPREGISTERS DIALOGEX 0, 0, 186, 95 +STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dialog" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN END From fff7bb5793ac4fd35906aeef822ef3ab8b13202c Mon Sep 17 00:00:00 2001 From: oddMLan Date: Tue, 15 Jan 2019 01:18:56 -0700 Subject: [PATCH 4/5] [RSP] Restore window if minimized when invoked from the context menu Similar fix to 798e19b2a6c3b39cd22db557deb6e2de9a5ff669 --- Source/RSP/RSP Command.c | 3 +++ Source/RSP/RSP Register.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Source/RSP/RSP Command.c b/Source/RSP/RSP Command.c index 5805eb3ac..ab18b430f 100644 --- a/Source/RSP/RSP Command.c +++ b/Source/RSP/RSP Command.c @@ -98,6 +98,9 @@ void Create_RSP_Commands_Window ( int Child ) } else { + if (IsIconic((HWND)RSPCommandshWnd)) { + SendMessage(RSPCommandshWnd, WM_SYSCOMMAND, SC_RESTORE, NULL); + } SetForegroundWindow(RSPCommandshWnd); } } diff --git a/Source/RSP/RSP Register.c b/Source/RSP/RSP Register.c index e4679e7eb..c4fee18dd 100644 --- a/Source/RSP/RSP Register.c +++ b/Source/RSP/RSP Register.c @@ -85,6 +85,9 @@ void Create_RSP_Register_Window ( int Child ) { CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)Create_RSP_Register_Window, (LPVOID)TRUE,0, &ThreadID); } else { + if (IsIconic((HWND)RSP_Registers_hDlg)) { + SendMessage(RSP_Registers_hDlg, WM_SYSCOMMAND, SC_RESTORE, NULL); + } SetForegroundWindow(RSP_Registers_hDlg); } } From 2f868d5e4c18b5beae76f0323e81c35d6d430b87 Mon Sep 17 00:00:00 2001 From: oddMLan Date: Tue, 15 Jan 2019 01:10:11 -0700 Subject: [PATCH 5/5] Fix #1524: Broken speed display Before updating the status bar ensure that the user enabled speed display in the UI --- .../Project64-core/N64System/FramePerSecondClass.cpp | 12 +++++++++--- .../Project64-core/N64System/FramePerSecondClass.h | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Source/Project64-core/N64System/FramePerSecondClass.cpp b/Source/Project64-core/N64System/FramePerSecondClass.cpp index ab2f1af3b..f65e13353 100644 --- a/Source/Project64-core/N64System/FramePerSecondClass.cpp +++ b/Source/Project64-core/N64System/FramePerSecondClass.cpp @@ -61,9 +61,11 @@ void CFramePerSecond::Reset(bool ClearDisplay) void CFramePerSecond::UpdateViCounter(void) { - if (m_iFrameRateType != FR_VIs && - m_iFrameRateType != FR_VIs_DLs && - m_iFrameRateType != FR_PERCENT) + if (!bDisplayFrameRate()) + { + return; + } + if (m_iFrameRateType != FR_VIs && m_iFrameRateType != FR_VIs_DLs && m_iFrameRateType != FR_PERCENT) { return; } @@ -149,6 +151,10 @@ void CFramePerSecond::ScreenHertzChanged(CFramePerSecond * _this) void CFramePerSecond::UpdateDlCounter(void) { + if (!bDisplayFrameRate()) + { + return; + } if (m_iFrameRateType != FR_DLs && m_iFrameRateType != FR_VIs_DLs) { return; diff --git a/Source/Project64-core/N64System/FramePerSecondClass.h b/Source/Project64-core/N64System/FramePerSecondClass.h index 19afef8ed..45fcaa100 100644 --- a/Source/Project64-core/N64System/FramePerSecondClass.h +++ b/Source/Project64-core/N64System/FramePerSecondClass.h @@ -10,8 +10,9 @@ ****************************************************************************/ #pragma once #include +#include "../Settings/N64SystemSettings.h" -class CFramePerSecond +class CFramePerSecond : public CN64SystemSettings { public: CFramePerSecond(void);