From 0c65b8bdbd0b630cb69f203419d69aa76c8d73f2 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 25 Mar 2023 21:14:58 +0200 Subject: [PATCH] 41020b3 --- expansion.cpp | 2 +- od-win32/resources/winuae.rc | 8 ++++---- od-win32/win32.h | 4 ++-- od-win32/win32_scaler.cpp | 2 +- od-win32/winuaechangelog.txt | 17 +++++++++++++++++ 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/expansion.cpp b/expansion.cpp index ac65082b..0f962275 100644 --- a/expansion.cpp +++ b/expansion.cpp @@ -5589,7 +5589,7 @@ const struct expansionromtype expansionroms[] = { }, { _T("buddha"), _T("Buddha"), _T("Individual Computers"), - NULL, buddha_init, NULL, buddha_add_ide_unit, ROMTYPE_BUDDHA, 0, 0, BOARD_AUTOCONFIG_Z2, false, + NULL, buddha_init, NULL, buddha_add_ide_unit, ROMTYPE_BUDDHA | ROMTYPE_NONE, 0, 0, BOARD_AUTOCONFIG_Z2, false, NULL, 0, false, EXPANSIONTYPE_IDE, 0, 0, 0, false, NULL, diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index 6fcc129c..d91ca324 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1420,8 +1420,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,10,1,0 - PRODUCTVERSION 4,10,1,0 + FILEVERSION 4,10,2,0 + PRODUCTVERSION 4,10,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1437,12 +1437,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "4.10.1.0" + VALUE "FileVersion", "4.10.2.0" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2023 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "4.10.1.0" + VALUE "ProductVersion", "4.10.2.0" END END BLOCK "VarFileInfo" diff --git a/od-win32/win32.h b/od-win32/win32.h index e4a430b9..0d33d4eb 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(2023, 3, 11) +#define WINUAEDATE MAKEBD(2023, 3, 25) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp index a2534786..f034f139 100644 --- a/od-win32/win32_scaler.cpp +++ b/od-win32/win32_scaler.cpp @@ -322,7 +322,7 @@ void getfilterrect2(int monid, RECT *sr, RECT *dr, RECT *zr, int dst_width, int filter_aspect = 0; keep_aspect = 0; palntscadjust = 1; - if (dst_width >= 640 && dst_width <= 800 && dst_height >= 480 && dst_height <= 600) { + if (dst_width >= 640 && dst_width <= 800 && dst_height >= 480 && dst_height <= 600 && !programmedmode) { autoselect = 1; scalemode = AUTOSCALE_NONE; int m = 1; diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 051b59c8..a9ea4b59 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,21 @@ +Beta 3: + +- Changed keyboard reset warning again: when reset keys are pressed, reset warning starts, when reset warning ends, system is reset but reset is kept active until at least one key is released. Keeping reset keys pressed more than 5 seconds force hard reset like non-reset warning config already did. Both keyboard reset modes now work identically. +- Programmed mode "do not include hidden lines" (b1) removed one too many line, breaking some programmed modes interlace field order. +- Interlace automatic LOF toggle cycle was still using pre-4.9 horizontal position origin. (Toggled 3 cycles too early, correct position is cycle 1 of line 0) +- LOL (NTSC long line) was toggled 1 cycle too early. Both LOF and LOL toggle when HPOS=1. +- COPJMP1+COPJMP2 strobe when Copper DMA is off stops the copper: this was not correct, if both strobes are generated, Copper instruction pointer is loaded with COP1PT OR'd with COP2PT. This usually indirectly stops the copper because it will sooner or later does MOVE to "dangerous" register. This is same address OR behavior as any other DMA pointer if more than one gets activated in same cycle (for example refresh + bitplane conflict). This was done before logic analyzer checks and was forgotten.. +- HAM5/HAM7 was incorrectly allowed in AGA mode (broken probably in 4.9?). AGA only enables HAM if 6 or 8 planes. +- Disk image was accidentally opened twice, preventing disk image deletion/editing without closing WinUAE (b1) +- When disk image is ejected using GUI, close image file handle immediately (previously it was closed after returning back to emulation) +- Mounting exe as HD floppy image created broken disk structure if file was larger than 1329664 bytes. Bitmap block used original DD block location but was allocated after HD root block. +- Filter mode "default" now always scales if programmed chipset display mode. +- Debugger breakpoints are now also reported when single stepping (f and fo etc), previously trace override other breakpoint detection. +- Debugger wf didn't fill in binary mode. +- GVP 2040 original ROM image added (No 68060 support). "tekscsi2.device 1.1 (17.4.95)". Filesystem loader has serial debugging enabled. Updated 68060 variant is "tekscsi2.device 1.0 (27.8.95)". For some reason newer version has 1.0 in version string but device internal version is still 1.1. +- Changed new Agnus Chip RAM max addressing advanced chipset option: default equals Chip RAM size. Forcing 512k when OCS can break old configs and cause confusion and result will look like new emulation bug. +- Some VHPOSW horizontal change support improvements. It is still a hack but it is simpler hack and generic, required changes are now dynamically calculated. It is not anymore hardwired to Smooth Copper / Up Front specific VHPOSW horizontal position changes. Demo specific hacks removed. Also now horizontal position moves beyond maxhpos is also emulated, hpos counts until to 0xFF before wrapping around. DMA debugger also updated to support skipped or doubled cycles. (Weird test cases by ross) Beta 2: -- 2.47.3