4010b6

diff --git a/a2065.cpp b/a2065.cpp
index 66128ed5ec28b619e7693284555b954cc444d5d1..468ffefaebac1d2c6daf8921a7041179e64e2626 100644 (file)
--- a/a2065.cpp
+++ b/a2065.cpp
@@ -1020,6 +1020,9 @@ static bool a2065_config (struct autoconfig_info *aci)
 {
        uae_u8 maco[3];
 
+       if (!aci)
+               return false;
+
        if (aci->postinit) {
                configured = expamem_board_pointer >> 16;
                return true;

diff --git a/od-win32/hardfile_win32.cpp b/od-win32/hardfile_win32.cpp
index 3ab2f9916908e5fdc84820005734ca61f62e2c99..563914feb6a13b446cf54326cc72540a2fe556dd 100644 (file)
--- a/od-win32/hardfile_win32.cpp
+++ b/od-win32/hardfile_win32.cpp
@@ -3681,9 +3681,18 @@ int harddrive_to_hdf (HWND hDlg, struct uae_prefs *p, int idx)
                        }
                }
                if (chsmode) {
-                       do_scsi_read10_chs(h, -1, cyl, head, 1, (uae_u8*)cache, secs, &specialaccessmode, false);
-                       get = 512 * secs;
-                       got = 512 * secs;
+                       int readsize = secs;
+                       int seccnt = 0;
+                       uae_u8 *p = (uae_u8*)cache;
+                       while (seccnt < secs) {
+                               if (seccnt + readsize > secs)
+                                       readsize = secs - seccnt;
+                               do_scsi_read10_chs(h, -1, cyl, head, seccnt + 1, p, readsize, &specialaccessmode, false);
+                               get = 512 * readsize;
+                               got = 512 * readsize;
+                               p += 512 * readsize;
+                               seccnt += readsize;
+                       }
                        head++;
                        if (head >= heads) {
                                head = 0;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 251b949726c56ee89b7e8d97725927a54cda25a4..88e87df2d3355cabef2a1a8bbc682e1446577495 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -17,15 +17,15 @@
 
 #define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
-#define LANG_DLL_FULL_VERSION_MATCH 1
+#define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("5")
+#define WINUAEBETA _T("6")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 7, 12)
+#define WINUAEDATE MAKEBD(2018, 7, 14)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 6d8f037afcbfbbaf380172517b683d9cfef5bbe5..93868e98ff64a418431167671d532cd0795dbf78 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,10 @@
 \r
+Beta 6:\r
+\r
+- Statefiles now include full relative and absolute path (disks, harddrives etc), now supports restoring statefile paths correctly even if relative path mode changed between save and restore. Old versions ignore new fields, old statefiles work like previously.\r
+- When tracing ('t' debugger command) STOP instruction in debugger, break first when STOP is executed (like previously), next trace waits until STOP instruction exits. Previously STOP activated debugger immediately again.\r
+- Picasso96 statefile restore didn't restore screen state fully. (4.x bug)\r
+\r
 Beta 5:\r
 \r
 - input.keyboard_type was always read as Amiga keyboard. If PC layout was set as default, keyboard layout was read incorrectly from config file.\r

diff --git a/qemuvga/ne2000.cpp b/qemuvga/ne2000.cpp
index 094a201064805ffd3cb31dc375574e0261d84384..23525a7a562e6459f496237c31d8810ee355bae7 100644 (file)
--- a/qemuvga/ne2000.cpp
+++ b/qemuvga/ne2000.cpp
@@ -1884,7 +1884,7 @@ static addrbank ariadne2_bank = {
        ariadne2_lget, ariadne2_wget, ariadne2_bget,
        ariadne2_lput, ariadne2_wput, ariadne2_bput,
        default_xlate, default_check, NULL, _T("*"), _T("NE2000"),
-       ariadne2_wget, ariadne2_lget,
+       ariadne2_lget, ariadne2_wget,
        ABFLAG_IO | ABFLAG_PPCIOSPACE, S_READ, S_WRITE
 };