Integrate SonofUgly's overclocking mechanism

https://github.com/SonofUgly/PCSX-Reloaded/commit/3f11d29f31ca02575aeedf073e87ffee933effb0

Integrated with a few small changes.

1 files changed, 30 insertions, 11 deletions

diff --git a/win32/pcsxr.rc b/win32/pcsxr.rc
index 1ca9b79b..afdf6899 100755
--- a/win32/pcsxr.rc
+++ b/win32/pcsxr.rc
@@ -98,19 +98,19 @@ BEGIN
     CTEXT           "PCSXR EMU\nVersion x.x",IDC_PCSXR_ABOUT_TEXT,22,10,112,15,0,WS_EX_TRANSPARENT

     CTEXT           "PCSXR a psx emulator...",IDC_PCSXR_ABOUT_AUTHORS,10,35,135,63,0,WS_EX_TRANSPARENT

     CTEXT           "Greets to...",IDC_PCSXR_ABOUT_GREETS,45,110,232,65

-    CONTROL         113,IDC_STATIC,"Static",SS_BITMAP | WS_BORDER,155,10,171,101

+    CONTROL         SPLASH_LOGO,IDC_STATIC,"Static",SS_BITMAP | WS_BORDER,155,10,171,101

     GROUPBOX        "",IDC_STATIC,5,25,145,77

     GROUPBOX        "",IDC_STATIC,43,100,234,79

 END

 

-IDD_CPUCONF DIALOGEX 0, 0, 240, 320

+IDD_CPUCONF DIALOGEX 0, 0, 241, 363

 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Cpu Config"

 FONT 8, "MS Sans Serif", 0, 0, 0x0

 BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,51,289,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,120,289,50,14

-    GROUPBOX        "Misc Options",IDC_MISCOPT,5,5,220,236

+    DEFPUSHBUTTON   "OK",IDOK,51,323,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,119,323,50,14

+    GROUPBOX        "Misc Options",IDC_MISCOPT,6,5,220,236

     CONTROL         "Disable Xa Decoding",IDC_XA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,205,10

     CONTROL         "Sio Irq Always Enabled",IDC_SIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,30,205,10

     CONTROL         "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,45,205,10

@@ -124,13 +124,17 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,150,205,10

     CONTROL         "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,205,10

     CONTROL         "Widescreen (GTE Hack)",IDC_WIDESCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,180,205,10

-    GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,255,220,35

-    CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,265,80,10

+    GROUPBOX        "Select Psx System Type",IDC_SELPSX,6,255,220,35

+    CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,265,80,10

     COMBOBOX        IDC_PSXTYPES,105,265,53,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

     CONTROL         "Hide cursor",IDC_HIDECURSOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,195,205,10

     CONTROL         "Save window position",IDC_SAVEWINDOWPOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,210,205,10

-    CONTROL         "Compatibility hacks (Raystorm/VH-D/MML/Cart World/...)",IDC_HACKFIX, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,225,205,10

-	CONTROL         "Wipeout MemHack", IDC_MEMHACK, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 240, 205, 10

+    CONTROL         "Compatibility hacks (Raystorm/VH-D/MML/Cart World/...)",IDC_HACKFIX,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,225,205,10

+    CONTROL         "Wipeout MemHack",IDC_MEMHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,240,205,10

+    GROUPBOX        "CPU Overclocking",IDC_SELPSXCLOCK,7,290,220,32

+    CONTROL         "Enable",IDC_OVRCLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,300,80,10

+    COMBOBOX        IDC_PSXCLOCK,105,297,53,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

 END

 

 IDD_NETPLAY DIALOG 0, 0, 165, 95

@@ -292,9 +296,9 @@ BEGIN
     IDD_CPUCONF, DIALOG

     BEGIN

         LEFTMARGIN, 7

-        RIGHTMARGIN, 225

+        RIGHTMARGIN, 226

         TOPMARGIN, 7

-        BOTTOMMARGIN, 287

+        BOTTOMMARGIN, 337

     END

 

     IDD_NETPLAY, DIALOG

@@ -350,20 +354,35 @@ END
 // remains consistent on all systems.

 IDI_APP_ICON            ICON                    "gui\\pcsxr.ico"

 

+

 /////////////////////////////////////////////////////////////////////////////

 //

 // Bitmap

 //

 

 SPLASH_LOGO             BITMAP                  "gui\\about.bmp"

+

 MAIN_LOGO               BITMAP                  "gui\\pcsxr.bmp"

 

+

 /////////////////////////////////////////////////////////////////////////////

 //

 // RT_MANIFEST

 //

 

 1                       RT_MANIFEST             "gui\\pcsxr.exe.manifest"

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// AFX_DIALOG_LAYOUT

+//

+

+IDD_CPUCONF AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // English (United States) resources

 /////////////////////////////////////////////////////////////////////////////