From cdc1250038b27bd3de3db69f0878f6db023cd9c6 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Tue, 24 Jul 2007 16:48:12 +0300 Subject: [PATCH] imported winuaesrc1430b12.zip --- ar.c | 80 +- custom.c | 56 +- memory.c | 7 +- od-win32/resources/resource | 944 ++++++++++++++++++++++ od-win32/resources/resource.h | 6 +- od-win32/resources/winuae.rc | 18 +- od-win32/win32.h | 6 +- od-win32/win32gui.c | 39 +- od-win32/winuae_msvc/winuae_msvc.8.vcproj | 4 + od-win32/winuaechangelog.txt | 13 +- 10 files changed, 1101 insertions(+), 72 deletions(-) create mode 100755 od-win32/resources/resource diff --git a/ar.c b/ar.c index eb37f674..04ccf792 100755 --- a/ar.c +++ b/ar.c @@ -155,6 +155,8 @@ * CIA-A: 0xb40000 (0x000, 0x100,...) * CIA-B: 0xb40001 (0x001, 0x101,...) * Custom: 0xe40000 + * + * NOTE: emulation also supports 0xd40000 relocated "rom"-images */ /* X-Power 500: @@ -168,11 +170,12 @@ /* Nordic Power: * - * ROM: 0xf00000 (64k) - * RAM: 0xf40000 (32k) - * CIA-A: 0xf47c00 (00,02,04,...) - * CIA-B: 0xf47c01 (01,03,05,...) - * Custom: 0xf47c00 (from 0x20->) + * ROM: 0xf00000 (64k, mirrored at 0xf10000) + * RAM: 0xf40000 (32k, mirrored at 0xf48000 - 0xf5ffff) + * CIA-A: 0xf43c00 (00,02,04,...) + * CIA-B: 0xf43c01 (01,03,05,...) + * Custom: 0xf43c00 (from 0x20->) + * addresses 0 to 1023: 0xf40000 (weird feature..) */ #include "sysconfig.h" @@ -222,8 +225,9 @@ static uae_u8 *hrtmemory = 0, *hrtmemory2 = 0, *hrtmemory3 = 0; static uae_u8 *armemory_rom = 0, *armemory_ram = 0; static uae_u32 hrtmem_mask, hrtmem2_mask, hrtmem3_mask; -static uae_u8 *hrtmon_custom, *hrtmon_ciaa, *hrtmon_ciab; +static uae_u8 *hrtmon_custom, *hrtmon_ciaa, *hrtmon_ciab, *hrtmon_zeropage; uae_u32 hrtmem_start, hrtmem2_start, hrtmem3_start, hrtmem_size, hrtmem2_size, hrtmem2_size2, hrtmem3_size; +uae_u32 hrtmem_end, hrtmem2_end; static int hrtmem_rom; static int triggered_once; @@ -966,6 +970,8 @@ static void hrtmon_go (void) cartridge_enter(); hrtmon_flag = ACTION_REPLAY_ACTIVE; set_special (®s, SPCFLAG_ACTION_REPLAY); + if (hrtmon_zeropage) + memcpy (hrtmon_zeropage, chipmemory, 1024); if (hrtmon_custom) memcpy (hrtmon_custom, ar_custom, 2 * 256); for (i = 0; i < 16; i++) { @@ -1521,14 +1527,14 @@ static int superiv_init(struct romdata *rd, struct zfile *f) hrtmem2_start = 0xf20000; hrtmem2_size = 0x10000; hrtmem_rom = 1; - hrtmon_ciadiv = 2; } else if (subtype == 66 || subtype == 67) { /* nordic */ hrtmem_start = 0xf00000; hrtmem_size = 0x10000; + hrtmem_end = 0xf20000; hrtmem2_start = 0xf40000; + hrtmem2_end = 0xf60000; hrtmem2_size = 0x10000; hrtmem_rom = 1; - hrtmon_ciadiv = 2; } else { /* super4 */ hrtmem_start = 0xd00000; hrtmem_size = 0x40000; @@ -1568,15 +1574,18 @@ static int superiv_init(struct romdata *rd, struct zfile *f) hrtmon_custom = hrtmemory2 + 0xfc00; hrtmon_ciaa = hrtmemory2 + 0xfc00; hrtmon_ciab = hrtmemory2 + 0xfc01; + hrtmon_ciadiv = 2; chip += 0x30000; hrtmemory2[0xfc80] = chip >> 24; hrtmemory2[0xfc81] = chip >> 16; hrtmemory2[0xfc82] = chip >> 8; hrtmemory2[0xfc83] = chip >> 0; } else if (subtype == 66 || subtype == 67) { - hrtmon_custom = hrtmemory2 + 0x7c00; - hrtmon_ciaa = hrtmemory2 + 0x7c00; - hrtmon_ciab = hrtmemory2 + 0x7c01; + hrtmon_custom = hrtmemory2 + 0x3c00; + hrtmon_ciaa = hrtmemory2 + 0x3c00; + hrtmon_ciab = hrtmemory2 + 0x3c01; + hrtmon_ciadiv = 2; + hrtmon_zeropage = hrtmemory2 + 0; /* eh? why not just use CPU? */ } else { hrtmon_custom = hrtmemory3 + 0x040000; hrtmon_ciaa = hrtmemory2 + 0x040000; @@ -1613,7 +1622,7 @@ int action_replay_load(void) rd = getromdatabypath(currprefs.cartfile); if (rd && rd->id == 62) return superiv_init(rd, NULL); - f = zfile_fopen(currprefs.cartfile,"rb"); + f = zfile_fopen(currprefs.cartfile, "rb"); if (!f) { write_log("failed to load '%s' cartridge ROM\n", currprefs.cartfile); return 0; @@ -1706,6 +1715,9 @@ void action_replay_cleanup() cart_type = 0; hrtmem_rom = 0; hrtmon_ciadiv = 256; + hrtmon_zeropage = 0; + hrtmem_end = 0; + hrtmem2_end = 0; } #ifndef FALSE @@ -1815,22 +1827,54 @@ int hrtmon_load(void) void hrtmon_map_banks() { + uaecptr addr; + if(!hrtmemory) return; - map_banks (&hrtmem_bank, hrtmem_start >> 16, hrtmem_size >> 16, 0); - if (hrtmem2_size) - map_banks (&hrtmem2_bank, hrtmem2_start >> 16, hrtmem2_size2 >> 16, 0); + + addr = hrtmem_start; + while (addr != hrtmem_end) { + map_banks (&hrtmem_bank, addr >> 16, hrtmem_size >> 16, 0); + addr += hrtmem_size; + if (!hrtmem_end) + break; + } + if (hrtmem2_size) { + addr = hrtmem2_start; + while (addr != hrtmem2_end) { + map_banks (&hrtmem2_bank, addr >> 16, hrtmem2_size2 >> 16, 0); + addr += hrtmem2_size; + if (!hrtmem2_end) + break; + } + } if (hrtmem3_size) map_banks (&hrtmem3_bank, hrtmem3_start >> 16, hrtmem3_size >> 16, 0); } static void hrtmon_unmap_banks() { + uaecptr addr; + if(!hrtmemory) return; - map_banks (&dummy_bank, hrtmem_start >> 16, hrtmem_size >> 16, 0); - if (hrtmem2_size) - map_banks (&dummy_bank, hrtmem2_start >> 16, hrtmem2_size2 >> 16, 0); + + addr = hrtmem_start; + while (addr != hrtmem_end) { + map_banks (&dummy_bank, addr >> 16, hrtmem_size >> 16, 0); + addr += hrtmem_size; + if (!hrtmem_end) + break; + } + if (hrtmem2_size) { + addr = hrtmem2_start; + while (addr != hrtmem2_end) { + map_banks (&dummy_bank, addr >> 16, hrtmem2_size2 >> 16, 0); + addr += hrtmem2_size; + if (!hrtmem2_end) + break; + } + } if (hrtmem3_size) map_banks (&dummy_bank, hrtmem3_start >> 16, hrtmem3_size >> 16, 0); } diff --git a/custom.c b/custom.c index 7015b7e8..94b7ebf7 100755 --- a/custom.c +++ b/custom.c @@ -727,8 +727,8 @@ STATIC_INLINE void compute_delay_offset (void) { delayoffset = (16 << fetchmode) - (((plfstrt - HARD_DDF_START) & fetchstart_mask) << 1); #if 0 - /* maybe we can finally get rid of this stupid table.. */ - if (tmp == 4) + /* maybe we can finally get rid of this stupid table.. */ + if (tmp == 4) delayoffset = 4; // Loons Docs else if (tmp == 8) delayoffset = 8; @@ -2330,6 +2330,7 @@ static void calcdiw (void) plfstrt = ddfstrt; plfstop = ddfstop; /* probably not the correct place.. */ + /* ECS/AGA and ddfstop > maxhpos = always-on display */ if (currprefs.chipset_mask & CSMASK_ECS_AGNUS) { if (ddfstop > maxhpos) plfstrt = 0; @@ -2593,19 +2594,14 @@ static void DMACON (int hpos, uae_u16 v) } } if ((dmacon & DMA_BLITPRI) > (oldcon & DMA_BLITPRI) && bltstate != BLT_done) { - static int count = 0; - if (!count) { - count = 1; - write_log ("warning: program is doing blitpri hacks.\n"); - } - set_special (®s, SPCFLAG_BLTNASTY); decide_blitter (hpos); + set_special (®s, SPCFLAG_BLTNASTY); } if (dmaen (DMA_BLITTER) && bltstate == BLT_init) bltstate = BLT_work; if ((dmacon & (DMA_BLITPRI | DMA_BLITTER | DMA_MASTER)) != (DMA_BLITPRI | DMA_BLITTER | DMA_MASTER)) { - unset_special (®s, SPCFLAG_BLTNASTY); decide_blitter (hpos); + unset_special (®s, SPCFLAG_BLTNASTY); } if (changed & (DMA_MASTER | 0x0f)) audio_hsync (0); @@ -2801,7 +2797,7 @@ static void BPLCON0 (int hpos, uae_u16 v) hpos_previous = hpos; } - if (((v & 4) && !interlace_seen) || (!(v & 4) && interlace_seen)) + if ((v & 4) && !interlace_seen) interlace_started = 2; ddf_change = vpos; @@ -4309,24 +4305,23 @@ static void hsync_handler (void) hpos_lpen = lightpen_cx; lightpen_triggered = 1; } - + } #ifdef CD32 - AKIKO_hsync_handler (); + AKIKO_hsync_handler (); #endif #ifdef CDTV - CDTV_hsync_handler (); + CDTV_hsync_handler (); #endif #ifdef CPUEMU_12 - if (currprefs.cpu_cycle_exact || currprefs.blitter_cycle_exact) { - decide_blitter (hpos); - memset (cycle_line, 0, sizeof cycle_line); - cycle_line[9] = CYCLE_REFRESH; - cycle_line[3] = CYCLE_REFRESH; - cycle_line[5] = CYCLE_REFRESH; - cycle_line[7] = CYCLE_REFRESH; - } -#endif + if (currprefs.cpu_cycle_exact || currprefs.blitter_cycle_exact) { + decide_blitter (hpos); + memset (cycle_line, 0, sizeof cycle_line); + cycle_line[9] = CYCLE_REFRESH; + cycle_line[3] = CYCLE_REFRESH; + cycle_line[5] = CYCLE_REFRESH; + cycle_line[7] = CYCLE_REFRESH; } +#endif eventtab[ev_hsync].evtime += get_cycles () - eventtab[ev_hsync].oldcycles; eventtab[ev_hsync].oldcycles = get_cycles (); @@ -5228,18 +5223,31 @@ static void REGPARAM2 custom_wput (uaecptr addr, uae_u32 value) write_log ("%d:%d:wput: %04.4X %04.4X pc=%p\n", hpos, vpos, addr & 0x01fe, value & 0xffff, m68k_getpc()); #endif sync_copper_with_cpu (hpos, 1); + if (addr & 1) { + addr &= ~1; + custom_wput_1 (hpos, addr, (value >> 8) | (value & 0xff00), 0); + custom_wput_1 (hpos, addr + 2, (value << 8) | (value & 0x00ff), 0); + return; + } custom_wput_1 (hpos, addr, value, 0); } static void REGPARAM2 custom_bput (uaecptr addr, uae_u32 value) { + uae_u16 rval = (value << 8) | (value & 0xFF); static int warned; - uae_u16 rval = (value << 8) | (value & 0xFF); #ifdef JIT special_mem |= S_WRITE; #endif - custom_wput (addr & ~1, rval); + if (currprefs.cpu_level == 68060) { + if (addr & 1) + custom_wput (addr & ~1, rval); + else + custom_wput (addr, value << 8); + } else { + custom_wput (addr & ~1, rval); + } if (warned < 10) { if (M68K_GETPC < 0xe00000 || M68K_GETPC >= 0x10000000) { write_log ("Byte put to custom register %04.4X PC=%08.8X\n", addr, M68K_GETPC); diff --git a/memory.c b/memory.c index ca896816..2adffec7 100755 --- a/memory.c +++ b/memory.c @@ -212,9 +212,10 @@ static struct romdata roms[] = { { "Freezer: X-Power Professional 500 v1.2", 1, 2, 1, 2, "XPOWER\0", 131072, 65, 0, 0, ROMTYPE_SUPERIV, 1, 0x9e70c231, 0xa2977a1c,0x41a8ca7d,0x4af4a168,0x726da542,0x179d5963 }, /* only 2 bad dumps available */ - { "Freezer: Nordic Power v?", 0, 0, 0, 0, "NPOWER\0", 65536, 66, 0, 0, ROMTYPE_SUPERIV, 1, }, - { "Freezer: Nordic Power v?", 0, 0, 0, 0, "NPOWER\0", 65536, 67, 0, 0, ROMTYPE_SUPERIV, 1, }, + { "Freezer: Nordic Power v1", 0, 0, 0, 0, "NPOWER\0", 65536, 66, 0, 0, ROMTYPE_SUPERIV, 1, }, //0xdd16cdec, 0xfd882967,0x87e2da5f,0x4ef6be32,0x5f7c9324,0xb5bd8e64 }, + { "Freezer: Nordic Power v2.0", 2, 0, 2, 0, "NPOWER\0", 65536, 67, 0, 0, ROMTYPE_SUPERIV, 1, + 0xa4db2906, 0x0aec68f7,0x25470c89,0x6b699ff4,0x6623dec5,0xc777466e }, { "Freezer: HRTMon v2.30 (built-in)", 0, 0, 0, 0, "HRTMON\0", 0, 63, 0, 0, ROMTYPE_HRTMON, 1, 0xffffffff, 0, 0, 0, 0, 0, "HRTMon" }, @@ -1751,7 +1752,7 @@ addrbank chipmem_agnus_bank = { addrbank chipmem_bank_ce2 = { chipmem_lget_ce2, chipmem_wget_ce2, chipmem_bget_ce2, chipmem_lput_ce2, chipmem_wput_ce2, chipmem_bput_ce2, - chipmem_xlate, chipmem_check, NULL, "Chip memory", + chipmem_xlate, chipmem_check, NULL, "Chip memory (68020 'ce')", chipmem_lget_ce2, chipmem_wget_ce2, ABFLAG_RAM }; #endif diff --git a/od-win32/resources/resource b/od-win32/resources/resource new file mode 100755 index 00000000..7ddf1078 --- /dev/null +++ b/od-win32/resources/resource @@ -0,0 +1,944 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by winuae.rc +// +#define IDS_KICKSTART 1 +#define IDS_DISK 2 +#define IDS_DISPLAY 3 +#define IDC_HARDDRIVE_IMAGE 3 +#define IDS_HARDDISK 4 +#define IDS_FLOPPY 5 +#define IDS_ABOUT 6 +#define IDS_LOADSAVE 7 +#define IDS_AVIOUTPUT 8 +#define IDS_PORTS 9 +#define IDS_MISC1 10 +#define IDS_MEMORY 11 +#define IDS_CPU 12 +#define IDS_CHIPSET 13 +#define IDS_INPUT 14 +#define IDS_OPENGL 15 +#define IDS_FILTER 15 +#define IDS_MISC2 16 +#define IDS_PATHS 17 +#define IDS_QUICKSTART 18 +#define IDS_FRONTEND 19 +#define IDS_CHIPSET2 20 +#define IDS_EXTTEXT 100 +#define IDS_EXTACTUAL 101 +#define IDS_SOUND 102 +#define IDS_CDROM 103 +#define IDS_FRAMERATE 104 +#define IDS_SECOND 105 +#define IDS_THIRD 106 +#define IDD_KICKSTART 107 +#define IDS_FOURTH 107 +#define IDD_DISPLAY 108 +#define IDS_FIFTH 108 +#define IDD_MEMORY 109 +#define IDS_SIXTH 109 +#define IDD_FLOPPY 110 +#define IDS_SEVENTH 110 +#define IDD_CPU 111 +#define IDS_EIGHTH 111 +#define IDD_ABOUT 112 +#define IDS_NINTH 112 +#define IDD_HARDDISK 113 +#define IDS_TENTH 113 +#define IDS_SELECTADF 114 +#define IDS_ADF 115 +#define IDS_CHOOSEBLANK 116 +#define IDS_SELECTHDF 117 +#define IDS_HDF 118 +#define IDS_SELECTUAE 119 +#define IDS_UAE 120 +#define IDS_SELECTROM 121 +#define IDD_SOUND 122 +#define IDS_ROM 122 +#define IDI_APPICON 123 +#define IDS_SELECTKEY 123 +#define IDI_CPU 124 +#define IDS_KEY 124 +#define IDI_ABOUT 125 +#define IDS_SELECTINFO 125 +#define IDS_NONE 126 +#define IDS_VOLUME 127 +#define IDI_HARDDISK 128 +#define IDS_PATH 128 +#define IDS_RW 129 +#define IDI_SOUND 130 +#define IDS_SECTORS 130 +#define IDS_SURFACES 131 +#define IDS_RESERVED 132 +#define IDS_BLOCKSIZE 133 +#define IDI_FLOPPY 134 +#define IDS_NAME 134 +#define IDD_LOADSAVE 135 +#define IDS_DESCRIPTION 135 +#define IDS_ONEINSTANCE 136 +#define IDI_PORTS 137 +#define IDS_INSTALLDIRECTX 137 +#define IDD_PORTS 138 +#define IDS_REGKEYCREATEFAILED 138 +#define IDS_COULDNOTLOADCONFIG 139 +#define IDD_CONTRIBUTORS 140 +#define IDS_NOHELP 140 +#define IDD_MISC1 141 +#define IDS_MUSTSELECTCONFIG 141 +#define IDD_HARDFILE 142 +#define IDS_NOAGA 142 +#define IDD_FILESYS 143 +#define IDS_INVALIDCOMPORT 143 +#define IDS_WSOCK2NEEDED 144 +#define IDD_MISC2 144 +#define IDS_UNSUPPORTEDPIXELFORMAT 145 +#define IDS_WAVEOUTOPENFAILURE 146 +#define IDS_MUSTENTERNAME 147 +#define IDS_MUSTSELECTCONFIGFORDELETE 148 +#define IDS_DELETECONFIGCONFIRMATION 149 +#define IDI_MISC1 150 +#define IDS_DELETECONFIGTITLE 150 +#define IDC_MYHAND 151 +#define IDS_GFXCARDCHECK 151 +#define IDD_DIALOG1 152 +#define IDS_GFXCARDTITLE 152 +#define IDD_DEBUGGER 152 +#define IDD_SETINFO 153 +#define IDS_MUSTSELECTPATH 153 +#define IDI_ICON1 153 +#define IDS_SETTINGSERROR 154 +#define IDD_CHIPSET 154 +#define IDS_MUSTSELECTNAME 155 +#define IDI_MOVE_UP 155 +#define IDD_CHIPSET2 155 +#define IDS_MUSTSELECTFILE 156 +#define IDI_MOVE_DOWN 156 +#define IDS_FAILEDHARDFILECREATION 157 +#define IDD_AVIOUTPUT 157 +#define IDS_CREATIONERROR 158 +#define IDI_AVIOUTPUT 158 +#define IDS_ERRORTITLE 159 +#define IDS_SELECTFILESYSROOT 160 +#define IDD_OPENGL 160 +#define IDD_FILTER 160 +#define IDS_DEFAULTMIDIOUT 161 +#define IDS_DEFAULTMIDIIN 162 +#define IDS_CONTRIBUTORS1 163 +#define IDD_HARDDRIVE 163 +#define IDS_CONTRIBUTORS2 164 +#define IDS_INVALIDPRTPORT 165 +#define IDS_SELECTUSS 166 +#define IDS_RESTOREUSS 166 +#define IDS_USS 167 +#define IDS_WRONGOSVERSION 168 +#define IDR_DRIVE_STARTUP_A500_1 168 +#define IDS_SELECTFLASH 169 +#define IDR_DRIVE_CLICK_A500_1 169 +#define IDS_FLASH 170 +#define IDR_DRIVE_SPIN_A500_1 170 +#define IDD_INPUT 171 +#define IDS_INPUTHOSTWIDGET 171 +#define IDI_INPUT 172 +#define IDS_INPUTAMIGAEVENT 172 +#define IDD_DISK 172 +#define IDS_INPUTAUTOFIRE 173 +#define IDS_SAVEUSS 174 +#define IDS_MIDIOVERFLOW 175 +#define IDS_HFDSIZE 176 +#define IDS_DEVICE 177 +#define IDS_BOOTPRI 178 +#define IDS_WRONGDXVERSION 179 +#define IDI_MISC2 180 +#define IDS_FLOPPY_COMPATIBLE 180 +#define IDR_DRIVE_SNATCH_A500_1 181 +#define IDS_FLOPPY_TURBO 181 +#define IDI_DISK 182 +#define IDR_DRIVE_SPINND_A500_1 182 +#define IDS_YES 182 +#define IDD_PANEL 183 +#define IDS_NO 183 +#define IDD_PATHS 184 +#define IDS_PRI_ABOVENORMAL 184 +#define IDI_CONFIGFILE 185 +#define IDD_QUICKSTART 185 +#define IDS_PRI_NORMAL 185 +#define IDM_SYSTRAY 186 +#define IDS_PRI_BELOWNORMAL 186 +#define IDS_PRI_LOW 187 +#define IDI_FOLDER 188 +#define IDS_OLDRTGLIBRARY 188 +#define IDS_DEFAULT_AF2005 189 +#define IDI_DISPLAY 190 +#define IDS_DEFAULT_AF 190 +#define IDS_DEFAULT_WINUAE 191 +#define IDI_ROOT 192 +#define IDS_INP 192 +#define IDS_RESTOREINP 193 +#define IDI_ICON2 194 +#define IDI_MEMORY 194 +#define IDS_SAVEINP 194 +#define IDS_SCREEN_WINDOWED 195 +#define IDS_SCREEN_FULLSCREEN 196 +#define IDS_SCREEN_FULLWINDOW 197 +#define IDS_SCREEN_VSYNC 198 +#define IDS_SOUND_MONO 200 +#define IDS_SOUND_MIXED 201 +#define IDI_QUICKSTART 201 +#define IDS_SOUND_STEREO 202 +#define IDS_SOUND_INTERPOL_DISABLED 203 +#define IDS_SOUND_INTERPOL_RH 204 +#define IDI_PATHS 204 +#define IDS_SOUND_INTERPOL_CRUX 205 +#define IDS_SOUND_FILTER_OFF 206 +#define IDS_SOUND_FILTER_EMULATED 207 +#define IDS_SOUND_FILTER_EMULATED_E 208 +#define IDS_INPUT_COMPATIBILITY 209 +#define IDS_INPUT_CUSTOM 210 +#define IDS_INPUT_COPY_DEFAULT 211 +#define IDS_INPUT_COPY_CUSTOM 212 +#define IDS_3D_NO_FILTER 213 +#define IDS_3D_BILINEAR 214 +#define IDS_VSYNC_DEFAULT 215 +#define IDS_DRIVESOUND_NONE 216 +#define IDS_DRIVESOUND_DEFAULT_A500 217 +#define IDS_AVIOUTPUT_NOCODEC 218 +#define IDS_DISK_IMAGENAME 219 +#define IDS_DISK_DRIVENAME 220 +#define IDS_AGA8BIT 221 +#define IDS_UNSUPPORTEDSCREENMODE 222 +#define IDS_UNSUPPORTEDSCREENMODE_1 223 +#define IDS_UNSUPPORTEDSCREENMODE_2 224 +#define IDS_UNSUPPORTEDSCREENMODE_3 225 +#define IDS_UNSUPPORTEDSCREENMODE_4 226 +#define IDS_FLOPPYTYPE35DD 227 +#define IDS_FLOPPYTYPE35HD 228 +#define IDS_FLOPPYTYPE525SD 229 +#define IDS_FLOPPYTYPEDISABLED 230 +#define IDS_STMENUNOFLOPPY 231 +#define IDS_TREEVIEW_HARDWARE 232 +#define IDS_TREEVIEW_HOST 233 +#define IDS_TREEVIEW_MISC 234 +#define IDS_TREEVIEW_SETTINGS 235 +#define IDS_WINUAETITLE_MMB 236 +#define IDS_WINUAETITLE_NORMAL 237 +#define IDS_STARTEMULATION 238 +#define IDS_TREEVIEW_ABOUT 239 +#define IDS_NOHARDDRIVES 240 +#define IDS_DEFAULT_HOST 241 +#define IDS_SOUND_4CHANNEL 242 +#define IDS_HF_FS_CUSTOM 243 +#define IDS_SELECTFS 244 +#define IDS_KEYJOY 245 +#define IDB_XARCADE 246 +#define IDS_STATEFILE_UNCOMPRESSED 246 +#define IDS_STATEFILE_RAMDUMP 247 +#define IDS_STATEFILE_WAVE 248 +#define IDD_FRONTEND 249 +#define IDS_SOUND_SWAP_PAULA 249 +#define IDS_SOUND_SWAP_AHI 250 +#define IDD_PROGRESSBAR 250 +#define IDS_SOUND_SWAP_BOTH 251 +#define IDD_STRINGBOX 251 +#define IDB_BITMAP1 252 +#define IDB_LCD160X43 252 +#define IDS_SOUND_FILTER_ON_AGA 252 +#define IDS_SOUND_FILTER_ON 253 +#define IDS_SOUND_FILTER_ON_A500 253 +#define IDS_DRIVESOUND_PC_FLOPPY 254 +#define IDS_FLOPPYTYPE35DDESCOM 255 +#define IDS_SOUND_STEREO2 256 +#define IDS_INPUT_CUSTOMEVENT 257 +#define IDS_DEFAULT_NEWWINUAE 258 +#define IDS_NUMSG_NEEDEXT2 300 +#define IDS_NUMSG_NOROMKEY 301 +#define IDS_NUMSG_KSROMCRCERROR 302 +#define IDS_NUMSG_KSROMREADERROR 303 +#define IDS_NUMSG_NOEXTROM 304 +#define IDS_NUMSG_MODRIP_NOTFOUND 305 +#define IDS_NUMSG_MODRIP_FINISHED 306 +#define IDS_NUMSG_MODRIP_SAVE 307 +#define IDS_NUMSG_KS68020 308 +#define IDS_NUMSG_ROMNEED 309 +#define IDS_NUMSG_NOZLIB 310 +#define IDS_NUMSG_STATEHD 311 +#define IDS_NUMSG_NOCAPS 312 +#define IDS_NUMSG_OLDCAPS 313 +#define IDS_IMGCHK_BOOTBLOCKCRCERROR 314 +#define IDS_IMGCHK_BOOTBLOCKNO 315 +#define IDS_IMGCHK_DAMAGED 316 +#define IDS_IMGCHK_KS2 317 +#define IDS_IMGCHK_KS3 318 +#define IDS_ROMSCANEND 319 +#define IDS_ROM_AVAILABLE 320 +#define IDS_ROM_UNAVAILABLE 321 +#define IDS_HARDDRIVESAFETYWARNING1 322 +#define IDS_NUMSG_KS68EC020 323 +#define IDS_ROMSCANNOROMS 324 +#define IDS_NUMSG_KICKREP 325 +#define IDS_NUMSG_KICKREPNO 326 +#define IDS_NUMSG_NOROM 327 +#define IDS_HDCLONE_OK 328 +#define IDS_HDCLONE_FAIL 329 +#define IDR_DBGACCEL 330 +#define IDS_NUMSG_KS68030 331 +#define IDS_NUMSG_EXPROMNEED 332 +#define IDS_HARDDRIVESAFETYWARNING2 333 +#define IDS_QS_MODELS 1000 +#define IDS_QS_MODEL_A500 1001 +#define IDS_QS_MODEL_A500P 1002 +#define IDS_QS_MODEL_A600 1003 +#define IDS_QS_MODEL_A1000 1004 +#define IDS_QS_MODEL_A1200 1005 +#define IDS_QS_MODEL_CD32 1006 +#define IDS_QS_MODEL_CDTV 1007 +#define IDS_QS_MODEL_UAE 1008 +#define IDS_QS_MODEL_ARCADIA 1009 +#define IDS_QS_MODEL_A3000 1010 +#define IDS_QS_MODEL_A4000 1011 +#define IDS_QS_MODEL_A4000T 1012 +#define IDC_RESOLUTION 1021 +#define IDC_SERIAL 1022 +#define IDC_REFRESHRATE 1022 +#define IDC_ILLEGAL 1023 +#define IDC_MIDILIST 1023 +#define IDC_MIDIOUTLIST 1023 +#define IDC_DA_MODE 1023 +#define IDC_SHOWGUI 1024 +#define IDC_MIDIINLIST 1024 +#define IDC_RESOLUTION2 1024 +#define IDC_DISPLAYSELECT 1024 +#define IDC_AUTOCONFIG 1025 +#define IDC_PRINTERLIST 1025 +#define IDC_RESOLUTION3 1025 +#define IDC_RESOLUTIONDEPTH 1025 +#define IDC_CHIPMEM 1026 +#define IDC_CREATELOGFILE 1026 +#define IDC_PORT0_JOYS 1026 +#define IDC_SCREENMODE_NATIVE 1026 +#define IDC_FASTMEM 1027 +#define IDC_SHOWLEDS 1027 +#define IDC_PORT1_JOYS 1027 +#define IDC_SCREENMODE_RTG 1027 +#define IDC_MBMEM1 1028 +#define IDC_SLOWMEM 1030 +#define IDC_MBMEM2 1031 +#define IDC_PARALLEL 1033 +#define IDC_JULIAN 1040 +#define IDC_FASTTEXT 1043 +#define IDC_FASTRAM 1044 +#define IDC_CHIPRAM 1045 +#define IDC_SLOWRAM 1046 +#define IDC_Z3TEXT 1047 +#define IDC_Z3FASTRAM 1048 +#define IDC_Z3FASTMEM 1049 +#define IDC_MBRAM1 1050 +#define IDC_MBRAM2 1051 +#define IDC_UAEHOME 1070 +#define IDC_PICASSOHOME 1071 +#define IDC_AMIGAHOME 1072 +#define IDC_WINUAEHOME 1073 +#define IDC_AIABHOME 1074 +#define IDC_CLOANTOHOME 1075 +#define IDC_THEROOTS 1076 +#define IDC_CAPS 1077 +#define IDC_ABIME 1078 +#define IDC_AMIGASYS 1079 +#define IDC_AMIKIT 1080 +#define IDC_RICHEDIT1 1091 +#define IDC_RICHEDIT2 1092 +#define IDC_CONTRIBUTORS 1124 +#define IDC_ASPECT 1170 +#define IDC_BLIT32 1173 +#define IDC_BLITIMM 1174 +#define IDC_LORES 1176 +#define IDC_LORES_SMOOTHED 1179 +#define IDC_FRAMERATE 1185 +#define IDC_RATETEXT 1186 +#define IDC_XSIZE 1187 +#define IDC_YSIZE 1188 +#define IDC_INPUTAUTOFIRERATE 1188 +#define IDC_LM_NORMAL 1189 +#define IDC_INPUTSPEEDD 1189 +#define IDC_LM_DOUBLED 1190 +#define IDC_INPUTSPEEDA 1190 +#define IDC_GFXCARDTEXT 1191 +#define IDC_LM_SCANLINES 1191 +#define IDC_INPUTSPEEDM 1191 +#define IDC_P96RAM 1192 +#define IDC_P96MEM 1193 +#define IDC_DA_SLIDER 1193 +#define IDC_FRAMERATE2 1194 +#define IDC_RATE2TEXT 1195 +#define IDC_CPU0 1200 +#define IDC_CPU1 1201 +#define IDC_CPU2 1202 +#define IDC_CPU3 1203 +#define IDC_CPU4 1204 +#define IDC_CPU5 1205 +#define IDC_CS_HOST 1209 +#define IDC_CS_68000 1210 +#define IDC_CS_ADJUSTABLE 1211 +#define IDC_CS_CPU_TEXT 1212 +#define IDC_CS_CHIPSET_TEXT 1213 +#define IDC_COMPATIBLE 1214 +#define IDC_TRUST0 1215 +#define IDC_TRUST1 1216 +#define IDC_TRUST2 1217 +#define IDC_CACHE 1218 +#define IDC_CYCLEEXACT 1219 +#define IDC_CS_CPU_TEXT2 1219 +#define IDC_CPUIDLE 1220 +#define IDC_GENLOCK 1220 +#define IDC_COMPATIBLE_FPU 1221 +#define IDC_FASTERRTG 1221 +#define IDC_COMPATIBLE24 1222 +#define IDC_SPEED 1223 +#define IDC_FPU0 1224 +#define IDC_FPU1 1225 +#define IDC_FPU2 1226 +#define IDC_FPU3 1227 +#define IDC_SOUNDSETTINGS 1229 +#define IDC_8BIT 1230 +#define IDC_16BIT 1231 +#define IDC_11KHZ 1232 +#define IDC_22KHZ 1233 +#define IDC_44KHZ 1234 +#define IDC_48KHZ 1235 +#define IDC_SOUNDSIZE 1236 +#define IDC_FREQUENCY 1237 +#define IDC_SOUND0 1238 +#define IDC_SOUND1 1239 +#define IDC_SOUND2 1240 +#define IDC_SOUND3 1241 +#define IDC_SOUNDSTYLE 1242 +#define IDC_SOUNDSTYLE0 1243 +#define IDC_STEREO 1244 +#define IDC_SOUNDSTYLE1 1245 +#define IDC_SOUNDINTERPOLATION 1248 +#define IDC_INTERPOLATION0 1249 +#define IDC_INTERPOLATION1 1250 +#define IDC_INTERPOLATION2 1251 +#define IDC_STEREOMODE 1252 +#define IDC_SOUNDINTERPOLATION2 1252 +#define IDC_STEREOMODE0 1253 +#define IDC_STEREOMODE1 1254 +#define IDC_STEREOMODE2 1255 +#define IDC_SOUNDINTERPOLATION3 1256 +#define IDC_DF0TEXT 1270 +#define IDC_DF1TEXT 1271 +#define IDC_DF2TEXT 1272 +#define IDC_DF3TEXT 1273 +#define IDC_EJECT0 1274 +#define IDC_EJECT1 1275 +#define IDC_EJECT2 1276 +#define IDC_EJECT3 1277 +#define IDC_DF0 1278 +#define IDC_DF1 1279 +#define IDC_DF2 1280 +#define IDC_DF3 1281 +#define IDC_CREATE 1282 +#define IDC_CREATE_RAW 1283 +#define IDC_SNAPSHOTNAME 1284 +#define IDC_SNAPSHOT 1285 +#define IDC_SAVEIMAGE0 1285 +#define IDC_DOSAVESTATE 1286 +#define IDC_SAVEIMAGE1 1286 +#define IDC_DOLOADSTATE 1287 +#define IDC_SAVEIMAGE2 1287 +#define IDC_PROWIZARD 1288 +#define IDC_SAVEIMAGE3 1288 +#define IDC_PORT0_JOYSC 1302 +#define IDC_PORT0_KBDA 1303 +#define IDC_PORT0_KBDB 1304 +#define IDC_PORT0_KBDC 1305 +#define IDC_PORT0_KBDD 1306 +#define IDC_PORT0_KBDE 1307 +#define IDC_PORT1_JOYSC 1308 +#define IDC_PORT1_KBDA 1309 +#define IDC_PORT1_KBDB 1310 +#define IDC_PORT1_KBDC 1311 +#define IDC_PORT1_KBDD 1312 +#define IDC_PORT1_KBDE 1313 +#define IDC_MIDIFRAME 1314 +#define IDC_SERPARFRAME 1315 +#define IDC_SERIALFRAME 1316 +#define IDC_EDIT 1334 +#define IDC_REMOVE 1335 +#define IDC_VOLUMELIST 1336 +#define IDC_UP 1337 +#define IDC_DOWN 1338 +#define IDC_NEW_FS 1339 +#define IDC_NEW_HF 1340 +#define IDC_NEW_HD 1341 +#define IDC_PORT0 1342 +#define IDC_NEW_FSARCH 1342 +#define IDC_PORT1 1343 +#define IDC_PATH_NAME 1362 +#define IDC_SELECTOR 1363 +#define IDC_VOLUME_NAME 1364 +#define IDC_HARDFILE_DEVICE 1364 +#define IDC_SECTORS 1365 +#define IDC_VOLUME_DEVICE 1365 +#define IDC_HEADS 1366 +#define IDC_RESERVED 1367 +#define IDC_BLOCKSIZE 1368 +#define IDC_HARDFILE_BOOTPRI 1369 +#define IDC_SECTORS_TEXT 1370 +#define IDC_SURFACES_TEXT 1371 +#define IDC_RESERVED_TEXT 1372 +#define IDC_RESERVED_TEXT2 1373 +#define IDC_BLOCKSIZE_TEXT 1374 +#define ID_OK 1375 +#define IDC_HARDFILE_BOOTPRI_TEXT 1375 +#define IDC_PATH_FILESYS 1376 +#define IDC_HARDFILE_DIR_TEXT 1377 +#define IDC_HARDFILE_DEVICE_TEXT 1378 +#define IDC_RW 1379 +#define IDC_HFRDB 1380 +#define IDC_RW2 1380 +#define IDC_RDB 1380 +#define IDC_HARDFILE_FILESYS_TEXT 1380 +#define IDC_FILESYS_SELECTOR 1381 +#define IDC_ROMFILE 1390 +#define IDC_KEYFILE 1391 +#define IDC_KICKCHOOSER 1392 +#define IDC_KEYCHOOSER 1393 +#define IDC_ROMFILE2 1394 +#define IDC_ROMCHOOSER2 1395 +#define IDC_FLASHCHOOSER 1396 +#define IDC_FLASHFILE 1397 +#define IDC_CARTFILE 1398 +#define IDC_CARTCHOOSER 1399 +#define IDC_SAVE 1400 +#define IDC_LOAD 1401 +#define IDC_DELETE 1403 +#define IDC_CONFIGLIST 1404 +#define IDC_EDITNAME 1405 +#define IDC_EDITDESCRIPTION 1406 +#define IDC_QUICKSAVE 1408 +#define IDC_QUICKLOAD 1409 +#define IDC_EXIT 1410 +#define IDC_EDITPATH 1410 +#define IDC_HDF_RDB 1500 +#define IDC_HFSIZE 1501 +#define IDC_HF_SIZE 1501 +#define IDC_LINEMODE 1502 +#define IDC_CREATEHF 1502 +#define IDC_HF_CREATE 1502 +#define IDC_SOCKETS 1503 +#define IDC_HF_DOSTYPE 1503 +#define IDC_HDF_CONTROLLER 1504 +#define IDC_RESETAMIGA 1504 +#define IDC_QUITEMU 1505 +#define IDC_MAPDRIVES 1507 +#define IDC_CPUTEXT 1508 +#define IDC_MAPDRIVES_NET 1508 +#define IDC_SWAP 1509 +#define IDC_CACHETEXT 1509 +#define IDC_SELECTRESTEXT 1510 +#define IDC_FLUSHPRINTER 1510 +#define IDC_SCREENRESTEXT 1511 +#define IDC_WIDTHTEXT 1512 +#define IDC_WINDOWEDTEXT 1512 +#define IDC_HEIGHTTEXT 1513 +#define IDC_SETTINGSTEXT 1514 +#define IDC_REFRESHTEXT 1515 +#define IDC_SETTINGSTEXT2 1515 +#define IDC_DISABLE1 1516 +#define IDC_DF1WP 1516 +#define IDC_QUICKSTART_COMPA 1516 +#define IDC_REFRESH2TEXT 1516 +#define IDC_DISABLE2 1517 +#define IDC_DF2WP 1517 +#define IDC_QUICKSTART_DF 1517 +#define IDC_DISABLE3 1518 +#define IDC_XCENTER 1518 +#define IDC_DF3WP 1518 +#define IDC_DF1WP2 1518 +#define IDC_QUICKSTART_HOST 1518 +#define IDC_YCENTER 1519 +#define IDC_DISABLE0 1519 +#define IDC_DF0WP 1519 +#define IDC_OCS 1520 +#define IDC_HDFLOPPY 1520 +#define IDC_ECS_AGNUS 1521 +#define IDC_ECS_DENISE 1522 +#define IDC_ECS 1523 +#define IDC_AGA 1524 +#define IDC_NTSC 1525 +#define IDC_NOSPEED 1527 +#define IDC_NOSOUND 1528 +#define IDC_INACTIVE_NOSOUND 1528 +#define IDC_MIDI 1529 +#define IDC_NOSPEEDPAUSE 1529 +#define IDC_INACTIVE_PAUSE 1529 +#define IDC_KICKSHIFTER 1530 +#define IDC_MIDI2 1530 +#define IDC_HIGHPRIORITY 1530 +#define IDC_MINIMIZED_NOSOUND 1530 +#define IDC_MINIMIZED_PAUSE 1531 +#define IDC_STATE_CAPTURE 1532 +#define IDC_KBLED_USB 1533 +#define IDC_SER_SHARED 1553 +#define IDC_SER_CTSRTS 1554 +#define IDC_SER_DIRECT 1555 +#define IDC_PSPRINTER 1556 +#define IDC_PSPRINTERDETECT 1557 +#define IDC_UAESERIAL 1558 +#define IDC_VIEWINFO 1568 +#define IDC_SETINFO 1569 +#define IDC_FLOPPYSLIDER 1570 +#define IDC_FLOPPYSLIDERTEXT 1571 +#define IDC_FLOPPYSPEED 1572 +#define IDC_FLOPPYSPD 1572 +#define IDC_GUILANGUAGE_LIST 1573 +#define IDC_SOUNDBUFFERRAM 1574 +#define IDC_SOUNDADJUST 1575 +#define IDC_SOUNDBUFFERTEXT 1576 +#define IDC_SOUNDVOLUME 1576 +#define IDC_SOUNDBUFFERMEM 1577 +#define IDC_HARDFLUSH 1578 +#define IDC_SOUNDADJUSTNUM 1578 +#define IDC_CONSTJUMP 1579 +#define IDC_SOUNDDRIVEVOLUME 1579 +#define IDC_JITFPU 1580 +#define IDC_SOUNDVOLUME2 1580 +#define IDC_NOFLAGS 1581 +#define IDC_SOUNDDRIVEVOLUME2 1581 +#define IDC_CS_CACHE_TEXT 1582 +#define IDC_FORCE 1583 +#define IDC_COLLISIONS 1584 +#define IDC_JITENABLE 1584 +#define IDC_DISASSEMBLY 1585 +#define IDC_CTRLF11 1586 +#define IDC_FASTCOPPER 1588 +#define IDC_COLLISION0 1589 +#define IDC_COLLISION1 1590 +#define IDC_AUDIOSYNC 1590 +#define IDC_COLLISION2 1591 +#define IDC_COLLISION3 1592 +#define IDC_SOUNDLAGSLIDER 1592 +#define IDC_SOUNDLAGCAPTION 1594 +#define IDC_FLOPPYTYPE 1594 +#define IDC_SYNCPARAMS 1595 +#define IDC_DF0TYPE 1595 +#define IDC_SOUNDLAGTEXT 1596 +#define IDC_DF1TYPE 1596 +#define IDC_DF2TYPE 1597 +#define IDC_SOUNDSPEEDSLIDER 1598 +#define IDC_DF0TYPE4 1598 +#define IDC_DF3TYPE 1598 +#define IDC_SOUNDSPEEDTEXT 1599 +#define IDC_SOUNDSPEEDCAPTION 1600 +#define IDC_NOOVERLAY 1601 +#define IDC_ROMFILE2TEXT 1602 +#define IDC_ROMTEXT 1603 +#define IDC_KEYTEXT 1604 +#define IDC_CD32 1605 +#define IDC_AKIKOC2P 1605 +#define IDC_FLASHTEXT 1605 +#define IDC_SCSIDEVICE 1606 +#define IDC_FLASHTEXT2 1606 +#define IDC_AVIOUTPUT_PAL 1607 +#define IDC_INPUTTYPE 1607 +#define IDC_AVIOUTPUT_NTSC 1608 +#define IDC_INPUTSELECTTEXT 1608 +#define IDC_NOUAEFSDB 1608 +#define IDC_NOTASKBARBUTTON 1608 +#define IDC_CLOCKSYNC 1609 +#define IDC_AVIOUTPUT_FPS 1609 +#define IDC_INPUTDEVICE 1609 +#define IDC_MAPROM 1609 +#define IDC_NORECYCLEBIN 1609 +#define IDC_AVIOUTPUT_FILETEXT 1610 +#define IDC_INPUTDEVICETEXT 1610 +#define IDC_ALWAYSONTOP 1610 +#define IDC_MAPROM2 1610 +#define IDC_HRTMON 1610 +#define IDC_AVIOUTPUT_FILE 1611 +#define IDC_INPUTLIST 1611 +#define IDC_CATWEASEL 1611 +#define IDC_AVIOUTPUT_FPS_STATIC 1612 +#define IDC_INPUTAMIGA 1612 +#define IDC_ALWAYSONTOP2 1612 +#define IDC_BORDERLESS 1612 +#define IDC_POWERSAVE 1612 +#define IDC_AVIOUTPUT_VIDEO 1613 +#define IDC_INPUTAUTOFIRE 1613 +#define IDC_MOUSETRICK 1613 +#define IDC_AVIOUTPUT_AUDIO 1614 +#define IDC_INPUTCOPYFROM 1614 +#define IDC_AVIOUTPUT_VIDEO_CODEC 1615 +#define IDC_INPUTDEVICEDISABLE 1615 +#define IDC_AVIOUTPUT_ACTIVATED 1615 +#define IDC_FILTERENABLE 1615 +#define IDC_AVIOUTPUT_AUDIO_CODEC 1616 +#define IDC_INPUTAMIGACNT 1616 +#define IDC_FILTERHZ 1616 +#define IDC_SAMPLERIPPER_ACTIVATED 1616 +#define IDC_AVIOUTPUT_BORDER_TRIM 1617 +#define IDC_FILTERVZ 1617 +#define IDC_INPREC_RECORD 1617 +#define IDC_AVIOUTPUT_AUDIO_STATIC 1618 +#define IDC_FILTERHO 1618 +#define IDC_AVIOUTPUT_VIDEO_STATIC 1619 +#define IDC_FILTERVO 1619 +#define IDC_AVIOUTPUT_8BIT 1620 +#define IDC_INPREC_PLAY 1620 +#define IDC_AVIOUTPUT_24BIT 1621 +#define IDC_AVIOUTPUT_WIDTH 1622 +#define IDC_AVIOUTPUT_HEIGHT 1623 +#define IDC_AVIOUTPUT_FRAME 1624 +#define IDC_FILTERXL 1624 +#define IDC_FILTERSLR 1625 +#define IDC_FILTERHZMULT 1626 +#define IDC_FILTERMODE 1627 +#define IDC_FILTERFILTER 1628 +#define IDC_FILTERDEFAULT 1629 +#define IDC_FILTERXTRA 1630 +#define IDC_INPUTDEADZONE 1630 +#define IDC_INPUTCOPY 1631 +#define IDC_FILTERPRESETS 1631 +#define IDC_SCREENSHOT 1632 +#define IDC_INPUTSWAP 1632 +#define IDC_FILTERPRESETLOAD 1632 +#define IDC_FLOPPYSPDTEXT 1633 +#define IDC_FILTERPRESETSAVE 1633 +#define IDC_FLOPPYSPD_TEXT 1634 +#define IDC_FILTERPRESETDELETE 1634 +#define IDC_HARDDRIVE 1635 +#define IDC_INACTIVE_PRI 1635 +#define IDC_FILTERVZMULT 1635 +#define IDC_SOUNDPRIMARY 1636 +#define IDC_MINIMIZED_PRI 1636 +#define IDC_VOLUME_BOOTPRI_TEXT 1637 +#define IDC_VOLUME_BOOTPRI 1638 +#define IDC_KBLED1 1639 +#define IDC_KBLED2 1640 +#define IDC_SOUNDFILTER 1640 +#define IDC_KBLED3 1641 +#define IDC_SOUNDCALIBRATE 1641 +#define IDC_ACTIVE_PRIORITY 1642 +#define IDC_SOUNDDRIVE 1642 +#define IDC_INACTIVE_PRIORITY 1643 +#define IDC_ACTIVE_PRI 1644 +#define IDC_MINIMIZED_PRIORITY 1645 +#define IDC_AVIOUTPUT_FRAMELIMITER 1645 +#define IDC_STATE_RATE 1646 +#define IDC_INPREC_PLAYMODE 1646 +#define IDC_STATE_BUFFERSIZE 1647 +#define IDC_SOUNDDRIVESELECT 1647 +#define IDC_PANELTREE 1647 +#define IDC_AVIOUTPUT_FRAMELIMITER2 1647 +#define IDC_AVIOUTPUT_NOSOUNDOUTPUT 1647 +#define IDC_AVIOUTPUT_DIMENSIONS_STATIC 1648 +#define IDC_STATE_BUFFERSIZE_TEXT 1648 +#define IDC_CONFIGTREE 1648 +#define IDC_AVIOUTPUT_OPTIONS 1649 +#define IDC_STATE_RATE_TEXT 1649 +#define IDC_DISKLISTREMOVE 1649 +#define IDC_DF0QENABLE 1649 +#define IDC_SOUNDCARD 1650 +#define IDC_CS_SOUND0 1650 +#define IDC_UPBM 1650 +#define IDC_DISKLISTREMOVE2 1650 +#define IDC_DISKLISTINSERT 1650 +#define IDC_DF1QENABLE 1650 +#define IDC_SOUNDCARDLIST 1651 +#define IDC_CS_SOUND1 1651 +#define IDC_SOUNDFREQ 1652 +#define IDC_CS_SOUND2 1652 +#define IDC_SOUNDCARD2 1653 +#define IDC_SOUNDFREQTXT 1653 +#define IDC_PANEL_FRAME 1653 +#define IDC_SOUNDFILTERTXT 1654 +#define IDC_PANEL_FRAME_OUTER 1654 +#define IDC_SOUNDSTEREO 1655 +#define IDC_CONFIGTYPE 1655 +#define IDC_SOUNDDRIVETXT 1656 +#define IDC_PATHS_ROM 1656 +#define IDC_SOUNDSTEREOSEP 1656 +#define IDC_SOUNDSTEREOTXT 1657 +#define IDC_PATHS_CONFIG 1657 +#define IDC_SOUNDINTERPOLATIONTXT 1658 +#define IDC_PATHS_SCREENSHOT 1658 +#define IDC_DISK 1659 +#define IDC_DISKLIST 1659 +#define IDC_PATHS_SAVEIMAGE 1659 +#define IDC_SOUNDSTEREOSEPTXT 1659 +#define IDC_PATHS_SAVESTATE 1660 +#define IDC_SOUNDSTEREOMIXTXT 1660 +#define IDC_PATHS_ROMS 1661 +#define IDC_SOUNDSTEREOMIX 1661 +#define IDC_PATHS_CONFIGS 1662 +#define IDC_SOUNDSWAP 1662 +#define IDC_PATHS_SCREENSHOTS 1663 +#define IDC_PATHS_SAVESTATES 1664 +#define IDC_SOUNDSTEREOSWAPTXT 1664 +#define IDC_SOUNDSWAPTXT 1664 +#define IDC_PATHS_SAVEIMAGES 1665 +#define IDC_PATHS_ROML 1666 +#define IDC_PATHS_CONFIGL 1667 +#define IDC_PATHS_SCREENSHOTL 1668 +#define IDC_PATHS_STATEFILEL 1669 +#define IDC_PATHS_SAVEIMAGEL 1670 +#define IDC_PATHS_DEFAULT 1671 +#define IDC_ROM_RESCAN 1672 +#define IDC_QUICKSTARTMODE 1673 +#define IDC_RESETREGISTRY 1673 +#define IDC_QUICKSTART_MODEL 1674 +#define IDC_PATHS_AVIOUTPUTL 1674 +#define IDC_QUICKSTART_CONFIGURATION 1675 +#define IDC_PATHS_AVIOUTPUT 1675 +#define IDC_QUICKSTART_COMPATIBILITY 1676 +#define IDC_PATHS_AVIOUTPUTS 1676 +#define IDC_QUICKSTART_CONFIG 1677 +#define IDC_RESETDISKHISTORY 1677 +#define IDC_DF0Q 1678 +#define IDC_DF0QQ 1678 +#define IDC_DF1Q 1679 +#define IDC_QUICKSTART_HOSTCONFIG 1679 +#define IDC_DF1QQ 1680 +#define IDC_QUICKSTART_SETCONFIG 1681 +#define IDC_CONFIGAUTO 1682 +#define IDC_DF0TEXTQ 1683 +#define IDC_CONFIGNOLINK 1683 +#define IDC_DF0WPQ 1684 +#define IDC_EJECT0Q 1685 +#define IDC_DF1WPQ 1686 +#define IDC_EJECT1Q 1687 +#define IDC_DF1TEXTQ 1688 +#define IDC_FILTERXLV 1692 +#define IDC_FILTERVOV 1693 +#define IDC_FILTERHOV 1694 +#define IDC_CONFIGLINK 1694 +#define IDC_FILTERVZV 1695 +#define IDC_PS_PARAMS 1695 +#define IDC_FILTERHZV 1696 +#define IDC_HF_TYPE 1696 +#define IDC_PRINTERAUTOFLUSH 1697 +#define IDC_PRINTERAUTOFLUSHTXT 1698 +#define IDC_DISKTEXT 1699 +#define IDC_FE_LIST 1700 +#define IDC_FE_INFO 1701 +#define IDC_FE_INFO2 1702 +#define IDC_FE_SCREENSHOT 1702 +#define IDC_PATHS_DEFAULTTYPE 1704 +#define IDC_SCSIMODE 1705 +#define IDC_PROGRESS1 1705 +#define IDC_PROGRESSBAR 1705 +#define IDC_PROGRESSBAR_TEXT 1706 +#define IDC_SCSIMODE2 1706 +#define IDC_LANGUAGE 1706 +#define IDC_CREATE_NAME 1707 +#define IDC_FILTERAUTORES 1708 +#define IDC_SOUND_AUTO 1709 +#define IDC_CS_RTC 1710 +#define IDC_CS_CIAA_TOD1 1711 +#define IDC_CS_CIAA_TOD2 1712 +#define IDC_CS_EXT 1712 +#define IDC_CS_CIAA_TOD3 1713 +#define IDC_CS_COMPATIBLE 1714 +#define IDC_CS_RAMSEYREV 1715 +#define IDC_CS_KSMIRROR 1716 +#define IDC_STRINGBOXEDIT 1716 +#define IDC_CS_CD32CD 1717 +#define IDC_STRINGBOX_TEXT 1717 +#define IDC_CS_CD32C2P 1718 +#define IDC_CS_CD32NVRAM 1719 +#define IDC_CS_CDTVCD 1720 +#define IDC_CS_CDTVRAM 1721 +#define IDC_CS_IDE1 1722 +#define IDC_CS_IDE2 1723 +#define IDC_CS_IDE3 1724 +#define IDC_CS_A1000RAM 1724 +#define IDC_CS_RAMSEY 1725 +#define IDC_CS_GARY 1726 +#define IDC_CS_FATGARY 1726 +#define IDC_CS_DMAC 1727 +#define IDC_CS_RTCADJUST 1728 +#define IDC_CS_RAMSEYREV3 1729 +#define IDC_CS_FATGARYREV 1729 +#define IDC_CS_CDTVRAMEXP 1730 +#define IDC_CS_RTC1 1731 +#define IDC_CS_RTC2 1732 +#define IDC_CS_RTC3 1733 +#define IDC_CS_IDE4 1734 +#define IDC_CS_DF0IDHW 1734 +#define IDC_CS_AGNUS 1735 +#define IDC_CS_AGNUSREV 1736 +#define IDC_CS_DENISE 1737 +#define IDC_CS_AGNUSREV2 1738 +#define IDC_CS_DENISEREV 1738 +#define IDC_DBG_OUTPUT1 1739 +#define IDC_CS_PCMCIA 1739 +#define IDC_DBG_HELP 1740 +#define IDC_DBG_INPUT 1741 +#define IDC_DBG_DREG 1742 +#define IDC_DBG_AREG 1743 +#define IDC_DBG_CCR 1744 +#define IDC_DBG_AMEM 1745 +#define IDC_DBG_SP_VBR 1746 +#define IDC_DBG_MMISC 1747 +#define IDC_DBG_PC 1748 +#define IDC_DBG_PREFETCH 1749 +#define IDC_DBG_FPREG 1750 +#define IDC_DBG_FPSR 1751 +#define IDC_DBG_OUTPUT2 1752 +#define IDC_DBG_MEMINPUT 1753 +#define IDC_DBG_MEMDOWN 1754 +#define IDC_DBG_MEMUP 1755 +#define IDC_DBG_MEM 1756 +#define IDC_DBG_DASM 1757 +#define IDC_DBG_MEMDOWNFAST 1758 +#define IDC_DBG_MEMTOPC 1759 +#define IDC_DBG_MEMUPFAST 1760 +#define IDC_DA_RESET 1761 +#define IDC_DBG_STATUS 1762 +#define IDC_DBG_BRKPTS 1763 +#define IDC_DBG_MCUSTOM 1764 +#define IDC_DBG_MISC 1765 +#define IDC_DBG_CUSTOM 1766 +#define IDC_DBG_MISCCPU 1767 +#define IDC_CS_A2091 1768 +#define IDC_CS_DMAC2 1769 +#define IDC_CS_A4091 1770 +#define IDC_CS_CDTVSCSI 1771 +#define IDC_CS_SCSIMODE 1772 +#define IDC_DF0ENABLE 1773 +#define IDC_DF1ENABLE 1774 +#define IDC_DF2ENABLE 1776 +#define IDC_DF3ENABLE 1778 +#define ID__FLOPPYDRIVES 40004 +#define ID_FLOPPYDRIVES_DF0 40005 +#define ID_ST_CONFIGURATION 40010 +#define ID_ST_HELP 40011 +#define ID_ST_QUIT 40012 +#define ID_ST_EJECTALL 40013 +#define ID_ST_DF0 40014 +#define ID_ST_DF1 40015 +#define ID_ST_DF2 40016 +#define ID_ST_DF3 40017 +#define ID_ST_RESET 40019 +#define ID_DBG_PAGE1 40020 +#define ID_DBG_PAGE2 40021 +#define ID_DBG_PAGE3 40022 +#define ID_DBG_PAGE4 40023 +#define ID_DBG_PAGE5 40024 +#define ID_DBG_PAGE6 40025 +#define ID_DBG_PAGE7 40026 +#define ID_DBG_PAGE8 40027 +#define ID_DBG_PAGE9 40028 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_3D_CONTROLS 1 +#define _APS_NEXT_RESOURCE_VALUE 334 +#define _APS_NEXT_COMMAND_VALUE 40029 +#define _APS_NEXT_CONTROL_VALUE 1774 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h index d0520767..7ddf1078 100755 --- a/od-win32/resources/resource.h +++ b/od-win32/resources/resource.h @@ -905,6 +905,10 @@ #define IDC_CS_A4091 1770 #define IDC_CS_CDTVSCSI 1771 #define IDC_CS_SCSIMODE 1772 +#define IDC_DF0ENABLE 1773 +#define IDC_DF1ENABLE 1774 +#define IDC_DF2ENABLE 1776 +#define IDC_DF3ENABLE 1778 #define ID__FLOPPYDRIVES 40004 #define ID_FLOPPYDRIVES_DF0 40005 #define ID_ST_CONFIGURATION 40010 @@ -934,7 +938,7 @@ #define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 334 #define _APS_NEXT_COMMAND_VALUE 40029 -#define _APS_NEXT_CONTROL_VALUE 1773 +#define _APS_NEXT_CONTROL_VALUE 1774 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 338864a0..3178b019 100755 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "resource." #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -199,28 +199,24 @@ IDD_FLOPPY DIALOGEX 0, 0, 300, 240 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - RTEXT "DF0:",IDC_STATIC,10,7,20,10,SS_CENTERIMAGE COMBOBOX IDC_DF0TEXT,2,22,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF0TYPE,123,6,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write-protected",IDC_STATIC,174,8,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF0WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,4,10,15 PUSHBUTTON "Eject",IDC_EJECT0,253,4,30,15 PUSHBUTTON "...",IDC_DF0,287,4,10,15 - RTEXT "DF1:",IDC_STATIC,10,42,20,10,SS_CENTERIMAGE COMBOBOX IDC_DF1TEXT,2,58,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF1TYPE,123,42,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write-protected",IDC_STATIC,174,43,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF1WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,40,10,15 PUSHBUTTON "Eject",IDC_EJECT1,253,40,30,15 PUSHBUTTON "...",IDC_DF1,287,40,10,15 - RTEXT "DF2:",IDC_STATIC,10,77,20,10,SS_CENTERIMAGE COMBOBOX IDC_DF2TEXT,2,93,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF2TYPE,123,77,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write-protected",IDC_STATIC,174,77,59,10,SS_CENTERIMAGE CONTROL "",IDC_DF2WP,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,238,75,9,15 PUSHBUTTON "Eject",IDC_EJECT2,253,75,30,15 PUSHBUTTON "...",IDC_DF2,287,75,10,15 - RTEXT "DF3:",IDC_STATIC,10,112,20,9,SS_CENTERIMAGE COMBOBOX IDC_DF3TEXT,2,128,296,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_DF3TYPE,123,112,49,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP RTEXT "Write-protected",IDC_STATIC,174,113,59,10,SS_CENTERIMAGE @@ -240,6 +236,10 @@ BEGIN PUSHBUTTON "Delete save image",IDC_SAVEIMAGE3,43,110,70,15,NOT WS_VISIBLE EDITTEXT IDC_CREATE_NAME,75,215,98,13,ES_AUTOHSCROLL RTEXT "Disk label:",IDC_STATIC,14,216,52,10,SS_CENTERIMAGE + CONTROL "DF0:",IDC_DF0ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,6,34,15 + CONTROL "DF1:",IDC_DF1ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,41,34,15 + CONTROL "DF2:",IDC_DF2ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,76,34,15 + CONTROL "DF3:",IDC_DF3ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,111,34,15 END IDD_HARDDISK DIALOGEX 0, 0, 300, 240 @@ -810,7 +810,7 @@ CAPTION "Processing..." FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN PUSHBUTTON "Cancel",IDCANCEL,88,40,50,14 - CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,19,215,14 + CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",WS_BORDER | 0x1,7,19,215,14 CTEXT "x",IDC_PROGRESSBAR_TEXT,23,5,187,10,SS_CENTERIMAGE | WS_TABSTOP END @@ -1050,7 +1050,7 @@ BEGIN IDS_SELECTFILESYSROOT "Please select the root directory of the file system..." IDS_DEFAULTMIDIOUT "Default MIDI-Out Device" IDS_CONTRIBUTORS1 "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n" - IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation" + IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock and Dirk Trowe - Cartridge hardware support." IDS_INVALIDPRTPORT "The printer you have in this configuration is not valid on this machine.\n" IDS_RESTOREUSS "Restore a WinUAE snapshot file" IDS_USS "WinUAE snapshot files" @@ -1241,8 +1241,6 @@ BEGIN IDS_ROM_UNAVAILABLE "unavailable" IDS_HARDDRIVESAFETYWARNING1 "Warning: The drive safety check is active. Selected drive is not empty and non-RDB partitioned." - IDS_HARDDRIVESAFETYWARNING2 - "Warning: The drive safety check has been disabled, and non-empty and non-RDB partitioned hard disk(s) were detected." IDS_NUMSG_KS68EC020 "The selected system ROM requires a 68020 with 24-bit addressing or higher CPU." IDS_ROMSCANNOROMS "No supported system ROMs detected." IDS_NUMSG_KICKREP "You need to have a floppy disk (image file) in DF0: to use the system ROM replacement." @@ -1252,6 +1250,8 @@ BEGIN IDS_HDCLONE_FAIL "Hard drive image file creation failed.\nError code %d:%d." IDS_NUMSG_KS68030 "The selected system ROM requires a 68030 CPU." IDS_NUMSG_EXPROMNEED "One of the following expansion boot ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs." + IDS_HARDDRIVESAFETYWARNING2 + "Warning: The drive safety check has been disabled, and non-empty and non-RDB partitioned hard disk(s) were detected." END STRINGTABLE diff --git a/od-win32/win32.h b/od-win32/win32.h index 515f4416..6aa979e3 100755 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,10 +15,10 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEBETA 11 +#define WINUAEBETA 12 #define WINUAEPUBLICBETA 1 -#define WINUAEDATE MAKEBD(2007, 7, 20) -#define WINUAEEXTRA "" +#define WINUAEDATE MAKEBD(2007, 7, 24) +#define WINUAEEXTRA " RC1" #define WINUAEREV "" #define IHF_WINDOWHIDDEN 6 diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c index fc42bd49..9b7d203b 100755 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -6576,10 +6576,10 @@ static void out_floppyspeed (HWND hDlg) #define BUTTONSPERFLOPPY 7 static int floppybuttons[][BUTTONSPERFLOPPY] = { - { IDC_DF0TEXT,IDC_DF0,IDC_EJECT0,IDC_DF0TYPE,IDC_DF0WP,IDC_SAVEIMAGE0,-1 }, - { IDC_DF1TEXT,IDC_DF1,IDC_EJECT1,IDC_DF1TYPE,IDC_DF1WP,IDC_SAVEIMAGE1,-1 }, - { IDC_DF2TEXT,IDC_DF2,IDC_EJECT2,IDC_DF2TYPE,IDC_DF2WP,IDC_SAVEIMAGE2,-1 }, - { IDC_DF3TEXT,IDC_DF3,IDC_EJECT3,IDC_DF3TYPE,IDC_DF3WP,IDC_SAVEIMAGE3,-1 } + { IDC_DF0TEXT,IDC_DF0,IDC_EJECT0,IDC_DF0TYPE,IDC_DF0WP,IDC_SAVEIMAGE0,IDC_DF0ENABLE }, + { IDC_DF1TEXT,IDC_DF1,IDC_EJECT1,IDC_DF1TYPE,IDC_DF1WP,IDC_SAVEIMAGE1,IDC_DF1ENABLE }, + { IDC_DF2TEXT,IDC_DF2,IDC_EJECT2,IDC_DF2TYPE,IDC_DF2WP,IDC_SAVEIMAGE2,IDC_DF2ENABLE }, + { IDC_DF3TEXT,IDC_DF3,IDC_EJECT3,IDC_DF3TYPE,IDC_DF3WP,IDC_SAVEIMAGE3,IDC_DF3ENABLE } }; static int floppybuttonsq[][BUTTONSPERFLOPPY] = { { IDC_DF0TEXTQ,IDC_DF0QQ,IDC_EJECT0Q,-1,IDC_DF0WPQ,-1,IDC_DF0QENABLE }, @@ -6725,7 +6725,10 @@ static void addfloppytype (HWND hDlg, int n) if (f_drive >= 0) ew (hDlg, f_drive, state); if (f_enable >= 0) { - ew (hDlg, f_enable, n > 0 && workprefs.nr_floppies > 0); + if (currentpage == QUICKSTART_ID) + ew (hDlg, f_enable, n > 0 && workprefs.nr_floppies > 0); + else + ew (hDlg, f_enable, TRUE); CheckDlgButton(hDlg, f_enable, state ? BST_CHECKED : BST_UNCHECKED); } chk = disk_getwriteprotect (workprefs.df[n]) && state == TRUE ? BST_CHECKED : 0; @@ -6748,22 +6751,24 @@ static void getfloppytype (HWND hDlg, int n) } static void getfloppytypeq (HWND hDlg, int n) { - int f_enable = floppybuttonsq[n][6]; + int f_enable = currentpage == QUICKSTART_ID ? floppybuttonsq[n][6] : floppybuttons[n][6]; int chk; - if (f_enable <= 0 || n == 0) + if (f_enable <= 0 || (n == 0 && currentpage == QUICKSTART_ID)) return; chk = IsDlgButtonChecked (hDlg, f_enable) ? 0 : -1; if (chk != workprefs.dfxtype[n]) { workprefs.dfxtype[n] = chk; addfloppytype (hDlg, n); } - if (chk == 0) - quickstart_floppy = 2; - else - quickstart_floppy = 1; - if (hWinUAEKey) - RegSetValueEx (hWinUAEKey, "QuickStartFloppies", 0, REG_DWORD, (CONST BYTE *)&quickstart_floppy, sizeof(quickstart_floppy)); + if (currentpage == QUICKSTART_ID) { + if (chk == 0) + quickstart_floppy = 2; + else + quickstart_floppy = 1; + if (hWinUAEKey) + RegSetValueEx (hWinUAEKey, "QuickStartFloppies", 0, REG_DWORD, (CONST BYTE *)&quickstart_floppy, sizeof(quickstart_floppy)); + } } static int getfloppybox (HWND hDlg, int f_text, char *out, int maxlen) @@ -6947,12 +6952,20 @@ static INT_PTR CALLBACK FloppyDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA } switch (LOWORD (wParam)) { + case IDC_DF0ENABLE: case IDC_DF0QENABLE: getfloppytypeq (hDlg, 0); break; + case IDC_DF1ENABLE: case IDC_DF1QENABLE: getfloppytypeq (hDlg, 1); break; + case IDC_DF2ENABLE: + getfloppytypeq (hDlg, 2); + break; + case IDC_DF3ENABLE: + getfloppytypeq (hDlg, 3); + break; case IDC_DF0WP: case IDC_DF0WPQ: floppysetwriteprotect (hDlg, 0, currentpage == QUICKSTART_ID ? IsDlgButtonChecked (hDlg, IDC_DF0WPQ) : IsDlgButtonChecked (hDlg, IDC_DF0WP)); diff --git a/od-win32/winuae_msvc/winuae_msvc.8.vcproj b/od-win32/winuae_msvc/winuae_msvc.8.vcproj index 78badfce..59b3a59a 100755 --- a/od-win32/winuae_msvc/winuae_msvc.8.vcproj +++ b/od-win32/winuae_msvc/winuae_msvc.8.vcproj @@ -2465,6 +2465,10 @@ RelativePath="..\resources\drive_startup.wav" > + + diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index bd7c449e..854ed86e 100755 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,7 +1,18 @@ +Beta 12: + +- added quick enable/disable checkboxes to floppy panel +- non-word aligned word writes to custom registers emulated correctly +- byte writes to custom registers emulated properly on a 68060 (perhaps + only Blizzard 68060 cards' feature?) +- 68020 "cycle-exact" does not anymore freeze when switching to RTG mode + (but it still should not be used) +- Nordic Power v2.0 support (got another "blue" Nordic Power today, + also "cartridge support" credits added to contributors list) + Beta 11: -- autoconfig memory banks do not show ****'s in debugger anymore +- autoconfig memory banks do not show as ****'s in debugger anymore - filesystem not initializing if JIT was enabled and no other autoconfig expansions enabled (ancient bug..) - do not crash if CD32 is selected in advanced chipset without -- 2.47.3