From fe17808964b02ff934556118c18e42d2756ef408 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 6 Sep 2014 14:27:23 +0300 Subject: [PATCH] A590/A2091 "No ROM" option didn't work in GUI. --- include/rommgr.h | 3 +-- od-win32/win32gui.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/rommgr.h b/include/rommgr.h index a2bf23b5..608d91c4 100644 --- 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 705bf541..cc9199e9 100644 --- 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 (¤t_fsvdlg); _tcscpy (current_fsvdlg.ci.rootdir, file); add_filesys_config (&workprefs, -1, ¤t_fsvdlg.ci); + } else if (harddrive) { + do_filesys_insert (file); } else { drv = floppyslot_addfile (prefs, file, drv, firstdrv, i); if (drv < 0) -- 2.47.3