From: Toni Wilen <twilen@winuae.net>
Date: Sun, 2 Nov 2025 18:49:07 +0000 (+0200)
Subject: 6020b5
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=1420685220134f7fe67ef26ffaa0745eb3d883bd;p=francis%2Fwinuae.git

6020b5
---

diff --git a/cia.cpp b/cia.cpp
index 482c1a8d..2257c24b 100644
--- a/cia.cpp
+++ b/cia.cpp
@@ -1180,7 +1180,7 @@ static bool keymcu_execute(void)
 {
 	bool handshake = (cia[0].t[0].cr & 0x40) != 0 && (cia[0].sdr_buf & 0x80) == 0;
 
-#if 1
+#if 0
 	extern int blop;
 	if (blop & 1) {
 		handshake = true;
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 123b8dc0..28ff9f2c 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("4")
+#define WINUAEBETA _T("5")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2025, 10, 26)
+#define WINUAEDATE MAKEBD(2025, 11, 2)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 377f17c2..0cf43282 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -21645,20 +21645,22 @@ static void enable_for_avioutputdlg (HWND hDlg)
 	ew (hDlg, IDC_STATEREC_RATE, !input_record && full_property_sheet ? TRUE : FALSE);
 	ew (hDlg, IDC_STATEREC_BUFFERSIZE, !input_record && full_property_sheet ? TRUE : FALSE);
 
+	tmp[0] = 0;
 	if (avioutput_audio == AVIAUDIO_WAV) {
 		_tcscpy (tmp, _T("Wave (internal)"));
 	} else {
 		avioutput_audio = AVIOutput_GetAudioCodec (tmp, sizeof tmp / sizeof (TCHAR));
 	}
-	if(!avioutput_audio) {
+	if (!avioutput_audio) {
 		CheckDlgButton (hDlg, IDC_AVIOUTPUT_AUDIO, BST_UNCHECKED);
 		WIN32GUI_LoadUIString (IDS_AVIOUTPUT_NOCODEC, tmp, sizeof tmp / sizeof (TCHAR));
 	}
 	SetWindowText (GetDlgItem (hDlg, IDC_AVIOUTPUT_AUDIO_STATIC), tmp);
 
+	tmp[0] = 0;
 	if (avioutput_audio != AVIAUDIO_WAV)
 		avioutput_video = AVIOutput_GetVideoCodec (tmp, sizeof tmp / sizeof (TCHAR));
-	if(!avioutput_video) {
+	if (!avioutput_video) {
 		CheckDlgButton (hDlg, IDC_AVIOUTPUT_VIDEO, BST_UNCHECKED);
 		WIN32GUI_LoadUIString (IDS_AVIOUTPUT_NOCODEC, tmp, sizeof tmp / sizeof (TCHAR));
 	}
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 744d1ab4..e4f44f10 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,17 @@
 
+Beta 5
+
+- KS ROM genlock detection still could misdetect genlock in JIT mode causing guru when timer.device attempts TOD calibration and causing non-existing 80000000 guru due to a KS bug (At least KS 3.1, perhaps others too). (6.0)
+- Fixed bad drive click code, was semi-broken since the beginning. Sound buffer size affected click sound quality and possibly clicks were missed completely. For some reason some WASAPI devices seem to play empty drive clicks with very low volume and also sometimes play motor sample + clicks strangely (samples are exact same and even volume is same), maybe some noise filter or something done by driver or something?
+- Visual DMA debugger now defaults again to Agnus lines, line zero at top. vv-x can be used to show virtual line at top, first line after vsync. Also previously it could have shown random bogus lines at the top or bottom.
+- 6.0b1 "If CIA serial port data direction is changed (CRA OUTMODE toggled), serial port state is reset, possible pending transmit or receive is immediately aborted." checked CIA-A vs CIA-B instead of checking if modified control register was A or B. Most likely didn't cause any side-effects, at least with any normal programs.
+- Chipset display is now cleared when entering genlock mode without genlock (hsync and vsync stops). Previously last frame was shown until no sync condition ended.
+- Trying to load a statefile when in genlock no sync condition didn't do anything.
+- ECS/AGA bitplane enable/disable fix when DDFSTRT==DDFSTOP. It always starts bitplane DMA but "ddfstop passed" condition depends on previous state of bitplane logic. Previously it always triggered "ddfstop passed".
+- Some ECS/AGA bitplane sequencer mid scanline DMA on/off logic changes, was lost during v5 to v6 update.
+- If bitplane DMA last BPL1DAT is also sprite slot and sprite is active: sprite and bitplane DMA conflicts. This was emulated in v5 but was lost during v6 update.
+- AVI capture before filtering had swapped color components (6.0)
+
 Beta 4:
 
 - OCS/ECS "7-planes" mode didn't enable EHB. (6.0)