[DDK]

- Remove NTKERNELAPI from Rtl String routines
- Remove obsolete hack definition
- Fix a typo, spotted by Thomas

svn path=/trunk/; revision=63269

diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 7c4ce75..53b2d13 100644 (file)
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -870,11 +870,11 @@ typedef VOID
 (NTAPI *PRTL_FREE_STRING_ROUTINE)(
   _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID Buffer);
 
-extern NTKERNELAPI const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine;
-extern NTKERNELAPI const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine;
+extern const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine;
+extern const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine;
 
 #if _WIN32_WINNT >= 0x0600
-extern NTKERNELAPI const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
+extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
 #endif
 
 _Function_class_(RTL_HEAP_COMMIT_ROUTINE)

diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 26ebbf3..8d04060 100644 (file)
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -25,9 +25,6 @@
 #ifndef _WDMDDK_
 #define _WDMDDK_
 
-// TEMP HACK!
-#define _PROPER_NT_EXPORTS 1
-
 #define WDM_MAJORVERSION        0x06
 #define WDM_MINORVERSION        0x00
 
@@ -155,9 +152,9 @@ extern "C" {
 #ifndef __STRINGIFY
 #define __STRINGIFY(_exp) #_exp
 #endif
-#define _Pragma_redifine_extname(_Name, _Target) _Pragma(__STRINGIFY(redefine_extname _Name _Target))
+#define _Pragma_redefine_extname(_Name, _Target) _Pragma(__STRINGIFY(redefine_extname _Name _Target))
 #define __CREATE_NTOS_DATA_IMPORT_ALIAS(_Name) \
-    _Pragma_redifine_extname(_Name,__IMPORTNAME(_Name))
+    _Pragma_redefine_extname(_Name,__IMPORTNAME(_Name))
 #endif
 
 #if defined(_WIN64)

diff --git a/reactos/include/xdk/rtltypes.h b/reactos/include/xdk/rtltypes.h
index 7e56f8c..fef0604 100644 (file)
--- a/reactos/include/xdk/rtltypes.h
+++ b/reactos/include/xdk/rtltypes.h
@@ -559,11 +559,11 @@ typedef VOID
 (NTAPI *PRTL_FREE_STRING_ROUTINE)(
   _In_ __drv_freesMem(Mem) _Post_invalid_ PVOID Buffer);
 
-extern NTKERNELAPI const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine;
-extern NTKERNELAPI const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine;
+extern const PRTL_ALLOCATE_STRING_ROUTINE RtlAllocateStringRoutine;
+extern const PRTL_FREE_STRING_ROUTINE RtlFreeStringRoutine;
 
 #if _WIN32_WINNT >= 0x0600
-extern NTKERNELAPI const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
+extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
 #endif
 
 _Function_class_(RTL_HEAP_COMMIT_ROUTINE)

diff --git a/reactos/include/xdk/wdm.template.h b/reactos/include/xdk/wdm.template.h
index 4d9e8f1..e525303 100644 (file)
--- a/reactos/include/xdk/wdm.template.h
+++ b/reactos/include/xdk/wdm.template.h
@@ -152,9 +152,9 @@ extern "C" {
 #ifndef __STRINGIFY
 #define __STRINGIFY(_exp) #_exp
 #endif
-#define _Pragma_redifine_extname(_Name, _Target) _Pragma(__STRINGIFY(redefine_extname _Name _Target))
+#define _Pragma_redefine_extname(_Name, _Target) _Pragma(__STRINGIFY(redefine_extname _Name _Target))
 #define __CREATE_NTOS_DATA_IMPORT_ALIAS(_Name) \
-    _Pragma_redifine_extname(_Name,__IMPORTNAME(_Name))
+    _Pragma_redefine_extname(_Name,__IMPORTNAME(_Name))
 #endif
 
 #if defined(_WIN64)