[ros-diffs] [hpoussin] 45994: [freeldr] Add SCSIPORT category to debug messages Add missing PELOADER entry + fix one debug message

Author: hpoussin
Date: Sun Mar  7 21:12:28 2010
New Revision: 45994

URL: http://svn.reactos.org/svn/reactos?rev=45994&view=rev
Log:
[freeldr] Add SCSIPORT category to debug messages
Add missing PELOADER entry + fix one debug message

Modified:
    trunk/reactos/boot/freeldr/freeldr/debug.c
    trunk/reactos/boot/freeldr/freeldr/include/debug.h
    trunk/reactos/boot/freeldr/freeldr/windows/peloader.c

Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Mar  7 21:12:28 2010
@@ -173,6 +173,12 @@
 	case DPRINT_HWDETECT:
 	    DbgPrint("HWDETECT: ");
 		break;
+	case DPRINT_PELOADER:
+	    DbgPrint("PELOADER: ");
+		break;
+	case DPRINT_SCSIPORT:
+	    DbgPrint("SCSIPORT: ");
+		break;
 	default:
 	    DbgPrint("UNKNOWN: ");
 		break;
@@ -192,6 +198,12 @@
 	if (!(Mask & DebugPrintMask))
 	{
 		return;
+	}
+
+	// Disable file/line for scsiport messages
+	if (Mask & DPRINT_SCSIPORT)
+	{
+		DebugStartOfLine = FALSE;
 	}
 
 	// Print the header if we have started a new line

Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Sun Mar  7 21:12:28
2010
@@ -35,6 +35,7 @@
 #define DPRINT_HWDETECT     0x00000400  // OR this with DebugPrintMask to enable hardware
detection messages
 #define DPRINT_WINDOWS      0x00000800  // OR this with DebugPrintMask to enable messages
from Windows loader
 #define DPRINT_PELOADER     0x00001000  // OR this with DebugPrintMask to enable messages
from PE images loader
+#define DPRINT_SCSIPORT     0x00002000  // OR this with DebugPrintMask to enable messages
from SCSI miniport
 
 extern char* g_file;
 extern int g_line;

Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Sun Mar  7 21:12:28
2010
@@ -56,7 +56,7 @@
 	PLDR_DATA_TABLE_ENTRY DataTableEntry;
 	LIST_ENTRY *ModuleEntry;
 
-	DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: DllName %X, LoadedEntry:
%X\n",
+	DPRINTM(DPRINT_PELOADER, "WinLdrCheckForLoadedDll: DllName %s, LoadedEntry:
%X\n",
 		DllName, LoadedEntry);
 
 	/* Just go through each entry in the LoadOrderList and compare loaded module's