[HEADERS]

[reactos.git] / reactos / drivers / storage / ide / uniata / ntddk_ex.h

diff --git a/reactos/drivers/storage/ide/uniata/ntddk_ex.h b/reactos/drivers/storage/ide/uniata/ntddk_ex.h
index c54da9a..e13ca48 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/ntddk_ex.h
+++ b/reactos/drivers/storage/ide/uniata/ntddk_ex.h
@@ -1,16 +1,22 @@
 #ifndef __NTDDK_EX__H__
 #define __NTDDK_EX__H__
 
+#ifdef ASSERT
 #undef ASSERT
-#define ASSERT
+#define ASSERT(x) ((void)0)
+// #define ASSERT(x) if (!(x)) { RtlAssert("#x",__FILE__,__LINE__, ""); }
+#endif
 
-typedef enum _SYSTEM_INFORMATION_CLASS
-{
+#ifndef FILE_CHARACTERISTIC_PNP_DEVICE  // DDK 2003
+#define FILE_CHARACTERISTIC_PNP_DEVICE  0x00000800
+#endif // !FILE_CHARACTERISTIC_PNP_DEVICE
+
+typedef enum _SYSTEM_INFORMATION_CLASS {
     SystemBasicInformation,
     SystemProcessorInformation,
     SystemPerformanceInformation,
     SystemTimeOfDayInformation,
-    SystemPathInformation, /// Obsolete: Use KUSER_SHARED_DATA
+    SystemPathInformation,
     SystemProcessInformation,
     SystemCallCountInformation,
     SystemDeviceInformation,
@@ -36,9 +42,15 @@ typedef enum _SYSTEM_INFORMATION_CLASS
     SystemUnloadGdiDriverInformation,
     SystemTimeAdjustmentInformation,
     SystemSummaryMemoryInformation,
+#ifndef __REACTOS__
+    SystemNextEventIdInformation,
+    SystemEventIdsInformation,
+    SystemCrashDumpInformation,
+#else
     SystemMirrorMemoryInformation,
     SystemPerformanceTraceInformation,
     SystemObsolete0,
+#endif
     SystemExceptionInformation,
     SystemCrashDumpStateInformation,
     SystemKernelDebuggerInformation,
@@ -48,10 +60,17 @@ typedef enum _SYSTEM_INFORMATION_CLASS
     SystemPrioritySeperation,
     SystemPlugPlayBusInformation,
     SystemDockInformation,
+#ifdef __REACTOS__
     SystemPowerInformationNative,
+#elif defined IRP_MN_START_DEVICE
+    SystemPowerInformationInfo,
+#else
+    SystemPowerInformation,
+#endif
     SystemProcessorSpeedInformation,
     SystemCurrentTimeZoneInformation,
     SystemLookasideInformation,
+#ifdef __REACTOS__
     SystemTimeSlipNotification,
     SystemSessionCreate,
     SystemSessionDetach,
@@ -105,8 +124,10 @@ typedef enum _SYSTEM_INFORMATION_CLASS
     SystemPrefetchPathInformation,
     SystemVerifierFaultsInformation,
     MaxSystemInfoClass,
+#endif //__REACTOS__
 } SYSTEM_INFORMATION_CLASS;
 
+
 NTSYSAPI
 NTSTATUS
 NTAPI
@@ -161,7 +182,9 @@ typedef struct _SYSTEM_MODULE_INFORMATION
 } SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION;
 
 typedef unsigned short  WORD;
-//typedef unsigned int    BOOL;
+#ifndef __REACTOS__
+typedef unsigned int    BOOL;
+#endif //__REACTOS__
 typedef unsigned long   DWORD;
 typedef unsigned char   BYTE;
 
@@ -494,7 +517,7 @@ typedef struct _KTHREAD_HDR {
 */
 } KTHREAD_HDR, *PKTHREAD_HDR;
 
-#ifdef __REACTOS__
+#ifndef __REACTOS__
 typedef struct _IMAGE_DOS_HEADER {      // DOS .EXE header
     WORD   e_magic;                     // Magic number
     WORD   e_cblp;                      // Bytes on last page of file
@@ -604,12 +627,14 @@ typedef struct _IMAGE_EXPORT_DIRECTORY {
 
 NTHALAPI
 VOID
+NTAPI
 HalDisplayString (
     PUCHAR String
     );
 
 NTHALAPI
 VOID
+NTAPI
 HalQueryDisplayParameters (
     OUT PULONG WidthInCharacters,
     OUT PULONG HeightInLines,
@@ -619,6 +644,7 @@ HalQueryDisplayParameters (
 
 NTHALAPI
 VOID
+NTAPI
 HalSetDisplayParameters (
     IN ULONG CursorColumn,
     IN ULONG CursorRow