Merge branch 'master' into qt-wacom-serial

2026-02-25 04:45:31 -07:00 · 2023-02-07 17:04:25 +06:00
parent 3884e5874b 8910c10d94
commit 17d4e4a7e2
588 changed files with 14944 additions and 9389 deletions
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -240,44 +240,33 @@ VPATH := $(EXPATH) . $(CODEGEN) minitrace cpu \
         sound/munt/srchelper sound/munt/srchelper/srctools/src \
         sound/resid-fp sound/ymfm \
         scsi video network network/slirp win
+
+WINDRES := windres
+STRIP   := strip
 ifeq ($(X64), y)
 TOOL_PREFIX := x86_64-w64-mingw32-
 else
- TOOL_PREFIX := i686-w64-mingw32-
-endif
-WINDRES := windres
-STRIP   := strip
-ifeq ($(ARM64), y)
- WINDRES := aarch64-w64-mingw32-windres
- STRIP   := aarch64-w64-mingw32-strip
-endif
-ifeq ($(ARM), y)
- WINDRES := armv7-w64-mingw32-windres
- STRIP   := armv7-w64-mingw32-strip
-endif
-ifeq ($(CLANG), y)
- CPP := clang++
- CC  := clang
 ifeq ($(ARM64), y)
-  CPP := aarch64-w64-mingw32-clang++
-  CC  := aarch64-w64-mingw32-clang
+  TOOL_PREFIX := aarch64-w64-mingw32-
+  WINDRES := ${TOOL_PREFIX}windres
+  STRIP   := ${TOOL_PREFIX}strip
 endif
 ifeq ($(ARM), y)
-  CPP := armv7-w64-mingw32-clang++
-  CC  := armv7-w64-mingw32-clang
+  TOOL_PREFIX := armv7-w64-mingw32-
+  WINDRES := ${TOOL_PREFIX}windres
+  STRIP   := ${TOOL_PREFIX}strip
 endif
+ TOOL_PREFIX := i686-w64-mingw32-
+endif
+
+ifeq ($(CLANG), y)
+ CPP := ${TOOL_PREFIX}clang++
+ CC  := ${TOOL_PREFIX}clang
 else
 CPP := ${TOOL_PREFIX}g++
 CC  := ${TOOL_PREFIX}gcc
- ifeq ($(ARM64), y)
-  CPP := aarch64-w64-mingw32-g++
-  CC  := aarch64-w64-mingw32-gcc
- endif
- ifeq ($(ARM), y)
-  CPP := armv7-w64-mingw32-g++
-  CC  := armv7-w64-mingw32-gcc
- endif
 endif
+
 DEPS     = -MMD -MF $*.d -c $<
 DEPFILE := win/.depends

@@ -549,7 +538,7 @@ CPUOBJ := $(DYNARECOBJ) \
 CHIPSETOBJ := 82c100.o acc2168.o \
              contaq_82c59x.o \
              cs4031.o cs8230.o \
-              ali1429.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o ali6117.o \
+              ali1429.o ali1435.o ali1489.o ali1531.o ali1541.o ali1543.o ali1621.o ali6117.o \
              gc100.o headland.o \
              ims8848.o intel_82335.o intel_420ex.o intel_4x0.o intel_i450kx.o intel_sio.o intel_piix.o \
              ioapic.o \
@@ -649,16 +638,17 @@ SCSIOBJ := scsi.o scsi_device.o \
           scsi_ncr5380.o scsi_ncr53c8xx.o \
           scsi_pcscsi.o scsi_spock.o

-SLIRPOBJ := arp_table.o bootp.o cksum.o dnssearch.o if.o \
-            ip_icmp.o ip_input.o ip_output.o \
-            mbuf.o misc.o sbuf.o slirp.o socket.o \
-            tcp_input.o tcp_output.o tcp_subr.o tcp_timer.o \
-            udp.o \
-            util.o version.o \
+SLIRPOBJ := net_slirp.o tinyglib.o \
+          arp_table.o bootp.o cksum.o dhcpv6.o dnssearch.o if.o \
+          ip_icmp.o ip_input.o ip_output.o \
+          ip6_icmp.o ip6_input.o ip6_output.o \
+          mbuf.o misc.o sbuf.o slirp.o socket.o \
+          tcp_input.o tcp_output.o tcp_subr.o tcp_timer.o \
+          udp.o udp6.o \
+          util.o version.o \

 NETOBJ := network.o \
          net_pcap.o \
-          net_slirp.o tinyglib.o \
          ${SLIRPOBJ} \
          net_dp8390.o net_3c501.o \
          net_3c503.o net_ne2000.o \
--- a/src/win/glad.c
+++ b/src/win/glad.c
@@ -1,6 +1,6 @@
 /*

-    OpenGL loader generated by glad 0.1.34 on Sat Dec  4 18:46:02 2021.
+    OpenGL loader generated by glad 0.1.36 on Sat Jan  7 18:24:33 2023.

    Language/Generator: C/C++
    Specification: gl
@@ -21,10 +21,10 @@
        https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D3.0&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_debug_output&extensions=GL_ARB_sync
 */

-#include <glad/glad.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glad/glad.h>

 static void *get_proc(const char *namez);

--- a/src/win/languages/cs-CZ.rc
+++ b/src/win/languages/cs-CZ.rc
@@ -53,10 +53,16 @@ BEGIN
        MENUITEM "&Dodržovat poměr stran 4:3",			IDM_VID_FORCE43
        POPUP "&Násobek zvětšení okna"
        BEGIN
-            MENUITEM "&0.5x",					IDM_VID_SCALE_1X
-            MENUITEM "&1x",					IDM_VID_SCALE_2X
-            MENUITEM "1.&5x",					IDM_VID_SCALE_3X
-            MENUITEM "&2x",					IDM_VID_SCALE_4X
+            MENUITEM "&0.5x",                   IDM_VID_SCALE_1X
+            MENUITEM "&1x",                     IDM_VID_SCALE_2X
+            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
+            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Metoda &filtrování"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Pořídit &screenshot\tCtrl+F11",		IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Předvolby...",				IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Povolit integraci s &Discordem",		IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Zesílení zvuku",				IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Zvuková karta:"
+#define STR_SOUND1		"Zvuková karta 1:"
+#define STR_SOUND2		"Zvuková karta 2:"
+#define STR_SOUND3		"Zvuková karta 3:"
+#define STR_SOUND4		"Zvuková karta 4:"
 #define STR_MIDI_OUT		"MIDI výstup:"
 #define STR_MIDI_IN		"MIDI vstup:"
 #define STR_MPU401		"Samostatný MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Použít zvuk FLOAT32"
 #define STR_FM_DRIVER		"FM synth driver"
 #define STR_FM_DRV_NUKED	"Nuked (přesnější)"
 #define STR_FM_DRV_YMFM		"YMFM (rychlejší)"

-#define STR_NET_TYPE		"Druh sítě:"
+#define STR_NET_TYPE	"Druh sítě:"
 #define STR_PCAP		"PCap zařízení:"
 #define STR_NET			"Síťový adaptér:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Zařízení na COM1:"
 #define STR_COM2		"Zařízení na COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"Vypnout skrze rozhraní ACPI"
    IDS_2161	"Nastavení"
    IDS_2162    "Časná mechanika"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/de-DE.rc
+++ b/src/win/languages/de-DE.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1,&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Filteringmethode"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "S&creenshot aufnehmen\tStrg+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Einstellungen...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "&Discord-Integration aktivieren", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Klangverstärkung...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Soundkarte:"
+#define STR_SOUND1		"Soundkarte 1:"
+#define STR_SOUND2		"Soundkarte 2:"
+#define STR_SOUND3		"Soundkarte 3:"
+#define STR_SOUND4		"Soundkarte 4:"
 #define STR_MIDI_OUT		"MIDI Out-Gerät:"
 #define STR_MIDI_IN		"MIDI In-Gerät:"
 #define STR_MPU401		"Standalone-MPU-401-Gerät"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32-Wiedergabe benutzen"
 #define STR_FM_DRIVER		"FM-Synth-Treiber"
 #define STR_FM_DRV_NUKED	"Nuked (genauer)"
 #define STR_FM_DRV_YMFM		"YMFM (schneller)"

-#define STR_NET_TYPE		"Netzwerktyp:"
+#define STR_NET_TYPE	"Netzwerktyp:"
 #define STR_PCAP		"PCap-Gerät:"
 #define STR_NET			"Netzwerkadapter:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1-Gerät:"
 #define STR_COM2		"COM2-Gerät:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI-basiertes Herunterfahren"
    IDS_2161	"Optionen"
    IDS_2162    "Früheres Laufwerk"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/dialogs.rc
+++ b/src/win/languages/dialogs.rc
@@ -320,58 +320,64 @@ DLG_CFG_SOUND DIALOG DISCARDABLE  CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, C
 STYLE DS_CONTROL | WS_CHILD
 FONT FONT_SIZE, FONT_NAME
 BEGIN
-    LTEXT           STR_SOUND, IDT_SOUND,
+    LTEXT           STR_SOUND1, IDT_SOUND1,
                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_SOUND,
+    COMBOBOX        IDC_COMBO_SOUND1,
                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND,
+    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND1,
                    CFG_COMBO_BTN_LEFT, 6, CFG_BTN_WIDTH, CFG_BTN_HEIGHT

-    LTEXT           STR_MIDI_OUT, IDT_MIDI_OUT,
+    LTEXT           STR_SOUND2, IDT_SOUND2,
                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_MIDI_OUT,
+    COMBOBOX        IDC_COMBO_SOUND2,
                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND2,
+                    CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+
+    LTEXT           STR_SOUND3, IDT_SOUND3,
+                    CFG_HMARGIN, 48, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
+    COMBOBOX        IDC_COMBO_SOUND3,
+                    CFG_COMBO_BOX_LEFT, 46, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND3,
+                    CFG_COMBO_BTN_LEFT, 45, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+
+    LTEXT           STR_SOUND4, IDT_SOUND4,
+                    CFG_HMARGIN, 68, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
+    COMBOBOX        IDC_COMBO_SOUND4,
+                    CFG_COMBO_BOX_LEFT, 66, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SND4,
+                    CFG_COMBO_BTN_LEFT, 65, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+
+    LTEXT           STR_MIDI_OUT, IDT_MIDI_OUT,
+                    CFG_HMARGIN, 88, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
+    COMBOBOX        IDC_COMBO_MIDI_OUT,
+                    CFG_COMBO_BOX_LEFT, 86, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
+                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON      STR_CONFIGURE,
                    IDC_CONFIGURE_MIDI_OUT,
-                    CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+                    CFG_COMBO_BTN_LEFT, 85, CFG_BTN_WIDTH, CFG_BTN_HEIGHT

    LTEXT           STR_MIDI_IN, IDT_MIDI_IN,
-                    CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
+                    CFG_HMARGIN, 108, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
    COMBOBOX        IDC_COMBO_MIDI_IN,
-                    CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
+                    CFG_COMBO_BOX_LEFT, 105, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_MIDI_IN,
-                    CFG_COMBO_BTN_LEFT, 44, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+                    CFG_COMBO_BTN_LEFT, 105, CFG_BTN_WIDTH, CFG_BTN_HEIGHT

    CONTROL         STR_MPU401,IDC_CHECK_MPU401,
                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 66, 199, CFG_CHECKBOX_HEIGHT
+                    CFG_HMARGIN, 126, 199, CFG_CHECKBOX_HEIGHT
    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_MPU401,
-                    CFG_COMBO_BTN_LEFT, 64, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
+                    CFG_COMBO_BTN_LEFT, 125, CFG_BTN_WIDTH, CFG_BTN_HEIGHT

-    CONTROL         STR_SSI,IDC_CHECK_SSI,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 84, 95, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_SSI,
-                    CFG_COMBO_BTN_LEFT, 82, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_CMS,IDC_CHECK_CMS,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 102, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_CMS,
-                    CFG_COMBO_BTN_LEFT, 100, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-
-    CONTROL         STR_GUS,IDC_CHECK_GUS,
-                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 120, CFG_CHECKBOX_PRI_WIDTH, CFG_CHECKBOX_HEIGHT
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_GUS,
-                    CFG_COMBO_BTN_LEFT, 118, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
-    
    CONTROL         STR_FLOAT, IDC_CHECK_FLOAT,
                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-                    CFG_HMARGIN, 138, 104, CFG_CHECKBOX_HEIGHT
+                    CFG_HMARGIN, 138, 194, CFG_CHECKBOX_HEIGHT

    GROUPBOX        STR_FM_DRIVER, IDC_FM_DRIVER,
                    CFG_HMARGIN, 154, 110, 42
@@ -391,22 +397,22 @@ FONT FONT_SIZE, FONT_NAME
 BEGIN
    LTEXT           STR_NET_TYPE, IDT_NET_TYPE,
                    CFG_HMARGIN, CFG_VMARGIN, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_NET_TYPE,
+    COMBOBOX        IDC_COMBO_NET1_TYPE,
                    CFG_COMBO_BOX_LEFT, 7, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

    LTEXT           STR_PCAP, IDT_PCAP,
                    CFG_HMARGIN, 28, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_PCAP,
+    COMBOBOX        IDC_COMBO_PCAP1,
                    CFG_COMBO_BOX_LEFT, 26, CFG_COMBO_NOBTN_WIDTH, CFG_COMBO_HEIGHT,
                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

    LTEXT           STR_NET, IDT_NET,
                    CFG_HMARGIN, 47, CFG_PANE_LTEXT_PRI_WIDTH, CFG_PANE_LTEXT_HEIGHT
-    COMBOBOX        IDC_COMBO_NET,
+    COMBOBOX        IDC_COMBO_NET1,
                    CFG_COMBO_BOX_LEFT, 45, CFG_COMBO_BTN_WIDTH, CFG_COMBO_HEIGHT,
                    CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_NET,
+    PUSHBUTTON      STR_CONFIGURE, IDC_CONFIGURE_NET1,
                    CFG_COMBO_BTN_LEFT, 44, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
 END

@@ -958,13 +964,13 @@ END
 #undef STR_JOY3
 #undef STR_JOY4

-#undef STR_SOUND
+#undef STR_SOUND1
+#undef STR_SOUND2
+#undef STR_SOUND3
+#undef STR_SOUND4
 #undef STR_MIDI_OUT
 #undef STR_MIDI_IN
 #undef STR_MPU401
-#undef STR_SSI
-#undef STR_CMS
-#undef STR_GUS
 #undef STR_FLOAT
 #undef STR_FM_DRIVER
 #undef STR_FM_DRV_NUKED
--- a/src/win/languages/en-GB.rc
+++ b/src/win/languages/en-GB.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Filter method"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Take s&creenshot\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferences...",		IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Enable &Discord integration", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "Sound &gain...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Sound card:"
+#define STR_SOUND1		"Sound card 1:"
+#define STR_SOUND2		"Sound card 2:"
+#define STR_SOUND3		"Sound card 3:"
+#define STR_SOUND4		"Sound card 4:"
 #define STR_MIDI_OUT	"MIDI Out Device:"
 #define STR_MIDI_IN		"MIDI In Device:"
 #define STR_MPU401		"Standalone MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Use FLOAT32 sound"
 #define STR_FM_DRIVER		"FM synth driver"
 #define STR_FM_DRV_NUKED	"Nuked (more accurate)"
 #define STR_FM_DRV_YMFM		"YMFM (faster)"

-#define STR_NET_TYPE		"Network type:"
+#define STR_NET_TYPE	"Network type:"
 #define STR_PCAP		"PCap device:"
 #define STR_NET			"Network adapter:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 Device:"
 #define STR_COM2		"COM2 Device:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI shutdown"
    IDS_2161	"Settings"
    IDS_2162    "Earlier drive"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/en-US.rc
+++ b/src/win/languages/en-US.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Filter method"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Take s&creenshot\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferences...",		IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Enable &Discord integration", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "Sound &gain...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Sound card:"
+#define STR_SOUND1		"Sound card 1:"
+#define STR_SOUND2		"Sound card 2:"
+#define STR_SOUND3		"Sound card 3:"
+#define STR_SOUND4		"Sound card 4:"
 #define STR_MIDI_OUT	"MIDI Out Device:"
 #define STR_MIDI_IN		"MIDI In Device:"
 #define STR_MPU401		"Standalone MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Use FLOAT32 sound"
 #define STR_FM_DRIVER		"FM synth driver"
 #define STR_FM_DRV_NUKED	"Nuked (more accurate)"
 #define STR_FM_DRV_YMFM		"YMFM (faster)"

-#define STR_NET_TYPE		"Network type:"
+#define STR_NET_TYPE	"Network type:"
 #define STR_PCAP		"PCap device:"
 #define STR_NET			"Network adapter:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 Device:"
 #define STR_COM2		"COM2 Device:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI shutdown"
    IDS_2161	"Settings"
    IDS_2162    "Earlier drive"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/es-ES.rc
+++ b/src/win/languages/es-ES.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "&Método de filtrado"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Tomar c&aptura\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferencias...",		IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Habilitar integración con &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Ganancia de sonido...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Mando 3..."
 #define STR_JOY4		"Mando 4..."

-#define STR_SOUND		"Tarjeta de sonido:"
+#define STR_SOUND1		"Tarjeta de sonido 1:"
+#define STR_SOUND2		"Tarjeta de sonido 2:"
+#define STR_SOUND3		"Tarjeta de sonido 3:"
+#define STR_SOUND4		"Tarjeta de sonido 4:"
 #define STR_MIDI_OUT		"Dispositivo MIDI de salida:"
 #define STR_MIDI_IN		"Dispositivo MIDI de entrada:"
 #define STR_MPU401		"MPU-401 independiente"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Usar sonido FLOAT32"
 #define STR_FM_DRIVER		"Controlador de sintet. FM"
 #define STR_FM_DRV_NUKED	"Nuked (más preciso)"
 #define STR_FM_DRV_YMFM		"YMFM (más rápido)"

-#define STR_NET_TYPE		"Tipo de red:"
+#define STR_NET_TYPE	"Tipo de red:"
 #define STR_PCAP		"Dispositivo PCap:"
 #define STR_NET			"Adaptador de red:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Dispositivo COM1:"
 #define STR_COM2		"Dispositivo COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI shutdown"
    IDS_2161	"Settings"
    IDS_2162    "Unidad anterior"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/fi-FI.rc
+++ b/src/win/languages/fi-FI.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                                             IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                                           IDM_VID_SCALE_3X
            MENUITEM "&2x",                                             IDM_VID_SCALE_4X
+            MENUITEM "&3x",                                             IDM_VID_SCALE_5X
+            MENUITEM "&4x",                                             IDM_VID_SCALE_6X
+            MENUITEM "&5x",                                             IDM_VID_SCALE_7X
+            MENUITEM "&6x",                                             IDM_VID_SCALE_8X
+            MENUITEM "&7x",                                             IDM_VID_SCALE_9X
+            MENUITEM "&8x",                                             IDM_VID_SCALE_10X
        END
        POPUP "&Suodatusmetodi"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Ota &kuvakaappaus\tCtrl+F11",                         IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Sovellusasetukset...",                               IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Käytä &Discord-integraatiota",                        IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Äänitasot...",                                       IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,13 +292,13 @@ END
 #define STR_JOY3            "Peliohjain 3..."
 #define STR_JOY4            "Peliohjain 4..."

-#define STR_SOUND           "Äänikortti:"
+#define STR_SOUND1           "Äänikortti 1:"
+#define STR_SOUND2           "Äänikortti 2:"
+#define STR_SOUND3           "Äänikortti 3:"
+#define STR_SOUND4           "Äänikortti 4:"
 #define STR_MIDI_OUT        "MIDI-ulostulo:"
 #define STR_MIDI_IN         "MIDI-sisääntulo:"
 #define STR_MPU401          "Erillinen MPU-401"
-#define STR_SSI             "Innovation SSI-2001"
-#define STR_CMS             "CMS / Game Blaster"
-#define STR_GUS             "Gravis Ultrasound"
 #define STR_FLOAT           "Käytä FLOAT32-ääntä"
 #define STR_FM_DRIVER       "FM-syntetisaattoriohjain"
 #define STR_FM_DRV_NUKED    "Nuked (tarkempi)"
@@ -299,6 +307,10 @@ END
 #define STR_NET_TYPE        "Verkon tyyppi:"
 #define STR_PCAP            "PCap-laite:"
 #define STR_NET             "Verkkokortti:"
+#define STR_NET1            "Network card 1:"
+#define STR_NET2            "Network card 2:"
+#define STR_NET3            "Network card 3:"
+#define STR_NET4            "Network card 4:"

 #define STR_COM1            "COM1-laite:"
 #define STR_COM2            "COM2-laite:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI-sammutus"
    IDS_2161	"Asetukset"
    IDS_2162    "Aiemmat asemat"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE
--- a/src/win/languages/fr-FR.rc
+++ b/src/win/languages/fr-FR.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Methode Filtre"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Copie &Ecran\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Préférences...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Activer intégration &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Gain Son...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Manette 3..."
 #define STR_JOY4		"Manette 4..."

-#define STR_SOUND		"Carte son:"
+#define STR_SOUND1		"Carte son 1:"
+#define STR_SOUND2		"Carte son 2:"
+#define STR_SOUND3		"Carte son 3:"
+#define STR_SOUND4		"Carte son 4:"
 #define STR_MIDI_OUT		"Sortie MIDI:"
 #define STR_MIDI_IN		"Entrée MIDI:"
 #define STR_MPU401		"MPU-401 autonome"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Utiliser le son FLOAT32"
 #define STR_FM_DRIVER		"Pilote de synthétiseur FM"
 #define STR_FM_DRV_NUKED	"Nuked (plus précis)"
 #define STR_FM_DRV_YMFM		"YMFM (plus rapide)"

-#define STR_NET_TYPE		"Type de réseau:"
+#define STR_NET_TYPE	"Type de réseau:"
 #define STR_PCAP		"Dispositif PCap:"
 #define STR_NET			"Adaptateur de réseau:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Dispositif COM1:"
 #define STR_COM2		"Dispositif COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI shutdown"
    IDS_2161	"Settings"
    IDS_2162    "Lecteur plus tôt"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/hr-HR.rc
+++ b/src/win/languages/hr-HR.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1,&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Metoda filtriranja"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Napravi &snimku zaslona\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Postavke...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Omogući integraciju sa programom &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Pojačanje zvuka...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Palica za igru 3..."
 #define STR_JOY4		"Palica za igru 4..."

-#define STR_SOUND		"Zvučna kartica:"
+#define STR_SOUND1		"Zvučna kartica 1:"
+#define STR_SOUND2		"Zvučna kartica 2:"
+#define STR_SOUND3		"Zvučna kartica 3:"
+#define STR_SOUND4		"Zvučna kartica 4:"
 #define STR_MIDI_OUT		"Izlazni uređaj MIDI:"
 #define STR_MIDI_IN		"Ulazni uređaj MIDI:"
 #define STR_MPU401		"Samostalni MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Koristi FLOAT32 za zvuk"
 #define STR_FM_DRIVER		"Drajver za FM sintisajzer"
 #define STR_FM_DRV_NUKED	"Nuked (precizniji)"
 #define STR_FM_DRV_YMFM		"YMFM (brži)"

-#define STR_NET_TYPE		"Tip mreže:"
+#define STR_NET_TYPE	"Tip mreže:"
 #define STR_PCAP		"Uređaj PCap:"
 #define STR_NET			"Mrežna kartica:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Uređaj COM1:"
 #define STR_COM2		"Uređaj COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI bazirano gašenje"
    IDS_2161	"Postavke"
    IDS_2162    "Raniji pogon"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/hu-HU.rc
+++ b/src/win/languages/hu-HU.rc
@@ -62,6 +62,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1,&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Szűrési mód"
        BEGIN
@@ -109,7 +115,9 @@ BEGIN
        MENUITEM "&Képernyőkép készítése\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Beállítások...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "&Discord integráció engedélyezése", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Hangerőszabályzó...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -289,21 +297,25 @@ END
 #define STR_JOY3		"Játékvez. 3..."
 #define STR_JOY4		"Játékvez. 4..."

-#define STR_SOUND		"Hangkártya:"
+#define STR_SOUND1		"Hangkártya 1:"
+#define STR_SOUND2		"Hangkártya 2:"
+#define STR_SOUND3		"Hangkártya 3:"
+#define STR_SOUND4		"Hangkártya 4:"
 #define STR_MIDI_OUT		"MIDI-kimenet:"
 #define STR_MIDI_IN		"MIDI-bemenet:"
 #define STR_MPU401		"Különálló MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32 használata"
 #define STR_FM_DRIVER		"FM szintetizátor meghajtó"
 #define STR_FM_DRV_NUKED	"Nuked (pontosabb)"
 #define STR_FM_DRV_YMFM		"YMFM (gyorsabb)"

-#define STR_NET_TYPE		"Hálózati típusa:"
+#define STR_NET_TYPE	"Hálózati típusa:"
 #define STR_PCAP		"PCap eszköz:"
 #define STR_NET			"Hálózati kártya:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 eszköz:"
 #define STR_COM2		"COM2 eszköz:"
@@ -526,6 +538,9 @@ BEGIN
    IDS_2160	"ACPI shutdown"
    IDS_2161	"Settings"
    IDS_2162    "Korábbi meghajtó"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/it-IT.rc
+++ b/src/win/languages/it-IT.rc
@@ -58,6 +58,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Metodo filtro"
        BEGIN
@@ -105,7 +111,9 @@ BEGIN
        MENUITEM "Cattura schermata\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferenze...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Abilita &integrazione Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "Guadagno &suono...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -285,21 +293,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Scheda audio:"
+#define STR_SOUND1		"Scheda audio 1:"
+#define STR_SOUND2		"Scheda audio 2:"
+#define STR_SOUND3		"Scheda audio 3:"
+#define STR_SOUND4		"Scheda audio 4:"
 #define STR_MIDI_OUT		"Uscita MIDI:"
 #define STR_MIDI_IN		"Entrata MIDI:"
 #define STR_MPU401		"MPU-401 autonomo"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Usa suono FLOAT32"
 #define STR_FM_DRIVER		"Driver sint. FM"
 #define STR_FM_DRV_NUKED	"Nuked (più accurato)"
 #define STR_FM_DRV_YMFM		"YMFM (più veloce)"

-#define STR_NET_TYPE		"Tipo di rete:"
+#define STR_NET_TYPE	"Tipo di rete:"
 #define STR_PCAP		"Dispositivo PCap:"
 #define STR_NET			"Scheda di rete:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Dispositivo COM1:"
 #define STR_COM2		"Dispositivo COM2:"
@@ -523,6 +535,9 @@ BEGIN
    IDS_2160	"ACPI shutdown"
    IDS_2161	"Settings"
    IDS_2162    "Unità anteriore"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/ja-JP.rc
+++ b/src/win/languages/ja-JP.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "1x(&1)",                     IDM_VID_SCALE_2X
            MENUITEM "1.5x(&5)",                   IDM_VID_SCALE_3X
            MENUITEM "2x(&2)",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                        IDM_VID_SCALE_5X
+            MENUITEM "&4x",                        IDM_VID_SCALE_6X
+            MENUITEM "&5x",                        IDM_VID_SCALE_7X
+            MENUITEM "&6x",                        IDM_VID_SCALE_8X
+            MENUITEM "&7x",                        IDM_VID_SCALE_9X
+            MENUITEM "&8x",                        IDM_VID_SCALE_10X
        END
        POPUP "フィルター方式"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "スクリーンショットを撮る(&C)\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "環境設定(&P)...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Discordとの連携機能(&D)", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "音量を調節(&G)...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"ジョイスティック3..."
 #define STR_JOY4		"ジョイスティック4..."

-#define STR_SOUND		"サウンドカード:"
+#define STR_SOUND1		"サウンドカード 1:"
+#define STR_SOUND2		"サウンドカード 2:"
+#define STR_SOUND3		"サウンドカード 3:"
+#define STR_SOUND4		"サウンドカード 4:"
 #define STR_MIDI_OUT		"MIDI出力デバイス:"
 #define STR_MIDI_IN		"MIDI入力デバイス:"
 #define STR_MPU401		"独立型MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32サウンドを使用する"
 #define STR_FM_DRIVER		"FMシンセドライバー"
 #define STR_FM_DRV_NUKED	"Nuked (高精度化)"
 #define STR_FM_DRV_YMFM		"YMFM (より速く)"

-#define STR_NET_TYPE		"ネットワークタイプ:"
+#define STR_NET_TYPE	"ネットワークタイプ:"
 #define STR_PCAP		"PCapデバイス:"
 #define STR_NET			"ネットワークアダプター:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1デバイス:"
 #define STR_COM2		"COM2デバイス:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPIシャットダウン"
    IDS_2161	"設定"
    IDS_2162    "アーリードライブ"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/ko-KR.rc
+++ b/src/win/languages/ko-KR.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "1배(&1)",                     IDM_VID_SCALE_2X
            MENUITEM "1.5배(&5)",                   IDM_VID_SCALE_3X
            MENUITEM "2배(&2)",                     IDM_VID_SCALE_4X
+            MENUITEM "&3배",                        IDM_VID_SCALE_5X
+            MENUITEM "&4배",                        IDM_VID_SCALE_6X
+            MENUITEM "&5배",                        IDM_VID_SCALE_7X
+            MENUITEM "&6배",                        IDM_VID_SCALE_8X
+            MENUITEM "&7배",                        IDM_VID_SCALE_9X
+            MENUITEM "&8배",                        IDM_VID_SCALE_10X
        END
        POPUP "필터 형식"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "스크린샷 찍기(&C)\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "환경설정(&P)...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "디스코드 연동 활성화하기(&D)", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "음량 증폭(&G)...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"조이스틱 3..."
 #define STR_JOY4		"조이스틱 4..."

-#define STR_SOUND		"사운드 카드:"
+#define STR_SOUND1		"사운드 카드 1:"
+#define STR_SOUND2		"사운드 카드 2:"
+#define STR_SOUND3		"사운드 카드 3:"
+#define STR_SOUND4		"사운드 카드 4:"
 #define STR_MIDI_OUT		"MIDI 출력 장치:"
 #define STR_MIDI_IN		"MIDI 입력 장치:"
 #define STR_MPU401		"MPU-401 단독 사용"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32 사운드 사용"
 #define STR_FM_DRIVER		"FM 신디사이저 드라이버"
 #define STR_FM_DRV_NUKED	"Nuked (더 정확한)"
 #define STR_FM_DRV_YMFM		"YMFM (더 빠르게)"

-#define STR_NET_TYPE		"네트워크 종류:"
+#define STR_NET_TYPE	"네트워크 종류:"
 #define STR_PCAP		"PCap 장치:"
 #define STR_NET			"네트워크 어댑터:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 장치:"
 #define STR_COM2		"COM2 장치:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI 종료"
    IDS_2161	"설정"
    IDS_2162    "이전 드라이브"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/pl-PL.rc
+++ b/src/win/languages/pl-PL.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Metoda filtrowania"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Zrób &zrzut ekranu\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferencje...",		IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Włącz integrację z &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "Wzmocnienie &dźwięku...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Karta dźwiękowa:"
+#define STR_SOUND1		"Karta dźwiękowa 1:"
+#define STR_SOUND2		"Karta dźwiękowa 2:"
+#define STR_SOUND3		"Karta dźwiękowa 3:"
+#define STR_SOUND4		"Karta dźwiękowa 4:"
 #define STR_MIDI_OUT		"Urządzenie wyjściowe MIDI:"
 #define STR_MIDI_IN		"Urządzenie wejściowe MIDI:"
 #define STR_MPU401		"Samodzielne urządzenie MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Użyj dźwięku FLOAT32"
 #define STR_FM_DRIVER		"Sterownik syntezy FM"
 #define STR_FM_DRV_NUKED	"Nuked (dokładniejszy)"
 #define STR_FM_DRV_YMFM		"YMFM (szybszy)"

-#define STR_NET_TYPE		"Rodzaj sieci:"
+#define STR_NET_TYPE	"Rodzaj sieci:"
 #define STR_PCAP		"Urządzenie PCap:"
 #define STR_NET			"Karta sieciowa:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Urządzenie COM1:"
 #define STR_COM2		"Urządzenie COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"Wyłączenie ACPI"
    IDS_2161	"Ustawienia"
    IDS_2162    "Wcześniejszy napęd"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/pt-BR.rc
+++ b/src/win/languages/pt-BR.rc
@@ -60,6 +60,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1,&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Método de filtragem"
        BEGIN
@@ -107,7 +113,9 @@ BEGIN
        MENUITEM "Capturar &tela\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferências...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Ativar integração com o &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Ganho de som...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -287,13 +295,13 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Placa de som:"
+#define STR_SOUND1		"Placa de som 1:"
+#define STR_SOUND2		"Placa de som 2:"
+#define STR_SOUND3		"Placa de som 3:"
+#define STR_SOUND4		"Placa de som 4:"
 #define STR_MIDI_OUT		"Disp. saída MIDI:"
 #define STR_MIDI_IN		"Disp. entrada MIDI:"
 #define STR_MPU401		"MPU-401 autônomo"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Usar som FLOAT32"
 #define STR_FM_DRIVER		"Controlador de sint. FM"
 #define STR_FM_DRV_NUKED	"Nuked (mais preciso)"
@@ -302,6 +310,10 @@ END
 #define STR_NET_TYPE		"Tipo de rede:"
 #define STR_PCAP		"Dispositivo PCap:"
 #define STR_NET			"Adaptador de rede:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Dispositivo COM1:"
 #define STR_COM2		"Dispositivo COM2:"
@@ -525,6 +537,9 @@ BEGIN
    IDS_2160	"Desligamento por ACPI"
    IDS_2161	"Configurações"
    IDS_2162    "Unidade anterior"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/pt-PT.rc
+++ b/src/win/languages/pt-PT.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Método de filtragem"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Gravar imagem de ecrã\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Preferências...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Ativar integração com &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Ganho de som...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Joystick 3..."
 #define STR_JOY4		"Joystick 4..."

-#define STR_SOUND		"Placa de som:"
+#define STR_SOUND1		"Placa de som 1:"
+#define STR_SOUND2		"Placa de som 2:"
+#define STR_SOUND3		"Placa de som 3:"
+#define STR_SOUND4		"Placa de som 4:"
 #define STR_MIDI_OUT		"Disp. saída MIDI:"
 #define STR_MIDI_IN		"Disp. entrada MIDI:"
 #define STR_MPU401		"MPU-401 autónomo"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Utilizar som FLOAT32"
 #define STR_FM_DRIVER		"Controlador de sint. FM"
 #define STR_FM_DRV_NUKED	"Nuked (mais exacto)"
 #define STR_FM_DRV_YMFM		"YMFM (mais rápido)"

-#define STR_NET_TYPE		"Tipo de rede:"
+#define STR_NET_TYPE	"Tipo de rede:"
 #define STR_PCAP		"Dispositivo PCap:"
 #define STR_NET			"Placa de rede:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Dispositivo COM1:"
 #define STR_COM2		"Dispositivo COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"Encerramento ACPI"
    IDS_2161	"Definições"
    IDS_2162    "Unidade anterior"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/ru-RU.rc
+++ b/src/win/languages/ru-RU.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Метод фильтрации"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Сделать с&криншот\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Параметры...",		IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Включить интеграцию &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Усиление звука...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Джойстик 3..."
 #define STR_JOY4		"Джойстик 4..."

-#define STR_SOUND		"Звуковая карта:"
+#define STR_SOUND1		"Звуковая карта 1:"
+#define STR_SOUND2		"Звуковая карта 2:"
+#define STR_SOUND3		"Звуковая карта 3:"
+#define STR_SOUND4		"Звуковая карта 4:"
 #define STR_MIDI_OUT		"MIDI Out устр-во:"
 #define STR_MIDI_IN		"MIDI In устр-во:"
 #define STR_MPU401		"Отдельный MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32 звук"
 #define STR_FM_DRIVER		"Драйвер FM-синтезатора"
 #define STR_FM_DRV_NUKED	"Nuked (более точный)"
 #define STR_FM_DRV_YMFM		"YMFM (быстрей)"

-#define STR_NET_TYPE		"Тип сети:"
+#define STR_NET_TYPE	"Тип сети:"
 #define STR_PCAP		"Устройство PCap:"
 #define STR_NET			"Сетевая карта:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Устройство COM1:"
 #define STR_COM2		"Устройство COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"Сигнал завершения ACPI"
    IDS_2161	"Настройки машины"
    IDS_2162    "Предыдущий дисковод"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/sl-SI.rc
+++ b/src/win/languages/sl-SI.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "&Metoda filtriranja"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "&Zajemi posnetek zaslona\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Možnosti...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Omogoči integracijo s programom &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Ojačanje zvoka...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Igralna palica 3..."
 #define STR_JOY4		"Igralna palica 4..."

-#define STR_SOUND		"Zvočna kartica:"
+#define STR_SOUND1		"Zvočna kartica 1:"
+#define STR_SOUND2		"Zvočna kartica 2:"
+#define STR_SOUND3		"Zvočna kartica 3:"
+#define STR_SOUND4		"Zvočna kartica 4:"
 #define STR_MIDI_OUT		"Izhodna naprava MIDI:"
 #define STR_MIDI_IN		"Vhodna naprava MIDI:"
 #define STR_MPU401		"Samostojen MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"Uporabi FLOAT32 za zvok"
 #define STR_FM_DRIVER		"Gonilnik sintetizacije FM"
 #define STR_FM_DRV_NUKED	"Nuked (točnejši)"
 #define STR_FM_DRV_YMFM		"YMFM (hitrejši)"

-#define STR_NET_TYPE		"Vrsta omrežja:"
+#define STR_NET_TYPE	"Vrsta omrežja:"
 #define STR_PCAP		"Naprava PCap:"
 #define STR_NET			"Omrežna kartica:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Naprava COM1:"
 #define STR_COM2		"Naprava COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"Zaustavitev ACPI"
    IDS_2161	"Nastavitve"
    IDS_2162    "Zgodnejši pogon"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/tr-TR.rc
+++ b/src/win/languages/tr-TR.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "&Filtre metodu"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "&Ekran görüntüsü al\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Tercihler...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "&Discord entegrasyonunu etkinleştir", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Ses yükseltici...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Oyun kolu 3..."
 #define STR_JOY4		"Oyun kolu 4..."

-#define STR_SOUND		"Ses kartı:"
+#define STR_SOUND1		"Ses kartı 1:"
+#define STR_SOUND2		"Ses kartı 2:"
+#define STR_SOUND3		"Ses kartı 3:"
+#define STR_SOUND4		"Ses kartı 4:"
 #define STR_MIDI_OUT		"MIDI Çıkış Cihazı:"
 #define STR_MIDI_IN		"MIDI Giriş Cihazı:"
 #define STR_MPU401		"Bağımsız MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32 ses kullan"
 #define STR_FM_DRIVER		"FM sentez sürücüsü"
 #define STR_FM_DRV_NUKED	"Nuked (daha doğru)"
 #define STR_FM_DRV_YMFM		"YMFM (daha hızlı)"

-#define STR_NET_TYPE		"Ağ tipi:"
+#define STR_NET_TYPE	"Ağ tipi:"
 #define STR_PCAP		"PCap cihazı:"
 #define STR_NET			"Ağ cihazı:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 Cihazı:"
 #define STR_COM2		"COM2 Cihazı:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI kapatma"
    IDS_2161	"Ayarlar"
    IDS_2162    "Daha erken sürüş"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/uk-UA.rc
+++ b/src/win/languages/uk-UA.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "&1x",                     IDM_VID_SCALE_2X
            MENUITEM "1.&5x",                   IDM_VID_SCALE_3X
            MENUITEM "&2x",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                     IDM_VID_SCALE_5X
+            MENUITEM "&4x",                     IDM_VID_SCALE_6X
+            MENUITEM "&5x",                     IDM_VID_SCALE_7X
+            MENUITEM "&6x",                     IDM_VID_SCALE_8X
+            MENUITEM "&7x",                     IDM_VID_SCALE_9X
+            MENUITEM "&8x",                     IDM_VID_SCALE_10X
        END
        POPUP "Метод фільтрації"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "Зробити &знімок\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "&Параметри...",		IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "Увімкнути інтеграцію &Discord", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "&Посилення звуку...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"Джойстик 3..."
 #define STR_JOY4		"Джойстик 4..."

-#define STR_SOUND		"Звукова карта:"
+#define STR_SOUND1		"Звукова карта 1:"
+#define STR_SOUND2		"Звукова карта 2:"
+#define STR_SOUND3		"Звукова карта 3:"
+#define STR_SOUND4		"Звукова карта 4:"
 #define STR_MIDI_OUT		"MIDI Out при-ій:"
 #define STR_MIDI_IN		"MIDI In при-ій:"
 #define STR_MPU401		"Окремий MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"FLOAT32 звук"
 #define STR_FM_DRIVER		"Драйвер FM-синтезатора"
 #define STR_FM_DRV_NUKED	"Nuked (більш точний)"
 #define STR_FM_DRV_YMFM		"YMFM (швидший)"

-#define STR_NET_TYPE		"Тип мережі:"
+#define STR_NET_TYPE	"Тип мережі:"
 #define STR_PCAP		"Пристрій PCap:"
 #define STR_NET			"Мережева карта:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"Пристрій COM1:"
 #define STR_COM2		"Пристрій COM2:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160 "Сигнал завершення ACPI"
    IDS_2161 "Налаштування машини"
    IDS_2162    "Більш ранній дисковод"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE
--- a/src/win/languages/zh-CN.rc
+++ b/src/win/languages/zh-CN.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "1x(&1)",                     IDM_VID_SCALE_2X
            MENUITEM "1.5x(&5)",                   IDM_VID_SCALE_3X
            MENUITEM "2x(&2)",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                        IDM_VID_SCALE_5X
+            MENUITEM "&4x",                        IDM_VID_SCALE_6X
+            MENUITEM "&5x",                        IDM_VID_SCALE_7X
+            MENUITEM "&6x",                        IDM_VID_SCALE_8X
+            MENUITEM "&7x",                        IDM_VID_SCALE_9X
+            MENUITEM "&8x",                        IDM_VID_SCALE_10X
        END
        POPUP "过滤方式"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "截图(&C)\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "首选项(&P)...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "启用 Discord 集成(&D)", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "音量增益(&G)...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"操纵杆 3..."
 #define STR_JOY4		"操纵杆 4..."

-#define STR_SOUND		"声卡:"
+#define STR_SOUND1		"声卡 1:"
+#define STR_SOUND2		"声卡 2:"
+#define STR_SOUND3		"声卡 3:"
+#define STR_SOUND4		"声卡 4:"
 #define STR_MIDI_OUT		"MIDI 输出设备:"
 #define STR_MIDI_IN		"MIDI 输入设备:"
 #define STR_MPU401		"独立 MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"使用单精度浮点 (FLOAT32)"
 #define STR_FM_DRIVER		"调频合成器驱动器"
 #define STR_FM_DRV_NUKED	"Nuked (更准确)"
 #define STR_FM_DRV_YMFM		"YMFM (更快)"

-#define STR_NET_TYPE		"网络类型:"
+#define STR_NET_TYPE	"网络类型:"
 #define STR_PCAP		"PCap 设备:"
 #define STR_NET			"网络适配器:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 设备:"
 #define STR_COM2		"COM2 设备:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI 关机"
    IDS_2161	"设置"
    IDS_2162    "早先的驱动器"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/languages/zh-TW.rc
+++ b/src/win/languages/zh-TW.rc
@@ -57,6 +57,12 @@ BEGIN
            MENUITEM "1x(&1)",                     IDM_VID_SCALE_2X
            MENUITEM "1.5x(&5)",                   IDM_VID_SCALE_3X
            MENUITEM "2x(&2)",                     IDM_VID_SCALE_4X
+            MENUITEM "&3x",                        IDM_VID_SCALE_5X
+            MENUITEM "&4x",                        IDM_VID_SCALE_6X
+            MENUITEM "&5x",                        IDM_VID_SCALE_7X
+            MENUITEM "&6x",                        IDM_VID_SCALE_8X
+            MENUITEM "&7x",                        IDM_VID_SCALE_9X
+            MENUITEM "&8x",                        IDM_VID_SCALE_10X
        END
        POPUP "過濾方式"
        BEGIN
@@ -104,7 +110,9 @@ BEGIN
        MENUITEM "擷圖(&C)\tCtrl+F11",  IDM_ACTION_SCREENSHOT
        MENUITEM SEPARATOR
        MENUITEM "首選項(&P)...",    IDM_PREFERENCES
+#ifdef DISCORD
        MENUITEM "啟用 Discord 整合(&D)", IDM_DISCORD
+#endif
        MENUITEM SEPARATOR
        MENUITEM "音量增益(&G)...",              IDM_SND_GAIN
 #ifdef MTR_ENABLED
@@ -284,21 +292,25 @@ END
 #define STR_JOY3		"搖桿 3..."
 #define STR_JOY4		"搖桿 4..."

-#define STR_SOUND		"音訊卡:"
+#define STR_SOUND1		"音訊卡 1:"
+#define STR_SOUND2		"音訊卡 2:"
+#define STR_SOUND3		"音訊卡 3:"
+#define STR_SOUND4		"音訊卡 4:"
 #define STR_MIDI_OUT		"MIDI 輸出裝置:"
 #define STR_MIDI_IN		"MIDI 輸入裝置:"
 #define STR_MPU401		"獨立 MPU-401"
-#define STR_SSI			"Innovation SSI-2001"
-#define STR_CMS			"CMS / Game Blaster"
-#define STR_GUS			"Gravis Ultrasound"
 #define STR_FLOAT		"使用單精度浮點 (FLOAT32)"
 #define STR_FM_DRIVER		"調頻合成器驅動器"
 #define STR_FM_DRV_NUKED	"Nuked (更準確)"
 #define STR_FM_DRV_YMFM		"YMFM (更快)"

-#define STR_NET_TYPE		"網路類型:"
+#define STR_NET_TYPE	"網路類型:"
 #define STR_PCAP		"PCap 裝置:"
 #define STR_NET			"網路配接器:"
+#define STR_NET1		"Network card 1:"
+#define STR_NET2		"Network card 2:"
+#define STR_NET3		"Network card 3:"
+#define STR_NET4		"Network card 4:"

 #define STR_COM1		"COM1 裝置:"
 #define STR_COM2		"COM2 裝置:"
@@ -522,6 +534,9 @@ BEGIN
    IDS_2160	"ACPI 關機"
    IDS_2161	"設定"
    IDS_2162    "早先的光碟機"
+    IDS_2163    "no dynarec"
+    IDS_2164    "old dynarec"
+    IDS_2165    "new dynarec"
 END

 STRINGTABLE DISCARDABLE 
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *          Fred N. van Kempen, <decwiz@yahoo.com>
 *
@@ -488,8 +488,8 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
        return (1);
    }

-    extern int gfxcard_2;
-    gfxcard_2 = 0;
+    extern int gfxcard[2];
+    gfxcard[1] = 0;

    /* Create console window. */
    if (force_debug) {
--- a/src/win/win_about.c
+++ b/src/win/win_about.c
@@ -45,9 +45,22 @@ AboutDialogCreate(HWND hwnd)
    wchar_t emu_version[256];
    i = swprintf(emu_version, sizeof(emu_version), L"%ls v%ls", EMU_NAME_W, EMU_VERSION_FULL_W);
 #ifdef EMU_GIT_HASH
-    swprintf(&emu_version[i], sizeof(emu_version) - i, L" [%ls]", EMU_GIT_HASH_W);
+    i += swprintf(&emu_version[i], sizeof(emu_version) - i, L" [%ls]", EMU_GIT_HASH_W);
 #endif

+#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
+#    define ARCH_STR L"arm"
+#elif defined(__aarch64__) || defined(_M_ARM64)
+#    define ARCH_STR L"arm64"
+#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#    define ARCH_STR L"i386"
+#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+#    define ARCH_STR L"x86_64"
+#else
+#    define ARCH_STR L"unknown"
+#endif
+    swprintf(&emu_version[i], sizeof(emu_version) - i, L" [%ls, %ls]", ARCH_STR, plat_get_string(IDS_DYNAREC));
+
    tdconfig.cbSize             = sizeof(tdconfig);
    tdconfig.hwndParent         = hwnd;
    tdconfig.hInstance          = hinstance;
--- a/src/win/win_cdrom.c
+++ b/src/win/win_cdrom.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *          Fred N. van Kempen, <decwiz@yahoo.com>
 *
--- a/src/win/win_devconf.c
+++ b/src/win/win_devconf.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *
 *          Copyright 2008-2018 Sarah Walker.
--- a/src/win/win_icon.c
+++ b/src/win/win_icon.c
@@ -9,6 +9,7 @@
 *          Implement the application's icon changing system.
 *
 *
+ *
 * Authors: Laci bá'
 *
 *          Copyright 2021 Laci bá'.
--- a/src/win/win_joystick.cpp
+++ b/src/win/win_joystick.cpp
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *
 *          Copyright 2008-2019 Sarah Walker.
--- a/src/win/win_joystick_rawinput.c
+++ b/src/win/win_joystick_rawinput.c
@@ -8,7 +8,9 @@
 *
 *          RawInput joystick interface.
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ *
+ *
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *          GH Cao, <driver1998.ms@outlook.com>
 *
--- a/src/win/win_joystick_xinput.c
+++ b/src/win/win_joystick_xinput.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *          GH Cao, <driver1998.ms@outlook.com>
 *
--- a/src/win/win_mouse.c
+++ b/src/win/win_mouse.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *          GH Cao, <driver1998.ms@outlook.com>
 *
--- a/src/win/win_opengl.c
+++ b/src/win/win_opengl.c
@@ -15,6 +15,8 @@
 *          (UI) options
 *          More error handling
 *
+ *
+ *
 * Authors: Teemu Korhonen
 *
 *          Copyright 2021 Teemu Korhonen
@@ -63,7 +65,7 @@ typedef LONG atomic_flag;

 static const int INIT_WIDTH   = 640;
 static const int INIT_HEIGHT  = 400;
-static const int BUFFERPIXELS = 4194304;  /* Same size as render_buffer, pow(2048+64,2). */
+static const int BUFFERPIXELS = 4194304;  /* Same size as render_buffer, pow(2048 + 64, 2). */
 static const int BUFFERBYTES  = 16777216; /* Pixel is 4 bytes. */
 static const int BUFFERCOUNT  = 3;        /* How many buffers to use for pixel transfer (2-3 is commonly recommended). */
 static const int ROW_LENGTH   = 2048;     /* Source buffer row lenght (including padding) */
--- a/src/win/win_opengl_glslp.c
+++ b/src/win/win_opengl_glslp.c
@@ -11,6 +11,8 @@
 *
 * TODO:    Read .glslp files for multipass shaders and settings.
 *
+ *
+ *
 * Authors: Teemu Korhonen
 *
 *          Copyright 2021 Teemu Korhonen
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -14,7 +14,7 @@
 *          David Hrdlička, <hrdlickadavid@outlook.com>
 *
 *          Copyright 2016-2019 Miran Grca.
- *          Copyright 2018,2019 David Hrdlička.
+ *          Copyright 2018-2019 David Hrdlička.
 *          Copyright 2021 Laci bá'
 *          Copyright 2021-2022 Jasmine Iwanek.
 */
@@ -93,18 +93,20 @@ static int temp_dynarec;
 #endif

 /* Video category */
-static int temp_gfxcard, temp_gfxcard_2, temp_ibm8514, temp_voodoo, temp_xga;
+static int temp_gfxcard[2], temp_ibm8514, temp_voodoo, temp_xga;

 /* Input devices category */
 static int temp_mouse, temp_joystick;

 /* Sound category */
-static int temp_sound_card, temp_midi_output_device, temp_midi_input_device, temp_mpu401, temp_SSI2001, temp_GAMEBLASTER, temp_GUS;
+static int temp_sound_card[SOUND_CARD_MAX];
+static int temp_midi_output_device, temp_midi_input_device, temp_mpu401;
 static int temp_float, temp_fm_driver;

 /* Network category */
-static int  temp_net_type, temp_net_card;
-static char temp_pcap_dev[128];
+static int  temp_net_type[NET_CARD_MAX];
+static int  temp_net_card[NET_CARD_MAX];
+static char temp_pcap_dev[NET_CARD_MAX][128];

 /* Ports category */
 static int temp_lpt_devices[PARALLEL_MAX];
@@ -324,8 +326,8 @@ win_settings_init(void)
    temp_sync = time_sync;

    /* Video category */
-    temp_gfxcard   = gfxcard;
-    temp_gfxcard_2 = gfxcard_2;
+    temp_gfxcard[0]   = gfxcard[0];
+    temp_gfxcard[1] = gfxcard[1];
    temp_voodoo    = voodoo_enabled;
    temp_ibm8514   = ibm8514_enabled;
    temp_xga       = xga_enabled;
@@ -335,24 +337,24 @@ win_settings_init(void)
    temp_joystick = joystick_type;

    /* Sound category */
-    temp_sound_card         = sound_card_current;
+    for (i = 0; i < SOUND_CARD_MAX; i++)
+        temp_sound_card[i] = sound_card_current[i];
    temp_midi_output_device = midi_output_device_current;
    temp_midi_input_device  = midi_input_device_current;
    temp_mpu401             = mpu401_standalone_enable;
-    temp_SSI2001            = SSI2001;
-    temp_GAMEBLASTER        = GAMEBLASTER;
-    temp_GUS                = GUS;
    temp_float              = sound_is_float;
    temp_fm_driver          = fm_driver;

    /* Network category */
-    temp_net_type = net_cards_conf[0].net_type;
-    memset(temp_pcap_dev, 0, sizeof(temp_pcap_dev));
-#ifdef ENABLE_SETTINGS_LOG
-    assert(sizeof(temp_pcap_dev) == sizeof(net_cards_conf[0].host_dev_name));
-#endif
-    memcpy(temp_pcap_dev, net_cards_conf[0].host_dev_name, sizeof(net_cards_conf[0].host_dev_name));
-    temp_net_card = net_cards_conf[0].device_num;
+    for (i = 0; i < NET_CARD_MAX; i++) {
+        temp_net_type[i] = net_cards_conf[i].net_type;
+        memset(temp_pcap_dev[i], 0, sizeof(temp_pcap_dev[i]));
+#    ifdef ENABLE_SETTINGS_LOG
+        assert(sizeof(temp_pcap_dev[i]) == sizeof(net_cards_conf[i].host_dev_name));
+#    endif
+        memcpy(temp_pcap_dev[i], net_cards_conf[i].host_dev_name, sizeof(net_cards_conf[i].host_dev_name));
+        temp_net_card[i] = net_cards_conf[i].device_num;
+    }

    /* Ports category */
    for (i = 0; i < PARALLEL_MAX; i++) {
@@ -451,8 +453,8 @@ win_settings_changed(void)
    i = i || (temp_sync != time_sync);

    /* Video category */
-    i = i || (gfxcard != temp_gfxcard);
-    i = i || (gfxcard_2 != temp_gfxcard_2);
+    i = i || (gfxcard[0] != temp_gfxcard[0]);
+    i = i || (gfxcard[1] != temp_gfxcard[1]);
    i = i || (voodoo_enabled != temp_voodoo);
    i = i || (ibm8514_enabled != temp_ibm8514);
    i = i || (xga_enabled != temp_xga);
@@ -462,20 +464,20 @@ win_settings_changed(void)
    i = i || (joystick_type != temp_joystick);

    /* Sound category */
-    i = i || (sound_card_current != temp_sound_card);
+    for (j = 0; j < SOUND_CARD_MAX; j++)
+        i = i || (sound_card_current[j] != temp_sound_card[j]);
    i = i || (midi_output_device_current != temp_midi_output_device);
    i = i || (midi_input_device_current != temp_midi_input_device);
    i = i || (mpu401_standalone_enable != temp_mpu401);
-    i = i || (SSI2001 != temp_SSI2001);
-    i = i || (GAMEBLASTER != temp_GAMEBLASTER);
-    i = i || (GUS != temp_GUS);
    i = i || (sound_is_float != temp_float);
    i = i || (fm_driver != temp_fm_driver);

    /* Network category */
-    i = i || (net_cards_conf[i].net_type != temp_net_type);
-    i = i || strcmp(temp_pcap_dev, net_cards_conf[0].host_dev_name);
-    i = i || (net_cards_conf[0].device_num != temp_net_card);
+    for (j = 0; j < NET_CARD_MAX; j++) {
+        i = i || (net_cards_conf[j].net_type != temp_net_type[j]);
+        i = i || strcmp(temp_pcap_dev[j], net_cards_conf[j].host_dev_name);
+        i = i || (net_cards_conf[j].device_num != temp_net_card[j]);
+    }

    /* Ports category */
    for (j = 0; j < PARALLEL_MAX; j++) {
@@ -544,8 +546,8 @@ win_settings_save(void)
    time_sync = temp_sync;

    /* Video category */
-    gfxcard         = temp_gfxcard;
-    gfxcard_2       = temp_gfxcard_2;
+    gfxcard[0]         = temp_gfxcard[0];
+    gfxcard[1]       = temp_gfxcard[1];
    voodoo_enabled  = temp_voodoo;
    ibm8514_enabled = temp_ibm8514;
    xga_enabled     = temp_xga;
@@ -555,21 +557,21 @@ win_settings_save(void)
    joystick_type = temp_joystick;

    /* Sound category */
-    sound_card_current         = temp_sound_card;
+    for (i = 0; i < SOUND_CARD_MAX; i++)
+        sound_card_current[i] = temp_sound_card[i];
    midi_output_device_current = temp_midi_output_device;
    midi_input_device_current  = temp_midi_input_device;
    mpu401_standalone_enable   = temp_mpu401;
-    SSI2001                    = temp_SSI2001;
-    GAMEBLASTER                = temp_GAMEBLASTER;
-    GUS                        = temp_GUS;
    sound_is_float             = temp_float;
    fm_driver                  = temp_fm_driver;

    /* Network category */
-    net_cards_conf[i].net_type = temp_net_type;
-    memset(net_cards_conf[0].host_dev_name, '\0', sizeof(net_cards_conf[0].host_dev_name));
-    strcpy(net_cards_conf[0].host_dev_name, temp_pcap_dev);
-    net_cards_conf[0].device_num = temp_net_card;
+    for (i = 0; i < NET_CARD_MAX; i++) {
+        net_cards_conf[i].net_type = temp_net_type[i];
+        memset(net_cards_conf[i].host_dev_name, '\0', sizeof(net_cards_conf[i].host_dev_name));
+        strcpy(net_cards_conf[i].host_dev_name, temp_pcap_dev[i]);
+        net_cards_conf[i].device_num = temp_net_card[i];
+    }

    /* Ports category */
    for (i = 0; i < PARALLEL_MAX; i++) {
@@ -1088,7 +1090,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                    else
                        settings_add_string(hdlg, IDC_COMBO_VIDEO, (LPARAM) device_name);
                    settings_list_to_device[0][d] = c;
-                    if ((c == 0) || (c == temp_gfxcard))
+                    if ((c == 0) || (c == temp_gfxcard[0]))
                        settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO, d);
                    d++;
                }
@@ -1103,7 +1105,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
            settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(e));

            // Secondary Video Card
-            c = 0;
+            c = d = 0;
            settings_reset_content(hdlg, IDC_COMBO_VIDEO_2);

            while (1) {
@@ -1118,15 +1120,20 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                if (!device_name[0])
                    break;

+                if ((c > 1) && (video_card_get_flags(c) == video_card_get_flags(temp_gfxcard[0]))) {
+                    c++;
+                    continue;
+                }
+
                if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) {
                    if (c == 0) // "None"
                        settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2104));
                    else if (c == 1) // "Internal"
                        settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2119));
-                    else if (video_card_get_flags(c) != video_card_get_flags(gfxcard))
+                    else
                        settings_add_string(hdlg, IDC_COMBO_VIDEO_2, (LPARAM) device_name);
                    settings_list_to_device[1][d] = c;
-                    if ((c == 0) || (c == temp_gfxcard_2))
+                    if ((c == 0) || (c == temp_gfxcard[1]))
                        settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO_2, d);
                    d++;
                }
@@ -1156,13 +1163,56 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
        case WM_COMMAND:
            switch (LOWORD(wParam)) {
                case IDC_COMBO_VIDEO:
-                    temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(temp_gfxcard));
+                    temp_gfxcard[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(temp_gfxcard[0]));
+
+                    // Secondary Video Card
+                    c = d = 0;
+                    settings_reset_content(hdlg, IDC_COMBO_VIDEO_2);
+
+                    while (1) {
+                        /* Skip "internal" if machine doesn't have it. */
+                        if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_VIDEO)) {
+                            c++;
+                            continue;
+                        }
+
+                        generate_device_name(video_card_getdevice(c), video_get_internal_name(c), 1);
+
+                        if (!device_name[0])
+                            break;
+
+                        if ((c > 1) && (video_card_get_flags(c) == video_card_get_flags(temp_gfxcard[0]))) {
+                            c++;
+                            continue;
+                        }
+
+                        if (video_card_available(c) && device_is_valid(video_card_getdevice(c), temp_machine)) {
+                            if (c == 0) // "None"
+                                settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2104));
+                            else if (c == 1) // "Internal"
+                                settings_add_string(hdlg, IDC_COMBO_VIDEO_2, win_get_string(IDS_2119));
+                            else
+                                settings_add_string(hdlg, IDC_COMBO_VIDEO_2, (LPARAM) device_name);
+                            settings_list_to_device[1][d] = c;
+                            if ((c == 0) || (c == temp_gfxcard[1]))
+                                settings_set_cur_sel(hdlg, IDC_COMBO_VIDEO_2, d);
+                            d++;
+                        }
+
+                        c++;
+
+                        settings_process_messages();
+                    }
+
+                    settings_enable_window(hdlg, IDC_COMBO_VIDEO_2, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
+                    e = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(e));
                    break;

                case IDC_COMBO_VIDEO_2:
-                    temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(temp_gfxcard_2));
+                    temp_gfxcard[1] = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_VID_2, video_card_has_config(temp_gfxcard[1]));
                    break;

                case IDC_CHECK_VOODOO:
@@ -1184,31 +1234,30 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                    break;

                case IDC_BUTTON_XGA:
-                    if (machine_has_bus(temp_machine, MACHINE_BUS_MCA) > 0) {
+                    if (machine_has_bus(temp_machine, MACHINE_BUS_MCA) > 0)
                        temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &xga_device);
-                    } else {
+                    else
                        temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &xga_isa_device);
-                    }
                    break;

                case IDC_CONFIGURE_VID:
-                    temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard));
+                    temp_gfxcard[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard[0]));
                    break;

                case IDC_CONFIGURE_VID_2:
-                    temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard_2));
+                    temp_gfxcard[1] = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) video_card_getdevice(temp_gfxcard[1]));
                    break;
            }
            return FALSE;

        case WM_SAVESETTINGS:
-            temp_gfxcard   = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
-            temp_gfxcard_2 = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
-            temp_voodoo    = settings_get_check(hdlg, IDC_CHECK_VOODOO);
-            temp_ibm8514   = settings_get_check(hdlg, IDC_CHECK_IBM8514);
-            temp_xga       = settings_get_check(hdlg, IDC_CHECK_XGA);
+            temp_gfxcard[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
+            temp_gfxcard[1] = settings_list_to_device[1][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO_2)];
+            temp_voodoo     = settings_get_check(hdlg, IDC_CHECK_VOODOO);
+            temp_ibm8514    = settings_get_check(hdlg, IDC_CHECK_IBM8514);
+            temp_xga        = settings_get_check(hdlg, IDC_CHECK_XGA);

        default:
            return FALSE;
@@ -1349,16 +1398,16 @@ static BOOL CALLBACK
 #endif
 win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    int             c, d;
+    uint16_t        c, d;
    LPTSTR          lptsTemp;
-    const device_t *sound_dev;
+    const device_t *sound_dev[SOUND_CARD_MAX];

    switch (message) {
        case WM_INITDIALOG:
            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));

            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_SOUND);
+            settings_reset_content(hdlg, IDC_COMBO_SOUND1);
            while (1) {
                /* Skip "internal" if machine doesn't have it. */
                if ((c == 1) && !machine_has_flags(temp_machine, MACHINE_SOUND)) {
@@ -1372,18 +1421,18 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                    break;

                if (sound_card_available(c)) {
-                    sound_dev = sound_card_getdevice(c);
+                    sound_dev[0] = sound_card_getdevice(c);

-                    if (device_is_valid(sound_dev, temp_machine)) {
+                    if (device_is_valid(sound_dev[0], temp_machine)) {
                        if (c == 0)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2104));
+                            settings_add_string(hdlg, IDC_COMBO_SOUND1, win_get_string(IDS_2104));
                        else if (c == 1)
-                            settings_add_string(hdlg, IDC_COMBO_SOUND, win_get_string(IDS_2119));
+                            settings_add_string(hdlg, IDC_COMBO_SOUND1, win_get_string(IDS_2119));
                        else
-                            settings_add_string(hdlg, IDC_COMBO_SOUND, (LPARAM) device_name);
+                            settings_add_string(hdlg, IDC_COMBO_SOUND1, (LPARAM) device_name);
                        settings_list_to_device[0][d] = c;
-                        if ((c == 0) || (c == temp_sound_card))
-                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND, d);
+                        if ((c == 0) || (c == temp_sound_card[0]))
+                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND1, d);
                        d++;
                    }
                }
@@ -1391,8 +1440,119 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                c++;
            }

-            settings_enable_window(hdlg, IDC_COMBO_SOUND, d);
-            settings_enable_window(hdlg, IDC_CONFIGURE_SND, sound_card_has_config(temp_sound_card));
+            settings_enable_window(hdlg, IDC_COMBO_SOUND1, d);
+            settings_enable_window(hdlg, IDC_CONFIGURE_SND1, sound_card_has_config(temp_sound_card[0]));
+
+            c = d = 0;
+            settings_reset_content(hdlg, IDC_COMBO_SOUND2);
+            while (1) {
+                /* Skip "internal" */
+                if (c == 1) {
+                    c++;
+                    continue;
+                }
+
+                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
+
+                if (!device_name[0])
+                    break;
+
+                if (sound_card_available(c)) {
+                    sound_dev[1] = sound_card_getdevice(c);
+
+                    if (device_is_valid(sound_dev[1], temp_machine)) {
+                        if (c == 0)
+                            settings_add_string(hdlg, IDC_COMBO_SOUND2, win_get_string(IDS_2104));
+                        else if (c == 1)
+                            settings_add_string(hdlg, IDC_COMBO_SOUND2, win_get_string(IDS_2119));
+                        else
+                            settings_add_string(hdlg, IDC_COMBO_SOUND2, (LPARAM) device_name);
+                        settings_list_to_device[0][d] = c;
+                        if ((c == 0) || (c == temp_sound_card[1]))
+                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND2, d);
+                        d++;
+                    }
+                }
+
+                c++;
+            }
+
+            settings_enable_window(hdlg, IDC_COMBO_SOUND2, d);
+            settings_enable_window(hdlg, IDC_CONFIGURE_SND2, sound_card_has_config(temp_sound_card[1]));
+
+            c = d = 0;
+            settings_reset_content(hdlg, IDC_COMBO_SOUND3);
+            while (1) {
+                /* Skip "internal" */
+                if (c == 1) {
+                    c++;
+                    continue;
+                }
+
+                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
+
+                if (!device_name[0])
+                    break;
+
+                if (sound_card_available(c)) {
+                    sound_dev[2] = sound_card_getdevice(c);
+
+                    if (device_is_valid(sound_dev[2], temp_machine)) {
+                        if (c == 0)
+                            settings_add_string(hdlg, IDC_COMBO_SOUND3, win_get_string(IDS_2104));
+                        else if (c == 1)
+                            settings_add_string(hdlg, IDC_COMBO_SOUND3, win_get_string(IDS_2119));
+                        else
+                            settings_add_string(hdlg, IDC_COMBO_SOUND3, (LPARAM) device_name);
+                        settings_list_to_device[0][d] = c;
+                        if ((c == 0) || (c == temp_sound_card[2]))
+                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND3, d);
+                        d++;
+                    }
+                }
+
+                c++;
+            }
+
+            settings_enable_window(hdlg, IDC_COMBO_SOUND3, d);
+            settings_enable_window(hdlg, IDC_CONFIGURE_SND3, sound_card_has_config(temp_sound_card[2]));
+
+            c = d = 0;
+            settings_reset_content(hdlg, IDC_COMBO_SOUND4);
+            while (1) {
+                /* Skip "internal" */
+                if (c == 1) {
+                    c++;
+                    continue;
+                }
+
+                generate_device_name(sound_card_getdevice(c), sound_card_get_internal_name(c), 1);
+
+                if (!device_name[0])
+                    break;
+
+                if (sound_card_available(c)) {
+                    sound_dev[3] = sound_card_getdevice(c);
+
+                    if (device_is_valid(sound_dev[3], temp_machine)) {
+                        if (c == 0)
+                            settings_add_string(hdlg, IDC_COMBO_SOUND4, win_get_string(IDS_2104));
+                        else if (c == 1)
+                            settings_add_string(hdlg, IDC_COMBO_SOUND4, win_get_string(IDS_2119));
+                        else
+                            settings_add_string(hdlg, IDC_COMBO_SOUND4, (LPARAM) device_name);
+                        settings_list_to_device[0][d] = c;
+                        if ((c == 0) || (c == temp_sound_card[3]))
+                            settings_set_cur_sel(hdlg, IDC_COMBO_SOUND4, d);
+                        d++;
+                    }
+                }
+
+                c++;
+            }
+
+            settings_enable_window(hdlg, IDC_COMBO_SOUND4, d);
+            settings_enable_window(hdlg, IDC_CONFIGURE_SND4, sound_card_has_config(temp_sound_card[3]));

            c = d = 0;
            settings_reset_content(hdlg, IDC_COMBO_MIDI_OUT);
@@ -1444,15 +1604,6 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
            settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
            settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
            settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
-            settings_enable_window(hdlg, IDC_CHECK_CMS, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
-            settings_set_check(hdlg, IDC_CHECK_CMS, temp_GAMEBLASTER);
-            settings_enable_window(hdlg, IDC_CONFIGURE_CMS, machine_has_bus(temp_machine, MACHINE_BUS_ISA) && temp_GAMEBLASTER);
-            settings_enable_window(hdlg, IDC_CHECK_GUS, machine_has_bus(temp_machine, MACHINE_BUS_ISA16));
-            settings_set_check(hdlg, IDC_CHECK_GUS, temp_GUS);
-            settings_enable_window(hdlg, IDC_CONFIGURE_GUS, machine_has_bus(temp_machine, MACHINE_BUS_ISA16) && temp_GUS);
-            settings_enable_window(hdlg, IDC_CHECK_SSI, machine_has_bus(temp_machine, MACHINE_BUS_ISA));
-            settings_set_check(hdlg, IDC_CHECK_SSI, temp_SSI2001);
-            settings_enable_window(hdlg, IDC_CONFIGURE_SSI, machine_has_bus(temp_machine, MACHINE_BUS_ISA) && temp_SSI2001);
            settings_set_check(hdlg, IDC_CHECK_FLOAT, temp_float);

            if (temp_fm_driver == FM_DRV_YMFM)
@@ -1466,17 +1617,56 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)

        case WM_COMMAND:
            switch (LOWORD(wParam)) {
-                case IDC_COMBO_SOUND:
-                    temp_sound_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)];
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SND, sound_card_has_config(temp_sound_card));
+                case IDC_COMBO_SOUND1:
+                    temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_SND1, sound_card_has_config(temp_sound_card[0]));
                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
                    break;

-                case IDC_CONFIGURE_SND:
-                    temp_sound_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card));
+                case IDC_CONFIGURE_SND1:
+                    temp_sound_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[0]));
+                    break;
+
+                case IDC_COMBO_SOUND2:
+                    temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_SND2, sound_card_has_config(temp_sound_card[1]));
+                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
+                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
+                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
+                    break;
+
+                case IDC_CONFIGURE_SND2:
+                    temp_sound_card[1] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[1]));
+                    break;
+
+                case IDC_COMBO_SOUND3:
+                    temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_SND3, sound_card_has_config(temp_sound_card[2]));
+                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
+                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
+                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
+                    break;
+
+                case IDC_CONFIGURE_SND3:
+                    temp_sound_card[2] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[2]));
+                    break;
+
+                case IDC_COMBO_SOUND4:
+                    temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
+                    settings_enable_window(hdlg, IDC_CONFIGURE_SND4, sound_card_has_config(temp_sound_card[3]));
+                    settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
+                    settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
+                    settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
+                    break;
+
+                case IDC_CONFIGURE_SND4:
+                    temp_sound_card[3] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) sound_card_getdevice(temp_sound_card[3]));
                    break;

                case IDC_COMBO_MIDI_OUT:
@@ -1514,46 +1704,17 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                case IDC_CONFIGURE_MPU401:
                    temp_deviceconfig |= deviceconfig_open(hdlg, machine_has_bus(temp_machine, MACHINE_BUS_MCA) ? (void *) &mpu401_mca_device : (void *) &mpu401_device);
                    break;
-
-                case IDC_CHECK_CMS:
-                    temp_GAMEBLASTER = settings_get_check(hdlg, IDC_CHECK_CMS);
-
-                    settings_enable_window(hdlg, IDC_CONFIGURE_CMS, temp_GAMEBLASTER);
-                    break;
-
-                case IDC_CONFIGURE_CMS:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, &cms_device);
-                    break;
-
-                case IDC_CHECK_GUS:
-                    temp_GUS = settings_get_check(hdlg, IDC_CHECK_GUS);
-                    settings_enable_window(hdlg, IDC_CONFIGURE_GUS, temp_GUS);
-                    break;
-
-                case IDC_CONFIGURE_GUS:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) &gus_device);
-                    break;
-
-                case IDC_CHECK_SSI:
-                    temp_SSI2001 = settings_get_check(hdlg, IDC_CHECK_SSI);
-
-                    settings_enable_window(hdlg, IDC_CONFIGURE_SSI, temp_SSI2001);
-                    break;
-
-                case IDC_CONFIGURE_SSI:
-                    temp_deviceconfig |= deviceconfig_open(hdlg, &ssi2001_device);
-                    break;
            }
            return FALSE;

        case WM_SAVESETTINGS:
-            temp_sound_card         = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)];
+            temp_sound_card[0]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND1)];
+            temp_sound_card[1]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND2)];
+            temp_sound_card[2]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND3)];
+            temp_sound_card[3]      = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND4)];
            temp_midi_output_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)];
            temp_midi_input_device  = settings_list_to_midi_in[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_IN)];
            temp_mpu401             = settings_get_check(hdlg, IDC_CHECK_MPU401);
-            temp_GAMEBLASTER        = settings_get_check(hdlg, IDC_CHECK_CMS);
-            temp_GUS                = settings_get_check(hdlg, IDC_CHECK_GUS);
-            temp_SSI2001            = settings_get_check(hdlg, IDC_CHECK_SSI);
            temp_float              = settings_get_check(hdlg, IDC_CHECK_FLOAT);
            if (settings_get_check(hdlg, IDC_RADIO_FM_DRV_NUKED))
                temp_fm_driver = FM_DRV_NUKED;
@@ -1849,10 +2010,16 @@ network_recalc_combos(HWND hdlg)
 {
    ignore_change = 1;

-    settings_enable_window(hdlg, IDC_COMBO_PCAP, temp_net_type == NET_TYPE_PCAP);
-    settings_enable_window(hdlg, IDC_COMBO_NET,
-                           (temp_net_type == NET_TYPE_SLIRP) || ((temp_net_type == NET_TYPE_PCAP) && (network_dev_to_id(temp_pcap_dev) > 0)));
-    settings_enable_window(hdlg, IDC_CONFIGURE_NET, network_card_has_config(temp_net_card) && ((temp_net_type == NET_TYPE_SLIRP) || ((temp_net_type == NET_TYPE_PCAP) && (network_dev_to_id(temp_pcap_dev) > 0))));
+#if 0
+    for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
+#endif
+        settings_enable_window(hdlg, IDC_COMBO_PCAP1, temp_net_type[0] == NET_TYPE_PCAP);
+        settings_enable_window(hdlg, IDC_COMBO_NET1,
+                               (temp_net_type[0] == NET_TYPE_SLIRP) || ((temp_net_type[0] == NET_TYPE_PCAP) && (network_dev_to_id(temp_pcap_dev[0]) > 0)));
+        settings_enable_window(hdlg, IDC_CONFIGURE_NET1, network_card_has_config(temp_net_card[0]) && ((temp_net_type[0] == NET_TYPE_SLIRP) || ((temp_net_type[0] == NET_TYPE_PCAP) && (network_dev_to_id(temp_pcap_dev[0]) > 0))));
+#if 0
+    }
+#endif

    ignore_change = 0;
 }
@@ -1871,90 +2038,120 @@ win_settings_network_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
        case WM_INITDIALOG:
            lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));

-            settings_add_string(hdlg, IDC_COMBO_NET_TYPE, (LPARAM) L"None");
-            settings_add_string(hdlg, IDC_COMBO_NET_TYPE, (LPARAM) L"SLiRP");
-            settings_add_string(hdlg, IDC_COMBO_NET_TYPE, (LPARAM) L"PCap");
-            settings_set_cur_sel(hdlg, IDC_COMBO_NET_TYPE, temp_net_type);
-            settings_enable_window(hdlg, IDC_COMBO_PCAP, temp_net_type == NET_TYPE_PCAP);
+#if 0
+            for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
+#endif
+                settings_add_string(hdlg, IDC_COMBO_NET1_TYPE, (LPARAM) L"None");
+                settings_add_string(hdlg, IDC_COMBO_NET1_TYPE, (LPARAM) L"SLiRP");
+                settings_add_string(hdlg, IDC_COMBO_NET1_TYPE, (LPARAM) L"PCap");
+                settings_set_cur_sel(hdlg, IDC_COMBO_NET1_TYPE, temp_net_type[0]);
+                settings_enable_window(hdlg, IDC_COMBO_PCAP1, temp_net_type[0] == NET_TYPE_PCAP);

-            for (c = 0; c < network_ndev; c++) {
-                mbstowcs(lptsTemp, network_devs[c].description, strlen(network_devs[c].description) + 1);
-                settings_add_string(hdlg, IDC_COMBO_PCAP, (LPARAM) lptsTemp);
-            }
-            settings_set_cur_sel(hdlg, IDC_COMBO_PCAP, network_dev_to_id(temp_pcap_dev));
+                for (c = 0; c < network_ndev; c++) {
+                    mbstowcs(lptsTemp, network_devs[c].description, strlen(network_devs[c].description) + 1);
+                    settings_add_string(hdlg, IDC_COMBO_PCAP1, (LPARAM) lptsTemp);
+                }
+                settings_set_cur_sel(hdlg, IDC_COMBO_PCAP1, network_dev_to_id(temp_pcap_dev[0]));

-            /* NIC config */
-            c = d = 0;
-            settings_reset_content(hdlg, IDC_COMBO_NET);
-            while (1) {
-                generate_device_name(network_card_getdevice(c), network_card_get_internal_name(c), 1);
+                /* NIC config */
+                c = d = 0;
+                settings_reset_content(hdlg, IDC_COMBO_NET1);
+                while (1) {
+                    generate_device_name(network_card_getdevice(c), network_card_get_internal_name(c), 1);

-                if (device_name[0] == L'\0')
-                    break;
+                    if (device_name[0] == L'\0')
+                        break;

-                if (network_card_available(c) && device_is_valid(network_card_getdevice(c), temp_machine)) {
-                    if (c == 0)
-                        settings_add_string(hdlg, IDC_COMBO_NET, win_get_string(IDS_2104));
-                    else
-                        settings_add_string(hdlg, IDC_COMBO_NET, (LPARAM) device_name);
-                    settings_list_to_device[0][d] = c;
-                    if ((c == 0) || (c == temp_net_card))
-                        settings_set_cur_sel(hdlg, IDC_COMBO_NET, d);
-                    d++;
+                    if (network_card_available(c) && device_is_valid(network_card_getdevice(c), temp_machine)) {
+                        if (c == 0)
+                            settings_add_string(hdlg, IDC_COMBO_NET1, win_get_string(IDS_2104));
+                        else
+                            settings_add_string(hdlg, IDC_COMBO_NET1, (LPARAM) device_name);
+                        settings_list_to_device[0][d] = c;
+                        if ((c == 0) || (c == temp_net_card[0]))
+                            settings_set_cur_sel(hdlg, IDC_COMBO_NET1, d);
+                        d++;
+                    }
+
+                    c++;
                }

-                c++;
+                settings_enable_window(hdlg, IDC_COMBO_NET1, d);
+                network_recalc_combos(hdlg);
+                free(lptsTemp);
+#if 0
            }
-
-            settings_enable_window(hdlg, IDC_COMBO_NET, d);
-            network_recalc_combos(hdlg);
-            free(lptsTemp);
-
+#endif
            return TRUE;

        case WM_COMMAND:
            switch (LOWORD(wParam)) {
-                case IDC_COMBO_NET_TYPE:
+                case IDC_COMBO_NET1_TYPE:
+#if 0
+                case IDC_COMBO_NET2_TYPE:
+                case IDC_COMBO_NET3_TYPE:
+                case IDC_COMBO_NET4_TYPE:
+#endif
                    if (ignore_change)
                        return FALSE;

-                    temp_net_type = settings_get_cur_sel(hdlg, IDC_COMBO_NET_TYPE);
+                    temp_net_type[0] = settings_get_cur_sel(hdlg, IDC_COMBO_NET1_TYPE);
                    network_recalc_combos(hdlg);
                    break;

-                case IDC_COMBO_PCAP:
+                case IDC_COMBO_PCAP1:
+#if 0
+                case IDC_COMBO_PCAP2:
+                case IDC_COMBO_PCAP3:
+                case IDC_COMBO_PCAP4:
+#endif
                    if (ignore_change)
                        return FALSE;

-                    memset(temp_pcap_dev, '\0', sizeof(temp_pcap_dev));
-                    strcpy(temp_pcap_dev, network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP)].device);
+                    memset(temp_pcap_dev[0], '\0', sizeof(temp_pcap_dev[0]));
+                    strcpy(temp_pcap_dev[0], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP1)].device);
                    network_recalc_combos(hdlg);
                    break;

-                case IDC_COMBO_NET:
+                case IDC_COMBO_NET1:
+#if 0
+                case IDC_COMBO_NET2:
+                case IDC_COMBO_NET3:
+                case IDC_COMBO_NET4:
+#endif
                    if (ignore_change)
                        return FALSE;

-                    temp_net_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET)];
+                    temp_net_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET1)];
                    network_recalc_combos(hdlg);
                    break;

-                case IDC_CONFIGURE_NET:
+                case IDC_CONFIGURE_NET1:
+#if 0
+                case IDC_CONFIGURE_NET2:
+                case IDC_CONFIGURE_NET3:
+                case IDC_CONFIGURE_NET4:
+#endif
                    if (ignore_change)
                        return FALSE;

-                    temp_net_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) network_card_getdevice(temp_net_card));
+                    temp_net_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET1)];
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) network_card_getdevice(temp_net_card[0]));
                    break;
            }
            return FALSE;

        case WM_SAVESETTINGS:
-            temp_net_type = settings_get_cur_sel(hdlg, IDC_COMBO_NET_TYPE);
-            memset(temp_pcap_dev, '\0', sizeof(temp_pcap_dev));
-            strcpy(temp_pcap_dev, network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP)].device);
-            temp_net_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET)];
-
+#if 0
+            for (uint8_t i = 0; i < NET_CARD_MAX; i++) {
+#endif
+                temp_net_type[0] = settings_get_cur_sel(hdlg, IDC_COMBO_NET1_TYPE);
+                memset(temp_pcap_dev[0], '\0', sizeof(temp_pcap_dev[0]));
+                strcpy(temp_pcap_dev[0], network_devs[settings_get_cur_sel(hdlg, IDC_COMBO_PCAP1)].device);
+                temp_net_card[0] = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_NET1)];
+#if 0
+            }
+#endif
        default:
            return FALSE;
    }
--- a/src/win/win_specify_dim.c
+++ b/src/win/win_specify_dim.c
@@ -130,6 +130,12 @@ SpecifyDimensionsDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM
                    EnableMenuItem(hmenu, IDM_VID_SCALE_2X, vid_resize ? MF_GRAYED : MF_ENABLED);
                    EnableMenuItem(hmenu, IDM_VID_SCALE_3X, vid_resize ? MF_GRAYED : MF_ENABLED);
                    EnableMenuItem(hmenu, IDM_VID_SCALE_4X, vid_resize ? MF_GRAYED : MF_ENABLED);
+                    EnableMenuItem(hmenu, IDM_VID_SCALE_5X, vid_resize ? MF_GRAYED : MF_ENABLED);
+                    EnableMenuItem(hmenu, IDM_VID_SCALE_6X, vid_resize ? MF_GRAYED : MF_ENABLED);
+                    EnableMenuItem(hmenu, IDM_VID_SCALE_7X, vid_resize ? MF_GRAYED : MF_ENABLED);
+                    EnableMenuItem(hmenu, IDM_VID_SCALE_8X, vid_resize ? MF_GRAYED : MF_ENABLED);
+                    EnableMenuItem(hmenu, IDM_VID_SCALE_9X, vid_resize ? MF_GRAYED : MF_ENABLED);
+                    EnableMenuItem(hmenu, IDM_VID_SCALE_10X, vid_resize ? MF_GRAYED : MF_ENABLED);

                    scrnsz_x = fixed_size_x;
                    scrnsz_y = fixed_size_y;
--- a/src/win/win_thread.c
+++ b/src/win/win_thread.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Fred N. van Kempen, <decwiz@yahoo.com>
 *
 *          Copyright 2008-2018 Sarah Walker.
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -10,7 +10,7 @@
 *
 *
 *
- * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
+ * Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
 *          Miran Grca, <mgrca8@gmail.com>
 *          Fred N. van Kempen, <decwiz@yahoo.com>
 *
@@ -44,7 +44,9 @@
 #include <86box/ui.h>
 #include <86box/win.h>
 #include <86box/version.h>
-#include <86box/discord.h>
+#ifdef DISCORD
+#   include <86box/discord.h>
+#endif

 #ifdef MTR_ENABLED
 #    include <minitrace/minitrace.h>
@@ -276,6 +278,12 @@ ResetAllMenus(void)
    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 1, MF_UNCHECKED);
    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 2, MF_UNCHECKED);
    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 3, MF_UNCHECKED);
+    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 4, MF_UNCHECKED);
+    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 5, MF_UNCHECKED);
+    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 6, MF_UNCHECKED);
+    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 7, MF_UNCHECKED);
+    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 8, MF_UNCHECKED);
+    CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 9, MF_UNCHECKED);
    CheckMenuItem(menuMain, IDM_VID_HIDPI, MF_UNCHECKED);

    CheckMenuItem(menuMain, IDM_VID_CGACON, MF_UNCHECKED);
@@ -316,10 +324,13 @@ ResetAllMenus(void)

    video_set_filter_menu(menuMain);

+#ifdef DISCORD
    if (discord_loaded)
        CheckMenuItem(menuMain, IDM_DISCORD, enable_discord ? MF_CHECKED : MF_UNCHECKED);
    else
        EnableMenuItem(menuMain, IDM_DISCORD, MF_DISABLED);
+#endif
+
 #ifdef MTR_ENABLED
    EnableMenuItem(menuMain, IDM_ACTION_END_TRACE, MF_DISABLED);
 #endif
@@ -820,6 +831,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                    config_save();
                    break;

+#ifdef DISCORD
                case IDM_DISCORD:
                    if (!discord_loaded)
                        break;
@@ -831,6 +843,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                    } else
                        discord_close();
                    break;
+#endif

                default:
                    media_menu_proc(hwnd, message, wParam, lParam);
@@ -1212,6 +1225,7 @@ ui_init(int nCmdShow)
        return (0);
    }

+#ifdef DISCORD
    if (!discord_load()) {
        enable_discord = 0;
    } else if (enable_discord) {
@@ -1221,6 +1235,7 @@ ui_init(int nCmdShow)
        /* Update Discord status */
        discord_update_activity(dopause);
    }
+#endif

    /* Create our main window's class and register it. */
    wincl.hInstance     = hinstance;
@@ -1451,9 +1466,11 @@ ui_init(int nCmdShow)
            plat_setfullscreen(0);
        }

+#ifdef DISCORD
        /* Run Discord API callbacks */
        if (enable_discord)
            discord_run_callbacks();
+#endif
    }

    timeEndPeriod(1);
@@ -1471,8 +1488,10 @@ ui_init(int nCmdShow)

    win_mouse_close();

+#ifdef DISCORD
    /* Shut down the Discord integration */
    discord_close();
+#endif

    if (user32_handle != NULL)
        dynld_close(user32_handle);
@@ -1521,9 +1540,11 @@ plat_pause(int p)
    CheckMenuItem(menuMain, IDM_ACTION_PAUSE,
                  (dopause) ? MF_CHECKED : MF_UNCHECKED);

+#ifdef DISCORD
    /* Update Discord status */
    if (enable_discord)
        discord_update_activity(dopause);
+#endif

    /* Update the toolbar */
    ToolBarUpdatePause(p);