Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Define the copyright year one time and then use this constant everywhere instead of redefining it at X places

Browse source 
- 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
This commit is contained in:
Colin Finck 2008-01-17 14:50:36 +00:00
parent 9238f49148
commit 2d0464ddb2
26 changed files with 15 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/base/applications/control/control.rc
View file

@ -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
/////////////////////////////////////////////////////////////////////////////

1
reactos/base/applications/regedit/clb/clb.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

2
reactos/base/shell/cmd/cmd.c
View file

@ -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 ();

3
reactos/base/shell/cmd/precomp.h
View file

@ -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 */

2
reactos/base/shell/cmd/ver.c
View file

@ -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'))

1
reactos/dll/win32/aclui/aclui.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

2
reactos/dll/win32/authz/authz.rc
View file

@ -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>

1
reactos/dll/win32/modemui/modemui.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

1
reactos/dll/win32/netid/netid.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

2
reactos/dll/win32/ntmarta/ntmarta.rc
View file

@ -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>

1
reactos/dll/win32/rasdlg/rasdlg.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

1
reactos/dll/win32/rasman/rasman.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

1
reactos/dll/win32/tapiui/tapiui.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
#define REACTOS_VERSION_DLL

5
reactos/dll/win32/user32/user32.rc
View file

@ -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
/////////////////////////////////////////////////////////////////////////////
//

2
reactos/drivers/base/bootvid/bootvid.rc
View file

@ -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"

40
reactos/include/reactos/resource.h
View file

@ -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 */

10
reactos/include/reactos/version.h
View file

@ -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

2
reactos/include/reactos/version.rc
View file

@ -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 */

4
reactos/include/reactos/wine/wine_common_ver.rc
View file

@ -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

1
rosapps/templates/dialog/dialog.rc
View file

@ -8,7 +8,6 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
/////////////////////////////////////////////////////////////////////////////

1
rostests/tests/dirdlg/dirdlg.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
IDD_MAIN DIALOG DISCARDABLE 20, 20, 220, 140

1
rostests/tests/icontest/icontest.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
IDI_ICON ICON DISCARDABLE "icon.ico"

3
rostests/tests/mdi/mdi.rc
View file

@ -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

3
rostests/tests/miditest/miditest.rc
View file

@ -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

1
rostests/tests/popupmenu/popupmenu.rc
View file

@ -1,5 +1,4 @@
#include <windows.h>
#include <reactos/resource.h>
#include "resource.h"
IDM_MAINMENU MENU LOADONCALL MOVEABLE DISCARDABLE

1
rostests/win32/smss/movefile/movefile.rc
View file

@ -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"