From ff57ed11e380d413f5cc5c10ce16b0567bcfd391 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Thu, 1 Jan 2004 15:26:04 +0000
Subject: [PATCH] added regedit to package list and added version information
 to regedit and welcome

svn path=/trunk/; revision=7377
---
 reactos/Makefile                         |  4 +--
 reactos/bootdata/packages/reactos.dff    |  1 +
 reactos/subsys/system/regedit/regedit.rc | 39 ++++++++++++++++++++++++
 reactos/subsys/system/welcome/welcome.rc | 37 +++++++++++++++++++++-
 4 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/reactos/Makefile b/reactos/Makefile
index cf3c6dcdd3f..c34ee23f1a6 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.195 2003/12/28 10:40:55 navaraf Exp $
+# $Id: Makefile,v 1.196 2004/01/01 15:26:04 weiden Exp $
 #
 # Global makefile
 #
@@ -91,7 +91,7 @@ STORAGE_DRIVERS = atapi cdrom class2 disk scsiport diskdump
 
 # System applications
 # autochk cmd format services setup usetup welcome winlogon
-SYS_APPS = autochk cmd explorer format services setup userinit usetup welcome winlogon
+SYS_APPS = autochk cmd explorer format services setup userinit usetup welcome winlogon regedit
 
 # System services
 # rpcss eventlog
diff --git a/reactos/bootdata/packages/reactos.dff b/reactos/bootdata/packages/reactos.dff
index caadeb5ad4a..4d928863b92 100755
--- a/reactos/bootdata/packages/reactos.dff
+++ b/reactos/bootdata/packages/reactos.dff
@@ -81,6 +81,7 @@ subsys\system\autochk\autochk.exe       1
 subsys\system\cmd\cmd.exe               1
 subsys\system\explorer\explorer.exe     4
 subsys\system\format\format.exe         1
+subsys\system\regedit\regedit.exe       4
 subsys\system\services\services.exe     1
 subsys\system\setup\setup.exe           1
 subsys\system\userinit\userinit.exe     1
diff --git a/reactos/subsys/system/regedit/regedit.rc b/reactos/subsys/system/regedit/regedit.rc
index 3baf180339d..430c375d5ff 100644
--- a/reactos/subsys/system/regedit/regedit.rc
+++ b/reactos/subsys/system/regedit/regedit.rc
@@ -18,6 +18,45 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <defines.h>
+#include <reactos/resource.h>
+#include "resource.h"
+
+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 Explorer\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"regedit\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"regedit.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
+
 #include "rsrc.rc"
 
 IDI_OPEN_FILE	ICON	DISCARDABLE	res/folderopen.ico
diff --git a/reactos/subsys/system/welcome/welcome.rc b/reactos/subsys/system/welcome/welcome.rc
index c6cbb487911..5e103a4a06c 100755
--- a/reactos/subsys/system/welcome/welcome.rc
+++ b/reactos/subsys/system/welcome/welcome.rc
@@ -1,6 +1,41 @@
-
+#include <defines.h>
+#include <reactos/resource.h>
 #include "resource.h"
 
+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-Welcome\0"
+            VALUE "FileVersion",	RES_STR_FILE_VERSION
+            VALUE "InternalName",	"welcome\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"welcome.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
 
 /* Icons */
 IDI_MAIN                ICON  "res/welcome.ico"