From 86bb59fd83b61cb2da06f45c05b576d428f98a44 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Tue, 24 May 2016 20:26:42 +0300 Subject: [PATCH] 3300b15 --- custom.cpp | 6 +----- od-win32/direct3d.cpp | 2 +- od-win32/win32.h | 4 ++-- od-win32/win32gui.cpp | 16 ++++++++++++++-- od-win32/winuaechangelog.txt | 10 ++++++++++ 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/custom.cpp b/custom.cpp index a1f7e56d..e7352665 100644 --- 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 5b6465f8..0d6d8ff6 100644 --- 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 c1f2dca5..4a2cc3fd 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("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 65fc2ad4..2124f6f0 100644 --- 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 142c1fe0..4e96f4bc 100644 --- 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 -- 2.47.3