From ba58b241e5a498a2e9752569e9b84e4516cb03f5 Mon Sep 17 00:00:00 2001
From: Emanuele Aliberti <ea@iol.it>
Date: Sat, 4 Dec 1999 20:58:45 +0000
Subject: [PATCH] Added version resource to dd and fs.

svn path=/trunk/; revision=822
---
 reactos/drivers/dd/beep/beep.rc         | 39 +++++++++++++++
 reactos/drivers/dd/beep/makefile        | 35 +++++++++----
 reactos/drivers/dd/blue/blue.rc         | 39 +++++++++++++++
 reactos/drivers/dd/blue/makefile        | 41 +++++++++++-----
 reactos/drivers/dd/ide/ide.c            |  3 +-
 reactos/drivers/dd/ide/ide.rc           | 39 +++++++++++++++
 reactos/drivers/dd/ide/makefile         | 44 ++++++++++++-----
 reactos/drivers/dd/keyboard/keyboard.rc | 39 +++++++++++++++
 reactos/drivers/dd/keyboard/makefile    | 45 ++++++++++++-----
 reactos/drivers/dd/null/makefile        | 43 +++++++++++-----
 reactos/drivers/dd/null/null.c          |  3 +-
 reactos/drivers/dd/null/null.rc         | 39 +++++++++++++++
 reactos/drivers/dd/parallel/makefile    | 43 +++++++++++-----
 reactos/drivers/dd/parallel/parallel.c  |  3 +-
 reactos/drivers/dd/parallel/parallel.rc | 39 +++++++++++++++
 reactos/drivers/dd/serial/makefile      | 43 +++++++++++-----
 reactos/drivers/dd/serial/serial.c      | 14 +++---
 reactos/drivers/dd/serial/serial.rc     | 39 +++++++++++++++
 reactos/drivers/dd/vga/makefile         | 65 +++++++++++++++++++------
 reactos/drivers/dd/vga/vgaddi.rc        | 39 +++++++++++++++
 reactos/drivers/dd/vga/vgamp.rc         | 39 +++++++++++++++
 reactos/drivers/dd/vidport/makefile     | 14 +++---
 reactos/drivers/dd/vidport/vidport.c    | 64 ++++++++++++++++++++++--
 reactos/drivers/dd/vidport/vidport.rc   | 39 +++++++++++++++
 reactos/drivers/fs/np/Makefile          | 56 ++++++++++++---------
 reactos/drivers/fs/np/create.c          | 10 ++--
 reactos/drivers/fs/np/mount.c           |  8 ++-
 reactos/drivers/fs/np/npfs.h            |  2 +-
 reactos/drivers/fs/vfat/iface.c         |  3 +-
 reactos/drivers/fs/vfat/makefile        | 46 ++++++++++++-----
 reactos/drivers/fs/vfat/vfat.h          |  2 +
 reactos/drivers/fs/vfat/vfatfs.rc       | 39 +++++++++++++++
 32 files changed, 852 insertions(+), 164 deletions(-)
 create mode 100644 reactos/drivers/dd/beep/beep.rc
 create mode 100644 reactos/drivers/dd/blue/blue.rc
 create mode 100644 reactos/drivers/dd/ide/ide.rc
 create mode 100644 reactos/drivers/dd/keyboard/keyboard.rc
 create mode 100644 reactos/drivers/dd/null/null.rc
 create mode 100644 reactos/drivers/dd/parallel/parallel.rc
 create mode 100644 reactos/drivers/dd/serial/serial.rc
 create mode 100644 reactos/drivers/dd/vga/vgaddi.rc
 create mode 100644 reactos/drivers/dd/vga/vgamp.rc
 create mode 100644 reactos/drivers/dd/vidport/vidport.rc
 create mode 100644 reactos/drivers/fs/vfat/vfatfs.rc

diff --git a/reactos/drivers/dd/beep/beep.rc b/reactos/drivers/dd/beep/beep.rc
new file mode 100644
index 00000000000..66d2c6f9f68
--- /dev/null
+++ b/reactos/drivers/dd/beep/beep.rc
@@ -0,0 +1,39 @@
+
+#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.2\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
+
diff --git a/reactos/drivers/dd/beep/makefile b/reactos/drivers/dd/beep/makefile
index 6547b9523b7..9979ff3432b 100644
--- a/reactos/drivers/dd/beep/makefile
+++ b/reactos/drivers/dd/beep/makefile
@@ -1,8 +1,8 @@
-#
+# $Id: makefile,v 1.6 1999/12/04 20:58:35 ea Exp $
 #
 #
 TARGET = beep
-OBJECTS = beep.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = beep.o beep.coff ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
@@ -12,6 +12,7 @@ all: beep.sys
 
 clean:
 	- $(RM) beep.o
+	- $(RM) beep.coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
@@ -39,15 +40,31 @@ endif
 
 
 beep.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname beep.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname beep.sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-	      -specs=../../svc_specs -mdll -o beep.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 include ../../../rules.mak
diff --git a/reactos/drivers/dd/blue/blue.rc b/reactos/drivers/dd/blue/blue.rc
new file mode 100644
index 00000000000..dafbe1fe23e
--- /dev/null
+++ b/reactos/drivers/dd/blue/blue.rc
@@ -0,0 +1,39 @@
+
+#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
+
diff --git a/reactos/drivers/dd/blue/makefile b/reactos/drivers/dd/blue/makefile
index 8cfa4b02851..95e0e6833f9 100644
--- a/reactos/drivers/dd/blue/makefile
+++ b/reactos/drivers/dd/blue/makefile
@@ -1,18 +1,20 @@
-#
+# $Id: makefile,v 1.9 1999/12/04 20:58:36 ea Exp $
 #
 #
 TARGET = blue
 
 BASE_CFLAGS = -I../../../include
 
-OBJECTS = blue.o ../../../ntoskrnl/ntoskrnl.a
+#OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o ../../../ntoskrnl/ntoskrnl.a
 
-all: blue.sys
+all: $(TARGET).sys
 
 .phony: all
 
 clean:
-	- $(RM) blue.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
@@ -38,16 +40,31 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-blue.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp $(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname blue.sys --base-file base.tmp \
-		   --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-	      -specs=../../svc_specs -mdll -o blue.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 
diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c
index a812e18add2..a76e3f9d598 100644
--- a/reactos/drivers/dd/ide/ide.c
+++ b/reactos/drivers/dd/ide/ide.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: ide.c,v 1.23 1999/12/04 20:58:36 ea Exp $
+ *
  *  IDE.C - IDE Disk driver 
  *     written by Rex Jolliff
  *     with help from various documentation sources and a few peeks at
diff --git a/reactos/drivers/dd/ide/ide.rc b/reactos/drivers/dd/ide/ide.rc
new file mode 100644
index 00000000000..5981746c951
--- /dev/null
+++ b/reactos/drivers/dd/ide/ide.rc
@@ -0,0 +1,39 @@
+
+#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",	"IDE Disk Device Driver\0"
+            VALUE "FileVersion",	"0.1.4\0"
+            VALUE "InternalName",	"ide\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"ide.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
+
diff --git a/reactos/drivers/dd/ide/makefile b/reactos/drivers/dd/ide/makefile
index e10d8109084..92f70a5cd81 100644
--- a/reactos/drivers/dd/ide/makefile
+++ b/reactos/drivers/dd/ide/makefile
@@ -1,21 +1,24 @@
-#
+# $Id: makefile,v 1.9 1999/12/04 20:58:38 ea Exp $
 #
 #
 TARGET=ide
-OBJECTS = ide.o ../../../ntoskrnl/ntoskrnl.a
+
+#OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: ide.sys
+all: $(TARGET).sys
 
 .phony: all
 
 clean:
-	- $(RM) ide.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) ide.sys
+	- $(RM) $(TARGET).sys
 
 .phony: clean
 
@@ -37,16 +40,31 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-ide.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp $(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname ide.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-              -specs=../../svc_specs -mdll -o ide.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 include ../../../rules.mak
diff --git a/reactos/drivers/dd/keyboard/keyboard.rc b/reactos/drivers/dd/keyboard/keyboard.rc
new file mode 100644
index 00000000000..8095fc3e48c
--- /dev/null
+++ b/reactos/drivers/dd/keyboard/keyboard.rc
@@ -0,0 +1,39 @@
+
+#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
+
diff --git a/reactos/drivers/dd/keyboard/makefile b/reactos/drivers/dd/keyboard/makefile
index 1f26b027329..9feeb38ed43 100644
--- a/reactos/drivers/dd/keyboard/makefile
+++ b/reactos/drivers/dd/keyboard/makefile
@@ -1,21 +1,24 @@
-#
+# $Id: makefile,v 1.7 1999/12/04 20:58:39 ea Exp $
 #
 #
 TARGET=keyboard
-OBJECTS = keyboard.o ../../../ntoskrnl/ntoskrnl.a
+
+#OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: keyboard.sys
+all: $(TARGET).sys
 
 .phony: all
 
 clean:
-	- $(RM) keyboard.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) keyboard.sys
+	- $(RM) $(TARGET).sys
 
 .phony: clean
 
@@ -37,16 +40,32 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-keyboard.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname keyboard.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-              -specs=../../svc_specs -mdll -o keyboard.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 include ../../../rules.mak
diff --git a/reactos/drivers/dd/null/makefile b/reactos/drivers/dd/null/makefile
index c0d8658385a..f8f00a323ca 100644
--- a/reactos/drivers/dd/null/makefile
+++ b/reactos/drivers/dd/null/makefile
@@ -1,21 +1,22 @@
-#
+# $Id: makefile,v 1.6 1999/12/04 20:58:39 ea Exp $
 #
 #
 TARGET=null
-OBJECTS= null.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS= $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: null.sys
+all: $(TARGET).sys
 
 .phony: all
 
 clean:
-	- $(RM) null.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) null.sys
+	- $(RM) $(TARGET).sys
 
 .phony: clean
 
@@ -37,16 +38,32 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-null.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname null.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-	      -specs=../../svc_specs -mdll -o null.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 
diff --git a/reactos/drivers/dd/null/null.c b/reactos/drivers/dd/null/null.c
index 753c55c8721..363bbdd5754 100644
--- a/reactos/drivers/dd/null/null.c
+++ b/reactos/drivers/dd/null/null.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: null.c,v 1.3 1999/12/04 20:58:39 ea Exp $
+ *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             services/null/null.c
diff --git a/reactos/drivers/dd/null/null.rc b/reactos/drivers/dd/null/null.rc
new file mode 100644
index 00000000000..5a61bc9d7f8
--- /dev/null
+++ b/reactos/drivers/dd/null/null.rc
@@ -0,0 +1,39 @@
+
+#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
+
diff --git a/reactos/drivers/dd/parallel/makefile b/reactos/drivers/dd/parallel/makefile
index 0bfbeb95ed8..5be68ff8f2d 100644
--- a/reactos/drivers/dd/parallel/makefile
+++ b/reactos/drivers/dd/parallel/makefile
@@ -1,21 +1,22 @@
-#
+# $Id: makefile,v 1.7 1999/12/04 20:58:40 ea Exp $
 #
 #
 TARGET=parallel
-OBJECTS= parallel.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS= $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: parallel.sys
+all: $(TARGET).sys
 
 .phony: all
 
 clean:
-	- $(RM) parallel.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) parallel.sys
+	- $(RM) $(TARGET).sys
 
 .phony: clean
 
@@ -37,16 +38,32 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-parallel.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname parallel.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-	      -specs=../../svc_specs -mdll -o parallel.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 
diff --git a/reactos/drivers/dd/parallel/parallel.c b/reactos/drivers/dd/parallel/parallel.c
index 1b8b32ad064..6a38031a9fc 100644
--- a/reactos/drivers/dd/parallel/parallel.c
+++ b/reactos/drivers/dd/parallel/parallel.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: parallel.c,v 1.4 1999/12/04 20:58:40 ea Exp $
+ *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             services/parallel/parallel.c
diff --git a/reactos/drivers/dd/parallel/parallel.rc b/reactos/drivers/dd/parallel/parallel.rc
new file mode 100644
index 00000000000..b0e6298b0df
--- /dev/null
+++ b/reactos/drivers/dd/parallel/parallel.rc
@@ -0,0 +1,39 @@
+
+#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
+
diff --git a/reactos/drivers/dd/serial/makefile b/reactos/drivers/dd/serial/makefile
index 6216e36c366..a284cc98a2c 100644
--- a/reactos/drivers/dd/serial/makefile
+++ b/reactos/drivers/dd/serial/makefile
@@ -1,21 +1,22 @@
-#
+# $Id: makefile,v 1.7 1999/12/04 20:58:40 ea Exp $
 #
 #
 TARGET= serial
-OBJECTS= serial.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS= $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: serial.sys
+all: $(TARGET).sys
 
 .phony: all
 
 clean:
-	- $(RM) serial.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) serial.sys
+	- $(RM) $(TARGET).sys
 
 .phony: clean
 
@@ -37,16 +38,32 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-serial.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname serial.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-	      -specs=../../svc_specs -mdll -o serial.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 
diff --git a/reactos/drivers/dd/serial/serial.c b/reactos/drivers/dd/serial/serial.c
index 2abd54b8107..c9c1f293ad8 100644
--- a/reactos/drivers/dd/serial/serial.c
+++ b/reactos/drivers/dd/serial/serial.c
@@ -1,10 +1,10 @@
-/*
-
- ** Serial driver
- ** Written by Jason Filby (jasonfilby@yahoo.com)
- ** For ReactOS (www.sid-dis.com/reactos)
-
-*/
+/* $Id: serial.c,v 1.7 1999/12/04 20:58:41 ea Exp $
+ *
+ * Serial driver
+ * Written by Jason Filby (jasonfilby@yahoo.com)
+ * For ReactOS (www.reactos.com)
+ *
+ */
 
 #include <ddk/ntddk.h>
 #include <internal/mmhal.h>
diff --git a/reactos/drivers/dd/serial/serial.rc b/reactos/drivers/dd/serial/serial.rc
new file mode 100644
index 00000000000..1b1b9fab779
--- /dev/null
+++ b/reactos/drivers/dd/serial/serial.rc
@@ -0,0 +1,39 @@
+
+#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
+
diff --git a/reactos/drivers/dd/vga/makefile b/reactos/drivers/dd/vga/makefile
index d6d760b5650..8cae838d1ec 100644
--- a/reactos/drivers/dd/vga/makefile
+++ b/reactos/drivers/dd/vga/makefile
@@ -3,8 +3,8 @@
 #
 BASE_CFLAGS = -I../../../include
 
-MP_OBJECTS = vgamp.o ../../../ntoskrnl/ntoskrnl.a ../vidport/vidport.a
-DDI_OBJECTS = vgaddi.o ../../../subsys/win32k/win32k.a
+MP_OBJECTS = vgamp.o vgamp.coff ../../../ntoskrnl/ntoskrnl.a ../vidport/vidport.a
+DDI_OBJECTS = vgaddi.o vgaddi.coff ../../../subsys/win32k/win32k.a
 
 all: vgamp.sys vgaddi.sys
 
@@ -16,31 +16,64 @@ clean:
 	- $(RM) base.tmp
 	- $(RM) temp.exp
 	- $(RM) *.sys
+	- $(RM) *.coff
 
 .phony: clean
 
 vgamp.sys: $(MP_OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(MP_OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(MP_OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname vgamp.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname vgamp.sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-              -specs=../../svc_specs -mdll -o vgamp.sys $(MP_OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o vgamp.sys \
+		$(MP_OBJECTS)
 	- $(RM) temp.exp
 
 vgaddi.sys: $(DDI_OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(DDI_OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(DDI_OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname vgaddi.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname vgaddi.sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-              -specs=../../svc_specs -mdll -o vgaddi.sys $(DDI_OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-specs=../../svc_specs \
+		-mdll \
+		-o vgaddi.sys \
+		$(DDI_OBJECTS)
 	- $(RM) temp.exp
 
 floppy: $(FLOPPY_DIR)/drivers/vgamp.sys $(FLOPPY_DIR)/drivers/vgaddi.sys
diff --git a/reactos/drivers/dd/vga/vgaddi.rc b/reactos/drivers/dd/vga/vgaddi.rc
new file mode 100644
index 00000000000..9e787b64dc2
--- /dev/null
+++ b/reactos/drivers/dd/vga/vgaddi.rc
@@ -0,0 +1,39 @@
+
+#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",	"VGADDI Device Driver\0"
+            VALUE "FileVersion",	"0.0.0\0"
+            VALUE "InternalName",	"vgaddi\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"vgaddi.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
+
diff --git a/reactos/drivers/dd/vga/vgamp.rc b/reactos/drivers/dd/vga/vgamp.rc
new file mode 100644
index 00000000000..192cd179814
--- /dev/null
+++ b/reactos/drivers/dd/vga/vgamp.rc
@@ -0,0 +1,39 @@
+
+#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
+
diff --git a/reactos/drivers/dd/vidport/makefile b/reactos/drivers/dd/vidport/makefile
index fe787e65c61..94c4a2b74d2 100644
--- a/reactos/drivers/dd/vidport/makefile
+++ b/reactos/drivers/dd/vidport/makefile
@@ -1,21 +1,23 @@
-#
+# $Id: makefile,v 1.7 1999/12/04 20:58:41 ea Exp $
 #
 #
 TARGET=vidport
-OBJECTS = vidport.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = $(TARGET).o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: vidport.sys vidport.a
+all: $(TARGET).sys vidport.a
 
 .phony: all
 
 clean:
-	- $(RM) vidport.o
+	- $(RM) $(TARGET).o
+	- $(RM) $(TARGET).a
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) vidport.sys
+	- $(RM) $(TARGET).sys
 
 .phony: clean
 
@@ -37,7 +39,7 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-vidport.sys: $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
 	$(DLLTOOL) \
 		--dllname $(TARGET).sys \
 		--def $(TARGET).def \
diff --git a/reactos/drivers/dd/vidport/vidport.c b/reactos/drivers/dd/vidport/vidport.c
index 1d6505d063c..8f7c17a4a9f 100644
--- a/reactos/drivers/dd/vidport/vidport.c
+++ b/reactos/drivers/dd/vidport/vidport.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: vidport.c,v 1.9 1999/12/04 20:58:42 ea Exp $
+ *
  * VideoPort driver
  *   Written by Rex Jolliff
  */
@@ -52,7 +53,8 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
   return  STATUS_SUCCESS;
 }
 
-ULONG 
+ULONG
+STDCALL
 VideoPortCompareMemory(IN PVOID  Source1, 
                        IN PVOID  Source2, 
                        IN ULONG  Length)
@@ -61,6 +63,7 @@ VideoPortCompareMemory(IN PVOID  Source1,
 }
 
 VOID 
+STDCALL
 VideoPortDebugPrint(IN ULONG DebugPrintLevel, 
                     IN PCHAR DebugMessage, ...)
 {
@@ -68,18 +71,21 @@ VideoPortDebugPrint(IN ULONG DebugPrintLevel,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortDisableInterrupt(IN PVOID  HwDeviceExtension)
 {
   UNIMPLEMENTED;
 }
 
 VP_STATUS 
+STDCALL
 VideoPortEnableInterrupt(IN PVOID  HwDeviceExtension)
 {
   UNIMPLEMENTED;
 }
 
 VOID 
+STDCALL
 VideoPortFreeDeviceBase(IN PVOID  HwDeviceExtension, 
                         IN PVOID  MappedAddress)
 {
@@ -87,6 +93,7 @@ VideoPortFreeDeviceBase(IN PVOID  HwDeviceExtension,
 }
 
 ULONG 
+STDCALL
 VideoPortGetBusData(IN PVOID  HwDeviceExtension,
                     IN BUS_DATA_TYPE  BusDataType,
                     IN ULONG  SlotNumber,
@@ -103,12 +110,14 @@ VideoPortGetBusData(IN PVOID  HwDeviceExtension,
 }
 
 UCHAR 
+STDCALL
 VideoPortGetCurrentIrql(VOID)
 {
   return KeGetCurrentIrql();
 }
 
 PVOID 
+STDCALL
 VideoPortGetDeviceBase(IN PVOID  HwDeviceExtension,
                        IN PHYSICAL_ADDRESS  IoAddress,
                        IN ULONG  NumberOfUchars,
@@ -126,6 +135,7 @@ VideoPortGetDeviceBase(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortGetDeviceData(IN PVOID  HwDeviceExtension,
                        IN VIDEO_DEVICE_DATA_TYPE  DeviceDataType,
                        IN PMINIPORT_QUERY_DEVICE_ROUTINE  CallbackRoutine,
@@ -135,6 +145,7 @@ VideoPortGetDeviceData(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortGetAccessRanges(IN PVOID  HwDeviceExtension,
                          IN ULONG  NumRequestedResources,
                          IN PIO_RESOURCE_DESCRIPTOR  RequestedResources OPTIONAL,
@@ -148,6 +159,7 @@ VideoPortGetAccessRanges(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortGetRegistryParameters(IN PVOID  HwDeviceExtension,
                                IN PWSTR  ParameterName,
                                IN UCHAR  IsParameterFileName,
@@ -158,6 +170,7 @@ VideoPortGetRegistryParameters(IN PVOID  HwDeviceExtension,
 }
 
 ULONG 
+STDCALL
 VideoPortInitialize(IN PVOID  Context1,
                     IN PVOID  Context2,
                     IN PVIDEO_HW_INITIALIZATION_DATA  HwInitializationData,
@@ -287,6 +300,7 @@ VideoPortInitialize(IN PVOID  Context1,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortInt10(IN PVOID  HwDeviceExtension,
                IN PVIDEO_X86_BIOS_ARGUMENTS  BiosArguments)
 {
@@ -294,6 +308,7 @@ VideoPortInt10(IN PVOID  HwDeviceExtension,
 }
 
 VOID 
+STDCALL
 VideoPortLogError(IN PVOID  HwDeviceExtension,
                   IN PVIDEO_REQUEST_PACKET  Vrp OPTIONAL,
                   IN VP_STATUS  ErrorCode,
@@ -303,6 +318,7 @@ VideoPortLogError(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortMapBankedMemory(IN PVOID  HwDeviceExtension,
                          IN PHYSICAL_ADDRESS  PhysicalAddress,
                          IN PULONG  Length,
@@ -317,6 +333,7 @@ VideoPortMapBankedMemory(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortMapMemory(IN PVOID  HwDeviceExtension,
                    IN PHYSICAL_ADDRESS  PhysicalAddress,
                    IN PULONG  Length,
@@ -339,6 +356,7 @@ VideoPortMapMemory(IN PVOID  HwDeviceExtension,
 }
 
 VOID 
+STDCALL
 VideoPortMoveMemory(OUT PVOID  Destination,
                     IN PVOID  Source,
                     IN ULONG  Length)
@@ -347,24 +365,28 @@ VideoPortMoveMemory(OUT PVOID  Destination,
 }
 
 UCHAR 
+STDCALL
 VideoPortReadPortUchar(IN PUCHAR  Port)
 {
   return  READ_PORT_UCHAR(Port);
 }
 
 USHORT 
+STDCALL
 VideoPortReadPortUshort(IN PUSHORT Port)
 {
   return  READ_PORT_USHORT(Port);
 }
 
 ULONG 
+STDCALL
 VideoPortReadPortUlong(IN PULONG Port)
 {
   return  READ_PORT_ULONG(Port);
 }
 
 VOID 
+STDCALL
 VideoPortReadPortBufferUchar(IN PUCHAR  Port, 
                              OUT PUCHAR  Buffer, 
                              IN ULONG  Count)
@@ -373,6 +395,7 @@ VideoPortReadPortBufferUchar(IN PUCHAR  Port,
 }
 
 VOID 
+STDCALL
 VideoPortReadPortBufferUshort(IN PUSHORT Port, 
                               OUT PUSHORT Buffer, 
                               IN ULONG Count)
@@ -381,6 +404,7 @@ VideoPortReadPortBufferUshort(IN PUSHORT Port,
 }
 
 VOID 
+STDCALL
 VideoPortReadPortBufferUlong(IN PULONG Port, 
                              OUT PULONG Buffer, 
                              IN ULONG Count)
@@ -389,24 +413,28 @@ VideoPortReadPortBufferUlong(IN PULONG Port,
 }
 
 UCHAR 
+STDCALL
 VideoPortReadRegisterUchar(IN PUCHAR Register)
 {
   return  READ_REGISTER_UCHAR(Register);
 }
 
 USHORT 
+STDCALL
 VideoPortReadRegisterUshort(IN PUSHORT Register)
 {
   return  READ_REGISTER_USHORT(Register);
 }
 
 ULONG 
+STDCALL
 VideoPortReadRegisterUlong(IN PULONG Register)
 {
   return  READ_REGISTER_ULONG(Register);
 }
 
 VOID 
+STDCALL
 VideoPortReadRegisterBufferUchar(IN PUCHAR  Register, 
                                  OUT PUCHAR  Buffer, 
                                  IN ULONG  Count)
@@ -415,6 +443,7 @@ VideoPortReadRegisterBufferUchar(IN PUCHAR  Register,
 }
 
 VOID 
+STDCALL
 VideoPortReadRegisterBufferUshort(IN PUSHORT  Register, 
                                   OUT PUSHORT  Buffer, 
                                   IN ULONG  Count)
@@ -423,6 +452,7 @@ VideoPortReadRegisterBufferUshort(IN PUSHORT  Register,
 }
 
 VOID 
+STDCALL
 VideoPortReadRegisterBufferUlong(IN PULONG  Register, 
                                  OUT PULONG  Buffer, 
                                  IN ULONG  Count)
@@ -431,6 +461,7 @@ VideoPortReadRegisterBufferUlong(IN PULONG  Register,
 }
 
 BOOLEAN 
+STDCALL
 VideoPortScanRom(IN PVOID  HwDeviceExtension, 
                  IN PUCHAR  RomBase,
                  IN ULONG  RomLength,
@@ -440,6 +471,7 @@ VideoPortScanRom(IN PVOID  HwDeviceExtension,
 }
 
 ULONG 
+STDCALL
 VideoPortSetBusData(IN PVOID  HwDeviceExtension,
                     IN BUS_DATA_TYPE  BusDataType,
                     IN ULONG  SlotNumber,
@@ -456,6 +488,7 @@ VideoPortSetBusData(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortSetRegistryParameters(IN PVOID  HwDeviceExtension,
                                IN PWSTR  ValueName,
                                IN PVOID  ValueData,
@@ -465,6 +498,7 @@ VideoPortSetRegistryParameters(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortSetTrappedEmulatorPorts(IN PVOID  HwDeviceExtension,
                                  IN ULONG  NumAccessRanges,
                                  IN PVIDEO_ACCESS_RANGE  AccessRange)
@@ -473,12 +507,14 @@ VideoPortSetTrappedEmulatorPorts(IN PVOID  HwDeviceExtension,
 }
 
 VOID 
+STDCALL
 VideoPortStallExecution(IN ULONG  Microseconds)
 {
   KeStallExecutionProcessor(Microseconds);
 }
 
 VOID 
+STDCALL
 VideoPortStartTimer(IN PVOID  HwDeviceExtension)
 {
   PVIDEOPORT_EXTENSION_DATA ExtensionData = 
@@ -488,6 +524,7 @@ VideoPortStartTimer(IN PVOID  HwDeviceExtension)
 }
 
 VOID 
+STDCALL
 VideoPortStopTimer(IN PVOID  HwDeviceExtension)
 {
   PVIDEOPORT_EXTENSION_DATA ExtensionData = 
@@ -497,6 +534,7 @@ VideoPortStopTimer(IN PVOID  HwDeviceExtension)
 }
 
 BOOLEAN 
+STDCALL
 VideoPortSynchronizeExecution(IN PVOID  HwDeviceExtension,
                               IN VIDEO_SYNCHRONIZE_PRIORITY  Priority,
                               IN PMINIPORT_SYNCHRONIZE_ROUTINE  SynchronizeRoutine,
@@ -506,6 +544,7 @@ VideoPortSynchronizeExecution(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortUnmapMemory(IN PVOID  HwDeviceExtension,
                      IN PVOID  VirtualAddress,
                      IN HANDLE  ProcessHandle)
@@ -514,6 +553,7 @@ VideoPortUnmapMemory(IN PVOID  HwDeviceExtension,
 }
 
 VP_STATUS 
+STDCALL
 VideoPortVerifyAccessRanges(IN PVOID  HwDeviceExtension,
                             IN ULONG  NumAccessRanges,
                             IN PVIDEO_ACCESS_RANGE  AccessRanges)
@@ -522,6 +562,7 @@ VideoPortVerifyAccessRanges(IN PVOID  HwDeviceExtension,
 }
 
 VOID 
+STDCALL
 VideoPortWritePortUchar(IN PUCHAR  Port, 
                         IN UCHAR  Value)
 {
@@ -529,6 +570,7 @@ VideoPortWritePortUchar(IN PUCHAR  Port,
 }
 
 VOID 
+STDCALL
 VideoPortWritePortUshort(IN PUSHORT  Port, 
                          IN USHORT  Value)
 {
@@ -536,6 +578,7 @@ VideoPortWritePortUshort(IN PUSHORT  Port,
 }
 
 VOID 
+STDCALL
 VideoPortWritePortUlong(IN PULONG Port, 
                         IN ULONG Value)
 {
@@ -543,6 +586,7 @@ VideoPortWritePortUlong(IN PULONG Port,
 }
 
 VOID 
+STDCALL
 VideoPortWritePortBufferUchar(IN PUCHAR  Port, 
                               IN PUCHAR  Buffer, 
                               IN ULONG  Count)
@@ -551,6 +595,7 @@ VideoPortWritePortBufferUchar(IN PUCHAR  Port,
 }
 
 VOID 
+STDCALL
 VideoPortWritePortBufferUshort(IN PUSHORT  Port, 
                                IN PUSHORT  Buffer, 
                                IN ULONG  Count)
@@ -559,6 +604,7 @@ VideoPortWritePortBufferUshort(IN PUSHORT  Port,
 }
 
 VOID 
+STDCALL
 VideoPortWritePortBufferUlong(IN PULONG  Port, 
                               IN PULONG  Buffer, 
                               IN ULONG  Count)
@@ -567,6 +613,7 @@ VideoPortWritePortBufferUlong(IN PULONG  Port,
 }
 
 VOID 
+STDCALL
 VideoPortWriteRegisterUchar(IN PUCHAR  Register, 
                             IN UCHAR  Value)
 {
@@ -574,6 +621,7 @@ VideoPortWriteRegisterUchar(IN PUCHAR  Register,
 }
 
 VOID 
+STDCALL
 VideoPortWriteRegisterUshort(IN PUSHORT  Register, 
                              IN USHORT  Value)
 {
@@ -581,6 +629,7 @@ VideoPortWriteRegisterUshort(IN PUSHORT  Register,
 }
 
 VOID 
+STDCALL
 VideoPortWriteRegisterUlong(IN PULONG  Register, 
                             IN ULONG  Value)
 {
@@ -588,6 +637,7 @@ VideoPortWriteRegisterUlong(IN PULONG  Register,
 }
 
 VOID 
+STDCALL
 VideoPortWriteRegisterBufferUchar(IN PUCHAR  Register, 
                                   IN PUCHAR  Buffer, 
                                   IN ULONG  Count)
@@ -596,6 +646,7 @@ VideoPortWriteRegisterBufferUchar(IN PUCHAR  Register,
 }
 
 VOID 
+STDCALL
 VideoPortWriteRegisterBufferUshort(IN PUSHORT  Register, 
                                    IN PUSHORT  Buffer, 
                                    IN ULONG  Count)
@@ -604,6 +655,7 @@ VideoPortWriteRegisterBufferUshort(IN PUSHORT  Register,
 }
 
 VOID 
+STDCALL
 VideoPortWriteRegisterBufferUlong(IN PULONG  Register, 
                                   IN PULONG  Buffer, 
                                   IN ULONG  Count)
@@ -611,13 +663,17 @@ VideoPortWriteRegisterBufferUlong(IN PULONG  Register,
   UNIMPLEMENTED;
 }
 
-VOID VideoPortZeroMemory(OUT PVOID  Destination, 
+VOID
+STDCALL
+VideoPortZeroMemory(OUT PVOID  Destination, 
                          IN ULONG  Length)
 {
   RtlZeroMemory (Destination, Length);
 }
 
-VOID VideoPortZeroDeviceMemory(OUT PVOID  Destination, 
+VOID
+STDCALL
+VideoPortZeroDeviceMemory(OUT PVOID  Destination, 
                                IN ULONG  Length)
 {
   UNIMPLEMENTED;
diff --git a/reactos/drivers/dd/vidport/vidport.rc b/reactos/drivers/dd/vidport/vidport.rc
new file mode 100644
index 00000000000..92f19089948
--- /dev/null
+++ b/reactos/drivers/dd/vidport/vidport.rc
@@ -0,0 +1,39 @@
+
+#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",	"Videort Driver\0"
+            VALUE "FileVersion",	"0.0.0\0"
+            VALUE "InternalName",	"vidport\0"
+            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
+            VALUE "OriginalFilename",	"vidport.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
+
diff --git a/reactos/drivers/fs/np/Makefile b/reactos/drivers/fs/np/Makefile
index 45dd07290d9..1c666bdff83 100644
--- a/reactos/drivers/fs/np/Makefile
+++ b/reactos/drivers/fs/np/Makefile
@@ -1,40 +1,52 @@
+# $Id: Makefile,v 1.2 1999/12/04 20:58:42 ea Exp $
 #
+# Named Pipes File System
 #
-#
+
+TARGETNAME=npfs
 
 BASE_CFLAGS = -I../../../include
 
-OBJECTS = super.o blockdev.o inode.o file.o dir.o rw.o quota.o security.o \
-          attr.o ../../../ntoskrnl/ntoskrnl.a
+OBJECTS = create.o mount.o \
+          ../../../ntoskrnl/ntoskrnl.a
 
-all: ext2fs.sys
+all: $(TARGETNAME).sys
 
 .phony: all
 
 clean:
-	- $(RM) super.o 
-	- $(RM) blockdev.o
-	- $(RM) inode.o
-	- $(RM) file.o
-	- $(RM) dir.o
-	- $(RM) rw.o
-	- $(RM) junk.tmp
-	- $(RM) base.tmp
-	- $(RM) temp.exp
-	- $(RM) ext2fs.sys
+	- $(RM) create.o 
+	- $(RM) mount.o
+	- $(RM) $(TARGETNAME).sys
 
 .phony: clean
 
-ext2fs.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp $(OBJECTS)
+$(TARGETNAME).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		$(OBJECTS)
 	$(RM) junk.tmp
-	$(DLLTOOL) --dllname ext2fs.sys --base-file base.tmp \
-	           --output-exp temp.exp
+	$(DLLTOOL) \
+		--dllname $(TARGETNAME).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--kill-at
 	$(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry \
-	      -specs=../../svc_specs -mdll -o ext2fs.sys $(OBJECTS) -Wl,temp.exp
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGETNAME).sys \
+		$(OBJECTS) \
+		-Wl,temp.exp
 	$(RM) temp.exp
 
 include ../../../rules.mak
diff --git a/reactos/drivers/fs/np/create.c b/reactos/drivers/fs/np/create.c
index 2d8f8dbf427..def56ba908b 100644
--- a/reactos/drivers/fs/np/create.c
+++ b/reactos/drivers/fs/np/create.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: create.c,v 1.2 1999/12/04 20:58:42 ea Exp $
+ *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS kernel
  * FILE:       services/fs/np/create.c
@@ -13,7 +14,7 @@
 //#define NDEBUG
 #include <internal/debug.h>
 
-#include "np.h"
+#include "npfs.h"
 
 /* FUNCTIONS *****************************************************************/
 
@@ -33,7 +34,7 @@ NTSTATUS NpfsCreatePipe(PNPFS_DEVICE_EXTENSION DeviceExt,
    PipeDescr = ExAllocatePool(NonPagedPool, sizeof(NPFS_FSCONTEXT));
    if (PipeDescr == NULL)
      {
-	return(STATUS_OUT_OF_MEMORY);
+	return(STATUS_NO_MEMORY);
      }
    
    Status = NpfsCreateEntry(PipeName, PipeDescr);
@@ -68,3 +69,6 @@ NTSTATUS NpfsCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp)
    
    return(Status);
 }
+
+
+/* EOF */
diff --git a/reactos/drivers/fs/np/mount.c b/reactos/drivers/fs/np/mount.c
index 8a220ab50a3..e2040b7e438 100644
--- a/reactos/drivers/fs/np/mount.c
+++ b/reactos/drivers/fs/np/mount.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: mount.c,v 1.2 1999/12/04 20:58:42 ea Exp $
+ *
  * COPYRIGHT:  See COPYING in the top level directory
  * PROJECT:    ReactOS kernel
  * FILE:       services/fs/np/mount.c
@@ -13,7 +14,7 @@
 //#define NDEBUG
 #include <internal/debug.h>
 
-#include "np.h"
+#include "npfs.h"
 
 /* GLOBALS *******************************************************************/
 
@@ -122,3 +123,6 @@ NTSTATUS DriverEntry(PDRIVER_OBJECT _DriverObject,
    
    return(STATUS_SUCCESS);
 }
+
+
+/* EOF */
diff --git a/reactos/drivers/fs/np/npfs.h b/reactos/drivers/fs/np/npfs.h
index 614d59e1ac0..3c26ffdd4f8 100644
--- a/reactos/drivers/fs/np/npfs.h
+++ b/reactos/drivers/fs/np/npfs.h
@@ -19,7 +19,7 @@ typedef struct
    LIST_ENTRY GlobalListEntry;
    ULONG Flags;
    LIST_ENTRY MsgListHead;
-   KPSIN_LOCK MsgListLock;
+   KSPIN_LOCK MsgListLock;
 } NPFS_FSCONTEXT, *PNPFS_FSCONTEXT;
 
 #endif /* __SERVICES_FS_NP_NPFS_H */
diff --git a/reactos/drivers/fs/vfat/iface.c b/reactos/drivers/fs/vfat/iface.c
index 595cc185993..99413ae8857 100644
--- a/reactos/drivers/fs/vfat/iface.c
+++ b/reactos/drivers/fs/vfat/iface.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: iface.c,v 1.38 1999/12/04 20:58:42 ea Exp $
+ *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             services/fs/vfat/iface.c
diff --git a/reactos/drivers/fs/vfat/makefile b/reactos/drivers/fs/vfat/makefile
index 9290b2d4d07..d3cdb8be29d 100644
--- a/reactos/drivers/fs/vfat/makefile
+++ b/reactos/drivers/fs/vfat/makefile
@@ -1,12 +1,14 @@
-#
+# $Id: makefile,v 1.11 1999/12/04 20:58:44 ea Exp $
 #
 #
 TARGET=vfatfs
+
+#OBJECTS = blockdev.o dir.o dirwr.o iface.o $(TARGET).coff ../../../ntoskrnl/ntoskrnl.a
 OBJECTS = blockdev.o dir.o dirwr.o iface.o ../../../ntoskrnl/ntoskrnl.a
 
 BASE_CFLAGS = -I../../../include
 
-all: vfatfs.sys
+all: $(TARGET).sys
 
 .phony: all
 
@@ -16,12 +18,13 @@ ifeq ($(DOSCLI),yes)
 	- $(RM) dir.o
 	- $(RM) dirwr.o
 	- $(RM) iface.o
+	- $(RM) $(TARGET).coff
 	- $(RM) junk.tmp
 	- $(RM) base.tmp
 	- $(RM) temp.exp
-	- $(RM) vfatfs.sys
+	- $(RM) $(TARGET).sys
 else
-	- $(RM) blockdev.o dir.o dirwr.o iface.o junk.tmp base.tmp temp.exp vfatfs.sys
+	- $(RM) blockdev.o dir.o dirwr.o iface.o $(TARGET).coff junk.tmp base.tmp temp.exp $(TARGET).sys
 endif
 
 .phony: clean
@@ -44,17 +47,34 @@ else
 	$(CP) $(TARGET).sys ../../../$(DIST_DIR)/drivers/$(TARGET).sys
 endif
 
-vfatfs.sys: $(OBJECTS)
-	$(CC) -specs=../../svc_specs -mdll -o junk.tmp -Wl,--defsym,_end=end \
-	      -Wl,--defsym,_edata=__data_end__ -Wl,--defsym,_etext=etext \
-	      -Wl,--base-file,base.tmp -Wl,"-h vfatfs.sys" $(OBJECTS)
+$(TARGET).sys: $(OBJECTS)
+	$(CC) \
+		-specs=../../svc_specs \
+		-mdll \
+		-o junk.tmp \
+		-Wl,--defsym,_end=end \
+		-Wl,--defsym,_edata=__data_end__ \
+		-Wl,--defsym,_etext=etext \
+		-Wl,--base-file,base.tmp \
+		-Wl,"-h vfatfs.sys" \
+		$(OBJECTS)
 	- $(RM) junk.tmp
-	$(DLLTOOL) --dllname vfatfs.sys --base-file base.tmp \
-	           --output-exp temp.exp --def vfatfs.def
+	$(DLLTOOL) \
+		--dllname $(TARGET).sys \
+		--base-file base.tmp \
+		--output-exp temp.exp \
+		--def vfatfs.def
 	- $(RM) base.tmp
-	$(CC) --verbose -Wl,--image-base,0x10000 -Wl,-e,_DriverEntry@8 \
-	      -specs=../../svc_specs -mdll -o vfatfs.sys $(OBJECTS) \
-	      -Wl,temp.exp -Wl,"-h vfatfs.sys"
+	$(CC) \
+		--verbose \
+		-Wl,--image-base,0x10000 \
+		-Wl,-e,_DriverEntry@8 \
+		-Wl,temp.exp \
+		-Wl,"-h vfatfs.sys" \
+		-specs=../../svc_specs \
+		-mdll \
+		-o $(TARGET).sys \
+		$(OBJECTS)
 	- $(RM) temp.exp
 
 
diff --git a/reactos/drivers/fs/vfat/vfat.h b/reactos/drivers/fs/vfat/vfat.h
index 037fa3c451e..911576ed6a3 100644
--- a/reactos/drivers/fs/vfat/vfat.h
+++ b/reactos/drivers/fs/vfat/vfat.h
@@ -1,3 +1,5 @@
+/* $Id: vfat.h,v 1.14 1999/12/04 20:58:44 ea Exp $ */
+
 #include <wchar.h>
 
 
diff --git a/reactos/drivers/fs/vfat/vfatfs.rc b/reactos/drivers/fs/vfat/vfatfs.rc
new file mode 100644
index 00000000000..82830c507d6
--- /dev/null
+++ b/reactos/drivers/fs/vfat/vfatfs.rc
@@ -0,0 +1,39 @@
+
+#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
+