5100b3

diff --git a/disasm.cpp b/disasm.cpp
index f466486b7911bcc58270ae8c280295a6ed5fc7aa..63d477f26728a910be6cda5aee1c14204cca02fc 100644 (file)
--- a/disasm.cpp
+++ b/disasm.cpp
@@ -1152,7 +1152,6 @@ static int asm_parse_mode(TCHAR *s, uae_u8 *reg, uae_u32 *v, int *extcnt, uae_u1
                                fullext = -1;
                        else
                                fullext = 2;
-                       fullext++;
                }
        }
        if (fullext < 0 || fullext == 1)

diff --git a/newcpu.cpp b/newcpu.cpp
index 803100c16238d8ff7f739c443d486d896734f92e..b9de88858a27f2028c9cbd21ab12e4552f81ac3a 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -6,7 +6,7 @@
 * (c) 1995 Bernd Schmidt
 */
 
-#define MMUOP_DEBUG 2
+#define MMUOP_DEBUG 0
 #define DEBUG_CD32CDTVIO 0
 #define EXCEPTION3_DEBUGGER 0
 #define CPUTRACE_DEBUG 0
@@ -6787,12 +6787,10 @@ void m68k_dumpstate(uaecptr *nextpc, uaecptr prevpc)
        if (currprefs.fpu_model) {
                uae_u32 fpsr;
                for (i = 0; i < 8; i++) {
-                       if (!(i & 1))
-                               console_out_f(_T("%d: "), i);
+                       console_out_f(_T("%d: "), i);
                        console_out_f (_T("%s "), fpp_print(&regs.fp[i], -1));
                        console_out_f (_T("%s "), fpp_print(&regs.fp[i], 0));
-                       if (i & 1)
-                               console_out_f (_T("\n"));
+                       console_out_f (_T("\n"));
                }
                fpsr = fpp_get_fpsr ();
                console_out_f (_T("FPSR: %08X FPCR: %08x FPIAR: %08x N=%d Z=%d I=%d NAN=%d\n"),

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 43daf3303dbf92180e0a23c0c21d46baeac14e65..af198b1aee82b475f56751d2b31be381b5ef4824 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -8311,6 +8311,8 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdL
        GetModuleFileName(NULL, executable_path, sizeof executable_path / sizeof(TCHAR));
 
        SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
+       BOOL b = FALSE;
+       SetUserObjectInformation(GetCurrentProcess(), UOI_TIMERPROC_EXCEPTION_SUPPRESSION, &b, sizeof(b));
        currprefs.win32_filesystem_mangle_reserved_names = true;
        SetDllDirectory (_T(""));
        /* Make sure we do an InitCommonControls() to get some advanced controls */

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 5701be65f2a6f0b6b9163d67a11f6a85d0b140cc..d243cf7608203749b4aa3f70000c59c46215f0b6 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 2")
+#define WINUAEBETA _T("Beta 3")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2023, 9, 21)
+#define WINUAEDATE MAKEBD(2023, 10, 7)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 31f36037dc531314df2cc06195a889c58a7c5f51..c98a45613b2399a20414365d4ac99cc09b82645b 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,37 @@
 
 
+- Blitter channel change when active emulation update. Fixes Jim Power cractro by Two Lives Crew. (Another TLC cracktro with similar blitter bug..)
+- AUDxPER=1 audio interrupt was unreliable. (AIBB sound effect hang)
+- 68030 MMU PLOAD disassembly fixed (FC variable was not updated)
+- Simple pad GUI control support.
+
+Pad GUI control details:
+
+Currently uses XInput (because it is so easy to use). Might use more generic gamepad reading later. Note that this is completely separate feature from GamePorts/Input panel game pad settings. This is not meant to support full, easy and complete use of GUI without touching mouse or keyboard. Option in misc panel. Can be also enabled using command line -gui_control. Command line overrides misc panel option.
+
+Gamepad config:
+
+A = select (pad mode)/left mouse click (mouse mode)
+B = right mouse click (mouse mode).
+Y = change active GUI area (pad mode)/TAB UI element change (mouse mode).
+D-pad = select UI elements, "pad mode".
+Left stick = move mouse, "mouse mode".
+
+UI element special cases:
+
+TreeViews: left/right = Tree level up or down. Up/down = move up or down in current tree level.
+Sliders: select element, press A and keep it pressed, move left or right to change slider position.
+D-pad mode currently only supports WinUAE GUI windows. (Not Windows file dialogs etc)
+
+Mouse mode is only available if any WinUAE GUI window or its child window (including Windows file dialogs) is active. Mouse movement is restricted to active window.
+
+On screen keyboard? Not sure if it is worth the trouble..
+
+GUI control code is currently ugly mix of SendInput() event injection, UI Automation and win32 UI element API calls.
+
+
+Beta 2:
+
 - If configured monitor size/coordinates changed, ignore it if it is not connected to any RTG board. Extra windows opened if non-existing monitor's window size was modified on the fly.
 - Some paths were shown strangely in floppy/quickstart floppy paths.
 - Bitplane start was horizontally shifted in some situations.
@@ -8,7 +40,6 @@
 - Last enumarated MIDI out device was missing.
 - Fixed "Remove interlace artifacts". (Missing reset of separated Denise and Agnus horizontal counters)
 
-
 Beta 1:
 
 Some more chipset updates, including usual "ross test" support fixes/updates, and some new features. I also have plans to rewrite part of chipset emulation yet again to support more extreme VHPOSW horizontal changes. Maybe during this beta series, maybe not..