[hpoussin] 31101: Merge 28311. WinLdr is now merged up to r28364 (included)

Author: hpoussin
Date: Sun Dec  9 15:58:21 2007
New Revision: 31101

URL: http://svn.reactos.org/svn/reactos?rev=31101&view=rev
Log:
Merge 28311. WinLdr is now merged up to r28364 (included)

Modified:
    branches/winldr/reactos/setupldr.c

Modified: branches/winldr/reactos/setupldr.c
URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/setupldr.c?rev=31...
==============================================================================
--- branches/winldr/reactos/setupldr.c (original)
+++ branches/winldr/reactos/setupldr.c Sun Dec  9 15:58:21 2007
@@ -282,7 +282,7 @@
   ULONG_PTR Base;
   ULONG Size;
   const char *SourcePath;
-  const char *LoadOptions;
+  const char *LoadOptions = "", *DbgLoadOptions = "";
   UINT i;
   char szKernelName[256];
   PCONFIGURATION_COMPONENT_DATA ConfigRoot;
@@ -384,8 +384,18 @@
       return;
     }

-  /* Get load options */
-  if (!InfFindFirstLine (InfHandle,
+#ifdef DBG
+  /* Get load options */  
+  if (InfFindFirstLine (InfHandle,
+			"SetupData",
+			"DbgOsLoadOptions",
+			&InfContext))
+    {
+	if (!InfGetDataField (&InfContext, 1, &DbgLoadOptions))
+	    DbgLoadOptions = "";
+    }
+#endif
+  if (!strlen(DbgLoadOptions) && !InfFindFirstLine (InfHandle,
    		 "SetupData",
    		 "OsLoadOptions",
    		 &InfContext))
@@ -418,8 +428,8 @@

/* Set kernel command line */
   MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline));
-  strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "),
-         LoadOptions);
+  strcat(strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "),
+		LoadOptions), DbgLoadOptions);

/* Setup the boot path and kernel path */
     strcpy(szBootPath, SourcePath);