From bdc681e1917f5f044c503accf440a7cb057ab9d5 Mon Sep 17 00:00:00 2001 From: Alex Ionescu Date: Tue, 5 Jan 2016 05:12:01 +0000 Subject: [PATCH] [BOOTMGFW]: Implement the rtlcompat functions, so that Rtl string functions will actually work. [HIVEBCD]: Start filling out a minimalistic BCD Hive layout to try out the BCD parsing/conversion code in my WC. svn path=/trunk/; revision=70491 --- reactos/boot/bootdata/hivebcd.inf | 7 ++++++- reactos/boot/environ/app/bootmgr/rtlcompat.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/reactos/boot/bootdata/hivebcd.inf b/reactos/boot/bootdata/hivebcd.inf index 9de29e70cd6..8146e02c44b 100644 --- a/reactos/boot/bootdata/hivebcd.inf +++ b/reactos/boot/bootdata/hivebcd.inf @@ -6,6 +6,11 @@ Signature = "$ReactOS$" BCD,"BCD00000000\Description\Control","System",0x00010003,1 BCD,"BCD00000000\Description\Control","TreatAtSystem",0x00010003,1 BCD,"BCD00000000\Description\Control","KeyName",2,"BCD00000000" -BCD,"BCD00000000\Objects",,0x00000012 + +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Description","Type",0x00010003,0x10100002 + +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000002","Element",2,"\EFI\BOOT\BOOTIA32.EFI" +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000004","Element",2,"ReactOS Boot Manager" +BCD,"BCD00000000\Objects\{9dea862c-5cdd-4e70-acc1-f32b344d4795}\Elements\12000005","Element",2,"en-US" ; EOF diff --git a/reactos/boot/environ/app/bootmgr/rtlcompat.c b/reactos/boot/environ/app/bootmgr/rtlcompat.c index 25aee307644..84347603921 100644 --- a/reactos/boot/environ/app/bootmgr/rtlcompat.c +++ b/reactos/boot/environ/app/bootmgr/rtlcompat.c @@ -30,7 +30,8 @@ RtlpAllocateMemory ( _In_ ULONG Tag ) { - return NULL; + UNREFERENCED_PARAMETER(Tag); + return BlMmAllocateHeap(Bytes); } VOID @@ -40,7 +41,8 @@ RtlpFreeMemory ( _In_ ULONG Tag ) { - return; + UNREFERENCED_PARAMETER(Tag); + BlMmFreeHeap(Mem); } NTSTATUS @@ -64,7 +66,11 @@ RtlAssert ( IN PCHAR Message OPTIONAL ) { - + EfiPrintf(L"*** ASSERTION %s FAILED AT %d in %s (%s) ***\r \n", + FailedAssertion, + LineNumber, + FileName, + Message); } ULONG @@ -73,6 +79,7 @@ DbgPrint ( ... ) { + EfiPrintf(L"%s\r\n", Format); return 0; } -- 2.17.1