Commit in reactos on MAIN
config+1-11.23 -> 1.24
apps/tests/capclock/capclock.rc+7-391.1 -> 1.2
apps/utils/net/roshttpd/common/roshttpd.rc+5-381.1 -> 1.2
apps/utils/net/telnet/telnet.rc+5-381.1 -> 1.2
apps/utils/pice/module/pice.rc+6-381.1 -> 1.2
apps/utils/regsvr32/regsvr32.rc+5-371.2 -> 1.3
apps/utils/rundll32/rundll32.rc+5-371.1 -> 1.2
drivers/bus/acpi/acpi.rc+6-361.3 -> 1.4
drivers/bus/isapnp/isapnp.rc+6-361.4 -> 1.5
drivers/bus/pci/pci.rc+6-361.4 -> 1.5
drivers/dd/beep/beep.rc+6-371.5 -> 1.6
drivers/dd/blue/blue.rc+6-371.4 -> 1.5
drivers/dd/bootvid/bootvid.rc+6-361.1 -> 1.2
drivers/dd/debugout/debugout.rc+6-381.1 -> 1.2
drivers/dd/mpu401/mpu401.rc+6-371.1 -> 1.2
drivers/dd/null/null.rc+6-381.3 -> 1.4
drivers/dd/parallel/parallel.rc+6-381.3 -> 1.4
drivers/dd/serial/serial.rc+6-381.3 -> 1.4
drivers/dd/sndblst/sndblst.rc+6-371.1 -> 1.2
drivers/dd/sound/sb16.rc+6-381.1 -> 1.2
drivers/fs/cdfs/cdfs.rc+6-381.3 -> 1.4
drivers/fs/ext2/ext2fs.rc+6-381.3 -> 1.4
drivers/fs/fs_rec/fs_rec.rc+6-381.3 -> 1.4
drivers/fs/minix/minix.rc+6-381.3 -> 1.4
drivers/fs/ms/msfs.rc+6-381.3 -> 1.4
drivers/fs/mup/mup.rc+6-381.3 -> 1.4
drivers/fs/np/npfs.rc+6-381.3 -> 1.4
drivers/fs/ntfs/ntfs.rc+6-381.3 -> 1.4
drivers/fs/vfat/vfatfs.rc+6-381.3 -> 1.4
drivers/input/keyboard/keyboard.rc+6-381.3 -> 1.4
drivers/input/mouclass/mouclass.rc+6-381.3 -> 1.4
drivers/input/psaux/psaux.rc+6-381.3 -> 1.4
drivers/input/sermouse/sermouse.rc+6-381.2 -> 1.3
drivers/lib/undis/undis.rc+6-371.1 -> 1.2
drivers/net/afd/afd.rc+6-371.4 -> 1.5
drivers/net/dd/ne2000/ne2000.rc+6-371.3 -> 1.4
drivers/net/dd/pcnet/pcnet.rc+6-371.1 -> 1.2
drivers/net/lan/lan.rc+6-371.1 -> 1.2
drivers/net/ndis/ndis.rc+6-371.4 -> 1.5
drivers/net/tcpip/tcpip.rc+6-371.4 -> 1.5
drivers/net/tdi/misc/tdi.rc+6-381.3 -> 1.4
drivers/net/tditest/tditest.rc+6-371.3 -> 1.4
drivers/net/wshtcpip/wshtcpip.rc+6-381.3 -> 1.4
drivers/storage/atapi/atapi.rc+6-371.4 -> 1.5
drivers/storage/cdrom/cdrom.rc+6-371.4 -> 1.5
drivers/storage/class2/class2.rc+6-361.5 -> 1.6
drivers/storage/disk/disk.rc+6-371.4 -> 1.5
drivers/storage/diskdump/diskdump.rc+6-371.1 -> 1.2
drivers/storage/floppy/floppy.rc+7-371.1 -> 1.2
drivers/storage/scsiport/scsiport.rc+6-371.5 -> 1.6
drivers/test/csqtest/csqtest.rc+6-371.1 -> 1.2
drivers/video/displays/framebuf/framebuf.rc+5-381.1 -> 1.2
drivers/video/displays/vga/vgaddi.rc+6-371.1 -> 1.2
drivers/video/miniport/vbe/vbemp.rc+6-371.1 -> 1.2
drivers/video/miniport/vga/vgamp.rc+6-371.1 -> 1.2
drivers/video/videoprt/videoprt.rc+6-381.2 -> 1.3
hal/hal/hal.rc+6-361.3 -> 1.4
hal/halx86/halx86mp.rc+5-371.4 -> 1.5
          /halx86up.rc+5-371.4 -> 1.5
include/reactos/version.rc+130added 1.1
               /resource.h+2-11.18 -> 1.19
include/wine/wine_common_ver.rc+43-661.1 -> 1.2
lib/acledit/acledit.rc+5-371.1 -> 1.2
lib/aclui/aclui.rc+6-351.3 -> 1.4
lib/advapi32/advapi32.rc+5-371.7 -> 1.8
lib/advpack/advpack.rc+5-371.1 -> 1.2
lib/cards/cards.rc+6-351.5 -> 1.6
lib/commctrl/commctrl.rc+6-371.1 -> 1.2
lib/coredll/coredll.rc+6-371.1 -> 1.2
lib/cpl/access/access.rc+6-341.1 -> 1.2
lib/cpl/appwiz/appwiz.rc+9-341.2 -> 1.3
lib/cpl/control/control.rc+9-391.3 -> 1.4
lib/cpl/cplsample/cplsample.rc+8-341.2 -> 1.3
lib/cpl/desk/desk.rc+9-341.1 -> 1.2
lib/cpl/ncpa/ncpa.rc+11-341.3 -> 1.4
lib/cpl/sysdm/sysdm.rc+10-361.4 -> 1.5
lib/crtdll/crtdll.rc+5-371.6 -> 1.7
lib/d3d8/d3d8.rc+6-361.1 -> 1.2
lib/d3d8thk/d3d8thk.rc+5-381.1 -> 1.2
lib/d3d9/d3d9.rc+6-361.1 -> 1.2
lib/devmgr/devmgr.rc+7-371.1 -> 1.2
lib/dnsapi/dnsapi.rc+5-371.1 -> 1.2
lib/fmifs/fmifs.rc+5-381.6 -> 1.7
lib/freetype/freetype.rc+7added 1.1
            /Makefile+1-31.11 -> 1.12
            /README.ROS+2-11.6 -> 1.7
lib/gdi32/gdi32.rc+5-381.6 -> 1.7
lib/gdiplus/gdiplus.rc+5-381.1 -> 1.2
lib/hid/hid.rc+5-391.1 -> 1.2
lib/imagehlp/imagehlp.rc+5-371.1 -> 1.2
lib/imm32/imm32.rc+5-381.1 -> 1.2
lib/iphlpapi/iphlpapi.rc+5-391.1 -> 1.2
lib/iprtprio/iprtprio.rc+6-381.1 -> 1.2
lib/kbddv/kbddv.rc+5-361.1 -> 1.2
lib/kbdfr/kbdfr.rc+5-361.1 -> 1.2
lib/kbdgr/kbdgr.rc+5-361.1 -> 1.2
lib/kbdse/kbdse.rc+5-361.1 -> 1.2
lib/kbduk/kbduk.rc+5-361.1 -> 1.2
lib/kbdus/kbdus.rc+5-361.1 -> 1.2
lib/kernel32/kernel32.rc+5-401.9 -> 1.10
lib/kjs/kjs.rc+6-361.1 -> 1.2
lib/lzexpand/lz32.rc+5-381.1 -> 1.2
lib/mpr/Makefile.in+1-21.2 -> 1.3
       /Makefile.ros-template+1-31.2 -> 1.3
       /mpr.rc+21.7 -> 1.8
       /winehq2ros.patch+37-41.2 -> 1.3
lib/msafd/msafd.rc+5-391.3 -> 1.4
lib/msgina/msgina.rc+7-351.2 -> 1.3
lib/msvcrt/msvcrt.rc+5-371.4 -> 1.5
lib/msvcrt20/msvcrt20.rc+5-371.1 -> 1.2
lib/msvideo/msvfw32.rc+5-381.1 -> 1.2
lib/mswsock/mswsock.rc+6-401.1 -> 1.2
lib/netapi32/netapi32.rc+6-371.1 -> 1.2
lib/ntdll/def/ntdll.rc+6-361.3 -> 1.4
lib/odbc32/odbc32.rc+6-371.1 -> 1.2
lib/ole32/Makefile.in+1-11.4 -> 1.5
         /ole32res.rc+21.1 -> 1.2
         /winehq2ros.patch+37-51.6 -> 1.7
lib/oleaut32/Makefile.in+1-31.5 -> 1.6
            /oleaut32.rc+21.4 -> 1.5
lib/psapi/psapi.rc+6-371.3 -> 1.4
lib/rosky/libsky/libsky.rc+6-391.1 -> 1.2
lib/rosky/libskygi/libskygi.rc+6-391.1 -> 1.2
lib/samlib/samlib.rc+6-371.1 -> 1.2
lib/secur32/secur32.rc+6-371.4 -> 1.5
lib/shell32/Makefile.in+1-11.8 -> 1.9
           /shres.rc+21.7 -> 1.8
lib/shellext/slayer/slayer.rc+7-351.1 -> 1.2
lib/snmpapi/snmpapi.rc+6-381.1 -> 1.2
lib/syssetup/syssetup.rc+8-351.6 -> 1.7
lib/twain/twain_32.rc+6-371.1 -> 1.2
lib/user32/user32.rc+9-351.35 -> 1.36
lib/userenv/userenv.rc+9-371.2 -> 1.3
lib/version/version.rc+6-371.4 -> 1.5
lib/winfax/winfax.rc+6-371.1 -> 1.2
lib/winmm/midimap/midimap.rc+6-381.1 -> 1.2
lib/winmm/wavemap/wavemap.rc+6-381.1 -> 1.2
lib/winspool/winspool.rc+6-401.1 -> 1.2
lib/wintrust/wintrust.rc+6-381.1 -> 1.2
lib/ws2_32/ws2_32.rc+6-381.3 -> 1.4
lib/ws2help/ws2help.rc+6-381.3 -> 1.4
lib/wshirda/wshirda.rc+6-381.3 -> 1.4
lib/wsock32/wsock32.rc+6-401.1 -> 1.2
ntoskrnl/ntoskrnl.rc+5-371.10 -> 1.11
services/dhcpd/dhcpd.rc+5-371.1 -> 1.2
services/eventlog/eventlog.rc+4-381.4 -> 1.5
services/rpcss/rpcss.rc+5-371.4 -> 1.5
subsys/csrss/csrss.rc+4-381.4 -> 1.5
subsys/csrss/win32csr/win32csr.rc+5-381.2 -> 1.3
subsys/ntvdm/ntvdm.rc+5-371.1 -> 1.2
subsys/smss/smss.rc+5-371.4 -> 1.5
subsys/system/autochk/autochk.rc+4-381.3 -> 1.4
subsys/system/cmd/cmd.rc+6-361.4 -> 1.5
subsys/system/explorer/explorer.rc+8-361.5 -> 1.6
subsys/system/explorer/notifyhook/notifyhook.rc+6-361.1 -> 1.2
subsys/system/lsass/lsass.rc+5-371.2 -> 1.3
subsys/system/regedit/regedit.rc+7-351.3 -> 1.4
subsys/system/services/services.rc+5-371.4 -> 1.5
subsys/system/setup/setup.rc+5-371.1 -> 1.2
subsys/system/userinit/userinit.rc+5-361.1 -> 1.2
subsys/system/usetup/usetup.rc+5-371.1 -> 1.2
subsys/system/vmwinst/De.rc-331.4 -> 1.5
                     /Es.rc-331.3 -> 1.4
                     /vmwinst.rc+7-341.6 -> 1.7
subsys/system/welcome/De.rc-331.1 -> 1.2
                     /Es.rc-351.1 -> 1.2
                     /welcome.rc+7-341.5 -> 1.6
subsys/system/winlogon/winlogon.rc+7-341.8 -> 1.9
subsys/win32k/win32k.rc+6-371.6 -> 1.7
tools/buildno.c+34-11.5 -> 1.6
+1179-5676
2 added + 168 modified, total 170 files
- Centralize definition of version resource
- Give DLLs a high version number, so installers won't overwrite them

reactos
config 1.23 -> 1.24
diff -u -r1.23 -r1.24
--- config	4 Oct 2004 21:38:48 -0000	1.23
+++ config	16 Oct 2004 20:27:19 -0000	1.24
@@ -25,7 +25,7 @@
 #
 # Whether to compile for debugging
 #
-DBG := 
+DBG := 1
 
 #
 # Whether to compile with optimizations

reactos/apps/tests/capclock
capclock.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- capclock.rc	4 Sep 2003 21:33:11 -0000	1.1
+++ capclock.rc	16 Oct 2004 20:27:20 -0000	1.2
@@ -1,5 +1,11 @@
+/* $Id: capclock.rc,v 1.2 2004/10/16 20:27:20 gvg Exp $ */
+
 #include <windows.h>
-#include "../../../include/reactos/resource.h"
+
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS W32 Caption Clock\0"
+#define REACTOS_STR_INTERNAL_NAME	"capclock\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"capclock.exe\0"
+#include <reactos/version.rc>
 
 /* Icons */
 
@@ -12,41 +18,3 @@
 FONT 8, "Microsoft Sans Serif"
 BEGIN
 END
-
-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 W32 Caption Clock\0"
-            VALUE "FileVersion",	RES_STR_PRODUCT_VERSION
-            VALUE "InternalName",	"capclock\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"capclock.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
-

reactos/apps/utils/net/roshttpd/common
roshttpd.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- roshttpd.rc	27 Jan 2001 22:38:43 -0000	1.1
+++ roshttpd.rc	16 Oct 2004 20:27:20 -0000	1.2
@@ -1,39 +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",	"ReactOS HTTP Win32 Server\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"roshttpd\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright",	"Casper S. Hornstrup (chorns@users.sourceforge.net)\0"
-            VALUE "OriginalFilename",	"roshttpd.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: roshttpd.rc,v 1.2 2004/10/16 20:27:20 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTTP Win32 Server\0"
+#define REACTOS_STR_INTERNAL_NAME	"roshttpd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"roshttpd.exe\0"
+#include <reactos/version.rc>

reactos/apps/utils/net/telnet
telnet.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- telnet.rc	27 Jan 2001 22:38:43 -0000	1.1
+++ telnet.rc	16 Oct 2004 20:27:20 -0000	1.2
@@ -1,39 +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",	"ReactOS Telnet Win32 Client\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"telnet\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalCopyright",	"Anonymous sources found at http://www.telnet.org/\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.2 2004/10/16 20:27:20 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Telnet Win32 Client\0"
+#define REACTOS_STR_INTERNAL_NAME	"telnet\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"telnet.exe\0"
+#include <reactos/version.rc>

reactos/apps/utils/pice/module
pice.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- pice.rc	21 Oct 2001 04:46:15 -0000	1.1
+++ pice.rc	16 Oct 2004 20:27:20 -0000	1.2
@@ -1,39 +1,7 @@
+/* $Id: pice.rc,v 1.2 2004/10/16 20:27:20 gvg Exp $ */
 
-#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",	"PICE Debugger\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"pice\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"pice.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"PICE Debugger\0"
+#define REACTOS_STR_INTERNAL_NAME	"pice\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"pice.sys\0"
+#include <reactos/version.rc>

reactos/apps/utils/regsvr32
regsvr32.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- regsvr32.rc	20 Feb 2004 15:05:36 -0000	1.2
+++ regsvr32.rc	16 Oct 2004 20:27:21 -0000	1.3
@@ -1,38 +1,6 @@
-#include <defines.h>
-#include <reactos/resource.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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",	"Register a COM component in the registry\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"regsvr32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"regsvr32.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: regsvr32.rc,v 1.3 2004/10/16 20:27:21 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"Register a COM component in the registry\0"
+#define REACTOS_STR_INTERNAL_NAME	"regsvr32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"regsvr32.exe\0"
+#include <reactos/version.rc>

reactos/apps/utils/rundll32
rundll32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- rundll32.rc	7 Nov 2003 09:12:44 -0000	1.1
+++ rundll32.rc	16 Oct 2004 20:27:21 -0000	1.2
@@ -1,38 +1,6 @@
-#include <defines.h>
-#include <reactos/resource.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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",	"Run a DLL as an App\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"rundll32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"rundll32.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: rundll32.rc,v 1.2 2004/10/16 20:27:21 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"Run a DLL as an App\0"
+#define REACTOS_STR_INTERNAL_NAME	"rundll32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"rundll32.exe\0"
+#include <reactos/version.rc>

reactos/drivers/bus/acpi
acpi.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- acpi.rc	8 Sep 2002 10:22:02 -0000	1.3
+++ acpi.rc	16 Oct 2004 20:27:21 -0000	1.4
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: acpi.rc,v 1.4 2004/10/16 20:27:21 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 ACPI Driver\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-	          VALUE "InternalName",	"acpi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"acpi.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS ACPI Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"acpi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"acpi.sys\0"
+#include <reactos/version.rc>

reactos/drivers/bus/isapnp
isapnp.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- isapnp.rc	17 Nov 2002 04:00:30 -0000	1.4
+++ isapnp.rc	16 Oct 2004 20:27:21 -0000	1.5
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: isapnp.rc,v 1.5 2004/10/16 20:27:21 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",	"ISA Plug And Play Bus Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"isapnp\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"isapnp.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ISA Plug And Play Bus Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"isapnp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"isapnp.sys\0"
+#include <reactos/version.rc>

reactos/drivers/bus/pci
pci.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- pci.rc	17 Nov 2002 04:00:30 -0000	1.4
+++ pci.rc	16 Oct 2004 20:27:21 -0000	1.5
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: pci.rc,v 1.5 2004/10/16 20:27:21 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",	"PCI Bus Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"pci\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"pci.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"PCI Bus Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"pci\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"pci.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/beep
beep.rc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- beep.rc	17 Nov 2002 04:00:30 -0000	1.5
+++ beep.rc	16 Oct 2004 20:27:21 -0000	1.6
@@ -1,38 +1,7 @@
-#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",	"PC Speaker Device Driver\0"
-            VALUE "FileVersion",	"0.0.3\0"
-            VALUE "InternalName",	"beep\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"beep.sys\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: beep.rc,v 1.6 2004/10/16 20:27:21 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"PC Speaker Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"beep\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"beep.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/blue
blue.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- blue.rc	17 Nov 2002 04:00:30 -0000	1.4
+++ blue.rc	16 Oct 2004 20:27:21 -0000	1.5
@@ -1,38 +1,7 @@
-#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",	"HAL Console Device Driver\0"
-            VALUE "FileVersion",	"0.0.6\0"
-            VALUE "InternalName",	"blue\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"blue.sys\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: blue.rc,v 1.5 2004/10/16 20:27:21 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"HAL Console Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"blue\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"blue.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/bootvid
bootvid.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- bootvid.rc	24 Aug 2003 12:11:13 -0000	1.1
+++ bootvid.rc	16 Oct 2004 20:27:21 -0000	1.2
@@ -1,40 +1,10 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: bootvid.rc,v 1.2 2004/10/16 20:27:21 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 Boot Video\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-	    VALUE "InternalName",	"bootvid\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"bootvid.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Boot Video\0"
+#define REACTOS_STR_INTERNAL_NAME	"bootvid\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"bootvid.sys\0"
+#include <reactos/version.rc>
 
 IDB_BOOTIMAGE   BITMAP  DISCARDABLE   "bootimage.bmp"
 

reactos/drivers/dd/debugout
debugout.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- debugout.rc	22 May 2003 15:11:29 -0000	1.1
+++ debugout.rc	16 Oct 2004 20:27:22 -0000	1.2
@@ -1,39 +1,7 @@
+/* $Id: debugout.rc,v 1.2 2004/10/16 20:27:22 gvg Exp $ */
 
-#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",	"Debug output Device Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"debug\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"debugout.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Debug output Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"debugout\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"debugout.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/mpu401
mpu401.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- mpu401.rc	20 Jan 2004 19:58:48 -0000	1.1
+++ mpu401.rc	16 Oct 2004 20:27:23 -0000	1.2
@@ -1,38 +1,7 @@
-#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",    "MPU-401 MIDI Driver\0"
-            VALUE "FileVersion",    "0.0.1\0"
-            VALUE "InternalName",   "mpu401\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",   "mpu401.sys\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: mpu401.rc,v 1.2 2004/10/16 20:27:23 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"MPU-401 MIDI Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"mpu401\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"mpu401.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/null
null.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- null.rc	8 Sep 2002 10:22:05 -0000	1.3
+++ null.rc	16 Oct 2004 20:27:23 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: null.rc,v 1.4 2004/10/16 20:27:23 gvg Exp $ */
 
-#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",	"Null Device Driver\0"
-            VALUE "FileVersion",	"0.0.2\0"
-            VALUE "InternalName",	"null\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"null.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Null Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"null\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"null.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/parallel
parallel.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- parallel.rc	8 Sep 2002 10:22:05 -0000	1.3
+++ parallel.rc	16 Oct 2004 20:27:23 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: parallel.rc,v 1.4 2004/10/16 20:27:23 gvg Exp $ */
 
-#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",	"Parallel Port Device Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"parallel\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"parallel.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Parallel Port Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"parallel\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"parallel.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/serial
serial.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- serial.rc	8 Sep 2002 10:22:06 -0000	1.3
+++ serial.rc	16 Oct 2004 20:27:23 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: serial.rc,v 1.4 2004/10/16 20:27:23 gvg Exp $ */
 
-#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",	"Serial Port Device Driver\0"
-            VALUE "FileVersion",	"0.0.2\0"
-            VALUE "InternalName",	"serial\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"serial.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Serial Port Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"serial\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"serial.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/sndblst
sndblst.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- sndblst.rc	20 Jan 2004 19:35:59 -0000	1.1
+++ sndblst.rc	16 Oct 2004 20:27:23 -0000	1.2
@@ -1,38 +1,7 @@
-#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",    "MPU-401 MIDI Driver\0"
-            VALUE "FileVersion",    "0.0.1\0"
-            VALUE "InternalName",   "mpu401\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",   "mpu401.sys\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: sndblst.rc,v 1.2 2004/10/16 20:27:23 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"SoundBlaster Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"sndblst\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"sndblst.sys\0"
+#include <reactos/version.rc>

reactos/drivers/dd/sound
sb16.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- sb16.rc	20 Jan 2004 00:29:48 -0000	1.1
+++ sb16.rc	16 Oct 2004 20:27:23 -0000	1.2
@@ -1,39 +1,7 @@
-#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",	"ReactOS Boot Video\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-	    VALUE "InternalName",	"sb16\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"sb16.sys\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: sb16.rc,v 1.2 2004/10/16 20:27:23 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"SB16 driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"sb16\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"sb16.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/cdfs
cdfs.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- cdfs.rc	8 Sep 2002 10:22:08 -0000	1.3
+++ cdfs.rc	16 Oct 2004 20:27:23 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: cdfs.rc,v 1.4 2004/10/16 20:27:23 gvg Exp $ */
 
-#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",	"ISO9660 Driver\0"
-            VALUE "FileVersion",	"0.0.6\0"
-            VALUE "InternalName",	"cdfs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"cdfs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ISO9660 Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"cdfs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"cdfs.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/ext2
ext2fs.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ext2fs.rc	8 Sep 2002 10:22:09 -0000	1.3
+++ ext2fs.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: ext2fs.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Linux ext2 IFS Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"ext2fs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ext2fs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Linux ext2 IFS Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"ext2fs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ext2fs.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/fs_rec
fs_rec.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- fs_rec.rc	8 Sep 2002 10:22:09 -0000	1.3
+++ fs_rec.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: fs_rec.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Filesystem recognizer driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"fs_rec\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"fs_rec.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Filesystem recognizer driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"fs_rec\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"fs_rec.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/minix
minix.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- minix.rc	8 Sep 2002 10:22:10 -0000	1.3
+++ minix.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: minix.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Minix IFS Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"minixfs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"minixfs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Minix IFS Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"minix\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"minix.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/ms
msfs.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- msfs.rc	8 Sep 2002 10:22:10 -0000	1.3
+++ msfs.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: msfs.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Mailslot IFS Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"msfs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"msfs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Mailslot IFS Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"msfs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"msfs.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/mup
mup.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- mup.rc	8 Sep 2002 10:22:11 -0000	1.3
+++ mup.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: mup.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Multi UNC Provider\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"mup\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"mup.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Multi UNC Provider\0"
+#define REACTOS_STR_INTERNAL_NAME	"mup\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"mup.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/np
npfs.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- npfs.rc	8 Sep 2002 10:22:11 -0000	1.3
+++ npfs.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: npfs.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Named Pipe IFS Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"npfs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"npfs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Named Pipe IFS Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"npfs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"npfs.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/ntfs
ntfs.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ntfs.rc	8 Sep 2002 10:22:12 -0000	1.3
+++ ntfs.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: ntfs.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"NTFS Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"ntfs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ntfs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"NTFS Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"ntfs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ntfs.sys\0"
+#include <reactos/version.rc>

reactos/drivers/fs/vfat
vfatfs.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- vfatfs.rc	8 Sep 2002 10:22:13 -0000	1.3
+++ vfatfs.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: vfatfs.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"VFAT IFS Driver\0"
-            VALUE "FileVersion",	"0.0.6\0"
-            VALUE "InternalName",	"vfatfs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vfatfs.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"VFAT IFS Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"vfatfs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"vfatfs.sys\0"
+#include <reactos/version.rc>

reactos/drivers/input/keyboard
keyboard.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- keyboard.rc	8 Sep 2002 10:22:13 -0000	1.3
+++ keyboard.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: keyboard.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Keyboard Device Driver\0"
-            VALUE "FileVersion",	"0.0.4\0"
-            VALUE "InternalName",	"keyboard\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"keyboard.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Keyboard Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"keyboard\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"keyboard.sys\0"
+#include <reactos/version.rc>

reactos/drivers/input/mouclass
mouclass.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- mouclass.rc	8 Sep 2002 10:22:13 -0000	1.3
+++ mouclass.rc	16 Oct 2004 20:27:24 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: mouclass.rc,v 1.4 2004/10/16 20:27:24 gvg Exp $ */
 
-#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",	"Mouse Class Device Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"mouclass\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"mouclass.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Mouse Class Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"mouclass\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"mouclass.sys\0"
+#include <reactos/version.rc>

reactos/drivers/input/psaux
psaux.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- psaux.rc	8 Sep 2002 10:22:14 -0000	1.3
+++ psaux.rc	16 Oct 2004 20:27:25 -0000	1.4
@@ -1,39 +1,7 @@
+/* $Id: psaux.rc,v 1.4 2004/10/16 20:27:25 gvg Exp $ */
 
-#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",	"PS Auxiliary Device Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"psaux\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"psaux.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"PS Auxiliary Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"psaux\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"psaux.sys\0"
+#include <reactos/version.rc>

reactos/drivers/input/sermouse
sermouse.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- sermouse.rc	28 Aug 2003 19:44:00 -0000	1.2
+++ sermouse.rc	16 Oct 2004 20:27:25 -0000	1.3
@@ -1,39 +1,7 @@
+/* $Id: sermouse.rc,v 1.3 2004/10/16 20:27:25 gvg Exp $ */
 
-#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",	"Serial Mouse Device Driver\0"
-            VALUE "FileVersion",	"0.0.8\0"
-            VALUE "InternalName",	"sermouse\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"sermouse.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Serial Mouse Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"sermouse\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"sermouse.sys\0"
+#include <reactos/version.rc>

reactos/drivers/lib/undis
undis.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- undis.rc	1 Oct 2004 02:31:05 -0000	1.1
+++ undis.rc	16 Oct 2004 20:27:25 -0000	1.2
@@ -1,38 +1,7 @@
-#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",  "NDIS Library\0"
-            VALUE "FileVersion",	  "0.1.4\0"
-            VALUE "InternalName",	  "ndis\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "ndis.sys\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: undis.rc,v 1.2 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"NDIS Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"ndis\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ndis\0"
+#include <reactos/version.rc>

reactos/drivers/net/afd
afd.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- afd.rc	25 Dec 2003 18:35:20 -0000	1.4
+++ afd.rc	16 Oct 2004 20:27:25 -0000	1.5
@@ -1,38 +1,7 @@
-#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",  "Socket Filesystem Driver\0"
-            VALUE "FileVersion",      "0.0.0\0"
-            VALUE "InternalName",     "afd\0"
-            VALUE "LegalCopyright",   RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "afd.sys\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: afd.rc,v 1.5 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Socket Filesystem Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"afd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"afd.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/dd/ne2000
ne2000.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ne2000.rc	8 Sep 2002 10:22:15 -0000	1.3
+++ ne2000.rc	16 Oct 2004 20:27:25 -0000	1.4
@@ -1,38 +1,7 @@
-#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",  "Novell NE2000 network driver\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "ne2000\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "ne2000.sys\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: ne2000.rc,v 1.4 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Novell NE2000 network driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"ne2000\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ne2000.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/dd/pcnet
pcnet.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- pcnet.rc	3 Sep 2003 23:59:56 -0000	1.1
+++ pcnet.rc	16 Oct 2004 20:27:25 -0000	1.2
@@ -1,38 +1,7 @@
-#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",  "PCNet Ethernet PCI Driver\0"
-            VALUE "FileVersion",	  "0.0.1\0"
-            VALUE "InternalName",	  "pcnet\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "pcnet.sys\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: pcnet.rc,v 1.2 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"PCNet Ethernet PCI Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"pcnet\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"pcnet.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/lan
lan.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lan.rc	17 Sep 2004 15:50:15 -0000	1.1
+++ lan.rc	16 Oct 2004 20:27:25 -0000	1.2
@@ -1,38 +1,7 @@
-#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",  "TCP/IP protocol driver\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "tcpip\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "tcpip.sys\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: lan.rc,v 1.2 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"TCP/IP protocol driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"lan\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"lan.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/ndis
ndis.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- ndis.rc	12 Oct 2003 16:39:52 -0000	1.4
+++ ndis.rc	16 Oct 2004 20:27:25 -0000	1.5
@@ -1,38 +1,7 @@
-#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",  "NDIS Library\0"
-            VALUE "FileVersion",	  "0.1.4\0"
-            VALUE "InternalName",	  "ndis\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "ndis.sys\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: ndis.rc,v 1.5 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"NDIS Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"ndis\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ndis.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/tcpip
tcpip.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- tcpip.rc	8 Sep 2002 10:22:17 -0000	1.4
+++ tcpip.rc	16 Oct 2004 20:27:25 -0000	1.5
@@ -1,38 +1,7 @@
-#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",  "TCP/IP protocol driver\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "tcpip\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "tcpip.sys\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: tcpip.rc,v 1.5 2004/10/16 20:27:25 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"TCP/IP protocol driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"tcpip\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"tcpip.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/tdi/misc
tdi.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- tdi.rc	8 Sep 2002 10:22:19 -0000	1.3
+++ tdi.rc	16 Oct 2004 20:27:26 -0000	1.4
@@ -1,39 +1,7 @@
-/* $Id: tdi.rc,v 1.3 2002/09/08 10:22:19 chorns Exp $ */
-#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",	"TDI wrapper kernel module\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"tdi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"tdi.sys\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: tdi.rc,v 1.4 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"TDI wrapper kernel module\0"
+#define REACTOS_STR_INTERNAL_NAME	"tdi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"tdi.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/tditest
tditest.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- tditest.rc	8 Sep 2002 10:22:20 -0000	1.3
+++ tditest.rc	16 Oct 2004 20:27:26 -0000	1.4
@@ -1,38 +1,7 @@
-#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",  "TDI test driver\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "tditest\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "tditest.sys\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: tditest.rc,v 1.4 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"TDI test driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"tditest\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"tditest.sys\0"
+#include <reactos/version.rc>

reactos/drivers/net/wshtcpip
wshtcpip.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- wshtcpip.rc	8 Sep 2002 10:22:21 -0000	1.3
+++ wshtcpip.rc	16 Oct 2004 20:27:26 -0000	1.4
@@ -1,39 +1,7 @@
-#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",	"Windows Sockets 2 API\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"ws2_32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ws2_32.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: wshtcpip.rc,v 1.4 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows Sockets 2 API\0"
+#define REACTOS_STR_INTERNAL_NAME	"wshtcpip\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"wshtcpip.dll\0"
+#include <reactos/version.rc>

reactos/drivers/storage/atapi
atapi.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- atapi.rc	17 Nov 2002 04:00:31 -0000	1.4
+++ atapi.rc	16 Oct 2004 20:27:26 -0000	1.5
@@ -1,38 +1,7 @@
-#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",	"ATAPI Device Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"atapi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"atapi.sys\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: atapi.rc,v 1.5 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ATAPI Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"atapi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"atapi.sys\0"
+#include <reactos/version.rc>

reactos/drivers/storage/cdrom
cdrom.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- cdrom.rc	17 Nov 2002 04:00:31 -0000	1.4
+++ cdrom.rc	16 Oct 2004 20:27:26 -0000	1.5
@@ -1,38 +1,7 @@
-#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",	"CD-ROM Class Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"cdrom\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"cdrom.sys\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: cdrom.rc,v 1.5 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"CD-ROM Class Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"cdrom\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"cdrom.sys\0"
+#include <reactos/version.rc>

reactos/drivers/storage/class2
class2.rc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- class2.rc	17 Nov 2002 04:00:31 -0000	1.5
+++ class2.rc	16 Oct 2004 20:27:26 -0000	1.6
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: class2.rc,v 1.6 2004/10/16 20:27:26 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",	"SCSI Class Driver Helper\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"class2\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"class2.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"SCSI Class Driver Helper\0"
+#define REACTOS_STR_INTERNAL_NAME	"class2\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"class2.sys\0"
+#include <reactos/version.rc>

reactos/drivers/storage/disk
disk.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- disk.rc	17 Nov 2002 04:00:32 -0000	1.4
+++ disk.rc	16 Oct 2004 20:27:26 -0000	1.5
@@ -1,38 +1,7 @@
-#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",	"Disk Class Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"disk\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"disk.sys\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: disk.rc,v 1.5 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Disk Class Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"disk\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"disk.sys\0"
+#include <reactos/version.rc>

reactos/drivers/storage/diskdump
diskdump.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- diskdump.rc	27 Aug 2003 21:28:08 -0000	1.1
+++ diskdump.rc	16 Oct 2004 20:27:26 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"Crash Dump Disk Driver\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"diskdump\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"diskdump.sys\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: diskdump.rc,v 1.2 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Crash Dump Disk Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"diskdump\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"diskdump.sys\0"
+#include <reactos/version.rc>

reactos/drivers/storage/floppy
floppy.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- floppy.rc	1 Mar 2004 06:37:26 -0000	1.1
+++ floppy.rc	16 Oct 2004 20:27:26 -0000	1.2
@@ -1,4 +1,5 @@
-/*
+/* $Id: floppy.rc,v 1.2 2004/10/16 20:27:26 gvg Exp $
+ *
  *  ReactOS Floppy Driver
  *  Copyright (C) 2004, Vizzini (vizzini@plasmic.com)
  *
@@ -23,40 +24,9 @@
  * REVISIONS:
  *                  15-Feb-2004 vizzini - Created
  */
-#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",	"Floppy Disk Controller Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"floppy\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"floppy.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Floppy Disk Controller Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"floppy\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"floppy.sys\0"
+#include <reactos/version.rc>

reactos/drivers/storage/scsiport
scsiport.rc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- scsiport.rc	7 Jun 2004 16:37:07 -0000	1.5
+++ scsiport.rc	16 Oct 2004 20:27:26 -0000	1.6
@@ -1,38 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
-#include "scsiport_int.h"
+/* $Id: scsiport.rc,v 1.6 2004/10/16 20:27:26 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",	"SCSI Port Driver\0"
-            VALUE "FileVersion",	VERSION
-            VALUE "InternalName",	"scsiport\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"scsiport.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"SCSI Port Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"scsiport\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"scsiport.sys\0"
+#include <reactos/version.rc>

reactos/drivers/test/csqtest
csqtest.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- csqtest.rc	9 Feb 2004 06:59:01 -0000	1.1
+++ csqtest.rc	16 Oct 2004 20:27:26 -0000	1.2
@@ -1,38 +1,7 @@
-#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",  "CSQ Test\0"
-            VALUE "FileVersion",	  "0.1.4\0"
-            VALUE "InternalName",	  "csqtest\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "csqtest.sys\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: csqtest.rc,v 1.2 2004/10/16 20:27:26 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"CSQ Test\0"
+#define REACTOS_STR_INTERNAL_NAME	"csqtest\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"csqtest.sys\0"
+#include <reactos/version.rc>

reactos/drivers/video/displays/framebuf
framebuf.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- framebuf.rc	13 Jan 2004 17:18:33 -0000	1.1
+++ framebuf.rc	16 Oct 2004 20:27:27 -0000	1.2
@@ -1,38 +1,5 @@
-#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",	"Framebuffer Display Driver\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"framebuf\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"framebuf.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Framebuffer Display Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"framebuf\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"framebuf.dll\0"
+#include <reactos/version.rc>

reactos/drivers/video/displays/vga
vgaddi.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- vgaddi.rc	10 Jan 2004 14:39:20 -0000	1.1
+++ vgaddi.rc	16 Oct 2004 20:27:28 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"VGA Display Driver\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"vgaddi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vgaddi.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: vgaddi.rc,v 1.2 2004/10/16 20:27:28 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"VGA Display Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"vgaddi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"vgaddi.dll\0"
+#include <reactos/version.rc>

reactos/drivers/video/miniport/vbe
vbemp.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- vbemp.rc	10 Jan 2004 14:39:21 -0000	1.1
+++ vbemp.rc	16 Oct 2004 20:27:28 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"VGA Miniport Device Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"vgamp\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vgamp.sys\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: vbemp.rc,v 1.2 2004/10/16 20:27:28 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"VBE Miniport Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"vbemp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"vbemp.sys\0"
+#include <reactos/version.rc>

reactos/drivers/video/miniport/vga
vgamp.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- vgamp.rc	10 Jan 2004 14:39:21 -0000	1.1
+++ vgamp.rc	16 Oct 2004 20:27:29 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"VGA Miniport Device Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"vgamp\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vgamp.sys\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: vgamp.rc,v 1.2 2004/10/16 20:27:29 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"VGA Miniport Device Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"vgamp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"vgamp.sys\0"
+#include <reactos/version.rc>

reactos/drivers/video/videoprt
videoprt.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- videoprt.rc	19 Mar 2004 20:58:32 -0000	1.2
+++ videoprt.rc	16 Oct 2004 20:27:29 -0000	1.3
@@ -1,39 +1,7 @@
+/* $Id: videoprt.rc,v 1.3 2004/10/16 20:27:29 gvg Exp $ */
 
-#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",	"Videoport Driver\0"
-            VALUE "FileVersion",	"0.0.0\0"
-            VALUE "InternalName",	"videoprt\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"videoprt.sys\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_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Videoport Driver\0"
+#define REACTOS_STR_INTERNAL_NAME	"videoprt\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"videoprt.sys\0"
+#include <reactos/version.rc>

reactos/hal/hal
hal.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- hal.rc	8 Sep 2002 10:22:24 -0000	1.3
+++ hal.rc	16 Oct 2004 20:27:29 -0000	1.4
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: hal.rc,v 1.4 2004/10/16 20:27:29 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",  "Template Hardware Abstraction Layer\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "hal\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "hal.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
\ No newline at end of file
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Template Hardware Abstraction Layer\0"
+#define REACTOS_STR_INTERNAL_NAME	"hal\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"hal.dll\0"
+#include <reactos/version.rc>

reactos/hal/halx86
halx86mp.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- halx86mp.rc	8 Sep 2002 10:22:24 -0000	1.4
+++ halx86mp.rc	16 Oct 2004 20:27:29 -0000	1.5
@@ -1,37 +1,5 @@
-#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",  "X86 Multiprocessor Hardware Abstraction Layer\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "halx86mp\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "halx86mp.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"X86 Multiprocessor Hardware Abstraction Layer\0"
+#define REACTOS_STR_INTERNAL_NAME	"halx86mp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"halx86mp.dll\0"
+#include <reactos/version.rc>

reactos/hal/halx86
halx86up.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- halx86up.rc	8 Sep 2002 10:22:24 -0000	1.4
+++ halx86up.rc	16 Oct 2004 20:27:29 -0000	1.5
@@ -1,37 +1,5 @@
-#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",  "X86 Uniprocessor Hardware Abstraction Layer\0"
-            VALUE "FileVersion",	  "0.0.0\0"
-            VALUE "InternalName",	  "halx86up\0"
-            VALUE "LegalCopyright",	  RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename", "halx86up.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"X86 Uniprocessor Hardware Abstraction Layer\0"
+#define REACTOS_STR_INTERNAL_NAME	"halx86up\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"halx86up.dll\0"
+#include <reactos/version.rc>

reactos/include/reactos
version.rc added at 1.1
diff -N version.rc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ version.rc	16 Oct 2004 20:27:29 -0000	1.1
@@ -0,0 +1,130 @@
+/* $Id: version.rc,v 1.1 2004/10/16 20:27:29 gvg Exp $
+ *
+ * Inspired by Wine file include/wine_common_ver.rc
+ * Copyright 2001 Dmitry Timoshkov
+ *
+ * Most version components are set to reasonable defaults here.
+ * If you're including this for a .DLL, #define REACTOS_VERSION_DLL before the #include.
+ * Other things to #define:
+ * REACTOS_STR_FILE_DESCRIPTION
+ * REACTOS_STR_INTERNAL_NAME
+ * REACTOS_STR_ORIGINAL_FILENAME
+ *
+ */
+
+#include "winver.h"
+#include "version.h"
+#include "buildno.h"
+
+/* Set defaults for everything, unless overridden */
+#ifndef REACTOS_FILEVERSION
+#ifdef REACTOS_VERSION_DLL
+#define REACTOS_FILEVERSION REACTOS_DLL_VERSION_MAJOR,KERNEL_VERSION_MINOR,KERNEL_VERSION_PATCH_LEVEL,0
+#else
+#define REACTOS_FILEVERSION KERNEL_VERSION_MAJOR,KERNEL_VERSION_MINOR,KERNEL_VERSION_PATCH_LEVEL,0
+#endif /* REACTOS_VERSION_DLL */
+#endif /* REACTOS_FILEVERSION */
+
+#ifndef REACTOS_PRODUCTVERSION
+#define REACTOS_PRODUCTVERSION KERNEL_VERSION_MAJOR,KERNEL_VERSION_MINOR,KERNEL_VERSION_PATCH_LEVEL,0
+#endif /* REACTOS_PRODUCTVERSION */
+
+#ifndef REACTOS_FILEFLAGSMASK
+#define REACTOS_FILEFLAGSMASK 0x3fL
+#endif /* REACTOS_FILEFLAGSMASK */
+
+#ifndef REACTOS_FILEFLAGS
+#ifdef _DEBUG
+#define REACTOS_FILEFLAGS VS_FF_DEBUG
+#else
+#define REACTOS_FILEFLAGS 0x0L
+#endif /* _DEBUG */
+#endif /* REACTOS_FILEFLAGS */
+
+#ifndef REACTOS_FILEOS
+#define REACTOS_FILEOS VOS_NT_WINDOWS32
+#endif /* REACTOS_FILEOS */
+
+#ifndef REACTOS_FILETYPE
+#ifdef REACTOS_VERSION_DLL
+#define REACTOS_FILETYPE VFT_DLL
+#else
+#define REACTOS_FILETYPE VFT_APP
+#endif /* REACTOS_VERSION_DLL */
+#endif /* REACTOS_FILETYPE */
+
+#ifndef REACTOS_FILESUBTYPE
+#define REACTOS_FILESUBTYPE VFT2_UNKNOWN
+#endif /* REACTOS_FILESUBTYPE */
+
+#ifndef REACTOS_STR_COMPANY_NAME
+#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team\0"
+#endif /* REACTOS_STR_COMPANY_NAME */
+
+#ifndef REACTOS_STR_FILE_DESCRIPTION
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS core dll\0"
+#endif /* REACTOS_STR_FILE_DESCRIPTION */
+
+#ifndef REACTOS_STR_FILE_VERSION
+#ifdef REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_VERSION REACTOS_DLL_VERSION_RC
+#else
+#define REACTOS_STR_FILE_VERSION KERNEL_VERSION_RC
+#endif /* REACTOS_VERSION_DLL */
+#endif /* REACTOS_STR_FILE_VERSION */
+
+#ifndef REACTOS_STR_INTERNAL_NAME
+#define REACTOS_STR_INTERNAL_NAME "\0"
+#endif /* REACTOS_STR_INTERNAL_NAME */
+
+#ifndef REACTOS_STR_LEGAL_COPYRIGHT
+#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2004 ReactOS Team\0"
+#endif /* REACTOS_STR_LEGAL_COPYRIGHT */
+
+#ifndef REACTOS_STR_ORIGINAL_FILENAME
+#define REACTOS_STR_ORIGINAL_FILENAME "\0"
+#endif /* REACTOS_STR_ORIGINAL_FILENAME */
+
+#ifndef REACTOS_STR_PRODUCT_NAME
+#define REACTOS_STR_PRODUCT_NAME "ReactOS Operating System\0"
+#endif /* REACTOS_STR_PRODUCT_NAME */
+
+#ifndef REACTOS_STR_PRODUCT_VERSION
+#define REACTOS_STR_PRODUCT_VERSION KERNEL_VERSION_RC
+#endif /* REACTOS_STR_PRODUCT_VERSION */
+
+/* The version resource itself */
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION		REACTOS_FILEVERSION
+  PRODUCTVERSION	REACTOS_PRODUCTVERSION
+  FILEFLAGSMASK		REACTOS_FILEFLAGSMASK
+  FILEFLAGS		REACTOS_FILEFLAGS
+  FILEOS		REACTOS_FILEOS
+  FILETYPE		REACTOS_FILETYPE
+  FILESUBTYPE		REACTOS_FILESUBTYPE
+  BEGIN
+    BLOCK "StringFileInfo"
+      BEGIN
+        BLOCK "040904b0"
+          BEGIN
+            VALUE "CompanyName",	REACTOS_STR_COMPANY_NAME
+            VALUE "FileDescription",	REACTOS_STR_FILE_DESCRIPTION
+            VALUE "FileVersion",	REACTOS_STR_FILE_VERSION
+            VALUE "InternalName",	REACTOS_STR_INTERNAL_NAME
+#ifdef REACTOS_ORIGINAL_COPYRIGHT
+            VALUE "OriginalCopyright",	REACTOS_STR_ORIGINAL_COPYRIGHT
+#endif /* REACTOS_ORIGINAL_COPYRIGHT */
+            VALUE "LegalCopyright",	REACTOS_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	REACTOS_STR_ORIGINAL_FILENAME
+            VALUE "ProductName",	REACTOS_STR_PRODUCT_NAME
+            VALUE "ProductVersion",	REACTOS_STR_PRODUCT_VERSION
+#ifdef REACTOS_OLESELFREGISTER
+	    VALUE "OLESelfRegister",	""
+#endif /* REACTOS_OLESELFREGISTER */
+          END
+      END
+    BLOCK "VarFileInfo"
+      BEGIN
+        VALUE "Translation", 0x409, 1200
+      END
+  END

reactos/include/reactos
resource.h 1.18 -> 1.19
diff -u -r1.18 -r1.19
--- resource.h	24 Mar 2004 21:46:19 -0000	1.18
+++ resource.h	16 Oct 2004 20:27:29 -0000	1.19
@@ -5,7 +5,8 @@
 
 /* Global File Version UINTs */
 
-#define RES_UINT_FV_MAJOR	KERNEL_VERSION_MAJOR
+#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 */

reactos/include/wine
wine_common_ver.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- wine_common_ver.rc	22 Aug 2003 23:34:30 -0000	1.1
+++ wine_common_ver.rc	16 Oct 2004 20:27:29 -0000	1.2
@@ -16,71 +16,48 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "winver.h"
+/* Convert Wine #defines to ReactOS #defines */
+#ifdef WINE_FILEVERSION
+#define REACTOS_FILEVERSION WINE_FILEVERSION
+#endif /* WINE_FILEVERSION */
+
+#ifdef WINE_FILEVERSION_STR
+#define REACTOS_STR_FILE_VERSION WINE_FILEVERSION_STR
+#endif /* WINE_FILEVERSION_STR */
+
+#ifdef WINE_FILEDESCRIPTION_STR
+#define REACTOS_STR_FILE_DESCRIPTION WINE_FILEDESCRIPTION_STR
+#else
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Wine core dll\0"
+#endif /* WINE_FILEDESCRIPTION_STR */
+
+#ifdef WINE_FILENAME_STR
+#define REACTOS_STR_INTERNAL_NAME WINE_FILENAME_STR
+#define REACTOS_STR_ORIGINAL_FILENAME WINE_FILENAME_STR
+#endif /* WINE_FILENAME_STR */
+
+#ifdef WINE_PRODUCTVERSION
+#define REACTOS_PRODUCT_VERSION WINE_PRODUCTVERSION
+#endif /* WINE_PRODUCTVERSION */
+
+#ifdef WINE_PRODUCTVERSION_STR
+#define REACTOS_STR_PRODUCT_VERSION WINE_PRODUCTVERSION_STR
+#endif /* WINE_PRODUCTVERSION_STR */
+
+#ifdef WINE_PRODUCTNAME_STR
+#define REACTOS_STR_PRODUCT_NAME WINE_PRODUCTNAME_STR
+#endif /* WINE_PRODUCTNAME_STR */
 
-/*
-Assign WINE_FILEVERSION and WINE_FILEVERSION_STR high enough number
-to make sure that programs, relying on the version numbers, will
-never complain.
-*/
-
-#ifndef WINE_FILEVERSION
-#define WINE_FILEVERSION 10,0,0,0
-#endif
-
-#ifndef WINE_FILEVERSION_STR
-#define WINE_FILEVERSION_STR "10.0"
-#endif
-
-#ifndef WINE_FILEDESCRIPTION_STR
-#define WINE_FILEDESCRIPTION_STR "Wine core dll"
-#endif
-
-#ifndef WINE_FILENAME_STR
-#define WINE_FILENAME_STR ""
-#endif
-
-#ifndef WINE_PRODUCTVERSION
-#define WINE_PRODUCTVERSION 1,0,0,0
-#endif
-
-#ifndef WINE_PRODUCTVERSION_STR
-#define WINE_PRODUCTVERSION_STR "1.0"
-#endif
-
-#ifndef WINE_PRODUCTNAME_STR
-#define WINE_PRODUCTNAME_STR "Wine"
-#endif
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION    WINE_FILEVERSION
-PRODUCTVERSION WINE_PRODUCTVERSION
-FILEFLAGSMASK  0
-FILEFLAGS      0
-FILEOS         VOS_UNKNOWN
-FILETYPE       VFT_DLL
-FILESUBTYPE    VFT2_UNKNOWN
-{
-    BLOCK "StringFileInfo"
-    {
-	BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
-	{
-	    VALUE "CompanyName", "Wine Team"
-	    VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
-	    VALUE "FileVersion", WINE_FILEVERSION_STR
-	    VALUE "InternalName", WINE_FILENAME_STR
-	    VALUE "LegalCopyright", "Copyright (c) 1993-2001 the Wine project authors " \
-				    "(see the file AUTHORS for a complete list)"
-	    VALUE "OriginalFilename", WINE_FILENAME_STR
-	    VALUE "ProductName", WINE_PRODUCTNAME_STR
-	    VALUE "ProductVersion", WINE_PRODUCTVERSION_STR
 #ifdef WINE_OLESELFREGISTER
-	    VALUE "OLESelfRegister", ""
-#endif
-	}
-    }
-    BLOCK "VarFileInfo"
-    {
-	VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
-    }
-}
+#define REACTOS_OLESELFREGISTER
+#endif /* WINE_OLESELFREGISTER */
+
+/* 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 " \
+                                       "(see the file AUTHORS for a complete list)"
+
+#define REACTOS_VERSION_DLL
+
+#include <reactos/version.rc>

reactos/lib/acledit
acledit.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- acledit.rc	9 Jul 2004 20:18:49 -0000	1.1
+++ acledit.rc	16 Oct 2004 20:27:29 -0000	1.2
@@ -1,40 +1,8 @@
-#include <reactos/resource.h>
 #include <defines.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 Access Control Editor\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"acledit\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"acledit.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
-
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Access Control Editor\0"
+#define REACTOS_STR_INTERNAL_NAME	"acledit\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"acledit.dll\0"
+#include <reactos/version.rc>

reactos/lib/aclui
aclui.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- aclui.rc	14 Aug 2004 11:50:25 -0000	1.3
+++ aclui.rc	16 Oct 2004 20:27:29 -0000	1.4
@@ -1,42 +1,13 @@
-#include <reactos/resource.h>
 #include <defines.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 Access Control List Editor\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"aclui\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"aclui.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Access Control List Editor\0"
+#define REACTOS_STR_INTERNAL_NAME	"aclui\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"aclui.dll\0"
+#include <reactos/version.rc>
 
 IDB_USRGRPIMAGES BITMAP "res/usrgrp.bmp"
+
 #include "aclui_En.rc"
 

reactos/lib/advapi32
advapi32.rc 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- advapi32.rc	8 Sep 2002 10:22:35 -0000	1.7
+++ advapi32.rc	16 Oct 2004 20:27:30 -0000	1.8
@@ -1,39 +1,7 @@
 #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",	"Advanced W32 Base API\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"advapi32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"advapi32.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
-
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Advanced W32 Base API\0"
+#define REACTOS_STR_INTERNAL_NAME	"advapi32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"advapi32.dll\0"
+#include <reactos/version.rc>

reactos/lib/advpack
advpack.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- advpack.rc	30 Aug 2004 04:49:03 -0000	1.1
+++ advpack.rc	16 Oct 2004 20:27:30 -0000	1.2
@@ -1,39 +1,7 @@
-#include <reactos/resource.h>
 #include <defines.h>
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 Advpack User Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"advpack\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"advpack.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
-
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Advpack User Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"advpack\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"advpack.dll\0"
+#include <reactos/version.rc>

reactos/lib/cards
cards.rc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- cards.rc	21 Mar 2004 14:35:19 -0000	1.5
+++ cards.rc	16 Oct 2004 20:27:30 -0000	1.6
@@ -19,7 +19,12 @@
  */
 
 #include <windows.h>
-#include <reactos/resource.h>
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Cardplaying Helper DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"cards\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"cards.dll\0"
+#include <reactos/version.rc>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
@@ -91,37 +96,3 @@
 66 BITMAP "res/Joker.bmp"
 67 BITMAP "res/XSign.bmp"
 68 BITMAP "res/OSign.bmp"
-
-
-VS_VERSION_INFO VERSIONINFO
-	FILEVERSION    5,1,2600,0
-	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",	"Cardplaying Helper DLL\0"
-            VALUE "FileVersion",	"5.1.2600\0"
-            VALUE "InternalName",	"cards\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"cards.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

reactos/lib/commctrl
commctrl.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- commctrl.rc	4 Mar 2004 18:54:21 -0000	1.1
+++ commctrl.rc	16 Oct 2004 20:27:30 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"ReactOS WinCE Compatiblity Layer\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"coredll\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"coredll.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: commctrl.rc,v 1.2 2004/10/16 20:27:30 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS WinCE Compatiblity Layer\0"
+#define REACTOS_STR_INTERNAL_NAME	"commctrl\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"commctrl.dll\0"
+#include <reactos/version.rc>

reactos/lib/coredll
coredll.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- coredll.rc	3 Mar 2004 19:11:20 -0000	1.1
+++ coredll.rc	16 Oct 2004 20:27:30 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"ReactOS WinCE Compatiblity Layer\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"coredll\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"coredll.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: coredll.rc,v 1.2 2004/10/16 20:27:30 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS WinCE Compatiblity Layer\0"
+#define REACTOS_STR_INTERNAL_NAME	"coredll\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"coredll.dll\0"
+#include <reactos/version.rc>

reactos/lib/cpl/access
access.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- access.rc	30 Jun 2004 12:16:27 -0000	1.1
+++ access.rc	16 Oct 2004 20:27:30 -0000	1.2
@@ -1,41 +1,13 @@
-#include <reactos/resource.h>
 #include <defines.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Accessibility Control Panel\0"
+#define REACTOS_STR_INTERNAL_NAME	"access\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"access.cpl\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 Accessibility Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"access\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"access.cpl\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_DEFAULT
 
 IDI_CPLACCESS ICON "resources/applet.ico"
 

reactos/lib/cpl/appwiz
appwiz.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- appwiz.rc	30 Jun 2004 12:11:11 -0000	1.2
+++ appwiz.rc	16 Oct 2004 20:27:30 -0000	1.3
@@ -1,46 +1,21 @@
 #include "resource.h"
 #ifdef _MSC_VER
-#include <../../../include/reactos/resource.h>
 #include <../../../include/defines.h>
 #else
-#include <reactos/resource.h>
 #include <defines.h>
 #endif
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Software Control Panel\0"
+#define REACTOS_STR_INTERNAL_NAME	"appwiz\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"appwiz.cpl\0"
+#ifdef _MSC_VER
+#include <../../../reactos/version.rc>
 #else
-	FILEFLAGS	0x0L
+#include <reactos/version.rc>
 #endif
-	FILEOS		0x40004L
-	FILETYPE	0x2L
-	FILESUBTYPE	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",	RES_STR_COMPANY_NAME
-            VALUE "FileDescription",	"ReactOS Software Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"appwiz\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"appwiz.cpl\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_DEFAULT
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 

reactos/lib/cpl/control
control.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- control.rc	29 Jun 2004 12:03:56 -0000	1.3
+++ control.rc	16 Oct 2004 20:27:30 -0000	1.4
@@ -5,10 +5,18 @@
 #include <reactos/resource.h>
 #include <defines.h>
 #else
-#include <../../../include/reactos/resource.h>
 #include <../../../include/defines.h>
 #endif
 
+#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
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 
@@ -46,41 +54,3 @@
 // remains consistent on all systems.
 IDI_MAINICON            ICON    DISCARDABLE     "resources/config.ico"
 /////////////////////////////////////////////////////////////////////////////
-
-
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 System Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"control\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"control.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
-

reactos/lib/cpl/cplsample
cplsample.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- cplsample.rc	8 Mar 2004 14:20:14 -0000	1.2
+++ cplsample.rc	16 Oct 2004 20:27:30 -0000	1.3
@@ -1,41 +1,15 @@
-#include <reactos/resource.h>
+/* $Id: cplsample.rc,v 1.3 2004/10/16 20:27:30 gvg Exp $ */
+
 #include <defines.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Sample Control Panel\0"
+#define REACTOS_STR_INTERNAL_NAME	"cplsample\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"cplsample.cpl\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 Sample Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"cplsample\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"cplsample.cpl\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_DEFAULT
 
 IDC_CPLICON_1 ICON "resources/cpl_icon1.ico"
 

reactos/lib/cpl/desk
desk.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- desk.rc	7 Aug 2004 00:05:23 -0000	1.1
+++ desk.rc	16 Oct 2004 20:27:31 -0000	1.2
@@ -1,46 +1,21 @@
 #include "resource.h"
 #ifdef _MSC_VER
-#include <../../../include/reactos/resource.h>
 #include <../../../include/defines.h>
 #else
-#include <reactos/resource.h>
 #include <defines.h>
 #endif
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Display Control Panel\0"
+#define REACTOS_STR_INTERNAL_NAME	"desk\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"desk.cpl\0"
+#ifdef _MSC_VER
+#include <../../../include/reactos/version.rc>
 #else
-	FILEFLAGS	0x0L
+#include <reactos/version.rc>
 #endif
-	FILEOS		0x40004L
-	FILETYPE	0x2L
-	FILESUBTYPE	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",	RES_STR_COMPANY_NAME
-            VALUE "FileDescription",	"ReactOS Display Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"desk\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"desk.cpl\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_DEFAULT
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 

reactos/lib/cpl/ncpa
ncpa.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ncpa.rc	15 Aug 2004 16:50:30 -0000	1.3
+++ ncpa.rc	16 Oct 2004 20:27:31 -0000	1.4
@@ -1,46 +1,23 @@
+/* $Id: ncpa.rc,v 1.4 2004/10/16 20:27:31 gvg Exp $ */
+
 #include "resource.h"
 #ifdef _MSC_VER
-#include <../../../include/reactos/resource.h>
 #include <../../../include/defines.h>
 #else
-#include <reactos/resource.h>
 #include <defines.h>
 #endif
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Network Control Panel\0"
+#define REACTOS_STR_INTERNAL_NAME	"ncpa\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ncpa.cpl\0"
+#ifdef _MSC_VER
+#include <../../../include/reactos/version.rc>
 #else
-	FILEFLAGS	0x0L
+#include <reactos/version.rc>
 #endif
-	FILEOS		0x40004L
-	FILETYPE	0x2L
-	FILESUBTYPE	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",	RES_STR_COMPANY_NAME
-            VALUE "FileDescription",	"ReactOS Network Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"ncpa\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ncpa.cpl\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_DEFAULT
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 IDI_HORIZONTAL ICON "resources/HORIZ.ICO"

reactos/lib/cpl/sysdm
sysdm.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- sysdm.rc	7 Jul 2004 09:42:58 -0000	1.4
+++ sysdm.rc	16 Oct 2004 20:27:31 -0000	1.5
@@ -1,42 +1,16 @@
-#include <reactos/resource.h>
+/* $Id: sysdm.rc,v 1.5 2004/10/16 20:27:31 gvg Exp $ */
+
 #include <defines.h>
 #include <commctrl.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS System Control Panel\0"
+#define REACTOS_STR_INTERNAL_NAME	"sysdm\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"sysdm.cpl\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 System Control Panel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"sysdm\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"sysdm.cpl\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_DEFAULT
 
 IDI_CPLSYSTEM ICON "resources/applet.ico"
 IDI_DEVMGR ICON "resources/devmgr.ico"
@@ -48,8 +22,8 @@
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
   LTEXT "Operating System",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8
-  LTEXT RES_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8
-  LTEXT "Version " RES_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8
+  LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8
+  LTEXT "Version " REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8
   
   LTEXT "Computer",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8
   LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING,LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING,8

reactos/lib/crtdll
crtdll.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- crtdll.rc	8 Sep 2002 10:22:38 -0000	1.6
+++ crtdll.rc	16 Oct 2004 20:27:31 -0000	1.7
@@ -1,37 +1,5 @@
-#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",	"C Runtime Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"crtdll\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"crtdll.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"C Runtime Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"crtdll\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"crtdll.dll\0"
+#include <reactos/version.rc>

reactos/lib/d3d8
d3d8.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- d3d8.rc	12 Nov 2003 21:05:23 -0000	1.1
+++ d3d8.rc	16 Oct 2004 20:27:31 -0000	1.2
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: d3d8.rc,v 1.2 2004/10/16 20:27:31 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 Direct3D\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"d3d8\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"d3d8.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Direct3D\0"
+#define REACTOS_STR_INTERNAL_NAME	"d3d8\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"d3d8.dll\0"
+#include <reactos/version.rc>

reactos/lib/d3d8thk
d3d8thk.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- d3d8thk.rc	25 Oct 2003 20:34:34 -0000	1.1
+++ d3d8thk.rc	16 Oct 2004 20:27:31 -0000	1.2
@@ -1,38 +1,5 @@
-#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",	"Direct3D OS Thunk layer\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"d3d8thk\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"d3d8thk.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Direct3D OS Thunk layer\0"
+#define REACTOS_STR_INTERNAL_NAME	"d3d8thk\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"d3d8thk.dll\0"
+#include <reactos/version.rc>

reactos/lib/d3d9
d3d9.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- d3d9.rc	12 Nov 2003 21:15:07 -0000	1.1
+++ d3d9.rc	16 Oct 2004 20:27:31 -0000	1.2
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: d3d9.rc,v 1.2 2004/10/16 20:27:31 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 Direct3D\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"d3d9\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"d3d9.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Direct3D\0"
+#define REACTOS_STR_INTERNAL_NAME	"d3d9\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"d3d9.dll\0"
+#include <reactos/version.rc>

reactos/lib/devmgr
devmgr.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- devmgr.rc	4 Apr 2004 21:49:15 -0000	1.1
+++ devmgr.rc	16 Oct 2004 20:27:31 -0000	1.2
@@ -1,42 +1,12 @@
-#include <reactos/resource.h>
+/* $Id: devmgr.rc,v 1.2 2004/10/16 20:27:31 gvg Exp $ */
+
 #include <defines.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 Device Manager\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"devmgr\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"devmgr.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Device Manager\0"
+#define REACTOS_STR_INTERNAL_NAME	"devmgr\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"devmgr.dll\0"
+#include <reactos/version.rc>
 
 IDI_DEVMGR ICON "resources/devmgr.ico"
-
-

reactos/lib/dnsapi
dnsapi.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- dnsapi.rc	18 Dec 2003 10:54:48 -0000	1.1
+++ dnsapi.rc	16 Oct 2004 20:27:31 -0000	1.2
@@ -1,37 +1,5 @@
-#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",	"DNSAPI.DLL Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"dnsapi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"dnsapi.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"DNSAPI.DLL Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"dnsapi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"dnsapi.dll\0"
+#include <reactos/version.rc>

reactos/lib/fmifs
fmifs.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- fmifs.rc	8 Sep 2002 10:22:39 -0000	1.6
+++ fmifs.rc	16 Oct 2004 20:27:31 -0000	1.7
@@ -1,38 +1,5 @@
-#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",	"File Management IFS Utility DLL\0"
-            VALUE "FileVersion",	"0.0.1\0"
-            VALUE "InternalName",	"fmifs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"fmifs.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"File Management IFS Utility DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"fmifs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"fmifs.dll\0"
+#include <reactos/version.rc>

reactos/lib/freetype
freetype.rc added at 1.1
diff -N freetype.rc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ freetype.rc	16 Oct 2004 20:27:33 -0000	1.1
@@ -0,0 +1,7 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"FreeType font handling library\0"
+#define REACTOS_STR_INTERNAL_NAME	"freetype\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"freetype.dll\0"
+#define REACTOS_STR_COMPANY_NAME	"ReactOS Development Team/FreeType Team\0"
+#define REACTOS_STR_LEGAL_COPYRIGHT	"Copyright 1998-2004 ReactOS Team, 1996-2004 FreeType Team\0"
+#include <reactos/version.rc>

reactos/lib/freetype
Makefile 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- Makefile	20 Aug 2004 15:19:38 -0000	1.11
+++ Makefile	16 Oct 2004 20:27:32 -0000	1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 2004/08/20 15:19:38 navaraf Exp $
+# $Id: Makefile,v 1.12 2004/10/16 20:27:32 gvg Exp $
 
 PATH_TO_TOP = ../..
 
@@ -6,8 +6,6 @@
 
 TARGET_NAME = freetype
 
-TARGET_NORC = yes
-
 TARGET_DEFONLY = yes
 
 include $(PATH_TO_TOP)/config

reactos/lib/freetype
README.ROS 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- README.ROS	18 Aug 2004 20:25:04 -0000	1.6
+++ README.ROS	16 Oct 2004 20:27:33 -0000	1.7
@@ -45,6 +45,7 @@
 mkdir lib\freetype\i386
 copy lib\freetype.old\rosglue.c lib\freetype
 copy lib\freetype.old\i386\setjmplongjmp.s lib\freetype\i386
+copy lib\freetype.old\freetype.rc lib\freetype
 copy lib\freetype.old\Makefile lib\freetype
 copy lib\freetype.old\README.ROS lib\freetype
 copy lib\freetype.old\Doxyfile lib\freetype
@@ -66,4 +67,4 @@
 After testing, you can commit the new/changed files to CVS. ALthough files
 config.mk and freetype.def are generated, they should be included in CVS.
 
-$Id: README.ROS,v 1.6 2004/08/18 20:25:04 gvg Exp $
+$Id: README.ROS,v 1.7 2004/10/16 20:27:33 gvg Exp $

reactos/lib/gdi32
gdi32.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- gdi32.rc	8 Sep 2002 10:22:39 -0000	1.6
+++ gdi32.rc	16 Oct 2004 20:27:33 -0000	1.7
@@ -1,38 +1,5 @@
-#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",	"GDI Client DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"gdi32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"gdi32.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"GDI Client DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"gdi32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"gdi32.dll\0"
+#include <reactos/version.rc>

reactos/lib/gdiplus
gdiplus.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- gdiplus.rc	23 Jul 2004 21:54:54 -0000	1.1
+++ gdiplus.rc	16 Oct 2004 20:27:33 -0000	1.2
@@ -1,38 +1,5 @@
-#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",	"GDI+\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"gdiplus\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"gdiplus.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"GDI+\0"
+#define REACTOS_STR_INTERNAL_NAME	"gdiplus\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"gdiplus.dll\0"
+#include <reactos/version.rc>

reactos/lib/hid
hid.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- hid.rc	12 Jul 2004 15:08:43 -0000	1.1
+++ hid.rc	16 Oct 2004 20:27:33 -0000	1.2
@@ -1,39 +1,5 @@
-#include <reactos/resource.h>
-#include <defines.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 Hid User Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"hid\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"hid.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
-
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Hid User Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"hid\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"hid.dll\0"
+#include <reactos/version.rc>

reactos/lib/imagehlp
imagehlp.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- imagehlp.rc	9 Nov 2003 19:19:02 -0000	1.1
+++ imagehlp.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,37 +1,5 @@
-#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",	"IMAGEHLP.DLL Debug Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"imagehlp\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"imagehlp.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"IMAGEHLP.DLL Debug Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"imagehlp\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"imagehlp.dll\0"
+#include <reactos/version.rc>

reactos/lib/imm32
imm32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- imm32.rc	27 Aug 2003 03:11:40 -0000	1.1
+++ imm32.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,38 +1,5 @@
-#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",	"WINE IMM32 API Client DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"imm32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"imm32.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"IMM32 API Client DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"imm32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"imm32.dll\0"
+#include <reactos/version.rc>

reactos/lib/iphlpapi
iphlpapi.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- iphlpapi.rc	17 Aug 2002 16:23:13 -0000	1.1
+++ iphlpapi.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,39 +1,5 @@
-#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",	"ReactOS Sockets 2 IP Helper API\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"iphlpapi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"iphlpapi.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
-
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Sockets 2 IP Helper API\0"
+#define REACTOS_STR_INTERNAL_NAME	"iphlpapi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"iphlpapi.dll\0"
+#include <reactos/version.rc>

reactos/lib/iprtprio
iprtprio.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- iprtprio.rc	27 Aug 2002 13:22:30 -0000	1.1
+++ iprtprio.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,39 +1,7 @@
-#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",	"ReactOS IP Route Priority API DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"iprtprio\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"iprtprio.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: iprtprio.rc,v 1.2 2004/10/16 20:27:34 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS IP Route Priority API DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"iprtprio\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"iprtprio.dll\0"
+#include <reactos/version.rc>

reactos/lib/kbddv
kbddv.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kbddv.rc	3 Jun 2004 11:14:06 -0000	1.1
+++ kbddv.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,36 +1,5 @@
-#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",	"ReactOS US Dvorak Keyboard Layout\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kbddvorak\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kbddvorak.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS US Dvorak Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbddv\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbddv.dll\0"
+#include <reactos/version.rc>

reactos/lib/kbdfr
kbdfr.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kbdfr.rc	27 Oct 2003 00:17:32 -0000	1.1
+++ kbdfr.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,36 +1,5 @@
-#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",	"ReactOS FRAscii Keyboard Layout\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kbdfr\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kbdfr.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS FRAscii Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbdfr\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbdfr.dll\0"
+#include <reactos/version.rc>

reactos/lib/kbdgr
kbdgr.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kbdgr.rc	9 Oct 2003 17:48:44 -0000	1.1
+++ kbdgr.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,36 +1,5 @@
-#include <defines.h>
-#include <reactos/resource.h>
-
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-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 German Keyboard Layout\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kbdgr\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kbdgr.dll\0"
-            VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x407, 1200
-    END
-END
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS German Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbdgr\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbdgr.dll\0"
+#include <reactos/version.rc>

reactos/lib/kbdse
kbdse.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kbdse.rc	9 Jan 2004 13:18:37 -0000	1.1
+++ kbdse.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,36 +1,5 @@
-#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",	"ReactOS SEAscii Keyboard Layout\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kbdse\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kbdse.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS SEAscii Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbdse\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbdse.dll\0"
+#include <reactos/version.rc>

reactos/lib/kbduk
kbduk.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kbduk.rc	6 Nov 2003 17:18:25 -0000	1.1
+++ kbduk.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,36 +1,5 @@
-#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",	"ReactOS UKAscii Keyboard Layout\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kbduk\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kbduk.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS UKAscii Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbduk\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbduk.dll\0"
+#include <reactos/version.rc>

reactos/lib/kbdus
kbdus.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kbdus.rc	31 Jul 2003 16:47:08 -0000	1.1
+++ kbdus.rc	16 Oct 2004 20:27:34 -0000	1.2
@@ -1,36 +1,5 @@
-#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",	"ReactOS USAscii Keyboard Layout\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kbdus\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kbdus.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS USAscii Keyboard Layout\0"
+#define REACTOS_STR_INTERNAL_NAME	"kbdus\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kbdus.dll\0"
+#include <reactos/version.rc>

reactos/lib/kernel32
kernel32.rc 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- kernel32.rc	23 Sep 2004 21:01:23 -0000	1.9
+++ kernel32.rc	16 Oct 2004 20:27:35 -0000	1.10
@@ -1,43 +1,8 @@
-#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",	"W32 subsystem kernel\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kernel32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kernel32.dll\0"
-            VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
-            VALUE "Build Date",		RES_STR_BUILD_DATE
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"W32 subsystem kernel\0"
+#define REACTOS_STR_INTERNAL_NAME	"kernel32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kernel32.dll\0"
+#include <reactos/version.rc>
 
 #include "errcodes.rc"
 

reactos/lib/kjs
kjs.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- kjs.rc	10 Jan 2004 20:38:17 -0000	1.1
+++ kjs.rc	16 Oct 2004 20:27:35 -0000	1.2
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: kjs.rc,v 1.2 2004/10/16 20:27:35 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 Kernel JavaScript DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"kjs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"kjs.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Kernel JavaScript DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"kjs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"kjs.dll\0"
+#include <reactos/version.rc>

reactos/lib/lzexpand
lz32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- lz32.rc	22 Jul 2003 03:58:23 -0000	1.1
+++ lz32.rc	16 Oct 2004 20:27:35 -0000	1.2
@@ -1,38 +1,5 @@
-#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",	"Lempel-Ziv Expander\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"lz32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"lz32.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Lempel-Ziv Expander\0"
+#define REACTOS_STR_INTERNAL_NAME	"lz32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"lz32.dll\0"
+#include <reactos/version.rc>

reactos/lib/mpr
Makefile.in 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.in	15 Apr 2004 09:28:04 -0000	1.2
+++ Makefile.in	16 Oct 2004 20:27:35 -0000	1.3
@@ -15,8 +15,7 @@
 	wnet.c
 
 RC_SRCS = \
-	mpr.rc \
-	version.rc
+	mpr.rc
 
 
 @MAKE_DLL_RULES@

reactos/lib/mpr
Makefile.ros-template 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- Makefile.ros-template	29 May 2004 21:24:44 -0000	1.2
+++ Makefile.ros-template	16 Oct 2004 20:27:35 -0000	1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.ros-template,v 1.2 2004/05/29 21:24:44 hbirr Exp $
+# $Id: Makefile.ros-template,v 1.3 2004/10/16 20:27:35 gvg Exp $
 
 TARGET_NAME = mpr
 
@@ -10,8 +10,6 @@
 
 TARGET_BASE = $(TARGET_BASE_LIB_MPR)
 
-TARGET_NORC = yes
-
 default: all
 
 DEP_OBJECTS = $(TARGET_OBJECTS)

reactos/lib/mpr
mpr.rc 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- mpr.rc	19 Sep 2004 10:07:26 -0000	1.7
+++ mpr.rc	16 Oct 2004 20:27:35 -0000	1.8
@@ -21,6 +21,8 @@
 #include "winbase.h"
 #include "mprres.h"
 
+#include "version.rc"
+
 #include "mpr_Cs.rc"
 #include "mpr_De.rc"
 #include "mpr_En.rc"

reactos/lib/mpr
winehq2ros.patch 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- winehq2ros.patch	15 Apr 2004 09:28:04 -0000	1.2
+++ winehq2ros.patch	16 Oct 2004 20:27:35 -0000	1.3
@@ -1,10 +1,43 @@
+Index: Makefile.in
+===================================================================
+RCS file: /home/wine/wine/dlls/mpr/Makefile.in,v
+retrieving revision 1.15
+diff -u -r1.15 Makefile.in
+--- Makefile.in	5 Apr 2004 23:14:26 -0000	1.15
++++ Makefile.in	16 Oct 2004 16:50:33 -0000
+@@ -15,8 +15,7 @@
+ 	wnet.c
+ 
+ RC_SRCS = \
+-	mpr.rc \
+-	version.rc
++	mpr.rc
+ 
+ 
+ @MAKE_DLL_RULES@
+Index: mpr.rc
+===================================================================
+RCS file: /home/wine/wine/dlls/mpr/mpr.rc,v
+retrieving revision 1.8
+diff -u -r1.8 mpr.rc
+--- mpr.rc	9 Sep 2004 19:18:58 -0000	1.8
++++ mpr.rc	16 Oct 2004 16:50:33 -0000
+@@ -21,6 +21,8 @@
+ #include "winbase.h"
+ #include "mprres.h"
+ 
++#include "version.rc"
++
+ #include "mpr_Cs.rc"
+ #include "mpr_De.rc"
+ #include "mpr_En.rc"
 Index: wnet.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/mpr/wnet.c,v
-retrieving revision 1.15
-diff -u -r1.15 wnet.c
---- wnet.c	5 Apr 2004 23:14:26 -0000	1.15
-+++ wnet.c	15 Apr 2004 09:36:14 -0000
+retrieving revision 1.17
+diff -u -r1.17 wnet.c
+--- wnet.c	30 Jun 2004 18:17:07 -0000	1.17
++++ wnet.c	16 Oct 2004 16:50:34 -0000
 @@ -22,6 +22,7 @@
  #include <stdarg.h>
  #include "windef.h"

reactos/lib/msafd
msafd.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- msafd.rc	8 Sep 2002 10:22:46 -0000	1.3
+++ msafd.rc	16 Oct 2004 20:27:35 -0000	1.4
@@ -1,39 +1,5 @@
-#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",	"Ancillary Function Driver DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"msafd\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"msafd.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
-
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Ancillary Function Driver DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"msafd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"msafd.dll\0"
+#include <reactos/version.rc>

reactos/lib/msgina
msgina.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- msgina.rc	1 Dec 2003 18:21:04 -0000	1.2
+++ msgina.rc	16 Oct 2004 20:27:35 -0000	1.3
@@ -1,41 +1,13 @@
-#include <reactos/resource.h>
-#include <defines.h>
+#include "defines.h"
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Logon GINA DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"msgina\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"msgina.dll\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 Logon GINA DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"msgina\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"msgina.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
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDI_LOGOFFICON ICON "resources/ico_logoff.ico"
 

reactos/lib/msvcrt
msvcrt.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- msvcrt.rc	8 Sep 2002 10:22:47 -0000	1.4
+++ msvcrt.rc	16 Oct 2004 20:27:35 -0000	1.5
@@ -1,37 +1,5 @@
-#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",	"MSVCRT.DLL Compatibility Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"msvcrt\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"msvcrt.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"MSVCRT.DLL Compatibility Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"msvcrt\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"msvcrt.dll\0"
+#include <reactos/version.rc>

reactos/lib/msvcrt20
msvcrt20.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- msvcrt20.rc	1 Jan 2004 15:27:58 -0000	1.1
+++ msvcrt20.rc	16 Oct 2004 20:27:35 -0000	1.2
@@ -1,37 +1,5 @@
-#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",	"MSVCRT.DLL Compatibility Library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"msvcrt\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"msvcrt.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"MSVCRT20.DLL Compatibility Library\0"
+#define REACTOS_STR_INTERNAL_NAME	"msvcrt20\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"msvcrt20.dll\0"
+#include <reactos/version.rc>

reactos/lib/msvideo
msvfw32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- msvfw32.rc	10 Jul 2004 21:19:46 -0000	1.1
+++ msvfw32.rc	16 Oct 2004 20:27:35 -0000	1.2
@@ -1,38 +1,5 @@
-#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",	"MSvideo support\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"msvfw32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"msvfw32.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
-
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"MSvideo support\0"
+#define REACTOS_STR_INTERNAL_NAME	"msvfw32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"msvfw32.dll\0"
+#include <reactos/version.rc>

reactos/lib/mswsock
mswsock.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- mswsock.rc	12 Sep 2003 17:51:47 -0000	1.1
+++ mswsock.rc	16 Oct 2004 20:27:35 -0000	1.2
@@ -1,41 +1,7 @@
-/* $Id: mswsock.rc,v 1.1 2003/09/12 17:51:47 vizzini Exp $ */
-
-#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",	"Windows Sockets 2 DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"mswsock\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"mswsock.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: mswsock.rc,v 1.2 2004/10/16 20:27:35 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows Sockets 2 DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"mswsock\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"mswsock.dll\0"
+#include <reactos/version.rc>

reactos/lib/netapi32
netapi32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- netapi32.rc	10 Feb 2004 16:57:23 -0000	1.1
+++ netapi32.rc	16 Oct 2004 20:27:36 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"WINE IMM32 API Client DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"imm32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"imm32.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: netapi32.rc,v 1.2 2004/10/16 20:27:36 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"NetApi DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"netapi32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"netapi32.dll\0"
+#include <reactos/version.rc>

reactos/lib/ntdll/def
ntdll.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ntdll.rc	8 Sep 2002 10:23:03 -0000	1.3
+++ ntdll.rc	16 Oct 2004 20:27:36 -0000	1.4
@@ -1,37 +1,7 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: ntdll.rc,v 1.4 2004/10/16 20:27:36 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 Layer DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"ntdll\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ntdll.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Layer DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"ntdll\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ntdll.dll\0"
+#include <reactos/version.rc>

reactos/lib/odbc32
odbc32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- odbc32.rc	25 Feb 2004 20:09:39 -0000	1.1
+++ odbc32.rc	16 Oct 2004 20:27:36 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"WINE IMM32 API Client DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"imm32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"imm32.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: odbc32.rc,v 1.2 2004/10/16 20:27:36 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ODBC Client DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"odbc32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"odbc32.dll\0"
+#include <reactos/version.rc>

reactos/lib/ole32
Makefile.in 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- Makefile.in	19 Sep 2004 10:20:48 -0000	1.4
+++ Makefile.in	16 Oct 2004 20:27:36 -0000	1.5
@@ -53,7 +53,7 @@
 	ole2thk.spec \
 	storage.spec
 
-RC_SRCS = ole32res.rc version.rc
+RC_SRCS = ole32res.rc
 RC_BINSRC = ole32res.rc
 RC_BINARIES = \
 	drag_copy.cur \

reactos/lib/ole32
ole32res.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ole32res.rc	2 Jan 2004 19:49:45 -0000	1.1
+++ ole32res.rc	16 Oct 2004 20:27:36 -0000	1.2
@@ -23,6 +23,8 @@
 #include "winuser.h"
 #include "winnls.h"
 
+#include "version.rc"
+
 /*
  * Everything that does not depend on language,
  * like textless bitmaps etc, go into the

reactos/lib/ole32
winehq2ros.patch 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- winehq2ros.patch	14 Aug 2004 20:00:59 -0000	1.6
+++ winehq2ros.patch	16 Oct 2004 20:27:36 -0000	1.7
@@ -1,10 +1,26 @@
+Index: Makefile.in
+===================================================================
+RCS file: /home/wine/wine/dlls/ole32/Makefile.in,v
+retrieving revision 1.37
+diff -u -r1.37 Makefile.in
+--- Makefile.in	22 Aug 2004 22:33:57 -0000	1.37
++++ Makefile.in	16 Oct 2004 17:16:49 -0000
+@@ -53,7 +53,7 @@
+ 	ole2thk.spec \
+ 	storage.spec
+ 
+-RC_SRCS = ole32res.rc version.rc
++RC_SRCS = ole32res.rc
+ RC_BINSRC = ole32res.rc
+ RC_BINARIES = \
+ 	drag_copy.cur \
 Index: ifs.h
 ===================================================================
 RCS file: /home/wine/wine/dlls/ole32/ifs.h,v
 retrieving revision 1.12
 diff -u -r1.12 ifs.h
 --- ifs.h	12 Aug 2004 03:33:30 -0000	1.12
-+++ ifs.h	14 Aug 2004 20:12:56 -0000
++++ ifs.h	16 Oct 2004 17:16:49 -0000
 @@ -33,8 +33,7 @@
   * IMalloc16 interface
   */
@@ -50,13 +66,29 @@
  
  #define INTERFACE IStorage16
  #define IStorage16_METHODS \
+Index: ole32res.rc
+===================================================================
+RCS file: /home/wine/wine/dlls/ole32/ole32res.rc,v
+retrieving revision 1.5
+diff -u -r1.5 ole32res.rc
+--- ole32res.rc	3 Oct 2003 05:01:34 -0000	1.5
++++ ole32res.rc	16 Oct 2004 17:16:49 -0000
+@@ -23,6 +23,8 @@
+ #include "winuser.h"
+ #include "winnls.h"
+ 
++#include "version.rc"
++
+ /*
+  * Everything that does not depend on language,
+  * like textless bitmaps etc, go into the
 Index: oleproxy.c
 ===================================================================
 RCS file: /home/wine/wine/dlls/ole32/oleproxy.c,v
-retrieving revision 1.19
-diff -u -r1.19 oleproxy.c
---- oleproxy.c	12 Aug 2004 23:00:55 -0000	1.19
-+++ oleproxy.c	14 Aug 2004 20:13:00 -0000
+retrieving revision 1.21
+diff -u -r1.21 oleproxy.c
+--- oleproxy.c	9 Sep 2004 21:03:58 -0000	1.21
++++ oleproxy.c	16 Oct 2004 17:16:50 -0000
 @@ -38,6 +38,7 @@
  
  #include <stdlib.h>

reactos/lib/oleaut32
Makefile.in 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- Makefile.in	2 Mar 2004 10:25:58 -0000	1.5
+++ Makefile.in	16 Oct 2004 20:27:36 -0000	1.6
@@ -35,9 +35,7 @@
 	ole2disp.c \
 	typelib16.c
 
-RC_SRCS = \
-	oleaut32.rc \
-	version.rc
+RC_SRCS = oleaut32.rc
 
 SUBDIRS = tests
 

reactos/lib/oleaut32
oleaut32.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- oleaut32.rc	7 Feb 2004 18:53:58 -0000	1.4
+++ oleaut32.rc	16 Oct 2004 20:27:36 -0000	1.5
@@ -22,6 +22,8 @@
 #include "winbase.h"
 #include "resource.h"
 
+#include "version.rc"
+
 #include "oleaut32_De.rc"
 #include "oleaut32_Dk.rc"
 #include "oleaut32_En.rc"

reactos/lib/psapi
psapi.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- psapi.rc	8 Sep 2002 10:23:08 -0000	1.3
+++ psapi.rc	16 Oct 2004 20:27:36 -0000	1.4
@@ -1,38 +1,7 @@
-#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",	"Process Status Helper\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"psapi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"psapi.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: psapi.rc,v 1.4 2004/10/16 20:27:36 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Process Status Helper\0"
+#define REACTOS_STR_INTERNAL_NAME	"psapi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"psapi.dll\0"
+#include <reactos/version.rc>

reactos/lib/rosky/libsky
libsky.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- libsky.rc	12 Aug 2004 02:50:35 -0000	1.1
+++ libsky.rc	16 Oct 2004 20:27:36 -0000	1.2
@@ -1,40 +1,7 @@
-#include <reactos/resource.h>
-#include <defines.h>
-#include "resource.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 SkyOS library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"libsky\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"libsky.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: libsky.rc,v 1.2 2004/10/16 20:27:36 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS SkyOS library\0"
+#define REACTOS_STR_INTERNAL_NAME	"libsky\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"libsky.dll\0"
+#include <reactos/version.rc>

reactos/lib/rosky/libskygi
libskygi.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- libskygi.rc	12 Aug 2004 02:50:35 -0000	1.1
+++ libskygi.rc	16 Oct 2004 20:27:36 -0000	1.2
@@ -1,40 +1,7 @@
-#include <reactos/resource.h>
-#include <defines.h>
-#include "resource.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 SkyOS GI library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"libskygi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"libskygi.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: libskygi.rc,v 1.2 2004/10/16 20:27:36 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS SkyOS GI library\0"
+#define REACTOS_STR_INTERNAL_NAME	"libskygi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"libskygi.dll\0"
+#include <reactos/version.rc>

reactos/lib/samlib
samlib.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- samlib.rc	23 Jan 2004 10:33:21 -0000	1.1
+++ samlib.rc	16 Oct 2004 20:27:36 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"Security Account Manager interface DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"samlib\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"samlib.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: samlib.rc,v 1.2 2004/10/16 20:27:36 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Security Account Manager interface DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"samlib\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"samlib.dll\0"
+#include <reactos/version.rc>

reactos/lib/secur32
secur32.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- secur32.rc	8 Sep 2002 10:23:08 -0000	1.4
+++ secur32.rc	16 Oct 2004 20:27:37 -0000	1.5
@@ -1,38 +1,7 @@
-#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",	"Security\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"secur32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"secur32.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: secur32.rc,v 1.5 2004/10/16 20:27:37 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Security\0"
+#define REACTOS_STR_INTERNAL_NAME	"secur32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"secur32.dll\0"
+#include <reactos/version.rc>

reactos/lib/shell32
Makefile.in 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- Makefile.in	20 Sep 2004 19:47:13 -0000	1.8
+++ Makefile.in	16 Oct 2004 20:27:37 -0000	1.9
@@ -51,7 +51,7 @@
 	shv_item_cmenu.c \
 	ros-systray.c
 
-RC_SRCS = shres.rc version.rc
+RC_SRCS = shres.rc
 RC_BINSRC = shres.rc
 RC_BINARIES = \
 	desktop.ico \

reactos/lib/shell32
shres.rc 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- shres.rc	1 Aug 2004 21:23:21 -0000	1.7
+++ shres.rc	16 Oct 2004 20:27:37 -0000	1.8
@@ -26,6 +26,8 @@
 #include "shlobj.h"
 #include "shresdef.h"
 
+#include "version.rc"
+
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 shv_accel ACCELERATORS

reactos/lib/shellext/slayer
slayer.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- slayer.rc	26 Sep 2004 09:56:23 -0000	1.1
+++ slayer.rc	16 Oct 2004 20:27:38 -0000	1.2
@@ -1,41 +1,13 @@
-#include <reactos/resource.h>
+/* $Id: slayer.rc,v 1.2 2004/10/16 20:27:38 gvg Exp $ */
+
 #include <defines.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 Compatibility Layer Shell Extension\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"slayer\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"slayer.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Compatibility Layer Shell Extension\0"
+#define REACTOS_STR_INTERNAL_NAME	"slayer\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"slayer.dll\0"
+#include <reactos/version.rc>
 
 #include "en.rc"
 

reactos/lib/snmpapi
snmpapi.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- snmpapi.rc	17 Aug 2002 15:48:21 -0000	1.1
+++ snmpapi.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,39 +1,7 @@
-#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",	"ReactOS Sockets 2 SNMP Helper API\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"snmpapi\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"snmpapi.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: snmpapi.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Sockets 2 SNMP Helper API\0"
+#define REACTOS_STR_INTERNAL_NAME	"snmpapi\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"snmpapi.dll\0"
+#include <reactos/version.rc>

reactos/lib/syssetup
syssetup.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- syssetup.rc	12 Sep 2004 09:52:48 -0000	1.6
+++ syssetup.rc	16 Oct 2004 20:27:39 -0000	1.7
@@ -1,42 +1,15 @@
+/* $Id: syssetup.rc,v 1.7 2004/10/16 20:27:39 gvg Exp $ */
+
 #include <windows.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-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",	"System Setup DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"syssetup\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"syssetup.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"System Setup DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"syssetup\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"syssetup.dll\0"
+#include <reactos/version.rc>
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* Bitmaps */
 IDB_WATERMARK BITMAP "resources/watermark.bmp"

reactos/lib/twain
twain_32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- twain_32.rc	22 Jul 2003 04:00:28 -0000	1.1
+++ twain_32.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,38 +1,7 @@
-#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",	"TWAIN support\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"twain_32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"twain_32.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: twain_32.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"TWAIN support\0"
+#define REACTOS_STR_INTERNAL_NAME	"twain_32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"twain_32.dll\0"
+#include <reactos/version.rc>

reactos/lib/user32
user32.rc 1.35 -> 1.36
diff -u -r1.35 -r1.36
--- user32.rc	15 Oct 2004 14:07:42 -0000	1.35
+++ user32.rc	16 Oct 2004 20:27:39 -0000	1.36
@@ -1,45 +1,19 @@
-#include <reactos/resource.h>
+/* $Id: user32.rc,v 1.36 2004/10/16 20:27:39 gvg Exp $ */
+
 #include <defines.h>
-#include <reactos/resource.h>
 #include <messages.h>
 #include <resource.h>
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS User API Client Dll\0"
+#define REACTOS_STR_INTERNAL_NAME	"user32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"user32.dll\0"
+#include <reactos/version.rc>
+
 #define IDS_MDI_MOREWINDOWS     13
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
-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 User API Client Dll\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"user32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"user32.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
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Cursors

reactos/lib/userenv
userenv.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- userenv.rc	8 Oct 2004 11:52:30 -0000	1.2
+++ userenv.rc	16 Oct 2004 20:27:39 -0000	1.3
@@ -1,4 +1,5 @@
-/*
+/* $Id: userenv.rc,v 1.3 2004/10/16 20:27:39 gvg Exp $
+ *
  * Copyright (C) 2004 Eric Kohl
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,47 +18,18 @@
  */
 
 #include <windows.h>
-#include <reactos/resource.h>
-
 #include "resources.h"
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"User Environment DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"userenv\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"userenv.dll\0"
+#define REACTOS_FILEVERSION		5,1,2600,0
+#define REACTOS_STR_FILE_VERSION	"5.1.2600\0"
+#include <reactos/version.rc>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-VS_VERSION_INFO VERSIONINFO
-	FILEVERSION    5,1,2600,0
-	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",	"User Environment DLL\0"
-            VALUE "FileVersion",	"5.1.2600\0"
-            VALUE "InternalName",	"userenv\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"userenv.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
-
-
 /*
  * Everything specific to any language goes in one of the specific
  * files. Note that you can and may override resources which also have

reactos/lib/version
version.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- version.rc	8 Sep 2002 10:23:13 -0000	1.4
+++ version.rc	16 Oct 2004 20:27:39 -0000	1.5
@@ -1,38 +1,7 @@
-#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",	"Version checking and file installation library\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"version\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"version.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: version.rc,v 1.5 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Version checking and file installation library\0"
+#define REACTOS_STR_INTERNAL_NAME	"version\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"version.dll\0"
+#include <reactos/version.rc>

reactos/lib/winfax
winfax.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- winfax.rc	2 Oct 2004 16:43:05 -0000	1.1
+++ winfax.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,38 +1,7 @@
-#include <reactos/resource.h>
-#include <defines.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-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 FAX API Support\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"winfax\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"winfax.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: winfax.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS FAX API Support\0"
+#define REACTOS_STR_INTERNAL_NAME	"winfax\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"winfax.dll\0"
+#include <reactos/version.rc>

reactos/lib/winmm/midimap
midimap.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- midimap.rc	10 Mar 2004 15:22:44 -0000	1.1
+++ midimap.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,39 +1,7 @@
-#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",    "ReactOS/WINE MIDI Mapper\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",   "midimap\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",   "midimap.drv\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: midimap.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS/WINE MIDI Mapper\0"
+#define REACTOS_STR_INTERNAL_NAME	"midimap\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"midimap.drv\0"
+#include <reactos/version.rc>

reactos/lib/winmm/wavemap
wavemap.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- wavemap.rc	10 Mar 2004 15:22:45 -0000	1.1
+++ wavemap.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,39 +1,7 @@
-#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",    "ReactOS/WINE Wave Mapper\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",   "wavemap\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",   "wavemap.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: wavemap.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS/WINE Wave Mapper\0"
+#define REACTOS_STR_INTERNAL_NAME	"wavemap\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"wavemap.drv\0"
+#include <reactos/version.rc>

reactos/lib/winspool
winspool.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- winspool.rc	30 Apr 2003 20:44:06 -0000	1.1
+++ winspool.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,41 +1,7 @@
-/* $Id: winspool.rc,v 1.1 2003/04/30 20:44:06 gvg Exp $ */
-
-#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",	"Windows printer spooler\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"winspool\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"winspool.drv\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: winspool.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows printer spooler\0"
+#define REACTOS_STR_INTERNAL_NAME	"winspool\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"winspool.drv\0"
+#include <reactos/version.rc>

reactos/lib/wintrust
wintrust.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- wintrust.rc	27 Aug 2004 12:10:27 -0000	1.1
+++ wintrust.rc	16 Oct 2004 20:27:39 -0000	1.2
@@ -1,39 +1,7 @@
-#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",	"ReactOS wintrust lib\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"wintrust\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"wintrust.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: wintrust.rc,v 1.2 2004/10/16 20:27:39 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS wintrust lib\0"
+#define REACTOS_STR_INTERNAL_NAME	"wintrust\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"wintrust.dll\0"
+#include <reactos/version.rc>

reactos/lib/ws2_32
ws2_32.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ws2_32.rc	8 Sep 2002 10:23:13 -0000	1.3
+++ ws2_32.rc	16 Oct 2004 20:27:40 -0000	1.4
@@ -1,39 +1,7 @@
-#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",	"Windows Sockets 2 DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"ws2_32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ws2_32.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: ws2_32.rc,v 1.4 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows Sockets 2 DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"ws2_32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ws2_32.dll\0"
+#include <reactos/version.rc>

reactos/lib/ws2help
ws2help.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- ws2help.rc	8 Sep 2002 10:23:15 -0000	1.3
+++ ws2help.rc	16 Oct 2004 20:27:40 -0000	1.4
@@ -1,39 +1,7 @@
-#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",	"Windows Sockets 2 Helper API\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"ws2help\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ws2help.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: ws2help.rc,v 1.4 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows Sockets 2 Helper API\0"
+#define REACTOS_STR_INTERNAL_NAME	"ws2help\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ws2help.dll\0"
+#include <reactos/version.rc>

reactos/lib/wshirda
wshirda.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- wshirda.rc	8 Sep 2002 10:23:15 -0000	1.3
+++ wshirda.rc	16 Oct 2004 20:27:40 -0000	1.4
@@ -1,39 +1,7 @@
-#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",	"Windows Sockets 2 IRDA Helper API\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"wshirda\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"wshirda.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: wshirda.rc,v 1.4 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows Sockets 2 IRDA Helper API\0"
+#define REACTOS_STR_INTERNAL_NAME	"wshirda\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"wshirda.dll\0"
+#include <reactos/version.rc>

reactos/lib/wsock32
wsock32.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- wsock32.rc	3 Apr 2003 22:44:19 -0000	1.1
+++ wsock32.rc	16 Oct 2004 20:27:40 -0000	1.2
@@ -1,41 +1,7 @@
-/* $Id: wsock32.rc,v 1.1 2003/04/03 22:44:19 gvg Exp $ */
-
-#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",	"Windows Sockets 2 DLL\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"wsock32\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"wsock32.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: wsock32.rc,v 1.2 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"Windows Sockets 2 DLL\0"
+#define REACTOS_STR_INTERNAL_NAME	"wsock32\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"wsock32.dll\0"
+#include <reactos/version.rc>

reactos/ntoskrnl
ntoskrnl.rc 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- ntoskrnl.rc	24 Mar 2004 21:46:41 -0000	1.10
+++ ntoskrnl.rc	16 Oct 2004 20:27:40 -0000	1.11
@@ -1,40 +1,8 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: ntoskrnl.rc,v 1.11 2004/10/16 20:27:40 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 Kernel & System\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-	    VALUE "InternalName",	"ntoskrnl\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ntoskrnl.exe\0"
-            VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
-            VALUE "Build Date",		RES_STR_BUILD_DATE
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Kernel & System\0"
+#define REACTOS_STR_INTERNAL_NAME	"ntoskrnl\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ntoskrnl.exe\0"
+#include <reactos/version.rc>
 
 #include "bugcodes.rc"

reactos/services/dhcpd
dhcpd.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- dhcpd.rc	5 Oct 2004 13:09:45 -0000	1.1
+++ dhcpd.rc	16 Oct 2004 20:27:40 -0000	1.2
@@ -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",	"Event logging service\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"EventLog\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"EventLog.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: dhcpd.rc,v 1.2 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"DHCP server service\0"
+#define REACTOS_STR_INTERNAL_NAME	"dhcpd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"dhcpd.exe\0"
+#include <reactos/version.rc>

reactos/services/eventlog
eventlog.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- eventlog.rc	17 Nov 2002 04:00:32 -0000	1.4
+++ eventlog.rc	16 Oct 2004 20:27:40 -0000	1.5
@@ -1,38 +1,4 @@
-#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",	"Event logging service\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"EventLog\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"EventLog.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	"Event logging service\0"
+#define REACTOS_STR_INTERNAL_NAME	"EventLog\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"EventLog.exe\0"
+#include <reactos/version.rc>

reactos/services/rpcss
rpcss.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- rpcss.rc	17 Nov 2002 04:00:32 -0000	1.4
+++ rpcss.rc	16 Oct 2004 20:27:40 -0000	1.5
@@ -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",	"RPC subsystem\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"RpcSs\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"RpcSs.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: rpcss.rc,v 1.5 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"RPC subsystem\0"
+#define REACTOS_STR_INTERNAL_NAME	"RpcSs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"RpcSs.exe\0"
+#include <reactos/version.rc>

reactos/subsys/csrss
csrss.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- csrss.rc	17 Nov 2002 04:00:32 -0000	1.4
+++ csrss.rc	16 Oct 2004 20:27:40 -0000	1.5
@@ -1,38 +1,4 @@
-#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",	"Client/Server Runtime Process\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"CSRSs and CSRSrv\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"CSRSs.exe and CSRSrv.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
-
+#define REACTOS_STR_FILE_DESCRIPTION	"Client/Server Runtime Process\0"
+#define REACTOS_STR_INTERNAL_NAME	"CSRSs and CSRSrv\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"CSRSs.exe and CSRSrv.dll\0"
+#include <reactos/version.rc>

reactos/subsys/csrss/win32csr
win32csr.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- win32csr.rc	19 Jan 2004 20:14:28 -0000	1.2
+++ win32csr.rc	16 Oct 2004 20:27:40 -0000	1.3
@@ -1,40 +1,7 @@
-#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",	"CSRSS subsystem usermode code\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"win32csr\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"win32csr.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"CSRSS subsystem usermode code\0"
+#define REACTOS_STR_INTERNAL_NAME	"win32csr\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"win32csr.dll\0"
+#include <reactos/version.rc>
 
 1	ICON	DISCARDABLE	res/terminal.ico

reactos/subsys/ntvdm
ntvdm.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ntvdm.rc	28 Oct 2002 13:59:59 -0000	1.1
+++ ntvdm.rc	16 Oct 2004 20:27:40 -0000	1.2
@@ -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",	"ReactOS Virtual DOS Machine\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"ntvdm\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"ntvdm.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: ntvdm.rc,v 1.2 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Virtual DOS Machine\0"
+#define REACTOS_STR_INTERNAL_NAME	"ntvdm\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"ntvdm.exe\0"
+#include <reactos/version.rc>

reactos/subsys/smss
smss.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- smss.rc	8 Sep 2002 10:23:46 -0000	1.4
+++ smss.rc	16 Oct 2004 20:27:40 -0000	1.5
@@ -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",	"ReactOS Session Manager\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"smss\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"smss.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: smss.rc,v 1.5 2004/10/16 20:27:40 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Session Manager\0"
+#define REACTOS_STR_INTERNAL_NAME	"smss\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"smss.exe\0"
+#include <reactos/version.rc>

reactos/subsys/system/autochk
autochk.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- autochk.rc	8 Sep 2002 10:23:46 -0000	1.3
+++ autochk.rc	16 Oct 2004 20:27:41 -0000	1.4
@@ -1,38 +1,4 @@
-#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",	"File system checker\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"autochk\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"autochk.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	"File system checker\0"
+#define REACTOS_STR_INTERNAL_NAME	"autochk\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"autochk.exe\0"
+#include <reactos/version.rc>

reactos/subsys/system/cmd
cmd.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- cmd.rc	2 Aug 2004 02:54:58 -0000	1.4
+++ cmd.rc	16 Oct 2004 20:27:41 -0000	1.5
@@ -1,41 +1,11 @@
 #include <windows.h>
-#include <reactos/resource.h>
 #include "cmdver.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 Command Processor\0"
-            VALUE "FileVersion",	CMD_VER_RC
-            VALUE "InternalName",	"cmd\0"
-	    VALUE "OriginalCopyright",	"Copyright (C) 1994-1998 Tim Norman and others\0"
-            VALUE "LegalCopyright",	"Copyright (C) 1998-2001 Eric Kohl and others\0"
-            VALUE "OriginalFilename",	"cmd.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 Command Processor\0"
+#define REACTOS_STR_INTERNAL_NAME	"cmd\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"cmd.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT	"Copyright (C) 1994-1998 Tim Norman and others\0"
+#define REACTOS_STR_LEGAL_COPYRIGHT     "Copyright (C) 1998-2001 Eric Kohl and others\0"
+#include <reactos/version.rc>
 
 1	ICON	DISCARDABLE	res/terminal.ico

reactos/subsys/system/explorer
explorer.rc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- explorer.rc	3 Aug 2004 19:43:45 -0000	1.5
+++ explorer.rc	16 Oct 2004 20:27:41 -0000	1.6
@@ -1,43 +1,15 @@
+/* $Id: explorer.rc,v 1.6 2004/10/16 20:27:41 gvg Exp $ */
+
 #include <defines.h>
-#include <reactos/resource.h>
 
 #include "explorer_intres.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",    "ReactOS Explorer\0"
-            VALUE "FileVersion",    RES_STR_FILE_VERSION
-            VALUE "InternalName",   "explorer\0"
-            VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",   "explorer.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 Explorer\0"
+#define REACTOS_STR_INTERNAL_NAME	"explorer\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"explorer.exe\0"
+#include <reactos/version.rc>
 
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 #define IDS_VERSION_STR             5000
 #define IDS_EXPLORER_VERSION_STR    5001
@@ -46,7 +18,7 @@
 
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_VERSION_STR RES_STR_PRODUCT_VERSION
+    IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION
     IDS_EXPLORER_VERSION_STR "ReactOS %s Explorer"
 END
 

reactos/subsys/system/explorer/notifyhook
notifyhook.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- notifyhook.rc	5 Sep 2004 12:27:36 -0000	1.1
+++ notifyhook.rc	16 Oct 2004 20:27:41 -0000	1.2
@@ -1,39 +1,9 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: notifyhook.rc,v 1.2 2004/10/16 20:27:41 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",    "NotifyHook DLL for ROS Explorer\0"
-            VALUE "FileVersion",    RES_STR_FILE_VERSION
-            VALUE "InternalName",   "notifyhook\0"
-            VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",   "notifyhook.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
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"NotifyHook DLL for ROS Explorer\0"
+#define REACTOS_STR_INTERNAL_NAME	"notifyhook\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"notifyhook.dll\0"
+#include <reactos/version.rc>
 
 /* EOF */

reactos/subsys/system/lsass
lsass.rc 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- lsass.rc	2 Jun 2002 19:25:02 -0000	1.2
+++ lsass.rc	16 Oct 2004 20:27:41 -0000	1.3
@@ -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",	"Local Security Authority\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"lsass\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"lsass.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: lsass.rc,v 1.3 2004/10/16 20:27:41 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"Local Security Authority\0"
+#define REACTOS_STR_INTERNAL_NAME	"lsass\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"lsass.exe\0"
+#include <reactos/version.rc>

reactos/subsys/system/regedit
regedit.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- regedit.rc	1 Jan 2004 15:26:04 -0000	1.3
+++ regedit.rc	16 Oct 2004 20:27:41 -0000	1.4
@@ -1,4 +1,5 @@
-/*
+/* $Id: regedit.rc,v 1.4 2004/10/16 20:27:41 gvg Exp $
+ *
  * Regedit resources
  *
  * Copyright 2002 Robert Dickenson
@@ -19,43 +20,14 @@
  */
 
 #include <defines.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Registry Explorer\0"
+#define REACTOS_STR_INTERNAL_NAME	"regedit\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"regedit.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 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
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 #include "rsrc.rc"
 

reactos/subsys/system/services
services.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- services.rc	17 Nov 2002 04:00:33 -0000	1.4
+++ services.rc	16 Oct 2004 20:27:41 -0000	1.5
@@ -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",	"Service Control Manager\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"Services\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"Services.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: services.rc,v 1.5 2004/10/16 20:27:41 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"Service Control Manager\0"
+#define REACTOS_STR_INTERNAL_NAME	"Services\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"Services.exe\0"
+#include <reactos/version.rc>

reactos/subsys/system/setup
setup.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- setup.rc	2 May 2003 18:08:39 -0000	1.1
+++ setup.rc	16 Oct 2004 20:27:41 -0000	1.2
@@ -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",	"ReactOS Setup\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"setup\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"setup.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: setup.rc,v 1.2 2004/10/16 20:27:41 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Setup\0"
+#define REACTOS_STR_INTERNAL_NAME	"setup\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"setup.exe\0"
+#include <reactos/version.rc>

reactos/subsys/system/userinit
userinit.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- userinit.rc	7 Dec 2003 01:12:58 -0000	1.1
+++ userinit.rc	16 Oct 2004 20:27:41 -0000	1.2
@@ -1,37 +1,6 @@
-#include <defines.h>
-#include <reactos/resource.h>
+/* $Id: userinit.rc,v 1.2 2004/10/16 20:27:41 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",	"Userinit Logon Application\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"userinit\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"userinit.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	"Userinit Logon Application\0"
+#define REACTOS_STR_INTERNAL_NAME	"userinit\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"userinit.dll\0"
+#include <reactos/version.rc>

reactos/subsys/system/usetup
usetup.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- usetup.rc	8 Sep 2002 18:28:43 -0000	1.1
+++ usetup.rc	16 Oct 2004 20:27:41 -0000	1.2
@@ -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",	"ReactOS Setup\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"usetup\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"usetup.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: usetup.rc,v 1.2 2004/10/16 20:27:41 gvg Exp $ */
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Setup\0"
+#define REACTOS_STR_INTERNAL_NAME	"usetup\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"usetup.dll\0"
+#include <reactos/version.rc>

reactos/subsys/system/vmwinst
De.rc 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- De.rc	15 Oct 2004 14:07:42 -0000	1.4
+++ De.rc	16 Oct 2004 20:27:41 -0000	1.5
@@ -1,38 +1,5 @@
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
-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 VMware(r) Treiberinstallation Tool\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"vmwinst\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vmwinst.exe\0"
-            VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x407, 1200
-    END
-END
-
 IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Grafikreiberinstallation"

reactos/subsys/system/vmwinst
Es.rc 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Es.rc	24 Sep 2004 20:18:15 -0000	1.3
+++ Es.rc	16 Oct 2004 20:27:41 -0000	1.4
@@ -1,38 +1,5 @@
 LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
 
-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 VMware(r) driver installation utility\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"vmwinst\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vmwinst.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
-
 IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Instalaci�n del Controlador de Video"

reactos/subsys/system/vmwinst
vmwinst.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- vmwinst.rc	24 Sep 2004 20:18:15 -0000	1.6
+++ vmwinst.rc	16 Oct 2004 20:27:41 -0000	1.7
@@ -1,41 +1,14 @@
+/* $Id: vmwinst.rc,v 1.7 2004/10/16 20:27:41 gvg Exp $ */
+
 #include <defines.h>
-#include <reactos/resource.h>
 #include "vmwinst.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS VMware(r) driver installation utility\0"
+#define REACTOS_STR_INTERNAL_NAME	"vmwinst\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"vmwinst.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 VMware(r) driver installation utility\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"vmwinst\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"vmwinst.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
 
 1 24 DISCARDABLE "manifest.xml"
 

reactos/subsys/system/welcome
De.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- De.rc	8 Aug 2004 19:15:57 -0000	1.1
+++ De.rc	16 Oct 2004 20:27:42 -0000	1.2
@@ -4,39 +4,6 @@
 
 LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
-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-Willkommen\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", 0x407, 1200
-    END
-END
-
 /* Icons */
 IDI_MAIN                ICON  "res/welcome.ico"
 

reactos/subsys/system/welcome
Es.rc 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- Es.rc	16 Jul 2004 22:24:24 -0000	1.1
+++ Es.rc	16 Oct 2004 20:27:42 -0000	1.2
@@ -4,41 +4,6 @@
 
 LANGUAGE LANG_SPANISH, SUBLANG_SPANISH
 
-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"
 

reactos/subsys/system/welcome
welcome.rc 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- welcome.rc	8 Aug 2004 19:15:57 -0000	1.5
+++ welcome.rc	16 Oct 2004 20:27:42 -0000	1.6
@@ -1,45 +1,18 @@
+/* $Id: welcome.rc,v 1.6 2004/10/16 20:27:42 gvg Exp $ */
+
 #include <defines.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS-Welcome\0"
+#define REACTOS_STR_INTERNAL_NAME	"welcome\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"welcome.exe\0"
+#include <reactos/version.rc>
+
 #include "De.rc"
 #include "Es.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",	"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"
 

reactos/subsys/system/winlogon
winlogon.rc 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- winlogon.rc	15 Oct 2004 14:07:42 -0000	1.8
+++ winlogon.rc	16 Oct 2004 20:27:42 -0000	1.9
@@ -1,41 +1,14 @@
+/* $Id: winlogon.rc,v 1.9 2004/10/16 20:27:42 gvg Exp $ */
+
 #include <defines.h>
-#include <reactos/resource.h>
 #include "resource.h"
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Logon Application\0"
+#define REACTOS_STR_INTERNAL_NAME	"winlogon\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"winlogon.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 Logon Application\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"winlogon\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"winlogon.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
 
 /* IDI_WINLOGON ICON "resources/winlogon.ico" */
 

reactos/subsys/win32k
win32k.rc 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- win32k.rc	24 Sep 2003 20:32:11 -0000	1.6
+++ win32k.rc	16 Oct 2004 20:27:43 -0000	1.7
@@ -1,38 +1,7 @@
-#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",	"W32 GDI KM subsystem\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"win32k\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"win32k.sys\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: win32k.rc,v 1.7 2004/10/16 20:27:43 gvg Exp $ */
 
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"W32 GDI KM subsystem\0"
+#define REACTOS_STR_INTERNAL_NAME	"win32k\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"win32k.sys\0"
+#include <reactos/version.rc>

reactos/tools
buildno.c 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- buildno.c	21 Feb 2004 15:34:51 -0000	1.5
+++ buildno.c	16 Oct 2004 20:27:43 -0000	1.6
@@ -1,4 +1,4 @@
-/* $Id: buildno.c,v 1.5 2004/02/21 15:34:51 ea Exp $
+/* $Id: buildno.c,v 1.6 2004/10/16 20:27:43 gvg Exp $
  *
  * buildno - Generate the build number for ReactOS
  *
@@ -80,6 +80,7 @@
   char* s;
   char* s1;
   int length;
+  int dllversion = KERNEL_VERSION_MAJOR + 42;
 
   s1 = s = malloc(256 * 1024);
   
@@ -122,6 +123,38 @@
       s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
     }
   s = s + sprintf (s, "-%S\"\n", KERNEL_VERSION_BUILD_TYPE);
+  s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion);
+  s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d",
+		   dllversion, KERNEL_VERSION_MINOR);
+  if (0 != KERNEL_VERSION_PATCH_LEVEL)
+    {
+      s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+    }
+  s = s + sprintf (s, "-%S\\0\"\n", KERNEL_VERSION_BUILD_TYPE);
+  s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d",
+		   dllversion,
+		   KERNEL_VERSION_MINOR);
+  if (0 != KERNEL_VERSION_PATCH_LEVEL)
+    {
+      s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+    }
+  s = s + sprintf (s, "-%S\"\n", KERNEL_VERSION_BUILD_TYPE);
+  s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d",
+		   dllversion,
+		   KERNEL_VERSION_MINOR);
+  if (0 != KERNEL_VERSION_PATCH_LEVEL)
+    {
+      s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+    }
+  s = s + sprintf (s, "-%S\\0\"\n", KERNEL_VERSION_BUILD_TYPE);
+  s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d", 
+		   dllversion,
+		   KERNEL_VERSION_MINOR);
+  if (0 != KERNEL_VERSION_PATCH_LEVEL)
+    {
+      s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+    }
+  s = s + sprintf (s, "-%S\"\n", KERNEL_VERSION_BUILD_TYPE);
   s = s + sprintf (s, "#endif\n/* EOF */\n");
 
   h = fopen (BUILDNO_INCLUDE_FILE, "rb");
CVSspam 0.2.8