From 4e3473ac5d333db419a6e7dfd7f0b9cdc6f8ee53 Mon Sep 17 00:00:00 2001
From: owomomo <ikyokyo@163.com>
Date: Wed, 19 Jun 2019 15:53:47 +0800
Subject: [PATCH] 1. Fixed accidentally added the cheat name control to the
 limit list. 2. Add text limit to Memory Watch for experiment. 3. Make the IDs
 of controls in Memory Watch predefined rather than directly coded, that's not
 quite standard in programming. Calculations to ID is not always trusted as
 they are automatically determined by the development tool.

---
 src/drivers/win/res.rc | 56 +++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc
index 3cdcc6318..faffec4cc 100644
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@@ -707,7 +707,7 @@ END
 DIRCONFIG DIALOGEX 63, 7, 305, 255
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Directories Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",CLOSE_BUTTON,175,230,56,14
     PUSHBUTTON      "Cancel",BTN_CANCEL,239,230,56,14
@@ -752,7 +752,7 @@ END
 DWBDIALOG DIALOG 33, 99, 250, 56
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "DWB!"
-FONT 8, "Tahoma"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "Text",LBL_DWBDIALOG_TEXT,7,9,237,8
     PUSHBUTTON      "Clear",BTN_CLEAR,64,32,50,14
@@ -762,7 +762,7 @@ END
 FKBDIALOG DIALOG 13, 72, 402, 194
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Family Keyboard Configuration"
-FONT 8, "Tahoma"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,320,170,56,14
     LTEXT           "Remember to push the ""Scroll Lock"" key during emulation to enable Family Keyboard input.",65503,18,6,370,12
@@ -844,7 +844,7 @@ END
 GAMEPADDIALOG DIALOGEX 4, 109, 243, 220
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Gamepad Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,173,196,56,14
     GROUPBOX        "",GRP_GAMEPAD1,4,8,232,82,WS_GROUP
@@ -874,7 +874,7 @@ END
 GUICONFIG DIALOGEX 16, 123, 184, 158
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "GUI Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,65,136,56,14
     CONTROL         "Load ""File Open"" dialog when FCEUX starts.",CB_LOAD_FILE_OPEN,
@@ -896,7 +896,7 @@ END
 INPUTCONFIG DIALOGEX 122, 105, 349, 199
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Input Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Port 1:",102,20,31,152,50
     COMBOBOX        COMBO_PAD1,27,57,71,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -944,7 +944,7 @@ END
 MAHJONGDIALOG DIALOG 65510, 106, 340, 110
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "mahjong"
-FONT 8, "Tahoma"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,277,91,56,14
     GROUPBOX        "",321,8,8,324,73,WS_GROUP
@@ -974,7 +974,7 @@ END
 MAPINPUT DIALOGEX 0, 0, 318, 294
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hotkeys"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,261,274,50,14
     PUSHBUTTON      "Cancel",BTN_CANCEL,205,274,50,14
@@ -997,7 +997,7 @@ END
 NETMOO DIALOGEX 44, 59, 365, 209
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Network Play"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_NETMOO_CMD_INPUT,10,137,347,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_OEMCONVERT | ES_WANTRETURN
     EDITTEXT        IDC_NETMOO_STATUS,10,8,347,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
@@ -1019,7 +1019,7 @@ END
 NEWINPUT DIALOGEX 0, 0, 186, 66
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Enter New Input"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CTEXT           "Press a key",LBL_KEY_COMBO,31,14,122,20
     PUSHBUTTON      "Clear",BTN_CLEAR,95,45,50,14
@@ -1029,7 +1029,7 @@ END
 PALCONFIG DIALOGEX 16, 81, 228, 217
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Palette Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",BUTTON_CLOSE,162,195,56,14
     GROUPBOX        "NES Palette",302,10,8,102,81,WS_GROUP
@@ -1061,7 +1061,7 @@ END
 POWERPADDIALOG DIALOG 30, 123, 131, 119
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Power Pad Configuration"
-FONT 8, "Tahoma"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,34,95,56,14
     GROUPBOX        "",312,8,10,114,74,WS_GROUP
@@ -1082,7 +1082,7 @@ END
 QUIZKINGDIALOG DIALOG 30, 123, 160, 74
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "quiz king"
-FONT 8, "Tahoma"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,54,56,56,14
     GROUPBOX        "Buzzers",312,8,7,144,39,WS_GROUP
@@ -1097,7 +1097,7 @@ END
 SOUNDCONFIG DIALOGEX 8, 95, 334, 282
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Sound Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,280,260,44,14
     GROUPBOX        "Output/Output Format:",302,10,9,131,93,WS_GROUP
@@ -1140,7 +1140,7 @@ END
 SUBORKBDIALOG DIALOGEX 13, 72, 478, 171
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Subor Keyboard Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",1,405,151,56,14
     LTEXT           "Remember to push the ""Scroll Lock"" key during emulation to enable Keyboard input.",-1,18,6,370,12
@@ -1251,7 +1251,7 @@ END
 TIMINGCONFIG DIALOGEX 23, 157, 203, 110
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Timing Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",1,137,87,56,14
     CONTROL         "Disable speed throttling used when sound is disabled.",CB_DISABLE_SPEED_THROTTLING,
@@ -1268,7 +1268,7 @@ END
 MOVIEOPTIONS DIALOGEX 65520, 76, 147, 222
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Movie Options"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",IDC_MOVIE_CLOSE,48,200,49,14,BS_CENTER
     CONTROL         "Pause after playback",IDC_MOVIE_PAUSEAFTERPLAYBACK,
@@ -1295,7 +1295,7 @@ END
 DWBDIALOGSIMPLE DIALOGEX 33, 99, 250, 39
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "DWBS!"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Type a key, or press Escape to disable.",65429,53,14,125,8
 END
@@ -1305,7 +1305,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VI
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "Memory Watch"
 MENU MEMWATCHMENU
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "",IDC_STATIC,3,0,126,200
     GROUPBOX        "",IDC_STATIC,131,0,128,200
@@ -1395,7 +1395,7 @@ END
 DEBUGGER DIALOGEX 54, 74, 546, 334
 STYLE DS_SETFONT | DS_3DLOOK | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "6502 Debugger"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     CONTROL         "",IDC_DEBUGGER_DISASSEMBLY,"RichEdit20A",ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_BORDER | WS_HSCROLL,18,5,316,317
     SCROLLBAR       IDC_DEBUGGER_DISASSEMBLY_VSCR,334,5,11,317,SBS_VERT
@@ -1478,7 +1478,7 @@ END
 TRACER DIALOGEX 0, 0, 317, 181
 STYLE DS_SETFONT | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Trace Logger"
-FONT 8, "Tahoma", 400, 0, 0x0
+FONT 9, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
     EDITTEXT        IDC_TRACER_LOG,3,3,300,44,ES_MULTILINE | ES_NOHIDESEL | ES_READONLY | WS_HSCROLL
     SCROLLBAR       IDC_SCRL_TRACER_LOG,303,3,11,44,SBS_VERT
@@ -1516,7 +1516,7 @@ END
 ADDBP DIALOGEX 66, 83, 197, 125
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Add Breakpoint..."
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "&Address:",-1,14,6,30,10
     EDITTEXT        IDC_ADDBP_ADDR_START,48,4,30,12,ES_UPPERCASE | ES_WANTRETURN
@@ -1542,7 +1542,7 @@ END
 NTVIEW DIALOGEX 44, 38, 352, 350
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Name Table Viewer"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Name Tables",IDC_NTVIEW_TABLE_BOX,2,0,347,251,WS_TABSTOP
     LTEXT           "Refresh:   More",IDC_STATIC,225,254,50,9
@@ -1571,7 +1571,7 @@ END
 ROMPATCHER DIALOGEX 84, 67, 304, 135
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Rom Data Editor"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     EDITTEXT        IDC_ROMPATCHER_CURRENT_DATA,7,47,282,12,ES_READONLY
     PUSHBUTTON      "Apply",IDC_ROMPATCHER_BTN_APPLY,185,92,54,14
@@ -1590,7 +1590,7 @@ END
 GGCONV DIALOGEX 84, 67, 186, 146
 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Game Genie Encoder/Decoder Tool"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Game Genie Code",-1,107,5,69,42
     EDITTEXT        IDC_GAME_GENIE_CODE,115,22,53,14,ES_UPPERCASE | ES_AUTOHSCROLL
@@ -1934,7 +1934,7 @@ END
 PPUVIEW DIALOGEX 44, 38, 353, 234
 STYLE DS_SETFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "PPU Viewer"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Pattern Tables",GRP_PPUVIEW_TABLES,2,-1,348,185,WS_TABSTOP
     LTEXT           "Tile:",LBL_PPUVIEW_TILE1,6,138,50,9
@@ -2073,7 +2073,7 @@ END
 VIDEOCONFIG DIALOGEX 65520, 76, 511, 170
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Video Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Full Screen Settings",65453,5,3,171,141,WS_GROUP
     CONTROL         "Full Screen (Alt + Enter or double-click)",IDC_VIDEOCONFIG_FS,
@@ -2224,7 +2224,7 @@ END
 DLG_SNESPAD DIALOGEX 4, 109, 243, 121
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Gamepad Configuration"
-FONT 8, "Tahoma", 0, 0, 0x0
+FONT 9, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "Close",BTN_CLOSE,177,97,56,14
     GROUPBOX        "",GRP_GAMEPAD1,4,8,232,82,WS_GROUP