4900b18

diff --git a/.gitignore b/.gitignore
index d17a92a1896fe320b2a84ba8d183f5336412f91d..bb28208a740eac947f1170d2168a5cb66793daaa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,5 @@ packages.config
 *.db-wal
 *.o
 **/.vs
+*.7z
+*.zip

diff --git a/custom.cpp b/custom.cpp
index b8a6cf69d90fcacdb78b184bbfa07598a491021b..a03b496a2c117fc90709f88aaf0b09d08fd4d28e 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -48,7 +48,7 @@
 #include "rommgr.h"
 #include "specialmonitors.h"
 
-#define CYCLE_CONFLICT_LOGGING 1
+#define CYCLE_CONFLICT_LOGGING 0
 
 #define SPEEDUP 1
 
@@ -6912,14 +6912,8 @@ static void decide_line(int endhpos)
                }
 
                hpos++;
-
-               //decide_line_decision_fetches(hpos);
-               //decide_sprite_fetch(hpos);
-
        }
 
-       decide_sprite_fetch(endhpos);
-
        last_decide_line_hpos = endhpos;
 }
 
@@ -8946,7 +8940,7 @@ static void hsync_handler_pre(bool onvsync)
        }
 }
 
-STATIC_INLINE bool is_last_line (void)
+STATIC_INLINE bool is_last_line(void)
 {
        return vpos + 1 == maxvpos + lof_store;
 }

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

diff --git a/od-win32/win32.h b/od-win32/win32.h
index c93f5161a7bc5b9b3a06353c017a43edde1fbfd8..1c2171165cb46fb7ba296f816341fe70a8e0ad22 100644 (file)
--- 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 17")
+#define WINUAEBETA _T("Beta 18")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2021, 2, 20)
+#define WINUAEDATE MAKEBD(2021, 4, 24)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 1b8c33d15a4956d32806e1777cbbe75bebfff9f6..023a2b6a8ae2be0513d298e94c352db68d3306b2 100644 (file)
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -4170,7 +4170,7 @@ retry:
                                mon->currentmode.native_width, mon->currentmode.native_height, mon->currentmode.current_depth);
                } else {
                        allocsoftbuffer(mon->monitor_id, _T("draw"), &avidinfo->drawbuffer, mon->currentmode.flags,
-                               1600, 1280, mon->currentmode.current_depth);
+                               1920, 1280, mon->currentmode.current_depth);
                }
                if (currprefs.monitoremu || currprefs.cs_cd32fmv || (currprefs.genlock && currprefs.genlock_image) || currprefs.cs_color_burst || currprefs.gfx_grayscale) {
                        allocsoftbuffer(mon->monitor_id, _T("monemu"), &avidinfo->tempbuffer, mon->currentmode.flags,

diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp
index 935f9f8c74d17af0e68b129c1fa8647e12d7eb46..35f24191162249c9dc9bd6864fd81013bab400ec 100644 (file)
--- a/od-win32/win32gui_extra.cpp
+++ b/od-win32/win32gui_extra.cpp
@@ -1292,9 +1292,9 @@ static void boxart_init(void)
 }
 
 static const TCHAR *boxartnames[MAX_BOX_ART_TYPES] = {
-       _T("Boxart"),
        _T("Title"),
        _T("SShot"),
+       _T("Boxart"),
        _T("Misc"),
        _T("Data"),
 };

diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
index e964278573b1708162c38789633ecad8e0301ea6..79415543685275530c87a9a6a9e374fef8d0415d 100644 (file)
--- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj
@@ -234,7 +234,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;:%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -401,7 +401,7 @@
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -714,7 +714,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\..\slirp;..\..\ppc\pearpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;FX11;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINVER=0x0601;NDEBUG;_WIN32_IE=0x0700;WIN32;UAE;WINUAE;__i386__;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>Sync</ExceptionHandling>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>

diff --git a/rommgr.cpp b/rommgr.cpp
index b4aa84cfd94745bb8b168155ccea46bc4885a53c..03a9cb23fec035a1e75b8a95792aaa155e647daa 100644 (file)
--- a/rommgr.cpp
+++ b/rommgr.cpp
@@ -1928,7 +1928,7 @@ struct zfile *read_rom (struct romdata *prd)
                                                }
                                                xfree(tmp);
                                        }
-                               } else if (rd->id == 182 || rd->id == 183) {
+                               } else if (rd->id == 182) {
                                        // ALG Space Pirates
                                        uae_u8 *tmp = xmalloc(uae_u8, size);
                                        if (tmp) {

diff --git a/softfloat/softfloat.cpp b/softfloat/softfloat.cpp
index 04b730550362ba3972cb28067da7a7a141def604..ce7efc77ff5a9a38d094fadd1ee3ec9cd9209787 100644 (file)
--- a/softfloat/softfloat.cpp
+++ b/softfloat/softfloat.cpp
@@ -2879,7 +2879,7 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, float_status *status)
 
 }
 #else // 09-01-2017: Modified version for Previous
-floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status* status)
+floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status)
 {
     flag aSign, bSign, zSign;
     int32_t aExp, bExp, expDiff;
@@ -2906,7 +2906,7 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status
     if (bExp == 0x7FFF) {
         if ((uint64_t)(bSig << 1)) return propagateFloatx80NaN(a, b, status);
         *s = (aSign != bSign);
-        return normalizeRoundAndPackFloatx80(status->floatx80_rounding_precision, aSign, aExp, aSig0, 0, status);;
+        return normalizeRoundAndPackFloatx80(status->floatx80_rounding_precision, aSign, aExp, aSig0, 0, status);
     }
     if (bExp == 0) {
         if (bSig == 0) {
@@ -2987,7 +2987,7 @@ floatx80 floatx80_rem(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status
  | value `a' with respect to the corresponding value `b'.
  *----------------------------------------------------------------------------*/
 
-floatx80 floatx80_mod(floatx80 a, floatx80 b, uint64_t* q, flag* s, float_status* status)
+floatx80 floatx80_mod(floatx80 a, floatx80 b, uint64_t *q, flag *s, float_status *status)
 {
     flag aSign, bSign, zSign;
     int32_t aExp, bExp, expDiff;