From 28d86222cda40a9dfb68ffe86d96a73891b7de8c Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Mon, 11 Sep 2000 20:17:02 +0000 Subject: [PATCH] Version resource added to the system utilities. svn path=/trunk/; revision=1350 --- rosapps/sysutils/chkdsk.rc | 39 +++++++++++ rosapps/sysutils/chklib.rc | 38 +++++++++++ rosapps/sysutils/format.rc | 39 +++++++++++ rosapps/sysutils/ldd.c | 7 +- rosapps/sysutils/ldd.rc | 38 +++++++++++ rosapps/sysutils/makefile | 121 +++++++++++++++++++++-------------- rosapps/sysutils/pedump.rc | 38 +++++++++++ rosapps/sysutils/qsi.rc | 38 +++++++++++ rosapps/sysutils/regnav.c | 8 +-- rosapps/sysutils/regnav.rc | 38 +++++++++++ rosapps/sysutils/shutdown.rc | 38 +++++++++++ 11 files changed, 387 insertions(+), 55 deletions(-) create mode 100644 rosapps/sysutils/chkdsk.rc create mode 100644 rosapps/sysutils/chklib.rc create mode 100644 rosapps/sysutils/format.rc create mode 100644 rosapps/sysutils/ldd.rc create mode 100644 rosapps/sysutils/pedump.rc create mode 100644 rosapps/sysutils/qsi.rc create mode 100644 rosapps/sysutils/regnav.rc create mode 100644 rosapps/sysutils/shutdown.rc diff --git a/rosapps/sysutils/chkdsk.rc b/rosapps/sysutils/chkdsk.rc new file mode 100644 index 00000000000..81de8ac3367 --- /dev/null +++ b/rosapps/sysutils/chkdsk.rc @@ -0,0 +1,39 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "ReactOS Disk Checking Utility\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "chkdsk\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalCopyright", "Mark Russinovich\0" + VALUE "OriginalFilename", "chkdsk.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/chklib.rc b/rosapps/sysutils/chklib.rc new file mode 100644 index 00000000000..f0660cbfd47 --- /dev/null +++ b/rosapps/sysutils/chklib.rc @@ -0,0 +1,38 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "Tool to check a dynamic library for a symbol\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "chklib\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "chklib.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/format.rc b/rosapps/sysutils/format.rc new file mode 100644 index 00000000000..7a3091b08a7 --- /dev/null +++ b/rosapps/sysutils/format.rc @@ -0,0 +1,39 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "ReactOS Disk Formatting Tool\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "format\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalCopyright", "Mark Russinovich\0" + VALUE "OriginalFilename", "format.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/ldd.c b/rosapps/sysutils/ldd.c index bcfc44cc5e5..bc15d5e8fd8 100644 --- a/rosapps/sysutils/ldd.c +++ b/rosapps/sysutils/ldd.c @@ -1,4 +1,4 @@ -/* $Id: ldd.c,v 1.1 2000/08/04 21:49:31 ea Exp $ +/* $Id: ldd.c,v 1.2 2000/09/11 20:17:02 ea Exp $ * * FILE : ldd.c * AUTHOR: Emanuele ALIBERTI @@ -10,6 +10,8 @@ #include #include +#include + #include "win32err.h" #define LINKS_SIZE 32768 @@ -51,8 +53,9 @@ int main (int argc, char * argv [] ) { printf ( - "ReactOS W32 - List DOS Devices\n" + "ReactOS %s - List DOS Devices Utility\n" "Written by E.Aliberti (%s)\n\n", + KERNEL_RELEASE_STR, __DATE__ ); diff --git a/rosapps/sysutils/ldd.rc b/rosapps/sysutils/ldd.rc new file mode 100644 index 00000000000..5fbc5074a05 --- /dev/null +++ b/rosapps/sysutils/ldd.rc @@ -0,0 +1,38 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "Tool to list the device names visible to the W32 subsystem (also known as DOS Devices).\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "ldd\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "ldd.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/makefile b/rosapps/sysutils/makefile index 875c11468f9..df4e6c71b96 100644 --- a/rosapps/sysutils/makefile +++ b/rosapps/sysutils/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.5 2000/05/28 17:44:51 ea Exp $ +# $Id: makefile,v 1.6 2000/09/11 20:17:02 ea Exp $ # # ReactOS System Utilities # @@ -18,6 +18,9 @@ # 2000-04-23 (ea) # Added pedump.c # +# 2000-08-4 (ea) +# Added ldd.c; removed login.c +# BASE_CFLAGS = -I../../reactos/include @@ -32,95 +35,115 @@ IMPORT_USER32=$(ROS_LIB)/user32/user32.a IMPORT_CRTDLL=$(ROS_LIB)/crtdll/crtdll.a TARGET=\ - regnav.exe \ - chklib.exe \ - qsi.exe -# pedump.exe \ -# shutdown.exe \ -# chkdsk.exe \ -# format.exe \ + regnav.exe \ + chklib.exe \ + qsi.exe \ + ldd.exe \ + pedump.exe \ + shutdown.exe \ + chkdsk.exe \ + format.exe all: $(TARGET) # By Mark Russinovich -chkdsk.exe: chkdsk.o win32err.o wmain.o +chkdsk.exe: chkdsk.o win32err.o wmain.o chkdsk.coff $(CC) \ - chkdsk.o \ - win32err.o \ - wmain.o \ - $(IMPORT_FMIFS) \ - $(IMPORT_KERNEL32) \ - $(IMPORT_CRTDLL) \ + chkdsk.o \ + win32err.o \ + wmain.o \ + chkdsk.coff \ + $(IMPORT_FMIFS) \ + $(IMPORT_KERNEL32) \ + $(IMPORT_CRTDLL) \ -o chkdsk.exe $(NM) --numeric-sort chkdsk.exe > chkdsk.sym -format.exe: format.o win32err.o wmain.o +format.exe: format.o win32err.o wmain.o format.coff $(CC) \ - format.o \ - win32err.o \ - wmain.o \ - $(IMPORT_FMIFS) \ - $(IMPORT_KERNEL32) \ - $(IMPORT_CRTDLL) \ + format.o \ + win32err.o \ + wmain.o \ + format.coff \ + $(IMPORT_FMIFS) \ + $(IMPORT_KERNEL32) \ + $(IMPORT_CRTDLL) \ -o format.exe $(NM) --numeric-sort format.exe > format.sym #--- -chklib.exe: chklib.o win32err.o +chklib.exe: chklib.o win32err.o chklib.coff $(CC) \ - chklib.o \ - win32err.o \ - $(IMPORT_KERNEL32) \ - $(IMPORT_CRTDLL) \ + chklib.o \ + win32err.o \ + chklib.coff \ + $(IMPORT_KERNEL32) \ + $(IMPORT_CRTDLL) \ -o chklib.exe $(NM) --numeric-sort chklib.exe > chklib.sym -regnav.exe: regnav.o win32err.o +regnav.exe: regnav.o win32err.o regnav.coff $(CC) \ - regnav.o \ - win32err.o \ - $(IMPORT_KERNEL32) \ - $(IMPORT_ADVAPI32) \ - $(IMPORT_CRTDLL) \ + regnav.o \ + win32err.o \ + regnav.coff \ + $(IMPORT_KERNEL32) \ + $(IMPORT_ADVAPI32) \ + $(IMPORT_CRTDLL) \ -o regnav.exe $(NM) --numeric-sort regnav.exe > regnav.sym -shutdown.exe: shutdown.o win32err.o +shutdown.exe: shutdown.o win32err.o shutdown.coff $(CC) \ - shutdown.o \ - win32err.o \ - $(IMPORT_KERNEL32) \ - $(IMPORT_USER32) \ - $(IMPORT_CRTDLL) \ + shutdown.o \ + win32err.o \ + shutdown.coff \ + $(IMPORT_KERNEL32) \ + $(IMPORT_USER32) \ + $(IMPORT_CRTDLL) \ -o shutdown.exe $(NM) --numeric-sort shutdown.exe > shutdown.sym -qsi.exe: qsi.o +qsi.exe: qsi.o qsi.coff $(CC) \ - qsi.o \ - $(IMPORT_NTDLL) \ - $(IMPORT_KERNEL32) \ - $(IMPORT_CRTDLL) \ + qsi.o \ + qsi.coff \ + $(IMPORT_NTDLL) \ + $(IMPORT_KERNEL32) \ + $(IMPORT_CRTDLL) \ -o qsi.exe $(NM) --numeric-sort qsi.exe > qsi.sym qsi.o: qsi.c $(ROS_INC)/ddk/zwtypes.h -pedump.exe: pedump.o +pedump.exe: pedump.o pedump.coff $(CC) \ - pedump.o \ - $(IMPORT_NTDLL) \ - $(IMPORT_KERNEL32) \ - $(IMPORT_CRTDLL) \ + pedump.o \ + pedump.coff \ + $(IMPORT_NTDLL) \ + $(IMPORT_KERNEL32) \ + $(IMPORT_CRTDLL) \ -o pedump.exe $(NM) --numeric-sort pedump.exe > pedump.sym pedump.o: pedump.c +ldd.exe: ldd.o win32err.o ldd.coff + $(CC) \ + ldd.o \ + win32err.o \ + ldd.coff \ + $(IMPORT_KERNEL32) \ + $(IMPORT_CRTDLL) \ + -o ldd.exe + $(NM) --numeric-sort ldd.exe > ldd.sym + +ldd.o: ldd.c + #--- CLEAN_FILES = *.o *.exe *.sym diff --git a/rosapps/sysutils/pedump.rc b/rosapps/sysutils/pedump.rc new file mode 100644 index 00000000000..31322f96d06 --- /dev/null +++ b/rosapps/sysutils/pedump.rc @@ -0,0 +1,38 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "Tool to dump a PE image file.\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "pedump\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "pedump.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/qsi.rc b/rosapps/sysutils/qsi.rc new file mode 100644 index 00000000000..d1959b5887f --- /dev/null +++ b/rosapps/sysutils/qsi.rc @@ -0,0 +1,38 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "Tool to query ReactOS system information.\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "qsi\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "qsi.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/regnav.c b/rosapps/sysutils/regnav.c index 0b920898d3c..885fa7757be 100644 --- a/rosapps/sysutils/regnav.c +++ b/rosapps/sysutils/regnav.c @@ -1,8 +1,8 @@ -/* $Id: regnav.c,v 1.3 2000/05/28 17:44:53 ea Exp $ +/* $Id: regnav.c,v 1.4 2000/09/11 20:17:02 ea Exp $ * * regnav.c * - * Copyright (c) 1998, 1999 Emanuele Aliberti + * Copyright (c) 1998-2000 Emanuele Aliberti * * -------------------------------------------------------------------- * @@ -46,7 +46,7 @@ LPCTSTR STR_HKEY_PERFORMANCE_DATA = _TEXT("HKEY_PERFORMANCE_DATA"); LPTSTR app_name = _TEXT("regnav"); -LPCTSTR app_ver = _TEXT("1.0.4"); +LPCTSTR app_ver = _TEXT("1.0.5"); HANDLE CurrentWorkingKey = INVALID_HANDLE_VALUE; /* \ */ TCHAR CurrentPath [CURRENT_PATH_SIZE] = _TEXT("\\"); BOOL Done = FALSE; @@ -510,7 +510,7 @@ CMDPROTO(cmd_ver) _TEXT("\ %s version %s (compiled on %s, at %s)\n\ ReactOS Console Registry Navigator\n\ -Copyright (c) 1998, 1999 Emanuele Aliberti\n\n"), +Copyright (c) 1998-2000 Emanuele Aliberti\n\n"), app_name, app_ver, _TEXT(__DATE__), diff --git a/rosapps/sysutils/regnav.rc b/rosapps/sysutils/regnav.rc new file mode 100644 index 00000000000..ccda2ba2553 --- /dev/null +++ b/rosapps/sysutils/regnav.rc @@ -0,0 +1,38 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "ReactOS Registry Navigation Console Tool\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "regnav\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "regnav.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + diff --git a/rosapps/sysutils/shutdown.rc b/rosapps/sysutils/shutdown.rc new file mode 100644 index 00000000000..35e126a35bc --- /dev/null +++ b/rosapps/sysutils/shutdown.rc @@ -0,0 +1,38 @@ +#include +#include + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +VS_VERSION_INFO VERSIONINFO + FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD + PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", RES_STR_COMPANY_NAME + VALUE "FileDescription", "ReactOS Shutdown Utility\0" + VALUE "FileVersion", RES_STR_FILE_VERSION + VALUE "InternalName", "shutdown\0" + VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT + VALUE "OriginalFilename", "shutdown.exe\0" + VALUE "ProductName", RES_STR_PRODUCT_NAME + VALUE "ProductVersion", RES_STR_PRODUCT_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END +