5200b2

diff --git a/custom.cpp b/custom.cpp
index 4edaed0bca71839aa602f9bfed0c425f7c727bc8..1e5b3664f39c93a8972aa9ff5b14c9f42058c1e0 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -10089,10 +10089,12 @@ static void checkautoscalecol0(void)
 
 bool get_custom_color_reg(int colreg, uae_u8 *r, uae_u8 *g, uae_u8 *b)
 {
+       if (colreg < 0)
+               return false;
        if (colreg >= 32 && !aga_mode) {
                return false;
        }
-       if (colreg >= 256 || colreg < 0) {
+       if (colreg >= 256) {
                return false;
        }
        if (aga_mode) {

diff --git a/od-win32/win32.h b/od-win32/win32.h
index d129787f3d63f938c5d4d4640a1130f4e6f85f48..6b52710c5d4d6cb96e4b846d90c6c5f9175f3f3a 100644 (file)
--- 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("1")
+#define WINUAEBETA _T("2")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2024, 1, 6)
+#define WINUAEDATE MAKEBD(2024, 1, 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 d6f688085e5ee7206d2c9204eb5c7e05b4b1b5df..470d04377d30f9d87b234b47f0c0d15116a85ae9 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,17 @@
 
+Beta 2:
+
+- "Simple mode" path string escaping in config file directory harddrive paths incorrectly escaped single quotes which added unwanted \'s to path.
+- NCR SVGA 8/16/24 bit mode selection fixed, Picasso96 v2.0 Altais driver now works in DraCo configuration.
+- Toccata was not mapped correctly in DraCo configuration.
+- Hardware emulated RTG boards Picasso96 screen dragging horizontal shift fix (broke in b1 panning fix)
+- Any TV overscan option + NTSC mode: few pixel grapohics corruption was visible in right edge of screen.
+- Do not force release of pressed keys if mouse capture was requested but mouse was already captured. On the fly screen settings changes (for example via input events or uae-configuration) caused unexpected forced key releases in full-window mode. (Forced key release is needed because otherwise sudden mouse capture loss might cause stuck keys in Amiga side)
+- 256 color screeenshot created wrong colors in some situations (usually when AGA and almost all colors in use). Attempts to keep custom chipset color 0 (backround color) in first palette index.
+- Include also current DPI when selecting between "old" smaller or "new" larger default GUI size. (Smaller desktop resolution + high DPI = too large default GUI size)
+
+Beta 1:
+
 - MacroSystem DraCo emulation. Quickstart entry also added. No V-Lab Motion emulation, no, don't ask.
 - Retina Z3 RTG board emulation. NCR 77C32BLT SVGA chip emulation by me, including blitter that was not that trivial to implement (existing documentation was quite bad). This is implemented as a PCem display card because it makes basic (S)VGA features automatically supported. Yes, I did say that I won't ever do any SVGA card emulations (and still don't unless they are basic enough, 2D only).  Implemented because DraCo has NCR 77C32BLT based RTG card and I wanted to emulate DraCo :) Big thanks to IComp and Thomas Richter for help/driver information.
 - Retina Z2 RTG board emulation. NCR 77C22E+ based, older version of NCR SVGA chip, no blitter, no linear frame buffer. Note that this is banked RTG board and Picasso96 driver requires MMU. Uses 128k of Z2 IO space only. 16 color mode (planar mode) is not supported.