Don't let msvcrt import itself and fix the resulting problems

svn path=/branches/xmlbuildsystem/; revision=15318

diff --git a/reactos/lib/crt/crt.xml b/reactos/lib/crt/crt.xml
index c673236..cb23160 100644 (file)
--- a/reactos/lib/crt/crt.xml
+++ b/reactos/lib/crt/crt.xml
@@ -24,6 +24,7 @@
        </directory>\r
        <directory name="ctype">\r
                <file>ctype.c</file>\r
+               <file>isalnum.c</file>\r
                <file>isascii.c</file>\r
                <file>iscntrl.c</file>\r
                <file>isgraph.c</file>\r
@@ -51,7 +52,9 @@
                <file>abnorter.c</file>\r
                <file>exhand2.c</file>\r
                <file>matherr.c</file>\r
+               <file>seh.s</file>\r
                <file>unwind.c</file>\r
+               <file>xcptfil.c</file>\r
        </directory>\r
        <directory name="float">\r
                <file>chgsign.c</file>\r
@@ -211,6 +214,7 @@
                <file>thread.c</file>\r
                <file>threadid.c</file>\r
                <file>threadx.c</file>\r
+               <file>wprocess.c</file>\r
        </directory>\r
        <directory name="search">\r
                <file>lfind.c</file>\r
@@ -246,6 +250,7 @@
                <file>fputc.c</file>\r
                <file>fputchar.c</file>\r
                <file>fputs.c</file>\r
+               <file>fputws.c</file>\r
                <file>fread.c</file>\r
                <file>freopen.c</file>\r
                <file>fseek.c</file>\r
@@ -253,6 +258,7 @@
                <file>fsopen.c</file>\r
                <file>ftell.c</file>\r
                <file>fwalk.c</file>\r
+               <file>fwprintf.c</file>\r
                <file>fwrite.c</file>\r
                <file>getc.c</file>\r
                <file>getchar.c</file>\r
@@ -265,6 +271,7 @@
                <file>putchar.c</file>\r
                <file>puts.c</file>\r
                <file>putw.c</file>\r
+               <file>putwchar.c</file>\r
                <file>remove.c</file>\r
                <file>rename.c</file>\r
                <file>rewind.c</file>\r
@@ -278,12 +285,20 @@
                <file>tmpfile.c</file>\r
                <file>tmpnam.c</file>\r
                <file>ungetc.c</file>\r
+               <file>ungetwc.c</file>\r
                <file>vfprintf.c</file>\r
                <file>vfwprint.c</file>\r
                <file>vprintf.c</file>\r
                <file>vsprintf.c</file>\r
                <file>vswprintf.c</file>\r
+               <file>vwprintf.c</file>\r
                <file>wfdopen.c</file>\r
+               <file>wfopen.c</file>\r
+               <file>wfreopen.c</file>\r
+               <file>wfsopen.c</file>\r
+               <file>wpopen.c</file>\r
+               <file>wprintf.c</file>\r
+               <file>wremove.c</file>\r
                <file>wrename.c</file>\r
                <file>wtempnam.c</file>\r
                <file>wtmpnam.c</file>\r

diff --git a/reactos/lib/crt/stdio/vsprintf.c b/reactos/lib/crt/stdio/vsprintf.c
index d51dcf9..ca09681 100644 (file)
--- a/reactos/lib/crt/stdio/vsprintf.c
+++ b/reactos/lib/crt/stdio/vsprintf.c
@@ -6,7 +6,7 @@
 #include <tchar.h>
 
 int
-crt_vsprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap)
+_vstprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap)
 {
   FILE f = {0};
   int len;
@@ -22,7 +22,7 @@ crt_vsprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap)
 
 
 int
-crt__vsnprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap)
+_vsntprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap)
 {
   FILE f = {0};
   int len;

diff --git a/reactos/lib/crt/stdio/vswprintf.c b/reactos/lib/crt/stdio/vswprintf.c
index 9b3cbd8..646e937 100644 (file)
--- a/reactos/lib/crt/stdio/vswprintf.c
+++ b/reactos/lib/crt/stdio/vswprintf.c
@@ -1,40 +1,4 @@
-/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */\r
 #define UNICODE\r
 #define _UNICODE\r
-#include <stdio.h>\r
-#include <stdarg.h>\r
-#include <limits.h>\r
-#include <internal/file.h>\r
-#include <tchar.h>\r
 \r
-int\r
-crt__vswprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap)\r
-{\r
-  FILE f = {0};\r
-  int len;\r
-\r
-  f._flag = _IOWRT|_IOSTRG|_IOBINARY;\r
-  f._ptr = (char*)str;\r
-  f._cnt = INT_MAX;\r
-  f._file = -1;\r
-  len = _vftprintf(&f,fmt, ap);\r
-  *(_TCHAR*)f._ptr = 0;\r
-  return len;\r
-}\r
-\r
-\r
-int\r
-crt__vsnwprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap)\r
-{\r
-  FILE f = {0};\r
-  int len;\r
-  \r
-  f._flag = _IOWRT|_IOSTRG|_IOBINARY;\r
-  f._ptr = (char*)str;\r
-  f._cnt = maxlen;\r
-  f._file = -1;\r
-  len = _vftprintf(&f,fmt, ap);\r
-  // what if the buffer is full ??\r
-  *(_TCHAR *)f._ptr = 0;\r
-  return len;\r
-}\r
+#include "vsprintf.c"\r

diff --git a/reactos/lib/crtdll/crtdll.def b/reactos/lib/crtdll/crtdll.def
index 463ef32..d463c84 100644 (file)
--- a/reactos/lib/crtdll/crtdll.def
+++ b/reactos/lib/crtdll/crtdll.def
@@ -359,8 +359,8 @@ _ungetch
 _unlink
 _unloaddll
 _utime
-_vsnprintf=crt__vsnprintf
-_vsnwprintf=crt__vsnwprintf
+_vsnprintf
+_vsnwprintf
 _wcsdup
 _wcsicmp
 _wcsicoll
@@ -541,7 +541,7 @@ ungetwc
 vfprintf
 vfwprintf
 vprintf
-vsprintf=crt_vsprintf
+vsprintf
 vswprintf
 vwprintf
 wcscat

diff --git a/reactos/lib/msvcrt/msvcrt.def b/reactos/lib/msvcrt/msvcrt.def
index ce37a02..4aa531e 100644 (file)
--- a/reactos/lib/msvcrt/msvcrt.def
+++ b/reactos/lib/msvcrt/msvcrt.def
@@ -555,8 +555,8 @@ _utime
 _utime64=stub
 _vscprintf=stub
 _vscwprintf=stub
-_vsnprintf=crt__vsnprintf
-_vsnwprintf=crt__vsnwprintf
+_vsnprintf
+_vsnwprintf
 _waccess
 _wasctime
 _wchdir
@@ -815,7 +815,7 @@ ungetwc
 vfprintf
 vfwprintf
 vprintf
-vsprintf=crt_vsprintf
+vsprintf
 vswprintf
 vwprintf
 wcscat

diff --git a/reactos/lib/msvcrt/msvcrt.xml b/reactos/lib/msvcrt/msvcrt.xml
index 3cf6e92..e51da4a 100644 (file)
--- a/reactos/lib/msvcrt/msvcrt.xml
+++ b/reactos/lib/msvcrt/msvcrt.xml
@@ -1,6 +1,7 @@
 <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll">\r
        <linkerflag>-nostartfiles</linkerflag>\r
        <linkerflag>--enable-stdcall-fixup</linkerflag>\r
+       <linkerflag>-nostdlib</linkerflag>\r
        <linkerflag>-lgcc</linkerflag>\r
        <importlibrary definition="msvcrt.def" />\r
        <include base="msvcrt">.</include>\r
@@ -14,10 +15,10 @@
        <define name="_MSVCRT_LIB_" />\r
        <define name="_MT" />\r
        <library>crt</library>\r
-       <library>wine</library>\r
        <library>string</library>\r
        <library>kernel32</library>\r
        <library>ntdll</library>\r
+       <library>wine</library>\r
        <pch>precomp.h</pch>\r
        <file>dllmain.c</file>\r
        <file>msvcrt.rc</file>\r