diff --git a/debug.cpp b/debug.cpp index 92344c8f3..bf26080a0 100644 --- a/debug.cpp +++ b/debug.cpp @@ -6377,6 +6377,7 @@ void debug (void) return; bogusframe = 1; + disasm_init(); addhistory (); #if 0 diff --git a/od-win32/win32.h b/od-win32/win32.h index 72b03af3b..622d5b21a 100644 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,7 +15,7 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 1 +#define WINUAEPUBLICBETA 0 #define LANG_DLL 1 #define LANG_DLL_FULL_VERSION_MATCH 1 @@ -25,7 +25,7 @@ #define WINUAEBETA _T("") #endif -#define WINUAEDATE MAKEBD(2021, 11, 27) +#define WINUAEDATE MAKEBD(2021, 12, 2) //#define WINUAEEXTRA _T("AmiKit Preview") //#define WINUAEEXTRA _T("Amiga Forever Edition") diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp index c84177a54..4cd5d5fae 100644 --- a/od-win32/win32gui.cpp +++ b/od-win32/win32gui.cpp @@ -20344,15 +20344,23 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM switch (wParam) { case IDC_FILTERDEFAULT: - currprefs.gf[filter_nativertg].gfx_filter_horiz_zoom = workprefs.gf[filter_nativertg].gfx_filter_horiz_zoom = 0; - currprefs.gf[filter_nativertg].gfx_filter_vert_zoom = workprefs.gf[filter_nativertg].gfx_filter_vert_zoom = 0; - currprefs.gf[filter_nativertg].gfx_filter_horiz_offset = workprefs.gf[filter_nativertg].gfx_filter_horiz_offset = 0; - currprefs.gf[filter_nativertg].gfx_filter_vert_offset = workprefs.gf[filter_nativertg].gfx_filter_vert_offset = 0; - currprefs.gf[filter_nativertg].gfx_filter_horiz_zoom_mult = workprefs.gf[filter_nativertg].gfx_filter_horiz_zoom_mult = 1.0; - currprefs.gf[filter_nativertg].gfx_filter_vert_zoom_mult = workprefs.gf[filter_nativertg].gfx_filter_vert_zoom_mult = 1.0; - values_to_hw3ddlg (hDlg, false); + { + struct gfx_filterdata *fd = &currprefs.gf[filter_nativertg]; + struct gfx_filterdata *fdw = &workprefs.gf[filter_nativertg]; + fd->gfx_filter_horiz_zoom = fdw->gfx_filter_horiz_zoom = 0; + fd->gfx_filter_vert_zoom = fdw->gfx_filter_vert_zoom = 0; + fd->gfx_filter_horiz_offset = fdw->gfx_filter_horiz_offset = 0; + fd->gfx_filter_vert_offset = fdw->gfx_filter_vert_offset = 0; + fd->gfx_filter_horiz_zoom_mult = fdw->gfx_filter_horiz_zoom_mult = 1.0; + fd->gfx_filter_vert_zoom_mult = fdw->gfx_filter_vert_zoom_mult = 1.0; + fd->gfx_filter_left_border = fdw->gfx_filter_left_border = -1; + fd->gfx_filter_top_border = fdw->gfx_filter_top_border = -1; + fd->gfx_filter_right_border = fdw->gfx_filter_right_border = 0; + fd->gfx_filter_bottom_border = fdw->gfx_filter_bottom_border = 0; + values_to_hw3ddlg(hDlg, false); updatedisplayarea(-1); break; + } case IDC_FILTERPRESETLOAD: case IDC_FILTERPRESETSAVE: case IDC_FILTERPRESETDELETE: diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 141166178..afa4666ad 100644 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,6 +1,16 @@ +Beta 43 (RC4): + +- CDFS mounting used wrong character set translation functions, file names with character codes larger than 128 could not be opened depending on Windows regional settings. +- Vertical centering sometimes decided to use max offset, pushing the image down as much as possible. +- Filter Overscan blanking used old horizontal origin (which changed to earlier, "true" horizontal=0 position, due to chipset updates). Workaround added. +- Blacker than black in non-HDR mode was not RGB=000000 black. + +Beta 42 (RC3): + - Switching from D3D11 fullscreen mode to windowed mode using GUI caused windowed mode to keep-reinitializing continuously. (CTRL+F12 switch worked normally) +- Fixed wrong condition in check if Denise side BPLCON0 parameters needs updating, broke for example HAM enable/disable until next line (b41) - Blitter line mode with C disabled also disables C-channel pointer modulo add operations. b39 update was not complete. (Methylate / Focus Design). - Interlace mode last 2 lines (if Overscan+ or Extreme) had swapped long/short line (last line/line zero "wrap around" point), LOF toggles at this point but display device does not see it until few lines later. - Fixed buffer overflow that caused unexpected crash due to internal variables getting corrupted. It happened if mode was RTG (native chipset not active) and native mode had copper list that writes to custom registers that can affect colors or blanking, state change was unnecessarily recorded to a buffer that is not in use if RTG mode and after long time (can be 100 minutes or more), it finally overflowed. Recent blanking updates introduced this.