[DDK/XDK]

Merge some changes to wdm.h back to xdk

svn path=/trunk/; revision=52080

diff --git a/reactos/include/xdk/exfuncs.h b/reactos/include/xdk/exfuncs.h
index 433909c..4c3dd7d 100644 (file)
--- a/reactos/include/xdk/exfuncs.h
+++ b/reactos/include/xdk/exfuncs.h
@@ -131,14 +131,14 @@ ExInterlockedFlushSList(
 #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_)
 
 NTKERNELAPI
-PSINGLE_LIST_ENTRY 
+PSINGLE_LIST_ENTRY
 FASTCALL
 ExInterlockedPopEntrySList(
   IN PSLIST_HEADER ListHead,
   IN PKSPIN_LOCK Lock);
 
 NTKERNELAPI
-PSINGLE_LIST_ENTRY 
+PSINGLE_LIST_ENTRY
 FASTCALL
 ExInterlockedPushEntrySList(
   IN PSLIST_HEADER ListHead,

diff --git a/reactos/include/xdk/kefuncs.h b/reactos/include/xdk/kefuncs.h
index a61f286..7574f4c 100644 (file)
--- a/reactos/include/xdk/kefuncs.h
+++ b/reactos/include/xdk/kefuncs.h
@@ -161,7 +161,7 @@ KeQuerySystemTime(
   OUT PLARGE_INTEGER CurrentTime);
 #endif /* !_M_AMD64 */
 
-#if !defined(_X86_)
+#if !defined(_X86_) && !defined(_M_ARM)
 NTKERNELAPI
 KIRQL
 NTAPI

diff --git a/reactos/include/xdk/mmfuncs.h b/reactos/include/xdk/mmfuncs.h
index f3a0cea..02902e3 100644 (file)
--- a/reactos/include/xdk/mmfuncs.h
+++ b/reactos/include/xdk/mmfuncs.h
@@ -118,6 +118,7 @@ $if (_WDMDDK_)
   ((PVOID) ((PCHAR) ((_Mdl)->StartVa) + (_Mdl)->ByteOffset))
 
 #define MmGetProcedureAddress(Address) (Address)
+#define MmLockPagableCodeSection(Address) MmLockPagableDataSection(Address)
 
 /* PVOID MmGetSystemAddressForMdl(
  *     IN PMDL Mdl);

diff --git a/reactos/include/xdk/wdm.template.h b/reactos/include/xdk/wdm.template.h
index 19fc2f2..94e21e6 100644 (file)
--- a/reactos/include/xdk/wdm.template.h
+++ b/reactos/include/xdk/wdm.template.h
@@ -170,7 +170,7 @@ typedef struct _DMA_ADAPTER *PADAPTER_OBJECT;
 #elif defined(_WDM_INCLUDED_)
 typedef struct _DMA_ADAPTER *PADAPTER_OBJECT;
 #else
-typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; 
+typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT;
 #endif
 
 #ifndef DEFINE_GUIDEX
@@ -191,7 +191,7 @@ typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT;
 #ifdef __cplusplus
 inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2)
 {
-    return ( (*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && 
+    return ( (*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) &&
              (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1)) );
 }
 #else