9 Nov
2007
9 Nov
'07
12:20 p.m.
Author: fireball
Date: Fri Nov 9 15:20:16 2007
New Revision: 30291
URL: http://svn.reactos.org/svn/reactos?rev=30291&view=rev
Log:
- Build crt and libcntpr from one source tree (using conditional code and/or different
source files where code is not shared).
Added:
trunk/reactos/lib/sdk/crt/libcntpr.h (contents, props changed)
- copied, changed from r30261, trunk/reactos/lib/sdk/libcntpr/libcntpr.h
trunk/reactos/lib/sdk/crt/libcntpr.rbuild (contents, props changed)
- copied, changed from r30261, trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild
trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/alldiv_asm.s
trunk/reactos/lib/sdk/crt/math/i386/alldvrm_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/alldvrm_asm.s
trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/allmul_asm.s
trunk/reactos/lib/sdk/crt/math/i386/allrem_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/allrem_asm.s
trunk/reactos/lib/sdk/crt/math/i386/allshl_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/allshl_asm.s
trunk/reactos/lib/sdk/crt/math/i386/allshr_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/allshr_asm.s
trunk/reactos/lib/sdk/crt/math/i386/aulldiv_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/aulldiv_asm.s
trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/aulldvrm_asm.s
trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/aullrem_asm.s
trunk/reactos/lib/sdk/crt/math/i386/aullshr_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/aullshr_asm.s
trunk/reactos/lib/sdk/crt/math/i386/ceil_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/ceil_asm.s
trunk/reactos/lib/sdk/crt/math/i386/cos_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s
trunk/reactos/lib/sdk/crt/math/i386/fabs_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/fabs_asm.s
trunk/reactos/lib/sdk/crt/math/i386/floor_asm.s
- copied unchanged from r30261,
trunk/reactos/lib/sdk/libcntpr/math/i386/floor_asm.s
trunk/reactos/lib/sdk/crt/math/i386/ftol_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/ftol_asm.s
trunk/reactos/lib/sdk/crt/math/i386/log_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/log_asm.s
trunk/reactos/lib/sdk/crt/math/i386/sin_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s
trunk/reactos/lib/sdk/crt/math/i386/sqrt_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/sqrt_asm.s
trunk/reactos/lib/sdk/crt/math/i386/tan_asm.s
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s
trunk/reactos/lib/sdk/crt/math/rand_nt.c
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/math/rand.c
trunk/reactos/lib/sdk/crt/string/sscanf.c
- copied, changed from r30261, trunk/reactos/lib/sdk/libcntpr/string/sscanf.c
trunk/reactos/lib/sdk/crt/string/strcspn.c
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/strcspn.c
trunk/reactos/lib/sdk/crt/string/strspn.c
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/strspn.c
trunk/reactos/lib/sdk/crt/string/strxspn.h
- copied unchanged from r30261, trunk/reactos/lib/sdk/libcntpr/string/strxspn.h
Removed:
trunk/reactos/lib/sdk/libcntpr/
Modified:
trunk/reactos/lib/sdk/crt/README.txt
trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s
trunk/reactos/lib/sdk/crt/string/atoi.c
trunk/reactos/lib/sdk/crt/string/splitp.c
trunk/reactos/lib/sdk/crt/wine/scanf.h
trunk/reactos/lib/sdk/sdk.rbuild
Modified: trunk/reactos/lib/sdk/crt/README.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/README.txt?rev…
==============================================================================
--- trunk/reactos/lib/sdk/crt/README.txt (original)
+++ trunk/reactos/lib/sdk/crt/README.txt Fri Nov 9 15:20:16 2007
@@ -7,7 +7,7 @@
TODO List:
Implement the remaining functions that are commented out in the .def file
Update source code headers for the license information.
-Compleate the W32API conversion for all source files.
+Complete the W32API conversion for all source files.
Write a decent regression test suite.
Convert all C++ style comments to C style comments.
????
Copied: trunk/reactos/lib/sdk/crt/libcntpr.h (from r30261,
trunk/reactos/lib/sdk/libcntpr/libcntpr.h)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.h?p2=…
==============================================================================
--- trunk/reactos/lib/sdk/libcntpr/libcntpr.h (original)
+++ trunk/reactos/lib/sdk/crt/libcntpr.h Fri Nov 9 15:20:16 2007
@@ -1,22 +1,22 @@
-/*
- * COPYRIGHT: See COPYING in the top level directory
- * PROJECT: ReactOS System Libraries
- * FILE: lib/sdk/libcntpr/libcntpr.h
- * PURPOSE: NT Private CRT
- * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org)
- */
-
-/* INCLUDES ******************************************************************/
-
-#ifndef _LIBCNT_
-#define _LIBCNT_
-
-//
-// C Headers
-//
-#include <stdlib.h>
-#include <stdio.h>
-
-#endif /* _LIBCNT_ */
-
-/* EOF */
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS System Libraries
+ * FILE: lib/sdk/libcntpr/libcntpr.h
+ * PURPOSE: NT Private CRT
+ * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org)
+ */
+
+/* INCLUDES ******************************************************************/
+
+#ifndef _LIBCNT_
+#define _LIBCNT_
+
+//
+// C Headers
+//
+#include <stdlib.h>
+#include <stdio.h>
+
+#endif /* _LIBCNT_ */
+
+/* EOF */
Propchange: trunk/reactos/lib/sdk/crt/libcntpr.h
------------------------------------------------------------------------------
svn:eol-style = native
Copied: trunk/reactos/lib/sdk/crt/libcntpr.rbuild (from r30261,
trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil…
==============================================================================
--- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original)
+++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild Fri Nov 9 15:20:16 2007
@@ -1,162 +1,177 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="libcntpr" type="staticlibrary">
- <define name="__NO_CTYPE_INLINES" />
- <define name="NO_RTL_INLINES" />
- <define name="_NTSYSTEM_" />
- <define name="_NTDLLBUILD_" />
- <define name="_SEH_NO_NATIVE_NLG" />
- <if property="ARCH" value="i386">
- <define name="__MINGW_IMPORT">"extern __attribute__
((dllexport))"</define>
- </if>
- <include base="libcntpr">.</include>
-
- <directory name="except">
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>chkstk_asm.s</file>
- <file>seh.s</file>
- </directory>
- </if>
- <if property="ARCH" value="powerpc">
- <directory name="powerpc">
- <file>chkstk_asm.s</file>
- <file>seh.s</file>
- </directory>
- </if>
- </directory>
- <directory name="math">
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>alldiv_asm.s</file>
- <file>alldvrm_asm.s</file>
- <file>allmul_asm.s</file>
- <file>allrem_asm.s</file>
- <file>allshl_asm.s</file>
- <file>allshr_asm.s</file>
- <file>atan_asm.s</file>
- <file>aulldiv_asm.s</file>
- <file>aulldvrm_asm.s</file>
- <file>aullrem_asm.s</file>
- <file>aullshr_asm.s</file>
- <file>ceil_asm.s</file>
- <file>cos_asm.s</file>
- <file>fabs_asm.s</file>
- <file>floor_asm.s</file>
- <file>ftol_asm.s</file>
- <file>log_asm.s</file>
- <file>pow_asm.s</file>
- <file>sin_asm.s</file>
- <file>sqrt_asm.s</file>
- <file>tan_asm.s</file>
- </directory>
- </if>
- <file>abs.c</file>
- <file>bsearch.c</file>
- <file>labs.c</file>
- <file>rand.c</file>
- </directory>
-
- <directory name="mem">
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>memchr_asm.s</file>
- <file>memcpy_asm.s</file>
- <file>memmove_asm.s</file>
- <file>memset_asm.s</file>
- </directory>
- </if>
- <ifnot property="ARCH" value="i386">
- <file>memchr.c</file>
- <file>memcpy.c</file>
- <file>memmove.c</file>
- <file>memset.c</file>
- </ifnot>
- <file>memccpy.c</file>
- <file>memcmp.c</file>
- <file>memicmp.c</file>
- </directory>
-
- <directory name="string">
- <if property="ARCH" value="i386">
- <directory name="i386">
- <file>strcat_asm.s</file>
- <file>strchr_asm.s</file>
- <file>strcmp_asm.s</file>
- <file>strcpy_asm.s</file>
- <file>strlen_asm.s</file>
- <file>strncat_asm.s</file>
- <file>strncmp_asm.s</file>
- <file>strncpy_asm.s</file>
- <file>strnlen_asm.s</file>
- <file>strrchr_asm.s</file>
- <file>wcscat_asm.s</file>
- <file>wcschr_asm.s</file>
- <file>wcscmp_asm.s</file>
- <file>wcscpy_asm.s</file>
- <file>wcslen_asm.s</file>
- <file>wcsncat_asm.s</file>
- <file>wcsncmp_asm.s</file>
- <file>wcsncpy_asm.s</file>
- <file>wcsnlen_asm.s</file>
- <file>wcsrchr_asm.s</file>
- </directory>
- </if>
- <ifnot property="ARCH" value="i386">
- <file>strcat.c</file>
- <file>strchr.c</file>
- <file>strcmp.c</file>
- <file>strcpy.c</file>
- <file>strlen.c</file>
- <file>strncat.c</file>
- <file>strncmp.c</file>
- <file>strncpy.c</file>
- <file>strnlen.c</file>
- <file>strrchr.c</file>
- <file>wcscat.c</file>
- <file>wcschr.c</file>
- <file>wcscmp.c</file>
- <file>wcscpy.c</file>
- <file>wcslen.c</file>
- <file>wcsncat.c</file>
- <file>wcsncmp.c</file>
- <file>wcsncpy.c</file>
- <file>wcsnlen.c</file>
- <file>wcsrchr.c</file>
- </ifnot>
- <file>ctype.c</file>
- <file>strcspn.c</file>
- <file>stricmp.c</file>
- <file>strnicmp.c</file>
- <file>strlwr.c</file>
- <file>strrev.c</file>
- <file>strset.c</file>
- <file>strstr.c</file>
- <file>strupr.c</file>
- <file>strpbrk.c</file>
- <file>strspn.c</file>
- <file>wstring.c</file>
- <file>wcsrev.c</file>
- <file>wcsnset.c</file>
- <file>atoi64.c</file>
- <file>atoi.c</file>
- <file>atol.c</file>
- <file>itoa.c</file>
- <file>itow.c</file>
- <file>lfind.c</file>
- <file>mbstowcs.c</file>
- <file>splitp.c</file>
- <file>strtol.c</file>
- <file>strtoul.c</file>
- <file>strtoull.c</file>
- <file>wcstol.c</file>
- <file>wcstombs.c</file>
- <file>wcstoul.c</file>
- <file>wtoi64.c</file>
- <file>wtoi.c</file>
- <file>wtol.c</file>
- <file>sscanf.c</file>
- </directory>
-
- <pch>libcntpr.h</pch>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="libcntpr" type="staticlibrary">
+ <include base="crt">.</include>
+ <include base="crt">include</include>
+ <define name="__NO_CTYPE_INLINES" />
+ <define name="NO_RTL_INLINES" />
+ <define name="_NTSYSTEM_" />
+ <define name="_NTDLLBUILD_" />
+ <define name="_SEH_NO_NATIVE_NLG" />
+ <define name="_LIBCNT_" />
+ <if property="ARCH" value="i386">
+ <define name="__MINGW_IMPORT">"extern __attribute__
((dllexport))"</define>
+ </if>
+
+ <directory name="except_nt">
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <file>chkstk_asm.s</file>
+ <file>seh.s</file>
+ </directory>
+ </if>
+ <if property="ARCH" value="powerpc">
+ <directory name="powerpc">
+ <file>chkstk_asm.s</file>
+ <file>seh.s</file>
+ </directory>
+ </if>
+ </directory>
+ <directory name="math">
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <file>alldiv_asm.s</file>
+ <file>alldvrm_asm.s</file>
+ <file>allmul_asm.s</file>
+ <file>allrem_asm.s</file>
+ <file>allshl_asm.s</file>
+ <file>allshr_asm.s</file>
+ <file>atan_asm.s</file>
+ <file>aulldiv_asm.s</file>
+ <file>aulldvrm_asm.s</file>
+ <file>aullrem_asm.s</file>
+ <file>aullshr_asm.s</file>
+ <file>ceil_asm.s</file>
+ <file>cos_asm.s</file>
+ <file>fabs_asm.s</file>
+ <file>floor_asm.s</file>
+ <file>ftol_asm.s</file>
+ <file>log_asm.s</file>
+ <file>pow_asm.s</file>
+ <file>sin_asm.s</file>
+ <file>sqrt_asm.s</file>
+ <file>tan_asm.s</file>
+ </directory>
+ </if>
+ <file>abs.c</file>
+ <file>labs.c</file>
+ <file>rand_nt.c</file>
+ </directory>
+
+ <directory name="mem">
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <file>memchr_asm.s</file>
+ <file>memcpy_asm.s</file>
+ <file>memmove_asm.s</file>
+ <file>memset_asm.s</file>
+ </directory>
+ </if>
+ <ifnot property="ARCH" value="i386">
+ <file>memchr.c</file>
+ <file>memcpy.c</file>
+ <file>memmove.c</file>
+ <file>memset.c</file>
+ </ifnot>
+ <file>memccpy.c</file>
+ <file>memcmp.c</file>
+ <file>memicmp.c</file>
+ </directory>
+
+ <directory name="search">
+ <file>bsearch.c</file>
+ <file>lfind.c</file>
+ </directory>
+
+ <directory name="string">
+ <if property="ARCH" value="i386">
+ <directory name="i386">
+ <file>strcat_asm.s</file>
+ <file>strchr_asm.s</file>
+ <file>strcmp_asm.s</file>
+ <file>strcpy_asm.s</file>
+ <file>strlen_asm.s</file>
+ <file>strncat_asm.s</file>
+ <file>strncmp_asm.s</file>
+ <file>strncpy_asm.s</file>
+ <file>strnlen_asm.s</file>
+ <file>strrchr_asm.s</file>
+ <file>wcscat_asm.s</file>
+ <file>wcschr_asm.s</file>
+ <file>wcscmp_asm.s</file>
+ <file>wcscpy_asm.s</file>
+ <file>wcslen_asm.s</file>
+ <file>wcsncat_asm.s</file>
+ <file>wcsncmp_asm.s</file>
+ <file>wcsncpy_asm.s</file>
+ <file>wcsnlen_asm.s</file>
+ <file>wcsrchr_asm.s</file>
+ </directory>
+ </if>
+ <ifnot property="ARCH" value="i386">
+ <file>strcat.c</file>
+ <file>strchr.c</file>
+ <file>strcmp.c</file>
+ <file>strcpy.c</file>
+ <file>strlen.c</file>
+ <file>strncat.c</file>
+ <file>strncmp.c</file>
+ <file>strncpy.c</file>
+ <file>strnlen.c</file>
+ <file>strrchr.c</file>
+ <file>wcscat.c</file>
+ <file>wcschr.c</file>
+ <file>wcscmp.c</file>
+ <file>wcscpy.c</file>
+ <file>wcslen.c</file>
+ <file>wcsncat.c</file>
+ <file>wcsncmp.c</file>
+ <file>wcsncpy.c</file>
+ <file>wcsnlen.c</file>
+ <file>wcsrchr.c</file>
+ </ifnot>
+ <file>ctype.c</file>
+ <file>strcspn.c</file>
+ <file>stricmp.c</file>
+ <file>strnicmp.c</file>
+ <file>strlwr.c</file>
+ <file>strrev.c</file>
+ <file>strset.c</file>
+ <file>strstr.c</file>
+ <file>strupr.c</file>
+ <file>strpbrk.c</file>
+ <file>strspn.c</file>
+ <file>atoi64.c</file>
+ <file>atoi.c</file>
+ <file>atol.c</file>
+ <file>itoa.c</file>
+ <file>itow.c</file>
+ <file>mbstowcs_nt.c</file>
+ <file>splitp.c</file>
+ <file>sscanf.c</file>
+ <file>strtol.c</file>
+ <file>strtoul.c</file>
+ <file>strtoull.c</file>
+ <file>wcstol.c</file>
+ <file>wcstombs_nt.c</file>
+ <file>wcstoul.c</file>
+ <file>wtoi64.c</file>
+ <file>wtoi.c</file>
+ <file>wtol.c</file>
+ </directory>
+
+ <directory name="wstring">
+ <file>wcsicmp.c</file>
+ <file>wcslwr.c</file>
+ <file>wcsnicmp.c</file>
+ <file>wcsupr.c</file>
+ <file>wcscspn.c</file>
+ <file>wcspbrk.c</file>
+ <file>wcsset.c</file>
+ <file>wcsspn.c</file>
+ <file>wcsstr.c</file>
+ <file>wcsrev.c</file>
+ </directory>
+
+ <pch>precomp.h</pch>
+</module>
Propchange: trunk/reactos/lib/sdk/crt/libcntpr.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s (original)
+++ trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s Fri Nov 9 15:20:16 2007
@@ -1,22 +1,50 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
- * PURPOSE:
- * FILE:
- * PROGRAMER: Magnus Olsen (magnus(a)greatlord.com)
- *
+ * PURPOSE: Run-Time Library
+ * FILE: lib/rtl/i386/atan.S
+ * PROGRAMER: Alex Ionescu (alex(a)relsoft.net)
+ *
+ * Copyright (C) 2002 Michael Ringgaard.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
.globl _atan
-
+
.intel_syntax noprefix
/* FUNCTIONS ***************************************************************/
_atan:
push ebp
- mov ebp,esp
- fld qword ptr [ebp+8]
- fpatan
+ mov ebp,esp
+ fld qword ptr [ebp+8] // Load real from stack
+ fld1 // Load constant 1
+ fpatan // Take the arctangent
pop ebp
ret
Modified: trunk/reactos/lib/sdk/crt/string/atoi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/atoi.c (original)
+++ trunk/reactos/lib/sdk/crt/string/atoi.c Fri Nov 9 15:20:16 2007
@@ -1,5 +1,6 @@
/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
#include <precomp.h>
+#include <tchar.h>
/*
* @implemented
Modified: trunk/reactos/lib/sdk/crt/string/splitp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/splitp.c (original)
+++ trunk/reactos/lib/sdk/crt/string/splitp.c Fri Nov 9 15:20:16 2007
@@ -1,4 +1,5 @@
#include <precomp.h>
+#include <tchar.h>
/*
* @implemented
Copied: trunk/reactos/lib/sdk/crt/string/sscanf.c (from r30261,
trunk/reactos/lib/sdk/libcntpr/string/sscanf.c)
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/sscanf.…
==============================================================================
--- trunk/reactos/lib/sdk/libcntpr/string/sscanf.c (original)
+++ trunk/reactos/lib/sdk/crt/string/sscanf.c Fri Nov 9 15:20:16 2007
@@ -1,10 +1,13 @@
-/**/
-#define WIN32_NO_STATUS
-#include <windows.h>
-#include <ndk/umtypes.h>
-#include <ndk/rtlfuncs.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <precomp.h>
+
+#include <wchar.h>
+#include <ctype.h>
+
+#define NDEBUG
+#include <internal/debug.h>
+
+#define WARN DPRINT1
+
#define EOF (-1)
@@ -23,7 +26,7 @@
#undef WIDE_SCANF
#undef CONSOLE
#define STRING 1
-#include "scanf.h"
+#include "wine/scanf.h"
int sscanf(const char *str, const char *format, ...)
{
Modified: trunk/reactos/lib/sdk/crt/wine/scanf.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/scanf.h?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wine/scanf.h (original)
+++ trunk/reactos/lib/sdk/crt/wine/scanf.h Fri Nov 9 15:20:16 2007
@@ -460,7 +460,11 @@
int invert = 0; /* Set if we are NOT to find the chars */
/* Init our bitmap */
+#ifdef _LIBCNT_
+ Mask = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8);
+#else
Mask = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _BITMAPSIZE_/8);
+#endif
RtlInitializeBitMap(&bitMask, Mask, _BITMAPSIZE_);
/* Read the format */
@@ -506,7 +510,11 @@
}
/* terminate */
if (!suppress) *sptr = 0;
+#ifdef _LIBCNT_
+ RtlFreeHeap(RtlGetProcessHeap(), 0, Mask);
+#else
HeapFree(GetProcessHeap(), 0, Mask);
+#endif
}
break;
default:
Modified: trunk/reactos/lib/sdk/sdk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/sdk.rbuild?rev=302…
==============================================================================
--- trunk/reactos/lib/sdk/sdk.rbuild (original)
+++ trunk/reactos/lib/sdk/sdk.rbuild Fri Nov 9 15:20:16 2007
@@ -3,12 +3,10 @@
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<directory name="crt">
<xi:include href="crt/crt.rbuild" />
+ <xi:include href="crt/libcntpr.rbuild" />
</directory>
<directory name="dxguid">
<xi:include href="dxguid/dxguid.rbuild" />
- </directory>
- <directory name="libcntpr">
- <xi:include href="libcntpr/libcntpr.rbuild" />
</directory>
<directory name="nt">
<xi:include href="nt/nt.rbuild" />