A590/A2091 "No ROM" option didn't work in GUI.

diff --git a/include/rommgr.h b/include/rommgr.h
index a2bf23b5e3f650384fa14ce731f20ac84e3e8d7d..608d91c4b9acf35706d41f7ea39a9044cecf3e4c 100644 (file)
--- a/include/rommgr.h
+++ b/include/rommgr.h
@@ -30,14 +30,13 @@ extern int decode_cloanto_rom_do (uae_u8 *mem, int size, int real_size);
 #define ROMTYPE_FASTLANE       0x00100004
 #define ROMTYPE_OKTAGON                0x00100005
 
-#define ROMTYPE_NONE           0x00800000
-
 #define ROMTYPE_EVEN           0x02000000
 #define ROMTYPE_ODD                    0x04000000
 #define ROMTYPE_8BIT           0x08000000
 #define ROMTYPE_BYTESWAP       0x10000000
 #define ROMTYPE_CD32           0x20000000
 #define ROMTYPE_SCRAMBLED      0x40000000
+#define ROMTYPE_NONE           0x80000000
 
 #define ROMTYPE_ALL_KICK (ROMTYPE_KICK | ROMTYPE_KICKCD32 | ROMTYPE_CD32)
 #define ROMTYPE_ALL_EXT (ROMTYPE_EXTCD32 | ROMTYPE_EXTCDTV)

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 705bf541270194762c70b3dd98fe6217fd765812..cc9199e974a4a6fd09b13d6e43e94b7393c9d058 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -8323,7 +8323,8 @@ static void addromfiles (UAEREG *fkey, HWND hDlg, DWORD d, const TCHAR *path, in
                        }
                        if (idx2 >= 0) {
                                struct romdata *rd = getromdatabyidgroup (idx2, group, subitem);
-                               if (rd && ((rd->type & ROMTYPE_GROUP_MASK) & (type & ROMTYPE_GROUP_MASK)) && (rd->type & ROMTYPE_SUB_MASK) == (type & ROMTYPE_SUB_MASK)) {
+                               if (rd && ((((rd->type & ROMTYPE_GROUP_MASK) & (type & ROMTYPE_GROUP_MASK)) && (rd->type & ROMTYPE_SUB_MASK) == (type & ROMTYPE_SUB_MASK)) ||
+                                       (rd->type & type) == ROMTYPE_NONE)) {
                                        getromname (rd, tmp);
                                        if (SendDlgItemMessage (hDlg, d, CB_FINDSTRING, (WPARAM)-1, (LPARAM)tmp) < 0)
                                                SendDlgItemMessage(hDlg, d, CB_ADDSTRING, 0, (LPARAM)tmp);
@@ -10053,7 +10054,7 @@ static void volumeselectfile (HWND hDlg)
                regquerystr (NULL, _T("FilesystemFilePath"), directory_path, &out);
        }
        if (DiskSelection (hDlg, 0, 14, &workprefs, directory_path)) {
-               TCHAR *s = filesys_createvolname (NULL, directory_path, _T("Harddrive"));
+               TCHAR *s = filesys_createvolname (NULL, directory_path, NULL, _T("Harddrive"));
                SetDlgItemText (hDlg, IDC_PATH_NAME, directory_path);
                SetDlgItemText (hDlg, IDC_VOLUME_NAME, s);
                xfree (s);
@@ -16579,6 +16580,8 @@ int dragdrop (HWND hDlg, HDROP hd, struct uae_prefs *prefs, int currentpage)
                                default_fsvdlg (&current_fsvdlg);
                                _tcscpy (current_fsvdlg.ci.rootdir, file);
                                add_filesys_config (&workprefs, -1, &current_fsvdlg.ci);
+                       } else if (harddrive) {
+                               do_filesys_insert (file);
                        } else {
                                drv = floppyslot_addfile (prefs, file, drv, firstdrv, i);
                                if (drv < 0)