From: Toni Wilen <twilen@winuae.net>
Date: Mon, 26 Oct 2015 16:55:43 +0000 (+0200)
Subject: 3200b18
X-Git-Tag: 3200~9
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=25ff8154dc5f04c3479c6c90f23e5d2450ee4825;p=francis%2Fwinuae.git

3200b18
---

diff --git a/arcadia.cpp b/arcadia.cpp
index 77642446..b39da181 100644
--- 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 f61da9c2..6707ae88 100644
--- 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 59e6fb1d..1790a444 100644
--- 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 23bcb316..884faaac 100644
--- 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 8d9112c9..e98c0d29 100644
--- 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 73dc138b..4bab815f 100644
--- 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;
 }