[ion] 16281: Hasta la vista ntdll/napi headers

Hasta la vista ntdll/napi headers
Modified: trunk/reactos/drivers/fs/np/fsctrl.c
Deleted: trunk/reactos/include/napi/
Deleted: trunk/reactos/include/ntdll/
Added: trunk/reactos/include/win32k/win32.h
Modified: trunk/reactos/ntoskrnl/include/internal/asm.h
Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S
Modified: trunk/reactos/ntoskrnl/ke/process.c
Modified: trunk/reactos/subsys/win32k/w32k.h
Modified: trunk/reactos/tools/nci/nci.mak
Modified: trunk/reactos/tools/nci/ncitool.c
  _____

Modified: trunk/reactos/drivers/fs/np/fsctrl.c
--- trunk/reactos/drivers/fs/np/fsctrl.c	2005-06-26 06:06:51 UTC
(rev 16280)
+++ trunk/reactos/drivers/fs/np/fsctrl.c	2005-06-26 06:27:34 UTC
(rev 16281)
@@ -11,7 +11,6 @@

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

#include <ntifs.h>
-#include <napi/npipe.h>
 #include "npfs.h"

#define NDEBUG
  _____

Copied: trunk/reactos/include/win32k/win32.h (from rev 16273,
trunk/reactos/include/napi/win32.h)
  _____

Modified: trunk/reactos/ntoskrnl/include/internal/asm.h
--- trunk/reactos/ntoskrnl/include/internal/asm.h	2005-06-26
06:06:51 UTC (rev 16280)
+++ trunk/reactos/ntoskrnl/include/internal/asm.h	2005-06-26
06:27:34 UTC (rev 16281)
@@ -116,3 +116,7 @@

#define KTRAP_FRAME_V86_GS         (0x88)
 #define KTRAP_FRAME_RESERVED9      (0x8A)
 #define KTRAP_FRAME_SIZE           (0x8C)
+
+/* User Shared Data */
+#define KUSER_SHARED_SYSCALL       0x7FFE0300
+#define KUSER_SHARED_SYSCALL_RET   0x7FFE0304
  _____

Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S
--- trunk/reactos/ntoskrnl/ke/i386/syscall.S	2005-06-26 06:06:51 UTC
(rev 16280)
+++ trunk/reactos/ntoskrnl/ke/i386/syscall.S	2005-06-26 06:27:34 UTC
(rev 16281)
@@ -14,7 +14,6 @@

#include <internal/i386/ke.h>
 #include <internal/asm.h>
 #include <ndk/i386/segment.h>
-#include <napi/shared_data.h>

#define UserMode  (1)

_____

Modified: trunk/reactos/ntoskrnl/ke/process.c
--- trunk/reactos/ntoskrnl/ke/process.c	2005-06-26 06:06:51 UTC (rev
16280)
+++ trunk/reactos/ntoskrnl/ke/process.c	2005-06-26 06:27:34 UTC (rev
16281)
@@ -11,7 +11,7 @@

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

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

_____

Modified: trunk/reactos/subsys/win32k/w32k.h
--- trunk/reactos/subsys/win32k/w32k.h	2005-06-26 06:06:51 UTC (rev
16280)
+++ trunk/reactos/subsys/win32k/w32k.h	2005-06-26 06:27:34 UTC (rev
16281)
@@ -22,7 +22,6 @@

#include <windows.h>    /* FIXME ? */
 #include <windowsx.h>   /* FIXME ? */
 #include <ndk/ntndk.h>
-#include <napi/win32.h> /* FIXME */

/* FIXME: ReactOS will be R-Rated if I really write what I'm about to
*/
 NTSTATUS 
@@ -46,6 +45,7 @@

/* External Win32K Header */
 #include <win32k/win32k.h>
+#include <win32k/win32.h>

/* Internal Win32K Header */
 #include "include/win32k.h"
  _____

Modified: trunk/reactos/tools/nci/nci.mak
--- trunk/reactos/tools/nci/nci.mak	2005-06-26 06:06:51 UTC (rev
16280)
+++ trunk/reactos/tools/nci/nci.mak	2005-06-26 06:27:34 UTC (rev
16281)
@@ -49,7 +49,7 @@

# NTOSKRNL.EXE
 KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst
-KERNEL_SERVICE_TABLE = include$(SEP)ntdll$(SEP)napi.h
+KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h
 NTDLL_STUBS = lib$(SEP)ntdll$(SEP)napi.S
 KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S

_____

Modified: trunk/reactos/tools/nci/ncitool.c
--- trunk/reactos/tools/nci/ncitool.c	2005-06-26 06:06:51 UTC (rev
16280)
+++ trunk/reactos/tools/nci/ncitool.c	2005-06-26 06:27:34 UTC (rev
16281)
@@ -130,7 +130,7 @@

" * PROGRAMMER:      Computer Generated File. See
tools/nci/ncitool.c\n"
             " * REMARK:          DO NOT EDIT OR COMMIT MODIFICATIONS TO
THIS FILE\n"
             " */\n\n\n"
-            "#include <napi/shared_data.h>\n\n",
+            "#define KUSER_SHARED_SYSCALL 0x7FFE0300\n\n",
             FileDescription,
             FileLocation);
 }