3600b12

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 4612a78a224009d7f456f8d0ded1dcb3dc7922e2..3d732543bd04889f1f403d72664c6b730072a0a8 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("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 5871c9c42ee2fe6f0f11e9ccbdd617bbf529c793..c1407e09e95ce661cb05797a63d3a6039a592ce1 100644 (file)
--- 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 e79748a46b0deea05bf608d26fa9b94c15a833b7..18fc42e616877b6d43c1d3bf7fb386c9088963f6 100644 (file)
--- 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 7548f73b0195cdd24922b5c5724bd7715194ca97..25280c0b646a7493955e81fd138d4ab6c6199c87 100644 (file)
--- 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.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+Beta 12:\r
+\r
+- Direct3D11 fullscreen + DXGI 1.5 works again (b11)\r
+- D3D11 fullscreen -> GUI -> change resolution/display parameters -> exit GUI does not cause blank screen anymore.\r
+- 68020 memory cycle exact CPU speed slider is again partially working, CPU speed can be reduced but not increased.\r
+\r
 Beta 11:\r
 \r
 - Updated to MSVC 2017 15.5\r