From c2b1e656a638d727a541308f4d461042321defbf Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Mon, 11 Dec 2017 21:48:22 +0200 Subject: [PATCH] 3600b12 --- od-win32/win32.h | 4 ++-- od-win32/win32gui.cpp | 2 +- od-win32/win32gui_extra.cpp | 4 +--- od-win32/winuaechangelog.txt | 6 ++++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/od-win32/win32.h b/od-win32/win32.h index 4612a78a..3d732543 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(2017, 12, 10) +#define WINUAEDATE MAKEBD(2017, 12, 11) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index 5871c9c4..c1407e09 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -11508,7 +11508,7 @@ static void enable_for_cpudlg (HWND hDlg) BOOL enable = FALSE, jitenable = FALSE; BOOL cpu_based_enable = FALSE; - ew(hDlg, IDC_SPEED, !workprefs.cpu_memory_cycle_exact); + ew(hDlg, IDC_SPEED, !workprefs.cpu_cycle_exact); ew(hDlg, IDC_COMPATIBLE24, workprefs.cpu_model <= 68030); //ew(hDlg, IDC_CS_HOST, !workprefs.cpu_cycle_exact); //ew(hDlg, IDC_CS_68000, !workprefs.cpu_cycle_exact); diff --git a/od-win32/win32gui_extra.cpp b/od-win32/win32gui_extra.cpp index e79748a4..18fc42e6 100644 --- a/od-win32/win32gui_extra.cpp +++ b/od-win32/win32gui_extra.cpp @@ -962,7 +962,7 @@ bool show_box_art(const TCHAR *path) if (max_visible_boxart_images < 1 || max_visible_boxart_images > 3) max_visible_boxart_images = 2; - total_height = 2 * hgap; + total_height = 0; max_width = 0; total_images = 0; lastimage = 0; @@ -1015,8 +1015,6 @@ bool show_box_art(const TCHAR *path) return false; } - total_height += hgap * (total_images - 1); - InvalidateRect(boxarthwnd, NULL, TRUE); ShowWindow(boxarthwnd, SW_SHOWNOACTIVATE); diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 7548f73b..25280c0b 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -4,6 +4,12 @@ JIT Direct current rules are less complex now. It automatically switches off onl - RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel. Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI) +Beta 12: + +- Direct3D11 fullscreen + DXGI 1.5 works again (b11) +- D3D11 fullscreen -> GUI -> change resolution/display parameters -> exit GUI does not cause blank screen anymore. +- 68020 memory cycle exact CPU speed slider is again partially working, CPU speed can be reduced but not increased. + Beta 11: - Updated to MSVC 2017 15.5 -- 2.47.3