41000b10

diff --git a/custom.cpp b/custom.cpp
index 3678e649b7f0d78f57b57c883dc8f67512f0bada..d6cfda3ed5c847920ae49aebd7e4274b29ce52ea 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -5811,12 +5811,12 @@ void compute_vsynctime(void)
 
        if (currprefs.turbo_emulation) {
                if (currprefs.turbo_emulation_limit > 0) {
-                       vsynctimebase = (int)(syncbase / currprefs.turbo_emulation_limit);
+                       vsynctimebase = (frame_time_t)(syncbase / currprefs.turbo_emulation_limit);
                } else {
                        vsynctimebase = 1;
                }
        } else {
-               vsynctimebase = (int)(syncbase / fake_vblank_hz);
+               vsynctimebase = (frame_time_t)(syncbase / fake_vblank_hz);
        }
        vsynctimebase_orig = vsynctimebase;
 

diff --git a/include/options.h b/include/options.h
index 164d113f4b96ae5790aa7d10a82de11d27583d99..78582bdc89dcc7fee155018b8cddd939261001a0 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -15,8 +15,8 @@
 #include "traps.h"
 
 #define UAEMAJOR 4
-#define UAEMINOR 9
-#define UAESUBREV 9
+#define UAEMINOR 10
+#define UAESUBREV 0
 
 #define MAX_AMIGADISPLAYS 4
 

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 274550e5fa82241e32dd981ef4db419690354570..cc3c68974300b9e6d5da5888b39a91920eef72d2 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1362,7 +1362,7 @@ BEGIN
     COMBOBOX        IDC_EXPANSIONBOARDITEMSELECTOR,12,112,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCSIROMSELECTNUM,175,78,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "24-bit DMA",IDC_SCSIROM24BITDMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,61,84,12
-    RTEXT           "Controller ID:",IDC_STATIC,241,59,110,15,SS_CENTERIMAGE
+    RTEXT           "Controller ID:",IDC_STATIC,281,59,70,15,SS_CENTERIMAGE
     COMBOBOX        IDC_SCSIROMID,356,60,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCSIROMFILE,202,78,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SCSIROMCHOOSER,376,78,10,15
@@ -1416,8 +1416,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,9,2,0
- PRODUCTVERSION 4,9,2,0
+ FILEVERSION 4,10,0,0
+ PRODUCTVERSION 4,10,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1433,12 +1433,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.9.2.0"
+            VALUE "FileVersion", "4.10.0.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2022 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.9.2.0"
+            VALUE "ProductVersion", "4.10.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 5be2fd4b5d55acbdac80770c5cffbcaa16bc8262..bfe3ccd000d25940c5d4562afa2ee298658653a0 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,18 +20,18 @@
 #define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("Beta 8")
+#define WINUAEBETA _T("Beta 10")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2022, 12, 3)
+#define WINUAEDATE MAKEBD(2022, 12, 10)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
 
 #ifndef WINUAEEXTRA
-#define WINUAEEXTRA _T("")
+#define WINUAEEXTRA _T("RC2")
 #endif
 #ifndef WINUAEREV
 #define WINUAEREV _T("")
@@ -222,8 +222,6 @@ void associate_file_extensions (void);
 DWORD GetFileAttributesSafe (const TCHAR *name);
 BOOL SetFileAttributesSafe (const TCHAR *name, DWORD attr);
 
-void HtmlHelp(HWND a, LPCWSTR b, UINT c, const TCHAR *d);
-
 typedef BOOL(CALLBACK* ADJUSTWINDOWRECTEXFORDPI)(LPRECT, DWORD, BOOL, DWORD, UINT);
 extern ADJUSTWINDOWRECTEXFORDPI pAdjustWindowRectExForDpi;
 

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 5a8a913a92a9455af96f47a0d1457ad7e7f81df4..4257a19f235057a1eb9405197afd948c105a820c 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,24 @@
 
+Beta 10 (RC2):
+
+- Bumped version to 4.10.0
+- 64-bit natmem limit increased to support G-REX PCI VRAM modification detection (Only draw lines that have been modified). Previously Voodoo 3 + G-REX always forced whole screen refresh. G-REX PCI memory space is above 2G "limit". Check also current limit to prevent "picasso_getwritewatch 87" log messages when running 32-bit version.
+- SupraDrive AMAB5 and AMAB6 are also 8k. Removed extra duplicated 8k. Previous SupraDrive 2000DMA ROM is called "44-25B" (Hand written text on ROM label did say 44-25B but I thought it was some kind of checksum or something but SupraRomChk on SupraBoot3.8B install disk does detect it as "44-25B"). Updated 2000DMA ROM mapping, SupraRomChck now detects supported ROMs correctly. Remaining undumped official Supra ROMs are "33-11B" and AMAB1, listed inside SupraRomChk executable. (Also some AMAB5 and AMAB6 beta roms are listed)
+- Added Hardital Synthesis/Super Big Bang v48.5 (previous was v53.1)
+- Serial port ring indicator (RI) signal support (RI is shared with printer port SELECT line)
+- Fix out of bounds buffer access when checking what should be written to write-only register that was read. (b5)
+
+Beta 9 (RC1):
+
+- Direct3D9 mode overlay mode didn't show Amiga screen in most configurations.
+- JIT interrupt handling fix part 2.
+- Debugger SMC detector cache flush does not anymore clear whole SMC state array (which can be huge if Amiga RAM is located in Z3 space). When state array needs to be reset, reset only RAM and ROM regions. Max SMC array size is now automatically same as highest RAM address.
+- Autoresolution didn't do anything unless gfx_windowed_multi or gfx_fullscreen_multi had non-zero values (b1)
+- Autoscale worked incorrectly in programmed modes. (b1)
+- Disable GUI Wait for blitter checkbox in 68000/010 cycle-exact modes. Previously it was allowed but did nothing.
+- CDTV/CD32 Quickstart didn't use new NVRAM Files -path (b1)
+- Added Supra AMAB2 ROM to ROM scanner. (Seems to support at least 2000DMA and AutoBoot models). AMAB1 is still missing, previously added 2000DMA ROM most likely isn't AMAB1 because it only supports 2000DMA. 2000DMA ROM selection now also lists all AMAB roms because AMAB2-4 have 2000DMA support (AMAB5/6 dropped 2000DMA support) and ROM scanner selection logic does not support filtering ROMs that have same type.
+
 Beta 8:
 
 - RTG to chipset mode (non-interlaced) switch didn't enable native mode filter (b7)

diff --git a/support/time.cpp b/support/time.cpp
index f825ba6e5ff4e12f573b0ef7868a992b8f6c6118..b98b6454a52227189d34697d926f913a4c67255c 100644 (file)
--- a/support/time.cpp
+++ b/support/time.cpp
@@ -19,7 +19,7 @@ static frame_time_t read_processor_time_qpf(void)
        frame_time_t t;
        QueryPerformanceCounter(&counter);
        if (qpcdivisor == 0)
-               t = (frame_time_t) (counter.LowPart);
+               t = (frame_time_t) (counter.QuadPart);
        else
                t = (frame_time_t) (counter.QuadPart >> qpcdivisor);
        if (!t)