From 6f1c83849629051a02e04fe113b3737aa3db4d9c Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 31 Oct 2019 18:14:04 +0100 Subject: [PATCH 1/3] The S3 cards now no longer do mixing or ROP's for PIX_TRANS reads. --- src/video/vid_s3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/video/vid_s3.c b/src/video/vid_s3.c index c0d0d0b03..7915e5544 100644 --- a/src/video/vid_s3.c +++ b/src/video/vid_s3.c @@ -8,7 +8,7 @@ * * S3 emulation. * - * Version: @(#)vid_s3.c 1.0.27 2019/10/30 + * Version: @(#)vid_s3.c 1.0.28 2019/10/31 * * Authors: Sarah Walker, * Miran Grca, @@ -2660,7 +2660,8 @@ void s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat if (s3_cpu_dest(s3)) { for (i = 0; i <= s3->bpp; i++) - s3->accel.pix_trans[read + i] = (dest_dat >> (i << 3)) & 0xff; + s3->accel.pix_trans[read + i] = (src_dat >> (i << 3)) & 0xff; + /* Yes, src_dat is correct, there is no mixing/ROP's done on PIX_TRANS reads. */ } else WRITE(s3->accel.dest + s3->accel.cx); } From 40ae8dfe0ee27125ad3bfc0002dfb984c6c9282e Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 31 Oct 2019 18:15:44 +0100 Subject: [PATCH 2/3] Closing the emulator with a window message now asks for confirmation as well. --- src/win/win_ui.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 99c579903..625769f49 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -8,15 +8,15 @@ * * user Interface module for WinAPI on Windows. * - * Version: @(#)win_ui.c 1.0.39 2019/3/20 + * Version: @(#)win_ui.c 1.0.40 2019/10/31 * * Authors: Sarah Walker, * Miran Grca, * Fred N. van Kempen, * - * Copyright 2008-2018 Sarah Walker. - * Copyright 2016-2018 Miran Grca. - * Copyright 2017,2018 Fred N. van Kempen. + * Copyright 2008-2019 Sarah Walker. + * Copyright 2016-2019 Miran Grca. + * Copyright 2017-2019 Fred N. van Kempen. * Copyright 2019 GH Cao. */ #define UNICODE @@ -697,9 +697,12 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_SHUTDOWN: - UnhookWindowsHookEx(hKeyboardHook); - KillTimer(hwnd, TIMER_1SEC); - PostQuitMessage(0); + i = ui_msgbox(MBX_QUESTION_YN, (wchar_t *)IDS_2122); + if (i == 0) { + UnhookWindowsHookEx(hKeyboardHook); + KillTimer(hwnd, TIMER_1SEC); + PostQuitMessage(0); + } break; case WM_CTRLALTDEL: From 22d0ed86fb66f74a9f3ad0e8b8ffdb3c472626ee Mon Sep 17 00:00:00 2001 From: OBattler Date: Thu, 31 Oct 2019 18:16:55 +0100 Subject: [PATCH 3/3] 86Box v2.04 Stable/Final release. --- src/86box.h | 6 +++--- src/win/86Box.rc | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/86box.h b/src/86box.h index a85123e48..c59566e45 100644 --- a/src/86box.h +++ b/src/86box.h @@ -8,7 +8,7 @@ * * Main include file for the application. * - * Version: @(#)86box.h 1.0.31 2019/10/31 + * Version: @(#)86box.h 1.0.32 2019/10/31 * * Authors: Miran Grca, *f Fred N. van Kempen, @@ -30,8 +30,8 @@ #define EMU_NAME "86Box" #define EMU_NAME_W L"86Box" #ifdef RELEASE_BUILD -#define EMU_VERSION "2.03" -#define EMU_VERSION_W L"2.03" +#define EMU_VERSION "2.04" +#define EMU_VERSION_W L"2.04" #else #define EMU_VERSION "2.10" #define EMU_VERSION_W L"2.10" diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 59c80990f..67e98acdb 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -8,7 +8,7 @@ * * Application resource script for Windows. * - * Version: @(#)86Box.rc 1.0.50 2019/10/31 + * Version: @(#)86Box.rc 1.0.51 2019/10/31 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -225,7 +225,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,129,94,71,12 ICON 100,IDC_ABOUT_ICON,7,7,20,20 #ifdef RELEASE_BUILD - LTEXT "86Box v2.03 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.", + LTEXT "86Box v2.04 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.", IDC_ABOUT_ICON,54,7,146,73 #else LTEXT "86Box v2.10 - An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, MoochMcGee, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2. See LICENSE for more information.", @@ -980,8 +980,8 @@ END VS_VERSION_INFO VERSIONINFO #ifdef RELEASE_BUILD - FILEVERSION 2,3,0,0 - PRODUCTVERSION 2,3,0,0 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,0 #else FILEVERSION 2,10,0,0 PRODUCTVERSION 2,10,0,0 @@ -1004,7 +1004,7 @@ BEGIN VALUE "CompanyName", "IRC #SoftHistory\0" VALUE "FileDescription", "86Box - an emulator for X86-based systems\0" #ifdef RELEASE_BUILD - VALUE "FileVersion", "2.03\0" + VALUE "FileVersion", "2.04\0" #else VALUE "FileVersion", "2.10\0" #endif @@ -1015,7 +1015,7 @@ BEGIN VALUE "PrivateBuild", "\0" VALUE "ProductName", "86Box Emulator\0" #ifdef RELEASE_BUILD - VALUE "ProductVersion", "2.03\0" + VALUE "ProductVersion", "2.04\0" #else VALUE "ProductVersion", "2.10\0" #endif