[ros-diffs] [ion] 23486: - mangledDDK had no idea what a const char is, now it does. - mangledDDK had wrong prototypes of DbgPrint/Ex. - PSEH too. - Fixed ntoskrnl headers to build with Windows 2003 header definitions. Make handle.c force usage of Windows 2000 header definitions, because the handle code is Win2K. - mangledDDK had wrong KeNumberProcessors definition.

[ion at svn.reactos.org]

Author: ion
Date: Sat Aug  5 20:49:07 2006
New Revision: 23486

URL: http://svn.reactos.org/svn/reactos?rev=23486&view=rev
Log:
- mangledDDK had no idea what a const char is, now it does.
- mangledDDK had wrong prototypes of DbgPrint/Ex.
- PSEH too.
- Fixed ntoskrnl headers to build with Windows 2003 header definitions. Make handle.c force usage of Windows 2000 header definitions, because the handle code is Win2K.
- mangledDDK had wrong KeNumberProcessors definition.

Modified:
    branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c
    branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h
    branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/include/psdk/ntdef.h
    trunk/reactos/include/reactos/libs/pseh/framebased.h

Modified: branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c
URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c?rev=23486&r1=23485&r2=23486&view=diff
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/ex/handle.c Sat Aug  5 20:49:07 2006
@@ -17,6 +17,8 @@
  */
 
 /* INCLUDES *****************************************************************/
+
+#define NTDDI_VERSION NTDDI_WIN2K
 
 #include <ntoskrnl.h>
 

Modified: branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h
URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h?rev=23486&r1=23485&r2=23486&view=diff
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/include/internal/ex.h Sat Aug  5 20:49:07 2006
@@ -261,7 +261,10 @@
     return ExSystemExceptionFilter();
 }
 
+
 /* RUNDOWN *******************************************************************/
+
+#if (NTDDI_VERSION >= NTDDI_WINXP)
 
 #ifdef _WIN64
 #define ExpChangeRundown(x, y, z) InterlockedCompareExchange64((PLONGLONG)x, y, z)
@@ -436,6 +439,7 @@
     /* Mark the counter as active */
     ExpSetRundown(&RunRef->Count, EX_RUNDOWN_ACTIVE);
 }
+#endif
 
 /* PUSHLOCKS *****************************************************************/
 

Modified: branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h
URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h?rev=23486&r1=23485&r2=23486&view=diff
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/include/ntoskrnl.h Sat Aug  5 20:49:07 2006
@@ -7,6 +7,11 @@
  */
 
 /* INCLUDES ******************************************************************/
+
+/* Temporary hack */
+#ifndef NTDDI_VERSION
+#define NTDDI_VERSION NTDDI_WS03
+#endif
 
 /* We are the Kernel */
 #define NTKERNELAPI

Modified: trunk/reactos/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=23486&r1=23485&r2=23486&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddk.h (original)
+++ trunk/reactos/include/ddk/winddk.h Sat Aug  5 20:49:07 2006
@@ -396,7 +396,15 @@
 extern POBJECT_TYPE NTSYSAPI MmSectionObjectType;
 extern POBJECT_TYPE NTSYSAPI SeTokenObjectType;
 
-extern NTOSAPI CCHAR KeNumberProcessors;
+#if (NTDDI_VERSION >= NTDDI_LONGHORN)
+extern volatile CCHAR NTSYSAPI KeNumberProcessors;
+#else
+#if (NTDDI_VERSION >= NTDDI_WINXP)
+extern CCHAR NTSYSAPI KeNumberProcessors;
+#else
+extern PCCHAR KeNumberProcessors;
+#endif
+#endif
 
 #define PROCESSOR_FEATURE_MAX 64
 #define MAX_WOW64_SHARED_ENTRIES 16
@@ -10442,7 +10450,7 @@
 ULONG
 __cdecl
 DbgPrint(
-  IN PCH  Format,
+  IN PCCH  Format,
   IN ...);
 
 ULONG
@@ -10450,7 +10458,7 @@
 DbgPrintEx(
   IN ULONG  ComponentId,
   IN ULONG  Level,
-  IN PCH  Format,
+  IN PCCH  Format,
   IN ...);
 
 NTOSAPI

Modified: trunk/reactos/include/psdk/ntdef.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdef.h?rev=23486&r1=23485&r2=23486&view=diff
==============================================================================
--- trunk/reactos/include/psdk/ntdef.h (original)
+++ trunk/reactos/include/psdk/ntdef.h Sat Aug  5 20:49:07 2006
@@ -63,6 +63,7 @@
 typedef STRING CANSI_STRING;
 typedef PSTRING PCANSI_STRING;
 typedef LARGE_INTEGER PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS;
+typedef CONST CHAR *LPCCH, *PCCH;
 typedef enum _SECTION_INHERIT {
   ViewShare = 1,
   ViewUnmap = 2

Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/framebased.h?rev=23486&r1=23485&r2=23486&view=diff
==============================================================================
--- trunk/reactos/include/reactos/libs/pseh/framebased.h (original)
+++ trunk/reactos/include/reactos/libs/pseh/framebased.h Sat Aug  5 20:49:07 2006
@@ -45,7 +45,7 @@
 # define _SEHSetJmp setjmp
 # define _SEHJmpBuf_t jmp_buf
 #endif
-unsigned long DbgPrint(char * Format,...);
+unsigned long DbgPrint(const char * Format,...);
 typedef struct __SEHFrame
 {
  _SEHPortableFrame_t SEH_Header;