Compatibility hack for windows (Solis);

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92017 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 32 insertions, 22 deletions

diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c
index cca0a814..eb2726a3 100755
--- a/win32/gui/ConfigurePlugins.c
+++ b/win32/gui/ConfigurePlugins.c
@@ -86,6 +86,7 @@ int LoadConfig() {
 	QueryKeyV("SaveWindowPos",  Conf->SaveWindowPos);
 	QueryKeyV("WindowPosX",  Conf->WindowPos[0]);
 	QueryKeyV("WindowPosY",  Conf->WindowPos[1]);
+	QueryKeyV("HackFix", Conf->HackFix);
 
 	QueryKeyV("Cpu",      Conf->Cpu);
 	QueryKeyV("PsxType",  Conf->PsxType);
@@ -143,6 +144,7 @@ void SaveConfig() {
 	SetKeyV("SaveWindowPos",  Conf->SaveWindowPos);
 	SetKeyV("WindowPosX",  Conf->WindowPos[0]);
 	SetKeyV("WindowPosY",  Conf->WindowPos[1]);
+	SetKeyV("HackFix", Conf->HackFix);
 
 	SetKeyV("Cpu",     Conf->Cpu);
 	SetKeyV("PsxType", Conf->PsxType);
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index f7eb971c..8d7a7362 100755
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -1354,6 +1354,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 			Button_SetText(GetDlgItem(hW,IDC_WIDESCREEN), _("Widescreen (GTE Hack)"));
 			Button_SetText(GetDlgItem(hW,IDC_HIDECURSOR), _("Hide cursor"));
 			Button_SetText(GetDlgItem(hW,IDC_SAVEWINDOWPOS), _("Save window position"));
+			Button_SetText(GetDlgItem(hW,IDC_HACKFIX), _("Compatibility hacks (Raystorm/VH-D/MML/Cart World/...)"));
 
 			Static_SetText(GetDlgItem(hW,IDC_MISCOPT), _("Options"));
 			Static_SetText(GetDlgItem(hW,IDC_SELPSX),  _("Psx System Type"));
@@ -1363,19 +1364,21 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 			Button_SetCheck(GetDlgItem(hW,IDC_MDEC),    Config.Mdec);
 			Button_SetCheck(GetDlgItem(hW,IDC_CDDA),    Config.Cdda);
 			Button_SetCheck(GetDlgItem(hW,IDC_SLOWBOOT),Config.SlowBoot);
-	   		Button_SetCheck(GetDlgItem(hW,IDC_PSXAUTO), Config.PsxAuto);
-	   		Button_SetCheck(GetDlgItem(hW,IDC_CPU),     (Config.Cpu == CPU_INTERPRETER));
-	   		Button_SetCheck(GetDlgItem(hW,IDC_PSXOUT),  Config.PsxOut);
+			Button_SetCheck(GetDlgItem(hW,IDC_PSXAUTO), Config.PsxAuto);
+			Button_SetCheck(GetDlgItem(hW,IDC_CPU),     (Config.Cpu == CPU_INTERPRETER));
+			Button_SetCheck(GetDlgItem(hW,IDC_PSXOUT),  Config.PsxOut);
 			Button_SetCheck(GetDlgItem(hW,IDC_DEBUG),   Config.Debug);
-	   		Button_SetCheck(GetDlgItem(hW,IDC_SPUIRQ),  Config.SpuIrq);
-	   		Button_SetCheck(GetDlgItem(hW,IDC_RCNTFIX), Config.RCntFix);
-	   		Button_SetCheck(GetDlgItem(hW,IDC_VSYNCWA), Config.VSyncWA);
+			Button_SetCheck(GetDlgItem(hW,IDC_SPUIRQ),  Config.SpuIrq);
+			Button_SetCheck(GetDlgItem(hW,IDC_RCNTFIX), Config.RCntFix);
+			Button_SetCheck(GetDlgItem(hW,IDC_VSYNCWA), Config.VSyncWA);
 			Button_SetCheck(GetDlgItem(hW,IDC_WIDESCREEN), Config.Widescreen);
 			Button_SetCheck(GetDlgItem(hW,IDC_HIDECURSOR), Config.HideCursor);
 			Button_SetCheck(GetDlgItem(hW,IDC_SAVEWINDOWPOS), Config.SaveWindowPos);
-	   		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "NTSC");
-	   		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "PAL");
-	   		ComboBox_SetCurSel(GetDlgItem(hW,IDC_PSXTYPES),Config.PsxType);
+			Button_SetCheck(GetDlgItem(hW,IDC_HACKFIX), Config.HackFix);
+
+			ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "NTSC");
+			ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES), "PAL");
+			ComboBox_SetCurSel(GetDlgItem(hW,IDC_PSXTYPES),Config.PsxType);
 
 			if (Config.Cpu == CPU_DYNAREC) {
 				Config.Debug = 0;
@@ -1388,8 +1391,8 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 
 		case WM_COMMAND: {
 			switch (LOWORD(wParam)) {
-       			case IDCANCEL: EndDialog(hW, FALSE); return TRUE;
-        		case IDOK:
+				case IDCANCEL: EndDialog(hW, FALSE); return TRUE;
+				case IDOK:
 					tmp = ComboBox_GetCurSel(GetDlgItem(hW,IDC_PSXTYPES));
 					if (tmp == 0) Config.PsxType = 0;
 					else Config.PsxType = 1;
@@ -1419,6 +1422,8 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 					Config.Widescreen = Button_GetCheck(GetDlgItem(hW,IDC_WIDESCREEN));
 					Config.HideCursor = Button_GetCheck(GetDlgItem(hW,IDC_HIDECURSOR));
 					Config.SaveWindowPos = Button_GetCheck(GetDlgItem(hW,IDC_SAVEWINDOWPOS));
+					Config.HackFix = Button_GetCheck(GetDlgItem(hW, IDC_HACKFIX));
+
 					if(Config.SaveWindowPos) {
 						GetWindowRect(gApp.hWnd, &rect);
 						Config.WindowPos[0] = rect.left;
@@ -1765,8 +1770,8 @@ void CreateMainWindow(int nCmdShow) {
 						WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX,
 						CW_USEDEFAULT,
 						0,
-						356,
-						252,
+						360,
+						248,
 						NULL,
 						NULL,
 						gApp.hInstance,
diff --git a/win32/pcsxr.rc b/win32/pcsxr.rc
index ded3fcb4..02433f74 100755
--- a/win32/pcsxr.rc
+++ b/win32/pcsxr.rc
@@ -103,14 +103,14 @@ BEGIN
     GROUPBOX        "",IDC_STATIC,43,100,234,79

 END

 

-IDD_CPUCONF DIALOGEX 0, 0, 232, 296

+IDD_CPUCONF DIALOGEX 0, 0, 232, 311

 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,273,50,14

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

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

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

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

+    GROUPBOX        "Misc Options",IDC_MISCOPT,5,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,11 +124,13 @@ 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,231,220,35

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

-    COMBOBOX        IDC_PSXTYPES,105,245,53,50,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,246,220,35

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

+    COMBOBOX        IDC_PSXTYPES,105,260,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         "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

 END

 

 IDD_NETPLAY DIALOG 0, 0, 165, 95

@@ -292,7 +294,7 @@ BEGIN
         LEFTMARGIN, 7

         RIGHTMARGIN, 225

         TOPMARGIN, 7

-        BOTTOMMARGIN, 272

+        BOTTOMMARGIN, 287

     END

 

     IDD_NETPLAY, DIALOG

diff --git a/win32/resource.h b/win32/resource.h
index 5ac99e9e..02e1dcc7 100755
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -305,6 +305,7 @@
 #define IDC_WIDESCREEN                  1264

 #define IDC_HIDECURSOR                  1265

 #define IDC_SAVEWINDOWPOS               1266

+#define IDC_HACKFIX                     1267

 #define ID_FILE_EXIT                    40001

 #define ID_HELP_ABOUT                   40002

 #define ID_FILE_RUN_CD                  40003