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

9 files changed, 143 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index 114c0b53..9bdb20da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,12 @@ October 9, 2009 Wei Mingzhi <weimingzhi@gmail.com>
  * gui/Config.c: Likewise.
  * gui/LnxMain.c: Likewise.
  * gui/Gtk2Gui.c: Likewise.
+ * win32/pcsx.rc: Likewise.
+ * win32/pcsx.dsp: Likewise.
+ * win32/gui/ConfigurePlugins.c: Likewise.
+ * win32/gui/WndMain.c: Likewise.
+ * win32/pcsx.dev: Likewise.
+ * win32/resource.h: Likewise.
 
 October 4, 2009 Wei Mingzhi <weimingzhi@gmail.com>
 
diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c
index b5c02b1e..c67e10e4 100644
--- a/libpcsxcore/debug.c
+++ b/libpcsxcore/debug.c
@@ -328,10 +328,11 @@ void StartDebugger() {
 }
 
 void StopDebugger() {
-    if (!debugger_active) {
+    if (debugger_active) {
         StopServer();
         SysPrintf(_("Debugger stopped.\n"));
-    }
+    }

+
     if (MemoryMap != NULL) {
         free(MemoryMap);
         MemoryMap = NULL;
@@ -410,7 +411,7 @@ void ProcessDebug() {
 static void ProcessCommands() {
     int code, i, dumping;
     FILE *sfile;
-    char cmd[257], *arguments, *p, reply[10240], sname[L_tmpnam], *save, *dump;
+    char cmd[257], *arguments, *p, reply[10240], *save, *dump;
     u32 reg, value, size, address;
     breakpoint_t *bp;
 
diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c
index 5d0cd9f5..bdecc01b 100644
--- a/libpcsxcore/socket.c
+++ b/libpcsxcore/socket.c
@@ -39,7 +39,6 @@ static int ptr = 0;
 #define PORT_NUMBER 12345
 
 int StartServer() {
-    struct hostent * localhostent;
     struct in_addr localhostaddr;
     struct sockaddr_in localsocketaddr;
 
diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c
index a075c9e3..1a558eb1 100644
--- a/win32/gui/ConfigurePlugins.c
+++ b/win32/gui/ConfigurePlugins.c
@@ -68,6 +68,11 @@ int LoadConfig() {
 	QueryKeyV(sizeof(Conf->SpuIrq),  "SpuIrq",  &Conf->SpuIrq);

 	QueryKeyV(sizeof(Conf->RCntFix), "RCntFix", &Conf->RCntFix);

 	QueryKeyV(sizeof(Conf->VSyncWA), "VSyncWA", &Conf->VSyncWA);

+	QueryKeyV(sizeof(Conf->Debug),   "Debug",   &Conf->Debug);

+

+	if (!Config.Cpu) {

+		Config.Debug = 0; // don't enable debugger if using dynarec core

+	}

 

 	RegCloseKey(myKey);

 

diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 3b7a289e..a3753613 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -1206,6 +1206,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 			Button_SetText(GetDlgItem(hW,IDC_PSXAUTO), _("Autodetect"));

 			Button_SetText(GetDlgItem(hW,IDC_CPU),     _("Enable Interpreter Cpu"));

 			Button_SetText(GetDlgItem(hW,IDC_PSXOUT),  _("Enable Console Output"));

+			Button_SetText(GetDlgItem(hW,IDC_DEBUG),   _("Enable Debugger"));

 			Button_SetText(GetDlgItem(hW,IDC_SPUIRQ),  _("Spu Irq Always Enabled"));

 			Button_SetText(GetDlgItem(hW,IDC_RCNTFIX), _("Parasite Eve 2, Vandal Hearts 1/2 Fix"));

 			Button_SetText(GetDlgItem(hW,IDC_VSYNCWA), _("InuYasha Sengoku Battle Fix"));

@@ -1220,6 +1221,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 	   		Button_SetCheck(GetDlgItem(hW,IDC_PSXAUTO), Config.PsxAuto);

 	   		Button_SetCheck(GetDlgItem(hW,IDC_CPU),     Config.Cpu);

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

@@ -1227,8 +1229,17 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 	   		ComboBox_AddString(GetDlgItem(hW,IDC_PSXTYPES),"PAL");

 	   		ComboBox_SetCurSel(GetDlgItem(hW,IDC_PSXTYPES),Config.PsxType);

 

+			if (!Config.Cpu) {

+				Config.Debug = 0;

+				Button_SetCheck(GetDlgItem(hW, IDC_DEBUG), FALSE);

+				EnableWindow(GetDlgItem(hW, IDC_DEBUG), FALSE);

+			}

+

+			EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), !Config.PsxAuto);

+			break;

+

 		case WM_COMMAND: {

-     		switch (LOWORD(wParam)) {

+			switch (LOWORD(wParam)) {

        			case IDCANCEL: EndDialog(hW,FALSE); return TRUE;

         		case IDOK:

 					tmp = ComboBox_GetCurSel(GetDlgItem(hW,IDC_PSXTYPES));

@@ -1257,6 +1268,12 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 					Config.SpuIrq  = Button_GetCheck(GetDlgItem(hW,IDC_SPUIRQ));

 					Config.RCntFix = Button_GetCheck(GetDlgItem(hW,IDC_RCNTFIX));

 					Config.VSyncWA = Button_GetCheck(GetDlgItem(hW,IDC_VSYNCWA));

+					tmp = Config.Debug;

+					Config.Debug   = Button_GetCheck(GetDlgItem(hW,IDC_DEBUG));

+					if (tmp != Config.Debug) {

+						if (Config.Debug) StartDebugger();

+						else StopDebugger();

+					}

 

 					SaveConfig();

 

@@ -1266,6 +1283,23 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 					else CloseConsole();

 

 					return TRUE;

+

+				case IDC_CPU:

+					if (Button_GetCheck(GetDlgItem(hW,IDC_CPU))) {

+						EnableWindow(GetDlgItem(hW,IDC_DEBUG), TRUE);

+					} else {

+						Button_SetCheck(GetDlgItem(hW,IDC_DEBUG), FALSE);

+						EnableWindow(GetDlgItem(hW,IDC_DEBUG), FALSE);

+					}

+					break;

+

+				case IDC_PSXAUTO:

+					if (Button_GetCheck(GetDlgItem(hW,IDC_PSXAUTO))) {

+						EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), FALSE);

+					} else {

+						EnableWindow(GetDlgItem(hW,IDC_PSXTYPES), TRUE);

+					}

+					break;

 			}

 		}

 	}

@@ -1675,6 +1709,8 @@ int SysInit() {
 	}

 	LoadMcds(Config.Mcd1, Config.Mcd2);

 

+	if (Config.Debug) StartDebugger();

+

 	return 0;

 }

 

@@ -1686,6 +1722,8 @@ void SysClose() {
 	psxShutdown();

 	ReleasePlugins();

 

+	StopDebugger();

+

 	if (Config.PsxOut) CloseConsole();

 

 	if (emuLog != NULL) fclose(emuLog);

diff --git a/win32/pcsx.dev b/win32/pcsx.dev
index 348e38a1..23aa1a02 100644
--- a/win32/pcsx.dev
+++ b/win32/pcsx.dev
@@ -7,9 +7,9 @@ Type=0
 Compiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -DPCSX_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsx\"  -Dinline=__inline___@@_

 CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -D_MSC_VER_ -DPCSX_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsx\"_@@_

 Includes=.;./zlib;../libpcsxcore;./glue;./gui;./intl

-Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32_@@_

+Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32 -lwsock32_@@_

 Libs=

-UnitCount=106

+UnitCount=109

 Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib

 ObjFiles=

 PrivateResource=pcsx_private.rc

@@ -1107,3 +1107,33 @@ Priority=1000
 OverrideBuildCmd=0

 BuildCmd=$(CC) -c CheatDlg.c -o CheatDlg.o $(CFLAGS)

 

+[Unit107]

+FileName=..\libpcsxcore\socket.h

+CompileCpp=1

+Folder=libpcsxcore

+Compile=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=

+

+[Unit108]

+FileName=..\libpcsxcore\debug.c

+CompileCpp=0

+Folder=libpcsxcore

+Compile=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=$(CC) -c debug.c -o debug.o $(CFLAGS)

+

+[Unit109]

+FileName=..\libpcsxcore\socket.c

+CompileCpp=0

+Folder=libpcsxcore

+Compile=1

+Link=1

+Priority=1000

+OverrideBuildCmd=0

+BuildCmd=$(CC) -c socket.c -o socket.o $(CFLAGS)

+

diff --git a/win32/pcsx.dsp b/win32/pcsx.dsp
index 99b5045c..1fb8b30c 100644
--- a/win32/pcsx.dsp
+++ b/win32/pcsx.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /pdb:none /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /pdb:none /machine:I386

 

 !ELSEIF  "$(CFG)" == "pcsx - Win32 Debug"

 

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

@@ -140,6 +140,10 @@ SOURCE=..\libpcsxcore\coff.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\libpcsxcore\debug.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\libpcsxcore\debug.h

 # End Source File

 # Begin Source File

@@ -264,6 +268,14 @@ SOURCE=..\libpcsxcore\sio.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\libpcsxcore\socket.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\libpcsxcore\socket.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\libpcsxcore\spu.c

 # End Source File

 # Begin Source File

diff --git a/win32/pcsx.rc b/win32/pcsx.rc
index d2b6277c..fee775de 100644
--- a/win32/pcsx.rc
+++ b/win32/pcsx.rc
@@ -1,4 +1,4 @@
-// Microsoft Visual C++ generated resource script.

+//Microsoft Developer Studio generated resource script.

 //

 #include "resource.h"

 

@@ -21,6 +21,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 #pragma code_page(936)

 #endif //_WIN32

 

+#ifndef _MAC

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

 //

 // Version

@@ -43,14 +44,14 @@ BEGIN
     BEGIN

         BLOCK "080404b0"

         BEGIN

-            VALUE "CompanyName", " "

-            VALUE "FileDescription", "pcsx"

-            VALUE "FileVersion", "1, 0, 0, 1"

-            VALUE "InternalName", "pcsx"

-            VALUE "LegalCopyright", "Copyright (c) 2009"

-            VALUE "OriginalFilename", "pcsx.exe"

-            VALUE "ProductName", "  pcsx"

-            VALUE "ProductVersion", "1, 0, 0, 1"

+            VALUE "CompanyName", " \0"

+            VALUE "FileDescription", "pcsx\0"

+            VALUE "FileVersion", "1, 0, 0, 1\0"

+            VALUE "InternalName", "pcsx\0"

+            VALUE "LegalCopyright", "Copyright (c) 2009\0"

+            VALUE "OriginalFilename", "pcsx.exe\0"

+            VALUE "ProductName", "  pcsx\0"

+            VALUE "ProductVersion", "1, 0, 0, 1\0"

         END

     END

     BLOCK "VarFileInfo"

@@ -59,6 +60,8 @@ BEGIN
     END

 END

 

+#endif    // !_MAC

+

 #endif    // Chinese (P.R.C.) resources

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

 

@@ -77,9 +80,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog

 //

 

-IDD_MCDCONF DIALOG  0, 0, 407, 197

-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 

-    WS_SYSMENU

+IDD_MCDCONF DIALOG DISCARDABLE  0, 0, 407, 197

+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Memcard Manager"

 FONT 8, "MS Sans Serif"

 BEGIN

@@ -107,8 +109,7 @@ BEGIN
 END

 

 ABOUT_DIALOG DIALOGEX 0, 0, 332, 209

-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 

-    WS_SYSMENU

+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About"

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

 BEGIN

@@ -124,9 +125,8 @@ BEGIN
     GROUPBOX        "",IDC_STATIC,43,100,234,79

 END

 

-IDD_CPUCONF DIALOG  0, 0, 232, 175

-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 

-    WS_SYSMENU

+IDD_CPUCONF DIALOG DISCARDABLE  0, 0, 232, 175

+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Cpu Config"

 FONT 8, "MS Sans Serif"

 BEGIN

@@ -137,7 +137,7 @@ BEGIN
     CONTROL         "Sio Irq Always Enabled",IDC_SIO,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,10,30,92,10

     CONTROL         "Black && White Movies",IDC_MDEC,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,60,200,10

+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,60,100,10

     CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | 

                     WS_TABSTOP,10,126,83,10

     GROUPBOX        "Misc Options",IDC_MISCOPT,5,5,220,100

@@ -145,21 +145,23 @@ BEGIN
                     WS_VSCROLL | WS_TABSTOP

     GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,110,220,35

     CONTROL         "Disable Cd Audio",IDC_CDDA,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,105,15,113,10

+                    WS_TABSTOP,112,15,113,10

     CONTROL         "Enable Console Output",IDC_PSXOUT,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,105,30,113,10

+                    BS_AUTOCHECKBOX | WS_TABSTOP,112,30,113,10

     CONTROL         "Enable Interpreter Cpu",IDC_CPU,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,105,45,113,10

+                    BS_AUTOCHECKBOX | WS_TABSTOP,112,45,113,10

     CONTROL         "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,10,45,91,10

     CONTROL         "Parasite Eve 2, Vandal Hearts 1/2 Fix",IDC_RCNTFIX,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,205,10

     CONTROL         "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",

                     BS_AUTOCHECKBOX | WS_TABSTOP,10,90,205,10

+    CONTROL         "Enable Debugger",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | 

+                    WS_TABSTOP,112,60,76,10

 END

 

-IDD_NETPLAY DIALOG  0, 0, 165, 95

-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

+IDD_NETPLAY DIALOG DISCARDABLE  0, 0, 165, 95

+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "NetPlay Configuration"

 FONT 8, "MS Sans Serif"

 BEGIN

@@ -175,8 +177,8 @@ BEGIN
                     IDC_NETPLAYNOTE,10,50,145,19

 END

 

-IDD_CONNECT DIALOG  0, 0, 112, 31

-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

+IDD_CONNECT DIALOG DISCARDABLE  0, 0, 112, 31

+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Connecting..."

 FONT 8, "MS Sans Serif"

 BEGIN

@@ -185,8 +187,7 @@ BEGIN
 END

 

 IDD_CONFIG DIALOGEX 0, 0, 322, 161

-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 

-    WS_SYSMENU

+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Configuration"

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

 BEGIN

@@ -232,7 +233,7 @@ BEGIN
 END

 

 IDD_CHEATLIST DIALOGEX 0, 0, 392, 201

-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Edit Cheat Codes"

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

 BEGIN

@@ -249,7 +250,7 @@ BEGIN
 END

 

 IDD_CHEATSEARCH DIALOGEX 0, 0, 280, 214

-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION

+STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_CAPTION

 CAPTION "Cheat Search"

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

 BEGIN

@@ -284,8 +285,7 @@ BEGIN
 END

 

 IDD_CHEATEDIT DIALOGEX 0, 0, 242, 161

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 

-    WS_SYSMENU

+STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Edit Cheat Code"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

@@ -299,9 +299,9 @@ BEGIN
 END

 

 IDD_CHEATVALEDIT DIALOGEX 0, 0, 162, 57

-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Enter New Value"

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

+FONT 8, "MS Sans Serif"

 BEGIN

     DEFPUSHBUTTON   "OK",IDOK,25,40,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,87,40,50,14

@@ -318,7 +318,7 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO 

+GUIDELINES DESIGNINFO MOVEABLE PURE 

 BEGIN

     IDD_MCDCONF, DIALOG

     BEGIN

@@ -381,22 +381,22 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_APP_ICON            ICON                    "gui\\cdrom02.ico"

+IDI_APP_ICON            ICON    DISCARDABLE     "gui\\cdrom02.ico"

 

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

 //

 // Bitmap

 //

 

-SPLASH_LOGO             BITMAP                  "gui\\about.bmp"

-MAIN_LOGO               BITMAP                  "gui\\pcsx.bmp"

+SPLASH_LOGO             BITMAP  MOVEABLE PURE   "gui\\about.bmp"

+MAIN_LOGO               BITMAP  MOVEABLE PURE   "gui\\pcsx.bmp"

 

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

 //

 // RT_MANIFEST

 //

 

-1                       RT_MANIFEST             "gui\\pcsx.exe.manifest"

+1                       RT_MANIFEST MOVEABLE PURE "gui\\pcsx.exe.manifest"

 #endif    // English (U.S.) resources

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

 

@@ -416,18 +416,18 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 // TEXTINCLUDE

 //

 

-1 TEXTINCLUDE 

+1 TEXTINCLUDE MOVEABLE PURE 

 BEGIN

     "resource.h\0"

 END

 

-2 TEXTINCLUDE 

+2 TEXTINCLUDE MOVEABLE PURE 

 BEGIN

     "#include ""afxres.h""\r\n"

     "\0"

 END

 

-3 TEXTINCLUDE 

+3 TEXTINCLUDE MOVEABLE PURE 

 BEGIN

     "\r\n"

     "\0"

diff --git a/win32/resource.h b/win32/resource.h
index fc9f0660..7f3bc399 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -147,6 +147,7 @@
 #define IDC_LABEL_ADDRESS               1052

 #define IDC_GPR6                        1053

 #define IDC_LISTSPU                     1053

+#define IDC_DEBUG                       1053

 #define IDC_GPR7                        1054

 #define IDC_LISTCDR                     1054

 #define IDC_GPR8                        1055

@@ -337,7 +338,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        116

 #define _APS_NEXT_COMMAND_VALUE         40047

-#define _APS_NEXT_CONTROL_VALUE         1053

+#define _APS_NEXT_CONTROL_VALUE         1054

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif