From: Toni Wilen <twilen@winuae.net>
Date: Sat, 25 Oct 2014 16:38:24 +0000 (+0300)
Subject: 2900b22
X-Git-Tag: 3000~16
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=6830c4aa0d4d8d09ca1640e965b5b847dc6927f3;p=francis%2Fwinuae.git

2900b22
---

diff --git a/ar.cpp b/ar.cpp
index a2c6fa1d..73ed24ad 100644
--- 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 fed75653..d2f137fc 100644
--- 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 8351a1fd..2e19104f 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("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 3d9d0926..312730da 100644
--- 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 60586a46..8f8b7681 100644
--- 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 aa8ccb8e..b83b25f9 100644
--- 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