80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixes

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-30 23:50:15 -05:00
parent 3a140e67d9
commit cace1de621
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/include/86box/resource.h
View File

@@ -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

2
src/win/languages/dialogs.rc
View File

@@ -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 |

2
src/win/languages/pl-PL.rc
View File

@@ -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:"

14
src/win/win_new_floppy.c
View File

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

17
src/win/win_settings.c
View File

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