From 15f8acd3dcd7ec7c1d6cb182a42c4e9a6fed84c2 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Thu, 5 Nov 2015 21:14:14 +0200
Subject: [PATCH] 3200b20

---
 .gitignore                   |  1 +
 od-win32/win32.h             |  4 ++--
 od-win32/win32gui.cpp        |  4 +---
 od-win32/winuaechangelog.txt | 19 +++++++++++++++++++
 rommgr.cpp                   | 10 ++++++++--
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f724032..f1e47b8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ aros.rom.cpp
 /linetoscr.cpp
 *.iobj
 *.ipdb
+*.opendb
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 812fb334..d6a3bd42 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("19")
+#define WINUAEBETA _T("20")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2015, 11, 2)
+#define WINUAEDATE MAKEBD(2015, 11, 5)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 884faaac..a830bda5 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -1498,10 +1498,8 @@ static int addrom (UAEREG *fkey, struct romdata *rd, const TCHAR *name)
 			s = _tcschr(s2, '\"');
 			if (s)
 				*s = 0;
-			// select plain file if previously found was inside archive
+			// if plain file already in registry: do not overwrite it
 			if (my_existsfile(s2) && !my_existsfile(pathname)) {
-				_tcscpy(pathname, s2);
-			} else {
 				return 1;
 			}
 		}
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 4419b8e8..b509ef26 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,23 @@
 
+Beta 20:
+
+- Map ROM feature was not JIT direct compatible (JIT update few betas ago)
+- Do not initialize CD drivers twice. (scsi passthrought, ioctl, image)
+- Fix compatibility with old config files (before 68000/010 32-bit addressing option was added),
+  force 24-bit addressing if config file was saved with 2.8.1 or older.
+- Another old config compatibily update, if 68000/010 with chipset extra set to Generic, use more A500-like
+  mainboard config than bigbox-like.
+- Added Kupke Golem FastSCSI/IDE combo board.
+- FastLane SCSI autoconfig mapping fixed.
+- ROM scanner prefer roms not in archives update (b15) had exactly opposite effect..
+
+Kupke Golem FastSCSI/IDE:
+- SCSI/IDE combo board. Whole board or only IDE can be disabled.
+- Fake DMA (SCSI long word wide, usual word wide PIO IDE)
+- 4.2 ROM added ("fastscsi device (romversion) V4.2 (06-FEB-95)")
+- Boot ROM made in 1995 without custom filesystem support..
+- Does not copy ROM code to RAM, driver code executes directly from ROM.
+
 Beta 19:
 
 - Sprite in far right border feature (b1) didn't work correctly in AGA modes that require hires/shres horizontal
diff --git a/rommgr.cpp b/rommgr.cpp
index 1bf58e64..3955047f 100644
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -95,7 +95,7 @@ struct romdata *getromdatabypath (const TCHAR *path)
 	return NULL;
 }
 
-#define NEXT_ROM_ID 157
+#define NEXT_ROM_ID 159
 
 #define ALTROM(id,grp,num,size,flags,crc32,a,b,c,d,e) \
 { _T("X"), 0, 0, 0, 0, 0, size, id, 0, 0, flags, (grp << 16) | num, 0, NULL, crc32, a, b, c, d, e },
@@ -427,6 +427,10 @@ static struct romdata roms[] = {
 	0xd13a2c89, 0xf9e38c4b,0xf5c6499d,0x486946ba,0x7b7636b8,0x0845265b, NULL, NULL },
 	ALTROMPN(156, 1, 1, 32768, ROMTYPE_ODD  | ROMTYPE_8BIT, NULL, 0x339b3549, 0x74de857b, 0x42f9a8e0, 0xc1f3c29e, 0x06982622, 0x853d08fe)
 	ALTROMPN(156, 1, 2, 32768, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x3aca5d1f, 0x786f2197, 0xc614be91, 0xae7e87da, 0xb42c3290, 0xd7997763)
+	{ _T("Kupke Golem v4.2"), 4, 2, 4, 2, _T("GOLEMFAST\0"), 16384, 157, 0, 0, ROMTYPE_GOLEMFAST, 0, 0, NULL,
+	0x5e94ee56, 0xf83dae55, 0x49f9b735, 0x52d5c6e0, 0x41da4c6c, 0x995a7f47, NULL, NULL },
+	ALTROMPN(157, 1, 1, 8192, ROMTYPE_ODD  | ROMTYPE_8BIT, NULL, 0xec13fda0, 0x6af1447c, 0x4363c46d, 0x05697458, 0x01daa30c, 0x03c01c9f)
+	ALTROMPN(157, 1, 2, 8192, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x39b0075e, 0xf6644ea0, 0x6c3ed349, 0xfb0fb6b4, 0xa9f07655, 0x0b104179)
 
 	{ _T("CyberStorm MK I 68040"), 0, 0, 0, 0, _T("CSMKI\0"), 32768, 95, 0, 0, ROMTYPE_CB_CSMK1, 0, 0, NULL,
 	  0, 0, 0, 0, 0, 0, NULL, _T("cyberstormmk1_040.rom") },
@@ -451,7 +455,9 @@ static struct romdata roms[] = {
 	{ _T("A1060 BIOS 2.06"), 2, 6, 2, 6, _T("A1060\0"), 16384, 147, 0, 0, ROMTYPE_A1060, 0, 0, _T("380619-03"),
 	0x185f2bbd, 0xeba74ad1,0x000a5351,0xa5d99179,0xbf75f831,0xac2d2402, NULL, NULL },
 	{ _T("A2088 BIOS 3.4"), 3, 4, 3, 4, _T("A2088\0"), 16384, 148, 0, 0, ROMTYPE_A2088, 0, 0, _T("380788-04"),
-	0x05552160, 0xd1defdee,0x1c0eae41,0x07d81e26,0x74915cd2,0x9d352f2e, NULL, NULL },
+	0x05552160, 0xd1defdee, 0x1c0eae41, 0x07d81e26, 0x74915cd2, 0x9d352f2e, NULL, NULL },
+	{ _T("A2088 BIOS 3.5"), 3, 5, 3, 5, _T("A2088\0"), 16384, 158, 0, 0, ROMTYPE_A2088, 0, 0, _T("380788-04"),
+	0xf8e1ad83, 0x45a2b7db,0x6e86fe80,0x5cfef63c,0x65c331a7,0x16a6e9e8, NULL, NULL },
 	{ _T("A2088 BIOS 3.6.1"), 3, 61, 3, 61, _T("A2088\0"), 16384, 149, 0, 0, ROMTYPE_A2088, 0, 0, _T("380788-06"),
 	0x5fd93e56, 0xc1b707a8,0xa62907d7,0x5299f10a,0xa60efd1f,0x44514b26, NULL, NULL },
 	{ _T("A2088T BIOS 4.10"), 4, 10, 4, 11, _T("A2088T\0"), 32768, 150, 0, 0, ROMTYPE_A2088T, 0, 0, _T("390657-02"),
-- 
2.47.3