From: Toni Wilen <twilen@winuae.net>
Date: Fri, 17 May 2019 13:58:27 +0000 (+0300)
Subject: 4210
X-Git-Tag: 4300~199
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=dd1bb5bb902f69145afd6eaa68761b9326289644;p=francis%2Fwinuae.git

4210
---

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index ce3cc65f..04c48387 100644
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -1395,8 +1395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,2,0,0
- PRODUCTVERSION 4,2,0,0
+ FILEVERSION 4,2,1,0
+ PRODUCTVERSION 4,2,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1412,12 +1412,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.2.0.0"
+            VALUE "FileVersion", "4.2.1.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2019 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.2.0.0"
+            VALUE "ProductVersion", "4.2.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/od-win32/win32.h b/od-win32/win32.h
index e6e1b5e6..c0376598 100644
--- 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 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("5")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2019, 5, 13)
+#define WINUAEDATE MAKEBD(2019, 5, 16)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 8017253c..540cccc1 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,9 @@
 
 
+4.2.1:
+
+- 68020+ MUL(S/U).L EA,Dn set Z and N flags like it was 64-bit (EA,Dh:Dl) variant, it used internal 64-bit result value when it should have used truncated 32-bit result value. Returned Z and N flag may have been wrong if multiplication overflowed. Has been broken since the beginning.
+
 Beta 5:
 
 - Adjusted previous SPTI CDROM update, if track type is unknown, use IOCTL_CDROM_RAW_READ and check and store track type. If track is normal CDROM track (MODE0) and only 2048 bytes are requested by caller, use normal read routine to read it. Using raw (2352 byte) read would skip part of error correction, possibly causing read errors if CD is not in good shape.
diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index 3c5a4cc1..8f47b78d 100644
--- a/od-win32/wix/Product.wxs
+++ b/od-win32/wix/Product.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define ProductName = "WinUAE" ?>
-  <?define ProductVersion = "4.2.0" ?>
-  <?define ProductFullVersion = "4.2.0.0" ?>
+  <?define ProductVersion = "4.2.1" ?>
+  <?define ProductFullVersion = "4.2.1.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>