Some more NDK fixes

Modified: trunk/reactos/include/napi/core.h
Modified: trunk/reactos/include/ndk/extypes.h
Modified: trunk/reactos/include/ndk/halfuncs.h
Modified: trunk/reactos/include/ndk/haltypes.h
Modified: trunk/reactos/include/ndk/zwfuncs.h
Modified: trunk/reactos/include/ndk/zwtypes.h
Modified: trunk/reactos/include/ntos/haltypes.h
Modified: trunk/reactos/ntoskrnl/ex/power.c
Modified: trunk/reactos/ntoskrnl/include/internal/mm.h

--- trunk/reactos/include/napi/core.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/napi/core.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -7,10 +7,6 @@

 #define MM_CORE_DUMP_HEADER_MAGIC         (0xdeafbead)
 #define MM_CORE_DUMP_HEADER_VERSION       (0x1)
 

-#define MM_CORE_DUMP_TYPE_NONE            (0x0)
-#define MM_CORE_DUMP_TYPE_MINIMAL         (0x1)
-#define MM_CORE_DUMP_TYPE_FULL            (0x2)
-

 typedef struct _MM_CORE_DUMP_HEADER
 {
   ULONG Magic;

--- trunk/reactos/include/ndk/extypes.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/ndk/extypes.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -18,6 +18,7 @@

 extern NTOSAPI POBJECT_TYPE ExTimerType;
 
 /* CONSTANTS *****************************************************************/

+#define INVALID_HANDLE_VALUE (HANDLE)-1

 
 /* ENUMERATIONS **************************************************************/
 
@@ -70,6 +71,12 @@

     ULONG AuditMask;
 } HANDLE_TABLE_ENTRY_INFO, *PHANDLE_TABLE_ENTRY_INFO;
 

+typedef struct _RUNDOWN_DESCRIPTOR 
+{
+    ULONG_PTR References;
+    KEVENT RundownEvent;
+} RUNDOWN_DESCRIPTOR, *PRUNDOWN_DESCRIPTOR;
+

 typedef struct _HANDLE_TABLE_ENTRY 
 {
     union 

--- trunk/reactos/include/ndk/halfuncs.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/ndk/halfuncs.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -114,7 +114,7 @@

 VOID
 STDCALL
 HalReturnToFirmware(

-    FIRMWARE_ENTRY Action

+    FIRMWARE_REENTRY Action

 );
 
 VOID

--- trunk/reactos/include/ndk/haltypes.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/ndk/haltypes.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -34,9 +34,13 @@

 /* ENUMERATIONS **************************************************************/
 typedef enum _FIRMWARE_ENTRY
 {

-    /*FIXME */
-    HalFixMe
-} FIRMWARE_ENTRY;

+  HalHaltRoutine,
+  HalPowerDownRoutine,
+  HalRestartRoutine,
+  HalRebootRoutine,
+  HalInteractiveModeRoutine,
+  HalMaximumRoutine
+} FIRMWARE_REENTRY, *PFIRMWARE_REENTRY;

 
 /* TYPES *********************************************************************/
 

--- trunk/reactos/include/ndk/zwfuncs.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/ndk/zwfuncs.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -1396,7 +1396,7 @@

 NTSTATUS
 STDCALL
 NtOpenSemaphore(

-    IN HANDLE SemaphoreHandle,

+    OUT PHANDLE SemaphoreHandle,

     IN ACCESS_MASK DesiredAcces,
     IN POBJECT_ATTRIBUTES ObjectAttributes
 );
@@ -1404,7 +1404,7 @@

 NTSTATUS
 STDCALL
 ZwOpenSemaphore(

-    IN HANDLE SemaphoreHandle,

+    OUT PHANDLE SemaphoreHandle,

     IN ACCESS_MASK DesiredAcces,
     IN POBJECT_ATTRIBUTES ObjectAttributes
 );
@@ -2945,13 +2945,13 @@

 NTSTATUS
 STDCALL
 NtShutdownSystem(

-    IN ULONG Action

+    IN SHUTDOWN_ACTION Action

 );
 
 NTSTATUS
 STDCALL
 ZwShutdownSystem(

-    IN ULONG Action

+    IN SHUTDOWN_ACTION Action

 );
 
 NTSTATUS

--- trunk/reactos/include/ndk/zwtypes.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/ndk/zwtypes.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -21,6 +21,13 @@

 
 /* ENUMERATIONS **************************************************************/
 

+typedef enum SHUTDOWN_ACTION_TAG 
+{
+    ShutdownNoReboot,
+    ShutdownReboot,
+    ShutdownPowerOff
+} SHUTDOWN_ACTION;
+

 typedef enum _PLUGPLAY_BUS_CLASS
 {
     SystemBus,
@@ -198,7 +205,7 @@

 typedef struct _MUTANT_BASIC_INFORMATION 
 {
     LONG CurrentCount;

-    BOOLEAN OwnedbyCalled;

+    BOOLEAN OwnedByCaller;

     BOOLEAN AbandonedState;
 } MUTANT_BASIC_INFORMATION, *PMUTANT_BASIC_INFORMATION;
 

--- trunk/reactos/include/ntos/haltypes.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/include/ntos/haltypes.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -24,8 +24,15 @@

 
 
 /* HalReturnToFirmware */

-#define FIRMWARE_HALT   1
-#define FIRMWARE_REBOOT 3

+typedef enum _FIRMWARE_ENTRY
+{
+  HalHaltRoutine,
+  HalPowerDownRoutine,
+  HalRestartRoutine,
+  HalRebootRoutine,
+  HalInteractiveModeRoutine,
+  HalMaximumRoutine
+} FIRMWARE_REENTRY, *PFIRMWARE_REENTRY;

 
 #ifndef __USE_W32API
 

--- trunk/reactos/ntoskrnl/ex/power.c	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/ntoskrnl/ex/power.c	2005-06-19 07:41:35 UTC (rev 16080)
@@ -96,11 +96,11 @@

      }
    else if (Action == ShutdownReboot)
      {

-        HalReturnToFirmware (FIRMWARE_REBOOT);

+        HalReturnToFirmware (HalRebootRoutine);

      }
    else
      {

-        HalReturnToFirmware (FIRMWARE_HALT);

+        HalReturnToFirmware (HalHaltRoutine);

      }
 }
 

--- trunk/reactos/ntoskrnl/include/internal/mm.h	2005-06-19 07:15:07 UTC (rev 16079)
+++ trunk/reactos/ntoskrnl/include/internal/mm.h	2005-06-19 07:41:35 UTC (rev 16080)
@@ -323,6 +323,10 @@

 
 #define MM_PHYSICAL_PAGE_MPW_PENDING     (0x8)
 

+#define MM_CORE_DUMP_TYPE_NONE            (0x0)
+#define MM_CORE_DUMP_TYPE_MINIMAL         (0x1)
+#define MM_CORE_DUMP_TYPE_FULL            (0x2)
+

 #define MM_PAGEOP_PAGEIN        (1)
 #define MM_PAGEOP_PAGEOUT       (2)
 #define MM_PAGEOP_PAGESYNCH     (3)