diff --git a/reactos/ChangeLog b/reactos/ChangeLog
index ea6d6de1563..c4b1679fc2c 100644
--- a/reactos/ChangeLog
+++ b/reactos/ChangeLog
@@ -1,3 +1,25 @@
+2004-11-27  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+	* apps/utils/driver/load/.cvsignore: Use native line-endings.
+	* apps/utils/driver/load/makefile: Ditto.
+	* apps/utils/driver/unload/.cvsignore: Ditto.
+	* apps/utils/driver/unload/makefile: Ditto.
+	* apps/utils/infinst/.cvsignore: Ditto.
+	* drivers/fs/ntfs/notes.txt: Ditto.
+	* drivers/lib/csq/MAKEFILE: Ditto.
+	* drivers/test/csqtest/Makefile: Ditto.
+	* drivers/test/csqtest/SOURCES: Ditto.
+	* drivers/video/displays/vga/main/enable.c: Ditto.
+	* drivers/video/displays/vga/objects/copybits.c: Ditto.
+	* include/tgetopt.h: Ditto.
+	* include/ntos/kdbgsyms.h: Ditto.
+	* lib/freetype/i386/setjmplongjmp.s: Ditto.
+	* lib/icmp/icmp.dsp: Ditto.
+	* lib/msvcrt/setjmp/i386/setjmp.s: Ditto.
+	* lib/string/strncpy.c: Ditto.
+	* tools/rgenstat/web/.cvsignore: Ditto.
+	* tools/wmc/y_tab.c: Ditto.
+
 2004-11-21  Casper S. Hornstrup  <chorns@users.sourceforge.net>
 
 	* apps/utils/Makefile (UTIL_APPS): Remove regsvr32.
diff --git a/reactos/apps/utils/driver/load/.cvsignore b/reactos/apps/utils/driver/load/.cvsignore
index 285568f3f33..d63774a7353 100644
--- a/reactos/apps/utils/driver/load/.cvsignore
+++ b/reactos/apps/utils/driver/load/.cvsignore
@@ -1,6 +1,6 @@
-*.o
-*.d
-*.exe
-*.coff
-*.sym
-*.map
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/apps/utils/driver/load/makefile b/reactos/apps/utils/driver/load/makefile
index e8dafd5f81b..1648c7f9c8b 100644
--- a/reactos/apps/utils/driver/load/makefile
+++ b/reactos/apps/utils/driver/load/makefile
@@ -1,21 +1,21 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = load
-
-TARGET_CFLAGS = -DUNICODE -D_UNICODE
-
-TARGET_SDKLIBS = ntdll.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF
+PATH_TO_TOP = ../../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = load
+
+TARGET_CFLAGS = -DUNICODE -D_UNICODE
+
+TARGET_SDKLIBS = ntdll.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/apps/utils/driver/unload/.cvsignore b/reactos/apps/utils/driver/unload/.cvsignore
index 285568f3f33..d63774a7353 100644
--- a/reactos/apps/utils/driver/unload/.cvsignore
+++ b/reactos/apps/utils/driver/unload/.cvsignore
@@ -1,6 +1,6 @@
-*.o
-*.d
-*.exe
-*.coff
-*.sym
-*.map
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/apps/utils/driver/unload/makefile b/reactos/apps/utils/driver/unload/makefile
index 0e978d7fc6c..ec267870467 100644
--- a/reactos/apps/utils/driver/unload/makefile
+++ b/reactos/apps/utils/driver/unload/makefile
@@ -1,21 +1,21 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = unload
-
-TARGET_CFLAGS = -DUNICODE -D_UNICODE
-
-TARGET_SDKLIBS = ntdll.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF
+PATH_TO_TOP = ../../../..
+
+TARGET_NORC = yes
+
+TARGET_TYPE = program
+
+TARGET_APPTYPE = console
+
+TARGET_NAME = unload
+
+TARGET_CFLAGS = -DUNICODE -D_UNICODE
+
+TARGET_SDKLIBS = ntdll.a
+
+TARGET_OBJECTS = $(TARGET_NAME).o
+
+include $(PATH_TO_TOP)/rules.mak
+
+include $(TOOLS_PATH)/helper.mk
+
+# EOF
diff --git a/reactos/apps/utils/infinst/.cvsignore b/reactos/apps/utils/infinst/.cvsignore
index 285568f3f33..d63774a7353 100644
--- a/reactos/apps/utils/infinst/.cvsignore
+++ b/reactos/apps/utils/infinst/.cvsignore
@@ -1,6 +1,6 @@
-*.o
-*.d
-*.exe
-*.coff
-*.sym
-*.map
+*.o
+*.d
+*.exe
+*.coff
+*.sym
+*.map
diff --git a/reactos/drivers/fs/ntfs/notes.txt b/reactos/drivers/fs/ntfs/notes.txt
index 05d27abea0a..327892febb8 100755
--- a/reactos/drivers/fs/ntfs/notes.txt
+++ b/reactos/drivers/fs/ntfs/notes.txt
@@ -1,5 +1,5 @@
-
-These are notes about the NT filesystem
-
-More documentation is available at:
-http://linux-ntfs.sourceforge.net/ntfs/index.html
+
+These are notes about the NT filesystem
+
+More documentation is available at:
+http://linux-ntfs.sourceforge.net/ntfs/index.html
diff --git a/reactos/drivers/lib/csq/MAKEFILE b/reactos/drivers/lib/csq/MAKEFILE
index 9c985f57bc6..58189757d61 100644
--- a/reactos/drivers/lib/csq/MAKEFILE
+++ b/reactos/drivers/lib/csq/MAKEFILE
@@ -1,7 +1,7 @@
-#
-# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
-# file to this component.  This file merely indirects to the real make file
-# that is shared by all the driver components of the Windows NT DDK
-#
-
-!INCLUDE $(NTMAKEENV)\makefile.def
+#
+# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
+# file to this component.  This file merely indirects to the real make file
+# that is shared by all the driver components of the Windows NT DDK
+#
+
+!INCLUDE $(NTMAKEENV)\makefile.def
diff --git a/reactos/drivers/test/csqtest/Makefile b/reactos/drivers/test/csqtest/Makefile
index 9348f56cf51..58db4ce3b18 100644
--- a/reactos/drivers/test/csqtest/Makefile
+++ b/reactos/drivers/test/csqtest/Makefile
@@ -1,7 +1,7 @@
-#
-# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
-# file to this component.  This file merely indirects to the real make file
-# that is shared by all the components of Windows NT
-#
-!INCLUDE $(NTMAKEENV)\makefile.def
-
+#
+# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
+# file to this component.  This file merely indirects to the real make file
+# that is shared by all the components of Windows NT
+#
+!INCLUDE $(NTMAKEENV)\makefile.def
+
diff --git a/reactos/drivers/test/csqtest/SOURCES b/reactos/drivers/test/csqtest/SOURCES
index 5a9b6695eeb..57f9e156818 100644
--- a/reactos/drivers/test/csqtest/SOURCES
+++ b/reactos/drivers/test/csqtest/SOURCES
@@ -1,5 +1,5 @@
-TARGETNAME=csqtest
-TARGETTYPE=DRIVER
-TARGETPATH=obj
-TARGETLIBS= csq.lib
-SOURCES= csqtest.c
+TARGETNAME=csqtest
+TARGETTYPE=DRIVER
+TARGETPATH=obj
+TARGETLIBS= csq.lib
+SOURCES= csqtest.c
diff --git a/reactos/drivers/video/displays/vga/main/enable.c b/reactos/drivers/video/displays/vga/main/enable.c
index 72574f4ab56..2a7fbaa03aa 100644
--- a/reactos/drivers/video/displays/vga/main/enable.c
+++ b/reactos/drivers/video/displays/vga/main/enable.c
@@ -1,9 +1,9 @@
 /*
  * entry.c
  *
- * $Revision: 1.3 $
- * $Author: dwelch $
- * $Date: 2004/03/16 21:11:44 $
+ * $Revision: 1.4 $
+ * $Author: chorns $
+ * $Date: 2004/11/27 00:46:24 $
  *
  */
 
@@ -340,7 +340,7 @@ DrvAssertMode(IN DHPDEV DPev,
 VOID STDCALL
 DrvDisablePDEV(IN DHPDEV PDev)
 {
-  PPDEV ppdev = (PPDEV)PDev;
+  PPDEV ppdev = (PPDEV)PDev;
 
   // EngDeletePalette(devinfoVGA.hpalDefault);
   if (ppdev->pjPreallocSSBBuffer != NULL)
diff --git a/reactos/drivers/video/displays/vga/objects/copybits.c b/reactos/drivers/video/displays/vga/objects/copybits.c
index dd072b2ef47..ebd64c69b2f 100644
--- a/reactos/drivers/video/displays/vga/objects/copybits.c
+++ b/reactos/drivers/video/displays/vga/objects/copybits.c
@@ -1,40 +1,40 @@
-#include "../vgaddi.h"
-#include "../vgavideo/vgavideo.h"
-
-#define DBG
-#include <debug.h>
-
-BOOL STDCALL
-DrvCopyBits(OUT SURFOBJ*  DestObj,  
-            IN  SURFOBJ*  SourceObj,  
-            IN  CLIPOBJ*  ClipObj,  
-            IN  XLATEOBJ* XLateObj,  
-            IN  RECTL*    DestRectL,  
-            IN  POINTL*   SrcPointL)
-{
-  BOOL Done = FALSE;
-
-  if (STYPE_BITMAP == DestObj->iType && BMF_4BPP == DestObj->iBitmapFormat &&
-      STYPE_DEVICE == SourceObj->iType)
-    {
-    /* Screen to 4 BPP DIB */
-    DIB_BltFromVGA(SrcPointL->x, SrcPointL->y,
-                   DestRectL->right - DestRectL->left,
-                   DestRectL->bottom - DestRectL->top,
-                   DestObj->pvScan0, DestObj->lDelta);
-    Done = TRUE;
-    }
-  else if (STYPE_DEVICE == DestObj->iType &&
-           STYPE_BITMAP == SourceObj->iType && BMF_4BPP == SourceObj->iBitmapFormat)
-    {
-    /* 4 BPP DIB to Screen */
-    DIB_BltToVGA(DestRectL->left, DestRectL->top,
-                 DestRectL->right - DestRectL->left,
-                 DestRectL->bottom - DestRectL->top,
-                 SourceObj->pvScan0, SourceObj->lDelta,
-                 0);
-    Done = TRUE;
-    }
-
-  return Done;
-}
+#include "../vgaddi.h"
+#include "../vgavideo/vgavideo.h"
+
+#define DBG
+#include <debug.h>
+
+BOOL STDCALL
+DrvCopyBits(OUT SURFOBJ*  DestObj,  
+            IN  SURFOBJ*  SourceObj,  
+            IN  CLIPOBJ*  ClipObj,  
+            IN  XLATEOBJ* XLateObj,  
+            IN  RECTL*    DestRectL,  
+            IN  POINTL*   SrcPointL)
+{
+  BOOL Done = FALSE;
+
+  if (STYPE_BITMAP == DestObj->iType && BMF_4BPP == DestObj->iBitmapFormat &&
+      STYPE_DEVICE == SourceObj->iType)
+    {
+    /* Screen to 4 BPP DIB */
+    DIB_BltFromVGA(SrcPointL->x, SrcPointL->y,
+                   DestRectL->right - DestRectL->left,
+                   DestRectL->bottom - DestRectL->top,
+                   DestObj->pvScan0, DestObj->lDelta);
+    Done = TRUE;
+    }
+  else if (STYPE_DEVICE == DestObj->iType &&
+           STYPE_BITMAP == SourceObj->iType && BMF_4BPP == SourceObj->iBitmapFormat)
+    {
+    /* 4 BPP DIB to Screen */
+    DIB_BltToVGA(DestRectL->left, DestRectL->top,
+                 DestRectL->right - DestRectL->left,
+                 DestRectL->bottom - DestRectL->top,
+                 SourceObj->pvScan0, SourceObj->lDelta,
+                 0);
+    Done = TRUE;
+    }
+
+  return Done;
+}
diff --git a/reactos/include/ntos/kdbgsyms.h b/reactos/include/ntos/kdbgsyms.h
index 79cf90267b1..1a464d07eec 100644
--- a/reactos/include/ntos/kdbgsyms.h
+++ b/reactos/include/ntos/kdbgsyms.h
@@ -2,7 +2,7 @@
 #ifndef __KDBGSYMS_H
 #define __KDBGSYMS_H
 
-#include <ddk/ntddk.h>
+#include <ddk/ntddk.h>
 
 #define ST_FILENAME	0x00
 #define ST_FUNCTION	0x01
diff --git a/reactos/include/tgetopt.h b/reactos/include/tgetopt.h
index 3b829a7cda0..7f9790955c1 100644
--- a/reactos/include/tgetopt.h
+++ b/reactos/include/tgetopt.h
@@ -32,11 +32,11 @@ extern "C"
 
 extern char *optarg;
 extern int optind;
-
extern int opterr;
+extern int opterr;
 extern int optopt;
 
 extern wchar_t *_woptarg;
-
extern int _woptind;
+extern int _woptind;
 extern int _wopterr;
 extern int _woptopt;
 
@@ -74,7 +74,7 @@ extern int _wgetopt_long_only (int argc, wchar_t *const *argv,
 		               const struct _woption *longopts, int *longind);
 
 extern int _getopt_internal (int argc, char *const *argv,
-
			     const char *shortopts, const struct option *longopts, int *longind,
+			     const char *shortopts, const struct option *longopts, int *longind,
 			     int long_only);
 
 extern int _wgetopt_internal (int argc, wchar_t *const *argv,
@@ -83,7 +83,7 @@ extern int _wgetopt_internal (int argc, wchar_t *const *argv,
 			       int long_only);
 
 #ifdef	__cplusplus
-
}
+}
 #endif
 
 #endif /* _GETOPT_H */
diff --git a/reactos/lib/freetype/i386/setjmplongjmp.s b/reactos/lib/freetype/i386/setjmplongjmp.s
index 93b1cd8ff2f..0e96ac2a290 100644
--- a/reactos/lib/freetype/i386/setjmplongjmp.s
+++ b/reactos/lib/freetype/i386/setjmplongjmp.s
@@ -1,19 +1,19 @@
-/* $Id: setjmplongjmp.s,v 1.1 2003/04/01 08:38:33 gvg Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
- * PROJECT:           FreeType implementation for ReactOS
- * PURPOSE:           Implementation of _setjmp/longjmp
- * FILE:              thirdparty/freetype/i386/setjmplongjmp.s
- * PROGRAMMER:        Ge van Geldorp (ge@gse.nl)
+/* $Id: setjmplongjmp.s,v 1.2 2004/11/27 00:46:24 chorns Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
+ * PROJECT:           FreeType implementation for ReactOS
+ * PURPOSE:           Implementation of _setjmp/longjmp
+ * FILE:              thirdparty/freetype/i386/setjmplongjmp.s
+ * PROGRAMMER:        Ge van Geldorp (ge@gse.nl)
  * NOTES:             Copied from glibc.
  *                    I have the feeling this could be implemented using the SEH
  *                    routines, but if it's good enough for glibc it's propably
  *                    good enough for me...
  *                    The MingW headers define jmp_buf to be an array of 16 ints,
  *                    based on the jmp_buf used by MSCVRT. We're using only 6 of
- *                    them, so plenty of space.
+ *                    them, so plenty of space.
  */
-
+
 #define JB_BX  0
 #define JB_SI  1
 #define JB_DI  2
@@ -24,22 +24,22 @@
 #define PCOFF  0
 
 #define JMPBUF 4
-
-/*
- * int
- * _setjmp(jmp_buf env);
- *
- * Parameters:
- *   [ESP+04h] - jmp_buf env
- * Registers:
- *   None
- * Returns:
- *   0
- * Notes:
+
+/*
+ * int
+ * _setjmp(jmp_buf env);
+ *
+ * Parameters:
+ *   [ESP+04h] - jmp_buf env
+ * Registers:
+ *   None
+ * Returns:
+ *   0
+ * Notes:
  *   Sets up the jmp_buf
- */
-.globl __setjmp
-__setjmp:
+ */
+.globl __setjmp
+__setjmp:
     xorl %eax, %eax
     movl JMPBUF(%esp), %edx
 
@@ -55,23 +55,23 @@ __setjmp:
     ret
 
 #define VAL 8
-
-/*
- * void
- * longjmp(jmp_buf env, int value);
- *
- * Parameters:
+
+/*
+ * void
+ * longjmp(jmp_buf env, int value);
+ *
+ * Parameters:
  *   [ESP+04h] - jmp_buf setup by _setjmp
- *   [ESP+08h] - int     value to return
- * Registers:
- *   None
- * Returns:
- *   Doesn't return
- * Notes:
+ *   [ESP+08h] - int     value to return
+ * Registers:
+ *   None
+ * Returns:
+ *   Doesn't return
+ * Notes:
  *   Non-local goto
- */
-.globl _longjmp
-_longjmp:
+ */
+.globl _longjmp
+_longjmp:
     movl JMPBUF(%esp), %ecx   /* User's jmp_buf in %ecx.  */
 
     movl VAL(%esp), %eax      /* Second argument is return value.  */
diff --git a/reactos/lib/icmp/icmp.dsp b/reactos/lib/icmp/icmp.dsp
index 046ba6a5b07..ade8e68b1b5 100644
--- a/reactos/lib/icmp/icmp.dsp
+++ b/reactos/lib/icmp/icmp.dsp
@@ -1,96 +1,96 @@
-# Microsoft Developer Studio Project File - Name="icmp" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=icmp - Win32
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "icmp.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "icmp.mak" CFG="icmp - Win32"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "icmp - Win32" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Output\Win32"
-# PROP BASE Intermediate_Dir "Output\Win32"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Output\Win32"
-# PROP Intermediate_Dir "Output\Win32"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICMP_EXPORTS" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\include /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ICMP_" /D "__WINESRC__" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c
-# SUBTRACT CPP /X /YX
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x41d /d "_DEBUG"
-# ADD RSC /l 0x41d /i "..\..\include" /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /def:"icmp.def" /pdbtype:sept
-# Begin Target
-
-# Name "icmp - Win32"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\icmp.dll.dbg.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\icmp.spec
-# Begin Custom Build
-InputPath=.\icmp.spec
-
-BuildCmds= \
-	..\..\tools\winebuild\Output\\Win32\winebuild.exe --def .\icmp.spec > .\icmp.def \
-	..\..\tools\winebuild\Output\\Win32\winebuild.exe -o .\icmp.dll.dbg.c --debug -C. icmp_main.c \
-	
-
-".\icmp.def" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-".\icmp.dll.dbg.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-# End Source File
-# Begin Source File
-
-SOURCE=.\icmp_main.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="icmp" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=icmp - Win32
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "icmp.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "icmp.mak" CFG="icmp - Win32"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "icmp - Win32" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Output\Win32"
+# PROP BASE Intermediate_Dir "Output\Win32"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Output\Win32"
+# PROP Intermediate_Dir "Output\Win32"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ICMP_EXPORTS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ..\..\include /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ICMP_" /D "__WINESRC__" /D __WINETEST_OUTPUT_DIR=\"Output\\Win32\" /D "__i386__" /D "_X86_" /D inline=__inline /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x41d /d "_DEBUG"
+# ADD RSC /l 0x41d /i "..\..\include" /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /def:"icmp.def" /pdbtype:sept
+# Begin Target
+
+# Name "icmp - Win32"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\icmp.dll.dbg.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\icmp.spec
+# Begin Custom Build
+InputPath=.\icmp.spec
+
+BuildCmds= \
+	..\..\tools\winebuild\Output\\Win32\winebuild.exe --def .\icmp.spec > .\icmp.def \
+	..\..\tools\winebuild\Output\\Win32\winebuild.exe -o .\icmp.dll.dbg.c --debug -C. icmp_main.c \
+	
+
+".\icmp.def" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+".\icmp.dll.dbg.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+# End Source File
+# Begin Source File
+
+SOURCE=.\icmp_main.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/reactos/lib/msvcrt/setjmp/i386/setjmp.s b/reactos/lib/msvcrt/setjmp/i386/setjmp.s
index ccc10cd1417..20e0a2fbebb 100644
--- a/reactos/lib/msvcrt/setjmp/i386/setjmp.s
+++ b/reactos/lib/msvcrt/setjmp/i386/setjmp.s
@@ -1,14 +1,14 @@
-/* $Id: setjmp.s,v 1.1 2003/04/06 12:40:55 gvg Exp $
- *
- * COPYRIGHT:         See COPYING in the top level directory
+/* $Id: setjmp.s,v 1.2 2004/11/27 00:46:24 chorns Exp $
+ *
+ * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS system libraries
- * PURPOSE:           Implementation of _setjmp/longjmp
- * FILE:              lib/msvcrt/i386/setjmp.s
- * PROGRAMMER:        Ge van Geldorp (ge@gse.nl)
+ * PURPOSE:           Implementation of _setjmp/longjmp
+ * FILE:              lib/msvcrt/i386/setjmp.s
+ * PROGRAMMER:        Ge van Geldorp (ge@gse.nl)
  * NOTES:             Implementation is not complete, see Wine source for a more
  *                    complete implementation
  */
-
+
 #define JB_BP  0
 #define JB_BX  1
 #define JB_DI  2
@@ -19,22 +19,22 @@
 #define PCOFF  0
 
 #define JMPBUF 4
-
-/*
- * int
- * _setjmp(jmp_buf env);
- *
- * Parameters:
- *   [ESP+04h] - jmp_buf env
- * Registers:
- *   None
- * Returns:
- *   0
- * Notes:
+
+/*
+ * int
+ * _setjmp(jmp_buf env);
+ *
+ * Parameters:
+ *   [ESP+04h] - jmp_buf env
+ * Registers:
+ *   None
+ * Returns:
+ *   0
+ * Notes:
  *   Sets up the jmp_buf
- */
-.globl __setjmp
-__setjmp:
+ */
+.globl __setjmp
+__setjmp:
     xorl %eax, %eax
     movl JMPBUF(%esp), %edx
 
@@ -48,22 +48,22 @@ __setjmp:
     movl PCOFF(%esp), %ecx     /* Save PC we are returning to now.  */
     movl %ecx, (JB_IP*4)(%edx)
     ret
-
-/*
- * int
- * _setjmp3(jmp_buf env, int nb_args, ...);
- *
- * Parameters:
- *   [ESP+04h] - jmp_buf env
- * Registers:
- *   None
- * Returns:
- *   0
- * Notes:
+
+/*
+ * int
+ * _setjmp3(jmp_buf env, int nb_args, ...);
+ *
+ * Parameters:
+ *   [ESP+04h] - jmp_buf env
+ * Registers:
+ *   None
+ * Returns:
+ *   0
+ * Notes:
  *   Sets up the jmp_buf
- */
-.globl __setjmp3
-__setjmp3:
+ */
+.globl __setjmp3
+__setjmp3:
     xorl %eax, %eax
     movl JMPBUF(%esp), %edx
 
@@ -79,23 +79,23 @@ __setjmp3:
     ret
 
 #define VAL 8
-
-/*
- * void
- * longjmp(jmp_buf env, int value);
- *
- * Parameters:
+
+/*
+ * void
+ * longjmp(jmp_buf env, int value);
+ *
+ * Parameters:
  *   [ESP+04h] - jmp_buf setup by _setjmp
- *   [ESP+08h] - int     value to return
- * Registers:
- *   None
- * Returns:
- *   Doesn't return
- * Notes:
+ *   [ESP+08h] - int     value to return
+ * Registers:
+ *   None
+ * Returns:
+ *   Doesn't return
+ * Notes:
  *   Non-local goto
- */
-.globl _longjmp
-_longjmp:
+ */
+.globl _longjmp
+_longjmp:
     movl JMPBUF(%esp), %ecx   /* User's jmp_buf in %ecx.  */
 
     movl VAL(%esp), %eax      /* Second argument is return value.  */
diff --git a/reactos/lib/string/strncpy.c b/reactos/lib/string/strncpy.c
index 17eef818596..a83106de548 100644
--- a/reactos/lib/string/strncpy.c
+++ b/reactos/lib/string/strncpy.c
@@ -1,6 +1,6 @@
-/* $Id: strncpy.c,v 1.2 2003/07/06 23:04:19 hyperion Exp $
+/* $Id: strncpy.c,v 1.3 2004/11/27 00:46:24 chorns Exp $
  */
-
#include <string.h>
+#include <string.h>
 #include "tcsncpy.h"
 
 /* EOF */
diff --git a/reactos/tools/rgenstat/web/.cvsignore b/reactos/tools/rgenstat/web/.cvsignore
index 74a59c46349..5e85583cc5a 100755
--- a/reactos/tools/rgenstat/web/.cvsignore
+++ b/reactos/tools/rgenstat/web/.cvsignore
@@ -1 +1 @@
-apistatus.xml
+apistatus.xml
diff --git a/reactos/tools/wmc/y_tab.c b/reactos/tools/wmc/y_tab.c
index fea2c2d3239..3ec7fd0b60d 100644
--- a/reactos/tools/wmc/y_tab.c
+++ b/reactos/tools/wmc/y_tab.c
@@ -1065,10 +1065,10 @@ case 59:
 		if(find_cpxlat(yyvsp[-4].num))
 			xyyerror("Codepage translation already defined for language 0x%x", yyvsp[-4].num);
 //		if(yyvsp[-2].num && !find_codepage(yyvsp[-2].num))
-		if(yyvsp[-2].num)
+		if(yyvsp[-2].num)
 			xyyerror(err_nocp, yyvsp[-2].num);
 //		if(yyvsp[0].num && !find_codepage(yyvsp[0].num))
-		if(yyvsp[0].num)
+		if(yyvsp[0].num)
 			xyyerror(err_nocp, yyvsp[0].num);
 		add_cpxlat(yyvsp[-4].num, yyvsp[-2].num, yyvsp[0].num);
 	;