4000b12

diff --git a/custom.cpp b/custom.cpp
index 15d4f8c7c3687f8f0fec1bf04ede2d3e98829591..f8213fe913eb028d46c4e6661480fd226459de62 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -3084,7 +3084,15 @@ static void decide_line (int hpos)
                                                nextstate = plf_passed_stop;
                                        }
                                        if (bpl_dma_off_when_active) {
-                                               nextstate = plf_passed_stop_act;
+#if 0
+                                               if ((bitplane_maybe_start_hpos < hstart && bitplane_maybe_start_hpos >= 0) && (currprefs.chipset_mask & CSMASK_AGA)) {
+                                                       nextstate = plf_passed_stop2;
+                                               } else {
+#endif
+                                                       nextstate = plf_passed_stop_act;
+#if 0
+                                               }
+#endif
                                                bpl_dma_off_when_active = 0;
                                        }
                                }
@@ -8276,6 +8284,7 @@ static void linesync_first_last_line(int *first, int *last)
        get_custom_raw_limits(&w, &h, &x, &y);
        if (y > 0)
                *first += y;
+       //write_log(_T("y=%d h=%d mfl=%d maxvpos=%d\n"), y, h, minfirstline, maxvpos_display);
 }
 
 static int vsyncnextscanline;

diff --git a/include/options.h b/include/options.h
index a28db4f362f86f40ae3ce5639ec2f2495a5d4cc7..072082e4e3cd3d3b2ee7919496a3ffb785cc73a0 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -887,6 +887,8 @@ extern int cfgfile_yesno (const TCHAR *option, const TCHAR *value, const TCHAR *
 extern int cfgfile_intval (const TCHAR *option, const TCHAR *value, const TCHAR *name, int *location, int scale);
 extern int cfgfile_strval (const TCHAR *option, const TCHAR *value, const TCHAR *name, int *location, const TCHAR *table[], int more);
 extern int cfgfile_string (const TCHAR *option, const TCHAR *value, const TCHAR *name, TCHAR *location, int maxsz);
+extern bool cfgfile_option_find(const TCHAR *s, const TCHAR *option);
+extern TCHAR *cfgfile_option_get(const TCHAR *s, const TCHAR *option);
 extern TCHAR *cfgfile_subst_path (const TCHAR *path, const TCHAR *subst, const TCHAR *file);
 
 extern TCHAR *target_expand_environment (const TCHAR *path, TCHAR *out, int maxlen);

diff --git a/main.cpp b/main.cpp
index 567b0479f5a77c8c2fbe9594ea3030bff8d6059c..fe59461f2d31a46d3a6d9a921cd444f9b56bb158 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -179,8 +179,13 @@ void fixup_prefs_dimensions (struct uae_prefs *prefs)
                ap->gfx_strobo = false;
                if (ap->gfx_vsync) {
                        if (ap->gfx_vsyncmode) {
-                               ap->gfx_backbuffers = 1;
-                               ap->gfx_strobo = false;
+                               if (ap->gfx_fullscreen != 0) {
+                                       ap->gfx_backbuffers = 1;
+                                       ap->gfx_strobo = false;
+                               } else {
+                                       ap->gfx_vsyncmode = 0;
+                                       ap->gfx_vsync = 0;
+                               }
                        } else {
                                // legacy vsync: always wait for flip
                                ap->gfx_vflip = -1;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index ff488a8c516f3e3bc5ffc7e90c874d90befa0674..e1bd7eee3f507c864e1b083d584f1b0e41a78255 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(2018, 5, 21)
+#define WINUAEDATE MAKEBD(2018, 6, 3)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 69d836e2805a633131668f8c68dd487284c925a7..abdb688a02eb482fbffae153741a5e26d292afd7 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -2240,6 +2240,8 @@ static void m(int monid)
 static void flipgui(int opengui)
 {
        D3D_guimode(0, opengui);
+       if (full_property_sheet)
+               return;
        if (opengui) {
                DirectDraw_FlipToGDISurface();
        } else {
@@ -6860,9 +6862,11 @@ static void enable_for_displaydlg (HWND hDlg)
        ew (hDlg, IDC_LM_IDOUBLED3, !workprefs.gfx_autoresolution && isdouble);
 
        if (workprefs.gfx_apmode[0].gfx_vsyncmode == 1 || workprefs.gfx_apmode[0].gfx_vsyncmode == 2) {
+               hide(hDlg, IDC_SCREENMODE_NATIVE3, FALSE);
                ew(hDlg, IDC_SCREENMODE_NATIVE3, TRUE);
        } else {
                ew(hDlg, IDC_SCREENMODE_NATIVE3, FALSE);
+               hide(hDlg, IDC_SCREENMODE_NATIVE3, TRUE);
        }
 
 }
@@ -7254,6 +7258,8 @@ static void display_fromselect (int val, int *fs, int *vsync, int p96)
 }
 #endif
 
+#define MAX_GUI_DISPLAY_SECTIONS 30
+
 static void values_to_displaydlg (HWND hDlg)
 {
        TCHAR buffer[MAX_DPATH];
@@ -7327,22 +7333,23 @@ static void values_to_displaydlg (HWND hDlg)
        WIN32GUI_LoadUIString(IDS_SCREEN_VSYNC_AUTOSWITCH, buffer, sizeof buffer / sizeof(TCHAR));
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE2, CB_ADDSTRING, 0, (LPARAM)buffer);
 
-       for (int i = 1; i < 30; i++) {
+       for (int i = 1; i < MAX_GUI_DISPLAY_SECTIONS; i++) {
                _stprintf(buffer, _T("%d"), i);
                SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE3, CB_ADDSTRING, 0, (LPARAM)buffer);
        }
 
-       SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE, CB_SETCURSEL,
-               workprefs.gfx_apmode[0].gfx_fullscreen, 0);
+       SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE, CB_SETCURSEL, workprefs.gfx_apmode[0].gfx_fullscreen, 0);
        v = workprefs.gfx_apmode[0].gfx_vsync;
        if (v < 0)
                v = 5;
        else if (v > 0) {
                v = v + (workprefs.gfx_apmode[0].gfx_vsyncmode || !v ? 0 : 2);
        }
+
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE2, CB_SETCURSEL, v, 0);
 
-       SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE3, CB_SETCURSEL, workprefs.gfx_display_sections - 1, 0);
+       if (workprefs.gfx_display_sections - 1 < MAX_GUI_DISPLAY_SECTIONS)
+               SendDlgItemMessage(hDlg, IDC_SCREENMODE_NATIVE3, CB_SETCURSEL, workprefs.gfx_display_sections - 1, 0);
 
 
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_RTG, CB_RESETCONTENT, 0, 0);
@@ -7845,7 +7852,7 @@ static INT_PTR CALLBACK DisplayDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPAR
                handle_da (hDlg);
                values_from_displaydlg (hDlg, msg, wParam, lParam);
                enable_for_displaydlg (hDlg);
-               if (LOWORD (wParam) == IDC_RATE2ENABLE) {
+               if (LOWORD (wParam) == IDC_RATE2ENABLE || LOWORD(wParam) == IDC_SCREENMODE_NATIVE3 || LOWORD(wParam) == IDC_SCREENMODE_NATIVE2 || LOWORD(wParam) == IDC_SCREENMODE_NATIVE) {
                        values_to_displaydlg (hDlg);
                }
                recursive--;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index ac15c078a2a562ab20a3c741397e09d4d83f18d5..d3a31c446890923ecdbde0d61989d5611e47e099 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,16 @@
 \r
 \r
+Beta 12:\r
+\r
+- Don't allow lagless vsync in normal windowed mode.\r
+- Hide lagless vsync slice count in GUI if lagless vsync is not selected.\r
+- Fixed crash if screen mode open failed and error dialog was shown. (b11)\r
+- D3D11 fullscreen mode opened in primary monitor if selected non-default monitor was connected to another GPU.\r
+- New debugger didn't load 3.1 (and probably older) amiga.lib files.\r
+- Added debugger_options config entry, currently only supported sub entry is pathprefix=x where x is string that gets appended to stabs source file paths.\r
+- Try harder to find working path for stabs source files and when working path combination is found, remember it instead of enumerating all possible variants every time source file is loaded.\r
+- uaedbg now breaks to debugger when debugged application causes unhandled exception via tc_TrapCode.\r
+\r
 Beta 11:\r
 \r
 - D3D11 fullscreen mode after alt-tab/gui was not restored properly if emulation was in paused state.\r