From ba04cd5c27fe1daa3f6149e72c81d54b3083ad52 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Sun, 8 Jul 2018 19:38:37 +0300
Subject: [PATCH] 4010b3

---
 od-win32/hardfile_win32.cpp  | 16 +++++++++++-----
 od-win32/win32.h             |  4 ++--
 od-win32/winuaechangelog.txt | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp
index 624bdf40..3ab2f991 100644
--- a/od-win32/hardfile_win32.cpp
+++ b/od-win32/hardfile_win32.cpp
@@ -333,7 +333,7 @@ static int safetycheck (HANDLE h, const TCHAR *name, uae_u64 offset, uae_u8 *buf
 			}
 			ReadFile(h, buf, blocksize, &outlen, NULL);
 			if (outlen != blocksize) {
-				write_log(_T("hd ignored, read error %d!\n"), GetLastError());
+				write_log(_T("hd ignored (out=%d bs=%d), read error %d!\n"), outlen, blocksize, GetLastError());
 				return 2;
 			}
 		}
@@ -973,9 +973,10 @@ static bool hd_get_meta_hack(HWND hDlg, HANDLE h, uae_u8 *data, uae_u8 *inq, str
 
 void ata_byteswapidentity(uae_u8 *d);
 
-static const uae_u16 blacklist[]
+static const uae_u16 blacklist[] =
 {
-	0x14cd, 0x125c,
+	0x14cd, 0xffff,
+	0x0aec, 0xffff,
 	0, 0
 };
 
@@ -996,8 +997,13 @@ static bool readidentity(HANDLE h, struct uae_driveinfo *udi, struct hardfiledat
 		return false;
 	if (udi->usb_vid) {
 		for (int i = 0; blacklist[i]; i += 2) {
-			if (udi->usb_vid == blacklist[i] && udi->usb_pid == blacklist[i + 1])
-				return false;
+			if (udi->usb_vid == blacklist[i]) {
+				if (udi->usb_pid == blacklist[i + 1] || blacklist[i + 1] == 0xffff) {
+					udi->scsi_direct_fail = true;
+					write_log(_T("VID=%04x PID=%04x blacklisted\n"), udi->usb_vid, udi->usb_pid);
+					return false;
+				}
+			}
 		}
 	}
 
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 7407c86f..aa9a966b 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("2")
+#define WINUAEBETA _T("3")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 7, 3)
+#define WINUAEDATE MAKEBD(2018, 7, 8)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 6d6a6020..a4bb1374 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,23 @@
 
+
+Beta 3:
+
+- If CD audio playing from real/virtual CD (not directly mounted image) was restarted because of config change, playback always started from beginning (or possibly failed to restart).
+- 68060 FPU disable behavior change (68060 accelerator boards have "$f0" ROM to disable FPU because exec does not understand 68060 FPU and will crash if enabled), FPU is not anymore automatically disabled at hard reset if any emulated accelerator board is configured (matches now real world), if no accelerator board: if UAE boot ROM is at $f00000 ("old" mode), it disables FPU (just like real accelerator board do), if UAE Boot ROM is any other address: ("new" mode), m68k RESET instruction will disable FPU. Previously 68060 config got stuck in reboot loop because of not-disabled FPU if system was software reset.
+- D3D9/11 vsync modes (lagless and standard) will now support 100/120Hz with optional black frame insertion.
+- Always check interrupts immediately after MOVE to SR instruction (except if JIT enabled). Previously it was delayed until following instruction if fast 68020+ mode.
+
+Beta 2:
+
+- QuikPak SCSI working. (Has same bug as tekscsi2.device 1.0: does not load RDB custom filesystems)
+- 80-bit FACOS fix. Also removed old unneeded JIT FACOS workaround.
+- If drive identity is read and it is CHS-only, don't enable CHS-only mode unless host OS also returns zero drive size. Some (old) Windows IDE drivers do support CHS-only drives. (3.6.0)
+- Added checks to prevent crashes when running in lagless vsync under wine. (DISPLAYCONFIG_VIDEO_SIGNAL_INFO and IDXGIOutput1 not implemented)
+
+QuikPak 4060:
+- Very similar in high level compared to TekMagic, main difference is SCSI chip, 53C720 (was 53C710 in TekMagic).
+- "tekscsi2.device (tekscsi2 2.1 (17.7.97) ©1997 Asimware Innovations Inc.)". Apparently v2.2 also exists.
+
 Beta 1:
 
 4.0.0 bugs fixed:
-- 
2.47.3