[ros-diffs] [ion] 25746: - Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*. - Fix invalid inbv called during shutdown. - Don't call HalResetDisplay during VidReset since it's not yet implemented and this will crash the system. - Temporarily disable bootvid in LiveCD until it works, and enable debugging output so LiveCDs can output some debugging information in case of bugs. * LiveCD won't actually work because for some time now, ReactOS needs to be "installed" because of

Author: ion
Date: Wed Feb  7 09:08:24 2007
New Revision: 25746

URL: http://svn.reactos.org/svn/reactos?rev=25746&view=rev
Log:
- Fix IopApplyReactOSCdRomHack to handle LiveCD case properly. LiveCD should now boot*.
- Fix invalid inbv called during shutdown.
- Don't call HalResetDisplay during VidReset since it's not yet implemented and
this will crash the system.
- Temporarily disable bootvid in LiveCD until it works, and enable debugging output so
LiveCDs can output some debugging information in case of bugs.
* LiveCD won't actually work because for some time now, ReactOS needs to be
"installed" because of missing PnP entries. LiveCD Boot will cause a message box
saying "EnableUserModePnPManager" failed. hpoussin?

Modified:
    trunk/reactos/boot/bootdata/livecd.ini
    trunk/reactos/drivers/base/bootvid/bootvid.c
    trunk/reactos/ntoskrnl/KrnlFun.c
    trunk/reactos/ntoskrnl/ex/power.c
    trunk/reactos/ntoskrnl/io/iomgr/arcname.c
    trunk/reactos/ntoskrnl/mm/mminit.c

Modified: trunk/reactos/boot/bootdata/livecd.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.ini?r…
==============================================================================
--- trunk/reactos/boot/bootdata/livecd.ini (original)
+++ trunk/reactos/boot/bootdata/livecd.ini Wed Feb  7 09:08:24 2007
@@ -25,4 +25,4 @@
 [ReactOS]
 BootType=ReactOS
 SystemPath=LiveCD
-Options=
+Options=/DEBUGPORT=COM1 /NOGUIBOOT

Modified: trunk/reactos/drivers/base/bootvid/bootvid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv…
==============================================================================
--- trunk/reactos/drivers/base/bootvid/bootvid.c (original)
+++ trunk/reactos/drivers/base/bootvid/bootvid.c Wed Feb  7 09:08:24 2007
@@ -463,7 +463,7 @@
     curr_y = 0;
 
     /* Clear the screen with HAL if we were asked to */
-    if (HalReset) HalResetDisplay();
+    //if (HalReset) HalResetDisplay();
 
     /* Re-initialize the VGA Display */
     VgaInterpretCmdStream(AT_Initialization);

Modified: trunk/reactos/ntoskrnl/KrnlFun.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=257…
==============================================================================
--- trunk/reactos/ntoskrnl/KrnlFun.c (original)
+++ trunk/reactos/ntoskrnl/KrnlFun.c Wed Feb  7 09:08:24 2007
@@ -15,9 +15,7 @@
 // Global:
 //  - TODO: Complete the list of bufxies
 //  - Fix DPCs interrupting code at DISPATCH_LEVEL
-//  - Fix process reference count leak.
 //  - Fix atapi.sys or serial.sys loading one more time at each boot.
-//  - Fix LiveCD.
 //
 ///////////////////////////////////////////////////////////////////////////////
 

Modified: trunk/reactos/ntoskrnl/ex/power.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/power.c?rev=25…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/power.c (original)
+++ trunk/reactos/ntoskrnl/ex/power.c Wed Feb  7 09:08:24 2007
@@ -150,7 +150,7 @@
         InbvSetTextColor(15);
         InbvInstallDisplayStringFilter(NULL);
         InbvEnableDisplayString(TRUE);
-        InbvSetScrollRegion(0, 0, 639, 479);
+        //InbvSetScrollRegion(0, 0, 639, 479);
      }
 
    if (Action == ShutdownNoReboot)

Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Wed Feb  7 09:08:24 2007
@@ -86,17 +86,20 @@
             RtlFreeUnicodeString(&DeviceName);
         }
 
-        /* Build the name */
-        sprintf(p, "cdrom(%lu)", DeviceNumber);
-
-        /* Adjust original command line */
-        q = strchr(p, ')');
-        if (q)
+        if (!(strstr(KeLoaderBlock->LoadOptions, "MININT")))
         {
-            q++;
-            strcpy(Buffer, q);
+            /* Build the name */
             sprintf(p, "cdrom(%lu)", DeviceNumber);
-            strcat(p, Buffer);
+
+            /* Adjust original command line */
+            q = strchr(p, ')');
+            if (q)
+            {
+                q++;
+                strcpy(Buffer, q);
+                sprintf(p, "cdrom(%lu)", DeviceNumber);
+                strcat(p, Buffer);
+            }
         }
     }
 

Modified: trunk/reactos/ntoskrnl/mm/mminit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mminit.c (original)
+++ trunk/reactos/ntoskrnl/mm/mminit.c Wed Feb  7 09:08:24 2007
@@ -480,7 +480,7 @@
         /*
         * Initialise the modified page writer.
         */
-        MmInitMpwThread();
+        if (!strstr(LoaderBlock->LoadOptions, "MININT")) MmInitMpwThread();
 
         /* Initialize the balance set manager */
         MmInitBsmThread();