3200b18

diff --git a/arcadia.cpp b/arcadia.cpp
index 776424461142a7fbf8a4b5fa5d0b24321f6f2479..b39da181ae3929d999c13dd45f034c554d536736 100644 (file)
--- a/arcadia.cpp
+++ b/arcadia.cpp
@@ -328,7 +328,7 @@ static addrbank arcadia_boot_bank = {
        arbb_lget, arbb_wget, arbb_bget,
        arbb_lput, arbb_wput, arbb_bput,
        arbb_xlate, arbb_check, NULL, NULL, _T("Arcadia BIOS"),
-       arbb_lget, arbb_wget, ABFLAG_ROM | ABFLAG_SAFE,
+       arbb_lget, arbb_wget, ABFLAG_ROM | ABFLAG_SAFE, S_READ, S_WRITE,
        NULL, arbb_mask
 };
 
@@ -408,7 +408,7 @@ static addrbank arcadia_rom_bank = {
        arb_lget, arb_wget, arb_bget,
        arb_lput, arb_wput, arb_bput,
        arb_xlate, arb_check, NULL, NULL, _T("Arcadia Game ROM"),
-       arb_lget, arb_wget, ABFLAG_ROM | ABFLAG_SAFE,
+       arb_lget, arb_wget, ABFLAG_ROM | ABFLAG_SAFE, S_READ, S_WRITE,
        NULL, arb_mask
 };
 

diff --git a/expansion.cpp b/expansion.cpp
index f61da9c2746edfdbeed2eafc91643cc9026a2dc1..6707ae88048213d6ef03dbe9047dcdd3ab370af7 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -3167,7 +3167,7 @@ const struct expansionromtype expansionroms[] = {
        },
        {
                _T("amax"), _T("AMAX ROM dongle"), _T("ReadySoft"),
-               NULL, 0, NULL, NULL, NULL, ROMTYPE_AMAX | ROMTYPE_NONE, 0, 0, 0, false
+               NULL, NULL, NULL, ROMTYPE_AMAX | ROMTYPE_NONE, 0, 0, 0, false
        },
 
 #if 0

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 59e6fb1d3b2dbc9bee72c273d4c1fcaee134eaae..1790a4448d048a60f868603b95fdcdf92dedbf96 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("17")
+#define WINUAEBETA _T("18")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2015, 10, 21)
+#define WINUAEDATE MAKEBD(2015, 10, 26)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 23bcb316059818ff9c3ad303761c27f6cbed447f..884faaac504a81f57a22c561ab0c262dececbfd2 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -17643,6 +17643,9 @@ static HWND updatePanel (int id)
        int fullpanel;
        struct newresource *tres;
 
+       if (!hDlg)
+               return NULL;
+
        if (first) {
                first = false;
                getguisize (hDlg, &gui_width, &gui_height);

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 8d9112c9b44b3df9d691da29a74da655c058fcb0..e98c0d29ac00e70b36b82ba7017a880061052a68 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,18 @@
 
+Beta 18:
+
+- If dragndrop to GUI closed GUI (for example config file with show_gui=no), invalid GUI windows handle was accessed.
+- Don't parse command line again when restarting emulation (for example by loading new config when emulation has
+  already been started). Previously command line overrode new config.
+- "Forget" all remembered scan line states when forcing full refresh, previously some border region scan lines
+  were not refreshed properly when display parameters, for example centering, changed.
+- Fixed named pipe unicode format buffer size calculation bug.
+- If last command line parameter is a path and it looks like config file or state file: load it automatically.
+  Adds support for dragndrop over winuae.exe shortcut with other parameters in shortcut's Target field.
+- Automatically resolve all shortcut (*.lnk) paths in command line.
+- D3D9 non-shader mode forgot scanline texture when switching modes.
+- Fixed off by one bug in input device re-enumeration causing keyboard layout B->A or C->B change.
+
 Beta 17:
 
 - Trace mode in 68000 cycle-exact was 4 cycles too long.

diff --git a/scsi.cpp b/scsi.cpp
index 73dc138bf625a2a7afd0dd59ccd21a1814b6c088..4bab815f64d2f3043e4ac20f510b89af5d01d33b 100644 (file)
--- a/scsi.cpp
+++ b/scsi.cpp
@@ -3572,7 +3572,7 @@ addrbank *system2000_init(struct romconfig *rc)
        scsi->baseaddress = 0xf00000;
        scsi->configured = 1;
        if (!rc->autoboot_disabled) {
-               load_rom_rc(rc, NULL, 16384, 0, scsi->rom, 16384, 0);
+               load_rom_rc(rc, ROMTYPE_SYSTEM2000, 16384, 0, scsi->rom, 16384, 0);
        }
        return scsi->bank;
 }