[ros-diffs] [hbelusca] 74748: [NTOS]: Add some dprints in IopLoadServiceModule() and IopOpenRegistryKeyEx() to investigate why these 1st-stage text-mode hacks may, or are (respectively) still needed.

[hbelusca]

Author: hbelusca
Date: Fri Jun  2 15:49:12 2017
New Revision: 74748

URL: http://svn.reactos.org/svn/reactos?rev=74748&view=rev
Log:
[NTOS]: Add some dprints in IopLoadServiceModule() and IopOpenRegistryKeyEx() 
to investigate why these 1st-stage text-mode hacks may, or are (respectively) 
still needed.

Modified:
    branches/setup_improvements/ntoskrnl/io/iomgr/driver.c

Modified: branches/setup_improvements/ntoskrnl/io/iomgr/driver.c
URL: 
http://svn.reactos.org/svn/reactos/branches/setup_improvements/ntoskrnl/io/iomgr/driver.c?rev=74748&r1=74747&r2=74748&view=diff
==============================================================================
--- branches/setup_improvements/ntoskrnl/io/iomgr/driver.c      [iso-8859-1] 
(original)
+++ branches/setup_improvements/ntoskrnl/io/iomgr/driver.c      [iso-8859-1] 
Fri Jun  2 15:49:12 2017
@@ -322,6 +322,7 @@
     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;
@@ -1127,8 +1128,13 @@
                                           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;
@@ -1205,7 +1211,7 @@
     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();