From d90793c88a927dab709ee637beafd164d91d12f0 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 2 Dec 2018 18:37:06 +0200 Subject: [PATCH] 4100b12 --- cfgfile.cpp | 2 +- disk.cpp | 2 +- od-win32/rp.cpp | 3 +++ od-win32/win32.h | 4 ++-- od-win32/win32gui.cpp | 2 ++ od-win32/winuaechangelog.txt | 20 +++++++++++++++++++- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/cfgfile.cpp b/cfgfile.cpp index 3a340990..4e0f7ad8 100644 --- a/cfgfile.cpp +++ b/cfgfile.cpp @@ -3405,7 +3405,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value) } if (_tcscmp (option, _T("gfx_linemode")) == 0) { - int v; + int v = 0; p->gfx_vresolution = VRES_DOUBLE; p->gfx_pscanlines = 0; p->gfx_iscanlines = 0; diff --git a/disk.cpp b/disk.cpp index 888ea3db..b1ae8a4c 100644 --- a/disk.cpp +++ b/disk.cpp @@ -4551,7 +4551,7 @@ uae_u8 *restore_disk (int num,uae_u8 *src) if (s && s[0]) write_log(_T("-> '%s'\n"), s); _tcscpy(old, currprefs.floppyslots[num].df); - _tcsncpy(changed_prefs.floppyslots[num].df, s, 255); + _tcsncpy(changed_prefs.floppyslots[num].df, s, MAX_DPATH); xfree(s); newis = changed_prefs.floppyslots[num].df[0] ? 1 : 0; diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp index 4e3187a7..7197500c 100644 --- a/od-win32/rp.cpp +++ b/od-win32/rp.cpp @@ -951,6 +951,9 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p) vres = max_vert_dbl; } } + if (hres == RES_LORES && vres > VRES_NONDOUBLE) + vres = VRES_NONDOUBLE; + p->gfx_resolution = hres; p->gfx_vresolution = vres; diff --git a/od-win32/win32.h b/od-win32/win32.h index b4726cd3..77099902 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("11") +#define WINUAEBETA _T("12") #else #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2018, 11, 24) +#define WINUAEDATE MAKEBD(2018, 12, 2) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 2e172fa6..2e119b66 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -16035,6 +16035,8 @@ static void updatejoyport (HWND hDlg, int changedport) SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_SETCURSEL, workprefs.input_magic_mouse_cursor, 0); CheckDlgButton (hDlg, IDC_PORT_TABLET, workprefs.input_tablet > 0); SendDlgItemMessage(hDlg, IDC_PORT_TABLET_MODE, CB_SETCURSEL, workprefs.input_tablet == TABLET_REAL ? 1 : 0, 0); + if (!is_tablet()) + workprefs.tablet_library = false; CheckDlgButton (hDlg, IDC_PORT_TABLET_LIBRARY, workprefs.tablet_library); CheckDlgButton (hDlg, IDC_PORT_AUTOSWITCH, workprefs.input_autoswitch); diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 7ede90a9..e3db0bb6 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,10 +1,28 @@ +Beta 12: + +- If tablet.library was ticked and config was loaded to system without tablet, it was not possible to untick it. +- If original path stored in statefile is not valid anymore, fix attempts (testing if it exists in current dir etc..) may have returned non-existing path in certain situations even if valid path was available. +- More 68030 MMU bus error retry fixes. (Remaining Previous NextOS crashes fixed) +- MMU's internal table read/write accesses should be always done in supervisor mode. (Not much effect on Amiga but other platforms usually have memory regions that are supervisor only) +- Magic mouse Windows cursor to Amiga mouse sync fixed. (Broken long time ago, still not fully working in every filter combination) +- When config file rom path pointed to non-existing file, autodetect of rom path is attempted. If last autodetect phase detected it, rom path was not updated. + +Beta 11: + +- Debugger assembler didn't assemble Scc and TRAPcc. CLR didn't show memory contents if EA was not register. +- Debugger disassembler does not create useless output anymore when disassembling 68020+ addressing modes. If CPU is <68020 but full extension bit is set: disassemble as 68000 but append "(68020+)" to output. +- SPTI mode CD read buffer overflow fix. (Probably only when playing CD audio) +- 68030 MMU + more compatible bus error handling was very broken. (MMU updates in previous betas broke it) +- 68030 MMU bus error exception/unaligned access emulation partial rewrite. Odd long access uses byte+word+byte access sequence (not 4xbyte). MOVEM and normal data accesses use same data buffer variable now, confusing special cases removed. Unaligned accesses that cross MMU page boundary retries are now compatible with new retry logic (b8). +- 68030 MMU + prefetch mode fix when prefetch crossed MMU pages and neither page was mapped as valid. (Amix illegal instruction error in early boot) +- 68030 MMU + prefetch + data cache mode fixed. (also broke in b8) Beta 10: - Fixed invisible sprites after statefile load (at least when not in AGA mode). (b8). - Reading CIA interrupt register exactly when CIA interrupt is going to activate may have caused stuck PORTS interrupt until CIAxICR was read again, which would also return unexpectedly no interrupts active in this situation. -- 68020+ more compatible state files didn't restore CPU mid-instruction properly, caused restore Amiga side crash if state was created during mid-instruction that has side-effects (like -(an) or (an)+ addressing mode) (introduced in 4.0 betas) +- 68020+ more compatible state files didn't restore CPU mid-instruction properly, caused restored Amiga side crash if state was created during mid-instruction that has side-effects (like -(an) or (an)+ addressing mode) (introduced in 4.0 betas) - 64-bit version didn't support rar unpacking without archiveaccess.dll, probably because 64-bit unrar.dll didn't exist when it was implemented. - Window corners are now drag'n'drop hot spots for different floppy drives. (top/left=0, top/right=1, bottom/left=2, bottom/right=3). - 68030 MMU MOVEM , access fault retry was unreliable in some situations. -- 2.47.3