From e82d975b54f05521ae75e358bcb648924a718743 Mon Sep 17 00:00:00 2001
From: OV2 <OV2@sessionclan.de>
Date: Sat, 2 Oct 2010 00:56:07 +0200
Subject: [PATCH] Remove language menu and restore debugger

Language menu is useless as english is the only option in it.
Localization needs a new approach...
Win32 port compiles again with DEBUGGER set (snes9x-rr)
---
 win32/rsrc/resource.h |   5 --
 win32/rsrc/snes9x.rc  |  14 +++---
 win32/snes9xw.vcproj  | 107 ++----------------------------------------
 win32/win32.cpp       |   4 +-
 win32/wsnes9x.cpp     |  58 +++++++----------------
 5 files changed, 29 insertions(+), 159 deletions(-)

diff --git a/win32/rsrc/resource.h b/win32/rsrc/resource.h
index c844e575..0cf2eab6 100644
--- a/win32/rsrc/resource.h
+++ b/win32/rsrc/resource.h
@@ -353,8 +353,6 @@
 #define IDC_SHADER_GLSL_VERTEX_BROWSE   3018
 #define IDC_SHADER_GLSL_FRAGMENT_BROWSE 3019
 #define ID_FILE_EXIT                    40001
-#define ID_LANGUAGE_ENGLISH             40002
-#define ID_LANGUAGE_NEDERLANDS          40003
 #define ID_WINDOW_HIDEMENUBAR           40004
 #define ID_FILE_AVI_RECORDING           40005
 #define ID_SOUND_NOSOUND                40021
@@ -400,9 +398,6 @@
 #define ID_OPTIONS_EMULATION            40069
 #define ID_OPTIONS_SETTINGS             40070
 #define ID_DEBUG_TRACE                  40071
-#define ID_DEBUG_TRACE_SPC              40072
-#define ID_DEBUG_TRACE_SA1              40073
-#define ID_DEBUG_TRACE_DSP1             40074
 #define ID_DEBUG_FRAME_ADVANCE          40075
 #define ID_DEBUG_SNES_STATUS            40076
 #define ID_NETPLAY_SERVER               40077
diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc
index f97e548e..7b3a1d1e 100644
--- a/win32/rsrc/snes9x.rc
+++ b/win32/rsrc/snes9x.rc
@@ -948,12 +948,6 @@ BEGIN
         MENUITEM "&Stretch Image\tAlt+Backspace", 40032
         MENUITEM "&Maintain Aspect Ratio",      40123
         MENUITEM "&Bilinear Filtering",         ID_WINDOW_VIDMEM
-        MENUITEM SEPARATOR
-        POPUP "&Language"
-        BEGIN
-            MENUITEM "&English",                    ID_LANGUAGE_ENGLISH, CHECKED
-            MENUITEM "&Nederlands",                 ID_LANGUAGE_NEDERLANDS, GRAYED
-        END
     END
     POPUP "&Cheat"
     BEGIN
@@ -975,6 +969,14 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "&Options...",                 ID_NETPLAY_OPTIONS
     END
+#ifdef DEBUGGER
+    POPUP "&Debug"
+    BEGIN
+        MENUITEM "&Trace",                      ID_DEBUG_TRACE
+        MENUITEM "&Frame Advance",              ID_DEBUG_FRAME_ADVANCE
+        MENUITEM "View SNES &Status",           ID_DEBUG_SNES_STATUS
+    END
+#endif
     POPUP "&Help"
     BEGIN
         MENUITEM "&About...",                   ID_HELP_ABOUT
diff --git a/win32/snes9xw.vcproj b/win32/snes9xw.vcproj
index bf58e57a..a72a1263 100644
--- a/win32/snes9xw.vcproj
+++ b/win32/snes9xw.vcproj
@@ -383,13 +383,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpngdmt.lib comctl32.lib winmm.lib opengl32.lib glu32.lib wsock32.lib ddraw.lib dsound.lib dxguid.lib delayimp.lib vfw32.lib xapobase.lib zlibdmtx64.lib"
+				AdditionalDependencies="libpngdmtx64.lib comctl32.lib winmm.lib opengl32.lib glu32.lib wsock32.lib ddraw.lib dsound.lib dxguid.lib delayimp.lib vfw32.lib xapobase.lib zlibdmtx64.lib"
 				OutputFile=".\snes9x-debug-x64.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\FMOD\api\lib&quot;;&quot;$(ProjectDir)..\..\FMODEx_x64\api\lib&quot;;&quot;$(ProjectDir)..\..\FMODEx\api\lib&quot;;&quot;$(ProjectDir)..\i386&quot;;&quot;$(ProjectDir)..\..\zlib\lib&quot;;&quot;$(ProjectDir)..\..\libPNG\lib&quot;"
 				EnableUAC="false"
-				DelayLoadDLLs="fmod.dll;fmodex.dll"
+				DelayLoadDLLs="fmodex64.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)/snes9x-debug-x64.pdb"
 				GenerateMapFile="false"
@@ -978,7 +978,7 @@
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\FMOD\api\lib&quot;;&quot;$(ProjectDir)..\..\FMODEx_x64\api\lib&quot;;&quot;$(ProjectDir)..\..\FMODEx\api\lib&quot;;&quot;$(ProjectDir)..\i386&quot;;&quot;$(ProjectDir)..\..\zlib\lib&quot;;&quot;$(ProjectDir)..\..\libPNG\lib&quot;"
 				EnableUAC="false"
-				DelayLoadDLLs="fmod.dll;fmodex64.dll"
+				DelayLoadDLLs="fmodex64.dll"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)/snes9x-debug-x64.pdb"
 				GenerateMapFile="false"
@@ -1813,97 +1813,8 @@
 			<File
 				RelativePath="..\debug.cpp"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug+ASM|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug+ASM|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release+ASM|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release+ASM|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug Unicode|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release Unicode|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -1915,7 +1826,6 @@
 				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1923,7 +1833,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1931,7 +1840,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1939,7 +1847,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1947,7 +1854,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug+ASM|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1955,7 +1861,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug+ASM|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1963,7 +1868,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release+ASM|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1971,7 +1875,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release+ASM|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1979,7 +1882,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug Unicode|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1987,7 +1889,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug Unicode|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -1995,7 +1896,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release Unicode|Win32"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
@@ -2003,7 +1903,6 @@
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release Unicode|x64"
-					ExcludedFromBuild="true"
 					>
 					<Tool
 						Name="VCCustomBuildTool"
diff --git a/win32/win32.cpp b/win32/win32.cpp
index 248098f0..8d2d3a1a 100644
--- a/win32/win32.cpp
+++ b/win32/win32.cpp
@@ -957,8 +957,8 @@ void InitSnes9X( void)
 //    extern FILE *trace;
 
 //    trace = fopen( "SNES9X.TRC", "wt");
-    freopen( "SNES9X.OUT", "wt", stdout);
-    freopen( "SNES9X.ERR", "wt", stderr);
+//    freopen( "SNES9X.OUT", "wt", stdout);
+//    freopen( "SNES9X.ERR", "wt", stderr);
 
 //    CPU.Flags |= TRACE_FLAG;
 //    APU.Flags |= TRACE_FLAG;
diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index 50bcbeb0..aebfd0f6 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -309,7 +309,7 @@ extern bool8 do_frame_adjust;
 HINSTANCE g_hInst;
 
 #ifdef DEBUGGER
-extern "C" void Trace ();
+#include "../debug.h"
 #endif
 
 static const char *rom_filename = NULL;
@@ -580,7 +580,6 @@ static uint32 FrameTimings[] = {
 
 // Languages supported by Snes9X: Windows
 // 0 - English [Default]
-// 1 - Dutch/Nederlands
 struct sLanguages Languages[] = {
 	{ IDR_MENU_US,
 		TEXT("Failed to initialize currently selected display output!\n Try switching to a different output method in the display settings."),
@@ -1845,20 +1844,6 @@ LRESULT CALLBACK WinProc(
                 SetMenu( GUI.hWnd, NULL);
             break;
 
-		case ID_LANGUAGE_ENGLISH:
-            GUI.Language = 0;
-
-            SetMenu( GUI.hWnd, LoadMenu( GUI.hInstance, MAKEINTRESOURCE( Languages[ GUI.Language].idMenu)));
-            DestroyMenu( GUI.hMenu);
-            GUI.hMenu = GetMenu( GUI.hWnd);
-            break;
-		case ID_LANGUAGE_NEDERLANDS:
-            GUI.Language = 1;
-
-            SetMenu( GUI.hWnd, LoadMenu( GUI.hInstance, MAKEINTRESOURCE( Languages[ GUI.Language].idMenu)));
-            DestroyMenu( GUI.hMenu);
-            GUI.hMenu = GetMenu( GUI.hWnd);
-            break;
 #ifdef NETPLAY_SUPPORT
 		case ID_NETPLAY_SERVER:
             S9xRestoreWindowTitle ();
@@ -2231,15 +2216,18 @@ LRESULT CALLBACK WinProc(
 							break;
 #ifdef DEBUGGER
 						case ID_DEBUG_TRACE:
-							{
-								Trace ();
-								break;
-							}
+							CPU.Flags ^= TRACE_FLAG;
+							break;
+
 						case ID_DEBUG_FRAME_ADVANCE:
 							CPU.Flags |= FRAME_ADVANCE_FLAG;
 							ICPU.FrameAdvanceCount = 1;
 							Settings.Paused = FALSE;
 							break;
+
+						case ID_DEBUG_SNES_STATUS:
+							MessageBox(GUI.hWnd, TEXT("Sorry, but this function is not implemented yet."), NULL, MB_OK | MB_ICONINFORMATION);
+							break;
 #endif
 						case IDM_ROM_INFO:
 							RestoreGUIDisplay ();
@@ -2577,7 +2565,7 @@ BOOL WinInit( HINSTANCE hInstance)
         return FALSE;
 	}
 
-	GUI.hMenu = LoadMenu (hInstance, MAKEINTRESOURCE( Languages[ GUI.Language].idMenu));
+	GUI.hMenu = LoadMenu(GUI.hInstance, MAKEINTRESOURCE(IDR_MENU_US));
     if (GUI.hMenu == NULL)
 	{
 		MessageBox (NULL, TEXT("Failed to initialize the menu.\nThis could indicate a failure of your operating system;\ntry closing some other windows or programs, or restart your computer, before opening Snes9x again.\nOr, if you compiled this program yourself, ensure that Snes9x was built with the proper resource files."), TEXT("Snes9X - Menu Initialization Failure"), MB_OK | MB_ICONSTOP);
@@ -3218,18 +3206,6 @@ int WINAPI WinMain(
 
 	InitLUTsWin32(); // init win hq2x
 
-    /*SetWindowPos (GUI.hWnd,HWND_TOP, GUI.window_size.left,
-		GUI.window_size.top,
-		GUI.window_size.right - GUI.window_size.left,
-		GUI.window_size.bottom - GUI.window_size.top, SWP_FRAMECHANGED);
-
-    if (!GUI.FullScreen)
-    {
-        RECT rect;
-        GetClientRect (GUI.hWnd, &rect);
-        InvalidateRect (GUI.hWnd, &rect, true);
-    }*/
-
     GUI.ControlForced = 0xff;
 
     S9xSetRecentGames ();
@@ -3287,7 +3263,8 @@ int WINAPI WinMain(
         MessageBox( GUI.hWnd, Languages[ GUI.Language].errFrameTimer, TEXT("Snes9X - Frame Timer"), MB_OK | MB_ICONINFORMATION);
     }
 
-    LoadROM(_tFromChar(rom_filename));
+	if(rom_filename)
+		LoadROM(_tFromChar(rom_filename));
 
 	S9xUnmapAllControls();
 	S9xSetupDefaultKeymap();
@@ -3758,17 +3735,14 @@ static void CheckMenuStates ()
     if (Settings.ReverseStereo)
         SetMenuItemInfo (GUI.hMenu, ID_SOUND_REVERSE_STEREO, FALSE, &mii);
 
-#ifndef DEBUGGER
-    mii.fState = MFS_DISABLED;
-#else
-    mii.fState = MFS_UNCHECKED;
-#endif
+#ifdef DEBUGGER
+    mii.fState = (CPU.Flags & TRACE_FLAG) ? MFS_CHECKED : MFS_UNCHECKED;
     SetMenuItemInfo (GUI.hMenu, ID_DEBUG_TRACE, FALSE, &mii);
-    SetMenuItemInfo (GUI.hMenu, ID_DEBUG_TRACE_SPC, FALSE, &mii);
-    SetMenuItemInfo (GUI.hMenu, ID_DEBUG_TRACE_SA1, FALSE, &mii);
-    SetMenuItemInfo (GUI.hMenu, ID_DEBUG_TRACE_DSP1, FALSE, &mii);
+    mii.fState = MFS_UNCHECKED;
     SetMenuItemInfo (GUI.hMenu, ID_DEBUG_FRAME_ADVANCE, FALSE, &mii);
+    mii.fState = MFS_DISABLED;
     SetMenuItemInfo (GUI.hMenu, ID_DEBUG_SNES_STATUS, FALSE, &mii);
+#endif
 
 	mii.fState = (!Settings.StopEmulation) ? MFS_ENABLED : MFS_DISABLED;
     SetMenuItemInfo (GUI.hMenu, ID_FILE_MOVIE_PLAY, FALSE, &mii);