From: Toni Wilen <twilen@winuae.net>
Date: Mon, 21 Oct 2024 14:32:04 +0000 (+0300)
Subject: 5310
X-Git-Tag: 5310^0
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=51b7be351f359dc97f967f051da390283bc4b409;p=francis%2Fwinuae.git

5310
---

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 7795722b..c2d8728e 100644
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1431,8 +1431,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
- PRODUCTVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
+ PRODUCTVERSION 5,3,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1448,12 +1448,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "5.3.0.0"
+            VALUE "FileVersion", "5.3.1.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2024 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "5.3.0.0"
+            VALUE "ProductVersion", "5.3.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index f6c9ed35..ca207ad7 100644
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -1127,14 +1127,8 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
 					p->gfx_ycenter_size = sm->lClipHeight;
 				p->gf[0].gfx_filter_top_border = sm->lClipTop;
 				p->gf[0].gfx_filter_bottom_border = sm->lClipTop + sm->lClipHeight;
-
-				if (hdbl > RES_MAX) {
-					p->gf[0].gfx_filter_left_border = sm->lClipLeft << (hdbl - RES_MAX);
-					p->gf[0].gfx_filter_right_border = p->gf[0].gfx_filter_left_border + (sm->lClipWidth << (hdbl - RES_MAX));
-				} else {
-					p->gf[0].gfx_filter_left_border = sm->lClipLeft >> (RES_MAX - hdbl);
-					p->gf[0].gfx_filter_right_border = p->gf[0].gfx_filter_left_border + (sm->lClipWidth >> (RES_MAX - hdbl));
-				}
+				p->gf[0].gfx_filter_left_border = sm->lClipLeft;
+				p->gf[0].gfx_filter_right_border = p->gf[0].gfx_filter_left_border + sm->lClipWidth;
 				// backwards compatibility fix
 				p->gf[0].gfx_filter_left_border -= 0x38 * 4;
 				p->gf[0].gfx_filter_right_border -= 0x38 * 4;
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 16b056b4..40f0165c 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("3")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2024, 10, 12)
+#define WINUAEDATE MAKEBD(2024, 10, 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 789d487b..dfce6287 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,6 +1,7 @@
 
-This is quick 5.3.1 beta series, normal update to 5.3.0. You might have heard that I have started rewriting (almost) whole custom chipset emulation few months ago. This isn't it. Still work to do, it isn't that useful in fast CPU modes yet.
+5.3.1
 
+This is quick 5.3.1 beta series, normal update to 5.3.0. You might have heard that I have started rewriting (almost) whole custom chipset emulation few months ago. This isn't it. Still work to do, it isn't that useful in fast CPU modes yet.
 
 Beta 3:
 
diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index 5e8ceb1d..aa5f8e82 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 = "5.3.0" ?>
-  <?define ProductFullVersion = "5.3.0.0" ?>
+  <?define ProductVersion = "5.3.1" ?>
+  <?define ProductFullVersion = "5.3.1.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>