Make rtl use a single header. Helps for PCH and will help for the new Headers (no need to change each file)

svn path=/trunk/; revision=15115
2024-12-28 10:04:49 +00:00 · 2005-05-08 05:14:46 +00:00 · 2005-05-08 05:14:46 +00:00 · 35deccffea
commit 35deccffea
parent f60871a43b
35 changed files with 85 additions and 105 deletions
--- a/reactos/include/funcs.h
+++ b/reactos/include/funcs.h
@ -2087,10 +2087,12 @@ NTSTATUS  STDCALL RtlWalkHeap( HANDLE heap, PVOID entry_ptr );
 NTSTATUS STDCALL LdrLockLoaderLock(ULONG flags, ULONG *result, ULONG *magic);
 NTSTATUS STDCALL LdrUnlockLoaderLock(ULONG flags, ULONG magic);

-NTSTATUS  STDCALL RtlDuplicateUnicodeString(
-    int add_nul,
-    const UNICODE_STRING *source,
-    UNICODE_STRING *destination);
+NTSTATUS STDCALL
+RtlDuplicateUnicodeString(
+   INT AddNull,
+   IN PUNICODE_STRING SourceString,
+   PUNICODE_STRING DestinationString);
+
 NTSTATUS  STDCALL RtlFindCharInUnicodeString(
    int flags,
    const UNICODE_STRING *main_str,
--- a/reactos/lib/rtl/access.c
+++ b/reactos/lib/rtl/access.c
@ -9,8 +9,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/acl.c
+++ b/reactos/lib/rtl/acl.c
@ -11,8 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/bit.c
+++ b/reactos/lib/rtl/bit.c
@ -26,7 +26,10 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
+#include "rtl.h"
+
+#define NDEBUG
+#include <debug.h>


 /* FUNCTIONS ****************************************************************/
--- a/reactos/lib/rtl/bitmap.c
+++ b/reactos/lib/rtl/bitmap.c
@ -28,7 +28,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/bootdata.c
+++ b/reactos/lib/rtl/bootdata.c
@ -24,7 +24,7 @@
 * FILE:              lib/rtl/bootdata.c
 */

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/compress.c
+++ b/reactos/lib/rtl/compress.c
@ -27,12 +27,11 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>

-
 /* MACROS *******************************************************************/

 #define COMPRESSION_FORMAT_MASK  0x00FF
--- a/reactos/lib/rtl/dos8dot3.c
+++ b/reactos/lib/rtl/dos8dot3.c
@ -27,8 +27,7 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ntos/minmax.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/encode.c
+++ b/reactos/lib/rtl/encode.c
@ -12,9 +12,10 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
+#include "rtl.h"

-#include <ntdll/ntdll.h>
+#define NDEBUG
+#include <debug.h>

 /* FUNCTIONS ***************************************************************/

--- a/reactos/lib/rtl/env.c
+++ b/reactos/lib/rtl/env.c
@ -11,14 +11,10 @@

 /* INCLUDES ******************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <napi/teb.h>
-#include <ntos/minmax.h>
-#include <string.h>
+#include "rtl.h"

 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>

 PPEB STDCALL RtlpCurrentPeb(VOID);
 /* FUNCTIONS *****************************************************************/
--- a/reactos/lib/rtl/error.c
+++ b/reactos/lib/rtl/error.c
@ -19,19 +19,11 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <winerror.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>

-#ifndef HIWORD
-#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
-#endif
-#ifndef LOWORD
-#define LOWORD(l) ((WORD)(l))
-#endif
-
 /* TYPES *******************************************************************/

 typedef struct _ERROR_TABLE
--- a/reactos/lib/rtl/exception.c
+++ b/reactos/lib/rtl/exception.c
@ -15,10 +15,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <windows.h>
-#include <string.h>
-#include <napi/teb.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/generictable.c
+++ b/reactos/lib/rtl/generictable.c
@ -24,7 +24,7 @@
 * FILE:              lib/rtl/genertictbl.c
 */

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/heap.c
+++ b/reactos/lib/rtl/heap.c
@ -12,11 +12,7 @@
 * require it.
 */

-#include <string.h>
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <ntos/heap.h>
-#include <ntos/minmax.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
@ -29,7 +25,6 @@
 #define TRACE_ON(x) (1)
 #endif

-
 static RTL_CRITICAL_SECTION RtlpProcessHeapsListLock;


--- a/reactos/lib/rtl/image.c
+++ b/reactos/lib/rtl/image.c
@ -9,11 +9,10 @@
 *                  17/03/2000 Created
 */

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>

 /* FUNCTIONS ****************************************************************/

--- a/reactos/lib/rtl/largeint.c
+++ b/reactos/lib/rtl/largeint.c
@ -11,7 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/luid.c
+++ b/reactos/lib/rtl/luid.c
@ -11,8 +11,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/mem.c
+++ b/reactos/lib/rtl/mem.c
@ -12,8 +12,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <string.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/network.c
+++ b/reactos/lib/rtl/network.c
@ -24,8 +24,7 @@
 * FILE:              lib/rtl/network.c
 */

-#include <ddk/ntddk.h>
-#include <stdio.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/nls.c
+++ b/reactos/lib/rtl/nls.c
@ -13,7 +13,7 @@
 */


-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/ppb.c
+++ b/reactos/lib/rtl/ppb.c
@ -11,14 +11,10 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/ldr.h>
-#include <napi/teb.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>

 /* MACROS ****************************************************************/

--- a/reactos/lib/rtl/process.c
+++ b/reactos/lib/rtl/process.c
@ -11,14 +11,10 @@

 /* INCLUDES ****************************************************************/

-#include <ddk/ntddk.h>
-#include <napi/i386/segment.h>
-#include <ntdll/ldr.h>
-#include <ntdll/base.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>

 /* FUNCTIONS ****************************************************************/

--- a/reactos/lib/rtl/random.c
+++ b/reactos/lib/rtl/random.c
@ -26,8 +26,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/registry.c
+++ b/reactos/lib/rtl/registry.c
@ -18,12 +18,10 @@
 /* INCLUDES ****************************************************************/

 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <ntos/minmax.h>
+#include "rtl.h"

 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>


 /* FUNCTIONS ***************************************************************/
--- a/reactos/lib/rtl/rtl.h
+++ b/reactos/lib/rtl/rtl.h
@ -0,0 +1,33 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS System Libraries
+ * FILE:            lib/rtl/rtl.h
+ * PURPOSE:         Run-Time Libary Header
+ * PROGRAMMER:      Alex Ionescu
+ */
+
+/* INCLUDES ******************************************************************/
+
+#include <ddk/ntddk.h>
+#include <windows.h>
+#include <ntdll/rtl.h>
+#include <napi/teb.h>
+#include <ntos/minmax.h>
+#include <string.h>
+#include <napi/i386/segment.h>
+#include <ntdll/ldr.h>
+#include <ntdll/base.h>
+#include <ntdll/rtl.h>
+#include <rosrtl/thread.h>
+#include <winerror.h>
+#include <stdio.h>
+
+#define ROUNDUP(a,b)    ((((a)+(b)-1)/(b))*(b))
+#ifndef HIWORD
+#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
+#endif
+#ifndef LOWORD
+#define LOWORD(l) ((WORD)(l))
+#endif
+
+/* EOF */
--- a/reactos/lib/rtl/sd.c
+++ b/reactos/lib/rtl/sd.c
@ -11,9 +11,10 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
+#include "rtl.h"

-#include <ntdll/ntdll.h>
+#define NDEBUG
+#include <debug.h>

 /* FUNCTIONS ***************************************************************/

--- a/reactos/lib/rtl/security.c
+++ b/reactos/lib/rtl/security.c
@ -9,8 +9,7 @@
 *                  21/11/2001 Created
 */

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/sid.c
+++ b/reactos/lib/rtl/sid.c
@ -10,12 +10,8 @@
 */

 /* INCLUDES *****************************************************************/
-
 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <string.h>
-
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/splaytree.c
+++ b/reactos/lib/rtl/splaytree.c
@ -24,7 +24,7 @@
 * FILE:              lib/rtl/splaytree.c
 */

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/thread.c
+++ b/reactos/lib/rtl/thread.c
@ -18,10 +18,10 @@

 /* INCLUDES *****************************************************************/

-#include <ntos.h>
+#include "rtl.h"

 #define NDEBUG
-#include <ntdll/ntdll.h>
+#include <debug.h>

 /* FUNCTIONS ***************************************************************/

--- a/reactos/lib/rtl/time.c
+++ b/reactos/lib/rtl/time.c
@ -12,8 +12,7 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/timezone.c
+++ b/reactos/lib/rtl/timezone.c
@ -11,15 +11,11 @@

 /* INCLUDES *****************************************************************/

-#include <ddk/ntddk.h>
-#include <ntos/registry.h>
-#include <ntos/time.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>

-
 /* FUNCTIONS *****************************************************************/

 /*
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@ -19,16 +19,8 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
-
 #define __NTDRIVER__
-#include <ddk/ntddk.h>
-
-#include <ntdll/rtl.h>
-
-#include <ntos/minmax.h>
-#define __NO_CTYPE_INLINES
-#include <ctype.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/unicodeprefix.c
+++ b/reactos/lib/rtl/unicodeprefix.c
@ -24,7 +24,7 @@
 * FILE:              lib/rtl/unicodeprfx.c
 */

-#include <ddk/ntddk.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>
--- a/reactos/lib/rtl/version.c
+++ b/reactos/lib/rtl/version.c
@ -29,11 +29,8 @@
 */

 /* INCLUDES *****************************************************************/
-
 #define __USE_W32API
-
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
+#include "rtl.h"

 #define NDEBUG
 #include <debug.h>