4900b35

diff --git a/audio.cpp b/audio.cpp
index c918d4ede7fd537cf01e5b3b66dddc0f8ca4dd17..022551033dcfb2212af3c7589181cb86c638fbc3 100644 (file)
--- a/audio.cpp
+++ b/audio.cpp
@@ -2389,7 +2389,7 @@ void AUDxDAT (int nr, uae_u16 v, uaecptr addr)
 #endif
 
 #if DEBUG_AUDIO > 0
-       if (debugchannel (nr) && (DEBUG_AUDIO > 1 || (!chan_ena || addr == 0xffffffff || ((cdp->state & 15) != 2 && (cdp->state & 15) != 3))))) {
+       if (debugchannel (nr) && (DEBUG_AUDIO > 1 || (!chan_ena || addr == 0xffffffff || ((cdp->state & 15) != 2 && (cdp->state & 15) != 3)))) {
                write_log (_T("AUD%dDAT: %04X ADDR=%08X LEN=%d/%d %d,%d,%d %06X\n"), nr,
                v, addr, cdp->wlen, cdp->len, cdp->state, chan_ena, isirq (nr) ? 1 : 0, M68K_GETPC);
        }

diff --git a/custom.cpp b/custom.cpp
index 053dea9852d0d48bfd6baef8a6239a6c3c4ae0ae..62a15272585547d5cd896195c906e0eed4347e53 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -11018,7 +11018,7 @@ static void hsync_handler_post(bool onvsync)
        // vblank interrupt = next line after VBSTRT
        if (vb_start_line == 1) {
                // first refresh (strobe) slot triggers vblank interrupt
-               send_interrupt(5, (REFRESH_FIRST_HPOS - 1) * CYCLE_UNIT);
+               send_interrupt(5, (REFRESH_FIRST_HPOS + 1) * CYCLE_UNIT);
        }
        // lastline - 1?
        if (vpos + 1 == maxvpos + lof_store || vpos + 1 == maxvpos + lof_store + 1) {

diff --git a/disasm.cpp b/disasm.cpp
index 41073902f6b344548e60122c7075b26ee970ad75..816a3ebe205321a22ae1a1e041b0496bd6d3aea0 100644 (file)
--- a/disasm.cpp
+++ b/disasm.cpp
@@ -197,11 +197,13 @@ static void showea_val(TCHAR *buffer, uae_u16 opcode, uaecptr addr, int size)
        struct mnemolookup *lookup;
        struct instr *table = &table68k[opcode];
 
+#ifndef CPU_TESTER
 #if UAE
        if (addr >= 0xe90000 && addr < 0xf00000)
                goto skip;
        if (addr >= 0xdff000 && addr < 0xe00000)
                goto skip;
+#endif
 #endif
 
        if (!(disasm_flags & DISASM_FLAG_VAL)) {

diff --git a/expansion.cpp b/expansion.cpp
index ff21dacc514ad4609aa408946de24365bec6bb1b..1356d01fcc0f9028bf7e0f074f5420b6edf035ac 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -5817,7 +5817,7 @@ const struct expansionromtype expansionroms[] = {
 #ifndef NDEBUG
        {
                _T("dev_ide"), _T("DEV IDE"), NULL,
-               NULL, dev_hd_init, NULL, dev_hd_add_ide_unit, ROMTYPE_DEVHD | ROMTYPE_NOT, 0, 0, BOARD_NONAUTOCONFIG_BEFORE, true,
+               NULL, dev_hd_init, NULL, dev_hd_add_ide_unit, ROMTYPE_DEVHD | ROMTYPE_NONE, 0, 0, BOARD_AUTOCONFIG_Z2, true,
                NULL, 0,
                false, EXPANSIONTYPE_CUSTOM | EXPANSIONTYPE_IDE | EXPANSIONTYPE_SCSI,
                0, 0, 0, false, NULL,

diff --git a/idecontrollers.cpp b/idecontrollers.cpp
index cf46733d1e1e54771418c7ad045068667e6a4549..6ae66e8f4f3d1aec211a12a1d3c50ae79611c8c7 100644 (file)
--- a/idecontrollers.cpp
+++ b/idecontrollers.cpp
@@ -603,6 +603,9 @@ static int get_ivst500at_reg(uaecptr addr, struct ide_board *board, int *portnum
 static int get_dev_hd_reg(uaecptr addr, struct ide_board* board)
 {
        int reg = -1;
+       if (addr & 0x8000) {
+               return -1;
+       }
        if (addr >= dev_hd_io_base && addr < dev_hd_io_base + dev_hd_io_total) {
                reg = (addr - dev_hd_io_base) / dev_hd_io_size;
                reg &= 7;
@@ -993,9 +996,30 @@ static uae_u32 ide_read_byte(struct ide_board *board, uaecptr addr)
 
        } else if (board->type == DEV_IDE) {
 
-               int reg = get_dev_hd_reg(addr, board);
-               if (reg >= 0) {
-                       v = get_ide_reg(board, reg);
+               if (addr == 0x88) {
+                       v = 0xff;
+               } else if (addr == 0x86 || addr == 0x90 || addr == 0x92 || addr == 0x94 || addr == 0x96) {
+                       if (addr == 0x86) {
+                               board->dma_ptr = 0x80;
+                               board->dma_cnt = 1;
+                       }
+                       v = board->rom[board->dma_ptr * 2 + 0x8000];
+                       board->dma_ptr++;
+                       if (board->dma_cnt == 1) {
+                               uae_u8 v2 = board->rom[board->dma_ptr * 2 + 0x8000];
+                               board->dma_ptr++;
+                               if (v != (v2 ^ 0xff)) {
+                                       write_log("error!\n");
+                               }
+                               board->dma_cnt = 0;
+                       }
+               } else {
+                       int reg = get_dev_hd_reg(addr, board);
+                       if (reg >= 0) {
+                               v = get_ide_reg(board, reg);
+                       } else {
+                               v = board->rom[addr];
+                       }
                }
        }
 
@@ -1606,9 +1630,18 @@ static void ide_write_byte(struct ide_board *board, uaecptr addr, uae_u8 v)
 
                } else if (board->type == DEV_IDE) {
 
-                       int reg = get_dev_hd_reg(addr, board);
-                       if (reg >= 0) {
-                               put_ide_reg(board, reg, v);
+                       if (addr == 0x86) {
+                               board->dma_ptr = 0;
+                               board->dma_cnt = 0;
+                       } else if (addr == 0x90 || addr == 0x92 || addr == 0x94 || addr == 0x96) {
+                               board->dma_ptr <<= 8;
+                               board->dma_ptr |= v;
+                               board->dma_ptr &= 0xffffff;
+                       } else {
+                               int reg = get_dev_hd_reg(addr, board);
+                               if (reg >= 0) {
+                                       put_ide_reg(board, reg, v);
+                               }
                        }
 
                }
@@ -2947,29 +2980,57 @@ void dotto_add_ide_unit(int ch, struct uaedev_config_info *ci, struct romconfig
        add_ide_standard_unit(ch, ci, rc, dotto_board, DOTTO_IDE, false, true, 2);
 }
 
+static const uae_u8 dev_autoconfig[16] = { 0xd1, 1, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00 };
+
 bool dev_hd_init(struct autoconfig_info* aci)
 {
+       bool ac = true;
        const struct expansionromtype* ert = get_device_expansion_rom(ROMTYPE_DEVHD);
        ide_add_reset();
 
-       // fake
-       aci->start = 0xe90000;
-       aci->size = 0x10000;
+       uae_u8 *rom = xcalloc(uae_u8, 65536);
+       load_rom_rc(aci->rc, ROMTYPE_DEVHD, 32768, 0, rom, 65536, LOADROM_EVENONLY_ODDONE);
+       memcpy(rom + 0x8000, rom, 0x8000);
+
+       if (!ac) {
+               // fake
+               aci->start = 0xe90000;
+               aci->size = 0x10000;
+       }
        dev_hd_io_base = 0x4000;
        dev_hd_io_size = 4;
        dev_hd_data_base = 0x4800;
        dev_hd_io_secondary = 0x1000;
        dev_hd_io_total = 8 * 4;
+
        if (!aci->doinit) {
+               if (ac) {
+                       aci->autoconfigp = dev_autoconfig;
+               }
+               xfree(rom);
                return true;
        }
+
        struct ide_board *ide = getide(aci);
 
+       if (ac) {
+               for (int i = 0; i < 16; i++) {
+                       uae_u8 b = dev_autoconfig[i];
+                       ew(ide, i * 4, b);
+               }
+       }
+
        ide->bank = &ide_bank_generic;
        ide->mask = 65536 - 1;
-       ide->configured = 1;
-       ide->baseaddress = aci->start;
-       map_banks(ide->bank, aci->start >> 16, aci->size >> 16, 0);
+       ide->keepautoconfig = true;
+       ide->rom = rom;
+       memcpy(ide->rom, ide->acmemory, 128);
+
+       if (!ac) {
+               ide->baseaddress = aci->start;
+               ide->configured = 1;
+               map_banks(ide->bank, aci->start >> 16, aci->size >> 16, 0);
+       }
 
        aci->addrbank = ide->bank;
        return true;

diff --git a/newcpu.cpp b/newcpu.cpp
index bce60a14fad642ffaf56f65d19e60b47ce682615..36280322b746cdffeabf380def8d2ca7558d05bb 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -2637,7 +2637,7 @@ static int iack_cycle(int nr)
        if (1) {
                // non-autovectored
                vector = x_get_byte(0x00fffff1 | ((nr - 24) << 1));
-               if (currprefs.cpu_cycle_exact)
+               if (currprefs.cpu_compatible)
                        x_do_cycles(4 * cpucycleunit);
        } else {
                // autovectored
@@ -4347,7 +4347,8 @@ void doint(void)
        }
 #endif
        if (m68k_interrupt_delay) {
-               regs.ipl_pin = intlev ();
+               int il = intlev();
+               regs.ipl_pin = il;
                if (regs.ipl_pin > regs.intmask || regs.ipl_pin == 7)
                        set_special(SPCFLAG_INT);
                return;

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index b0118c08fffb1693cecef8a8ffde4a0c23af175e..890341fc1d1453979c8e50aa7a87c2f291c2534e 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -130,6 +130,13 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,77,104,12
     CONTROL         "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,77,106,13
+    GROUPBOX        "Advanced Custom ROM Settings",IDC_STATIC,0,98,394,59
+    COMBOBOX        IDC_CUSTOMROMSELECT,12,115,135,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Address range",IDC_STATIC,158,115,54,15,SS_CENTERIMAGE
+    EDITTEXT        IDC_ROM_ADDRESS,219,115,79,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_ROM_ADDRESS2,306,115,79,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CUSTOMROMFILE,12,135,361,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_CUSTOMROMCHOOSER,376,132,10,15
     GROUPBOX        "Miscellaneous",IDC_STATIC,0,162,395,109
     LTEXT           "Cartridge ROM file:",IDC_FLASHTEXT2,12,177,265,10
     COMBOBOX        IDC_CARTFILE,12,190,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -143,13 +150,6 @@ BEGIN
     GROUPBOX        "Advanced UAE expansion board/Boot ROM Settings",IDC_STATIC,0,274,395,36
     COMBOBOX        IDC_UAEBOARD_TYPE,96,289,155,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Board type:",IDC_STATIC,20,287,67,15,SS_CENTERIMAGE
-    RTEXT           "Address range",IDC_STATIC,158,115,54,15,SS_CENTERIMAGE
-    EDITTEXT        IDC_ROM_ADDRESS,219,115,79,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_ROM_ADDRESS2,306,115,79,13,ES_AUTOHSCROLL
-    COMBOBOX        IDC_CUSTOMROMSELECT,12,115,135,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Advanced Custom ROM Settings",IDC_STATIC,0,98,394,59
-    EDITTEXT        IDC_CUSTOMROMFILE,12,135,361,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_CUSTOMROMCHOOSER,376,132,10,15
 END
 
 IDD_DISPLAY DIALOGEX 0, 0, 396, 316
@@ -161,29 +161,34 @@ BEGIN
     RTEXT           "Fullscreen:",IDC_STATIC,3,35,51,15,SS_CENTERIMAGE
     COMBOBOX        IDC_RESOLUTION,59,35,76,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_RESOLUTIONDEPTH,144,35,62,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_REFRESHRATE,288,36,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Windowed:",IDC_STATIC,2,52,51,15,SS_CENTERIMAGE
     EDITTEXT        IDC_XSIZE,59,54,43,12,ES_NUMBER
     EDITTEXT        IDC_YSIZE,110,54,43,12,ES_NUMBER
+    CONTROL         "Window resize",IDC_DISPLAY_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,55,92,10
+    CONTROL         "VRR monitor. Do not tick!",IDC_DISPLAY_VARSYNC,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,58,71,112,10
+    COMBOBOX        IDC_REFRESHRATE,288,36,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_DISPLAY_BUFFERCNT,288,54,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Settings",IDC_SETTINGSTEXT,1,90,283,183
     RTEXT           "Native:",IDC_STATIC,18,102,32,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SCREENMODE_NATIVE,54,102,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCREENMODE_NATIVE2,131,102,108,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SCREENMODE_NATIVE3,246,102,31,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "RTG:",IDC_STATIC,19,119,31,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SCREENMODE_RTG,54,122,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCREENMODE_RTG2,131,122,107,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Blacker than black [] Borderblanked black is blacker than display area black.",IDC_BLACKER_THAN_BLACK,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,144,139,10
-    CONTROL         "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,144,123,10
     CONTROL         "Remove interlace artifacts [] Emulates interlace mode internally as progressive, removing all interlace artifacts. Not compatible with all software.",IDC_FLICKERFIXER,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,158,139,10
+    CONTROL         "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,171,139,10
+    CONTROL         "Filtered low resolution [] When scaling hires to lores or superhires to hires, show average color of pixel instead of dropping every other pixel.",IDC_LORES_SMOOTHED,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,144,123,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,158,124,10
-    CONTROL         "Monochrome video out",IDC_GRAYSCALE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,171,139,10
     RTEXT           "Resolution:",IDC_STATIC,6,196,44,8,SS_CENTERIMAGE
     COMBOBOX        IDC_LORES,57,195,77,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Overscan:",IDC_STATIC,145,196,43,8,SS_CENTERIMAGE
+    COMBOBOX        IDC_OVERSCANMODE,197,194,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Resolution autoswitch:",IDC_STATIC,92,216,110,8,SS_CENTERIMAGE
     COMBOBOX        IDC_AUTORESOLUTIONSELECT,214,215,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Refresh:",IDC_REFRESHTEXT,11,235,57,8
@@ -211,11 +216,6 @@ BEGIN
     CONTROL         "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,255,90,10
     CONTROL         "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,268,90,10
     CONTROL         "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,281,90,10
-    CONTROL         "VRR monitor. Do not tick!",IDC_DISPLAY_VARSYNC,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,58,71,112,10
-    COMBOBOX        IDC_SCREENMODE_NATIVE3,246,102,31,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Window resize",IDC_DISPLAY_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,55,92,10
-    COMBOBOX        IDC_OVERSCANMODE,197,194,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Overscan:",IDC_STATIC,145,196,43,8,SS_CENTERIMAGE
 END
 
 IDD_MEMORY DIALOGEX 0, 0, 396, 316
@@ -250,17 +250,17 @@ BEGIN
     EDITTEXT        IDC_AUTOCONFIG_PRODUCT,196,194,45,13,ES_AUTOHSCROLL
     RTEXT           "Autoconfig data",IDC_STATIC,11,214,57,15,SS_CENTERIMAGE
     EDITTEXT        IDC_AUTOCONFIG_DATA,78,213,164,13,ES_AUTOHSCROLL
-    CONTROL         "Edit Autoconfig data",IDC_FASTMEMAUTOCONFIGUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,190,103,8
-    CONTROL         "Manual configuration",IDC_FASTMEMNOAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,201,103,8
     RTEXT           "Memory board",IDC_STATIC,15,235,53,15,SS_CENTERIMAGE
     COMBOBOX        IDC_MEMORYBOARDSELECT,77,235,165,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Z3 mapping mode:",IDC_STATIC,263,236,115,15,SS_CENTERIMAGE
     RTEXT           "Address range",IDC_STATIC,10,256,57,15,SS_CENTERIMAGE
     EDITTEXT        IDC_RAM_ADDRESS,77,256,79,13,ES_AUTOHSCROLL
     EDITTEXT        IDC_RAM_ADDRESS2,164,256,79,13,ES_AUTOHSCROLL
-    COMBOBOX        IDC_Z3MAPPING,262,256,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Edit Autoconfig data",IDC_FASTMEMAUTOCONFIGUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,190,103,8
+    CONTROL         "Manual configuration",IDC_FASTMEMNOAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,201,103,8
     CONTROL         "DMA Capable",IDC_FASTMEMDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,213,103,8
     CONTROL         "Force 16-bit",IDC_FASTMEMFORCE16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,261,225,103,8
+    LTEXT           "Z3 mapping mode:",IDC_STATIC,263,236,115,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_Z3MAPPING,262,256,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_CPU DIALOGEX 0, 0, 396, 316
@@ -277,15 +277,18 @@ BEGIN
     CONTROL         "24-bit addressing",IDC_COMPATIBLE24,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,98,119,12
     CONTROL         "More compatible [] 68000: emulate prefetch. 68020+: emulate prefetch and instruction cache. More compatible but slower.",IDC_COMPATIBLE,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,111,118,12
+    CONTROL         "Data cache emulation [] 68030, 040 and 060 optional data cache emulation. Requires More compatible option.",IDC_CPUDATACACHE,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,123,119,12
     CONTROL         "JIT [] Enable just-in-time CPU emulator. Significantly increases the speed of the CPU emulation. Requires 68020 or higher CPU.",IDC_JITENABLE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,136,120,12
+    CONTROL         "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,149,118,12
+    GROUPBOX        "MMU",IDC_STATIC,2,168,129,42,BS_LEFT
     CONTROL         "None",IDC_MMUENABLEOFF,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,181,87,10
-    CONTROL         "EC [] 68EC030, 68EC040 and 68EC060 Transparent Translation Register emulation. Not compatible with JIT.",IDC_MMUENABLEEC,
-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,73,195,48,10
     CONTROL         "MMU [] 68030, 68040 and 68060 MMU emulation. Not compatible with JIT.",IDC_MMUENABLE,
                     "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,195,49,10
-    CONTROL         "Unimplemented CPU emu [] Emulate 68060 unimplemented integer instructions",IDC_CPU_UNIMPLEMENTED,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,149,118,12
+    CONTROL         "EC [] 68EC030, 68EC040 and 68EC060 Transparent Translation Register emulation. Not compatible with JIT.",IDC_MMUENABLEEC,
+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,73,195,48,10
     GROUPBOX        "FPU",IDC_STATIC,1,212,129,103,BS_LEFT
     CONTROL         "None",IDC_FPU0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,223,87,10
     CONTROL         "68881",IDC_FPU1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,236,87,10
@@ -295,6 +298,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,275,117,10
     CONTROL         "Unimplemented FPU emu [] Emulate FPU unimplemented instructions",IDC_FPU_UNIMPLEMENTED,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,287,116,10
+    COMBOBOX        IDC_FPU_MODE,7,299,112,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     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,
@@ -304,6 +308,7 @@ BEGIN
     EDITTEXT        IDC_CPUTEXT,194,75,30,12,ES_CENTER | ES_READONLY
     RTEXT           "CPU Idle",IDC_STATIC,230,77,41,9
     CONTROL         "",IDC_CPUIDLE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,278,72,69,21
+    EDITTEXT        IDC_CPUIDLETEXT,356,75,30,12,ES_CENTER | ES_READONLY
     GROUPBOX        "Cycle-exact CPU Emulation Speed",IDC_STATIC,136,100,258,42
     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
@@ -327,12 +332,7 @@ BEGIN
     CONTROL         "Direct",IDC_TRUST0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,143,288,72,10
     CONTROL         "Indirect",IDC_TRUST1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,221,288,72,10
     CONTROL         "No flags",IDC_NOFLAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,299,288,68,11
-    GROUPBOX        "MMU",IDC_STATIC,2,168,129,42,BS_LEFT
-    CONTROL         "Data cache emulation [] 68030, 040 and 060 optional data cache emulation. Requires More compatible option.",IDC_CPUDATACACHE,
-                    "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,8,123,119,12
-    COMBOBOX        IDC_FPU_MODE,7,299,112,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Catch unexpected exceptions",IDC_JITCRASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,300,115,11
-    EDITTEXT        IDC_CPUIDLETEXT,356,75,30,12,ES_CENTER | ES_READONLY
 END
 
 IDD_FLOPPY DIALOGEX 0, 0, 396, 316
@@ -435,6 +435,7 @@ BEGIN
     CONTROL         "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,72,108,10
     CONTROL         "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,90,108,10
     CONTROL         "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,103,108,10
+    CONTROL         "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,123,108,10
     GROUPBOX        "Volume",IDC_STATIC,139,28,255,69
     RTEXT           "Master",IDC_STATIC,160,47,51,10,SS_CENTERIMAGE
     CONTROL         "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,41,105,20
@@ -474,7 +475,6 @@ BEGIN
     CONTROL         "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,257,98,10
     CONTROL         "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,271,98,10
     CONTROL         "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,285,98,10
-    CONTROL         "Volume Counter mode",IDC_SOUND_VOLCNT,"Button",BS_AUTOCHECKBOX | BS_LEFT | NOT WS_VISIBLE | WS_GROUP | WS_TABSTOP,13,123,108,10
 END
 
 IDD_LOADSAVE DIALOGEX 0, 0, 396, 316
@@ -599,11 +599,11 @@ BEGIN
     CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,65,36,210,35
     CONTROL         "",IDC_RICHEDIT2,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,1,84,343,28
     PUSHBUTTON      "Contributors",IDC_CONTRIBUTORS,132,126,80,15
+    CONTROL         "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,194,112,24
     CONTROL         "",IDC_AMIGAHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,116,194,112,24
     CONTROL         "",IDC_WINUAEHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,231,194,112,24
-    CONTROL         "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,174,222,112,24
     CONTROL         "",IDC_ABIME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,60,222,112,24
-    CONTROL         "",IDC_CLOANTOHOME,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,194,112,24
+    CONTROL         "",IDC_CAPS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,174,222,112,24
     CONTROL         "",IDC_AMIGASYS,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,2,251,112,24
     CONTROL         "",IDC_AMIKIT,"RICHEDIT",TCS_SCROLLOPPOSITE | TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED,231,251,112,24
 END
@@ -626,9 +626,11 @@ BEGIN
     PUSHBUTTON      "GUI Font...",IDC_GUI_FONT,272,155,54,14
     PUSHBUTTON      "Set default",IDC_GUI_DEFAULT,272,174,54,14
     COMBOBOX        IDC_GUI_SIZE,333,175,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Reset list customizations",IDC_GUI_LVDEFAULT,272,192,115,14
     CONTROL         "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,209,114,11
     CONTROL         "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,222,114,11
     GROUPBOX        "State Files",IDC_STATIC,1,242,393,38
+    COMBOBOX        IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_STATECLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,261,9,10
     PUSHBUTTON      "Load state...",IDC_DOLOADSTATE,257,257,65,14
     PUSHBUTTON      "Save state...",IDC_DOSAVESTATE,325,257,65,14
@@ -637,8 +639,6 @@ BEGIN
     COMBOBOX        IDC_KBLED2,97,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_KBLED3,184,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11
-    COMBOBOX        IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Reset list customizations",IDC_GUI_LVDEFAULT,272,192,115,14
 END
 
 IDD_HARDFILE DIALOGEX 0, 0, 397, 292
@@ -651,6 +651,9 @@ BEGIN
     RTEXT           "Path:",IDC_HARDFILE_DIR_TEXT,10,18,37,10
     COMBOBOX        IDC_PATH_NAME,52,15,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SELECTOR,380,14,11,15
+    RTEXT           "Geometry:",IDC_STATIC,6,34,41,10
+    COMBOBOX        IDC_PATH_GEOMETRY,52,32,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_PATH_GEOMETRY_SELECTOR,380,31,11,15
     RTEXT           "FileSys:",IDC_HARDFILE_FILESYS_TEXT,13,52,34,10
     COMBOBOX        IDC_PATH_FILESYS,51,49,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_FILESYS_SELECTOR,380,48,11,15
@@ -691,9 +694,6 @@ BEGIN
     PUSHBUTTON      "OK",IDOK,147,271,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,203,271,50,14
     RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,128,43,10,NOT WS_VISIBLE
-    COMBOBOX        IDC_PATH_GEOMETRY,52,32,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_PATH_GEOMETRY_SELECTOR,380,31,11,15
-    RTEXT           "Geometry:",IDC_STATIC,6,34,41,10
 END
 
 IDD_FILESYS DIALOGEX 15, 25, 396, 111
@@ -763,12 +763,15 @@ BEGIN
     COMBOBOX        IDC_CS_EXT,116,129,88,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Options",IDC_STATIC,221,20,173,137
     CONTROL         "Keyboard connected",IDC_KEYBOARD_CONNECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,35,150,10
+    CONTROL         "Subpixel display emulation",IDC_SUBPIXEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,48,150,10
     CONTROL         "Immediate Blitter [] Faster but less compatible blitter emulation.",IDC_BLITIMM,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,62,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,75,150,10
-    LTEXT           "Monitor:",IDC_STATIC,240,139,68,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    LTEXT           "Video port display hardware:",IDC_STATIC,241,105,117,15,SS_CENTERIMAGE
     COMBOBOX        IDC_MONITOREMU,237,123,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Monitor:",IDC_STATIC,240,139,68,15,SS_CENTERIMAGE,WS_EX_RIGHT
+    COMBOBOX        IDC_MONITOREMU_MON,319,141,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Collision Level",IDC_STATIC,1,161,393,48
     CONTROL         "None [] Collision hardware emulation disabled.",IDC_COLLISION0,
                     "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,47,177,101,10
@@ -785,12 +788,9 @@ BEGIN
     COMBOBOX        IDC_GENLOCKMIX,330,229,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Include alpha channel in screenshots and video captures.",IDC_GENLOCK_ALPHA,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,247,214,10
+    CONTROL         "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,262,214,10
     COMBOBOX        IDC_GENLOCKFILE,12,278,356,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_GENLOCKFILESELECT,375,277,10,15
-    CONTROL         "Keep aspect ratio",IDC_GENLOCK_KEEP_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,262,214,10
-    COMBOBOX        IDC_MONITOREMU_MON,319,141,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Video port display hardware:",IDC_STATIC,241,105,117,15,SS_CENTERIMAGE
-    CONTROL         "Subpixel display emulation",IDC_SUBPIXEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,48,150,10
 END
 
 IDD_CHIPSET2 DIALOGEX 0, 0, 396, 316
@@ -817,6 +817,7 @@ BEGIN
     CONTROL         "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,158,104,11
     CONTROL         "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,171,104,11
     CONTROL         "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,104,11
+    CONTROL         "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,106,12
     CONTROL         "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,93,121,11
     CONTROL         "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,106,121,11
     CONTROL         "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,119,121,11
@@ -826,6 +827,7 @@ BEGIN
     CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,171,104,11
     CONTROL         "Custom register byte write bug",IDC_CS_BYTECUSTOMWRITEBUG,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,130,11
+    CONTROL         "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,197,125,12
     CONTROL         "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,93,125,11
     CONTROL         "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,106,125,11
     CONTROL         "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,119,123,11
@@ -833,6 +835,10 @@ BEGIN
     CONTROL         "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,145,125,11
     CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,158,125,11
     CONTROL         "Composite color burst",IDC_CS_COMPOSITECOLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,171,125,12
+    CONTROL         "CIA 391078-01 [] CIA revision that can't read IO pin status in output mode",IDC_CS_CIA,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,197,125,12
+    RTEXT           "Unmapped address space:",IDC_STATIC,15,215,101,9
+    COMBOBOX        IDC_CS_UNMAPPED,125,212,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Internal SCSI Hardware",IDC_STATIC,0,232,395,30
     CONTROL         "A3000 WD33C93 SCSI",IDC_CS_DMAC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,247,108,11
     CONTROL         "A4000T NCR53C710 SCSI",IDC_CS_DMAC2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,247,125,11
@@ -845,12 +851,6 @@ BEGIN
     CONTROL         "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,299,107,11
     EDITTEXT        IDC_CS_AGNUSREV,311,284,45,13,ES_AUTOHSCROLL
     EDITTEXT        IDC_CS_DENISEREV,311,298,45,13,ES_AUTOHSCROLL
-    COMBOBOX        IDC_CS_UNMAPPED,125,212,113,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Unmapped address space:",IDC_STATIC,15,215,101,9
-    CONTROL         "Toshiba Gary",IDC_CS_TOSHIBAGARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,106,12
-    CONTROL         "KS ROM has Chip RAM speed",IDC_CS_ROMISSLOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,197,125,12
-    CONTROL         "CIA 391078-01 [] CIA revision that can't read IO pin status in output mode",IDC_CS_CIA,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,197,125,12
 END
 
 IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 316
@@ -924,6 +924,7 @@ BEGIN
     COMBOBOX        IDC_FILTERMODE,9,39,153,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERSTACK,167,39,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTERFILTERH,199,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERFILTERV,233,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTEROVERLAYTYPE,9,60,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTEROVERLAY,134,60,129,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_FILTER_NATIVERTG,268,20,120,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -932,16 +933,16 @@ BEGIN
     COMBOBOX        IDC_FILTERINTEGER,361,60,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Horiz. size:",-1,7,87,81,10,SS_CENTERIMAGE
     COMBOBOX        IDC_FILTERHZMULT,92,86,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Vert. size:",-1,7,108,81,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_FILTERVZMULT,92,107,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Horiz. position:",-1,5,129,81,10,SS_CENTERIMAGE
-    RTEXT           "Vert. position:",-1,5,149,81,10,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,80,152,19
     EDITTEXT        IDC_FILTERHZV,316,82,42,12,ES_CENTER | ES_READONLY
+    RTEXT           "Vert. size:",-1,7,108,81,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_FILTERVZMULT,92,107,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,101,152,19
     EDITTEXT        IDC_FILTERVZV,316,103,42,12,ES_CENTER | ES_READONLY
+    RTEXT           "Horiz. position:",-1,5,129,81,10,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,122,151,19
     EDITTEXT        IDC_FILTERHOV,316,124,42,12,ES_CENTER | ES_READONLY
+    RTEXT           "Vert. position:",-1,5,149,81,10,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,147,143,151,19
     EDITTEXT        IDC_FILTERVOV,316,145,42,12,ES_CENTER | ES_READONLY
     GROUPBOX        "Aspect Ratio Correction",-1,1,173,144,89
@@ -960,7 +961,6 @@ BEGIN
     PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,205,280,55,14
     PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,265,280,55,14
     PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,325,280,55,14
-    COMBOBOX        IDC_FILTERFILTERV,233,39,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_HARDDRIVE DIALOGEX 0, 0, 397, 219
@@ -970,33 +970,33 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     RTEXT           "Hard drive:",IDC_STATIC,7,11,38,10
     COMBOBOX        IDC_HARDDRIVE,49,9,339,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Geometry:",IDC_STATIC,3,31,41,10
+    COMBOBOX        IDC_PATH_GEOMETRY,49,29,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_PATH_GEOMETRY_SELECTOR,377,28,11,15,WS_DISABLED
     EDITTEXT        IDC_HDFINFO,5,51,385,12,ES_CENTER | ES_READONLY
     EDITTEXT        IDC_HDFINFO2,5,68,385,12,ES_CENTER | ES_READONLY
-    DEFPUSHBUTTON   "Read Identity",IDC_HARDDRIVE_ID,113,152,111,14,WS_DISABLED
-    EDITTEXT        IDC_PATH_NAME,17,190,41,15,ES_AUTOHSCROLL | NOT WS_VISIBLE
+    DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,88,158,14,WS_DISABLED
     CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,171,90,56,10
+    CONTROL         "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,90,55,10
+    CONTROL         "Identity",IDC_HDF_IDENTITY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,110,55,10
+    CONTROL         "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,299,90,87,10
     COMBOBOX        IDC_HDF_CONTROLLER_UNIT,7,111,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_TYPE,113,111,110,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_HDF_FEATURE_LEVEL,7,152,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER,7,132,216,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_FEATURE_LEVEL,7,152,97,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Read Identity",IDC_HARDDRIVE_ID,113,152,111,14,WS_DISABLED
+    EDITTEXT        IDC_HDFINFO3,7,173,217,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_PATH_NAME,17,190,41,15,ES_AUTOHSCROLL | NOT WS_VISIBLE
     DEFPUSHBUTTON   "Add hard drive",IDOK,237,190,73,14,WS_DISABLED
-    PUSHBUTTON      "Cancel",IDCANCEL,316,190,73,14
-    CONTROL         "Lock",IDC_HDF_LOCK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,90,55,10
-    DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,5,88,158,14,WS_DISABLED
-    CONTROL         "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,299,90,87,10
+    RTEXT           "Surfaces:",IDC_SURFACES_TEXT,298,112,45,10
     EDITTEXT        IDC_HEADS,347,109,40,15,ES_NUMBER | WS_DISABLED
+    RTEXT           "Sectors:",IDC_SECTORS_TEXT,298,131,45,10
     EDITTEXT        IDC_SECTORS,347,128,40,15,ES_NUMBER | WS_DISABLED
+    RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,150,43,10
     EDITTEXT        IDC_RESERVED,347,147,40,15,ES_NUMBER | WS_DISABLED
-    EDITTEXT        IDC_BLOCKSIZE,347,166,40,15,ES_NUMBER | WS_DISABLED
-    RTEXT           "Surfaces:",IDC_SURFACES_TEXT,298,112,45,10
-    RTEXT           "Sectors:",IDC_SECTORS_TEXT,298,131,45,10
     RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,168,45,10
-    RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,150,43,10
-    COMBOBOX        IDC_PATH_GEOMETRY,49,29,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_PATH_GEOMETRY_SELECTOR,377,28,11,15,WS_DISABLED
-    RTEXT           "Geometry:",IDC_STATIC,3,31,41,10
-    CONTROL         "Identity",IDC_HDF_IDENTITY,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,233,110,55,10
-    EDITTEXT        IDC_HDFINFO3,7,173,217,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_BLOCKSIZE,347,166,40,15,ES_NUMBER | WS_DISABLED
+    PUSHBUTTON      "Cancel",IDCANCEL,316,190,73,14
 END
 
 IDD_MISC2 DIALOGEX 0, 0, 396, 316
@@ -1221,7 +1221,10 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     GROUPBOX        "RTG Graphics Card",IDC_STATIC,1,48,393,198
+    LTEXT           "Board:",IDC_STATIC,29,62,61,10
     COMBOBOX        IDC_RTG_Z2Z3,26,77,215,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Monitor:",IDC_STATIC,105,62,65,10,0,WS_EX_RIGHT
+    COMBOBOX        IDC_MONITOREMU_MON,175,61,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_RTG_NUM,248,77,37,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "VRAM size: [] Graphics card memory. Required for RTG (Picasso96) emulation.",IDC_GFXCARDTEXT,2,98,76,10,SS_NOTIFY | SS_CENTERIMAGE
     CONTROL         "",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,94,103,20
@@ -1235,6 +1238,7 @@ BEGIN
     CONTROL         "Always center",IDC_RTG_CENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,156,169,10
     CONTROL         "Hardware vertical blank interrupt",IDC_RTG_VBINTERRUPT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,169,157,10
+    CONTROL         "Multithreaded",IDC_RTG_THREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,156,83,10
     CONTROL         "Hardware sprite emulation",IDC_RTG_HWSPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,169,148,10
     CTEXT           "Color modes:",IDC_STATIC,295,81,83,10,SS_CENTERIMAGE
     COMBOBOX        IDC_RTG_8BIT,296,96,82,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
@@ -1248,10 +1252,6 @@ BEGIN
     COMBOBOX        IDC_RTG_BUFFERCNT,153,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CTEXT           "Aspect ratio:",IDC_STATIC,282,212,83,10,SS_CENTERIMAGE
     COMBOBOX        IDC_RTG_SCALE_ASPECTRATIO,282,227,84,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Multithreaded",IDC_RTG_THREAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,156,83,10
-    LTEXT           "Board:",IDC_STATIC,29,62,61,10
-    COMBOBOX        IDC_MONITOREMU_MON,175,61,65,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Monitor:",IDC_STATIC,105,62,65,10,0,WS_EX_RIGHT
 END
 
 IDD_INPUTMAP DIALOGEX 0, 0, 421, 341
@@ -1301,12 +1301,12 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK |
 CAPTION "CD Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
+    CONTROL         "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,77
     RTEXT           "HD Controller:",IDC_STATIC,7,90,65,10,SS_CENTERIMAGE
     COMBOBOX        IDC_HDF_CONTROLLER,80,89,154,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_HDF_CONTROLLER_UNIT,239,89,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "Add CD Drive",IDOK,121,108,73,14
     PUSHBUTTON      "Cancel",IDCANCEL,201,108,73,14
-    CONTROL         "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,4,4,387,77
 END
 
 IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 97
@@ -1347,26 +1347,25 @@ BEGIN
     COMBOBOX        IDC_SCSIROMSUBSELECT,12,95,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_EXPANSIONBOARDITEMSELECTOR,12,112,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCSIROMSELECTNUM,175,78,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "24-bit DMA",IDC_SCSIROM24BITDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,61,84,12
     RTEXT           "Controller ID:",IDC_STATIC,241,59,110,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SCSIROMID,356,60,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SCSIROMFILE,202,78,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SCSIROMCHOOSER,376,78,10,15
     CONTROL         "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,98,94,12
+    CONTROL         "PCMCIA inserted",IDC_SCSIROMFILEPCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,301,98,84,12
     CONTROL         "",IDC_EXPANSIONBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,112,99,12
-    EDITTEXT        IDC_EXPANSIONBOARDSTRINGBOX,202,112,172,14,ES_AUTOHSCROLL
-    COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,112,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_SCSIROMFILE,202,78,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Accelerator Board Settings",IDC_STATIC,1,133,394,91
     COMBOBOX        IDC_CPUBOARD_TYPE,13,154,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_CPUBOARD_SUBTYPE,13,173,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_ACCELERATORBOARDITEMSELECTOR,12,205,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_ACCELERATORBOARDSELECTOR,202,205,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Accelerator board memory:",IDC_STATIC,155,181,104,15,SS_CENTERIMAGE
     LTEXT           "Accelerator board ROM file:",IDC_STATIC,203,141,170,15,SS_CENTERIMAGE
     COMBOBOX        IDC_CPUBOARDROMFILE,202,156,169,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_CPUBOARDROMCHOOSER,376,155,10,15
+    RTEXT           "Accelerator board memory:",IDC_STATIC,155,181,104,15,SS_CENTERIMAGE
     CONTROL         "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,269,179,68,20
     EDITTEXT        IDC_CPUBOARDRAM,343,183,40,12,ES_CENTER | ES_READONLY
-    CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,206,99,12
+    COMBOBOX        IDC_ACCELERATORBOARDITEMSELECTOR,12,205,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_ACCELERATORBOARDSELECTOR,202,205,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Miscellaneous Expansions",IDC_STATIC,1,228,394,51
     CONTROL         "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,243,179,11
@@ -1374,9 +1373,10 @@ BEGIN
     CONTROL         "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,243,187,11
     CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,259,193,11
+    EDITTEXT        IDC_EXPANSIONBOARDSTRINGBOX,202,112,172,14,ES_AUTOHSCROLL
+    COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,112,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,206,99,12
     CONTROL         "Enabled",IDC_SCSIROMSELECTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,79,99,12
-    CONTROL         "PCMCIA inserted",IDC_SCSIROMFILEPCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,301,98,84,12
-    CONTROL         "24-bit DMA",IDC_SCSIROM24BITDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,61,84,12
 END
 
 IDD_CHSQUERY DIALOGEX 0, 0, 396, 85
@@ -1384,15 +1384,15 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK |
 CAPTION "CHS Geometry"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    PUSHBUTTON      "OK",IDOK,59,57,135,15
-    PUSHBUTTON      "Cancel",IDCANCEL,201,57,135,15
-    EDITTEXT        IDC_CHS_CYLINDERS,86,32,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_CHS_HEADS,204,32,45,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_CHS_SECTORS,322,32,45,13,ES_AUTOHSCROLL
+    CTEXT           "Imaging CHS-only IDE drive requires correct geometry. Check drive label.",IDC_STATIC,39,10,330,9
     RTEXT           "Cylinders:",IDC_STATIC,27,33,45,9
+    EDITTEXT        IDC_CHS_CYLINDERS,86,32,45,13,ES_AUTOHSCROLL
     RTEXT           "Heads:",IDC_STATIC,145,33,45,9
+    EDITTEXT        IDC_CHS_HEADS,204,32,45,13,ES_AUTOHSCROLL
     RTEXT           "Sectors:",IDC_STATIC,263,33,45,9
-    CTEXT           "Imaging CHS-only IDE drive requires correct geometry. Check drive label.",IDC_STATIC,39,10,330,9
+    EDITTEXT        IDC_CHS_SECTORS,322,32,45,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "OK",IDOK,59,57,135,15
+    PUSHBUTTON      "Cancel",IDCANCEL,201,57,135,15
 END
 
 

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 0f848f8da599cac2e7ca1b5e545d554241db2e4f..7d666750efc9cbfcae9d8b3f2059dc491fa8a4a9 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -2729,6 +2729,7 @@ static LRESULT CALLBACK MainWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                return 0;
 
        case WM_POWERBROADCAST:
+               write_log("POWERBROADCAST: %08x %08x %08x\n", message, lParam, wParam);
                if (wParam == PBT_APMRESUMEAUTOMATIC) {
                        setsystime ();
                        return TRUE;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index de3570733a696c01e0f1394f1bae7fa66012ec07..ca76df453b6050c0def83b741441995cf0b897b0 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("Beta 34")
+#define WINUAEBETA _T("Beta 35")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2021, 9, 19)
+#define WINUAEDATE MAKEBD(2021, 9, 28)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 7f878c9582feb082c3939bfb226e7872adb42b02..83d5c2a9f4cafcdd55408af9e08da898fc8deb89 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -12353,6 +12353,7 @@ static INT_PTR MiscDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
        int v, i;
        static int recursive;
+       TCHAR tmp[MAX_DPATH];
 
        if (recursive)
                return FALSE;
@@ -12438,27 +12439,30 @@ static INT_PTR MiscDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
                                switch (LOWORD (wParam))
                                {
                                case IDC_STATENAME:
-                                       if (HIWORD(wParam) != CBN_EDITCHANGE && getcomboboxtext(hDlg, IDC_STATENAME, savestate_fname, sizeof savestate_fname / sizeof(TCHAR))) {
-                                               if (savestate_fname[0]) {
-                                                       parsefilepath(savestate_fname, sizeof savestate_fname / sizeof(TCHAR));
-                                                       savestate_state = STATE_DORESTORE;
-                                                       if (!my_existsfile(savestate_fname)) {
-                                                               TCHAR t[MAX_DPATH];
-                                                               _tcscpy(t, savestate_fname);
-                                                               _tcscat(savestate_fname, _T(".uss"));
+                                       if (HIWORD(wParam) != CBN_EDITCHANGE && getcomboboxtext(hDlg, IDC_STATENAME, tmp, sizeof tmp / sizeof(TCHAR))) {
+                                               if (tmp[0]) {
+                                                       parsefilepath(tmp, sizeof tmp / sizeof(TCHAR));
+                                                       if (_tcscmp(tmp, savestate_fname)) {
+                                                               _tcscpy(savestate_fname, tmp);
+                                                               savestate_state = STATE_DORESTORE;
                                                                if (!my_existsfile(savestate_fname)) {
-                                                                       fetch_statefilepath(savestate_fname, sizeof(t) / sizeof(MAX_DPATH));
-                                                                       _tcscat(savestate_fname, t);
+                                                                       TCHAR t[MAX_DPATH];
+                                                                       _tcscpy(t, savestate_fname);
+                                                                       _tcscat(savestate_fname, _T(".uss"));
                                                                        if (!my_existsfile(savestate_fname)) {
-                                                                               _tcscat(savestate_fname, _T(".uss"));
+                                                                               fetch_statefilepath(savestate_fname, sizeof(t) / sizeof(MAX_DPATH));
+                                                                               _tcscat(savestate_fname, t);
                                                                                if (!my_existsfile(savestate_fname)) {
-                                                                                       _tcscpy(savestate_fname, t);
+                                                                                       _tcscat(savestate_fname, _T(".uss"));
+                                                                                       if (!my_existsfile(savestate_fname)) {
+                                                                                               _tcscpy(savestate_fname, t);
+                                                                                       }
                                                                                }
                                                                        }
                                                                }
+                                                               _tcscpy(workprefs.statefile, savestate_fname);
+                                                               setstatefilename(hDlg);
                                                        }
-                                                       _tcscpy(workprefs.statefile, savestate_fname);
-                                                       setstatefilename(hDlg);
                                                }
                                        }
                                        break;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 33d52b45f9c44575316988afb0229e3858e4d7e5..ef515c9e4c2df999140e2c5855aeaa73e0906302 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,12 @@
 
+Beta 35:
+
+- Adjusted 68000 IPL sampling timing. (Spectre Party / Phenomena, F1GP by MicroValue. Not Microprose!)
+- Blizzard PPC: if RESET m68k instruction executed, apparently board logic also forces external CPU reset.
+- Fixed GDI handle leak (GUI panel change always leaked 2 font handles)
+- Updated GUI tab order.
+- If emulator was started by selecting statefile and GUI was opened after starting emulation, every time GUI Misc panel was opened, selected statefile was set to reload when GUI exited. (b31?)
+
 Beta 34:
 
 - Harmnless bug causing "Negative nr_color_changes.. " log messages fixed.