4910b1

diff --git a/include/options.h b/include/options.h
index 63b1a2a053451737ab073b7bc871019779103f5c..c9a9537700971358dc2cf8956054718b3ba5b638 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -16,7 +16,7 @@
 
 #define UAEMAJOR 4
 #define UAEMINOR 9
-#define UAESUBREV 0
+#define UAESUBREV 1
 
 #define MAX_AMIGADISPLAYS 4
 

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 3ec63c7c396c95d9012df3640e27ec0b81e0e21d..af9d526e0ce5a6ad1d35c0988a460a542cdc468d 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1404,8 +1404,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,9,0,0
- PRODUCTVERSION 4,9,0,0
+ FILEVERSION 4,9,1,0
+ PRODUCTVERSION 4,9,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1421,12 +1421,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.9.0.0"
+            VALUE "FileVersion", "4.9.1.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2021 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.9.0.0"
+            VALUE "ProductVersion", "4.9.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index 3671466d01a3a9a0a484084d33e2b33a4b767b4f..1af32a0eb337273f9143037c61ec8abb741d7911 100644 (file)
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -1308,18 +1308,21 @@ static int screencap(LPCVOID pData, struct AmigaMonitor *mon)
                if (rpsc->szScreenFiltered[0])
                        ok = screenshotf(0, rpsc->szScreenFiltered, 1, 1, 0, NULL);
                if (rpsc->szScreenRaw[0]) {
+#if 0
                        struct vidbuf_description *avidinfo = &adisplays[0].gfxvidinfo;
                        struct vidbuffer vb;
                        int w = avidinfo->drawbuffer.inwidth;
                        int h = get_vertical_visible_height(true);
                        allocvidbuffer(0, &vb, w, h, avidinfo->drawbuffer.pixbytes * 8);
-                       set_custom_limits(0, 0, 0, 0);
+                       set_custom_limits(-1, -1, -1, -1);
                        draw_frame(&vb);
                        ok |= screenshotf(0, rpsc->szScreenRaw, 1, 1, 1, &vb);
                        if (log_rp & 2)
                                write_log(_T("Rawscreenshot %dx%d\n"), w, h);
-                       //ok |= screenshotf (_T("c:\\temp\\1.bmp"), 1, 1, 1, &vb);
                        freevidbuffer(0, &vb);
+#else
+                       ok |= screenshotf(0, rpsc->szScreenRaw, 1, 1, 1, NULL);
+#endif
                }
                screenshotmode = ossm;
                if (log_rp & 2)
@@ -2382,8 +2385,9 @@ void rp_test(void)
        struct AmigaMonitor *mon = &AMonitors[0];
        struct RPScreenCapture rpsc = { 0 };
 
-       _tcscpy(rpsc.szScreenRaw, _T("c:\\temp\\test.png"));
-       
+       _tcscpy(rpsc.szScreenRaw, _T("c:\\temp\\test_r.png"));
+       _tcscpy(rpsc.szScreenFiltered, _T("c:\\temp\\test_f.png"));
+
        screencap((void*)&rpsc, mon);
 #endif
 #if 0

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 04cfc5acd8f2dc924de0372e8a61989d5fe6a7a3..a549e644478b5abe6620de2ca961a7738974a139 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
-#define LANG_DLL_FULL_VERSION_MATCH 1
+#define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("")
+#define WINUAEBETA _T("Beta 1")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2021, 12, 6)
+#define WINUAEDATE MAKEBD(2021, 12, 18)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index afa4666ad97d32ba47c9965a8f4481a0429764d0..6c8108e7cf39309db974efeb9f0d4c92e76e8988 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,28 @@
 
 
+Beta 1:
+
+4.9.0 bugs:
+
+- JIT indirect safe mode MOVEM.W from memory didn't sign extend registers (very, very old bug but apparently it was almost invisible until now because previously indirect MOVEM wasn't used unless VRAM wasn't indirect capable and direct MOVEM was still incorrectly used even when indirect mode was enabled. This was fixed in 4.9.0.)
+- Really force all emulated gfx board VRAM accesses to use indirect JIT. Previously used method still allowed direct JIT if code first accessed plain RAM and later (after it was translated) same code accessed VRAM. Fixes graphics corruption in some situations when JIT mode is direct and using emulated RTG boards. Only uaegfx is always fully JIT direct compatible.
+- JIT MOVEM.x <regs>,-(An) and <regs> includes An: use MOVEM indirect safe mode. Tester does not complain anymore.
+- PCem RTG board 15 and 16-bit lores modes didn't horizontally double correctly.
+- HBSTRT very near end of scanline was detected as missed, opening left border.
+- Programmed HBLANK end mid screen + bitplanes active (=totally broken situation) caused random graphics corruption.
+- ECS Denise horizontal blanking logic updated, it is quite complex and previous was not complete. Note that in real world it can only work if display uses H/V sync (not composite sync) = VGA monitor. CSYNC vs HSYNC/VSYNC "monitor cable" option will be added later.
+- Programmed Denise/Lisa side vertical blank ended 1 line too early. It takes 1 more line before Denise/Lisa ends it.
+- Programmed vertical blank generated blank scanline wasn't always drawn fully to end of scanline.
+
+Other updates and earlier version bug fixes:
+
+- If warp mode and non-qualifier key is pressed: send release event immediately. It is now possible to type normally in warp mode. Note that physical key release will generate another, almost always harmless, key release event.
+- PCem Cirrus Logic SVGA emulation planar support enabled. Picasso96 supports 4bit/16 color planar mode.
+- Hardware emulated RTG mode + horizontal or vertical doubling + magic mouse: mouse position calculation incorrectly used doubled coordinates.
+- Only process mouse/keyboad input Windows events during mid frame (used to reduce input lag) and process other events during vblank.
+
+4.9.0
+
 Beta 43 (RC4):
 
 - CDFS mounting used wrong character set translation functions, file names with character codes larger than 128 could not be opened depending on Windows regional settings.