From 8f45e61ee49eb5d1cc7a87b1e646395ca09e8b69 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sat, 15 Jul 2023 23:53:59 +0200 Subject: [PATCH] [0.4.10][SDK] Shorten autogenerated Copyright strings (#5210) Ports back: 0.4.15-dev-5910-g 99e5f51d5b0398d2a90005dfa3f838cca644d40b in a slightly adapted form, which respects that we were still a "Team" in 0.4.7 - 0.4.14 and no "Project" yet. The idea with the "Project" was born during 0.4.15-dev'ing. That existing difference does also manifest in media/inf/*.inf and I don't intend to ever change that for the older branches. That means also that in the older branches we do not need to scroll at all to see all the text. Also adopt ReactOS birth year from 1998 to 1996 which we do also use in the msgina startup-dlgs-pics all the way from releases/0.4.7 at least to todays master head. --- sdk/include/reactos/version.rc | 4 ++-- sdk/include/reactos/wine/wine_common_ver.rc | 26 +++++---------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/sdk/include/reactos/version.rc b/sdk/include/reactos/version.rc index b069ff8ca4f..e595b3b9b13 100644 --- a/sdk/include/reactos/version.rc +++ b/sdk/include/reactos/version.rc @@ -16,10 +16,10 @@ #include "buildno.h" /* Define some defaults (shouldn't be overwritten by applications */ -#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team" +#define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Team" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "1996-" COPYRIGHT_YEAR " ReactOS Team" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System" /* Set defaults for everything, unless overridden */ diff --git a/sdk/include/reactos/wine/wine_common_ver.rc b/sdk/include/reactos/wine/wine_common_ver.rc index e24debc005a..ba26c195fc8 100644 --- a/sdk/include/reactos/wine/wine_common_ver.rc +++ b/sdk/include/reactos/wine/wine_common_ver.rc @@ -1,20 +1,7 @@ /* - * Copyright 2001 Dmitry Timoshkov - * Copyright 2004 Ivan Leo Puoti - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * COPYRIGHT: 2001 Dmitry Timoshkov + * 2004 Ivan Leo Puoti */ #include "windef.h" @@ -58,10 +45,9 @@ #endif /* WINE_OLESELFREGISTER */ /* Credit the Wine team */ -#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/Wine Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team, 1993-" COPYRIGHT_YEAR " the Wine project authors\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-" COPYRIGHT_YEAR " the Wine project authors " \ - "(see the file AUTHORS for a complete list)" +#define REACTOS_STR_COMPANY_NAME "ReactOS Team/Wine Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "1996-" COPYRIGHT_YEAR " ReactOS, 1993-" COPYRIGHT_YEAR " Wine\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "1993-" COPYRIGHT_YEAR " Wine Team" #define REACTOS_VERSION_DLL