[ros-diffs] [ion] 24620: - Fix some EFI prototypes and exports. - Add BOOT_ENTRY definition. - Fix build breakage from earlier commit.

[ion at svn.reactos.org]

Author: ion
Date: Mon Oct 23 09:49:07 2006
New Revision: 24620

URL: http://svn.reactos.org/svn/reactos?rev=24620&view=rev
Log:
- Fix some EFI prototypes and exports.
- Add BOOT_ENTRY definition.
- Fix build breakage from earlier commit.

Modified:
    trunk/reactos/include/ndk/iofuncs.h
    trunk/reactos/include/ndk/iotypes.h
    trunk/reactos/include/ndk/umfuncs.h
    trunk/reactos/ntoskrnl/ex/efi.c
    trunk/reactos/ntoskrnl/ntoskrnl.def

Modified: trunk/reactos/include/ndk/iofuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iofuncs.h?rev=24620&r1=24619&r2=24620&view=diff
==============================================================================
--- trunk/reactos/include/ndk/iofuncs.h (original)
+++ trunk/reactos/include/ndk/iofuncs.h Mon Oct 23 09:49:07 2006
@@ -32,8 +32,8 @@
 NTSTATUS
 NTAPI
 NtAddBootEntry(
-    IN PUNICODE_STRING EntryName,
-    IN PUNICODE_STRING EntryValue
+    IN PBOOT_ENTRY BootEntry,
+    IN ULONG Id
 );
 
 NTSYSCALLAPI
@@ -109,8 +109,7 @@
 NTSTATUS
 NTAPI
 NtDeleteBootEntry(
-    IN PUNICODE_STRING EntryName,
-    IN PUNICODE_STRING EntryValue
+    IN ULONG Id
 );
 
 NTSYSCALLAPI

Modified: trunk/reactos/include/ndk/iotypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=24620&r1=24619&r2=24620&view=diff
==============================================================================
--- trunk/reactos/include/ndk/iotypes.h (original)
+++ trunk/reactos/include/ndk/iotypes.h Mon Oct 23 09:49:07 2006
@@ -1102,6 +1102,21 @@
 } BOOT_OPTIONS, *PBOOT_OPTIONS;
 
 //
+// Firmware Boot Entry
+//
+typedef struct _BOOT_ENTRY
+{
+    ULONG Version;
+    ULONG Length;
+    ULONG Id;
+    ULONG Attributes;
+    ULONG FriendlyNameOffset;
+    ULONG BootFilePathOffset;
+    ULONG OsOptionsLength;
+    CHAR OsOptions[1];
+} BOOT_ENTRY, *PBOOT_ENTRY;
+
+//
 // APC Callback for NtCreateFile
 //
 typedef VOID

Modified: trunk/reactos/include/ndk/umfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=24620&r1=24619&r2=24620&view=diff
==============================================================================
--- trunk/reactos/include/ndk/umfuncs.h (original)
+++ trunk/reactos/include/ndk/umfuncs.h Mon Oct 23 09:49:07 2006
@@ -168,7 +168,7 @@
 NTAPI
 DbgUiConvertStateChangeStructure(
     IN PDBGUI_WAIT_STATE_CHANGE WaitStateChange,
-    IN LPDEBUG_EVENT DebugEvent
+    IN PVOID DebugEvent
 );
 
 VOID

Modified: trunk/reactos/ntoskrnl/ex/efi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/efi.c?rev=24620&r1=24619&r2=24620&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ex/efi.c (original)
+++ trunk/reactos/ntoskrnl/ex/efi.c Mon Oct 23 09:49:07 2006
@@ -16,8 +16,8 @@
 
 NTSTATUS
 NTAPI
-NtAddBootEntry(IN PUNICODE_STRING EntryName,
-               IN PUNICODE_STRING EntryValue)
+NtAddBootEntry(IN PBOOT_ENTRY Entry,
+               IN ULONG Id)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -25,8 +25,7 @@
 
 NTSTATUS
 NTAPI
-NtDeleteBootEntry(IN PUNICODE_STRING EntryName,
-                  IN PUNICODE_STRING EntryValue)
+NtDeleteBootEntry(IN ULONG Id)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;

Modified: trunk/reactos/ntoskrnl/ntoskrnl.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=24620&r1=24619&r2=24620&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl.def (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Oct 23 09:49:07 2006
@@ -1327,7 +1327,7 @@
 ZwCreateSection at 28
 ZwCreateSymbolicLinkObject at 16
 ZwCreateTimer at 16
-ZwDeleteBootEntry at 8
+ZwDeleteBootEntry at 4
 ZwDeleteFile at 4
 ZwDeleteKey at 4
 ZwDeleteValueKey at 8