Centralize definition of version resource

svn path=/trunk/; revision=11299

diff --git a/rosapps/cmdutils/find.rc b/rosapps/cmdutils/find.rc
index 03683a1..4818e2a 100644 (file)
--- a/rosapps/cmdutils/find.rc
+++ b/rosapps/cmdutils/find.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "W32 find command\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "find\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",  "find.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
+/* $Id: find.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "W32 find command\0"
+#define REACTOS_STR_INTERNAL_NAME      "find\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "find.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/cmdutils/mode/mode.rc b/rosapps/cmdutils/mode/mode.rc
index 3a2bd29..ea04bba 100644 (file)
--- a/rosapps/cmdutils/mode/mode.rc
+++ b/rosapps/cmdutils/mode/mode.rc
@@ -1,45 +1,6 @@
-#include <windows.h>
-#include <reactos/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 "Comments",          "Absolutely no warranties whatsoever - Use at your own risk\0"
-            VALUE "CompanyName",       RES_STR_COMPANY_NAME
-            VALUE "FileDescription",   "ReactOS mode utility\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "mode\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", RES_STR_LEGAL_COPYRIGHT
-            VALUE "Copyright",         "Copyright © 2002 Robert Dickenson\0"
-            VALUE "Maintainer",                "Robert Dickenson (robd@users.sourceforge.net)\0"
-            VALUE "LegalTrademarks",   "\0"
-            VALUE "PrivateBuild",      "\0"
-            VALUE "OriginalFilename",  "mode.exe\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-            VALUE "SpecialBuild",      "Non-versioned Development Beta Release\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+/* $Id: mode.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS mode utility\0"
+#define REACTOS_STR_INTERNAL_NAME      "mode\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "mode.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/cmdutils/more.rc b/rosapps/cmdutils/more.rc
index c3b6bee..07c434d 100644 (file)
--- a/rosapps/cmdutils/more.rc
+++ b/rosapps/cmdutils/more.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "W32 more command\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "more\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",  "more.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
+/* $Id: more.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "W32 more command\0"
+#define REACTOS_STR_INTERNAL_NAME      "more\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "more.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/cmdutils/sort.rc b/rosapps/cmdutils/sort.rc
index 536e102..d2e1cea 100644 (file)
--- a/rosapps/cmdutils/sort.rc
+++ b/rosapps/cmdutils/sort.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "W32 sort command\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "sort\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",  "sort.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
+/* $Id: sort.rc,v 1.2 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "W32 sort command\0"
+#define REACTOS_STR_INTERNAL_NAME      "sort\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "sort.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/cmdutils/tee.rc b/rosapps/cmdutils/tee.rc
index 4ae45dc..5aa3a51 100644 (file)
--- a/rosapps/cmdutils/tee.rc
+++ b/rosapps/cmdutils/tee.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "W32 tee command\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "tee\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",  "tee.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
+/* $Id: tee.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "W32 tee command\0"
+#define REACTOS_STR_INTERNAL_NAME      "tee\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "tee.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/cmdutils/touch/touch.rc b/rosapps/cmdutils/touch/touch.rc
index b1439e5..b9ef1c5 100644 (file)
--- a/rosapps/cmdutils/touch/touch.rc
+++ b/rosapps/cmdutils/touch/touch.rc
@@ -1,41 +1,6 @@
-#include <windows.h>
-#include <reactos/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 Touch utility\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "finger\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Regents of the University of California\0"
-            VALUE "Copyright",         "Ted Felix <tfelix@fred.net>\0"
-            VALUE "Maintainer",                "Steven Edwards (Isolation@users.sourceforge.net)\0"
-            VALUE "OriginalFilename",  "finger.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
+/* $Id: touch.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Touch utility\0"
+#define REACTOS_STR_INTERNAL_NAME      "touch\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "touch.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/cmdutils/y.rc b/rosapps/cmdutils/y.rc
index 3f3aee3..78c2f5e 100644 (file)
--- a/rosapps/cmdutils/y.rc
+++ b/rosapps/cmdutils/y.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "W32 y command\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "y\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",  "y.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
+/* $Id: y.rc,v 1.3 2004/10/16 22:30:16 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "W32 y command\0"
+#define REACTOS_STR_INTERNAL_NAME      "y\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "y.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/devutils/genguid/genguid.rc b/rosapps/devutils/genguid/genguid.rc
index 262d452..14ff2d9 100644 (file)
--- a/rosapps/devutils/genguid/genguid.rc
+++ b/rosapps/devutils/genguid/genguid.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "GUID Generator\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "genguid\0"
-            VALUE "LegalCopyright",    "Jonathon Wilson"
-            VALUE "OriginalFilename",  "genguid.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
+/* $Id: genguid.rc,v 1.2 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "GUID Generator\0"
+#define REACTOS_STR_INTERNAL_NAME      "genguid\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "genguid.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/devutils/zoomin/zoomin.rc b/rosapps/devutils/zoomin/zoomin.rc
index 757bc26..36f6797 100644 (file)
--- a/rosapps/devutils/zoomin/zoomin.rc
+++ b/rosapps/devutils/zoomin/zoomin.rc
@@ -1,8 +1,13 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: zoomin.rc,v 1.2 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#include <defines.h>

 #include "resource.h"
 
 #include "resource.h"
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Zoomin by Robert Dickenson\0"
+#define REACTOS_STR_INTERNAL_NAME      "zoomin\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "zoomin.exe\0"
+#include <reactos/version.rc>
+

 
 /////////////////////////////////////////////////////////////////////////////
 //
 
 /////////////////////////////////////////////////////////////////////////////
 //


@@ -63,49 +68,6 @@ BEGIN
 END
 
 
 END
 
 

-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-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 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Absolutely no warranties whatsoever - Use at your own risk\0"
-            VALUE "CompanyName", RES_STR_COMPANY_NAME
-            VALUE "FileDescription", "ReactOS Zoomin by Robert Dickenson\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "zoomin\0"
-            VALUE "LegalCopyright", "Copyright © 2002 Robert Dickenson\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "zoomin.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-            VALUE "SpecialBuild", "Non-versioned Development Beta Release\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0xc09, 1200
-    END
-END
-
-

 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog

diff --git a/rosapps/dflat32/edit.rc b/rosapps/dflat32/edit.rc
index 0ecda24..e34ea22 100644 (file)
--- a/rosapps/dflat32/edit.rc
+++ b/rosapps/dflat32/edit.rc
@@ -1,44 +1,9 @@
-/* $Id: edit.rc,v 1.2 2002/09/03 18:44:15 chorns Exp $ */
-#include <windows.h>
-#include <reactos/resource.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/* Version information. */
-
-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",   "FreeDOS/ReactOS Text Editor\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "edit\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "FreeDOS Project"
-            VALUE "OriginalFilename",  "edit.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
+/* $Id: edit.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "FreeDOS/ReactOS Text Editor\0"
+#define REACTOS_STR_INTERNAL_NAME      "edit\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "edit.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "FreeDOS Project\0"
+#include <reactos/version.rc>

 
 /* EOF */
 
 /* EOF */

diff --git a/rosapps/lib/dflat32/dflat32.rc b/rosapps/lib/dflat32/dflat32.rc
index 5985a77..d279db3 100644 (file)
--- a/rosapps/lib/dflat32/dflat32.rc
+++ b/rosapps/lib/dflat32/dflat32.rc
@@ -1,43 +1,9 @@
-#include <windows.h>
-#include <reactos/resource.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/* Version information. */
-
-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",   "dflat32 console windowing library\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "dflat32\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "?"
-            VALUE "OriginalFilename",  "dflat32.dll\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+/* $Id: dflat32.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION   "dflat32 console windowing library\0"
+#define REACTOS_STR_INTERNAL_NAME      "dflat\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "dflat.dll\0"
+#include <reactos/version.rc>

 
 /* EOF */
 
 /* EOF */

diff --git a/rosapps/net/arp/arp.rc b/rosapps/net/arp/arp.rc
index 6b79ef6..2bc49e4 100644 (file)
--- a/rosapps/net/arp/arp.rc
+++ b/rosapps/net/arp/arp.rc
@@ -1,39 +1,6 @@
-#include <windows.h>
-#include <reactos/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 TCP/IPv4 Win32 arp\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "arp\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Robert Dickenson (robd@reactos.org)\0"
-            VALUE "OriginalFilename",  "arp.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
+/* $Id: arp.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Win32 arp\0"
+#define REACTOS_STR_INTERNAL_NAME      "arp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "arp.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/finger/finger.rc b/rosapps/net/finger/finger.rc
index abf1ef8..d1e44df 100644 (file)
--- a/rosapps/net/finger/finger.rc
+++ b/rosapps/net/finger/finger.rc
@@ -1,39 +1,6 @@
-#include <windows.h>
-#include <reactos/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 TCP/IPv4 Win32 finger\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "finger\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Steven Edwards (Isolation@users.sourceforge.net)\0"
-            VALUE "OriginalFilename",  "finger.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
+/* $Id: finger.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Win32 finger\0"
+#define REACTOS_STR_INTERNAL_NAME      "finger\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "finger.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/ipconfig/ipconfig.rc b/rosapps/net/ipconfig/ipconfig.rc
index 791a229..756293b 100644 (file)
--- a/rosapps/net/ipconfig/ipconfig.rc
+++ b/rosapps/net/ipconfig/ipconfig.rc
@@ -1,39 +1,6 @@
-#include <windows.h>
-#include <reactos/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 TCP/IPv4 Win32 ipconfig\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "ipconfig\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Robert Dickenson (robd@reactos.org)\0"
-            VALUE "OriginalFilename",  "ipconfig.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
+/* $Id: ipconfig.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Win32 ipconfig\0"
+#define REACTOS_STR_INTERNAL_NAME      "ipconfig\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "ipconfig.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/ncftp/ncftp.rc b/rosapps/net/ncftp/ncftp.rc
index e651810..cff0d2f 100644 (file)
--- a/rosapps/net/ncftp/ncftp.rc
+++ b/rosapps/net/ncftp/ncftp.rc
@@ -1,39 +1,7 @@
-#include <windows.h>
-#include <reactos/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",   "Ncftp for Win32\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "ncftp\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Anonymous sources found at http://www.ncftp.org/\0"
-            VALUE "OriginalFilename",  "ncftp.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
+/* $Id: ncftp.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "Ncftp for Win32\0"
+#define REACTOS_STR_INTERNAL_NAME      "ncftp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "ncftp.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Anonymous sources found at http://www.ncftp.org/\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/netstat/netstat.rc b/rosapps/net/netstat/netstat.rc
index f83075e..475396a 100644 (file)
--- a/rosapps/net/netstat/netstat.rc
+++ b/rosapps/net/netstat/netstat.rc
@@ -1,43 +1,14 @@
-#include <windows.h>
-#include <reactos/resource.h>
+/* $Id: netstat.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#include <windows.h>

 #include "resource.h"
 
 #include "resource.h"
 

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Win32 netstat\0"
+#define REACTOS_STR_INTERNAL_NAME      "netstat\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "netstat.exe\0"
+#include <reactos/version.rc>

 
 

-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 TCP/IPv4 Win32 netstat\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "netstat\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Robert Dickenson (robd@reactos.org)\0"
-            VALUE "OriginalFilename",  "netstat.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
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 
 /////////////////////////////////////////////////////////////////////////////
 //
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/rosapps/net/niclist/niclist.rc b/rosapps/net/niclist/niclist.rc
index 1a2d3cb..b8e65f9 100644 (file)
--- a/rosapps/net/niclist/niclist.rc
+++ b/rosapps/net/niclist/niclist.rc
@@ -1,81 +1,6 @@
-#include <windows.h>
-#include <reactos/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 packet driver niclist\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "niclist\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Robert Dickenson (robd@reactos.org)\0"
-            VALUE "OriginalFilename",  "niclist.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
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-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 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Absolutely no warranties whatsoever - Use at your own risk\0"
-            VALUE "CompanyName", RES_STR_COMPANY_NAME
-            VALUE "FileDescription", "ReactOS Network Interface List Utility by Robert Dickenson\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "niclist\0"
-            VALUE "LegalCopyright", "Copyright © 2002 Robert Dickenson\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "niclist.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-            VALUE "SpecialBuild", "Non-versioned Development Beta Release\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0xc09, 1200
-    END
-END
+/* $Id: niclist.rc,v 1.4 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS packet driver niclist\0"
+#define REACTOS_STR_INTERNAL_NAME      "niclist\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "niclist.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/ping/ping.rc b/rosapps/net/ping/ping.rc
index 7034128..ba9dd84 100644 (file)
--- a/rosapps/net/ping/ping.rc
+++ b/rosapps/net/ping/ping.rc
@@ -1,39 +1,7 @@
-#include <windows.h>
-#include <reactos/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 TCP/IPv4 Win32 Ping\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "ping\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
-            VALUE "OriginalFilename",  "ping.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
+/* $Id: ping.rc,v 1.3 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Win32 Ping\0"
+#define REACTOS_STR_INTERNAL_NAME      "ping\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "ping.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/telnet/telnet.rc b/rosapps/net/telnet/telnet.rc
index 3d91dc6..c7bfd14 100644 (file)
--- a/rosapps/net/telnet/telnet.rc
+++ b/rosapps/net/telnet/telnet.rc
@@ -1,40 +1,6 @@
-#include <windows.h>
-#include <reactos/resource.h>
-#include "resource/tnmsg.rc"
-
-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",   "Console Telnet for Win32\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "ping\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Paul Brannan (cout@users.sourceforge.net)\0"
-            VALUE "OriginalFilename",  "telnet.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
+/* $Id: telnet.rc,v 1.4 2004/10/16 22:30:17 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "Console Telnet for Win32\0"
+#define REACTOS_STR_INTERNAL_NAME      "telnet\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "telnet.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/net/whois/whois.rc b/rosapps/net/whois/whois.rc
index b79866b..2c87d7e 100644 (file)
--- a/rosapps/net/whois/whois.rc
+++ b/rosapps/net/whois/whois.rc
@@ -1,39 +1,7 @@
-#include <windows.h>
-#include <reactos/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 TCP/IPv4 Win32 Whois\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "ping\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright", "Steven Edwards (Isolation@users.sourceforge.net)\0"
-            VALUE "OriginalFilename",  "whois.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
+/* $Id: whois.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS TCP/IPv4 Win32 Whois\0"
+#define REACTOS_STR_INTERNAL_NAME      "whois\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "whois.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Steven Edwards (Isolation@users.sourceforge.net)\0"
+#include <reactos/version.rc>

diff --git a/rosapps/notepad/main.c b/rosapps/notepad/main.c
index a783681..5b09637 100644 (file)
--- a/rosapps/notepad/main.c
+++ b/rosapps/notepad/main.c
@@ -353,3 +353,4 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show)
     }
     return msg.wParam;
 }
     }
     return msg.wParam;
 }

+

diff --git a/rosapps/notepad/makefile b/rosapps/notepad/makefile
index 66e65f1..d67759a 100644 (file)
--- a/rosapps/notepad/makefile
+++ b/rosapps/notepad/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.4 2004/03/17 01:28:13 sedwards Exp $
+# $Id: makefile,v 1.5 2004/10/16 22:30:18 gvg Exp $

 
 PATH_TO_TOP = ../../reactos
 
 
 PATH_TO_TOP = ../../reactos
 


@@ -24,4 +24,11 @@ include $(PATH_TO_TOP)/rules.mak
 
 include $(TOOLS_PATH)/helper.mk
 
 
 include $(TOOLS_PATH)/helper.mk
 

+# EOF
+
+
+# EOF
+
+
+

 # EOF
 # EOF

diff --git a/rosapps/notevil/notevil.rc b/rosapps/notevil/notevil.rc
index 6e01b78..78f763b 100644 (file)
--- a/rosapps/notevil/notevil.rc
+++ b/rosapps/notevil/notevil.rc
@@ -1,43 +1,9 @@
-/* $Id: notevil.rc,v 1.13 2003/10/11 21:06:18 gvg Exp $ */
-#include <windows.h>
-#include "../../reactos/include/reactos/resource.h"
+/* $Id: notevil.rc,v 1.14 2004/10/16 22:30:18 gvg Exp $ */

 
 

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/* Version information. */
-
-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 Coders Console Parade\0"
-            VALUE "FileVersion",       RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",      "notevil\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",  "notevil.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
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Coders Console Parade\0"
+#define REACTOS_STR_INTERNAL_NAME      "notevil\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "notevil.exe\0"
+#include <reactos/version.rc>

 
 /*
  * String table
 
 /*
  * String table

diff --git a/rosapps/regedt32/Makefile b/rosapps/regedt32/Makefile
index 575baa9..3fad431 100644 (file)
--- a/rosapps/regedt32/Makefile
+++ b/rosapps/regedt32/Makefile
@@ -19,7 +19,7 @@ TARGET_CFLAGS = -DGCC \
        -D_WIN32_WINNT=0x501 \
        -DWINVER=0x501
 
        -D_WIN32_WINNT=0x501 \
        -DWINVER=0x501
 

-RCFLAGS = -DGCC -D_WIN32_IE=0x0400
+TARGET_RCFLAGS = -DGCC -D_WIN32_IE=0x0400 -D__USE_W32API

 
 TARGET_SDKLIBS = \
        kernel32.a \
 
 TARGET_SDKLIBS = \
        kernel32.a \

diff --git a/rosapps/regedt32/regedt32.rc b/rosapps/regedt32/regedt32.rc
index a5c14c1..4fe892c 100644 (file)
--- a/rosapps/regedt32/regedt32.rc
+++ b/rosapps/regedt32/regedt32.rc
@@ -1,9 +1,14 @@
-#include <windows.h>
+/* $Id: regedt32.rc,v 1.8 2004/10/16 22:30:18 gvg Exp $ */
+

 #include <reactos/resource.h>
 
 #include <reactos/resource.h>
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Registry Editor 32 by Robert Dickenson\0"
+#define REACTOS_STR_INTERNAL_NAME      "regedt32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "regedt32.exe\0"
+#include <reactos/version.rc>
+

 //Microsoft Developer Studio generated resource script.
 //
 //Microsoft Developer Studio generated resource script.
 //

-#include "resource.h"

 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////


@@ -180,49 +185,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
 #endif    // APSTUDIO_INVOKED
 
 

-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-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 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Absolutely no warranties whatsoever - Use at your own risk\0"
-            VALUE "CompanyName", RES_STR_COMPANY_NAME
-            VALUE "FileDescription", "ReactOS Registry Editor 32 by Robert Dickenson\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "regedt32\0"
-            VALUE "LegalCopyright", "Copyright © 2002 Robert Dickenson\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "regedt32.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-            VALUE "SpecialBuild", "Non-versioned Development Beta Release\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0xc09, 1200
-    END
-END
-
-

 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table

diff --git a/rosapps/sysutils/chkdsk.rc b/rosapps/sysutils/chkdsk.rc
index f72fc2b..9129c97 100644 (file)
--- a/rosapps/sysutils/chkdsk.rc
+++ b/rosapps/sysutils/chkdsk.rc
@@ -1,39 +1,6 @@
-#include <windows.h>
-#include <reactos/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 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
+/* $Id: chkdsk.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Disk Checking Utility\0"
+#define REACTOS_STR_INTERNAL_NAME      "chkdsk\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "chkdsk.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/chklib.rc b/rosapps/sysutils/chklib.rc
index b202ac9..5743e23 100644 (file)
--- a/rosapps/sysutils/chklib.rc
+++ b/rosapps/sysutils/chklib.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "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
+/* $Id: chklib.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "Tool to check a dynamic library for a symbol\0"
+#define REACTOS_STR_INTERNAL_NAME      "chklib\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "chklib.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/ctm/ctm.rc b/rosapps/sysutils/ctm/ctm.rc
index 063d51d..2887c80 100644 (file)
--- a/rosapps/sysutils/ctm/ctm.rc
+++ b/rosapps/sysutils/ctm/ctm.rc
@@ -1,37 +1,7 @@
-#include <windows.h>
-#include <reactos/resource.h>
+/* $Id: ctm.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */

 
 

-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 Console Task Manager\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "ctm\0"
-            VALUE "LegalCopyright",    "2003, Aleksey Bragin\0"
-            VALUE "OriginalFilename",  "ctm.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
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Console Task Manager\0"
+#define REACTOS_STR_INTERNAL_NAME      "ctm\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "ctm.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "2003, Aleksey Bragin\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/format.rc b/rosapps/sysutils/format.rc
index 2d3a39d..b69f5ba 100644 (file)
--- a/rosapps/sysutils/format.rc
+++ b/rosapps/sysutils/format.rc
@@ -1,39 +1,7 @@
-#include <windows.h>
-#include <reactos/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 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
+/* $Id: format.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Disk Formatting Tool\0"
+#define REACTOS_STR_INTERNAL_NAME      "format\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "format.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Mark Russinovich\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/ldd.rc b/rosapps/sysutils/ldd.rc
index a567870..9e75b61 100644 (file)
--- a/rosapps/sysutils/ldd.rc
+++ b/rosapps/sysutils/ldd.rc
@@ -1,38 +1,6 @@
-#include <windows.h>
-#include <reactos/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",   "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
+/* $Id: ldd.rc,v 1.3 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "Tool to list the device names visible to the W32 subsystem (also known as DOS Devices).\0"
+#define REACTOS_STR_INTERNAL_NAME      "ldd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "ldd.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/pedump.rc b/rosapps/sysutils/pedump.rc
index 82bd9fe..e7e9a60 100644 (file)
--- a/rosapps/sysutils/pedump.rc
+++ b/rosapps/sysutils/pedump.rc
@@ -1,39 +1,7 @@
-#include <windows.h>
-#include <reactos/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",   "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 "OriginalCopyright",  "1993 Randy Kath; 1997 Sang Cho\0"
-            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
+/* $Id: pedump.rc,v 1.4 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "Tool to dump a PE image file.\0"
+#define REACTOS_STR_INTERNAL_NAME      "pedump\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "pedump.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "1993 Randy Kath; 1997 Sang Cho\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/qsi.rc b/rosapps/sysutils/qsi.rc
index d1959b5..3875c39 100644 (file)
--- a/rosapps/sysutils/qsi.rc
+++ b/rosapps/sysutils/qsi.rc
@@ -1,38 +1,6 @@
-#include <defines.h>
-#include <reactos/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",   "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
+/* $Id: qsi.rc,v 1.2 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "Tool to query ReactOS system information.\0"
+#define REACTOS_STR_INTERNAL_NAME      "qsi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "qsi.exe\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/regexpl/regexpl.rc b/rosapps/sysutils/regexpl/regexpl.rc
index 8a71141..615005b 100644 (file)
--- a/rosapps/sysutils/regexpl/regexpl.rc
+++ b/rosapps/sysutils/regexpl/regexpl.rc
@@ -1,40 +1,7 @@
-#include <windows.h>
-#include <reactos/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 Console Registry Explorer\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "regexpl\0"
-            VALUE "LegalCopyright",    "2000 (c) Nedko Arnaoudov\0"
-            VALUE "OriginalFilename",  "regexpl.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
-
-GPL LICENSE "../../copying"
+/* $Id: regexpl.rc,v 1.5 2004/10/16 22:30:19 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Console Registry Explorer\0"
+#define REACTOS_STR_INTERNAL_NAME      "regexpl\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "regexpl.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "2000 (c) Nedko Arnaoudov\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/shutdown.rc b/rosapps/sysutils/shutdown.rc
index ba1c9d0..bba6e45 100644 (file)
--- a/rosapps/sysutils/shutdown.rc
+++ b/rosapps/sysutils/shutdown.rc
@@ -1,39 +1,7 @@
-#include <windows.h>
-#include <reactos/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 Shutdown Utility (Win32)\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "shutdown\0"
-            VALUE "LegalCopyright",    RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright",  "1997-1999 Emanuele Aliberti\0"
-            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
+/* $Id: shutdown.rc,v 1.4 2004/10/16 22:30:18 gvg Exp $ */

 
 

+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS Shutdown Utility (Win32)\0"
+#define REACTOS_STR_INTERNAL_NAME      "shutdown\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "shutdown.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "1997-1999 Emanuele Aliberti\0"
+#include <reactos/version.rc>

diff --git a/rosapps/sysutils/tlist/tlist.rc b/rosapps/sysutils/tlist/tlist.rc
index 5b59795..2a0e238 100644 (file)
--- a/rosapps/sysutils/tlist/tlist.rc
+++ b/rosapps/sysutils/tlist/tlist.rc
@@ -1,37 +1,7 @@
-#include <windows.h>
-#include <reactos/resource.h>
+/* $Id: tlist.rc,v 1.3 2004/10/16 22:30:19 gvg Exp $ */

 
 

-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 W32 T(ask)List\0"
-            VALUE "FileVersion",       RES_STR_FILE_VERSION
-            VALUE "InternalName",      "tlist\0"
-            VALUE "LegalCopyright",    "2000,2001 Emanuele Aliberti\0"
-            VALUE "OriginalFilename",  "tlist.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
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS W32 T(ask)List\0"
+#define REACTOS_STR_INTERNAL_NAME      "tlist\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "tlist.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "2000,2001 Emanuele Aliberti\0"
+#include <reactos/version.rc>

diff --git a/rosapps/templates/mdi/mdi.rc b/rosapps/templates/mdi/mdi.rc
index d35ff1b..d5cbdbd 100644 (file)
--- a/rosapps/templates/mdi/mdi.rc
+++ b/rosapps/templates/mdi/mdi.rc
@@ -1,5 +1,12 @@
+/* $Id: mdi.rc,v 1.4 2004/10/16 22:30:19 gvg Exp $ */
+

 #include <windows.h>
 #include <windows.h>

-#include <reactos/resource.h>
+
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS MDI Sample Application by Robert Dickenson\0"
+#define REACTOS_STR_INTERNAL_NAME      "mdi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "mdi.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright © 2002 Robert Dickenson\0"
+#include <reactos/version.rc>

 
 //Microsoft Developer Studio generated resource script.
 //
 
 //Microsoft Developer Studio generated resource script.
 //


@@ -133,49 +140,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
 #endif    // APSTUDIO_INVOKED
 
 

-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-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 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Absolutely no warranties whatsoever - Use at your own risk\0"
-            VALUE "CompanyName", RES_STR_COMPANY_NAME
-            VALUE "FileDescription", "ReactOS MDI Sample Application by Robert Dickenson\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "mdi\0"
-            VALUE "LegalCopyright", "Copyright © 2002 Robert Dickenson\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "mdi.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-            VALUE "SpecialBuild", "Non-versioned Development Beta Release\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0xc09, 1200
-    END
-END
-
-

 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table
 /////////////////////////////////////////////////////////////////////////////
 //
 // String Table

diff --git a/rosapps/winfile/winfile.rc b/rosapps/winfile/winfile.rc
index 64fb4d2..961f8b3 100644 (file)
--- a/rosapps/winfile/winfile.rc
+++ b/rosapps/winfile/winfile.rc
@@ -1,5 +1,12 @@
+/* $Id: winfile.rc,v 1.11 2004/10/16 22:30:19 gvg Exp $ */
+

 #include <windows.h>
 #include <windows.h>

-#include <reactos/resource.h>
+
+#define REACTOS_STR_FILE_DESCRIPTION   "ReactOS File Manager by Robert Dickenson\0"
+#define REACTOS_STR_INTERNAL_NAME      "winfile\0"
+#define REACTOS_STR_ORIGINAL_FILENAME  "winfile.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright © 2002 Robert Dickenson\0"
+#include <reactos/version.rc>

 
 //Microsoft Developer Studio generated resource script.
 //
 
 //Microsoft Developer Studio generated resource script.
 //


@@ -525,52 +532,6 @@ END
 #endif    // APSTUDIO_INVOKED
 
 
 #endif    // APSTUDIO_INVOKED
 
 

-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-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 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "Absolutely no warranties whatsoever - Use at your own risk\0"
-            VALUE "CompanyName", RES_STR_COMPANY_NAME
-            VALUE "FileDescription", "ReactOS File Manager by Robert Dickenson\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "winfile\0"
-            VALUE "LegalCopyright", "Copyright © 2002 Robert Dickenson\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "winfile.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName",       RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",    RES_STR_PRODUCT_VERSION
-            VALUE "SpecialBuild", "Non-versioned Development Beta Release\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0xc09, 1200
-    END
-END
-
-#endif    // !_MAC
-
-

 /////////////////////////////////////////////////////////////////////////////
 //
 // Accelerator
 /////////////////////////////////////////////////////////////////////////////
 //
 // Accelerator