Big merge: thanks alex and greatlord. Not a complete merge but most

[reactos.git] / reactos / boot / freeldr / freeldr / reactos / reactos.c

diff --git a/reactos/boot/freeldr/freeldr/reactos/reactos.c b/reactos/boot/freeldr/freeldr/reactos/reactos.c
index f76d8d2..8db5c05 100644 (file)
--- a/reactos/boot/freeldr/freeldr/reactos/reactos.c
+++ b/reactos/boot/freeldr/freeldr/reactos/reactos.c
@@ -820,7 +820,11 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
        /*
         * Import the loaded system hive
         */
-       RegImportBinaryHive((PCHAR)Base, Size);
+       if( !RegImportBinaryHive((PCHAR)Base, Size) )
+       {
+           printf("Could not load system hive\n");
+           return;
+       }
 
        /*
         * Initialize the 'CurrentControlSet' link
@@ -870,7 +874,8 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 
 #undef DbgPrint
 ULONG
-DbgPrint(const char *Format, ...)
+__cdecl
+DbgPrint(PCCH Format, ...)
 {
        va_list ap;
        CHAR Buffer[512];