From 1212ee24922996bdaf5ecd91b794c798e5ba0742 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Wed, 4 Oct 2023 15:00:47 -0400
Subject: [PATCH] Fix some typos in the win ui

---
 src/win/win_new_floppy.c |  2 +-
 src/win/win_settings.c   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c
index 495abfb27..d0a245a45 100644
--- a/src/win/win_new_floppy.c
+++ b/src/win/win_new_floppy.c
@@ -739,7 +739,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, UNUSED(LPARAM l
                         new_floppy_msgbox_header(hdlg, MBX_ERROR, (wchar_t *) IDS_4108, (wchar_t *) IDS_4115);
                         return TRUE;
                     }
-                    /*FALLTHROUGH*/
+                    fallthrough;
                 case IDCANCEL:
                     EndDialog(hdlg, 0);
                     plat_pause(0);
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index b36a8a90b..adeefd8b4 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -4396,7 +4396,7 @@ win_settings_mo_drives_init_columns(HWND hdlg)
 static void
 win_settings_zip_drives_resize_columns(HWND hdlg)
 {
-    int  width[C_COLUMNS_MO_DRIVES] = {
+    int  width[C_COLUMNS_ZIP_DRIVES] = {
                                         C_COLUMNS_ZIP_DRIVES_BUS,
                                         C_COLUMNS_ZIP_DRIVES_TYPE
                                       };
@@ -4713,12 +4713,12 @@ cdrom_recalc_location_controls(HWND hdlg, int assign_id)
     settings_show_window(hdlg, IDC_COMBO_CD_SPEED, bus != CDROM_BUS_DISABLED);
     settings_show_window(hdlg, IDT_CD_SPEED, bus != CDROM_BUS_DISABLED);
 #if 0
-    settings_show_window(hdlg, IDC_CHECKEARLY, bus != CDROM_BUS_DISABLED);
+    settings_show_window(hdlg, IDC_COMBO_CD_TYPE, bus != CDROM_BUS_DISABLED);
 #endif
     if (bus != CDROM_BUS_DISABLED) {
         settings_set_cur_sel(hdlg, IDC_COMBO_CD_SPEED, temp_cdrom[lv2_current_sel].speed - 1);
 #if 0
-    settings_set_check(hdlg, IDC_CHECKEARLY, temp_cdrom[lv2_current_sel].early);
+    settings_set_check(hdlg, IDC_COMBO_CD_TYPE, temp_cdrom[lv2_current_sel].early);
 #endif
     }
 
@@ -4924,7 +4924,7 @@ static void
 mo_track(uint8_t id)
 {
     if (temp_mo_drives[id].bus_type == MO_BUS_ATAPI)
-        ide_tracking |= (1 << (temp_zip_drives[id].ide_channel << 3));
+        ide_tracking |= (1 << (temp_mo_drives[id].ide_channel << 3));
     else if (temp_mo_drives[id].bus_type == MO_BUS_SCSI)
         scsi_tracking[temp_mo_drives[id].scsi_device_id >> 3] |= (1 << (temp_mo_drives[id].scsi_device_id & 0x07));
 }
@@ -4933,7 +4933,7 @@ static void
 mo_untrack(uint8_t id)
 {
     if (temp_mo_drives[id].bus_type == MO_BUS_ATAPI)
-        ide_tracking &= ~(1 << (temp_zip_drives[id].ide_channel << 3));
+        ide_tracking &= ~(1 << (temp_mo_drives[id].ide_channel << 3));
     else if (temp_mo_drives[id].bus_type == MO_BUS_SCSI)
         scsi_tracking[temp_mo_drives[id].scsi_device_id >> 3] &= ~(1 << (temp_mo_drives[id].scsi_device_id & 0x07));
 }
@@ -5110,8 +5110,8 @@ win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam
                     break;
 
 #if 0
-                case IDC_CHECKEARLY:
-                    temp_cdrom[lv2_current_sel].early = settings_get_check(hdlg, IDC_CHECKEARLY);
+                case IDC_COMBO_CD_TYPE::
+                    temp_cdrom[lv2_current_sel].early = settings_get_check(hdlg, IDC_COMBO_CD_TYPE:);
                     win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel);
                     break;
 #endif