From afdb2b164444ac7ad2838ea4b1f4ddaee78886b7 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 18:55:12 -0500 Subject: [PATCH 01/18] Fix more cases of hardcoding where we had a macro --- src/include/86box/lpt.h | 4 +++- src/lpt.c | 12 ++++++------ src/win/win_settings.c | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h index 109de58ba..dd241c064 100644 --- a/src/include/86box/lpt.h +++ b/src/include/86box/lpt.h @@ -24,9 +24,11 @@ extern void lpt1_remove_ams(void); #define lpt1_init(a) lpt_port_init(0, a) #define lpt1_irq(a) lpt_port_irq(0, a) #define lpt1_remove() lpt_port_remove(0) + #define lpt2_init(a) lpt_port_init(1, a) #define lpt2_irq(a) lpt_port_irq(1, a) #define lpt2_remove() lpt_port_remove(1) + #define lpt3_init(a) lpt_port_init(2, a) #define lpt3_irq(a) lpt_port_irq(2, a) #define lpt3_remove() lpt_port_remove(2) @@ -45,7 +47,7 @@ typedef struct { void * priv; } lpt_port_t; -extern lpt_port_t lpt_ports[3]; +extern lpt_port_t lpt_ports[PARALLEL_MAX]; extern void lpt_write(uint16_t port, uint8_t val, void *priv); extern uint8_t lpt_read(uint16_t port, void *priv); diff --git a/src/lpt.c b/src/lpt.c index d528c2911..e85156fdb 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -14,7 +14,7 @@ #include <86box/net_plip.h> -lpt_port_t lpt_ports[3]; +lpt_port_t lpt_ports[PARALLEL_MAX]; static const struct { @@ -74,7 +74,7 @@ lpt_devices_init(void) { int i = 0; - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].dt = (lpt_device_t *) lpt_devices[lpt_ports[i].device].device; if (lpt_ports[i].dt) @@ -89,7 +89,7 @@ lpt_devices_close(void) int i = 0; lpt_port_t *dev; - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { dev = &lpt_ports[i]; if (dev->dt) @@ -176,10 +176,10 @@ void lpt_init(void) { int i; - uint16_t default_ports[3] = { 0x378, 0x278, 0x3bc }; - uint8_t default_irqs[3] = { 7, 5, 7 }; + uint16_t default_ports[PARALLEL_MAX] = { 0x378, 0x278, 0x3bc }; + uint8_t default_irqs[PARALLEL_MAX] = { 7, 5, 7 }; - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].addr = 0xffff; lpt_ports[i].irq = 0xff; lpt_ports[i].enable_irq = 0x10; diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 2f2324e2e..3511277ef 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -99,8 +99,8 @@ static int temp_net_type, temp_net_card; static char temp_pcap_dev[522]; /* Ports category */ -static int temp_lpt_devices[3]; -static int temp_serial[4], temp_lpt[3]; +static int temp_lpt_devices[PARALLEL_MAX]; +static int temp_serial[SERIAL_MAX], temp_lpt[PARALLEL_MAX]; /* Other peripherals category */ static int temp_fdc_card, temp_hdc, temp_ide_ter, temp_ide_qua, temp_cassette; @@ -357,11 +357,11 @@ win_settings_init(void) temp_net_card = network_card; /* Ports category */ - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { temp_lpt_devices[i] = lpt_ports[i].device; temp_lpt[i] = lpt_ports[i].enabled; } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) temp_serial[i] = serial_enabled[i]; /* Storage devices category */ @@ -477,11 +477,11 @@ win_settings_changed(void) i = i || (network_card != temp_net_card); /* Ports category */ - for (j = 0; j < 3; j++) { + for (j = 0; j < PARALLEL_MAX; j++) { i = i || (temp_lpt_devices[j] != lpt_ports[j].device); i = i || (temp_lpt[j] != lpt_ports[j].enabled); } - for (j = 0; j < 4; j++) + for (j = 0; j < SERIAL_MAX; j++) i = i || (temp_serial[j] != serial_enabled[j]); /* Storage devices category */ @@ -568,11 +568,11 @@ win_settings_save(void) network_card = temp_net_card; /* Ports category */ - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].device = temp_lpt_devices[i]; lpt_ports[i].enabled = temp_lpt[i]; } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) serial_enabled[i] = temp_serial[i]; /* Storage devices category */ @@ -1504,7 +1504,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG: lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { c = 0; while (1) { s = lpt_device_get_name(c); @@ -1527,7 +1527,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) settings_enable_window(hdlg, IDC_COMBO_LPT1 + i, temp_lpt[i]); } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) settings_set_check(hdlg, IDC_CHECK_SERIAL1 + i, temp_serial[i]); free(lptsTemp); @@ -1547,12 +1547,12 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_SAVESETTINGS: - for (i = 0; i < 3; i++) { + for (i = 0; i < PARALLEL_MAX; i++) { temp_lpt_devices[i] = settings_get_cur_sel(hdlg, IDC_COMBO_LPT1 + i); temp_lpt[i] = settings_get_check(hdlg, IDC_CHECK_PARALLEL1 + i); } - for (i = 0; i < 4; i++) + for (i = 0; i < SERIAL_MAX; i++) temp_serial[i] = settings_get_check(hdlg, IDC_CHECK_SERIAL1 + i); default: From 9ffa688c1398b176e288067698c8314205efd403 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 18:55:29 -0500 Subject: [PATCH 02/18] widen so things like "recieve input" actually fit --- src/win/win_devconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/win_devconf.c b/src/win/win_devconf.c index 4f4ddc639..c4de7d90b 100644 --- a/src/win/win_devconf.c +++ b/src/win/win_devconf.c @@ -471,7 +471,7 @@ deviceconfig_inst_open(HWND hwnd, const device_t *device, int inst) item->y = y; item->id = id++; - item->cx = 80; + item->cx = 100; item->cy = 15; item->style = WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX; From e1c845e39354f7d55360a70c25fe3d70f1829ec2 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 19:15:27 -0500 Subject: [PATCH 03/18] LPT4 was a thing in the pre PS/2 era --- src/include/86box/86box.h | 2 +- src/include/86box/lpt.h | 14 +++++++++++ src/include/86box/resource.h | 45 ++++++++++++++++++------------------ src/lpt.c | 4 ++-- src/win/languages/cs-CZ.rc | 8 ++++--- src/win/languages/de-DE.rc | 8 ++++--- src/win/languages/dialogs.rc | 22 ++++++++++++------ src/win/languages/en-GB.rc | 2 ++ src/win/languages/en-US.rc | 2 ++ src/win/languages/es-ES.rc | 2 ++ src/win/languages/fi-FI.rc | 2 ++ src/win/languages/fr-FR.rc | 2 ++ src/win/languages/hr-HR.rc | 2 ++ src/win/languages/hu-HU.rc | 4 ++++ src/win/languages/it-IT.rc | 5 +++- src/win/languages/ja-JP.rc | 2 ++ src/win/languages/ko-KR.rc | 2 ++ src/win/languages/pt-BR.rc | 2 ++ src/win/languages/pt-PT.rc | 2 ++ src/win/languages/ru-RU.rc | 2 ++ src/win/languages/sl-SI.rc | 2 ++ src/win/languages/tr-TR.rc | 2 ++ src/win/languages/zh-CN.rc | 2 ++ 23 files changed, 101 insertions(+), 39 deletions(-) diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h index af4a6a962..0947ceb66 100644 --- a/src/include/86box/86box.h +++ b/src/include/86box/86box.h @@ -23,7 +23,7 @@ /* Configuration values. */ #define SERIAL_MAX 4 -#define PARALLEL_MAX 3 +#define PARALLEL_MAX 4 #define SCREEN_RES_X 640 #define SCREEN_RES_Y 480 diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h index dd241c064..ae1a63388 100644 --- a/src/include/86box/lpt.h +++ b/src/include/86box/lpt.h @@ -33,6 +33,20 @@ extern void lpt1_remove_ams(void); #define lpt3_irq(a) lpt_port_irq(2, a) #define lpt3_remove() lpt_port_remove(2) +#define lpt4_init(a) lpt_port_init(3, a) +#define lpt4_irq(a) lpt_port_irq(3, a) +#define lpt4_remove() lpt_port_remove(3) + +/* +#define lpt5_init(a) lpt_port_init(4, a) +#define lpt5_irq(a) lpt_port_irq(4, a) +#define lpt5_remove() lpt_port_remove(4) + +#define lpt6_init(a) lpt_port_init(5, a) +#define lpt6_irq(a) lpt_port_irq(5, a) +#define lpt6_remove() lpt_port_remove(5) +*/ + void lpt_devices_init(void); void lpt_devices_close(void); diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index f35be6465..53f18a223 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -170,31 +170,32 @@ #define IDC_COMBO_LPT1 1070 /* ports config */ #define IDC_COMBO_LPT2 1071 #define IDC_COMBO_LPT3 1072 -#define IDC_CHECK_SERIAL1 1073 -#define IDC_CHECK_SERIAL2 1074 -#define IDC_CHECK_SERIAL3 1075 -#define IDC_CHECK_SERIAL4 1076 -#define IDC_CHECK_PARALLEL1 1077 +#define IDC_COMBO_LPT4 1073 +#define IDC_CHECK_SERIAL1 1074 +#define IDC_CHECK_SERIAL2 1075 +#define IDC_CHECK_SERIAL3 1076 +#define IDC_CHECK_SERIAL4 1077 +#define IDC_CHECK_PARALLEL1 1078 #define IDC_CHECK_PARALLEL2 1078 -#define IDC_CHECK_PARALLEL3 1079 +#define IDC_CHECK_PARALLEL3 1080 -#define IDC_OTHER_PERIPH 1080 /* storage controllers config */ -#define IDC_COMBO_HDC 1081 -#define IDC_CONFIGURE_HDC 1082 -#define IDC_CHECK_IDE_TER 1083 -#define IDC_BUTTON_IDE_TER 1084 -#define IDC_CHECK_IDE_QUA 1085 -#define IDC_BUTTON_IDE_QUA 1086 -#define IDC_GROUP_SCSI 1087 +#define IDC_OTHER_PERIPH 1081 /* storage controllers config */ +#define IDC_COMBO_HDC 1082 +#define IDC_CONFIGURE_HDC 1083 +#define IDC_CHECK_IDE_TER 1084 +#define IDC_BUTTON_IDE_TER 1085 +#define IDC_CHECK_IDE_QUA 1086 +#define IDC_BUTTON_IDE_QUA 1087 +#define IDC_GROUP_SCSI 1088 #define IDC_COMBO_SCSI_1 1088 -#define IDC_COMBO_SCSI_2 1089 -#define IDC_COMBO_SCSI_3 1090 -#define IDC_COMBO_SCSI_4 1091 -#define IDC_CONFIGURE_SCSI_1 1092 -#define IDC_CONFIGURE_SCSI_2 1093 -#define IDC_CONFIGURE_SCSI_3 1094 -#define IDC_CONFIGURE_SCSI_4 1095 -#define IDC_CHECK_CASSETTE 1096 +#define IDC_COMBO_SCSI_2 1090 +#define IDC_COMBO_SCSI_3 1091 +#define IDC_COMBO_SCSI_4 1092 +#define IDC_CONFIGURE_SCSI_1 1093 +#define IDC_CONFIGURE_SCSI_2 1094 +#define IDC_CONFIGURE_SCSI_3 1095 +#define IDC_CONFIGURE_SCSI_4 1096 +#define IDC_CHECK_CASSETTE 1097 #define IDC_HARD_DISKS 1100 /* hard disks config */ #define IDC_LIST_HARD_DISKS 1101 diff --git a/src/lpt.c b/src/lpt.c index e85156fdb..e2cb6ad5e 100644 --- a/src/lpt.c +++ b/src/lpt.c @@ -176,8 +176,8 @@ void lpt_init(void) { int i; - uint16_t default_ports[PARALLEL_MAX] = { 0x378, 0x278, 0x3bc }; - uint8_t default_irqs[PARALLEL_MAX] = { 7, 5, 7 }; + uint16_t default_ports[PARALLEL_MAX] = { 0x378, 0x278, 0x3bc, 0x268 }; /*, 0x27c, 0x26c }; */ + uint8_t default_irqs[PARALLEL_MAX] = { 7, 5, 7, 5 }; /* , 7, 5 }; */ for (i = 0; i < PARALLEL_MAX; i++) { lpt_ports[i].addr = 0xffff; diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index f9b128819..f6a4f2e52 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -329,9 +329,10 @@ END #define STR_PCAP "PCap zařízení:" #define STR_NET "Síťový adaptér:" -#define STR_LPT1 "Zařízení na LPT1" -#define STR_LPT2 "Zařízení na LPT2" -#define STR_LPT3 "Zařízení na LPT3" +#define STR_LPT1 "Zařízení na LPT1:" +#define STR_LPT2 "Zařízení na LPT2:" +#define STR_LPT3 "Zařízení na LPT3:" +#define STR_LPT4 "Zařízení na LPT4:" #define STR_SERIAL1 "Povolit port COM1" #define STR_SERIAL2 "Povolit port COM2" #define STR_SERIAL3 "Povolit port COM3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Povolit port LPT1" #define STR_PARALLEL2 "Povolit port LPT2" #define STR_PARALLEL3 "Povolit port LPT3" +#define STR_PARALLEL4 "Povolit port LPT4" #define STR_HDC "Řadič disku:" #define STR_FDC "Disketový řadič:" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 9a89beb24..0ec0034fc 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -329,9 +329,10 @@ END #define STR_PCAP "PCap-Gerät:" #define STR_NET "Netzwerkadapter:" -#define STR_LPT1 "LPT1-Gerät" -#define STR_LPT2 "LPT2-Gerät" -#define STR_LPT3 "LPT3-Gerät" +#define STR_LPT1 "LPT1-Gerät:" +#define STR_LPT2 "LPT2-Gerät:" +#define STR_LPT3 "LPT3-Gerät:" +#define STR_LPT4 "LPT4-Gerät:" #define STR_SERIAL1 "Serielle Schnittstelle 1" #define STR_SERIAL2 "Serielle Schnittstelle 2" #define STR_SERIAL3 "Serielle Schnittstelle 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Parallelport 1" #define STR_PARALLEL2 "Parallelport 2" #define STR_PARALLEL3 "Parallelport 3" +#define STR_PARALLEL4 "Parallelport 4" #define STR_HDC "HDD-Controller:" #define STR_FDC "FD-Controller:" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 9f4211aa0..7cf466240 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -225,21 +225,27 @@ BEGIN COMBOBOX IDC_COMBO_LPT3,71,45,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT STR_LPT4,IDT_1720,7,66,61,10 + COMBOBOX IDC_COMBO_LPT4,71,64,189,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + CONTROL STR_SERIAL1,IDC_CHECK_SERIAL1,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,64,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,94,10 CONTROL STR_SERIAL2,IDC_CHECK_SERIAL2,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,147,64,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,147,83,94,10 CONTROL STR_SERIAL3,IDC_CHECK_SERIAL3,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,82,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,101,94,10 CONTROL STR_SERIAL4,IDC_CHECK_SERIAL4,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,147,82,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,147,101,94,10 CONTROL STR_PARALLEL1,IDC_CHECK_PARALLEL1,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,100,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,119,94,10 CONTROL STR_PARALLEL2,IDC_CHECK_PARALLEL2,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,147,100,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,147,119,94,10 CONTROL STR_PARALLEL3,IDC_CHECK_PARALLEL3,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,118,94,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,137,94,10 + CONTROL STR_PARALLEL4,IDC_CHECK_PARALLEL4,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,147,137,94,10 END DLG_CFG_STORAGE DIALOG DISCARDABLE 107, 0, 267, 203 @@ -525,6 +531,7 @@ END #undef STR_LPT1 #undef STR_LPT2 #undef STR_LPT3 +#undef STR_LPT4 #undef STR_SERIAL1 #undef STR_SERIAL2 #undef STR_SERIAL3 @@ -532,6 +539,7 @@ END #undef STR_PARALLEL1 #undef STR_PARALLEL2 #undef STR_PARALLEL3 +#undef STR_PARALLEL4 #undef STR_HDC #undef STR_FDC diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 936a05e17..7989bd019 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1 Device:" #define STR_LPT2 "LPT2 Device:" #define STR_LPT3 "LPT3 Device:" +#define STR_LPT4 "LPT4 Device:" #define STR_SERIAL1 "Serial port 1" #define STR_SERIAL2 "Serial port 2" #define STR_SERIAL3 "Serial port 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Parallel port 1" #define STR_PARALLEL2 "Parallel port 2" #define STR_PARALLEL3 "Parallel port 3" +#define STR_PARALLEL4 "Parallel port 4" #define STR_HDC "HD Controller:" #define STR_FDC "FD Controller:" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index 0266397a4..123684d5e 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1 Device:" #define STR_LPT2 "LPT2 Device:" #define STR_LPT3 "LPT3 Device:" +#define STR_LPT4 "LPT4 Device:" #define STR_SERIAL1 "Serial port 1" #define STR_SERIAL2 "Serial port 2" #define STR_SERIAL3 "Serial port 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Parallel port 1" #define STR_PARALLEL2 "Parallel port 2" #define STR_PARALLEL3 "Parallel port 3" +#define STR_PARALLEL4 "Parallel port 4" #define STR_HDC "HD Controller:" #define STR_FDC "FD Controller:" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 52cb60c6b..38cac4aa7 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" +#define STR_LPT4 "Dispositivo LPT4:" #define STR_SERIAL1 "Puerto serie 1" #define STR_SERIAL2 "Puerto serie 2" #define STR_SERIAL3 "Puerto serie 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Puerto paralelo 1" #define STR_PARALLEL2 "Puerto paralelo 2" #define STR_PARALLEL3 "Puerto paralelo 3" +#define STR_PARALLEL4 "Puerto paralelo 4" #define STR_HDC "Controladora HD:" #define STR_FDC "Controladora FD:" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index 5513977af..f18453563 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1-laite:" #define STR_LPT2 "LPT2-laite:" #define STR_LPT3 "LPT3-laite:" +#define STR_LPT4 "LPT4-laite:" #define STR_SERIAL1 "Sarjaportti 1" #define STR_SERIAL2 "Sarjaportti 2" #define STR_SERIAL3 "Sarjaportti 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Rinnakkaisportti 1" #define STR_PARALLEL2 "Rinnakkaisportti 2" #define STR_PARALLEL3 "Rinnakkaisportti 3" +#define STR_PARALLEL4 "Rinnakkaisportti 4" #define STR_HDC "Kiintolevyohjain:" #define STR_FDC "Levykeohjain:" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 460283b0d..35a241d1b 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Dispositif LPT1:" #define STR_LPT2 "Dispositif LPT2:" #define STR_LPT3 "Dispositif LPT3:" +#define STR_LPT4 "Dispositif LPT4:" #define STR_SERIAL1 "Port série 1" #define STR_SERIAL2 "Port série 2" #define STR_SERIAL3 "Port série 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Port parallèle 1" #define STR_PARALLEL2 "Port parallèle 2" #define STR_PARALLEL3 "Port parallèle 3" +#define STR_PARALLEL4 "Port parallèle 4" #define STR_HDC "Contrôleur HD:" #define STR_FDC "Contrôleur FD:" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 575d0ba1d..6386cd0bc 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Uređaj LPT1:" #define STR_LPT2 "Uređaj LPT2:" #define STR_LPT3 "Uređaj LPT3:" +#define STR_LPT4 "Uređaj LPT4:" #define STR_SERIAL1 "Serijska vrata 1" #define STR_SERIAL2 "Serijska vrata 2" #define STR_SERIAL3 "Serijska vrata 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Paralelna vrata 1" #define STR_PARALLEL2 "Paralelna vrata 2" #define STR_PARALLEL3 "Paralelna vrata 3" +#define STR_PARALLEL4 "Paralelna vrata 4" #define STR_HDC "Kontroler tvrdog diska:" #define STR_FDC "Kontroler diskete:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index ae7e51924..a8cc39aee 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -11,6 +11,8 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT #pragma code_page(65001) #endif //_WIN32 +#define AUTHORS + ///////////////////////////////////////////////////////////////////////////// // // Menu @@ -335,6 +337,7 @@ END #define STR_LPT1 "LPT1 eszköz:" #define STR_LPT2 "LPT2 eszköz:" #define STR_LPT3 "LPT3 eszköz:" +#define STR_LPT4 "LPT4 eszköz:" #define STR_SERIAL1 "Soros port 1" #define STR_SERIAL2 "Soros port 2" #define STR_SERIAL3 "Soros port 3" @@ -342,6 +345,7 @@ END #define STR_PARALLEL1 "Párhuzamos port 1" #define STR_PARALLEL2 "Párhuzamos port 2" #define STR_PARALLEL3 "Párhuzamos port 3" +#define STR_PARALLEL4 "Párhuzamos port 4" #define STR_HDC "Merevl.-vezérlő:" #define STR_FDC "Floppy-vezérlő:" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 2ee1cb0a8..1f19443c4 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -6,7 +6,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN #pragma code_page(65001) #endif //_WIN32 -#define explorerdotexe +// explorerdotexe +#define AUTHORS ///////////////////////////////////////////////////////////////////////////// // @@ -332,6 +333,7 @@ END #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" +#define STR_LPT4 "Dispositivo LPT4:" #define STR_SERIAL1 "Porta seriale 1" #define STR_SERIAL2 "Porta seriale 2" #define STR_SERIAL3 "Porta seriale 3" @@ -339,6 +341,7 @@ END #define STR_PARALLEL1 "Porta parallela 1" #define STR_PARALLEL2 "Porta parallela 2" #define STR_PARALLEL3 "Porta parallela 3" +#define STR_PARALLEL4 "Porta parallela 4" #define STR_HDC "Controller HD:" #define STR_FDC "Controller FD:" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 56abc7600..66f25be11 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1デバイス:" #define STR_LPT2 "LPT2デバイス:" #define STR_LPT3 "LPT3デバイス:" +#define STR_LPT4 "LPT4デバイス:" #define STR_SERIAL1 "シリアルポート1" #define STR_SERIAL2 "シリアルポート2" #define STR_SERIAL3 "シリアルポート3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "パラレルポート1" #define STR_PARALLEL2 "パラレルポート2" #define STR_PARALLEL3 "パラレルポート3" +#define STR_PARALLEL4 "パラレルポート4" #define STR_HDC "HDコントローラー:" #define STR_FDC "FDコントローラー:" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index b2e86d0ac..bbe715617 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1 장치:" #define STR_LPT2 "LPT2 장치:" #define STR_LPT3 "LPT3 장치:" +#define STR_LPT4 "LPT4 장치:" #define STR_SERIAL1 "직렬 포트 1" #define STR_SERIAL2 "직렬 포트 2" #define STR_SERIAL3 "직렬 포트 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "병렬 포트 1" #define STR_PARALLEL2 "병렬 포트 2" #define STR_PARALLEL3 "병렬 포트 3" +#define STR_PARALLEL4 "병렬 포트 4" #define STR_HDC "HD 컨트롤러:" #define STR_FDC "FD 컨트롤러:" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 68761adfa..d56c0fa7a 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -335,6 +335,7 @@ END #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" +#define STR_LPT4 "Dispositivo LPT4:" #define STR_SERIAL1 "Porta serial 1" #define STR_SERIAL2 "Porta serial 2" #define STR_SERIAL3 "Porta serial 3" @@ -342,6 +343,7 @@ END #define STR_PARALLEL1 "Porta paralela 1" #define STR_PARALLEL2 "Porta paralela 2" #define STR_PARALLEL3 "Porta paralela 3" +#define STR_PARALLEL4 "Porta paralela 4" #define STR_HDC "Controlador HD:" #define STR_FDC "Controlador FD:" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index cc50665b1..77c8eb07e 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" +#define STR_LPT4 "Dispositivo LPT4:" #define STR_SERIAL1 "Porta de série 1" #define STR_SERIAL2 "Porta de série 2" #define STR_SERIAL3 "Porta de série 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Porta paralela 1" #define STR_PARALLEL2 "Porta paralela 2" #define STR_PARALLEL3 "Porta paralela 3" +#define STR_PARALLEL4 "Porta paralela 4" #define STR_HDC "Controlador HD:" #define STR_FDC "Controlador FD:" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 82530c400..3140a3064 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Устройство LPT1:" #define STR_LPT2 "Устройство LPT2:" #define STR_LPT3 "Устройство LPT3:" +#define STR_LPT4 "Устройство LPT4:" #define STR_SERIAL1 "Последов. порт COM1" #define STR_SERIAL2 "Последов. порт COM2" #define STR_SERIAL3 "Последов. порт COM3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Параллельный порт LPT1" #define STR_PARALLEL2 "Параллельный порт LPT2" #define STR_PARALLEL3 "Параллельный порт LPT3" +#define STR_PARALLEL4 "Параллельный порт LPT4" #define STR_HDC "Контроллер HD:" #define STR_FDC "Контроллер FD:" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index cdc00fc4a..ef5295363 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Naprava LPT1:" #define STR_LPT2 "Naprava LPT2:" #define STR_LPT3 "Naprava LPT3:" +#define STR_LPT4 "Naprava LPT4:" #define STR_SERIAL1 "Serijska vrata 1" #define STR_SERIAL2 "Serijska vrata 2" #define STR_SERIAL3 "Serijska vrata 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Paralelna vrata 1" #define STR_PARALLEL2 "Paralelna vrata 2" #define STR_PARALLEL3 "Paralelna vrata 3" +#define STR_PARALLEL4 "Paralelna vrata 4" #define STR_HDC "Krmilnik trdega diska:" #define STR_FDC "Krmilnik disketnika:" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index eca2767dc..1229ec5f2 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1 Cihazı:" #define STR_LPT2 "LPT2 Cihazı:" #define STR_LPT3 "LPT3 Cihazı:" +#define STR_LPT4 "LPT4 Cihazı:" #define STR_SERIAL1 "Seri port 1" #define STR_SERIAL2 "Seri port 2" #define STR_SERIAL3 "Seri port 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Paralel port 1" #define STR_PARALLEL2 "Paralel port 2" #define STR_PARALLEL3 "Paralel port 3" +#define STR_PARALLEL4 "Paralel port 4" #define STR_HDC "HD Kontrolcüsü:" #define STR_FDC "FD Kontrolcüsü:" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 52d8de944..60f483a00 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "LPT1 设备:" #define STR_LPT2 "LPT2 设备:" #define STR_LPT3 "LPT3 设备:" +#define STR_LPT4 "LPT4 设备:" #define STR_SERIAL1 "串口 1" #define STR_SERIAL2 "串口 2" #define STR_SERIAL3 "串口 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "并口 1" #define STR_PARALLEL2 "并口 2" #define STR_PARALLEL3 "并口 3" +#define STR_PARALLEL4 "并口 4" #define STR_HDC "硬盘控制器:" #define STR_FDC "软盘控制器:" From 0613845e16892a0056e222ef2735771eedaa5418 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 19:24:46 -0500 Subject: [PATCH 04/18] Currently unused parts for Serial Device support --- src/win/languages/cs-CZ.rc | 4 ++++ src/win/languages/de-DE.rc | 4 ++++ src/win/languages/dialogs.rc | 22 ++++++++++++++++++++++ src/win/languages/en-GB.rc | 4 ++++ src/win/languages/en-US.rc | 4 ++++ src/win/languages/es-ES.rc | 4 ++++ src/win/languages/fi-FI.rc | 4 ++++ src/win/languages/fr-FR.rc | 4 ++++ src/win/languages/hr-HR.rc | 4 ++++ src/win/languages/hu-HU.rc | 4 ++++ src/win/languages/it-IT.rc | 4 ++++ src/win/languages/ja-JP.rc | 4 ++++ src/win/languages/ko-KR.rc | 4 ++++ src/win/languages/pt-BR.rc | 4 ++++ src/win/languages/pt-PT.rc | 4 ++++ src/win/languages/ru-RU.rc | 4 ++++ src/win/languages/sl-SI.rc | 4 ++++ src/win/languages/tr-TR.rc | 4 ++++ src/win/languages/zh-CN.rc | 4 ++++ 19 files changed, 94 insertions(+) diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index f6a4f2e52..75921230a 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap zařízení:" #define STR_NET "Síťový adaptér:" +#define STR_COM1 "Zařízení na COM1:" +#define STR_COM2 "Zařízení na COM2:" +#define STR_COM3 "Zařízení na COM3:" +#define STR_COM4 "Zařízení na COM4:" #define STR_LPT1 "Zařízení na LPT1:" #define STR_LPT2 "Zařízení na LPT2:" #define STR_LPT3 "Zařízení na LPT3:" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 0ec0034fc..9fb84a20c 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap-Gerät:" #define STR_NET "Netzwerkadapter:" +#define STR_COM1 "COM1-Gerät:" +#define STR_COM2 "COM2-Gerät:" +#define STR_COM3 "COM3-Gerät:" +#define STR_COM4 "COM4-Gerät:" #define STR_LPT1 "LPT1-Gerät:" #define STR_LPT2 "LPT2-Gerät:" #define STR_LPT3 "LPT3-Gerät:" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 7cf466240..f59603e9f 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -213,6 +213,24 @@ DLG_CFG_PORTS DIALOG DISCARDABLE 107, 0, 267, 135 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN +/* + LTEXT STR_COM1,IDT_1717,7,9,61,10 + COMBOBOX IDC_COMBO_COM1,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + + LTEXT STR_COM2,IDT_1718,7,28,61,10 + COMBOBOX IDC_COMBO_COM2,71,26,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + + LTEXT STR_COM3,IDT_1719,7,47,61,10 + COMBOBOX IDC_COMBO_COM3,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + + LTEXT STR_COM4,IDT_1720,7,66,61,10 + COMBOBOX IDC_COMBO_COM4,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP +*/ + LTEXT STR_LPT1,IDT_1717,7,9,61,10 COMBOBOX IDC_COMBO_LPT1,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -528,6 +546,10 @@ END #undef STR_PCAP #undef STR_NET +#undef STR_COM1 +#undef STR_COM2 +#undef STR_COM3 +#undef STR_COM4 #undef STR_LPT1 #undef STR_LPT2 #undef STR_LPT3 diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 7989bd019..498939216 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap device:" #define STR_NET "Network adapter:" +#define STR_COM1 "COM1 Device:" +#define STR_COM2 "COM2 Device:" +#define STR_COM3 "COM3 Device:" +#define STR_COM4 "COM4 Device:" #define STR_LPT1 "LPT1 Device:" #define STR_LPT2 "LPT2 Device:" #define STR_LPT3 "LPT3 Device:" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index 123684d5e..ef1b4131d 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap device:" #define STR_NET "Network adapter:" +#define STR_COM1 "COM1 Device:" +#define STR_COM2 "COM2 Device:" +#define STR_COM3 "COM3 Device:" +#define STR_COM4 "COM4 Device:" #define STR_LPT1 "LPT1 Device:" #define STR_LPT2 "LPT2 Device:" #define STR_LPT3 "LPT3 Device:" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 38cac4aa7..2056978cb 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Adaptador de red:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index f18453563..e5a2643f2 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap-laite:" #define STR_NET "Verkkokortti:" +#define STR_COM1 "COM1-laite:" +#define STR_COM2 "COM2-laite:" +#define STR_COM3 "COM3-laite:" +#define STR_COM4 "COM4-laite:" #define STR_LPT1 "LPT1-laite:" #define STR_LPT2 "LPT2-laite:" #define STR_LPT3 "LPT3-laite:" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index 35a241d1b..ca1355f03 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "Dispositif PCap:" #define STR_NET "Adaptateur de réseau:" +#define STR_COM1 "Dispositif COM1:" +#define STR_COM2 "Dispositif COM2:" +#define STR_COM3 "Dispositif COM3:" +#define STR_COM4 "Dispositif COM4:" #define STR_LPT1 "Dispositif LPT1:" #define STR_LPT2 "Dispositif LPT2:" #define STR_LPT3 "Dispositif LPT3:" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 6386cd0bc..06b7db4a5 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "Uređaj PCap:" #define STR_NET "Mrežna kartica:" +#define STR_COM1 "Uređaj COM1:" +#define STR_COM2 "Uređaj COM2:" +#define STR_COM3 "Uređaj COM3:" +#define STR_COM4 "Uređaj COM4:" #define STR_LPT1 "Uređaj LPT1:" #define STR_LPT2 "Uređaj LPT2:" #define STR_LPT3 "Uređaj LPT3:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index a8cc39aee..5d2561655 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -334,6 +334,10 @@ END #define STR_PCAP "PCap eszköz:" #define STR_NET "Hálózati kártya:" +#define STR_COM1 "COM1 eszköz:" +#define STR_COM2 "COM2 eszköz:" +#define STR_COM3 "COM3 eszköz:" +#define STR_COM4 "COM4 eszköz:" #define STR_LPT1 "LPT1 eszköz:" #define STR_LPT2 "LPT2 eszköz:" #define STR_LPT3 "LPT3 eszköz:" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index 1f19443c4..ce21d6cc1 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -330,6 +330,10 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Scheda di rete:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 66f25be11..7c11f5f18 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCapデバイス:" #define STR_NET "ネットワークアダプター:" +#define STR_COM1 "COM1デバイス:" +#define STR_COM2 "COM2デバイス:" +#define STR_COM3 "COM3デバイス:" +#define STR_COM4 "COM4デバイス:" #define STR_LPT1 "LPT1デバイス:" #define STR_LPT2 "LPT2デバイス:" #define STR_LPT3 "LPT3デバイス:" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index bbe715617..ddbdf111a 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap 장치:" #define STR_NET "네트워크 어댑터:" +#define STR_COM1 "COM1 장치:" +#define STR_COM2 "COM2 장치:" +#define STR_COM3 "COM3 장치:" +#define STR_COM4 "COM4 장치:" #define STR_LPT1 "LPT1 장치:" #define STR_LPT2 "LPT2 장치:" #define STR_LPT3 "LPT3 장치:" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index d56c0fa7a..695c27d6a 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -332,6 +332,10 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Adaptador de rede:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 77c8eb07e..09aa38389 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "Dispositivo PCap:" #define STR_NET "Placa de rede:" +#define STR_COM1 "Dispositivo COM1:" +#define STR_COM2 "Dispositivo COM2:" +#define STR_COM3 "Dispositivo COM3:" +#define STR_COM4 "Dispositivo COM4:" #define STR_LPT1 "Dispositivo LPT1:" #define STR_LPT2 "Dispositivo LPT2:" #define STR_LPT3 "Dispositivo LPT3:" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 3140a3064..86eb4c812 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "Устройство PCap:" #define STR_NET "Сетевая карта:" +#define STR_COM1 "Устройство COM1:" +#define STR_COM2 "Устройство COM2:" +#define STR_COM3 "Устройство COM3:" +#define STR_COM4 "Устройство COM4:" #define STR_LPT1 "Устройство LPT1:" #define STR_LPT2 "Устройство LPT2:" #define STR_LPT3 "Устройство LPT3:" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index ef5295363..8bf14c5b4 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "Naprava PCap:" #define STR_NET "Omrežna kartica:" +#define STR_COM1 "Naprava COM1:" +#define STR_COM2 "Naprava COM2:" +#define STR_COM3 "Naprava COM3:" +#define STR_COM4 "Naprava COM4:" #define STR_LPT1 "Naprava LPT1:" #define STR_LPT2 "Naprava LPT2:" #define STR_LPT3 "Naprava LPT3:" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 1229ec5f2..9a4b2894b 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap cihazı:" #define STR_NET "Ağ cihazı:" +#define STR_COM1 "COM1 Cihazı:" +#define STR_COM2 "COM2 Cihazı:" +#define STR_COM3 "COM3 Cihazı:" +#define STR_COM4 "COM4 Cihazı:" #define STR_LPT1 "LPT1 Cihazı:" #define STR_LPT2 "LPT2 Cihazı:" #define STR_LPT3 "LPT3 Cihazı:" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 60f483a00..2c54dfdf9 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -329,6 +329,10 @@ END #define STR_PCAP "PCap 设备:" #define STR_NET "网络适配器:" +#define STR_COM1 "COM1 设备:" +#define STR_COM2 "COM2 设备:" +#define STR_COM3 "COM3 设备:" +#define STR_COM4 "COM4 设备:" #define STR_LPT1 "LPT1 设备:" #define STR_LPT2 "LPT2 设备:" #define STR_LPT3 "LPT3 设备:" From c15244d0c25594e9d20278c7488bfa12d7d596af Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 19:32:51 -0500 Subject: [PATCH 05/18] Make several bits less confusing --- src/include/86box/resource.h | 2 +- src/win/languages/dialogs.rc | 42 +++++++++++++++++++++--------------- src/win/win_settings.c | 12 +++++------ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index 53f18a223..5eb188420 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -128,7 +128,7 @@ #define IDC_COMBO_MACHINE 1011 /* machine/cpu config */ #define IDC_CONFIGURE_MACHINE 1012 #define IDC_COMBO_CPU_TYPE 1013 -#define IDC_COMBO_CPU 1014 +#define IDC_COMBO_CPU_SPEED 1014 #define IDC_COMBO_FPU 1015 #define IDC_COMBO_WS 1016 #ifdef USE_DYNAREC diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index f59603e9f..a92a95d1b 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -47,18 +47,6 @@ BEGIN WS_BORDER,53,45,166,14 END -DLG_CONFIG DIALOG DISCARDABLE 0, 0, 376, 256 -STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION STR_CONFIG -FONT FONT_SIZE, FONT_NAME -BEGIN - DEFPUSHBUTTON STR_OK,IDOK,246,235,50,14 - PUSHBUTTON STR_CANCEL,IDCANCEL,307,235,50,14 - CONTROL "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | - LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,100,212 - CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,373,1 -END - DLG_SPECIFY_DIM DIALOG DISCARDABLE 0, 0, 175, 66 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_SPECIFY_DIM @@ -80,6 +68,18 @@ BEGIN PUSHBUTTON STR_CANCEL,IDCANCEL,99,45,50,14 END +DLG_CONFIG DIALOG DISCARDABLE 0, 0, 376, 256 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION STR_CONFIG +FONT FONT_SIZE, FONT_NAME +BEGIN + DEFPUSHBUTTON STR_OK,IDOK,246,235,50,14 + PUSHBUTTON STR_CANCEL,IDCANCEL,307,235,50,14 + CONTROL "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_REPORT | LVS_NOCOLUMNHEADER | + LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,100,212 + CONTROL "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,373,1 +END + DLG_CFG_MACHINE DIALOG DISCARDABLE 107, 0, 305, 200 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME @@ -87,28 +87,40 @@ BEGIN COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MACHINE_TYPE,IDT_1708,7,9,60,10 + COMBOBOX IDC_COMBO_MACHINE,71,26,138,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MACHINE,IDT_1701,7,28,60,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,214,26,46,12 + COMBOBOX IDC_COMBO_CPU_TYPE,71,45,110,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_CPU_TYPE,IDT_1702,7,47,59,10 - COMBOBOX IDC_COMBO_CPU,215,45,45,120,CBS_DROPDOWNLIST | + + COMBOBOX IDC_COMBO_CPU_SPEED,215,45,45,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_SPEED,IDT_1704,189,47,24,10 + COMBOBOX IDC_COMBO_FPU,71,64,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_FPU,IDT_1707,7,66,59,10 + COMBOBOX IDC_COMBO_WS,71,83,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_WAIT_STATES,IDT_1703,7,85,60,10 + EDITTEXT IDC_MEMTEXT,70,102,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_MEMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,113,101, 12,12 LTEXT STR_MB,IDT_1705,123,104,10,10 LTEXT STR_MEMORY,IDT_1706,7,104,30,10 + +#ifdef USE_DYNAREC + CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,120,120,10 +#endif + GROUPBOX STR_TIME_SYNC,IDC_TIME_SYNC,7,135,100,56 CONTROL STR_DISABLED,IDC_RADIO_TS_DISABLED,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,147,84,10 @@ -116,10 +128,6 @@ BEGIN BS_AUTORADIOBUTTON | WS_TABSTOP,14,161,84,10 CONTROL STR_ENABLED_UTC, IDC_RADIO_TS_UTC,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,14,175,84,10 -#ifdef USE_DYNAREC - CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,120,120,10 -#endif END DLG_CFG_VIDEO DIALOG DISCARDABLE 107, 0, 267, 45 diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 3511277ef..e37a2cfa0 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -707,13 +707,13 @@ win_settings_machine_recalc_cpu_m(HWND hdlg) lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR)); - settings_reset_content(hdlg, IDC_COMBO_CPU); + settings_reset_content(hdlg, IDC_COMBO_CPU_SPEED); c = i = 0; while (temp_cpu_f->cpus[c].cpu_type != 0) { if (cpu_is_eligible(temp_cpu_f, c, temp_machine)) { stransi = (char *) temp_cpu_f->cpus[c].name; mbstowcs(lptsTemp, stransi, strlen(stransi) + 1); - settings_add_string(hdlg, IDC_COMBO_CPU, (LPARAM)(LPCSTR)lptsTemp); + settings_add_string(hdlg, IDC_COMBO_CPU_SPEED, (LPARAM)(LPCSTR)lptsTemp); if (first_eligible == -1) first_eligible = i; @@ -727,13 +727,13 @@ win_settings_machine_recalc_cpu_m(HWND hdlg) } if (i == 0) fatal("No eligible CPUs for the selected family\n"); - settings_enable_window(hdlg, IDC_COMBO_CPU, i != 1); + settings_enable_window(hdlg, IDC_COMBO_CPU_SPEED, i != 1); if (current_eligible < first_eligible) current_eligible = first_eligible; else if (current_eligible > last_eligible) current_eligible = last_eligible; temp_cpu = listtocpu[current_eligible]; - settings_set_cur_sel(hdlg, IDC_COMBO_CPU, current_eligible); + settings_set_cur_sel(hdlg, IDC_COMBO_CPU_SPEED, current_eligible); win_settings_machine_recalc_cpu(hdlg); @@ -974,9 +974,9 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) win_settings_machine_recalc_cpu_m(hdlg); } break; - case IDC_COMBO_CPU: + case IDC_COMBO_CPU_SPEED: if (HIWORD(wParam) == CBN_SELCHANGE) { - temp_cpu = listtocpu[settings_get_cur_sel(hdlg, IDC_COMBO_CPU)]; + temp_cpu = listtocpu[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_SPEED)]; win_settings_machine_recalc_cpu(hdlg); } break; From 7582f99613708e547e7faef16db4f38bda18aaf7 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 19:33:38 -0500 Subject: [PATCH 06/18] Fix PSSJ Clone --- src/sound/snd_pssj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/snd_pssj.c b/src/sound/snd_pssj.c index 6ef24c679..a69420c2e 100644 --- a/src/sound/snd_pssj.c +++ b/src/sound/snd_pssj.c @@ -290,7 +290,7 @@ const device_t pssj_1e0_device = const device_t pssj_isa_device = { - "Tandy PSSJ (ISA Clone)", + "Tandy PSSJ Clone", DEVICE_ISA, 0, pssj_isa_init, From 7c6c96b0e7895e8f4eb0b2bd65bc7379d842ecf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Mon, 31 Jan 2022 03:09:02 +0100 Subject: [PATCH 07/18] Fix some toolbar resizing bugs --- src/win/win.c | 7 +++++-- src/win/win_ui.c | 5 +---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/win/win.c b/src/win/win.c index 7d127efa6..801c32ca5 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -1135,12 +1135,15 @@ plat_setfullscreen(int on) ResizeWindowByClientArea(hwndMain, temp_x, temp_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height)); } + /* Toolbar. */ + MoveWindow(hwndRebar, 0, 0, temp_x, tbar_height, TRUE); + /* Render window. */ - MoveWindow(hwndRender, 0, 0, temp_x, temp_y, TRUE); + MoveWindow(hwndRender, 0, hide_tool_bar ? 0 : tbar_height, temp_x, temp_y, TRUE); GetWindowRect(hwndRender, &rect); /* Status bar. */ - MoveWindow(hwndSBAR, 0, rect.bottom, temp_x, 17, TRUE); + MoveWindow(hwndSBAR, 0, rect.bottom, temp_x, sbar_height, TRUE); if (mouse_capture) ClipCursor(&rect); diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 099540ccb..92fccd1c3 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -1419,10 +1419,7 @@ ui_init(int nCmdShow) scrnsz_x = fixed_size_x; scrnsz_y = fixed_size_y; } - if (hide_status_bar) - ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y); - else - ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y + sbar_height); + ResizeWindowByClientArea(hwnd, scrnsz_x, scrnsz_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height)); } /* Load the desired language */ From 3a8c58ca090e9280bda0903cdbd1dbdaee3fbfe7 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 21:48:47 -0500 Subject: [PATCH 08/18] Update win_settings.c --- src/win/win_settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/win_settings.c b/src/win/win_settings.c index e37a2cfa0..69b4afbe3 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -3731,7 +3731,7 @@ win_settings_zip_drives_recalc_list(HWND hdlg) lvI.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE; lvI.stateMask = lvI.iSubItem = lvI.state = 0; - for (i = 0; i < 4; i++) { + for (i = 0; i < ZIP_NUM; i++) { fsid = combo_id_to_format_string_id(temp_zip_drives[i].bus_type); lvI.iSubItem = 0; From a666ff87c001b5b7d6d3447a5ec4c2f3c18ab941 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 22:06:18 -0500 Subject: [PATCH 09/18] Less confusion for midi out --- src/include/86box/resource.h | 4 ++-- src/win/languages/dialogs.rc | 4 ++-- src/win/win_settings.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index 5eb188420..eda3c2418 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -154,7 +154,7 @@ #define IDC_CHECK_SSI 1042 #define IDC_CHECK_CMS 1043 #define IDC_CHECK_GUS 1044 -#define IDC_COMBO_MIDI 1045 +#define IDC_COMBO_MIDI_OUT 1045 #define IDC_CHECK_MPU401 1046 #define IDC_CONFIGURE_MPU401 1047 #define IDC_CHECK_FLOAT 1048 @@ -281,7 +281,7 @@ #define IDC_CONFIGURE_BUSLOGIC 1305 #define IDC_CONFIGURE_PCAP 1306 #define IDC_CONFIGURE_NET 1307 -#define IDC_CONFIGURE_MIDI 1308 +#define IDC_CONFIGURE_MIDI_OUT 1308 #define IDC_CONFIGURE_MIDI_IN 1309 #define IDC_JOY1 1310 #define IDC_JOY2 1311 diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index a92a95d1b..c6934b398 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -169,10 +169,10 @@ BEGIN LTEXT STR_SOUND,IDT_1711,7,9,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12 - COMBOBOX IDC_COMBO_MIDI,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_COMBO_MIDI_OUT,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT STR_MIDI,IDT_1712,7,28,59,10 - PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI,214,26,46,12 + PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_OUT,214,26,46,12 COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 69b4afbe3..9f72b4f9d 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -1346,7 +1346,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) c++; } - settings_enable_window(hdlg, IDC_CONFIGURE_MIDI, midi_device_has_config(temp_midi_device)); + settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device)); c = d = 0; settings_reset_content(hdlg, IDC_COMBO_MIDI_IN); @@ -1406,13 +1406,13 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case IDC_COMBO_MIDI: temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; - settings_enable_window(hdlg, IDC_CONFIGURE_MIDI, midi_device_has_config(temp_midi_device)); + settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device)); 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_MIDI: + case IDC_CONFIGURE_MIDI_OUT: temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; temp_deviceconfig |= deviceconfig_open(hdlg, (void *)midi_device_getdevice(temp_midi_device)); break; From 3a140e67d9a1da471cb82107b93ec6c2fdec6d60 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 23:30:40 -0500 Subject: [PATCH 10/18] Refactor IDT_???? to have meaningful names --- src/include/86box/resource.h | 211 +++++++++++++++++++++-------------- src/win/languages/cs-CZ.rc | 5 +- src/win/languages/de-DE.rc | 5 +- src/win/languages/dialogs.rc | 155 ++++++++++++------------- src/win/languages/en-GB.rc | 5 +- src/win/languages/en-US.rc | 5 +- src/win/languages/es-ES.rc | 5 +- src/win/languages/fi-FI.rc | 5 +- src/win/languages/fr-FR.rc | 5 +- src/win/languages/hr-HR.rc | 5 +- src/win/languages/hu-HU.rc | 5 +- src/win/languages/it-IT.rc | 5 +- src/win/languages/ja-JP.rc | 5 +- src/win/languages/ko-KR.rc | 5 +- src/win/languages/pl-PL.rc | 5 +- src/win/languages/pt-BR.rc | 5 +- src/win/languages/pt-PT.rc | 5 +- src/win/languages/ru-RU.rc | 5 +- src/win/languages/sl-SI.rc | 5 +- src/win/languages/tr-TR.rc | 5 +- src/win/languages/zh-CN.rc | 5 +- src/win/win_settings.c | 56 +++++----- 22 files changed, 289 insertions(+), 228 deletions(-) diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index eda3c2418..f7143ff54 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -24,93 +24,134 @@ /* Dialog IDs. */ -#define DLG_ABOUT 101 /* top-level dialog */ -#define DLG_STATUS 102 /* top-level dialog */ -#define DLG_SND_GAIN 103 /* top-level dialog */ -#define DLG_NEW_FLOPPY 104 /* top-level dialog */ -#define DLG_SPECIFY_DIM 105 /* top-level dialog */ -#define DLG_PREFERENCES 106 /* top-level dialog */ -#define DLG_CONFIG 110 /* top-level dialog */ -#define DLG_CFG_MACHINE 111 /* sub-dialog of config */ -#define DLG_CFG_VIDEO 112 /* sub-dialog of config */ -#define DLG_CFG_INPUT 113 /* sub-dialog of config */ -#define DLG_CFG_SOUND 114 /* sub-dialog of config */ -#define DLG_CFG_NETWORK 115 /* sub-dialog of config */ -#define DLG_CFG_PORTS 116 /* sub-dialog of config */ -#define DLG_CFG_STORAGE 117 /* sub-dialog of config */ -#define DLG_CFG_HARD_DISKS 118 /* sub-dialog of config */ -#define DLG_CFG_HARD_DISKS_ADD 119 /* sub-dialog of config */ -#define DLG_CFG_FLOPPY_AND_CDROM_DRIVES 120 /* sub-dialog of config */ -#define DLG_CFG_OTHER_REMOVABLE_DEVICES 121 /* sub-dialog of config */ -#define DLG_CFG_PERIPHERALS 122 /* sub-dialog of config */ +#define DLG_ABOUT 101 /* top-level dialog */ +#define DLG_STATUS 102 /* top-level dialog */ +#define DLG_SND_GAIN 103 /* top-level dialog */ +#define DLG_NEW_FLOPPY 104 /* top-level dialog */ +#define DLG_SPECIFY_DIM 105 /* top-level dialog */ +#define DLG_PREFERENCES 106 /* top-level dialog */ +#define DLG_CONFIG 110 /* top-level dialog */ +#define DLG_CFG_MACHINE 111 /* sub-dialog of config */ +#define DLG_CFG_VIDEO 112 /* sub-dialog of config */ +#define DLG_CFG_INPUT 113 /* sub-dialog of config */ +#define DLG_CFG_SOUND 114 /* sub-dialog of config */ +#define DLG_CFG_NETWORK 115 /* sub-dialog of config */ +#define DLG_CFG_PORTS 116 /* sub-dialog of config */ +#define DLG_CFG_STORAGE 117 /* sub-dialog of config */ +#define DLG_CFG_HARD_DISKS 118 /* sub-dialog of config */ +#define DLG_CFG_HARD_DISKS_ADD 119 /* sub-dialog of config */ +#define DLG_CFG_FLOPPY_AND_CDROM_DRIVES 120 /* sub-dialog of config */ +#define DLG_CFG_OTHER_REMOVABLE_DEVICES 121 /* sub-dialog of config */ +#define DLG_CFG_PERIPHERALS 122 /* sub-dialog of config */ /* Static text label IDs. */ -#define IDT_1700 1700 /* Language: */ -#define IDT_1701 1701 /* Machine: */ -#define IDT_1702 1702 /* CPU type: */ -#define IDT_1703 1703 /* Wait states: */ -#define IDT_1704 1704 /* CPU: */ -#define IDT_1705 1705 /* MB == IDC_TEXT_MB */ -#define IDT_1706 1706 /* Memory: */ -#define IDT_1707 1707 /* Video: */ -#define IDT_1708 1708 /* Machine type: */ -#define IDT_1709 1709 /* Mouse: */ -#define IDT_1710 1710 /* Joystick: */ -#define IDT_1711 1711 /* Sound card: */ -#define IDT_1712 1712 /* MIDI Out Device: */ -#define IDT_1713 1713 /* MIDI In Device: */ -#define IDT_1714 1714 /* Network type: */ -#define IDT_1715 1715 /* PCap device: */ -#define IDT_1716 1716 /* Network adapter: */ -#define IDT_1717 1717 /* SCSI Controller: */ -#define IDT_1718 1718 /* HD Controller: */ -#define IDT_1719 1719 -#define IDT_1720 1720 /* Hard disks: */ -#define IDT_1721 1721 /* Bus: */ -#define IDT_1722 1722 /* Channel: */ -#define IDT_1723 1723 /* ID: */ -#define IDT_1724 1724 /* LUN: */ -#define IDT_1726 1726 /* Sectors: */ -#define IDT_1727 1727 /* Heads: */ -#define IDT_1728 1728 /* Cylinders: */ -#define IDT_1729 1729 /* Size (MB): */ -#define IDT_1730 1730 /* Type: */ -#define IDT_1731 1731 /* File name: */ -#define IDT_1737 1737 /* Floppy drives: */ -#define IDT_1738 1738 /* Type: */ -#define IDT_1739 1739 /* CD-ROM drives: */ -#define IDT_1740 1740 /* Bus: */ -#define IDT_1741 1741 /* ID: */ -#define IDT_1742 1742 /* LUN: */ -#define IDT_1743 1743 /* Channel: */ -#define IDT_STEXT 1744 /* text in status window */ -#define IDT_SDEVICE 1745 /* text in status window */ -#define IDT_1746 1746 /* Gain */ -#define IDT_1749 1749 /* File name: */ -#define IDT_1750 1750 /* Disk size: */ -#define IDT_1751 1751 /* RPM mode: */ -#define IDT_1752 1752 /* Progress: */ -#define IDT_1753 1753 /* Bus: */ -#define IDT_1754 1754 /* ID: */ -#define IDT_1755 1755 /* LUN: */ -#define IDT_1756 1756 /* Channel: */ -#define IDT_1757 1757 /* Progress: */ -#define IDT_1758 1758 /* Speed: */ -#define IDT_1759 1759 /* ZIP drives: */ -#define IDT_1763 1763 /* Board #1: */ -#define IDT_1764 1764 /* Board #2: */ -#define IDT_1765 1765 /* Board #3: */ -#define IDT_1766 1766 /* Board #4: */ -#define IDT_1767 1767 /* ISA RTC: */ -#define IDT_1768 1768 /* Ext FD Controller: */ -#define IDT_1769 1769 /* MO drives: */ -#define IDT_1770 1770 /* Bus: */ -#define IDT_1771 1771 /* ID: */ -#define IDT_1772 1772 /* Channel */ -#define IDT_1773 1773 /* Type: */ -#define IDT_1774 1774 /* Image Format: */ -#define IDT_1775 1775 /* Block Size: */ +/* DLG_SND_GAIN */ +#define IDT_GAIN 1700 /* Gain */ + +/* DLG_NEW_FLOPPY */ +#define IDT_FLP_FILE_NAME 1701 /* File name: */ +#define IDT_FLP_DISK_SIZE 1702 /* Disk size: */ +#define IDT_FLP_RPM_MODE 1703 /* RPM mode: */ +#define IDT_FLP_PROGRESS 1704 /* Progress: */ + +/* DLG_SPECIFY_DIM */ +#define IDT_WIDTH 1705 /* ??? */ +#define IDT_HEIGHT 1706 /* ??? */ + +/* DLG_CFG_MACHINE */ +#define IDT_MACHINE_TYPE 1707 /* Machine type: */ +#define IDT_MACHINE 1708 /* Machine: */ +#define IDT_CPU_TYPE 1709 /* CPU type: */ +#define IDT_CPU_SPEED 1710 /* CPU speed: */ +#define IDT_FPU 1711 /* FPU: */ +#define IDT_WAIT_STATES 1712 /* Wait states: */ +#define IDT_MB 1713 /* MB == IDC_TEXT_MB */ +#define IDT_MEMORY 1714 /* Memory: */ + +/* DLG_CFG_VIDEO */ +#define IDT_VIDEO 1715 /* Video: */ + +/* DLG_CFG_INPUT */ +#define IDT_MOUSE 1716 /* Mouse: */ +#define IDT_JOYSTICK 1717 /* Joystick: */ + +/* DLG_CFG_SOUND */ +#define IDT_SOUND 1718 /* Sound card: */ +#define IDT_MIDI_OUT 1719 /* MIDI Out Device: */ +#define IDT_MIDI_IN 1720 /* MIDI In Device: */ + +/* DLG_CFG_NETWORK */ +#define IDT_NET_TYPE 1721 /* Network type: */ +#define IDT_PCAP 1722 /* PCap device: */ +#define IDT_NET 1723 /* Network adapter: */ + +/* DLG_CFG_PORTS */ +#define IDT_COM1 1724 /* COM1 Device: */ +#define IDT_COM2 1725 /* COM1 Device: */ +#define IDT_COM3 1726 /* COM1 Device: */ +#define IDT_COM4 1727 /* COM1 Device: */ + +#define IDT_LPT1 1728 /* LPT1 Device: */ +#define IDT_LPT2 1729 /* LPT2 Device: */ +#define IDT_LPT3 1730 /* LPT3 Device: */ +#define IDT_LPT4 1731 /* LPT4 Device: */ + +/* DLG_CFG_STORAGE */ +#define IDT_HDC 1732 /* HD Controller: */ +#define IDT_FDC 1733 /* Ext FD Controller: */ +#define IDT_SCSI_1 1734 /* SCSI Board #1: */ +#define IDT_SCSI_2 1735 /* SCSI Board #2: */ +#define IDT_SCSI_3 1736 /* SCSI Board #3: */ +#define IDT_SCSI_4 1737 /* SCSI Board #4: */ + +/* DLG_CFG_HARD_DISKS */ +#define IDT_HDD 1738 /* Hard disks: */ +#define IDT_BUS 1739 /* Bus: */ +#define IDT_CHANNEL 1740 /* Channel: */ +#define IDT_ID 1741 /* ID: */ +#define IDT_LUN 1742 /* LUN: */ + +/* DLG_CFG_HARD_DISKS_ADD */ +#define IDT_SECTORS 1743 /* Sectors: */ +#define IDT_HEADS 1744 /* Heads: */ +#define IDT_CYLS 1745 /* Cylinders: */ +#define IDT_SIZE_MB 1746 /* Size (MB): */ +#define IDT_TYPE 1747 /* Type: */ +#define IDT_FILE_NAME 1748 /* File name: */ +#define IDT_IMG_FORMAT 1749 /* Image Format: */ +#define IDT_BLOCK_SIZE 1750 /* Block Size: */ +#define IDT_PROGRESS 1751 /* Progress: */ + +/* DLG_CFG_FLOPPY_AND_CDROM_DRIVES */ +#define IDT_FLOPPY_DRIVES 1752 /* Floppy drives: */ +#define IDT_FDD_TYPE 1753 /* Type: */ +#define IDT_CD_DRIVES 1754 /* CD-ROM drives: */ +#define IDT_CD_BUS 1755 /* Bus: */ +#define IDT_CD_ID 1756 /* ID: */ +#define IDT_CD_LUN 1757 /* LUN: */ +#define IDT_CD_CHANNEL 1758 /* Channel: */ +#define IDT_CD_SPEED 1759 /* Speed: */ + +/* DLG_CFG_OTHER_REMOVABLE_DEVICES */ +#define IDT_MO_DRIVES 1760 /* MO drives: */ +#define IDT_MO_BUS 1761 /* Bus: */ +#define IDT_MO_ID 1762 /* ID: */ +#define IDT_MO_CHANNEL 1763 /* Channel */ +#define IDT_MO_TYPE 1764 /* Type: */ + +#define IDT_ZIP_DRIVES 1765 /* ZIP drives: */ +#define IDT_ZIP_BUS 1766 /* Bus: */ +#define IDT_ZIP_ID 1767 /* ID: */ +#define IDT_ZIP_LUN 1768 /* LUN: */ +#define IDT_ZIP_CHANNEL 1769 /* Channel: */ + +/* DLG_CFG_PERIPHERALS */ +#define IDT_ISARTC 1770 /* ISA RTC: */ +#define IDT_ISAMEM_1 1771 /* ISAMEM Board #1: */ +#define IDT_ISAMEM_2 1772 /* ISAMEM Board #2: */ +#define IDT_ISAMEM_3 1773 /* ISAMEM Board #3: */ +#define IDT_ISAMEM_4 1774 /* ISAMEM Board #4: */ /* * To try to keep these organized, we now group the @@ -136,7 +177,7 @@ #endif #define IDC_MEMTEXT 1018 #define IDC_MEMSPIN 1019 -#define IDC_TEXT_MB IDT_1705 +#define IDC_TEXT_MB IDT_MB #define IDC_VIDEO 1020 /* video config */ #define IDC_COMBO_VIDEO 1021 diff --git a/src/win/languages/cs-CZ.rc b/src/win/languages/cs-CZ.rc index 75921230a..ababda8f2 100644 --- a/src/win/languages/cs-CZ.rc +++ b/src/win/languages/cs-CZ.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Počítač:" #define STR_CONFIGURE "Nastavit" #define STR_CPU_TYPE "Procesor:" -#define STR_SPEED "Rychlost:" +#define STR_CPU_SPEED "Rychlost:" #define STR_FPU "Koprocesor:" #define STR_WAIT_STATES "Čekací stavy:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Zvuková karta:" -#define STR_MIDI "MIDI výstup:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo časování" #define STR_CHECKBPB "Kontrola BPB" #define STR_CDROM_DRIVES "Mechaniky CD-ROM:" +#define STR_CD_SPEED "Rychlost:" #define STR_MO_DRIVES "Magnetooptické mechaniky:" #define STR_ZIP_DRIVES "Mechaniky ZIP:" diff --git a/src/win/languages/de-DE.rc b/src/win/languages/de-DE.rc index 9fb84a20c..08f152795 100644 --- a/src/win/languages/de-DE.rc +++ b/src/win/languages/de-DE.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Maschine:" #define STR_CONFIGURE "Einstellen" #define STR_CPU_TYPE "CPU-Typ:" -#define STR_SPEED "Geschwindigkeit:" +#define STR_CPU_SPEED "Geschwindigkeit:" #define STR_FPU "FPU-Einheit:" #define STR_WAIT_STATES "Wartezustände:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Soundkarte:" -#define STR_MIDI "MIDI Out-Gerät:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo-Timings" #define STR_CHECKBPB "BPB überprüfen" #define STR_CDROM_DRIVES "CD-ROM-Laufwerke:" +#define STR_CD_SPEED "Geschwindigkeit:" #define STR_MO_DRIVES "MO-Laufwerke:" #define STR_ZIP_DRIVES "ZIP-Laufwerke:" diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index c6934b398..111c6e292 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -23,7 +23,7 @@ BEGIN PUSHBUTTON STR_CANCEL,IDCANCEL,57,24,50,14 CONTROL STR_GAIN,IDC_SLIDER_GAIN,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,15,20,20,109 - CTEXT STR_GAIN,IDT_1746,10,7,32,9,SS_CENTERIMAGE + CTEXT STR_GAIN,IDT_GAIN,10,7,32,9,SS_CENTERIMAGE END DLG_NEW_FLOPPY DIALOG DISCARDABLE 0, 0, 226, 86 @@ -33,16 +33,16 @@ FONT FONT_SIZE, FONT_NAME BEGIN DEFPUSHBUTTON STR_OK,IDOK,104,65,50,14 PUSHBUTTON STR_CANCEL,IDCANCEL,162,65,50,14 - LTEXT STR_FILE_NAME,IDT_1749,7,6,44,12,SS_CENTERIMAGE - LTEXT STR_DISK_SIZE,IDT_1750,7,25,44,12,SS_CENTERIMAGE - LTEXT STR_RPM_MODE,IDT_1751,7,45,44,12,SS_CENTERIMAGE + LTEXT STR_FILE_NAME,IDT_FLP_FILE_NAME,7,6,44,12,SS_CENTERIMAGE + LTEXT STR_DISK_SIZE,IDT_FLP_DISK_SIZE,7,25,44,12,SS_CENTERIMAGE + LTEXT STR_RPM_MODE,IDT_FLP_RPM_MODE,7,45,44,12,SS_CENTERIMAGE EDITTEXT IDC_EDIT_FILE_NAME,53,5,150,14,ES_AUTOHSCROLL | ES_READONLY COMBOBOX IDC_COMBO_DISK_SIZE,53,25,166,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_RPM_MODE,53,45,166,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_CFILE,206,5,13,14 - LTEXT STR_PROGRESS,IDT_1757,7,45,44,12,SS_CENTERIMAGE + LTEXT STR_PROGRESS,IDT_FLP_PROGRESS,7,45,44,12,SS_CENTERIMAGE CONTROL "IMGCreateProgress",IDC_PBAR_IMG_CREATE,"msctls_progress32",PBS_SMOOTH | WS_BORDER,53,45,166,14 END @@ -52,12 +52,12 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION STR_SPECIFY_DIM FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_WIDTH,IDT_1709,7,9,24,12 + LTEXT STR_WIDTH,IDT_WIDTH,7,9,24,12 EDITTEXT IDC_EDIT_WIDTH,33,7,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_WIDTHSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,76,6, 12,12 - LTEXT STR_HEIGHT,IDT_1710,97,9,24,12 + LTEXT STR_HEIGHT,IDT_HEIGHT,97,9,24,12 EDITTEXT IDC_EDIT_HEIGHT,123,7,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_HEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,166,6, @@ -86,35 +86,35 @@ FONT FONT_SIZE, FONT_NAME BEGIN COMBOBOX IDC_COMBO_MACHINE_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MACHINE_TYPE,IDT_1708,7,9,60,10 + LTEXT STR_MACHINE_TYPE,IDT_MACHINE_TYPE,7,9,60,10 COMBOBOX IDC_COMBO_MACHINE,71,26,138,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MACHINE,IDT_1701,7,28,60,10 + LTEXT STR_MACHINE,IDT_MACHINE,7,28,60,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MACHINE,214,26,46,12 COMBOBOX IDC_COMBO_CPU_TYPE,71,45,110,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CPU_TYPE,IDT_1702,7,47,59,10 + LTEXT STR_CPU_TYPE,IDT_CPU_TYPE,7,47,59,10 COMBOBOX IDC_COMBO_CPU_SPEED,215,45,45,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SPEED,IDT_1704,189,47,24,10 + LTEXT STR_CPU_SPEED,IDT_CPU_SPEED,189,47,24,10 COMBOBOX IDC_COMBO_FPU,71,64,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_FPU,IDT_1707,7,66,59,10 + LTEXT STR_FPU,IDT_FPU,7,66,59,10 COMBOBOX IDC_COMBO_WS,71,83,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_WAIT_STATES,IDT_1703,7,85,60,10 + LTEXT STR_WAIT_STATES,IDT_WAIT_STATES,7,85,60,10 EDITTEXT IDC_MEMTEXT,70,102,45,12,ES_AUTOHSCROLL | ES_NUMBER CONTROL "",IDC_MEMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS,113,101, 12,12 - LTEXT STR_MB,IDT_1705,123,104,10,10 - LTEXT STR_MEMORY,IDT_1706,7,104,30,10 + LTEXT STR_MB,IDT_MB,123,104,10,10 + LTEXT STR_MEMORY,IDT_MEMORY,7,104,30,10 #ifdef USE_DYNAREC CONTROL STR_DYNAREC,IDC_CHECK_DYNAREC,"Button", @@ -134,7 +134,7 @@ DLG_CFG_VIDEO DIALOG DISCARDABLE 107, 0, 267, 45 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_VIDEO,IDT_1707,7,9,48,10 + LTEXT STR_VIDEO,IDT_VIDEO,7,9,48,10 COMBOBOX IDC_COMBO_VIDEO,64,7,155,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_VID,222,7,38,12 @@ -147,11 +147,11 @@ DLG_CFG_INPUT DIALOG DISCARDABLE 107, 0, 267, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_MOUSE,IDT_1709,7,9,57,10 + LTEXT STR_MOUSE,IDT_MOUSE,7,9,57,10 COMBOBOX IDC_COMBO_MOUSE,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MOUSE,214,7,46,12 - LTEXT STR_JOYSTICK,IDT_1710,7,27,58,10 + LTEXT STR_JOYSTICK,IDT_JOYSTICK,7,27,58,10 COMBOBOX IDC_COMBO_JOYSTICK,71,25,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_JOY1,IDC_JOY1,7,44,50,14 @@ -166,17 +166,17 @@ FONT FONT_SIZE, FONT_NAME BEGIN COMBOBOX IDC_COMBO_SOUND,71,7,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SOUND,IDT_1711,7,9,59,10 + LTEXT STR_SOUND,IDT_SOUND,7,9,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12 COMBOBOX IDC_COMBO_MIDI_OUT,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MIDI,IDT_1712,7,28,59,10 + LTEXT STR_MIDI,IDT_MIDI_OUT,7,28,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_OUT,214,26,46,12 COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MIDI_IN,IDT_1713,7,47,59,10 + LTEXT STR_MIDI_IN,IDT_MIDI_IN,7,47,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_IN,214,45,46,12 CONTROL STR_MPU401,IDC_CHECK_MPU401,"Button", @@ -203,15 +203,15 @@ DLG_CFG_NETWORK DIALOG DISCARDABLE 107, 0, 267, 65 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_NET_TYPE,IDT_1714,7,9,59,10 + LTEXT STR_NET_TYPE,IDT_NET_TYPE,7,9,59,10 COMBOBOX IDC_COMBO_NET_TYPE,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_PCAP,IDT_1715,7,28,59,10 + LTEXT STR_PCAP,IDT_PCAP,7,28,59,10 COMBOBOX IDC_COMBO_PCAP,71,26,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_NET,IDT_1716,7,47,59,10 + LTEXT STR_NET,IDT_NET,7,47,59,10 COMBOBOX IDC_COMBO_NET,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,214,44,46,12 @@ -222,36 +222,36 @@ STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN /* - LTEXT STR_COM1,IDT_1717,7,9,61,10 + LTEXT STR_COM1,IDT_COM1,7,9,61,10 COMBOBOX IDC_COMBO_COM1,71,7,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_COM2,IDT_1718,7,28,61,10 + LTEXT STR_COM2,IDT_COM2,7,28,61,10 COMBOBOX IDC_COMBO_COM2,71,26,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_COM3,IDT_1719,7,47,61,10 + LTEXT STR_COM3,IDT_COM3,7,47,61,10 COMBOBOX IDC_COMBO_COM3,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_COM4,IDT_1720,7,66,61,10 + LTEXT STR_COM4,IDT_COM4,7,66,61,10 COMBOBOX IDC_COMBO_COM4,71,45,DLG_CFG_COMBO_NOBTN_WIDTH,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP */ - LTEXT STR_LPT1,IDT_1717,7,9,61,10 + LTEXT STR_LPT1,IDT_LPT1,7,9,61,10 COMBOBOX IDC_COMBO_LPT1,71,7,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_LPT2,IDT_1718,7,28,61,10 + LTEXT STR_LPT2,IDT_LPT2,7,28,61,10 COMBOBOX IDC_COMBO_LPT2,71,26,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_LPT3,IDT_1719,7,47,61,10 + LTEXT STR_LPT3,IDT_LPT3,7,47,61,10 COMBOBOX IDC_COMBO_LPT3,71,45,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_LPT4,IDT_1720,7,66,61,10 + LTEXT STR_LPT4,IDT_LPT4,7,66,61,10 COMBOBOX IDC_COMBO_LPT4,71,64,189,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -278,12 +278,12 @@ DLG_CFG_STORAGE DIALOG DISCARDABLE 107, 0, 267, 203 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_HDC,IDT_1718,7,9,64,10 + LTEXT STR_HDC,IDT_HDC,7,9,64,10 COMBOBOX IDC_COMBO_HDC,64,7,155,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_HDC,222,7,38,12 - LTEXT STR_FDC,IDT_1768,7,28,64,10 + LTEXT STR_FDC,IDT_FDC,7,28,64,10 COMBOBOX IDC_COMBO_FDC,64,26,155,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_FDC,222,26,38,12 @@ -297,19 +297,19 @@ BEGIN PUSHBUTTON STR_CONFIGURE,IDC_BUTTON_IDE_QUA,222,64,38,12 GROUPBOX STR_SCSI,IDC_GROUP_SCSI,7,85,253,93 - LTEXT STR_SCSI_1,IDT_1763,16,102,48,10 + LTEXT STR_SCSI_1,IDT_SCSI_1,16,102,48,10 COMBOBOX IDC_COMBO_SCSI_1,73,100,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_1,213,100,38,12 - LTEXT STR_SCSI_2,IDT_1764,16,121,48,10 + LTEXT STR_SCSI_2,IDT_SCSI_2,16,121,48,10 COMBOBOX IDC_COMBO_SCSI_2,73,119,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_2,213,119,38,12 - LTEXT STR_SCSI_3,IDT_1765,16,140,48,10 + LTEXT STR_SCSI_3,IDT_SCSI_3,16,140,48,10 COMBOBOX IDC_COMBO_SCSI_3,73,138,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_3,213,138,38,12 - LTEXT STR_SCSI_4,IDT_1766,16,159,48,10 + LTEXT STR_SCSI_4,IDT_SCSI_4,16,159,48,10 COMBOBOX IDC_COMBO_SCSI_4,73,157,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SCSI_4,213,157,38,12 @@ -325,19 +325,19 @@ BEGIN CONTROL "List1",IDC_LIST_HARD_DISKS,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,253,92 - LTEXT STR_HDD,IDT_1720,7,7,253,8 + LTEXT STR_HDD,IDT_HDD,7,7,253,8 PUSHBUTTON STR_NEW,IDC_BUTTON_HDD_ADD_NEW,60,137,62,10 PUSHBUTTON STR_EXISTING,IDC_BUTTON_HDD_ADD,129,137,62,10 PUSHBUTTON STR_REMOVE,IDC_BUTTON_HDD_REMOVE,198,137,62,10 COMBOBOX IDC_COMBO_HD_BUS,33,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1721,7,119,24,8 + LTEXT STR_BUS,IDT_BUS,7,119,24,8 COMBOBOX IDC_COMBO_HD_CHANNEL,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1722,131,119,38,8 + LTEXT STR_CHANNEL,IDT_CHANNEL,131,119,38,8 COMBOBOX IDC_COMBO_HD_ID,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1723,131,119,38,8 + LTEXT STR_ID,IDT_ID,131,119,38,8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,170,117,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -357,30 +357,30 @@ BEGIN EDITTEXT IDC_EDIT_HD_SIZE,42,52,28,12 COMBOBOX IDC_COMBO_HD_TYPE,113,52,98,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SECTORS,IDT_1726,154,35,27,10 - LTEXT STR_HEADS,IDT_1727,81,35,29,8 - LTEXT STR_CYLS,IDT_1728,7,35,32,12 - LTEXT STR_SIZE_MB,IDT_1729,7,54,33,8 - LTEXT STR_TYPE,IDT_1730,86,54,24,8 - LTEXT STR_FILE_NAME,IDT_1731,7,7,204,9 + LTEXT STR_SECTORS,IDT_SECTORS,154,35,27,10 + LTEXT STR_HEADS,IDT_HEADS,81,35,29,8 + LTEXT STR_CYLS,IDT_CYLS,7,35,32,12 + LTEXT STR_SIZE_MB,IDT_SIZE_MB,7,54,33,8 + LTEXT STR_TYPE,IDT_TYPE,86,54,24,8 + LTEXT STR_FILE_NAME,IDT_FILE_NAME,7,7,204,9 COMBOBOX IDC_COMBO_HD_BUS,33,71,58,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1721,7,73,24,8 + LTEXT STR_BUS,IDT_BUS,7,73,24,8 COMBOBOX IDC_COMBO_HD_CHANNEL,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1722,99,73,34,8 + LTEXT STR_CHANNEL,IDT_CHANNEL,99,73,34,8 COMBOBOX IDC_COMBO_HD_ID,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1723,99,73,34,8 + LTEXT STR_ID,IDT_ID,99,73,34,8 COMBOBOX IDC_COMBO_HD_CHANNEL_IDE,134,71,77,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_IMG_FORMAT,IDT_1774,7,92,50,12 + LTEXT STR_IMG_FORMAT,IDT_IMG_FORMAT,7,92,50,12 COMBOBOX IDC_COMBO_HD_IMG_FORMAT,58,90,153,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BLOCK_SIZE,IDT_1775,7,111,50,12 + LTEXT STR_BLOCK_SIZE,IDT_BLOCK_SIZE,7,111,50,12 COMBOBOX IDC_COMBO_HD_BLOCK_SIZE,58,109,153,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_PROGRESS,IDT_1752,7,7,204,9 + LTEXT STR_PROGRESS,IDT_PROGRESS,7,7,204,9 CONTROL "IMGCreateProgress",IDC_PBAR_IMG_CREATE,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,16,204,12 END @@ -392,10 +392,10 @@ BEGIN CONTROL "List1",IDC_LIST_FLOPPY_DRIVES,"SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,253,60 - LTEXT STR_FLOPPY_DRIVES,IDT_1737,7,7,253,8 + LTEXT STR_FLOPPY_DRIVES,IDT_FLOPPY_DRIVES,7,7,253,8 COMBOBOX IDC_COMBO_FD_TYPE,33,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_TYPE,IDT_1738,7,87,24,8 + LTEXT STR_TYPE,IDT_FDD_TYPE,7,87,24,8 CONTROL STR_TURBO,IDC_CHECKTURBO,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,131,86,64,10 CONTROL STR_CHECKBPB,IDC_CHECKBPB,"Button", @@ -404,19 +404,19 @@ BEGIN CONTROL "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,117,253,60 - LTEXT STR_CDROM_DRIVES,IDT_1739,7,107,253,8 + LTEXT STR_CDROM_DRIVES,IDT_CD_DRIVES,7,107,253,8 COMBOBOX IDC_COMBO_CD_BUS,33,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1740,7,187,24,8 + LTEXT STR_BUS,IDT_CD_BUS,7,187,24,8 COMBOBOX IDC_COMBO_CD_ID,170,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1741,131,187,38,8 + LTEXT STR_ID,IDT_CD_ID,131,187,38,8 COMBOBOX IDC_COMBO_CD_CHANNEL_IDE,170,185,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1742,131,187,38,8 + LTEXT STR_CHANNEL,IDT_CD_CHANNEL,131,187,38,8 COMBOBOX IDC_COMBO_CD_SPEED,33,205,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_SPEED,IDT_1758,7,207,24,8 + LTEXT STR_CD_SPEED,IDT_CD_SPEED,7,207,24,8 END DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE 107, 0, 267, 222 @@ -427,33 +427,33 @@ BEGIN CONTROL "List1",IDC_LIST_MO_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,17,253,60 - LTEXT STR_MO_DRIVES,IDT_1769,7,7,253,8 + LTEXT STR_MO_DRIVES,IDT_MO_DRIVES,7,7,253,8 COMBOBOX IDC_COMBO_MO_BUS,33,85,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1770,7,87,24,8 + LTEXT STR_BUS,IDT_MO_BUS,7,87,24,8 COMBOBOX IDC_COMBO_MO_ID,170,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1771,131,87,38,8 + LTEXT STR_ID,IDT_MO_ID,131,87,38,8 COMBOBOX IDC_COMBO_MO_CHANNEL_IDE,170,85,90,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1772,131,87,38,8 + LTEXT STR_CHANNEL,IDT_MO_CHANNEL,131,87,38,8 COMBOBOX IDC_COMBO_MO_TYPE,33,105,120,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_TYPE,IDT_1773,7,107,24,8 + LTEXT STR_TYPE,IDT_MO_TYPE,7,107,24,8 CONTROL "List1",IDC_LIST_ZIP_DRIVES,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,137,253,60 - LTEXT STR_ZIP_DRIVES,IDT_1759,7,127,253,8 + LTEXT STR_ZIP_DRIVES,IDT_ZIP_DRIVES,7,127,253,8 COMBOBOX IDC_COMBO_ZIP_BUS,33,205,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_BUS,IDT_1753,7,207,24,8 + LTEXT STR_BUS,IDT_ZIP_BUS,7,207,24,8 COMBOBOX IDC_COMBO_ZIP_ID,149,205,61,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_ID,IDT_1754,120,207,28,8 + LTEXT STR_ID,IDT_ZIP_ID,120,207,28,8 COMBOBOX IDC_COMBO_ZIP_CHANNEL_IDE,149,205,61,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_CHANNEL,IDT_1755,120,207,28,8 + LTEXT STR_CHANNEL,IDT_ZIP_CHANNEL,120,207,28,8 CONTROL STR_250,IDC_CHECK250,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,218,205,44,10 END @@ -462,25 +462,25 @@ DLG_CFG_PERIPHERALS DIALOG DISCARDABLE 107, 0, 267, 154 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN - LTEXT STR_ISARTC,IDT_1767,7,9,48,10 + LTEXT STR_ISARTC,IDT_ISARTC,7,9,48,10 COMBOBOX IDC_COMBO_ISARTC,64,7,155,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISARTC,222,7,38,12 GROUPBOX STR_ISAMEM,IDC_GROUP_ISAMEM,7,28,253,93 - LTEXT STR_ISAMEM_1,IDT_1763,16,45,48,10 + LTEXT STR_ISAMEM_1,IDT_ISAMEM_1,16,45,48,10 COMBOBOX IDC_COMBO_ISAMEM_1,73,43,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_1,213,43,38,12 - LTEXT STR_ISAMEM_2,IDT_1764,16,64,48,10 + LTEXT STR_ISAMEM_2,IDT_ISAMEM_2,16,64,48,10 COMBOBOX IDC_COMBO_ISAMEM_2,73,62,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_2,213,62,38,12 - LTEXT STR_ISAMEM_3,IDT_1765,16,83,48,10 + LTEXT STR_ISAMEM_3,IDT_ISAMEM_3,16,83,48,10 COMBOBOX IDC_COMBO_ISAMEM_3,73,81,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_3,213,81,38,12 - LTEXT STR_ISAMEM_4,IDT_1766,16,102,48,10 + LTEXT STR_ISAMEM_4,IDT_ISAMEM_4,16,102,48,10 COMBOBOX IDC_COMBO_ISAMEM_4,73,100,137,120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_ISAMEM_4,213,100,38,12 @@ -520,7 +520,7 @@ END #undef STR_MACHINE #undef STR_CONFIGURE #undef STR_CPU_TYPE -#undef STR_SPEED +#undef STR_CPU_SPEED #undef STR_FPU #undef STR_WAIT_STATES #undef STR_MB @@ -542,7 +542,7 @@ END #undef STR_JOY4 #undef STR_SOUND -#undef STR_MIDI +#undef STR_MIDI_OUT #undef STR_MIDI_IN #undef STR_MPU401 #undef STR_SSI @@ -603,6 +603,7 @@ END #undef STR_TURBO #undef STR_CHECKBPB #undef STR_CDROM_DRIVES +#undef STR_CD_SPEED #undef STR_MO_DRIVES #undef STR_ZIP_DRIVES diff --git a/src/win/languages/en-GB.rc b/src/win/languages/en-GB.rc index 498939216..381091ca5 100644 --- a/src/win/languages/en-GB.rc +++ b/src/win/languages/en-GB.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Machine:" #define STR_CONFIGURE "Configure" #define STR_CPU_TYPE "CPU type:" -#define STR_SPEED "Speed:" +#define STR_CPU_SPEED "Speed:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Wait states:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Sound card:" -#define STR_MIDI "MIDI Out Device:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo timings" #define STR_CHECKBPB "Check BPB" #define STR_CDROM_DRIVES "CD-ROM drives:" +#define STR_CD_SPEED "Speed:" #define STR_MO_DRIVES "MO drives:" #define STR_ZIP_DRIVES "ZIP drives:" diff --git a/src/win/languages/en-US.rc b/src/win/languages/en-US.rc index ef1b4131d..6013cea7b 100644 --- a/src/win/languages/en-US.rc +++ b/src/win/languages/en-US.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Machine:" #define STR_CONFIGURE "Configure" #define STR_CPU_TYPE "CPU type:" -#define STR_SPEED "Speed:" +#define STR_CPU_SPEED "Speed:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Wait states:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Sound card:" -#define STR_MIDI "MIDI Out Device:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo timings" #define STR_CHECKBPB "Check BPB" #define STR_CDROM_DRIVES "CD-ROM drives:" +#define STR_CD_SPEED "Speed:" #define STR_MO_DRIVES "MO drives:" #define STR_ZIP_DRIVES "ZIP drives:" diff --git a/src/win/languages/es-ES.rc b/src/win/languages/es-ES.rc index 2056978cb..ff774c894 100644 --- a/src/win/languages/es-ES.rc +++ b/src/win/languages/es-ES.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Máquina:" #define STR_CONFIGURE "Configurar" #define STR_CPU_TYPE "Tipo de CPU:" -#define STR_SPEED "Velocidad:" +#define STR_CPU_SPEED "Velocidad:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Estados en espera:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Mando 4..." #define STR_SOUND "Tarjeta de sonido:" -#define STR_MIDI "Dispositivo MIDI de salida:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Temporizaciones Turbo" #define STR_CHECKBPB "Chequear BPB" #define STR_CDROM_DRIVES "Unidades de CD-ROM:" +#define STR_CD_SPEED "Velocidad:" #define STR_MO_DRIVES "Unidades MO:" #define STR_ZIP_DRIVES "Unidades ZIP:" diff --git a/src/win/languages/fi-FI.rc b/src/win/languages/fi-FI.rc index e5a2643f2..b24e297d8 100644 --- a/src/win/languages/fi-FI.rc +++ b/src/win/languages/fi-FI.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Tietokone:" #define STR_CONFIGURE "Määritys" #define STR_CPU_TYPE "Suorittimen tyyppi:" -#define STR_SPEED "Nopeus:" +#define STR_CPU_SPEED "Nopeus:" #define STR_FPU "Apusuoritin:" #define STR_WAIT_STATES "Odotustilat:" #define STR_MB "Mt" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Peliohjain 4..." #define STR_SOUND "Äänikortti:" -#define STR_MIDI "MIDI-ulostulo:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo-ajoitukset" #define STR_CHECKBPB "Tarkista BPB" #define STR_CDROM_DRIVES "CD-ROM-asemat:" +#define STR_CD_SPEED "Nopeus:" #define STR_MO_DRIVES "Magneettisoptiset asemat (MO):" #define STR_ZIP_DRIVES "ZIP-asemat:" diff --git a/src/win/languages/fr-FR.rc b/src/win/languages/fr-FR.rc index ca1355f03..e048c5065 100644 --- a/src/win/languages/fr-FR.rc +++ b/src/win/languages/fr-FR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Machine:" #define STR_CONFIGURE "Configurer" #define STR_CPU_TYPE "Type du processeur:" -#define STR_SPEED "Vitesse:" +#define STR_CPU_SPEED "Vitesse:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "États d'attente:" #define STR_MB "Mo" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Manette 4..." #define STR_SOUND "Carte son:" -#define STR_MIDI "Sortie MIDI:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo" #define STR_CHECKBPB "Vérifier BPB" #define STR_CDROM_DRIVES "Lecterus CD-ROM:" +#define STR_CD_SPEED "Vitesse:" #define STR_MO_DRIVES "Lecteurs magnéto-optiques:" #define STR_ZIP_DRIVES "Lecteurs ZIP:" diff --git a/src/win/languages/hr-HR.rc b/src/win/languages/hr-HR.rc index 06b7db4a5..5a212cc91 100644 --- a/src/win/languages/hr-HR.rc +++ b/src/win/languages/hr-HR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Sistem:" #define STR_CONFIGURE "Namjesti" #define STR_CPU_TYPE "Tip procesora:" -#define STR_SPEED "Brzina:" +#define STR_CPU_SPEED "Brzina:" #define STR_FPU "FPU uređaj:" #define STR_WAIT_STATES "Stanja čekanja:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Palica za igru 4..." #define STR_SOUND "Zvučna kartica:" -#define STR_MIDI "Izlazni uređaj MIDI:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo vrijemena" #define STR_CHECKBPB "Provjeraj BPB" #define STR_CDROM_DRIVES "CD-ROM pogoni:" +#define STR_CD_SPEED "Brzina:" #define STR_MO_DRIVES "MO pogoni:" #define STR_ZIP_DRIVES "ZIP pogoni:" diff --git a/src/win/languages/hu-HU.rc b/src/win/languages/hu-HU.rc index 5d2561655..6d5907bcc 100644 --- a/src/win/languages/hu-HU.rc +++ b/src/win/languages/hu-HU.rc @@ -300,7 +300,7 @@ END #define STR_MACHINE "Számítógép:" #define STR_CONFIGURE "Beállítások..." #define STR_CPU_TYPE "Processzor:" -#define STR_SPEED "Seb.:" +#define STR_CPU_SPEED "Seb.:" #define STR_FPU "FPU-egység:" #define STR_WAIT_STATES "Várak. ciklusok:" #define STR_MB "MB" @@ -322,7 +322,7 @@ END #define STR_JOY4 "Játékvez. 4..." #define STR_SOUND "Hangkártya:" -#define STR_MIDI "MIDI-kimenet:" +#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" @@ -383,6 +383,7 @@ END #define STR_TURBO "Turbó időzítés" #define STR_CHECKBPB "BPB ellenőrzés" #define STR_CDROM_DRIVES "CD-ROM meghajtók:" +#define STR_CD_SPEED "Seb.:" #define STR_MO_DRIVES "MO-meghajtók:" #define STR_ZIP_DRIVES "ZIP-meghajtók:" diff --git a/src/win/languages/it-IT.rc b/src/win/languages/it-IT.rc index ce21d6cc1..c941bc585 100644 --- a/src/win/languages/it-IT.rc +++ b/src/win/languages/it-IT.rc @@ -296,7 +296,7 @@ END #define STR_MACHINE "Piastra madre:" #define STR_CONFIGURE "Configura" #define STR_CPU_TYPE "Tipo del CPU:" -#define STR_SPEED "Veloc.:" +#define STR_CPU_SPEED "Veloc.:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Stati di attesa:" #define STR_MB "MB" @@ -318,7 +318,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Scheda audio:" -#define STR_MIDI "Uscita MIDI:" +#define STR_MIDI_OUT "Uscita MIDI:" #define STR_MIDI_IN "Entrata MIDI:" #define STR_MPU401 "MPU-401 autonomo" #define STR_SSI "Innovation SSI-2001" @@ -379,6 +379,7 @@ END #define STR_TURBO "Turbo" #define STR_CHECKBPB "Verifica BPB" #define STR_CDROM_DRIVES "Unità CD-ROM:" +#define STR_CD_SPEED "Veloc.:" #define STR_MO_DRIVES "Unità magneto-ottiche:" #define STR_ZIP_DRIVES "Unità ZIP:" diff --git a/src/win/languages/ja-JP.rc b/src/win/languages/ja-JP.rc index 7c11f5f18..c3e9b2acd 100644 --- a/src/win/languages/ja-JP.rc +++ b/src/win/languages/ja-JP.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "マシン:" #define STR_CONFIGURE "設定" #define STR_CPU_TYPE "CPUタイプ:" -#define STR_SPEED "速度:" +#define STR_CPU_SPEED "速度:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "待機状態:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "ジョイスティック4..." #define STR_SOUND "サウンドカード:" -#define STR_MIDI "MIDI出力デバイス:" +#define STR_MIDI_OUT "MIDI出力デバイス:" #define STR_MIDI_IN "MIDI入力デバイス:" #define STR_MPU401 "独立型MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "高速タイミング" #define STR_CHECKBPB "BPBをチェック" #define STR_CDROM_DRIVES "CD-ROMドライブ:" +#define STR_CD_SPEED "速度:" #define STR_MO_DRIVES "光磁気ドライブ:" #define STR_ZIP_DRIVES "ZIPドライブ:" diff --git a/src/win/languages/ko-KR.rc b/src/win/languages/ko-KR.rc index ddbdf111a..8d494c718 100644 --- a/src/win/languages/ko-KR.rc +++ b/src/win/languages/ko-KR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "기종:" #define STR_CONFIGURE "설정" #define STR_CPU_TYPE "CPU 종류:" -#define STR_SPEED "속도:" +#define STR_CPU_SPEED "속도:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "대기 상태:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "조이스틱 4..." #define STR_SOUND "사운드 카드:" -#define STR_MIDI "MIDI 출력 장치:" +#define STR_MIDI_OUT "MIDI 출력 장치:" #define STR_MIDI_IN "MIDI 입력 장치:" #define STR_MPU401 "MPU-401 단독 사용" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "고속 동작" #define STR_CHECKBPB "BPB 확인" #define STR_CDROM_DRIVES "CD-ROM 드라이브:" +#define STR_CD_SPEED "속도:" #define STR_MO_DRIVES "광자기 드라이브:" #define STR_ZIP_DRIVES "ZIP 드라이브:" diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 2c4a74e7c..52d730882 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Maszyna:" #define STR_CONFIGURE "Konfiguruj" #define STR_CPU_TYPE "Rodzaj procesora:" -#define STR_SPEED "Szybkość:" +#define STR_CPU_SPEED "Szybkość:" #define STR_FPU "Jednostka FPU:" #define STR_WAIT_STATES "Stany oczekiwania:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Karta dźwiękowa:" -#define STR_MIDI "Urządzenie wyjściowe MIDI:" +#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" @@ -372,6 +372,7 @@ END #define STR_TURBO "Rozrządy Turbo" #define STR_CHECKBPB "Sprawdzaj BPB" #define STR_CDROM_DRIVES "Napędy CD-ROM:" +#define STR_CD_SPEED "Szybkość:" #define STR_MO_DRIVES "Napędy MO:" #define STR_ZIP_DRIVES "Napędy ZIP:" diff --git a/src/win/languages/pt-BR.rc b/src/win/languages/pt-BR.rc index 695c27d6a..72cab4239 100644 --- a/src/win/languages/pt-BR.rc +++ b/src/win/languages/pt-BR.rc @@ -298,7 +298,7 @@ END #define STR_MACHINE "Máquina:" #define STR_CONFIGURE "Configurar" #define STR_CPU_TYPE "Tipo de CPU:" -#define STR_SPEED "Veloc.:" +#define STR_CPU_SPEED "Veloc.:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Estados de espera:" #define STR_MB "MB" @@ -320,7 +320,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Placa de som:" -#define STR_MIDI "Disp. saída MIDI:" +#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" @@ -381,6 +381,7 @@ END #define STR_TURBO "Turbo" #define STR_CHECKBPB "Verificar BPB" #define STR_CDROM_DRIVES "Unidades de CD-ROM:" +#define STR_CD_SPEED "Veloc.:" #define STR_MO_DRIVES "Unidades magneto-ópticas:" #define STR_ZIP_DRIVES "Unidades ZIP:" diff --git a/src/win/languages/pt-PT.rc b/src/win/languages/pt-PT.rc index 09aa38389..2d8103147 100644 --- a/src/win/languages/pt-PT.rc +++ b/src/win/languages/pt-PT.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Máquina:" #define STR_CONFIGURE "Configurar" #define STR_CPU_TYPE "Tipo do CPU:" -#define STR_SPEED "Velocidade:" +#define STR_CPU_SPEED "Velocidade:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Estados de espera:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Joystick 4..." #define STR_SOUND "Placa de som:" -#define STR_MIDI "Disp. saída MIDI:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Velocidade turbo" #define STR_CHECKBPB "Verificar BPB" #define STR_CDROM_DRIVES "Unidades CD-ROM:" +#define STR_CD_SPEED "Velocidade:" #define STR_MO_DRIVES "Unidades magneto-ópticas:" #define STR_ZIP_DRIVES "Unidades ZIP:" diff --git a/src/win/languages/ru-RU.rc b/src/win/languages/ru-RU.rc index 86eb4c812..0fd617d74 100644 --- a/src/win/languages/ru-RU.rc +++ b/src/win/languages/ru-RU.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Системная плата:" #define STR_CONFIGURE "Настройка" #define STR_CPU_TYPE "Тип ЦП:" -#define STR_SPEED "Скорость:" +#define STR_CPU_SPEED "Скорость:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Циклы ожидания:" #define STR_MB "МБ" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Джойстик 4..." #define STR_SOUND "Звуковая карта:" -#define STR_MIDI "MIDI Out устр-во:" +#define STR_MIDI_OUT "MIDI Out устр-во:" #define STR_MIDI_IN "MIDI In устр-во:" #define STR_MPU401 "Отдельный MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "Турбо тайминги" #define STR_CHECKBPB "Проверять BPB" #define STR_CDROM_DRIVES "Дисководы CD-ROM:" +#define STR_CD_SPEED "Скорость:" #define STR_MO_DRIVES "Магнитооптические дисководы:" #define STR_ZIP_DRIVES "ZIP дисководы:" diff --git a/src/win/languages/sl-SI.rc b/src/win/languages/sl-SI.rc index 8bf14c5b4..1b4f1c3fa 100644 --- a/src/win/languages/sl-SI.rc +++ b/src/win/languages/sl-SI.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Sistem:" #define STR_CONFIGURE "Nastavi" #define STR_CPU_TYPE "Vrsta procesorja:" -#define STR_SPEED "Hitrost:" +#define STR_CPU_SPEED "Hitrost:" #define STR_FPU "Procesor plavajoče vejice:" #define STR_WAIT_STATES "Čakalna stanja:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Igralna palica 4..." #define STR_SOUND "Zvočna kartica:" -#define STR_MIDI "Izhodna naprava MIDI:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo časovniki" #define STR_CHECKBPB "Preverjaj BPB" #define STR_CDROM_DRIVES "Pogoni CD-ROM:" +#define STR_CD_SPEED "Hitrost:" #define STR_MO_DRIVES "Magnetno-optični pogoni:" #define STR_ZIP_DRIVES "Pogoni ZIP:" diff --git a/src/win/languages/tr-TR.rc b/src/win/languages/tr-TR.rc index 9a4b2894b..617f0a45a 100644 --- a/src/win/languages/tr-TR.rc +++ b/src/win/languages/tr-TR.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "Makine:" #define STR_CONFIGURE "Ayarla" #define STR_CPU_TYPE "CPU türü:" -#define STR_SPEED "Hız:" +#define STR_CPU_SPEED "Hız:" #define STR_FPU "FPU:" #define STR_WAIT_STATES "Bekleme süreleri:" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "Oyun kolu 4..." #define STR_SOUND "Ses kartı:" -#define STR_MIDI "MIDI Çıkış Cihazı:" +#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" @@ -378,6 +378,7 @@ END #define STR_TURBO "Turbo zamanlamaları" #define STR_CHECKBPB "BPB'yi denetle" #define STR_CDROM_DRIVES "CD-ROM sürücüleri:" +#define STR_CD_SPEED "Hız:" #define STR_MO_DRIVES "MO sürücüleri:" #define STR_ZIP_DRIVES "ZIP sürücüleri:" diff --git a/src/win/languages/zh-CN.rc b/src/win/languages/zh-CN.rc index 2c54dfdf9..668b1a061 100644 --- a/src/win/languages/zh-CN.rc +++ b/src/win/languages/zh-CN.rc @@ -295,7 +295,7 @@ END #define STR_MACHINE "机型:" #define STR_CONFIGURE "配置" #define STR_CPU_TYPE "CPU 类型:" -#define STR_SPEED "速度:" +#define STR_CPU_SPEED "速度:" #define STR_FPU "浮点处理器 (FPU):" #define STR_WAIT_STATES "等待状态 (WS):" #define STR_MB "MB" @@ -317,7 +317,7 @@ END #define STR_JOY4 "操纵杆 4..." #define STR_SOUND "声卡:" -#define STR_MIDI "MIDI 输出设备:" +#define STR_MIDI_OUT "MIDI 输出设备:" #define STR_MIDI_IN "MIDI 输入设备:" #define STR_MPU401 "独立 MPU-401" #define STR_SSI "Innovation SSI-2001" @@ -378,6 +378,7 @@ END #define STR_TURBO "加速时序" #define STR_CHECKBPB "检查 BPB" #define STR_CDROM_DRIVES "光盘驱动器:" +#define STR_CD_SPEED "速度:" #define STR_MO_DRIVES "磁光盘驱动器:" #define STR_ZIP_DRIVES "ZIP 驱动器:" diff --git a/src/win/win_settings.c b/src/win/win_settings.c index 9f72b4f9d..c377f3069 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -2011,7 +2011,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) { int i = 0, bus = 0; - for (i = IDT_1722; i <= IDT_1723; i++) + for (i = IDT_CHANNEL; i <= IDT_ID; i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_ID, FALSE); @@ -2022,7 +2022,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) switch(bus) { case HDD_BUS_MFM: /* MFM */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE); if (assign_id) @@ -2030,7 +2030,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.mfm_channel : temp_hdd[lv1_current_sel].mfm_channel); break; case HDD_BUS_XTA: /* XTA */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE); if (assign_id) @@ -2038,7 +2038,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL, is_add_dlg ? new_hdd.xta_channel : temp_hdd[lv1_current_sel].xta_channel); break; case HDD_BUS_ESDI: /* ESDI */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL, TRUE); if (assign_id) @@ -2047,7 +2047,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) break; case HDD_BUS_IDE: /* IDE */ case HDD_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1722, TRUE); + settings_show_window(hdlg, IDT_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_CHANNEL_IDE, TRUE); if (assign_id) @@ -2055,8 +2055,8 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_HD_CHANNEL_IDE, is_add_dlg ? new_hdd.ide_channel : temp_hdd[lv1_current_sel].ide_channel); break; case HDD_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1723, TRUE); - settings_show_window(hdlg, IDT_1724, TRUE); + settings_show_window(hdlg, IDT_ID, TRUE); + settings_show_window(hdlg, IDT_LUN, TRUE); settings_show_window(hdlg, IDC_COMBO_HD_ID, TRUE); if (assign_id) @@ -2065,7 +2065,7 @@ recalc_location_controls(HWND hdlg, int is_add_dlg, int assign_id) } } - settings_show_window(hdlg, IDT_1721, (hd_listview_items != 0) || is_add_dlg); + settings_show_window(hdlg, IDT_BUS, (hd_listview_items != 0) || is_add_dlg); settings_show_window(hdlg, IDC_COMBO_HD_BUS, (hd_listview_items != 0) || is_add_dlg); } @@ -2528,11 +2528,11 @@ static MVHDGeom create_drive_vhd_fixed(char* filename, int cyl, int heads, int s adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry); HWND h = GetDlgItem(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE); - settings_show_window(vhd_progress_hdlg, IDT_1731, FALSE); + settings_show_window(vhd_progress_hdlg, IDT_FILE_NAME, FALSE); settings_show_window(vhd_progress_hdlg, IDC_EDIT_HD_FILE_NAME, FALSE); settings_show_window(vhd_progress_hdlg, IDC_CFILE, FALSE); settings_show_window(vhd_progress_hdlg, IDC_PBAR_IMG_CREATE, TRUE); - settings_enable_window(vhd_progress_hdlg, IDT_1752, TRUE); + settings_enable_window(vhd_progress_hdlg, IDT_PROGRESS, TRUE); SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) vhd_geometry.cyl * vhd_geometry.heads * vhd_geometry.spt); SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0); @@ -2663,7 +2663,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM settings_set_cur_sel(hdlg, IDC_COMBO_HD_BLOCK_SIZE, 0); settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE); - settings_show_window(hdlg, IDT_1775, FALSE); + settings_show_window(hdlg, IDT_BLOCK_SIZE, FALSE); if (existing & 1) { settings_enable_window(hdlg, IDC_EDIT_HD_SPT, FALSE); @@ -2672,7 +2672,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM settings_enable_window(hdlg, IDC_EDIT_HD_SIZE, FALSE); settings_enable_window(hdlg, IDC_COMBO_HD_TYPE, FALSE); settings_show_window(hdlg, IDC_COMBO_HD_IMG_FORMAT, FALSE); - settings_show_window(hdlg, IDT_1774, FALSE); + settings_show_window(hdlg, IDT_IMG_FORMAT, FALSE); /* adjust window size */ GetWindowRect(hdlg, &rect); @@ -2717,7 +2717,7 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM new_hdd.scsi_id = id; settings_enable_window(hdlg, IDC_EDIT_HD_FILE_NAME, FALSE); - settings_show_window(hdlg, IDT_1752, FALSE); + settings_show_window(hdlg, IDT_PROGRESS, FALSE); settings_show_window(hdlg, IDC_PBAR_IMG_CREATE, FALSE); no_update = 0; @@ -2845,11 +2845,11 @@ win_settings_hard_disks_add_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM size &= 0xfffff; if (size || r) { - settings_show_window(hdlg, IDT_1731, FALSE); + settings_show_window(hdlg, IDT_FILE_NAME, FALSE); settings_show_window(hdlg, IDC_EDIT_HD_FILE_NAME, FALSE); settings_show_window(hdlg, IDC_CFILE, FALSE); settings_show_window(hdlg, IDC_PBAR_IMG_CREATE, TRUE); - settings_enable_window(hdlg, IDT_1752, TRUE); + settings_enable_window(hdlg, IDT_PROGRESS, TRUE); h = GetDlgItem(hdlg, IDC_PBAR_IMG_CREATE); SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) r); @@ -3309,10 +3309,10 @@ hdd_add_file_open_error: if (img_format == 4 || img_format == 5) { /* For dynamic and diff VHDs, show the block size dropdown. */ settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, TRUE); - settings_show_window(hdlg, IDT_1775, TRUE); + settings_show_window(hdlg, IDT_BLOCK_SIZE, TRUE); } else { /* Hide it otherwise. */ settings_show_window(hdlg, IDC_COMBO_HD_BLOCK_SIZE, FALSE); - settings_show_window(hdlg, IDT_1775, FALSE); + settings_show_window(hdlg, IDT_BLOCK_SIZE, FALSE); } break; } @@ -4226,19 +4226,19 @@ cdrom_recalc_location_controls(HWND hdlg, int assign_id) int i = 0; int bus = temp_cdrom[lv2_current_sel].bus_type; - for (i = IDT_1741; i < (IDT_1742 + 1); i++) + for (i = IDT_CD_ID; i <= (IDT_CD_LUN); i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_ID, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_SPEED, bus != CDROM_BUS_DISABLED); - settings_show_window(hdlg, IDT_1758, bus != CDROM_BUS_DISABLED); + settings_show_window(hdlg, IDT_CD_SPEED, bus != CDROM_BUS_DISABLED); if (bus != CDROM_BUS_DISABLED) settings_set_cur_sel(hdlg, IDC_COMBO_CD_SPEED, temp_cdrom[lv2_current_sel].speed - 1); switch(bus) { case CDROM_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1742, TRUE); + settings_show_window(hdlg, IDT_CD_LUN, TRUE); settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, TRUE); if (assign_id) @@ -4247,7 +4247,7 @@ cdrom_recalc_location_controls(HWND hdlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_CD_CHANNEL_IDE, temp_cdrom[lv2_current_sel].ide_channel); break; case CDROM_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1741, TRUE); + settings_show_window(hdlg, IDT_CD_ID, TRUE); settings_show_window(hdlg, IDC_COMBO_CD_ID, TRUE); if (assign_id) @@ -4307,19 +4307,19 @@ mo_recalc_location_controls(HWND hdlg, int assign_id) int i = 0; int bus = temp_mo_drives[lv1_current_sel].bus_type; - for (i = IDT_1771; i < (IDT_1772 + 1); i++) + for (i = IDT_MO_ID; i <= (IDT_MO_CHANNEL); i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_MO_ID, FALSE); settings_show_window(hdlg, IDC_COMBO_MO_CHANNEL_IDE, FALSE); settings_show_window(hdlg, IDC_COMBO_MO_TYPE, bus != MO_BUS_DISABLED); - settings_show_window(hdlg, IDT_1773, bus != MO_BUS_DISABLED); + settings_show_window(hdlg, IDT_MO_TYPE, bus != MO_BUS_DISABLED); if (bus != MO_BUS_DISABLED) settings_set_cur_sel(hdlg, IDC_COMBO_MO_TYPE, temp_mo_drives[lv1_current_sel].type); switch(bus) { case MO_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1772, TRUE); + settings_show_window(hdlg, IDT_MO_CHANNEL, TRUE); settings_show_window(hdlg, IDC_COMBO_MO_CHANNEL_IDE, TRUE); if (assign_id) @@ -4328,7 +4328,7 @@ mo_recalc_location_controls(HWND hdlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_MO_CHANNEL_IDE, temp_mo_drives[lv1_current_sel].ide_channel); break; case MO_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1771, TRUE); + settings_show_window(hdlg, IDT_MO_ID, TRUE); settings_show_window(hdlg, IDC_COMBO_MO_ID, TRUE); if (assign_id) @@ -4374,7 +4374,7 @@ zip_recalc_location_controls(HWND hdlg, int assign_id) int bus = temp_zip_drives[lv2_current_sel].bus_type; - for (i = IDT_1754; i < (IDT_1755 + 1); i++) + for (i = IDT_ZIP_ID; i <= (IDT_ZIP_LUN); i++) settings_show_window(hdlg, i, FALSE); settings_show_window(hdlg, IDC_COMBO_ZIP_ID, FALSE); settings_show_window(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, FALSE); @@ -4385,7 +4385,7 @@ zip_recalc_location_controls(HWND hdlg, int assign_id) switch(bus) { case ZIP_BUS_ATAPI: /* ATAPI */ - settings_show_window(hdlg, IDT_1755, TRUE); + settings_show_window(hdlg, IDT_ZIP_LUN, TRUE); settings_show_window(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, TRUE); if (assign_id) @@ -4394,7 +4394,7 @@ zip_recalc_location_controls(HWND hdlg, int assign_id) settings_set_cur_sel(hdlg, IDC_COMBO_ZIP_CHANNEL_IDE, temp_zip_drives[lv2_current_sel].ide_channel); break; case ZIP_BUS_SCSI: /* SCSI */ - settings_show_window(hdlg, IDT_1754, TRUE); + settings_show_window(hdlg, IDT_ZIP_ID, TRUE); settings_show_window(hdlg, IDC_COMBO_ZIP_ID, TRUE); if (assign_id) From cace1de62124f5631919fa9ad53c4935dd06ad70 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Sun, 30 Jan 2022 23:50:15 -0500 Subject: [PATCH 11/18] Fixes --- src/include/86box/resource.h | 37 ++++++++++++++++++------------------ src/win/languages/dialogs.rc | 2 +- src/win/languages/pl-PL.rc | 2 ++ src/win/win_new_floppy.c | 14 +++++++------- src/win/win_settings.c | 17 +++++++++-------- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index f7143ff54..4b05d1c8e 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -217,26 +217,27 @@ #define IDC_CHECK_SERIAL3 1076 #define IDC_CHECK_SERIAL4 1077 #define IDC_CHECK_PARALLEL1 1078 -#define IDC_CHECK_PARALLEL2 1078 +#define IDC_CHECK_PARALLEL2 1079 #define IDC_CHECK_PARALLEL3 1080 +#define IDC_CHECK_PARALLEL4 1081 -#define IDC_OTHER_PERIPH 1081 /* storage controllers config */ -#define IDC_COMBO_HDC 1082 -#define IDC_CONFIGURE_HDC 1083 -#define IDC_CHECK_IDE_TER 1084 -#define IDC_BUTTON_IDE_TER 1085 -#define IDC_CHECK_IDE_QUA 1086 -#define IDC_BUTTON_IDE_QUA 1087 -#define IDC_GROUP_SCSI 1088 -#define IDC_COMBO_SCSI_1 1088 -#define IDC_COMBO_SCSI_2 1090 -#define IDC_COMBO_SCSI_3 1091 -#define IDC_COMBO_SCSI_4 1092 -#define IDC_CONFIGURE_SCSI_1 1093 -#define IDC_CONFIGURE_SCSI_2 1094 -#define IDC_CONFIGURE_SCSI_3 1095 -#define IDC_CONFIGURE_SCSI_4 1096 -#define IDC_CHECK_CASSETTE 1097 +#define IDC_OTHER_PERIPH 1082 /* storage controllers config */ +#define IDC_COMBO_HDC 1083 +#define IDC_CONFIGURE_HDC 1084 +#define IDC_CHECK_IDE_TER 1085 +#define IDC_BUTTON_IDE_TER 1086 +#define IDC_CHECK_IDE_QUA 1087 +#define IDC_BUTTON_IDE_QUA 1088 +#define IDC_GROUP_SCSI 1089 +#define IDC_COMBO_SCSI_1 1090 +#define IDC_COMBO_SCSI_2 1091 +#define IDC_COMBO_SCSI_3 1092 +#define IDC_COMBO_SCSI_4 1093 +#define IDC_CONFIGURE_SCSI_1 1094 +#define IDC_CONFIGURE_SCSI_2 1095 +#define IDC_CONFIGURE_SCSI_3 1096 +#define IDC_CONFIGURE_SCSI_4 1097 +#define IDC_CHECK_CASSETTE 1098 #define IDC_HARD_DISKS 1100 /* hard disks config */ #define IDC_LIST_HARD_DISKS 1101 diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 111c6e292..c49918e87 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -171,7 +171,7 @@ BEGIN COMBOBOX IDC_COMBO_MIDI_OUT,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT STR_MIDI,IDT_MIDI_OUT,7,28,59,10 + LTEXT STR_MIDI_OUT,IDT_MIDI_OUT,7,28,59,10 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_OUT,214,26,46,12 COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | diff --git a/src/win/languages/pl-PL.rc b/src/win/languages/pl-PL.rc index 52d730882..05c0f3a16 100644 --- a/src/win/languages/pl-PL.rc +++ b/src/win/languages/pl-PL.rc @@ -332,6 +332,7 @@ END #define STR_LPT1 "Urządzenie LPT1:" #define STR_LPT2 "Urządzenie LPT2:" #define STR_LPT3 "Urządzenie LPT3:" +#define STR_LPT4 "Urządzenie LPT4:" #define STR_SERIAL1 "Port szeregowy 1" #define STR_SERIAL2 "Port szeregowy 2" #define STR_SERIAL3 "Port szeregowy 3" @@ -339,6 +340,7 @@ END #define STR_PARALLEL1 "Port równoległy 1" #define STR_PARALLEL2 "Port równoległy 2" #define STR_PARALLEL3 "Port równoległy 3" +#define STR_PARALLEL4 "Port równoległy 4" #define STR_HDC "Kontroler dysku twardego:" #define STR_FDC "Kontroler dyskietek:" diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c index 4f0f1255f..0a4d0c5b6 100644 --- a/src/win/win_new_floppy.c +++ b/src/win/win_new_floppy.c @@ -330,7 +330,7 @@ create_zip_sector_image(char *file_name, disk_size_t disk_size, uint8_t is_zdi, h = GetDlgItem(hwnd, IDC_COMBO_RPM_MODE); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); - h = GetDlgItem(hwnd, IDT_1751); + h = GetDlgItem(hwnd, IDT_FLP_RPM_MODE); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE); @@ -338,7 +338,7 @@ create_zip_sector_image(char *file_name, disk_size_t disk_size, uint8_t is_zdi, SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0); EnableWindow(h, TRUE); ShowWindow(h, SW_SHOW); - h = GetDlgItem(hwnd, IDT_1757); + h = GetDlgItem(hwnd, IDT_FLP_PROGRESS); EnableWindow(h, TRUE); ShowWindow(h, SW_SHOW); @@ -564,7 +564,7 @@ create_mo_sector_image(char *file_name, int8_t disk_size, uint8_t is_mdi, HWND h h = GetDlgItem(hwnd, IDC_COMBO_RPM_MODE); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); - h = GetDlgItem(hwnd, IDT_1751); + h = GetDlgItem(hwnd, IDT_FLP_RPM_MODE); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE); @@ -572,7 +572,7 @@ create_mo_sector_image(char *file_name, int8_t disk_size, uint8_t is_mdi, HWND h SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0); EnableWindow(h, TRUE); ShowWindow(h, SW_SHOW); - h = GetDlgItem(hwnd, IDT_1757); + h = GetDlgItem(hwnd, IDT_FLP_PROGRESS); EnableWindow(h, TRUE); ShowWindow(h, SW_SHOW); @@ -733,7 +733,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) SendMessage(h, CB_SETCURSEL, 0, 0); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); - h = GetDlgItem(hdlg, IDT_1751); + h = GetDlgItem(hdlg, IDT_FLP_RPM_MODE); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); h = GetDlgItem(hdlg, IDOK); @@ -741,7 +741,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) h = GetDlgItem(hdlg, IDC_PBAR_IMG_CREATE); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); - h = GetDlgItem(hdlg, IDT_1757); + h = GetDlgItem(hdlg, IDT_FLP_PROGRESS); EnableWindow(h, FALSE); ShowWindow(h, SW_HIDE); break; @@ -833,7 +833,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) else file_type = 0; } - h = GetDlgItem(hdlg, IDT_1751); + h = GetDlgItem(hdlg, IDT_FLP_RPM_MODE); if (file_type == 2) { EnableWindow(h, TRUE); ShowWindow(h, SW_SHOW); diff --git a/src/win/win_settings.c b/src/win/win_settings.c index c377f3069..86e0500cc 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -1325,7 +1325,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) settings_enable_window(hdlg, IDC_CONFIGURE_SND, sound_card_has_config(temp_sound_card)); c = d = 0; - settings_reset_content(hdlg, IDC_COMBO_MIDI); + settings_reset_content(hdlg, IDC_COMBO_MIDI_OUT); while (1) { generate_device_name(midi_device_getdevice(c), midi_device_get_internal_name(c), 0); @@ -1334,12 +1334,12 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) if (midi_device_available(c)) { if (c == 0) - settings_add_string(hdlg, IDC_COMBO_MIDI, win_get_string(IDS_2103)); + settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, win_get_string(IDS_2103)); else - settings_add_string(hdlg, IDC_COMBO_MIDI, (LPARAM) device_name); + settings_add_string(hdlg, IDC_COMBO_MIDI_OUT, (LPARAM) device_name); settings_list_to_midi[d] = c; if ((c == 0) || (c == temp_midi_device)) - settings_set_cur_sel(hdlg, IDC_COMBO_MIDI, d); + settings_set_cur_sel(hdlg, IDC_COMBO_MIDI_OUT, d); d++; } @@ -1404,8 +1404,8 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) temp_deviceconfig |= deviceconfig_open(hdlg, (void *)sound_card_getdevice(temp_sound_card)); break; - case IDC_COMBO_MIDI: - temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; + case IDC_COMBO_MIDI_OUT: + temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)]; settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device)); settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401); settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow()); @@ -1413,7 +1413,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) break; case IDC_CONFIGURE_MIDI_OUT: - temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; + temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI_OUT)]; temp_deviceconfig |= deviceconfig_open(hdlg, (void *)midi_device_getdevice(temp_midi_device)); break; @@ -1474,7 +1474,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case WM_SAVESETTINGS: temp_sound_card = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_SOUND)]; - temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; + temp_midi_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); @@ -1539,6 +1539,7 @@ win_settings_ports_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) case IDC_CHECK_PARALLEL1: case IDC_CHECK_PARALLEL2: case IDC_CHECK_PARALLEL3: + case IDC_CHECK_PARALLEL4: i = LOWORD(wParam) - IDC_CHECK_PARALLEL1; settings_enable_window(hdlg, IDC_COMBO_LPT1 + i, settings_get_check(hdlg, IDC_CHECK_PARALLEL1 + i) == BST_CHECKED); From 27b85ad31ac0fb404de1af4dc3905c71d8c45694 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 31 Jan 2022 01:43:12 -0500 Subject: [PATCH 12/18] More skeletons --- src/config.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/config.c b/src/config.c index eebc4462e..972fb82ab 100644 --- a/src/config.c +++ b/src/config.c @@ -1076,6 +1076,12 @@ load_ports(void) for (c = 0; c < SERIAL_MAX; c++) { sprintf(temp, "serial%d_enabled", c + 1); serial_enabled[c] = !!config_get_int(cat, temp, (c >= 2) ? 0 : 1); + +/* + sprintf(temp, "serial%d_device", c + 1); + p = (char *) config_get_string(cat, temp, "none"); + com_ports[c].device = com_device_get_from_internal_name(p); +*/ } for (c = 0; c < PARALLEL_MAX; c++) { @@ -2554,6 +2560,15 @@ save_ports(void) config_delete_var(cat, temp); else config_set_int(cat, temp, serial_enabled[c]); + +/* + sprintf(temp, "serial%d_device", c + 1); + if (com_ports[c].device == 0) + config_delete_var(cat, temp); + else + config_set_string(cat, temp, + (char *) com_device_get_internal_name(com_ports[c].device)); +*/ } for (c = 0; c < PARALLEL_MAX; c++) { From 5f0a06bf1c0620c7757e5e7f4a8a16781c9c54a2 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 31 Jan 2022 01:59:45 -0500 Subject: [PATCH 13/18] Fix Ports dialog height --- src/win/languages/dialogs.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index c49918e87..d1bf1a399 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -217,7 +217,7 @@ BEGIN PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_NET,214,44,46,12 END -DLG_CFG_PORTS DIALOG DISCARDABLE 107, 0, 267, 135 +DLG_CFG_PORTS DIALOG DISCARDABLE 107, 0, 267, 150 STYLE DS_CONTROL | WS_CHILD FONT FONT_SIZE, FONT_NAME BEGIN From 4fbb9ddc665db697b991c886a388d018d5df4c81 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 31 Jan 2022 04:36:39 -0500 Subject: [PATCH 14/18] A bit more preperation for serial devices --- src/device.c | 10 ++++++---- src/include/86box/device.h | 25 +++++++++++++------------ 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/device.c b/src/device.c index 7b9d4c167..9a05cce88 100644 --- a/src/device.c +++ b/src/device.c @@ -378,9 +378,7 @@ device_get_name(const device_t *d, int bus, char *name) name[0] = 0x00; if (bus) { - if (d->flags & DEVICE_LPT) - sbus = "LPT"; - else if (d->flags & DEVICE_ISA) + if (d->flags & DEVICE_ISA) sbus = (d->flags & DEVICE_AT) ? "ISA16" : "ISA"; else if (d->flags & DEVICE_CBUS) sbus = "C-BUS"; @@ -396,6 +394,10 @@ device_get_name(const device_t *d, int bus, char *name) sbus = "AGP"; else if (d->flags & DEVICE_AC97) sbus = "AMR"; + else if (d->flags & DEVICE_COM) + sbus = "COM"; + else if (d->flags & DEVICE_LPT) + sbus = "LPT"; if (sbus != NULL) { /* First concatenate [] before the device's name. */ @@ -406,7 +408,7 @@ device_get_name(const device_t *d, int bus, char *name) /* Then change string from ISA16 to ISA if applicable. */ if (!strcmp(sbus, "ISA16")) sbus = "ISA"; - else if (!strcmp(sbus, "LPT")) { + else if (!strcmp(sbus, "LPT")|| !strcmp(sbus, "COM")) { sbus = NULL; strcat(name, d->name); return; diff --git a/src/include/86box/device.h b/src/include/86box/device.h index 040dc3830..4771c87b7 100644 --- a/src/include/86box/device.h +++ b/src/include/86box/device.h @@ -55,18 +55,19 @@ enum { DEVICE_NOT_WORKING = 1, /* does not currently work correctly and will be disabled in a release build */ - DEVICE_LPT = 2, /* requires a parallel port */ - DEVICE_PCJR = 4, /* requires an IBM PCjr */ - DEVICE_AT = 8, /* requires an AT-compatible system */ - DEVICE_PS2 = 0x10, /* requires a PS/1 or PS/2 system */ - DEVICE_ISA = 0x20, /* requires the ISA bus */ - DEVICE_CBUS = 0x40, /* requires the C-BUS bus */ - DEVICE_MCA = 0x80, /* requires the MCA bus */ - DEVICE_EISA = 0x100, /* requires the EISA bus */ - DEVICE_VLB = 0x200, /* requires the PCI bus */ - DEVICE_PCI = 0x400, /* requires the VLB bus */ - DEVICE_AGP = 0x800, /* requires the AGP bus */ - DEVICE_AC97 = 0x1000 /* requires the AC'97 bus */ + DEVICE_PCJR = 2, /* requires an IBM PCjr */ + DEVICE_AT = 4, /* requires an AT-compatible system */ + DEVICE_PS2 = 8, /* requires a PS/1 or PS/2 system */ + DEVICE_ISA = 0x10, /* requires the ISA bus */ + DEVICE_CBUS = 0x20, /* requires the C-BUS bus */ + DEVICE_MCA = 0x40, /* requires the MCA bus */ + DEVICE_EISA = 0x80, /* requires the EISA bus */ + DEVICE_VLB = 0x100, /* requires the PCI bus */ + DEVICE_PCI = 0x200, /* requires the VLB bus */ + DEVICE_AGP = 0x400, /* requires the AGP bus */ + DEVICE_AC97 = 0x800, /* requires the AC'97 bus */ + DEVICE_COM = 0x1000 /* requires a serial port */ + DEVICE_LPT = 0x2000, /* requires a parallel port */ }; From 6423888ff59e158c7c980db8bdde2191406982cf Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 31 Jan 2022 04:39:19 -0500 Subject: [PATCH 15/18] fix mistake --- src/include/86box/device.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/86box/device.h b/src/include/86box/device.h index 4771c87b7..6e7fa53cf 100644 --- a/src/include/86box/device.h +++ b/src/include/86box/device.h @@ -66,8 +66,8 @@ enum { DEVICE_PCI = 0x200, /* requires the VLB bus */ DEVICE_AGP = 0x400, /* requires the AGP bus */ DEVICE_AC97 = 0x800, /* requires the AC'97 bus */ - DEVICE_COM = 0x1000 /* requires a serial port */ - DEVICE_LPT = 0x2000, /* requires a parallel port */ + DEVICE_COM = 0x1000, /* requires a serial port */ + DEVICE_LPT = 0x2000 /* requires a parallel port */ }; From 44fd5b10ac981f6cd5418d39493e04fe0a518e66 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 31 Jan 2022 05:00:52 -0500 Subject: [PATCH 16/18] Moved as requested by lemondrops --- src/sound/sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound/sound.c b/src/sound/sound.c index 892f6a689..b92062665 100644 --- a/src/sound/sound.c +++ b/src/sound/sound.c @@ -85,7 +85,6 @@ static const SOUND_CARD sound_cards[] = { { "none", NULL }, { "internal", NULL }, - { "pssj_isa", &pssj_isa_device }, { "adlib", &adlib_device }, { "adlibgold", &adgold_device }, { "azt2316a", &azt2316a_device }, @@ -105,6 +104,7 @@ static const SOUND_CARD sound_cards[] = #if defined(DEV_BRANCH) && defined(USE_PAS16) { "pas16", &pas16_device }, #endif + { "pssj_isa", &pssj_isa_device }, { "wss", &wss_device }, { "adlib_mca", &adlib_mca_device }, { "ncraudio", &ncr_business_audio_device }, From 1ed4af662c22d71034860faa21ec70955f84eb15 Mon Sep 17 00:00:00 2001 From: Jasmine Iwanek Date: Mon, 31 Jan 2022 05:29:14 -0500 Subject: [PATCH 17/18] Alphabetical --- src/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/device.c b/src/device.c index 9a05cce88..fba365260 100644 --- a/src/device.c +++ b/src/device.c @@ -408,7 +408,7 @@ device_get_name(const device_t *d, int bus, char *name) /* Then change string from ISA16 to ISA if applicable. */ if (!strcmp(sbus, "ISA16")) sbus = "ISA"; - else if (!strcmp(sbus, "LPT")|| !strcmp(sbus, "COM")) { + else if (!strcmp(sbus, "COM")|| !strcmp(sbus, "LPT")) { sbus = NULL; strcat(name, d->name); return; From b764f828b377b2bb2f703824a5075f2ba62cb368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Mon, 31 Jan 2022 16:43:55 +0100 Subject: [PATCH 18/18] Fix status bar disappearing upon returning from full screen --- src/win/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/win/win.c b/src/win/win.c index 801c32ca5..66cf8a85e 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -1140,10 +1140,10 @@ plat_setfullscreen(int on) /* Render window. */ MoveWindow(hwndRender, 0, hide_tool_bar ? 0 : tbar_height, temp_x, temp_y, TRUE); - GetWindowRect(hwndRender, &rect); /* Status bar. */ - MoveWindow(hwndSBAR, 0, rect.bottom, temp_x, sbar_height, TRUE); + GetClientRect(hwndMain, &rect); + MoveWindow(hwndSBAR, 0, rect.bottom - sbar_height, temp_x, sbar_height, TRUE); if (mouse_capture) ClipCursor(&rect);