From 6596c26eece8c316fb3e751da73b7f3c6dd7401d Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 03:20:35 +0500 Subject: [PATCH 1/5] Update the default copyright year --- CMakeLists.txt | 2 +- src/include_make/86box/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9170741cb..ac9292376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,7 +182,7 @@ if(NOT EMU_BUILD_NUM) set(EMU_BUILD_NUM 0) endif() if(NOT EMU_COPYRIGHT_YEAR) - set(EMU_COPYRIGHT_YEAR 2021) + set(EMU_COPYRIGHT_YEAR 2022) endif() add_subdirectory(src) diff --git a/src/include_make/86box/version.h b/src/include_make/86box/version.h index 9228c68e3..efafaa6a3 100644 --- a/src/include_make/86box/version.h +++ b/src/include_make/86box/version.h @@ -32,7 +32,7 @@ #define EMU_VERSION_FULL EMU_VERSION #define EMU_VERSION_FULL_W EMU_VERSION_W -#define COPYRIGHT_YEAR "2021" +#define COPYRIGHT_YEAR "2022" /* Web URL info. */ #define EMU_SITE L"86box.net" From 8cf53950aa7eb3df6f001b3a3b51c37fbceb25c1 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 03:21:58 +0500 Subject: [PATCH 2/5] Fix character encoding errors in comments --- src/printer/prt_cpmap.c | 4 ++-- src/printer/prt_escp.c | 4 ++-- src/qt/qt_sdl.c | 4 ++-- src/win/win_sdl.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/printer/prt_cpmap.c b/src/printer/prt_cpmap.c index 62c00d544..f5da0e91d 100644 --- a/src/printer/prt_cpmap.c +++ b/src/printer/prt_cpmap.c @@ -10,12 +10,12 @@ * * * - * Authors: Michael Dr�ing, + * Authors: Michael Drüing, * Fred N. van Kempen, * * Based on code by Frederic Weymann (originally for DosBox.) * - * Copyright 2018 Michael Dr�ing. + * Copyright 2018 Michael Drüing. * Copyright 2018 Fred N. van Kempen. * * Redistribution and use in source and binary forms, with diff --git a/src/printer/prt_escp.c b/src/printer/prt_escp.c index 8e490e9e1..22bd86e06 100644 --- a/src/printer/prt_escp.c +++ b/src/printer/prt_escp.c @@ -10,12 +10,12 @@ * * * - * Authors: Michael Dr�ing, + * Authors: Michael Drüing, * Fred N. van Kempen, * * Based on code by Frederic Weymann (originally for DosBox.) * - * Copyright 2018,2019 Michael Dr�ing. + * Copyright 2018,2019 Michael Drüing. * Copyright 2019,2019 Fred N. van Kempen. * * Redistribution and use in source and binary forms, with diff --git a/src/qt/qt_sdl.c b/src/qt/qt_sdl.c index 81a1311d1..08f240862 100644 --- a/src/qt/qt_sdl.c +++ b/src/qt/qt_sdl.c @@ -15,10 +15,10 @@ * * * Authors: Fred N. van Kempen, - * Michael Dr�ing, + * Michael Drüing, * * Copyright 2018-2020 Fred N. van Kempen. - * Copyright 2018-2020 Michael Dr�ing. + * Copyright 2018-2020 Michael Drüing. * * Redistribution and use in source and binary forms, with * or without modification, are permitted provided that the diff --git a/src/win/win_sdl.c b/src/win/win_sdl.c index cf5afb809..cd4b26169 100644 --- a/src/win/win_sdl.c +++ b/src/win/win_sdl.c @@ -15,10 +15,10 @@ * * * Authors: Fred N. van Kempen, - * Michael Dr�ing, + * Michael Drüing, * * Copyright 2018-2020 Fred N. van Kempen. - * Copyright 2018-2020 Michael Dr�ing. + * Copyright 2018-2020 Michael Drüing. * * Redistribution and use in source and binary forms, with * or without modification, are permitted provided that the From e8456cc5ca0fd8db8c61391d7633426771b4a815 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 03:29:46 +0500 Subject: [PATCH 3/5] Change the internal name for the PIIX3 variation for boards with I/O APIC --- src/chipset/intel_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c index dade95cba..97280b06c 100644 --- a/src/chipset/intel_piix.c +++ b/src/chipset/intel_piix.c @@ -1648,7 +1648,7 @@ const device_t piix3_device = const device_t piix3_ioapic_device = { "Intel 82371SB (PIIX3) (Boards with I/O APIC)", - "piix3", + "piix3_ioapic", DEVICE_PCI, 0x70001403, piix_init, From fd58bb53ffd15eecf9cf2a8794af71c15803adb6 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 27 Jan 2022 20:39:16 +0500 Subject: [PATCH 4/5] isamem: fix a compile warning and add proper dev-branch #ifdefs --- src/device/isamem.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/device/isamem.c b/src/device/isamem.c index 7ef72215f..a987cba77 100644 --- a/src/device/isamem.c +++ b/src/device/isamem.c @@ -68,11 +68,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include #include #include +#define HAVE_STDARG_H #include <86box/86box.h> #include <86box/machine.h> #include <86box/io.h> @@ -994,7 +996,7 @@ static const device_t ev159_device = { }; -#ifdef USE_ISAMEM_BRAT +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT) static const device_config_t brat_config[] = { { @@ -1066,7 +1068,7 @@ static const device_config_t brat_config[] = "size", "Memory Size", CONFIG_SPINNER, "", 128, "", { 0, 8192, 512 }, - { 0 } + { { 0 } } }, { "", "", -1 @@ -1085,7 +1087,7 @@ static const device_t brat_device = { #endif -#ifdef USE_ISAMEM_RAMPAGE +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE) static const device_config_t rampage_config[] = { { @@ -1169,7 +1171,7 @@ static const device_config_t rampage_config[] = "size", "Memory Size", CONFIG_SPINNER, "", 128, "", { 0, 8192, 128 }, - { 0 } + { { 0 } } }, { "", "", -1 @@ -1188,7 +1190,7 @@ static const device_t rampage_device = { #endif -#ifdef USE_ISAMEM_IAB +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB) static const device_config_t iab_config[] = { { @@ -1272,7 +1274,7 @@ static const device_config_t iab_config[] = "size", "Memory Size", CONFIG_SPINNER, "", 128, "", { 0, 8192, 128 }, - { 0 } + { { 0 } } }, { "", "", -1 @@ -1313,13 +1315,13 @@ static const struct { { &a6pak_device }, { &ems5150_device }, { &ev159_device }, -#ifdef USE_ISAMEM_BRAT +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_BRAT) { &brat_device }, #endif -#ifdef USE_ISAMEM_RAMPAGE +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_RAMPAGE) { &rampage_device }, #endif -#ifdef USE_ISAMEM_IAB +#if defined(DEV_BRANCH) && defined(USE_ISAMEM_IAB) { &iab_device }, #endif { NULL } From a0a0bfbc7962e2c7174326471a1e4e4da369ba43 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Sun, 13 Feb 2022 07:02:35 +0500 Subject: [PATCH 5/5] Port translation changes from #2070 to the Qt UI --- src/qt/languages/pl-PL.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 1b9e05e81..5d51a6dc7 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1007,7 +1007,7 @@ msgid "Disk image too large" msgstr "Obraz dysku jest za duży" msgid "Remember to partition and format the newly-created drive." -msgstr "Nie zapomnij o partycjonowaniu u sformatowaniu nowo utworzego dysku" +msgstr "Nie zapomnij o partycjonowaniu i sformatowaniu nowo utworzego dysku" msgid "The selected file will be overwritten. Are you sure you want to use it?" msgstr "Wybrany plik zostanie nadpisany. Czy na pewno chcesz użyć tego pliku?" @@ -1052,7 +1052,7 @@ msgid "Select the parent VHD" msgstr "Wybierz nadrzędny plik VHD" msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?" -msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?" +msgstr "Może to oznaczać, że obraz nadrzędny został zmodyfikowany po utworzeniu obrazu różnicującego.\n\nMoże się to również zdarzyć, jeśli pliki obrazów zostały przeniesione lub skopiowane, lub wystąpił błąd w programie, który utworzył ten dysk\n\nCzy chcesz naprawić sygnatury czasowe?" msgid "Parent and child disk timestamps do not match" msgstr "Sygnatury czasowe dysku nadrzędnego i podrzędnego nie zgadzają się"