[NTOS]

- use NTDDI_VERSION 0x05020400 (2k3, SP4)
- fix ProbeForRead parameters
- remove a hack

svn path=/branches/header-work/; revision=45971

diff --git a/ntoskrnl/ex/exintrin.c b/ntoskrnl/ex/exintrin.c
index 0d98379..f843252 100644 (file)
--- a/ntoskrnl/ex/exintrin.c
+++ b/ntoskrnl/ex/exintrin.c
@@ -99,7 +99,7 @@ InterlockedExchangeAdd(IN OUT LONG volatile *Addend,
  */
 VOID
 NTAPI
  */
 VOID
 NTAPI

-ProbeForRead(IN CONST VOID *Address,
+ProbeForRead(IN VOID *Address,

              IN SIZE_T Length,
              IN ULONG Alignment)
 {
              IN SIZE_T Length,
              IN ULONG Alignment)
 {

diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h
index d116cb3..4656597 100644 (file)
--- a/ntoskrnl/include/ntoskrnl.h
+++ b/ntoskrnl/include/ntoskrnl.h
@@ -22,8 +22,6 @@
 #define SINGLE_GROUP_LEGACY_API
 #include <excpt.h>
 #include <ntdef.h>
 #define SINGLE_GROUP_LEGACY_API
 #include <excpt.h>
 #include <ntdef.h>

-#undef DECLSPEC_IMPORT
-#define DECLSPEC_IMPORT

 #include <ntifs.h>
 #include <wdmguid.h>
 #include <arc/arc.h>
 #include <ntifs.h>
 #include <wdmguid.h>
 #include <arc/arc.h>

diff --git a/ntoskrnl/ntoskrnl-generic.rbuild b/ntoskrnl/ntoskrnl-generic.rbuild
index abf3219..3c5334d 100644 (file)
--- a/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/ntoskrnl/ntoskrnl-generic.rbuild
@@ -7,6 +7,7 @@
        <define name="_NTOSKRNL_" />
        <define name="_NTSYSTEM_" />
        <define name="_IN_KERNEL_" />
        <define name="_NTOSKRNL_" />
        <define name="_NTSYSTEM_" />
        <define name="_IN_KERNEL_" />

+       <define name="NTDDI_VERSION">0x05020400</define>

        <if property="_WINKD_" value="1">
                <define name="_WINKD_" />
        </if>
        <if property="_WINKD_" value="1">
                <define name="_WINKD_" />
        </if>