[NTOS] Add some DPRINTs in IopLoadServiceModule() and IopOpenRegistryKeyEx() to inves...
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Fri, 2 Jun 2017 15:49:12 +0000 (15:49 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Wed, 24 Oct 2018 22:40:03 +0000 (00:40 +0200)
svn path=/branches/setup_improvements/; revision=74748

ntoskrnl/io/iomgr/driver.c

index f9de2e5..fc133b0 100644 (file)
@@ -322,6 +322,7 @@ IopLoadServiceModule(
     if (ExpInTextModeSetup)
     {
         /* We have no registry, but luckily we know where all the drivers are */
+        DPRINT1("IopLoadServiceModule(%wZ, 0x%p) called in ExpInTextModeSetup mode...\n", ServiceName, ModuleObject);
 
         /* ServiceStart < 4 is all that matters */
         ServiceStart = 0;
@@ -1044,8 +1045,13 @@ IopInitializeBootDrivers(VOID)
                                           NULL,
                                           &BootEntry->RegistryPath,
                                           KEY_READ);
+            DPRINT1("IopOpenRegistryKeyEx(%wZ) returned 0x%08lx\n", &BootEntry->RegistryPath, Status);
+#if 0
+            if (NT_SUCCESS(Status))
+#else // Hack still needed...
             if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */
                 ((KeLoaderBlock->SetupLdrBlock) && ((KeyHandle = (PVOID)1)))) // yes, it's an assignment!
+#endif
             {
                 /* Save the handle */
                 DriverInfo->ServiceHandle = KeyHandle;
@@ -1122,7 +1128,7 @@ IopInitializeSystemDrivers(VOID)
     PUNICODE_STRING *DriverList, *SavedList;
 
     /* No system drivers on the boot cd */
-    if (KeLoaderBlock->SetupLdrBlock) return;
+    if (KeLoaderBlock->SetupLdrBlock) return; // ExpInTextModeSetup
 
     /* Get the driver list */
     SavedList = DriverList = CmGetSystemDriverList();