- Define the copyright year one time and then use this constant everywhere instead...

- 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

diff --git a/reactos/base/applications/control/control.rc b/reactos/base/applications/control/control.rc
index 84039e7..86cec71 100644 (file)
--- 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 <reactos/resource.h>
 #include <windows.h>
 
 #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 <reactos/version.rc>
-#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 0841a7f..5efa884 100644 (file)
--- a/reactos/base/applications/regedit/clb/clb.rc
+++ b/reactos/base/applications/regedit/clb/clb.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/base/shell/cmd/cmd.c b/reactos/base/shell/cmd/cmd.c
index f2b9243..1e4fde3 100644 (file)
--- 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 b986fb6..6ac6c6d 100644 (file)
--- 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 <reactos/resource.h>
+#include <reactos/buildno.h>
+#include <reactos/version.h>
 
 #endif /* __CMD_PRECOMP_H */

diff --git a/reactos/base/shell/cmd/ver.c b/reactos/base/shell/cmd/ver.c
index 4393e2d..b129184 100644 (file)
--- 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 31748fa..6bfcfb4 100644 (file)
--- a/reactos/dll/win32/aclui/aclui.rc
+++ b/reactos/dll/win32/aclui/aclui.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/dll/win32/authz/authz.rc b/reactos/dll/win32/authz/authz.rc
index d6acdf2..58c67c7 100644 (file)
--- a/reactos/dll/win32/authz/authz.rc
+++ b/reactos/dll/win32/authz/authz.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #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 <reactos/version.rc>
-

diff --git a/reactos/dll/win32/modemui/modemui.rc b/reactos/dll/win32/modemui/modemui.rc
index bbc36e1..1d1d1fc 100644 (file)
--- a/reactos/dll/win32/modemui/modemui.rc
+++ b/reactos/dll/win32/modemui/modemui.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/dll/win32/netid/netid.rc b/reactos/dll/win32/netid/netid.rc
index 8761a45..c9a8ff2 100644 (file)
--- a/reactos/dll/win32/netid/netid.rc
+++ b/reactos/dll/win32/netid/netid.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/dll/win32/ntmarta/ntmarta.rc b/reactos/dll/win32/ntmarta/ntmarta.rc
index b2ad43b..5ecb019 100644 (file)
--- a/reactos/dll/win32/ntmarta/ntmarta.rc
+++ b/reactos/dll/win32/ntmarta/ntmarta.rc
@@ -1,9 +1,7 @@
 #include <windows.h>
-#include <reactos/resource.h>
 
 #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 <reactos/version.rc>
-

diff --git a/reactos/dll/win32/rasdlg/rasdlg.rc b/reactos/dll/win32/rasdlg/rasdlg.rc
index 5092fe5..6b0f36d 100644 (file)
--- a/reactos/dll/win32/rasdlg/rasdlg.rc
+++ b/reactos/dll/win32/rasdlg/rasdlg.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/dll/win32/rasman/rasman.rc b/reactos/dll/win32/rasman/rasman.rc
index a9f762f..701bb08 100644 (file)
--- a/reactos/dll/win32/rasman/rasman.rc
+++ b/reactos/dll/win32/rasman/rasman.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/dll/win32/tapiui/tapiui.rc b/reactos/dll/win32/tapiui/tapiui.rc
index 3bda0f8..ecd8091 100644 (file)
--- a/reactos/dll/win32/tapiui/tapiui.rc
+++ b/reactos/dll/win32/tapiui/tapiui.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL

diff --git a/reactos/dll/win32/user32/user32.rc b/reactos/dll/win32/user32/user32.rc
index 487d654..ad49ec6 100644 (file)
--- a/reactos/dll/win32/user32/user32.rc
+++ b/reactos/dll/win32/user32/user32.rc
@@ -1,8 +1,7 @@
 /* $Id$ */
 
 #include <windows.h>
-
-#include <resource.h>
+#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 e6a6ac1..e491cb0 100644 (file)
--- 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 (file)
index 059248d..0000000
--- 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 3a92c1a..69e1b7c 100644 (file)
--- 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 c8c8e3b..9dca3cf 100644 (file)
--- 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 ff489bf..77eb2da 100644 (file)
--- 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 0d3cdd4..04aeb29 100644 (file)
--- a/rosapps/templates/dialog/dialog.rc
+++ b/rosapps/templates/dialog/dialog.rc
@@ -8,7 +8,6 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/rostests/tests/dirdlg/dirdlg.rc b/rostests/tests/dirdlg/dirdlg.rc
index c083329..bd48b63 100644 (file)
--- a/rostests/tests/dirdlg/dirdlg.rc
+++ b/rostests/tests/dirdlg/dirdlg.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #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 95b080f..68c787a 100644 (file)
--- a/rostests/tests/icontest/icontest.rc
+++ b/rostests/tests/icontest/icontest.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
 IDI_ICON                ICON    DISCARDABLE     "icon.ico"

diff --git a/rostests/tests/mdi/mdi.rc b/rostests/tests/mdi/mdi.rc
index e409b76..fa5b4a5 100644 (file)
--- a/rostests/tests/mdi/mdi.rc
+++ b/rostests/tests/mdi/mdi.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #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 2070bdd..fa5b4a5 100644 (file)
--- a/rostests/tests/miditest/miditest.rc
+++ b/rostests/tests/miditest/miditest.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-//#include <reactos/resource.h>
 #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 7ee181d..7525696 100644 (file)
--- a/rostests/tests/popupmenu/popupmenu.rc
+++ b/rostests/tests/popupmenu/popupmenu.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #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 77fc4ab..4956e91 100644 (file)
--- a/rostests/win32/smss/movefile/movefile.rc
+++ b/rostests/win32/smss/movefile/movefile.rc
@@ -1,5 +1,4 @@
 #include <windows.h>
-#include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Move File after reboot test\0"
 #define REACTOS_STR_INTERNAL_NAME      "movefiletest\0"