Merge pull request #1554 from oddMLan/misc-bugfixes

Misc bugfixes

Source/Project64-core/N64System/FramePerSecondClass.cpp

@@ -61,9 +61,11 @@ void CFramePerSecond::Reset(bool ClearDisplay)
 
 void CFramePerSecond::UpdateViCounter(void)
 {
-    if (m_iFrameRateType != FR_VIs &&
+    if (!bDisplayFrameRate())
-        m_iFrameRateType != FR_VIs_DLs &&
+    {
-        m_iFrameRateType != FR_PERCENT)
+        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;

Source/Project64-core/N64System/FramePerSecondClass.h

@@ -10,8 +10,9 @@
 ****************************************************************************/
 #pragma once
 #include <Common/HighResTimeStamp.h>
+#include "../Settings/N64SystemSettings.h"
 
-class CFramePerSecond
+class CFramePerSecond : public CN64SystemSettings
 {
 public:
     CFramePerSecond(void);

Source/Project64/Project64.exe.manifest

@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-  <trustInfo xmlns='urn:schemas-microsoft-com:asm.v3'>
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <assemblyIdentity
-    version='2.1.0.1'
-    processorArchitecture='x86'
-    name='Project64'
-    type='win32'
-  />
-  <dependency>
-  <dependentAssembly>
-    <assemblyIdentity
-      type='win32'
-      name='Microsoft.Windows.Common-Controls'
-      version='6.0.0.0'
-      processorArchitecture='X86'
-      publicKeyToken='6595b64144ccf1df'
-      language='*'
-    />
-  </dependentAssembly>
-  </dependency>
-</assembly>

Source/Project64/Project64.vcxproj

@@ -32,7 +32,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
-    <GenerateManifest>false</GenerateManifest>
+    <GenerateManifest>true</GenerateManifest>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
@@ -243,9 +243,6 @@
   <ItemGroup>
     <ResourceCompile Include="UserInterface\UIResources.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="Project64.exe.manifest" />
-  </ItemGroup>
   <ProjectExtensions>
     <VisualStudio>
       <UserProperties RESOURCE_FILE="UserInterface\UIResources.rc" />

Source/Project64/Project64.vcxproj.filters

@@ -487,7 +487,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="Project64.exe.manifest" />
-  </ItemGroup>
 </Project>

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));

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);
 		}	
 	}

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);
 		}	
 	}

Source/RSP/RSP.rc

@@ -29,16 +29,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
 // Dialog
 //
 
-RSPCOMMAND DIALOG  0, 0, 187, 94
+RSPCOMMAND DIALOGEX  0, 0, 187, 94
-STYLE DS_SETFONT | DS_MODALFRAME | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
 END
 
-RSPREGISTERS DIALOG  0, 0, 186, 95
+RSPREGISTERS DIALOGEX  0, 0, 186, 95
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+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