branch update for HEAD-2003021201

diff --git a/src/libcaptive/client/lib.c b/src/libcaptive/client/lib.c
index 9c80d9c..909c12f 100644 (file)
--- a/src/libcaptive/client/lib.c
+++ b/src/libcaptive/client/lib.c
@@ -23,7 +23,7 @@
 #include <libgnomevfs/gnome-vfs-result.h>
 #include <glib/gmessages.h>
 #include "captive/macros.h"
-#include "reactos/ddk/rtl.h"   /* for InitializeObjectAttributes() */
+#include "reactos/ntos/rtl.h"  /* for InitializeObjectAttributes() */
 #include "captive/unicode.h"
 #include <libgnomevfs/gnome-vfs-utils.h>       /* for gnome_vfs_unescape_string() */
 #include <glib/gprintf.h>

diff --git a/src/libcaptive/include/captive/client-directory.h b/src/libcaptive/include/captive/client-directory.h
index b6855ea..8445b47 100644 (file)
--- a/src/libcaptive/include/captive/client-directory.h
+++ b/src/libcaptive/include/captive/client-directory.h
@@ -24,7 +24,7 @@
 #include <glib/gmacros.h>
 #include <glib-object.h>
 #include "reactos/ntos/types.h"        /* for HANDLE */
-#include "reactos/ddk/zwtypes.h"       /* for FILE_ID_BOTH_DIR_INFORMATION */
+#include "reactos/ntos/zwtypes.h"      /* for FILE_ID_BOTH_DIR_INFORMATION */
 #include <libgnomevfs/gnome-vfs-file-info.h>   /* for GnomeVFSFileInfo */
 
 

diff --git a/src/libcaptive/include/captive/client-file.h b/src/libcaptive/include/captive/client-file.h
index 949e7db..f7d76a3 100644 (file)
--- a/src/libcaptive/include/captive/client-file.h
+++ b/src/libcaptive/include/captive/client-file.h
@@ -24,7 +24,7 @@
 #include <glib/gmacros.h>
 #include <glib-object.h>
 #include "reactos/ntos/types.h"        /* for HANDLE */
-#include "reactos/ddk/zwtypes.h"       /* for FILE_ID_BOTH_DIR_INFORMATION */
+#include "reactos/ntos/zwtypes.h"      /* for FILE_ID_BOTH_DIR_INFORMATION */
 #include <libgnomevfs/gnome-vfs-handle.h>      /* for GnomeVFSOpenMode */
 
 

diff --git a/src/libcaptive/include/captive/unicode.h b/src/libcaptive/include/captive/unicode.h
index d6232b8..b93c1f0 100644 (file)
--- a/src/libcaptive/include/captive/unicode.h
+++ b/src/libcaptive/include/captive/unicode.h
@@ -25,7 +25,7 @@
 #include <glib/gtypes.h>
 #include <glib/galloca.h>
 #include "reactos/napi/types.h"  /* for PUNICODE_STRING etc. */
-#include "reactos/ddk/rtltypes.h"      /* for ANSI_STRING */
+#include "reactos/ntos/rtltypes.h"     /* for ANSI_STRING */
 #include <stddef.h>    /* for size_t and wchar_t */
 #include <glib/gunicode.h>     /* for gunichar */
 

diff --git a/src/libcaptive/include/reactos/ddk/Makefile.am b/src/libcaptive/include/reactos/ddk/Makefile.am
index 8b162bb..82a5542 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/Makefile.am
+++ b/src/libcaptive/include/reactos/ddk/Makefile.am
@@ -48,12 +48,8 @@ noinst_HEADERS+= \
                pnptypes.h \
                psfuncs.h \
                pstypes.h \
-               rtl.h \
-               rtltypes.h \
                scsi.h \
                setypes.h \
                srb.h \
                status.h \
-               types.h \
-               zw.h \
-               zwtypes.h
+               types.h

diff --git a/src/libcaptive/include/reactos/ddk/fstypes.h b/src/libcaptive/include/reactos/ddk/fstypes.h
index ac8f9f3..12efef1 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/fstypes.h
+++ b/src/libcaptive/include/reactos/ddk/fstypes.h
@@ -34,7 +34,7 @@
 
 #include "reactos/ddk/iotypes.h"       /* for PFILE_OBJECT */
 #include "reactos/ddk/extypes.h"       /* for FAST_MUTEX */
-#include "reactos/ddk/rtltypes.h"      /* for RTL_SPLAY_LINKS */
+#include "reactos/ntos/rtltypes.h"     /* for RTL_SPLAY_LINKS */
 #include "ddk/fstypes.h"
 
 

diff --git a/src/libcaptive/include/reactos/ddk/haltypes.h b/src/libcaptive/include/reactos/ddk/haltypes.h
index 54a513c..31dd74e 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/haltypes.h
+++ b/src/libcaptive/include/reactos/ddk/haltypes.h
@@ -33,7 +33,7 @@
 
 
 #include "reactos/ddk/iotypes.h"       /* for PDEVICE_OBJECT */
-#include "reactos/ddk/rtltypes.h"      /* for PSTRING */
+#include "reactos/ntos/rtltypes.h"     /* for PSTRING */
 #include "ddk/haltypes.h"
 
 

diff --git a/src/libcaptive/include/reactos/ddk/iofuncs.h b/src/libcaptive/include/reactos/ddk/iofuncs.h
index e4f7f1a..6399c06 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/iofuncs.h
+++ b/src/libcaptive/include/reactos/ddk/iofuncs.h
@@ -36,8 +36,8 @@
 #include "reactos/ddk/types.h" /* for PKIRQL */
 #include "reactos/napi/types.h"        /* for NTSTATUS */
 #include "reactos/ddk/iotypes.h"       /* for PADAPTER_OBJECT */
-#include "reactos/ddk/rtltypes.h"      /* for PCONTROLLER_OBJECT */
-#include "reactos/ddk/zwtypes.h"       /* for PFILE_FULL_EA_INFORMATION */
+#include "reactos/ntos/rtltypes.h"     /* for PCONTROLLER_OBJECT */
+#include "reactos/ntos/zwtypes.h"      /* for PFILE_FULL_EA_INFORMATION */
 #include "reactos/ddk/extypes.h"       /* for WORK_QUEUE_TYPE */
 #include "reactos/ddk/ntddk.h" /* for FASTCALL */
 #include "ddk/iofuncs.h"

diff --git a/src/libcaptive/include/reactos/ddk/obfuncs.h b/src/libcaptive/include/reactos/ddk/obfuncs.h
index 2ae5eff..3b3a7e9 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/obfuncs.h
+++ b/src/libcaptive/include/reactos/ddk/obfuncs.h
@@ -32,7 +32,7 @@
 #define _CAPTIVE_REACTOS_DDK_OBFUNCS_H 1
 
 
-#include "reactos/ddk/zwtypes.h"       /* for POBJECT_NAME_INFORMATION */
+#include "reactos/ntos/zwtypes.h"      /* for POBJECT_NAME_INFORMATION */
 #include "ddk/obfuncs.h"
 
 

diff --git a/src/libcaptive/include/reactos/ntos/Makefile.am b/src/libcaptive/include/reactos/ntos/Makefile.am
index 7573d77..ea17f3f 100644 (file)
--- a/src/libcaptive/include/reactos/ntos/Makefile.am
+++ b/src/libcaptive/include/reactos/ntos/Makefile.am
@@ -21,6 +21,10 @@ include $(top_srcdir)/src/libcaptive/Makefile-libcaptive.am
 
 noinst_HEADERS+= \
                disk.h \
+               rtl.h \
+               rtltypes.h \
                security.h \
                time.h \
-               types.h
+               types.h \
+               zw.h \
+               zwtypes.h

diff --git a/src/libcaptive/include/reactos/ddk/rtl.h b/src/libcaptive/include/reactos/ntos/rtl.h
similarity index 91%
rename from src/libcaptive/include/reactos/ddk/rtl.h
rename to src/libcaptive/include/reactos/ntos/rtl.h
index f27cb2d..b40ffe5 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/rtl.h
+++ b/src/libcaptive/include/reactos/ntos/rtl.h
@@ -1,5 +1,5 @@
 /* $Id$
- * GNU world compatibility wrapper for reactos ddk/rtl.h for libcaptive
+ * GNU world compatibility wrapper for reactos ntos/rtl.h for libcaptive
  * Copyright (C) 2002 Jan Kratochvil <project-captive@jankratochvil.net>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,9 @@
 
 #include "reactos/ntos/types.h"        /* for WORD etc. */
 #include "reactos/ddk/extypes.h"       /* for PSLIST_HEADER */
-#include "reactos/ddk/rtltypes.h"      /* for PRTL_ATOM_TABLE */
+#include "reactos/ntos/rtltypes.h"     /* for PRTL_ATOM_TABLE */
 #include "reactos/ntos/time.h" /* for PTIME_ZONE_INFORMATION */
-#include "ddk/rtl.h"
+#include "ntos/rtl.h"
 
 
 #endif /* _CAPTIVE_REACTOS_DDK_RTL_H */

diff --git a/src/libcaptive/include/reactos/ddk/rtltypes.h b/src/libcaptive/include/reactos/ntos/rtltypes.h
similarity index 94%
rename from src/libcaptive/include/reactos/ddk/rtltypes.h
rename to src/libcaptive/include/reactos/ntos/rtltypes.h
index 978f240..b430b42 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/rtltypes.h
+++ b/src/libcaptive/include/reactos/ntos/rtltypes.h
@@ -1,5 +1,5 @@
 /* $Id$
- * GNU world compatibility wrapper for reactos ddk/rtltypes.h for libcaptive
+ * GNU world compatibility wrapper for reactos ntos/rtltypes.h for libcaptive
  * Copyright (C) 2002 Jan Kratochvil <project-captive@jankratochvil.net>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #include "reactos/ntos/types.h"        /* for ULONG  */
 #include "reactos/ddk/ketypes.h"       /* for KDEVICE_QUEUE */
 #include "reactos/ddk/ntdef.h" /* for NTAPI */
-#include "ddk/rtltypes.h"
+#include "ntos/rtltypes.h"
 
 
 #endif /* _CAPTIVE_REACTOS_DDK_RTLTYPES_H */

diff --git a/src/libcaptive/include/reactos/ddk/zw.h b/src/libcaptive/include/reactos/ntos/zw.h
similarity index 93%
rename from src/libcaptive/include/reactos/ddk/zw.h
rename to src/libcaptive/include/reactos/ntos/zw.h
index 527b713..40eeb8a 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/zw.h
+++ b/src/libcaptive/include/reactos/ntos/zw.h
@@ -1,5 +1,5 @@
 /* $Id$
- * GNU world compatibility wrapper for reactos ddk/zw.h for libcaptive
+ * GNU world compatibility wrapper for reactos ntos/zw.h for libcaptive
  * Copyright (C) 2002 Jan Kratochvil <project-captive@jankratochvil.net>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
 #define _CAPTIVE_REACTOS_DDK_ZW_H 1
 
 
-#include "ddk/zw.h"
+#include "ntos/zw.h"
 
 
 #endif /* _CAPTIVE_REACTOS_DDK_ZW_H */

diff --git a/src/libcaptive/include/reactos/ddk/zwtypes.h b/src/libcaptive/include/reactos/ntos/zwtypes.h
similarity index 93%
rename from src/libcaptive/include/reactos/ddk/zwtypes.h
rename to src/libcaptive/include/reactos/ntos/zwtypes.h
index 56ccfbc..72572ec 100644 (file)
--- a/src/libcaptive/include/reactos/ddk/zwtypes.h
+++ b/src/libcaptive/include/reactos/ntos/zwtypes.h
@@ -1,5 +1,5 @@
 /* $Id$
- * GNU world compatibility wrapper for reactos ddk/zwtypes.h for libcaptive
+ * GNU world compatibility wrapper for reactos ntos/zwtypes.h for libcaptive
  * Copyright (C) 2002 Jan Kratochvil <project-captive@jankratochvil.net>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -33,7 +33,7 @@
 
 
 #include "reactos/napi/teb.h"  /* for CLIENT_ID */
-#include "ddk/zwtypes.h"
+#include "ntos/zwtypes.h"
 
 
 #endif /* _CAPTIVE_REACTOS_DDK_ZWTYPES_H */

diff --git a/src/libcaptive/ob/dirobj.c b/src/libcaptive/ob/dirobj.c
index 9bd98a6..5faabfc 100644 (file)
--- a/src/libcaptive/ob/dirobj.c
+++ b/src/libcaptive/ob/dirobj.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/zw.h"    /* self */
+#include "reactos/ntos/zw.h"   /* self */
 #include "reactos/ntos/types.h"        /* for PHANDLE */
 #include "reactos/napi/types.h"        /* for NTSTATUS */
 #include <glib/gmessages.h>

diff --git a/src/libcaptive/ob/handle.c b/src/libcaptive/ob/handle.c
index c65de54..e8de9ca 100644 (file)
--- a/src/libcaptive/ob/handle.c
+++ b/src/libcaptive/ob/handle.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/zw.h"    /* self */
+#include "reactos/ntos/zw.h"   /* self */
 #include "reactos/ntos/types.h"        /* for HANDLE */
 #include "reactos/napi/types.h"        /* for NTSTATUS */
 #include <glib/gmessages.h>

diff --git a/src/libcaptive/rtl/error.c b/src/libcaptive/rtl/error.c
index 0951862..16c6f0c 100644 (file)
--- a/src/libcaptive/rtl/error.c
+++ b/src/libcaptive/rtl/error.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtl.h"   /* self */
+#include "reactos/ntos/rtl.h"  /* self */
 #include <glib/gmessages.h>
 
 

diff --git a/src/libcaptive/rtl/generictable.c b/src/libcaptive/rtl/generictable.c
index f69dd52..3b4d79d 100644 (file)
--- a/src/libcaptive/rtl/generictable.c
+++ b/src/libcaptive/rtl/generictable.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtl.h"   /* self */
+#include "reactos/ntos/rtl.h"  /* self */
 #include <glib/gtypes.h>
 #include <glib/gmessages.h>
 #include <glib/ghash.h>

diff --git a/src/libcaptive/rtl/memcpy.c b/src/libcaptive/rtl/memcpy.c
index c7ca67f..330888d 100644 (file)
--- a/src/libcaptive/rtl/memcpy.c
+++ b/src/libcaptive/rtl/memcpy.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtl.h"   /* self */
+#include "reactos/ntos/rtl.h"  /* self */
 #include <glib/gmessages.h>
 #include <string.h>
 

diff --git a/src/libcaptive/rtl/memmove.c b/src/libcaptive/rtl/memmove.c
index f16a0f2..827a5ae 100644 (file)
--- a/src/libcaptive/rtl/memmove.c
+++ b/src/libcaptive/rtl/memmove.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtl.h"   /* self */
+#include "reactos/ntos/rtl.h"  /* self */
 #include <glib/gmessages.h>
 #include <string.h>
 

diff --git a/src/libcaptive/rtl/memset.c b/src/libcaptive/rtl/memset.c
index cd64322..b48be23 100644 (file)
--- a/src/libcaptive/rtl/memset.c
+++ b/src/libcaptive/rtl/memset.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtl.h"   /* self */
+#include "reactos/ntos/rtl.h"  /* self */
 #include <glib/gmessages.h>
 #include <string.h>
 

diff --git a/src/libcaptive/rtl/splaylinks.c b/src/libcaptive/rtl/splaylinks.c
index 9f3db6d..8fb288f 100644 (file)
--- a/src/libcaptive/rtl/splaylinks.c
+++ b/src/libcaptive/rtl/splaylinks.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtltypes.h"      /* self */
+#include "reactos/ntos/rtltypes.h"     /* self */
 #include <glib/gmessages.h>
 
 

diff --git a/src/libcaptive/rtl/string.c b/src/libcaptive/rtl/string.c
index dff6cb2..a776b4e 100644 (file)
--- a/src/libcaptive/rtl/string.c
+++ b/src/libcaptive/rtl/string.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "reactos/ddk/rtl.h"   /* self */
+#include "reactos/ntos/rtl.h"  /* self */
 #include <glib/gmessages.h>
 #include <string.h>