3300b15

diff --git a/custom.cpp b/custom.cpp
index a1f7e56d68bf42e1b190bba551c595005dffebf8..e73526652a75bf046b25f6f9892edb84dac25db0 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -6188,10 +6188,6 @@ STATIC_INLINE int copper_cant_read2 (int hpos, int alloc)
        if ((hpos == maxhpos - 3) && (maxhpos & 1) && alloc >= 0) {
                if (alloc) {
                        alloc_cycle (hpos, CYCLE_COPPER);
-#ifdef DEBUGGER
-                       if (debug_dma)
-                               record_dma_event (DMA_EVENT_COPPERWANTED, hpos, vpos);
-#endif
                }
                return -1;
        }
@@ -6202,7 +6198,7 @@ static int copper_cant_read (int hpos, int alloc)
 {
        int cant = copper_cant_read2 (hpos, alloc);
 #ifdef DEBUGGER
-       if (cant && debug_dma && alloc)
+       if (cant && debug_dma)
                record_dma_event (DMA_EVENT_COPPERWANTED, hpos, vpos);
 #endif
        return cant;

diff --git a/od-win32/direct3d.cpp b/od-win32/direct3d.cpp
index 5b6465f89c3dedbd807d41b53b6592cf6c6e7faf..0d6d8ff6bb1089aadb760ac85599fde1f2abec57 100644 (file)
--- a/od-win32/direct3d.cpp
+++ b/od-win32/direct3d.cpp
@@ -2262,7 +2262,7 @@ static int getd3dadapter (IDirect3D9 *d3d)
 static const TCHAR *D3D_init2 (HWND ahwnd, int w_w, int w_h, int depth, int *freq, int mmult)
 {
        HRESULT ret, hr;
-       static TCHAR errmsg[100] = { 0 };
+       static TCHAR errmsg[300] = { 0 };
        D3DDISPLAYMODE mode = { 0 };
        D3DCAPS9 d3dCaps;
        int adapter;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index c1f2dca5d1acbb01a2f85599426fb26a2d3e3bac..4a2cc3fdc47e18529395c00c2ca52ff5b7b1a33a 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("14")
+#define WINUAEBETA _T("15")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2016, 5, 18)
+#define WINUAEDATE MAKEBD(2016, 5, 24)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 65fc2ad4895b639c1de5c60041e951b8b374adc1..2124f6f017291cef574fcba420ceec73f0657546 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -9655,7 +9655,11 @@ static void values_to_kickstartdlg (HWND hDlg)
        CheckDlgButton(hDlg, IDC_KICKSHIFTER, workprefs.kickshifter);
        CheckDlgButton(hDlg, IDC_MAPROM, workprefs.maprom);
 
-       SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_SETCURSEL, workprefs.uaeboard, 0);
+       if (workprefs.boot_rom == 1) {
+               SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_SETCURSEL, 0, 0);
+       } else {
+               SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_SETCURSEL, workprefs.uaeboard + 1, 0);
+       }
 }
 
 static void values_from_kickstartdlg(HWND hDlg)
@@ -9664,7 +9668,14 @@ static void values_from_kickstartdlg(HWND hDlg)
        getromfile(hDlg, IDC_ROMFILE2, workprefs.romextfile, sizeof(workprefs.romextfile) / sizeof(TCHAR));
        getromfile(hDlg, IDC_CARTFILE, workprefs.cartfile, sizeof(workprefs.cartfile) / sizeof(TCHAR));
 
-       workprefs.uaeboard = SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_GETCURSEL, 0, 0);
+       int v = SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_GETCURSEL, 0, 0);
+       if (v > 0) {
+               workprefs.uaeboard = v - 1;
+               workprefs.boot_rom = 0;
+       } else {
+               workprefs.uaeboard = 0;
+               workprefs.boot_rom = 1; // disabled
+       }
 }
 
 static void init_kickstart (HWND hDlg)
@@ -9689,6 +9700,7 @@ static void init_kickstart (HWND hDlg)
        ew(hDlg, IDC_UAEBOARD_TYPE, full_property_sheet);
 
        SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_RESETCONTENT, 0, 0);
+       SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("ROM disabled"));
        SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("Original UAE (FS + F0 ROM)"));
        SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("New UAE (64k + F0 ROM)"));
        SendDlgItemMessage(hDlg, IDC_UAEBOARD_TYPE, CB_ADDSTRING, 0, (LPARAM)_T("New UAE (128k, ROM, Direct)"));

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 142c1fe071511280320ef2e2273b0797dd53ca17..4e96f4bcb7c1ab41b14a5eb8c4b24518855916b7 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,14 @@
 
+Beta 15:
+
+- Remove unmatched characters from keyboard injected paste event. (Previously was replaced with spaces).
+- Delay each paste injected key press and release a bit. Some programs don't like too fast key events.
+- Restoring statefile with blitter active and it was force-finished (=not cycle-exact mode): blitter
+  interrupt was not correctly generated when restoring state file.
+- Fixed Direct3D mode DirectX9 install warning buffer overflow.
+- Added "ROM disabled" to ROM panel Boot ROM selection. "ROM disabled" = force disable UAE boot ROM even
+  if one or more UAE expansions are configured.
+
 Beta 14:
 
 - AGA subpixel scrolling: if line's parameters didn't change compared to previous field's line, line was