From 2d0464ddb26a8e976240612ceb26a37cfeda0c56 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Thu, 17 Jan 2008 14:50:36 +0000 Subject: [PATCH] - Define the copyright year one time and then use this constant everywhere instead of redefining it at X places - Get rid of the "include/reactos/resource.h" header file. It contained outdated strings and had no effect on the resource files anymore. The "version.rc" file has the same purpose and does a better job. svn path=/trunk/; revision=31840 --- reactos/base/applications/control/control.rc | 5 --- reactos/base/applications/regedit/clb/clb.rc | 1 - reactos/base/shell/cmd/cmd.c | 2 +- reactos/base/shell/cmd/precomp.h | 3 +- reactos/base/shell/cmd/ver.c | 2 +- reactos/dll/win32/aclui/aclui.rc | 1 - reactos/dll/win32/authz/authz.rc | 2 - reactos/dll/win32/modemui/modemui.rc | 1 - reactos/dll/win32/netid/netid.rc | 1 - reactos/dll/win32/ntmarta/ntmarta.rc | 2 - reactos/dll/win32/rasdlg/rasdlg.rc | 1 - reactos/dll/win32/rasman/rasman.rc | 1 - reactos/dll/win32/tapiui/tapiui.rc | 1 - reactos/dll/win32/user32/user32.rc | 5 +-- reactos/drivers/base/bootvid/bootvid.rc | 2 - reactos/include/reactos/resource.h | 40 ------------------- reactos/include/reactos/version.h | 10 +++-- reactos/include/reactos/version.rc | 2 +- .../include/reactos/wine/wine_common_ver.rc | 4 +- rosapps/templates/dialog/dialog.rc | 1 - rostests/tests/dirdlg/dirdlg.rc | 1 - rostests/tests/icontest/icontest.rc | 1 - rostests/tests/mdi/mdi.rc | 3 -- rostests/tests/miditest/miditest.rc | 3 -- rostests/tests/popupmenu/popupmenu.rc | 1 - rostests/win32/smss/movefile/movefile.rc | 1 - 26 files changed, 15 insertions(+), 82 deletions(-) delete mode 100644 reactos/include/reactos/resource.h diff --git a/reactos/base/applications/control/control.rc b/reactos/base/applications/control/control.rc index 84039e7e76b..86cec711f88 100644 --- a/reactos/base/applications/control/control.rc +++ b/reactos/base/applications/control/control.rc @@ -1,17 +1,12 @@ //Microsoft Developer Studio generated resource script. // #include "resource.h" -#include #include #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "control\0" #define REACTOS_STR_ORIGINAL_FILENAME "control.exe\0" -#ifndef MS_COMPILER #include -#else -#include <../../../include/reactos/version.rc> -#endif ///////////////////////////////////////////////////////////////////////////// diff --git a/reactos/base/applications/regedit/clb/clb.rc b/reactos/base/applications/regedit/clb/clb.rc index 0841a7ff3bf..5efa8847bc8 100644 --- a/reactos/base/applications/regedit/clb/clb.rc +++ b/reactos/base/applications/regedit/clb/clb.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c index f2b9243f775..1e4fde32637 100644 --- a/reactos/base/shell/cmd/cmd.c +++ b/reactos/base/shell/cmd/cmd.c @@ -1794,7 +1794,7 @@ Initialize (int argc, const TCHAR* argv[]) _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); - ConOutPuts (_T("(C) Copyright 1998-2008 ReactOS Team.\n")); + ConOutPuts (_T("(C) Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team.\n")); } ExecuteAutoRunFile (); diff --git a/reactos/base/shell/cmd/precomp.h b/reactos/base/shell/cmd/precomp.h index b986fb63084..6ac6c6dcb81 100644 --- a/reactos/base/shell/cmd/precomp.h +++ b/reactos/base/shell/cmd/precomp.h @@ -33,6 +33,7 @@ #include "config.h" #include "batch.h" -#include +#include +#include #endif /* __CMD_PRECOMP_H */ diff --git a/reactos/base/shell/cmd/ver.c b/reactos/base/shell/cmd/ver.c index 4393e2d560c..b1291841fc4 100644 --- a/reactos/base/shell/cmd/ver.c +++ b/reactos/base/shell/cmd/ver.c @@ -73,7 +73,7 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param) ShortVersion(); ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T(RES_STR_LEGAL_COPYRIGHT)); + ConOutPuts (_T("Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team")); /* Basic copyright notice */ if (param[0] == _T('\0')) diff --git a/reactos/dll/win32/aclui/aclui.rc b/reactos/dll/win32/aclui/aclui.rc index 31748fac083..6bfcfb46a98 100644 --- a/reactos/dll/win32/aclui/aclui.rc +++ b/reactos/dll/win32/aclui/aclui.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/authz/authz.rc b/reactos/dll/win32/authz/authz.rc index d6acdf215e3..58c67c7cde1 100644 --- a/reactos/dll/win32/authz/authz.rc +++ b/reactos/dll/win32/authz/authz.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL @@ -7,4 +6,3 @@ #define REACTOS_STR_INTERNAL_NAME "authz\0" #define REACTOS_STR_ORIGINAL_FILENAME "authz.dll\0" #include - diff --git a/reactos/dll/win32/modemui/modemui.rc b/reactos/dll/win32/modemui/modemui.rc index bbc36e16d4d..1d1d1fcc608 100644 --- a/reactos/dll/win32/modemui/modemui.rc +++ b/reactos/dll/win32/modemui/modemui.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/netid/netid.rc b/reactos/dll/win32/netid/netid.rc index 8761a456931..c9a8ff21c0e 100644 --- a/reactos/dll/win32/netid/netid.rc +++ b/reactos/dll/win32/netid/netid.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/ntmarta/ntmarta.rc b/reactos/dll/win32/ntmarta/ntmarta.rc index b2ad43ba55b..5ecb019f3c1 100644 --- a/reactos/dll/win32/ntmarta/ntmarta.rc +++ b/reactos/dll/win32/ntmarta/ntmarta.rc @@ -1,9 +1,7 @@ #include -#include #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS MARTA Provider\0" #define REACTOS_STR_INTERNAL_NAME "ntmarta\0" #define REACTOS_STR_ORIGINAL_FILENAME "ntmarta.dll\0" #include - diff --git a/reactos/dll/win32/rasdlg/rasdlg.rc b/reactos/dll/win32/rasdlg/rasdlg.rc index 5092fe5ab0f..6b0f36df1e7 100644 --- a/reactos/dll/win32/rasdlg/rasdlg.rc +++ b/reactos/dll/win32/rasdlg/rasdlg.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/rasman/rasman.rc b/reactos/dll/win32/rasman/rasman.rc index a9f762f9f92..701bb08995b 100644 --- a/reactos/dll/win32/rasman/rasman.rc +++ b/reactos/dll/win32/rasman/rasman.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/tapiui/tapiui.rc b/reactos/dll/win32/tapiui/tapiui.rc index 3bda0f83b28..ecd80915dbf 100644 --- a/reactos/dll/win32/tapiui/tapiui.rc +++ b/reactos/dll/win32/tapiui/tapiui.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" #define REACTOS_VERSION_DLL diff --git a/reactos/dll/win32/user32/user32.rc b/reactos/dll/win32/user32/user32.rc index 487d6542d76..ad49ec62fdb 100644 --- a/reactos/dll/win32/user32/user32.rc +++ b/reactos/dll/win32/user32/user32.rc @@ -1,8 +1,7 @@ /* $Id$ */ #include - -#include +#include "resource.h" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Client Dll\0" @@ -12,7 +11,7 @@ #define IDS_MDI_MOREWINDOWS 13 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL ///////////////////////////////////////////////////////////////////////////// // diff --git a/reactos/drivers/base/bootvid/bootvid.rc b/reactos/drivers/base/bootvid/bootvid.rc index e6a6ac115d0..e491cb0d9a4 100644 --- a/reactos/drivers/base/bootvid/bootvid.rc +++ b/reactos/drivers/base/bootvid/bootvid.rc @@ -1,7 +1,5 @@ /* $Id$ */ -#include "resource.h" - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VGA Boot Driver\0" #define REACTOS_STR_INTERNAL_NAME "bootvid.dll\0" diff --git a/reactos/include/reactos/resource.h b/reactos/include/reactos/resource.h deleted file mode 100644 index 059248d56b7..00000000000 --- a/reactos/include/reactos/resource.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef _INC_REACTOS_RESOURCE_H -#define _INC_REACTOS_RESOURCE_H -#include "version.h" -#include "buildno.h" - -/* Global File Version UINTs */ - -#define RES_UINT_FV_DLL_MAJOR 42 -#define RES_UINT_FV_EXE_MAJOR KERNEL_VERSION_MAJOR -#define RES_UINT_FV_MINOR KERNEL_VERSION_MINOR -#define RES_UINT_FV_REVISION KERNEL_VERSION_PATCH_LEVEL -/* Can't use KERNEL_VERSION_BUILD, would overflow */ -#define RES_UINT_FV_BUILD 0 - -/* ReactOS Product Version UINTs */ - -#define RES_UINT_PV_MAJOR KERNEL_VERSION_MAJOR -#define RES_UINT_PV_MINOR KERNEL_VERSION_MINOR -#define RES_UINT_PV_REVISION KERNEL_VERSION_PATCH_LEVEL -#define RES_UINT_PV_BUILD 0 - -/* Common version strings for rc scripts */ - -#define RES_STR_COMPANY_NAME "ReactOS Development Team\0" -#define RES_STR_LEGAL_COPYRIGHT "Copyright (c) 1998-2006 ReactOS Team\0" -#define RES_STR_PRODUCT_NAME "ReactOS Operating System\0" -#define RES_STR_PRODUCT_VERSION KERNEL_VERSION_RC -#define RES_STR_BUILD_DATE KERNEL_VERSION_BUILD_RC - -/* FILE_VERSION defaults to PRODUCT_VERSION */ -#define RES_STR_FILE_VERSION KERNEL_RELEASE_RC - -/* ReactOS default Application Registry Root Path */ -#define RES_STR_ROSAPP_REGISTRY_ROOT "Software\\ReactWare" - -/* Bitmaps */ -#define IDB_BOOTIMAGE 100 - -#endif /* ndef _INC_REACTOS_RESOURCE_H */ - diff --git a/reactos/include/reactos/version.h b/reactos/include/reactos/version.h index 3a92c1a2026..69e1b7c09b7 100644 --- a/reactos/include/reactos/version.h +++ b/reactos/include/reactos/version.h @@ -17,12 +17,14 @@ #ifndef __VERSION_H #define __VERSION_H -#define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MAJOR 0 +#define KERNEL_VERSION_MINOR 4 +#define KERNEL_VERSION_PATCH_LEVEL 0 + +#define COPYRIGHT_YEAR "2008" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"SVN" #endif diff --git a/reactos/include/reactos/version.rc b/reactos/include/reactos/version.rc index c8c8e3b1f42..9dca3cf6252 100644 --- a/reactos/include/reactos/version.rc +++ b/reactos/include/reactos/version.rc @@ -20,7 +20,7 @@ #define REACTOS_DEFAULT_STR_COMPANY_NAME "ReactOS Development Team\0" #define REACTOS_DEFAULT_STR_DESCRIPTION "ReactOS Core Component\0" #define REACTOS_DEFAULT_STR_INTERNAL_NAME "\0" -#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-2008 ReactOS Team\0" +#define REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT "Copyright 1998-" COPYRIGHT_YEAR " ReactOS Team\0" #define REACTOS_DEFAULT_STR_PRODUCT_NAME "ReactOS Operating System\0" /* Set defaults for everything, unless overridden */ diff --git a/reactos/include/reactos/wine/wine_common_ver.rc b/reactos/include/reactos/wine/wine_common_ver.rc index ff489bfed95..77eb2dada03 100644 --- a/reactos/include/reactos/wine/wine_common_ver.rc +++ b/reactos/include/reactos/wine/wine_common_ver.rc @@ -54,8 +54,8 @@ /* Credit the Wine team */ #define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/Wine Team\0" -#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2004 ReactOS Team, 1993-2004 the Wine project authors\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright (c) 1993-2001 the Wine project authors " \ +#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_VERSION_DLL diff --git a/rosapps/templates/dialog/dialog.rc b/rosapps/templates/dialog/dialog.rc index 0d3cdd4e6df..04aeb298e47 100644 --- a/rosapps/templates/dialog/dialog.rc +++ b/rosapps/templates/dialog/dialog.rc @@ -8,7 +8,6 @@ // Generated from the TEXTINCLUDE 2 resource. // #include -#include #include "resource.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/rostests/tests/dirdlg/dirdlg.rc b/rostests/tests/dirdlg/dirdlg.rc index c0833299d0f..bd48b635794 100644 --- a/rostests/tests/dirdlg/dirdlg.rc +++ b/rostests/tests/dirdlg/dirdlg.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" IDD_MAIN DIALOG DISCARDABLE 20, 20, 220, 140 diff --git a/rostests/tests/icontest/icontest.rc b/rostests/tests/icontest/icontest.rc index 95b080f4c9a..68c787a9de3 100644 --- a/rostests/tests/icontest/icontest.rc +++ b/rostests/tests/icontest/icontest.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" IDI_ICON ICON DISCARDABLE "icon.ico" diff --git a/rostests/tests/mdi/mdi.rc b/rostests/tests/mdi/mdi.rc index e409b76df06..fa5b4a5416b 100644 --- a/rostests/tests/mdi/mdi.rc +++ b/rostests/tests/mdi/mdi.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" IDR_MAINMENU MENU DISCARDABLE @@ -26,5 +25,3 @@ BEGIN MENUITEM "&Cascade", ID_WINDOW_CASCADE END END - - diff --git a/rostests/tests/miditest/miditest.rc b/rostests/tests/miditest/miditest.rc index 2070bddea71..fa5b4a5416b 100644 --- a/rostests/tests/miditest/miditest.rc +++ b/rostests/tests/miditest/miditest.rc @@ -1,5 +1,4 @@ #include -//#include #include "resource.h" IDR_MAINMENU MENU DISCARDABLE @@ -26,5 +25,3 @@ BEGIN MENUITEM "&Cascade", ID_WINDOW_CASCADE END END - - diff --git a/rostests/tests/popupmenu/popupmenu.rc b/rostests/tests/popupmenu/popupmenu.rc index 7ee181d092c..75256967add 100644 --- a/rostests/tests/popupmenu/popupmenu.rc +++ b/rostests/tests/popupmenu/popupmenu.rc @@ -1,5 +1,4 @@ #include -#include #include "resource.h" IDM_MAINMENU MENU LOADONCALL MOVEABLE DISCARDABLE diff --git a/rostests/win32/smss/movefile/movefile.rc b/rostests/win32/smss/movefile/movefile.rc index 77fc4abedb0..4956e918088 100644 --- a/rostests/win32/smss/movefile/movefile.rc +++ b/rostests/win32/smss/movefile/movefile.rc @@ -1,5 +1,4 @@ #include -#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Move File after reboot test\0" #define REACTOS_STR_INTERNAL_NAME "movefiletest\0"