3400b16

diff --git a/cfgfile.cpp b/cfgfile.cpp
index fa99557dbb1b08785feed7258af0abb2c837cb58..0922241b45b59ea8d93bdb7a3400cd96f9e18e94 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -1349,6 +1349,11 @@ static bool cfgfile_readramboard(const TCHAR *option, const TCHAR *value, const
                                        rb->autoconfig_inuse = false;
                                }
                        }
+                       s1 = cfgfile_option_get(value, _T("write_address"));
+                       if (s1) {
+                               TCHAR *endptr;
+                               rb->write_address = _tcstol(s1, &endptr, 16);
+                       }
                        return true;
                }
        }
@@ -1390,7 +1395,10 @@ static void cfgfile_writeramboard(struct uae_prefs *prefs, struct zfile *f, cons
                        *p++ = ',';
                _stprintf(p, _T("start=%08x,end=%08x"), rb->start_address, rb->end_address);
                p += _tcslen(p);
-
+       }
+       if (rb->write_address) {
+               _stprintf(p, _T(",write_address=%08x"), rb->write_address);
+               p += _tcslen(p);
        }
        if (tmp2[0]) {
                cfgfile_write(f, tmp1, tmp2);

diff --git a/include/memory.h b/include/memory.h
index 8776f9447a45dff82a5d15454bcc20897570a12f..1666db6cf5edabe75a117c0fb0f23343ed16773f 100644 (file)
--- a/include/memory.h
+++ b/include/memory.h
@@ -143,6 +143,7 @@ struct autoconfig_info
        int zorro;
        const TCHAR *label;
        addrbank *addrbank;
+       uaecptr write_bank_address;
        struct romconfig *rc;
        uae_u32 last_high_ram;
        const struct cpuboardsubtype *cst;

diff --git a/include/options.h b/include/options.h
index c390e29ea18b0872dc995546450295b79540d549..993829b00c2551fcdcea0e49cc6baa46459551ca 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -390,6 +390,7 @@ struct ramboard
        int device_order;
        uae_u32 start_address;
        uae_u32 end_address;
+       uae_u32 write_address;
 };
 struct expansion_params
 {

diff --git a/memory.cpp b/memory.cpp
index 7bd20f90e0ee0d1fe183fd0875ab8efedff90bd3..b8d4c1788bda6a493c854c99128bd6fc7f31f9e1 100644 (file)
--- a/memory.cpp
+++ b/memory.cpp
@@ -2080,7 +2080,8 @@ static void fill_ce_banks (void)
        memset(ce_cachable + (a3000lmem_bank.start >> 16), 1 | 2, currprefs.mbresmem_low_size >> 16);
        memset(ce_cachable + (mem25bit_bank.start >> 16), 1 | 2, currprefs.mem25bit_size >> 16);
 
-       if (get_mem_bank (0).flags & ABFLAG_CHIPRAM) {
+       addrbank *ab = &get_mem_bank(0);
+       if (ab && (ab->flags & ABFLAG_CHIPRAM)) {
                for (i = 0; i < (0x200000 >> 16); i++) {
                        ce_banktype[i] = (currprefs.cs_mbdmac || (currprefs.chipset_mask & CSMASK_AGA)) ? CE_MEMBANK_CHIP32 : CE_MEMBANK_CHIP16;
                }
@@ -2097,7 +2098,7 @@ static void fill_ce_banks (void)
                addrbank *b;
                ce_banktype[i] = CE_MEMBANK_CIA;
                b = &get_mem_bank (i << 16);
-               if (!(b->flags & ABFLAG_CIA)) {
+               if (b && !(b->flags & ABFLAG_CIA)) {
                        ce_banktype[i] = CE_MEMBANK_FAST32;
                        ce_cachable[i] = 1;
                }

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 8b2d6445a7b751990b7d625aedd87db24713109a..ed3fd4de60aa9bf57120a651c466abcc8938198d 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -109,8 +109,8 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     CONTROL         "",IDC_BOARDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,2,18,390,220
     CONTROL         "Custom board order",IDC_AUTOCONFIGCUSTOMSORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,2,242,99,12
-    PUSHBUTTON      "Move down",IDC_BOARDS_DOWN,203,241,78,14
     PUSHBUTTON      "Move up",IDC_BOARDS_UP,114,241,78,14
+    PUSHBUTTON      "Move down",IDC_BOARDS_DOWN,203,241,78,14
 END
 
 IDD_KICKSTART DIALOGEX 0, 0, 396, 259
@@ -173,6 +173,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,154,139,10
     CONTROL         "VGA mode resolution autoswitch [] Automatically selects between hires and superhires in programmed display modes, keeping correct aspect ratio.",IDC_AUTORESOLUTIONVGA,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,154,124,10
+    CONTROL         "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,167,139,10
     RTEXT           "Resolution:",IDC_STATIC,24,192,110,8,SS_CENTERIMAGE
     COMBOBOX        IDC_LORES,142,191,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Resolution autoswitch:",IDC_STATIC,92,212,110,8,SS_CENTERIMAGE
@@ -202,7 +203,6 @@ BEGIN
     CONTROL         "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,251,90,10
     CONTROL         "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,264,90,10
     CONTROL         "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,277,90,10
-    CONTROL         "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,167,139,10
 END
 
 IDD_MEMORY DIALOGEX 0, 0, 396, 266
@@ -228,24 +228,24 @@ BEGIN
     EDITTEXT        IDC_Z3CHIPRAM,311,76,40,12,ES_CENTER | ES_READONLY
     EDITTEXT        IDC_MAX32RAM,14,99,366,12,ES_CENTER | ES_READONLY
     GROUPBOX        "Advanced Memory Settings",IDC_STATIC,1,128,393,137
+    COMBOBOX        IDC_MEMORYSELECT,14,151,228,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_MEMORYMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,253,145,68,20
     EDITTEXT        IDC_MEMORYRAM,328,148,40,12,ES_CENTER | ES_READONLY
-    LTEXT           "Z3 mapping mode:",IDC_STATIC,263,215,115,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_Z3MAPPING,262,237,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_MEMORYSELECT,14,151,228,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_AUTOCONFIG_MANUFACTURER,78,175,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_AUTOCONFIG_PRODUCT,196,175,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_AUTOCONFIG_DATA,78,194,164,13,ES_AUTOHSCROLL
     RTEXT           "Manufacturer",IDC_STATIC,12,175,57,15,SS_CENTERIMAGE
+    EDITTEXT        IDC_AUTOCONFIG_MANUFACTURER,78,175,45,13,ES_AUTOHSCROLL
     RTEXT           "Product",IDC_STATIC,133,175,55,15,SS_CENTERIMAGE
+    EDITTEXT        IDC_AUTOCONFIG_PRODUCT,196,175,45,13,ES_AUTOHSCROLL
     RTEXT           "Autoconfig data",IDC_STATIC,11,195,57,15,SS_CENTERIMAGE
+    EDITTEXT        IDC_AUTOCONFIG_DATA,78,194,164,13,ES_AUTOHSCROLL
     CONTROL         "Edit Autoconfig data",IDC_FASTMEMAUTOCONFIGUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,177,103,8
+    CONTROL         "Manual configuration",IDC_FASTMEMNOAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,195,103,8
     RTEXT           "Memory board",IDC_STATIC,15,216,53,15,SS_CENTERIMAGE
     COMBOBOX        IDC_MEMORYBOARDSELECT,77,216,165,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Manual configuration",IDC_FASTMEMNOAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,195,103,8
+    LTEXT           "Z3 mapping mode:",IDC_STATIC,263,215,115,15,SS_CENTERIMAGE
     RTEXT           "Address range",IDC_STATIC,10,237,57,15,SS_CENTERIMAGE
     EDITTEXT        IDC_RAM_ADDRESS,77,237,79,13,ES_AUTOHSCROLL
     EDITTEXT        IDC_RAM_ADDRESS2,164,237,79,13,ES_AUTOHSCROLL
+    COMBOBOX        IDC_Z3MAPPING,262,237,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_CPU DIALOGEX 0, 0, 396, 317
@@ -268,6 +268,15 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,147,120,11
     CONTROL         "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,160,118,10
+    GROUPBOX        "FPU",IDC_STATIC,1,188,129,128,BS_LEFT
+    CONTROL         "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,204,87,10
+    CONTROL         "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,217,87,10
+    CONTROL         "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,230,87,10
+    CONTROL         "CPU internal",IDC_FPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,243,93,10
+    CONTROL         "More compatible [] More compatible but slower FPU emulation.",IDC_COMPATIBLE_FPU,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,259,117,10
+    CONTROL         "Unimplemented FPU emu [] Emulate FPU unimplemented instructions",IDC_FPU_UNIMPLEMENTED,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,272,116,10
     GROUPBOX        "CPU Emulation Speed",IDC_STATIC,136,1,258,97
     CONTROL         "Fastest possible",IDC_CS_HOST,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,143,19,195,10
     CONTROL         "Approximate A500/A1200 or cycle-exact",IDC_CS_68000,
@@ -281,34 +290,25 @@ BEGIN
     RTEXT           "CPU Frequency",IDC_STATIC,139,121,67,10,SS_CENTERIMAGE
     COMBOBOX        IDC_CPU_FREQUENCY,215,120,89,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_CPU_FREQUENCY2,312,119,70,15
-    GROUPBOX        "FPU",IDC_STATIC,1,188,129,128,BS_LEFT
-    CONTROL         "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,204,87,10
-    CONTROL         "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,217,87,10
-    CONTROL         "68882",IDC_FPU2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,230,87,10
-    CONTROL         "CPU internal",IDC_FPU3,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,243,93,10
-    CONTROL         "More compatible [] More compatible but slower FPU emulation.",IDC_COMPATIBLE_FPU,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,259,117,10
-    CONTROL         "Unimplemented FPU emu [] Emulate FPU unimplemented instructions",IDC_FPU_UNIMPLEMENTED,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,272,116,10
+    GROUPBOX        "PPC CPU options",IDC_STATIC,136,144,258,57
+    CONTROL         "PPC CPU emulation (Blizzard PPC / CyberStorm PPC) [] Automatically configure CyberStorm PPC or Blizzard PPC setup.",IDC_CPU_PPC,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,145,161,236,10
+    RTEXT           "Stopped M68K CPU idle mode",IDC_STATIC,180,183,121,9
+    CONTROL         "",IDC_PPC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,177,69,21
+    GROUPBOX        "x86 Bridgeboard CPU options",IDC_STATIC,136,202,258,42
+    RTEXT           "CPU Speed",IDC_STATIC,147,221,55,9,SS_CENTERIMAGE
+    EDITTEXT        IDC_CPUTEXT_x86,224,220,39,12,ES_CENTER | ES_READONLY
+    CONTROL         "",IDC_SPEED_x86,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,278,215,108,20
     GROUPBOX        "Advanced JIT Settings",IDC_STATIC,136,245,258,70
     RTEXT           "Cache size:",IDC_STATIC,143,261,66,10,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_CACHE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,212,255,115,20
     EDITTEXT        IDC_CACHETEXT,331,260,30,12,ES_CENTER | ES_READONLY
-    CONTROL         "Hard flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,281,84,11
-    CONTROL         "Constant jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,221,281,71,11
     CONTROL         "FPU support",IDC_JITFPU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,281,71,11
-    CONTROL         "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,299,68,11
+    CONTROL         "Constant jump",IDC_CONSTJUMP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,221,281,71,11
+    CONTROL         "Hard flush",IDC_HARDFLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,281,84,11
     CONTROL         "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,143,299,72,10
     CONTROL         "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,221,299,72,10
-    CONTROL         "PPC CPU emulation (Blizzard PPC / CyberStorm PPC) [] Automatically configure CyberStorm PPC or Blizzard PPC setup.",IDC_CPU_PPC,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,145,161,236,10
-    GROUPBOX        "PPC CPU options",IDC_STATIC,136,144,258,57
-    RTEXT           "Stopped M68K CPU idle mode",IDC_STATIC,180,183,121,9
-    CONTROL         "",IDC_PPC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,308,177,69,21
-    CONTROL         "",IDC_SPEED_x86,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,278,215,108,20
-    RTEXT           "CPU Speed",IDC_STATIC,147,221,55,9,SS_CENTERIMAGE
-    GROUPBOX        "x86 Bridgeboard CPU options",IDC_STATIC,136,202,258,42
-    EDITTEXT        IDC_CPUTEXT_x86,224,220,39,12,ES_CENTER | ES_READONLY
+    CONTROL         "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,299,68,11
 END
 
 IDD_FLOPPY DIALOGEX 0, 0, 396, 261
@@ -439,17 +439,17 @@ BEGIN
     GROUPBOX        "Floppy Drive Sound Emulation",IDC_STATIC,1,209,278,91
     CONTROL         "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,20,227,107,19
     EDITTEXT        IDC_SOUNDDRIVEVOLUME2,145,231,48,12,ES_CENTER | ES_READONLY
+    LTEXT           "Empty drive",IDC_STATIC,205,231,60,15,SS_CENTERIMAGE
     CONTROL         "",IDC_SOUNDDRIVEVOLUMEX,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,20,254,107,19
     EDITTEXT        IDC_SOUNDDRIVEVOLUMEX2,145,258,48,12,ES_CENTER | ES_READONLY
-    COMBOBOX        IDC_SOUNDDRIVE,205,281,66,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Disk in drive",IDC_STATIC,205,258,60,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SOUNDDRIVESELECT,18,281,175,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SOUNDDRIVE,205,281,66,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Drivers",IDC_STATIC,285,213,109,87
     CONTROL         "DirectSound",IDC_SOUND_DS,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,234,98,10
     CONTROL         "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,248,98,10
     CONTROL         "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,262,98,10
     CONTROL         "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,276,98,10
-    LTEXT           "Disk in drive",IDC_STATIC,208,231,60,15,SS_CENTERIMAGE
-    LTEXT           "Empty drive",IDC_STATIC,208,258,60,15,SS_CENTERIMAGE
 END
 
 IDD_LOADSAVE DIALOGEX 0, 0, 396, 318
@@ -526,6 +526,8 @@ BEGIN
     COMBOBOX        IDC_PORT1_JOYSMODE,136,74,106,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Remap / Test [] Remap or test Port 2 configuration.",IDC_PORT1_REMAP,310,74,78,14
     PUSHBUTTON      "Swap ports [] Swap ports 1 and 2.",IDC_SWAP,45,100,78,14
+    CONTROL         "Mouse/Joystick autoswitching [] Press button to automatically insert inactive input device in to joystick/mouse port",IDC_PORT_AUTOSWITCH,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,102,172,11
     LTEXT           "Emulated parallel port joystick adapter",IDC_STATIC,10,124,179,15,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT2_JOYS,45,142,342,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Remap / Test [] Remap or test Parallel port joystick port 1 configurarion.",IDC_PORT2_REMAP,310,159,78,14
@@ -534,17 +536,15 @@ BEGIN
     GROUPBOX        "Mouse extra settings",IDC_STATIC,1,219,393,68
     RTEXT           "Mouse speed:",IDC_STATIC,13,237,70,10,SS_CENTERIMAGE
     EDITTEXT        IDC_INPUTSPEEDM,97,237,25,13,ES_NUMBER
+    CONTROL         "Install virtual mouse driver",IDC_PORT_TABLET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,270,116,11
+    RTEXT           "Mouse untrap mode:",IDC_STATIC,143,237,110,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_MOUSE_UNTRAPMODE,268,234,119,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Magic Mouse cursor mode:",IDC_STATIC,143,253,110,10,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT_TABLET_CURSOR,268,251,119,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Install virtual mouse driver",IDC_PORT_TABLET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,270,116,11
     CONTROL         "Full tablet input emulation",IDC_PORT_TABLET_FULL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,270,106,11
     CONTROL         "Tablet.library emulation",IDC_PORT_TABLET_LIBRARY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,271,117,11
-    CONTROL         "Mouse/Joystick autoswitching [] Press button to automatically insert inactive input device in to joystick/mouse port",IDC_PORT_AUTOSWITCH,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,102,172,11
-    COMBOBOX        IDC_MOUSE_UNTRAPMODE,268,234,119,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Mouse untrap mode:",IDC_STATIC,143,237,110,10,SS_CENTERIMAGE
 END
 
 IDD_CONTRIBUTORS DIALOGEX 0, 0, 530, 345
@@ -646,18 +646,18 @@ BEGIN
     EDITTEXT        IDC_RESERVED,347,111,40,15,ES_NUMBER
     RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,132,45,10
     EDITTEXT        IDC_BLOCKSIZE,347,130,40,15,ES_NUMBER
-    PUSHBUTTON      "RDB mode",IDC_HDF_RDB,135,109,75,14
     LTEXT           "HD Controller:",IDC_STATIC,10,113,54,10,SS_CENTERIMAGE
+    PUSHBUTTON      "RDB mode",IDC_HDF_RDB,135,109,75,14
+    COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,109,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER,6,131,152,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_UNIT,163,131,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_TYPE,231,131,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,109,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_HDFINFO,5,150,385,12,ES_CENTER | ES_READONLY
     EDITTEXT        IDC_HDFINFO2,5,166,385,12,ES_CENTER | ES_READONLY
     GROUPBOX        "New hard disk image file",IDC_STATIC,2,190,392,62
     PUSHBUTTON      "Create",IDC_HF_CREATE,58,206,80,14
     COMBOBOX        IDC_HF_TYPE,58,230,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_HF_SIZE,154,206,61,15,ES_NUMBER
+    EDITTEXT        IDC_HF_SIZE,154,206,61,15
     LTEXT           "MB",IDC_STATIC,220,209,53,10,SS_CENTERIMAGE
     EDITTEXT        IDC_HF_DOSTYPE,154,229,61,15
     LTEXT           "DOS type",IDC_STATIC,222,231,51,10,SS_CENTERIMAGE
@@ -719,17 +719,18 @@ BEGIN
                     "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,114,31,86,10
     CONTROL         "NTSC [] North American and Japanese display standard, 60Hz refresh rate. Other countries use PAL (50Hz. display refresh rate)",IDC_NTSC,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,47,86,10
+    CONTROL         "Cycle-exact (Full) [] The most compatible A500/A1200 emulation mode.",IDC_CYCLEEXACT,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,68,194,10
     CONTROL         "Cycle-exact (DMA/Memory accesses)",IDC_CYCLEEXACTMEMORY,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,81,194,10
     RTEXT           "Chipset Extra:",IDC_STATIC,72,108,71,15,SS_CENTERIMAGE
     COMBOBOX        IDC_CS_EXT,148,109,49,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Options",IDC_STATIC,221,0,173,137
+    CONTROL         "Keyboard connected",IDC_KEYBOARD_CONNECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,15,150,10
     CONTROL         "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,47,150,10
     CONTROL         "Wait for Blitter [] Compatibility hack for programs that don't wait for the blitter correctly, causing graphics corruption if CPU is too fast.",IDC_BLITWAIT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,60,150,10
-    CONTROL         "Genlock connected [] Allow boot sequence to detect genlock.",IDC_GENLOCK,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,209,150,10
     LTEXT           "Video port display hardware:",IDC_STATIC,237,91,117,15,SS_CENTERIMAGE
     COMBOBOX        IDC_MONITOREMU,237,109,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Collision Level",IDC_STATIC,1,141,393,48
@@ -741,16 +742,15 @@ BEGIN
                     "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,182,157,181,10
     CONTROL         "Full [] 100% collision hardware emulation. Only very few games need this option. Slowest.",IDC_COLLISION3,
                     "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,182,172,181,10
+    GROUPBOX        "Genlock",IDC_STATIC,0,195,393,66
+    CONTROL         "Genlock connected [] Allow boot sequence to detect genlock.",IDC_GENLOCK,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,209,150,10
     COMBOBOX        IDC_GENLOCKMODE,197,209,124,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_GENLOCKMIX,330,209,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Cycle-exact (Full) [] The most compatible A500/A1200 emulation mode.",IDC_CYCLEEXACT,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,12,68,194,10
-    GROUPBOX        "Genlock",IDC_STATIC,0,195,393,66
-    COMBOBOX        IDC_GENLOCKFILE,12,241,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_GENLOCKFILESELECT,375,240,10,15
     CONTROL         "Include alpha channel in screenshots and video captures.",IDC_GENLOCK_ALPHA,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,226,214,10
-    CONTROL         "Keyboard connected",IDC_KEYBOARD_CONNECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,15,150,10
+    COMBOBOX        IDC_GENLOCKFILE,12,241,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_GENLOCKFILESELECT,375,240,10,15
 END
 
 IDD_CHIPSET2 DIALOGEX 0, 0, 396, 305
@@ -784,6 +784,8 @@ BEGIN
     CONTROL         "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,156,121,11
     CONTROL         "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,169,121,11
     CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,182,104,11
+    CONTROL         "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,195,130,11
     CONTROL         "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,104,125,11
     CONTROL         "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,117,125,11
     CONTROL         "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,130,125,11
@@ -791,10 +793,11 @@ BEGIN
     CONTROL         "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,156,125,11
     CONTROL         "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,169,125,11
     CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,182,125,11
+    CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,195,125,12
     GROUPBOX        "Internal SCSI Hardware",IDC_STATIC,0,218,395,39
     CONTROL         "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,236,108,11
-    CONTROL         "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,236,121,11
     CONTROL         "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,130,236,125,11
+    CONTROL         "CDTV WD33C93 SCSI",IDC_CS_CDTVSCSI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,263,236,121,11
     GROUPBOX        "Chipset Revision",IDC_STATIC,1,259,393,46
     CONTROL         "Ramsey revision:",IDC_CS_RAMSEY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,275,97,11
     CONTROL         "Fat Gary revision:",IDC_CS_FATGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,34,289,97,11
@@ -804,9 +807,6 @@ BEGIN
     CONTROL         "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,289,107,11
     EDITTEXT        IDC_CS_AGNUSREV,311,274,45,13,ES_AUTOHSCROLL
     EDITTEXT        IDC_CS_DENISEREV,311,289,45,13,ES_AUTOHSCROLL
-    CONTROL         "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,195,130,11
-    CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,195,125,12
 END
 
 IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 260
@@ -930,12 +930,12 @@ BEGIN
     DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,67,158,14
     EDITTEXT        IDC_PATH_NAME,178,67,97,15,ES_AUTOHSCROLL | NOT WS_VISIBLE
     CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,315,71,60,10
-    COMBOBOX        IDC_HDF_CONTROLLER,8,113,218,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_UNIT,65,90,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Add hard drive",IDOK,236,113,73,14
-    PUSHBUTTON      "Cancel",IDCANCEL,316,113,73,14
     COMBOBOX        IDC_HDF_CONTROLLER_TYPE,178,90,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_FEATURE_LEVEL,291,90,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER,8,113,218,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Add hard drive",IDOK,236,113,73,14
+    PUSHBUTTON      "Cancel",IDCANCEL,316,113,73,14
 END
 
 IDD_MISC2 DIALOGEX 0, 0, 396, 278
@@ -1160,6 +1160,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     GROUPBOX        "RTG Graphics Card",IDC_STATIC,1,0,393,189
     COMBOBOX        IDC_RTG_Z2Z3,26,14,215,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_RTG_NUM,248,14,37,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "VRAM size: [] Graphics card memory. Required for RTG (Picasso96) emulation.",IDC_GFXCARDTEXT,2,35,76,10,SS_NOTIFY | SS_CENTERIMAGE
     CONTROL         "",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,31,103,20
     EDITTEXT        IDC_P96RAM,201,34,40,12,ES_CENTER | ES_READONLY
@@ -1185,7 +1186,6 @@ BEGIN
     COMBOBOX        IDC_RTG_BUFFERCNT,153,162,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CTEXT           "Aspect ratio:",IDC_STATIC,282,149,83,10,SS_CENTERIMAGE
     COMBOBOX        IDC_RTG_SCALE_ASPECTRATIO,282,162,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_RTG_NUM,248,14,37,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_INPUTMAP DIALOGEX 0, 0, 421, 341
@@ -1199,12 +1199,12 @@ BEGIN
     EDITTEXT        IDC_INPUTMAPOUTM,1,277,418,29,ES_MULTILINE | ES_READONLY | WS_DISABLED
     COMBOBOX        IDC_INPUTMAPADD,2,309,247,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Add Event",IDC_INPUTMAP_CUSTOM,253,308,79,14
+    PUSHBUTTON      "Autofire",IDC_INPUTMAP_SPECIALS,338,308,79,14
     PUSHBUTTON      "Test",IDC_INPUTMAP_TEST,1,325,80,14
     PUSHBUTTON      "Remap",IDC_INPUTMAP_CAPTURE,85,325,80,14
     PUSHBUTTON      "Delete",IDC_INPUTMAP_DELETE,169,325,80,14
     PUSHBUTTON      "Delete all",IDC_INPUTMAP_DELETEALL,253,325,80,14
     PUSHBUTTON      "Exit",IDC_INPUTMAP_EXIT,338,325,79,14
-    PUSHBUTTON      "Autofire",IDC_INPUTMAP_SPECIALS,338,308,79,14
 END
 
 IDD_INFOBOX DIALOGEX 0, 0, 420, 68
@@ -1275,38 +1275,38 @@ IDD_EXPANSION2 DIALOGEX 0, 0, 396, 248
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    RTEXT           "Accelerator board memory:",IDC_STATIC,155,145,104,15,SS_CENTERIMAGE
-    CONTROL         "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,269,143,68,20
-    EDITTEXT        IDC_CPUBOARDRAM,343,147,40,12,ES_CENTER | ES_READONLY
-    COMBOBOX        IDC_CPUBOARD_TYPE,13,118,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_CPUBOARD_SUBTYPE,13,137,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Expansion Board Settings",IDC_STATIC,1,6,394,88
-    COMBOBOX        IDC_SCSIROMSELECTNUM,175,42,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SCSIROMSELECTCAT,12,23,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCSIROMSELECT,12,42,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,62,99,12
+    COMBOBOX        IDC_SCSIROMSUBSELECT,12,59,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_EXPANSIONBOARDITEMSELECTOR,12,76,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SCSIROMSELECTNUM,175,42,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Controller ID:",IDC_STATIC,241,23,110,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SCSIROMID,356,24,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_SCSIROMFILE,202,42,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SCSIROMCHOOSER,376,42,10,15
-    COMBOBOX        IDC_SCSIROMSUBSELECT,12,59,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,62,99,12
+    CONTROL         "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,76,99,12
+    COMBOBOX        IDC_SCSIROMFILE,202,42,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Accelerator Board Settings",IDC_STATIC,1,97,394,91
+    COMBOBOX        IDC_CPUBOARD_TYPE,13,118,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_CPUBOARD_SUBTYPE,13,137,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_ACCELERATORBOARDITEMSELECTOR,12,169,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Accelerator board memory:",IDC_STATIC,155,145,104,15,SS_CENTERIMAGE
     LTEXT           "Accelerator board ROM file:",IDC_STATIC,203,105,170,15,SS_CENTERIMAGE
     COMBOBOX        IDC_CPUBOARDROMFILE,202,120,169,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_CPUBOARDROMCHOOSER,376,119,10,15
-    GROUPBOX        "Accelerator Board Settings",IDC_STATIC,1,97,394,91
+    CONTROL         "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,269,143,68,20
+    EDITTEXT        IDC_CPUBOARDRAM,343,147,40,12,ES_CENTER | ES_READONLY
+    CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,170,99,12
     GROUPBOX        "Miscellaneous Expansions",IDC_STATIC,1,192,394,51
-    CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,223,147,11
-    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,223,151,11
     CONTROL         "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,207,187,11
+    CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,223,147,11
     CONTROL         "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,207,187,11
+    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,223,151,11
     CONTROL         "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,43,99,12
-    COMBOBOX        IDC_SCSIROMSELECTCAT,12,23,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_EXPANSIONBOARDITEMSELECTOR,12,76,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,76,99,12
     COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,76,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_ACCELERATORBOARDITEMSELECTOR,12,169,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,170,99,12
     COMBOBOX        IDC_ACCELERATORBOARDSELECTOR,202,169,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
 END
 
@@ -1570,7 +1570,6 @@ BEGIN
     IDD_HARDDRIVE, DIALOG
     BEGIN
         RIGHTMARGIN, 396
-        BOTTOMMARGIN, 109
     END
 
     IDD_MISC2, DIALOG

diff --git a/od-win32/screenshot.cpp b/od-win32/screenshot.cpp
index 2f6e18d6f2cf385fc1718fd290abef02372d2527..1f8acf2e1283b472a51d8e24e994787970c90ea3 100644 (file)
--- a/od-win32/screenshot.cpp
+++ b/od-win32/screenshot.cpp
@@ -820,3 +820,8 @@ void screenshot (int mode, int doprepare)
        freevidbuffer (&vb);
 #endif
 }
+
+void screenshot_reset(void)
+{
+       screenshot_free();
+}

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 8d7f1374b57bc2fffd839f195e5f51339cc1b5d0..6ee25bac2eed3b3f964e3276d281de0a08ef7209 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("15")
+#define WINUAEBETA _T("16")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2016, 11, 6)
+#define WINUAEDATE MAKEBD(2016, 11, 13)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
@@ -161,7 +161,8 @@ int isdllversion (const TCHAR *name, int version, int revision, int subver, int
 
 extern int screenshot_prepare (void);
 extern int screenshot_prepare (int);
-extern void screenshot_free (void);
+extern void screenshot_free(void);
+extern void screenshot_reset(void);
 
 extern void rawinput_release(void);
 extern void rawinput_alloc(void);

diff --git a/od-win32/win32gfx.h b/od-win32/win32gfx.h
index 63ff292f7d5d0d682449162a74ea78400213bedf..0f33ae25d921e222d27e71f307bb96624986d403 100644 (file)
--- a/od-win32/win32gfx.h
+++ b/od-win32/win32gfx.h
@@ -17,7 +17,6 @@ int WIN32GFX_GetDepth (int real);
 void WIN32GFX_DisplayChangeRequested (int);
 void DX_Invalidate (int x, int y, int width, int height);
 
-RGBFTYPE WIN32GFX_FigurePixelFormats (RGBFTYPE colortype);
 int WIN32GFX_AdjustScreenmode (struct MultiDisplay *md, int *pwidth, int *pheight, int *ppixbits);
 extern HCURSOR normalcursor;
 

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 418434288f794504cabcfb940d0d4f28f409d453..7a02e5583297a084bcdcce834b5076e6254447b1 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -3048,7 +3048,7 @@ static int loopmulti (const TCHAR *s, TCHAR *out)
        return 1;
 }
 
-static BOOL CreateHardFile (HWND hDlg, UINT hfsizem, const TCHAR *dostype, TCHAR *newpath, TCHAR *outpath)
+static BOOL CreateHardFile (HWND hDlg, uae_s64 hfsize, const TCHAR *dostype, TCHAR *newpath, TCHAR *outpath)
 {
        HANDLE hf;
        int i = 0;
@@ -3056,7 +3056,6 @@ static BOOL CreateHardFile (HWND hDlg, UINT hfsizem, const TCHAR *dostype, TCHAR
        LONG highword = 0;
        DWORD ret, written;
        TCHAR init_path[MAX_DPATH] = _T("");
-       uae_u64 hfsize;
        uae_u32 dt;
        uae_u8 b;
        int sparse, dynamic;
@@ -3065,7 +3064,6 @@ static BOOL CreateHardFile (HWND hDlg, UINT hfsizem, const TCHAR *dostype, TCHAR
        sparse = 0;
        dynamic = 0;
        dt = 0;
-       hfsize = (uae_u64)hfsizem * 1024 * 1024;
        if (ischecked (hDlg, IDC_HF_SPARSE))
                sparse = 1;
        if (ischecked (hDlg, IDC_HF_DYNAMIC)) {
@@ -3135,16 +3133,23 @@ static BOOL CreateHardFile (HWND hDlg, UINT hfsizem, const TCHAR *dostype, TCHAR
        return result;
 }
 
-static int CalculateHardfileSize (HWND hDlg)
+static uae_s64 CalculateHardfileSize(HWND hDlg)
 {
-       BOOL Translated = FALSE;
-       UINT mbytes = 0;
+       uae_s64 mbytes = 0;
+       TCHAR tmp[100];
 
-       mbytes = GetDlgItemInt(hDlg, IDC_HF_SIZE, &Translated, FALSE);
+       tmp[0] = 0;
+       GetDlgItemText(hDlg, IDC_HF_SIZE, tmp, sizeof tmp / sizeof(TCHAR));
+       for (int i = 0; i < _tcslen(tmp); i++) {
+               if (tmp[i] == ',')
+                       tmp[i] = '.';
+       }
+       double v = _tstof(tmp);
+       mbytes = (uae_s64)(v * 1024 * 1024);
+       mbytes &= ~511;
        if (mbytes <= 0)
                mbytes = 0;
-       if( !Translated )
-               mbytes = 0;
+
        return mbytes;
 }
 
@@ -6539,7 +6544,7 @@ static INT_PTR CALLBACK QuickstartDlgProc (HWND hDlg, UINT msg, WPARAM wParam, L
                case IDC_DF1QENABLE:
                case IDC_INFO0Q:
                case IDC_INFO1Q:
-               if (currentpage == QUICKSTART_ID)
+                       if (currentpage == QUICKSTART_ID)
                                ret = FloppyDlgProc (hDlg, msg, wParam, lParam);
                        break;
                case IDC_QUICKSTART_SETCONFIG:
@@ -12762,7 +12767,7 @@ static void hardfilecreatehdf (HWND hDlg, TCHAR *newpath)
 {
        TCHAR hdfpath[MAX_DPATH];
        LRESULT res;
-       UINT setting = CalculateHardfileSize (hDlg);
+       uae_s64 setting = CalculateHardfileSize (hDlg);
        TCHAR dostype[16];
        GetDlgItemText (hDlg, IDC_HF_DOSTYPE, dostype, sizeof (dostype) / sizeof (TCHAR));
        res = SendDlgItemMessage (hDlg, IDC_HF_TYPE, CB_GETCURSEL, 0, 0);
@@ -14245,6 +14250,7 @@ static INT_PTR CALLBACK FloppyDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA
        static int recursive = 0;
        int i;
        static TCHAR diskname[40] = { _T("") };
+       static int dropopen;
 
        switch (msg)
        {
@@ -14287,6 +14293,7 @@ static INT_PTR CALLBACK FloppyDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA
                                }
                        }
                        setmultiautocomplete (hDlg, df0texts);
+                       dropopen = 0;
                }
        case WM_USER:
                recursive++;
@@ -14309,30 +14316,43 @@ static INT_PTR CALLBACK FloppyDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARA
                if (recursive > 0)
                        break;
                recursive++;
-               if (HIWORD (wParam) == CBN_SELCHANGE || HIWORD (wParam) == CBN_KILLFOCUS)  {
+               if (HIWORD(wParam) == CBN_DROPDOWN)
+                       dropopen = 1;
+               if (HIWORD(wParam) == CBN_CLOSEUP)
+                       dropopen = 0;
+               if ((HIWORD(wParam) == CBN_SELCHANGE && !dropopen) || HIWORD(wParam) == CBN_KILLFOCUS || HIWORD(wParam) == CBN_CLOSEUP)  {
+                       bool upd = HIWORD(wParam) == CBN_KILLFOCUS || HIWORD(wParam) == CBN_CLOSEUP;
                        switch (LOWORD (wParam))
                        {
                        case IDC_DF0TEXT:
                        case IDC_DF0TEXTQ:
                                getfloppyname (hDlg, 0);
-                               addfloppytype (hDlg, 0);
-                               addfloppyhistory (hDlg);
+                               if (upd) {
+                                       addfloppytype (hDlg, 0);
+                                       addfloppyhistory (hDlg);
+                               }
                                break;
                        case IDC_DF1TEXT:
                        case IDC_DF1TEXTQ:
                                getfloppyname (hDlg, 1);
-                               addfloppytype (hDlg, 1);
-                               addfloppyhistory (hDlg);
+                               if (upd) {
+                                       addfloppytype (hDlg, 1);
+                                       addfloppyhistory (hDlg);
+                               }
                                break;
                        case IDC_DF2TEXT:
                                getfloppyname (hDlg, 2);
-                               addfloppytype (hDlg, 2);
-                               addfloppyhistory (hDlg);
+                               if (upd) {
+                                       addfloppytype (hDlg, 2);
+                                       addfloppyhistory (hDlg);
+                               }
                                break;
                        case IDC_DF3TEXT:
                                getfloppyname (hDlg, 3);
-                               addfloppytype (hDlg, 3);
-                               addfloppyhistory (hDlg);
+                               if (upd) {
+                                       addfloppytype (hDlg, 3);
+                                       addfloppyhistory (hDlg);
+                               }
                                break;
                        case IDC_DF0TYPE:
                                getfloppytype (hDlg, 0);
@@ -18448,10 +18468,12 @@ static INT_PTR CALLBACK AVIOutputDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LP
                case IDC_SCREENSHOT_ORIGINALSIZE:
                        screenshot_originalsize = ischecked(hDlg, IDC_SCREENSHOT_ORIGINALSIZE) ? 1 : 0;
                        regsetint(NULL, _T("Screenshot_Original"), screenshot_originalsize);
+                       screenshot_reset();
                        break;
                case IDC_SCREENSHOT_CLIP:
                        screenshot_clipmode = ischecked(hDlg, IDC_SCREENSHOT_CLIP) ? 1 : 0;
                        regsetint(NULL, _T("Screenshot_ClipMode"), screenshot_clipmode);
+                       screenshot_reset();
                        break;
                case IDC_STATEREC_SAVE:
                        if (input_record > INPREC_RECORD_NORMAL) {
@@ -19670,10 +19692,12 @@ static INT_PTR CALLBACK DialogProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
        return FALSE;
 }
 
+#if 0
 static ACCEL EmptyAccel[] = {
        { FVIRTKEY, VK_UP, 20001 }, { FVIRTKEY, VK_DOWN, 20002 },
        { 0, 0, 0 }
 };
+#endif
 
 struct newresource *getresource (int tmpl)
 {
@@ -19756,7 +19780,6 @@ static int init_page (int tmpl, int icon, int title,
 {
        LPTSTR lpstrTitle;
        static int id = 0;
-       int i = -1;
        struct newresource *res;
 
        res = getresource (tmpl);
@@ -19776,10 +19799,15 @@ static int init_page (int tmpl, int icon, int title,
        ppage[id].idx = id;
        ppage[id].accel = NULL;
        ppage[id].focusid = focusid;
+#if 0
        if (!accels)
                accels = EmptyAccel;
-       while (accels[++i].key);
-       ppage[id].accel = CreateAcceleratorTable (accels, i);
+#endif
+       if (accels) {
+               int i = -1;
+               while (accels[++i].key);
+               ppage[id].accel = CreateAcceleratorTable (accels, i);
+       }
        if (tmpl == IDD_FRONTEND)
                ppage[id].fullpanel = TRUE;
        id++;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 5e7a7ea03bc9421d866f11b783b98911efef598d..a2545c0813dd42153c7b6e354df478cd5cf2ce1e 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,29 @@ JIT Direct current rules are less complex now. It automatically switches off onl
   - RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+Beta 16:\r
+\r
+- uaenet.device unit 0 and 1 (slirp units) didn't open (some previous beta)\r
+- Floppy drive sound volume labels were swapped.\r
+- HDF create size option now accepts decimal numbers. (4.5 = 4.5M. Size is always truncated to 512 byte boundary)\r
+- Microbotics HardFrame SCSI controller emulation. v1.5 ROM added.\r
+- Mainhattan A-Team IDE controller emulation. v1.8. ROM added.\r
+- Immediately free previously allocated screenshot data if screenshot parameters change. (No need to close and open GUI)\r
+- Improve floppy selection drop down behavior. Don't select image until drop down gets closed, sort history list only after\r
+  combo box loses focus to allow keyboard shortcuts to work properly, cursor up/down works without qualifiers.\r
+- GUI tab-key order updated.\r
+\r
+Microbotics HardFrame:\r
+- Adaptec AIC-6250 SCSI chip. Possibly only Amiga controller that uses this chip. Slightly more advanced than 5380.\r
+- True DMA! Off the self 68430 DMA controller.\r
+- v1.5 ROM ("MicroBotics HardFrame Driver 1.5")\r
+- Incomplete emulation, only driver required SCSI chip and DMA controller features are emulated.\r
+\r
+Mainhattan A-Team:\r
+- Yet another basic PIO IDE controller.\r
+- v1.8 ROM ("ateam at-bus device driver (romversion) V1.8 (19-Jun-92)"\r
+- "ateam.asm,v 1.8.1.1 92/05/20 20:44:21 ML Rel $ Copyright (c)92 by MAINHATTAN-Data. Written by Mike Lamm. All Rights reserved!"\r
+- Does not seem to support custom filesystems.\r
 \r
 Beta 15:\r
 \r