From 71036f6b3c2c985a16d400e0925f8204a140f882 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Sun, 8 Nov 2020 20:22:56 +0200
Subject: [PATCH] 4500b10

---
 od-win32/win32.h                                   |  4 ++--
 od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters |  6 +++---
 od-win32/winuaechangelog.txt                       | 11 +++++++++++
 support/time.cpp                                   |  5 +----
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/od-win32/win32.h b/od-win32/win32.h
index b2039c91..5b2445c8 100644
--- 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("Beta 9")
+#define WINUAEBETA _T("Beta 10")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2020, 11, 5)
+#define WINUAEDATE MAKEBD(2020, 11, 8)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
index f5047f54..d03dc6ac 100644
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters
@@ -958,9 +958,6 @@
     <ClCompile Include="..\..\pcem\vid_svga_render.cpp">
       <Filter>pcem</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\pcem\vid_cl5429.cpp">
-      <Filter>pcem</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\pcem\vid_s3.cpp">
       <Filter>pcem</Filter>
     </ClCompile>
@@ -970,6 +967,9 @@
     <ClCompile Include="..\..\tinyxml2.cpp">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\pcem\vid_cl5429.cpp">
+      <Filter>pcem</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resources\35floppy.ico">
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index a4e0f685..e147b8e7 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,15 @@
 
+Beta 10:
+
+- Added workaround for Windows socket behavior difference compared to Unix/Amiga. Windows return truncated data and error status if bsdsocket.library recv/recvfrom() supplied buffer is smaller than available data. Unix/Amiga sockets will also return truncated data but don't return error status.
+- Debug logging $bfff00 write truncated long words to words.
+- Log window size was not stored in ini mode.
+- ini file is now only saved if contents has been modified.
+- Fixed CV64/3D in Z2 mode. (CGX4 hang, Picasso96 wrong colors in some modes)
+- Fixed PicassoIV overlay. (Possibly can only happen with some P96 versions, at least some set overlay at VRAM address zero which accidentally worked)
+- Fixed Cirrus Logic blitter bug that was introduced few betas ago (for example some CGX4 modes had ghost shell window cursor images)
+- uaedbg invalid access message now includes information if it was caused by any chipset DMA channel. Memwatch logging must be enabled (w + return in debugger or any memwatch point enabled)
+
 Beta 9:
 
 - 64-bit JIT used wrong flag handling mode which broke some programs (b1).
diff --git a/support/time.cpp b/support/time.cpp
index e5ae0dc9..bd580655 100644
--- a/support/time.cpp
+++ b/support/time.cpp
@@ -135,7 +135,7 @@ static void figure_processor_speed_qpf(void)
 	qpfrate = freq.QuadPart;
 	/* limit to 10MHz */
 	qpcdivisor = 0;
-	while (qpfrate >= 10000000) {
+	while (qpfrate > 10000000) {
 		qpfrate >>= 1;
 		qpcdivisor++;
 	}
@@ -147,9 +147,6 @@ static void figure_processor_speed_qpf(void)
 
 void uae_time_calibrate(void)
 {
-	if (si.dwNumberOfProcessors > 1) {
-		userdtsc = 0;
-	}
 	if (userdtsc) {
 		figure_processor_speed_rdtsc();
 	}
-- 
2.47.3