[INCLUDE]

- Add missing __stosq intrinsic
- Move architecture specific stuff to a later location in wdm.h to make sure we have ASSERT macros already
- Add missing extern "C" to some NDK header
- Remove duplicate sal definitions

svn path=/trunk/; revision=58598

reactos/include/crt/msc/intrin.h

@@ -117,6 +117,8 @@ void __movsd(unsigned long * Destination, unsigned long const * Source, size_t C
 #pragma intrinsic(__movsd)
 #endif
 #ifdef _M_AMD64
+void __stosq(unsigned __int64 * Dest, unsigned __int64 Data, size_t Count);
+#pragma intrinsic(__stosq)
 void __movsq(unsigned __int64 * Destination, unsigned __int64 const * Source, size_t Count);
 #pragma intrinsic(__movsq)
 #endif

reactos/include/ndk/mmtypes.h

@@ -66,12 +66,12 @@ Author:
 //
 // Flags for ProcessExecutionOptions
 //
-#define MEM_EXECUTE_OPTION_DISABLE                          0x1 
+#define MEM_EXECUTE_OPTION_DISABLE                          0x1
 #define MEM_EXECUTE_OPTION_ENABLE                           0x2
 #define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION          0x4
 #define MEM_EXECUTE_OPTION_PERMANENT                        0x8
 #define MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE          0x10
-#define MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE            0x20 
+#define MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE            0x20
 #define MEM_EXECUTE_OPTION_VALID_FLAGS                      0x3F
 
 #ifndef NTOS_MODE_USER
@@ -989,6 +989,10 @@ typedef struct _DRIVER_SPECIFIED_VERIFIER_THUNKS
     ULONG NumberOfThunks;
 } DRIVER_SPECIFIED_VERIFIER_THUNKS, *PDRIVER_SPECIFIED_VERIFIER_THUNKS;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // Default heap size values.  For user mode, these values are copied to a new
 // process's PEB by the kernel in MmCreatePeb.  In kernel mode, RtlCreateHeap
@@ -1007,6 +1011,10 @@ extern SIZE_T MmHeapDeCommitFreeBlockThreshold;
 //
 extern POBJECT_TYPE NTSYSAPI MmSectionObjectType;
 
+#ifdef __cplusplus
+}; // extern "C"
+#endif
+
 #endif // !NTOS_MODE_USER
 
 #endif // _MMTYPES_H

reactos/include/ndk/obfuncs.h

@@ -26,6 +26,10 @@ Author:
 #include <pstypes.h>
 #include <obtypes.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef NTOS_MODE_USER
 
 //
@@ -576,4 +580,8 @@ ZwWaitForSingleObject(
 
 #endif /* NTOS_MODE_USER */
 
+#ifdef __cplusplus
+}; // extern "C"
+#endif
+
 #endif

reactos/include/ndk/rtlfuncs.h

@@ -3259,6 +3259,7 @@ DbgPrompt(
     _In_ ULONG MaximumResponseLength
 );
 
+#undef DbgBreakPoint
 VOID
 NTAPI
 DbgBreakPoint(

reactos/include/psdk/sal.h

@@ -1090,7 +1090,6 @@ __PRIMOP(int, _In_function_class_(__In_impl_ char*);)
 
 #define _In_function_class_(x) _In_function_class_(#x)
 #define _Called_from_function_class_(x) _In_function_class_(x)
-#define _Function_class_(x) _SA_annotes1(SAL_functionClassNew, #x)
 
 #else // ] [ !_PREFAST_
 

reactos/include/psdk/sal_old.h

@@ -53,7 +53,6 @@
 #define __inner_fallthrough_dec __inline __nothrow void __FallThrough() {}
 #define __inner_override __declspec("__override")
 #define __inner_success(expr) __declspec("SAL_success("SPECSTRINGIZE(expr)")")
-#define __inner_typefix(ctype) __declspec("SAL_typefix("SPECSTRINGIZE(ctype)")")
 #define __maybenull __declspec("SAL_maybenull")
 #define __maybereadonly __declspec("SAL_maybereadonly")
 #define __maybevalid __declspec("SAL_maybevalid")

reactos/include/xdk/kefuncs.h

@@ -2,6 +2,21 @@
  *                              Kernel Functions                              *
  ******************************************************************************/
 $if (_WDMDDK_)
+#if defined(_M_IX86)
+$include(x86/ke.h)
+#elif defined(_M_AMD64)
+$include(amd64/ke.h)
+#elif defined(_M_IA64)
+$include(ia64/ke.h)
+#elif defined(_M_PPC)
+$include(ppc/ke.h)
+#elif defined(_M_MIPS)
+$include(mips/ke.h)
+#elif defined(_M_ARM)
+$include(arm/ke.h)
+#else
+#error Unknown Architecture
+#endif
 
 NTKERNELAPI
 VOID

reactos/include/xdk/ketypes.h

@@ -1237,21 +1237,3 @@ typedef struct _KQUEUE {
 
 $endif (_NTIFS_)
 
-$if (_WDMDDK_)
-#if defined(_M_IX86)
-$include(x86/ke.h)
-#elif defined(_M_AMD64)
-$include(amd64/ke.h)
-#elif defined(_M_IA64)
-$include(ia64/ke.h)
-#elif defined(_M_PPC)
-$include(ppc/ke.h)
-#elif defined(_M_MIPS)
-$include(mips/ke.h)
-#elif defined(_M_ARM)
-$include(arm/ke.h)
-#else
-#error Unknown Architecture
-#endif
-$endif (_WDMDDK_)
-