Full drive/RDB mode button is now a checkbox

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 60aae0f3f575d6a1889a32ac34bacbcc6a7d21fc..4fc3c9e5694a1cb97162af710ccc4c0aeec74c38 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -675,9 +675,8 @@ BEGIN
     EDITTEXT        IDC_RESERVED,347,125,40,15,ES_NUMBER
     RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,147,45,10
     EDITTEXT        IDC_BLOCKSIZE,347,144,40,15,ES_NUMBER
-    LTEXT           "HD Controller:",IDC_STATIC,10,127,54,10,SS_CENTERIMAGE
-    PUSHBUTTON      "Full drive/RDB mode",IDC_HDF_RDB,83,123,127,14
-    COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,123,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "HD Controller:",IDC_STATIC,10,131,54,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_HDF_FEATURE_LEVEL,163,123,126,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER,6,145,152,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_UNIT,163,145,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_TYPE,231,145,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -695,6 +694,7 @@ BEGIN
     PUSHBUTTON      "OK",IDOK,147,271,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,203,271,50,14
     RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,128,43,10,NOT WS_VISIBLE
+    CONTROL         "Full drive/RDB mode",IDC_HDF_RDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,117,95,10
 END
 
 IDD_FILESYS DIALOGEX 15, 25, 396, 111

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 686c1d00e41fbe68dd4a287e1b41b3cbc30af605..7a5b024a1cf7952eb9c8d44c9cf343ee4e360720 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -14091,6 +14091,7 @@ static void hardfile_testrdb (struct hfdlg_vals *hdf)
        memset (&hfd, 0, sizeof hfd);
        hfd.ci.readonly = true;
        hfd.ci.blocksize = 512;
+       hdf->rdb = 0;
        if (hdf_open (&hfd, current_hfdlg.ci.rootdir) > 0) {
                for (i = 0; i < 16; i++) {
                        hdf_read_rdb (&hfd, id, i * 512, 512);
@@ -14115,6 +14116,7 @@ static void hardfile_testrdb (struct hfdlg_vals *hdf)
                                hdf->ci.devname[0] = 0;
                                if (blocksize >= 512)
                                        hdf->ci.blocksize = blocksize;
+                               hdf->rdb = 1;
                                break;
                        }
                }
@@ -14405,6 +14407,7 @@ static void sethardfile (HWND hDlg)
        bool rdb = is_hdf_rdb ();
        bool physgeo = rdb && ischecked(hDlg, IDC_HDF_PHYSGEOMETRY);
        bool disables = !rdb || (rdb && current_hfdlg.ci.controller_type == HD_CONTROLLER_TYPE_UAE);
+       bool rdsk = current_hfdlg.rdb;
 
        sethd(hDlg);
        if (!disables)
@@ -14420,7 +14423,6 @@ static void sethardfile (HWND hDlg)
        CheckDlgButton (hDlg, IDC_HDF_RW, !current_hfdlg.ci.readonly);
        CheckDlgButton (hDlg, IDC_HDF_AUTOBOOT, ISAUTOBOOT(&current_hfdlg.ci));
        CheckDlgButton (hDlg, IDC_HDF_DONOTMOUNT, !ISAUTOMOUNT(&current_hfdlg.ci));
-       ew (hDlg, IDC_HDF_RDB, !rdb);
        ew (hDlg, IDC_HDF_AUTOBOOT, disables);
        ew (hDlg, IDC_HDF_DONOTMOUNT, disables);
        hide (hDlg, IDC_HDF_AUTOBOOT, !disables);
@@ -14428,8 +14430,16 @@ static void sethardfile (HWND hDlg)
        hide (hDlg, IDC_HARDFILE_BOOTPRI, !disables);
        hide (hDlg, IDC_HARDFILE_BOOTPRI_TEXT, !disables);
        hide (hDlg, IDC_HDF_PHYSGEOMETRY, !rdb);
-       if (!rdb)
+       if (rdb) {
+               ew(hDlg, IDC_HDF_RDB, !rdsk);
+               setchecked(hDlg, IDC_HDF_RDB, true);
+       } else {
+               ew(hDlg, IDC_HDF_RDB, TRUE);
+               setchecked(hDlg, IDC_HDF_RDB, false);
+       }
+       if (!rdb) {
                setchecked(hDlg, IDC_HDF_PHYSGEOMETRY, false);
+       }
        hide(hDlg, IDC_RESERVED_TEXT, rdb);
        hide(hDlg, IDC_CYLINDERS_TEXT, !rdb);
        gui_set_string_cursor(hdmenutable, hDlg, IDC_HDF_CONTROLLER, current_hfdlg.ci.controller_type +  current_hfdlg.ci.controller_type_unit * HD_CONTROLLER_NEXT_UNIT);
@@ -15200,11 +15210,18 @@ static INT_PTR CALLBACK HardfileSettingsProc (HWND hDlg, UINT msg, WPARAM wParam
                        SetDlgItemInt (hDlg, IDC_HARDFILE_BOOTPRI, current_hfdlg.ci.bootpri, TRUE);
                        break;
                case IDC_HDF_RDB:
-                       SetDlgItemText (hDlg, IDC_PATH_FILESYS, _T(""));
-                       SetDlgItemText (hDlg, IDC_HARDFILE_DEVICE, _T(""));
-                       current_hfdlg.ci.sectors = current_hfdlg.ci.reserved = current_hfdlg.ci.surfaces = 0;
-                       current_hfdlg.ci.bootpri = 0;
-                       sethardfile (hDlg);
+                       if (ischecked(hDlg, IDC_HDF_RDB)) {
+                               SetDlgItemText(hDlg, IDC_PATH_FILESYS, _T(""));
+                               SetDlgItemText(hDlg, IDC_HARDFILE_DEVICE, _T(""));
+                               current_hfdlg.ci.sectors = current_hfdlg.ci.reserved = current_hfdlg.ci.surfaces = 0;
+                               current_hfdlg.ci.bootpri = 0;
+                       } else {
+                               TCHAR tmp[MAX_DPATH];
+                               _tcscpy(tmp, current_hfdlg.ci.rootdir);
+                               default_hfdlg(&current_hfdlg, false);
+                               _tcscpy(current_hfdlg.ci.rootdir, tmp);
+                       }
+                       sethardfile(hDlg);
                        break;
                case IDC_PATH_GEOMETRY_SELECTOR:
                        if (DiskSelection (hDlg, IDC_PATH_GEOMETRY, 23, &workprefs, NULL, current_hfdlg.ci.geometry)) {
@@ -15220,7 +15237,7 @@ static INT_PTR CALLBACK HardfileSettingsProc (HWND hDlg, UINT msg, WPARAM wParam
                        if (v != *p) {
                                set_phys_cyls(hDlg);
                                updatehdfinfo (hDlg, true, false, false);
-                               ew (hDlg, IDC_HDF_RDB, !is_hdf_rdb ());
+                               setchecked(hDlg, IDC_HDF_RDB, !is_hdf_rdb());
                        }
                        break;
                case IDC_RESERVED:
@@ -15232,7 +15249,7 @@ static INT_PTR CALLBACK HardfileSettingsProc (HWND hDlg, UINT msg, WPARAM wParam
                                        current_hfdlg.ci.physical_geometry = true;
                                }
                                updatehdfinfo (hDlg, true, false, false);
-                               ew (hDlg, IDC_HDF_RDB, !is_hdf_rdb ());
+                               setchecked(hDlg, IDC_HDF_RDB, !is_hdf_rdb());
                        }
                        break;
                case IDC_HEADS:
@@ -15242,7 +15259,7 @@ static INT_PTR CALLBACK HardfileSettingsProc (HWND hDlg, UINT msg, WPARAM wParam
                        if (v != *p) {
                                set_phys_cyls(hDlg);
                                updatehdfinfo (hDlg, true, false, false);
-                               ew (hDlg, IDC_HDF_RDB, !is_hdf_rdb ());
+                               setchecked(hDlg, IDC_HDF_RDB, !is_hdf_rdb());
                        }
                        break;
                case IDC_BLOCKSIZE:
@@ -15479,7 +15496,7 @@ static INT_PTR CALLBACK HarddriveSettingsProc (HWND hDlg, UINT msg, WPARAM wPara
                                if (v != *p) {
                                        set_phys_cyls(hDlg);
                                        updatehdfinfo (hDlg, true, false, true);
-                                       ew (hDlg, IDC_HDF_RDB, !is_hdf_rdb ());
+                                       setchecked(hDlg, IDC_HDF_RDB, !is_hdf_rdb());
                                }
                                break;
                        case IDC_RESERVED:
@@ -15491,7 +15508,7 @@ static INT_PTR CALLBACK HarddriveSettingsProc (HWND hDlg, UINT msg, WPARAM wPara
                                                current_hfdlg.ci.physical_geometry = true;
                                        }
                                        updatehdfinfo (hDlg, true, false, true);
-                                       ew (hDlg, IDC_HDF_RDB, !is_hdf_rdb ());
+                                       setchecked(hDlg, IDC_HDF_RDB, !is_hdf_rdb());
                                }
                                break;
                        case IDC_HEADS:
@@ -15501,7 +15518,7 @@ static INT_PTR CALLBACK HarddriveSettingsProc (HWND hDlg, UINT msg, WPARAM wPara
                                if (v != *p) {
                                        set_phys_cyls(hDlg);
                                        updatehdfinfo (hDlg, true, false, true);
-                                       ew (hDlg, IDC_HDF_RDB, !is_hdf_rdb ());
+                                       setchecked(hDlg, IDC_HDF_RDB, !is_hdf_rdb());
                                }
                                break;
                }