2900b22

diff --git a/ar.cpp b/ar.cpp
index a2c6fa1d72ddb50c285b81926f6d7e20fc623fe4..73ed24add9b4f0a42b07997c531ec214cc47a6b7 100644 (file)
--- a/ar.cpp
+++ b/ar.cpp
@@ -1646,7 +1646,7 @@ int action_replay_load (void)
                write_log (_T("action_replay_load () ROM already loaded.\n"));
                return 0;
        }
-       if (_tcslen (currprefs.cartfile) == 0)
+       if (_tcslen (currprefs.cartfile) == 0 || currprefs.cartfile[0] == ':')
                return 0;
        if (currprefs.cs_cd32fmv)
                return 0;

diff --git a/custom.cpp b/custom.cpp
index fed75653273f0c71eb219f81d1a74364385f0b5e..d2f137fcd84fe4c99ec8ae87cb24441c06dd190d 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -9342,6 +9342,8 @@ uae_u8 *restore_cycles (uae_u8 *src)
        restore_u32 ();
        start_cycles = restore_u64 ();
        extra_cycle = restore_u32 ();
+       if (extra_cycle < 0 || extra_cycle >= 2 * CYCLE_UNIT)
+               extra_cycle = 0;
        write_log (_T("RESTORECYCLES %08lX\n"), start_cycles);
        return src;
 }

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 8351a1fd1c04adcc4e5b19ff34ff07e0dd866c0f..2e19104f0bb0fb19b82b602aa47ce6323fb766df 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("21")
+#define WINUAEBETA _T("22")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2014, 10, 19)
+#define WINUAEDATE MAKEBD(2014, 10, 25)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 3d9d0926d996b1945c264a2daea101e7f54d409c..312730dadbb8197465bb618d2639123382c7b7a6 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -18,6 +18,18 @@ Things that may happen in 2015:
 
 - restore only single input target to default.
 
+Beta 22:
+
+- CDTV-CR CD unit was initialized even when CDTV-CR emulation was not enabled. Broke CD access on configurations
+  that used CD unit for other purposes.
+- Changed directory filesystem max file size limit (when not using 64-bit dos packets) to 4G-1. Old 2G-1 was
+  technically official max size but most native filesystems don't enforce it and support file sizes up to 4G-1
+  (at least as long as application uses unsigned integers)
+- Standard CD image read sector function didn't handle (rarely used) 2336 byte CD sectors correctly.
+- Some statefiles have corrupt "extra_cycle" value (probably saved by some buggy beta) that causes long delay
+  when restored, added workaround.
+- 68000 CE mode IPL line sampling timing update. Do it during any memory access, not just prefetches.
+
 Beta 21:
 
 - Moved CDTV-CR under original CDTV Quickstart option.

diff --git a/ppc/ppc.cpp b/ppc/ppc.cpp
index 60586a46dbe5a29a3b14ae60f777bfa7c9b8cfe5..8f8b76816dd564313da70d57cbc3ae095790b1bd 100644 (file)
--- a/ppc/ppc.cpp
+++ b/ppc/ppc.cpp
@@ -30,7 +30,11 @@
 #define TRACE(format, ...) write_log(_T("PPC: ") format, ## __VA_ARGS__)
 
 #ifdef WINUAE
+#ifdef WIN64
+#define QEMU_LIBRARY_PATH _T("qemu\\x64\\qemu-uae.dll")
+#else
 #define QEMU_LIBRARY_PATH _T("qemu\\qemu-uae.dll")
+#endif
 #else
 #define QEMU_LIBRARY_PATH _T("qemu-uae.dll")
 #endif

diff --git a/zfile_archive.cpp b/zfile_archive.cpp
index aa8ccb8e0cf7c41a017b913c91220bc94bfb444d..b83b25f9d6f77314495526fba14d81c4a0f8a154 100644 (file)
--- a/zfile_archive.cpp
+++ b/zfile_archive.cpp
@@ -731,6 +731,9 @@ static void archive_close_rar (void *ctx)
 
 struct zvolume *archive_directory_rar (struct zfile *z)
 {
+#ifdef WIN64
+       return archive_directory_arcacc (z, ArchiveFormatRAR);
+#else
        struct zvolume *zv;
        struct RARContext *rc;
        struct zfile *zftmp;
@@ -769,10 +772,12 @@ struct zvolume *archive_directory_rar (struct zfile *z)
        zv->archive = zftmp;
        zv->method = ArchiveFormatRAR;
        return zv;
+#endif
 }
 
 static struct zfile *archive_access_rar (struct znode *zn)
 {
+#ifndef WIN64
        struct RARContext *rc = (struct RARContext*)zn->volume->handle;
        int i;
        struct zfile *zf = NULL;
@@ -803,6 +808,9 @@ static struct zfile *archive_access_rar (struct znode *zn)
 end:
        pRARCloseArchive(rc->hArcData);
        return zf;
+#else
+       return NULL;
+#endif
 }
 #endif