Author: fireball Date: Sat Aug 11 18:32:39 2007 New Revision: 28287
URL: http://svn.reactos.org/svn/reactos?rev=28287&view=rev Log: - Merge 26782, 26783, 26785, 26786 - Merge 26842, 26847, 26861, 26867 - Merge 26958
Modified: branches/winldr/arch/i386/hwacpi.c branches/winldr/arch/i386/hwapm.c branches/winldr/arch/i386/pcdisk.c branches/winldr/cache/blocklist.c branches/winldr/cache/cache.c branches/winldr/debug.c branches/winldr/disk/disk.c branches/winldr/disk/partition.c branches/winldr/drivemap.c branches/winldr/freeldr.c branches/winldr/fs/ext2.c branches/winldr/fs/fat.c branches/winldr/fs/fs.c branches/winldr/fs/fsrec.c branches/winldr/fs/iso.c branches/winldr/fs/ntfs.c branches/winldr/include/debug.h branches/winldr/inifile/inifile.c branches/winldr/inifile/parse.c branches/winldr/linuxboot.c branches/winldr/mm/meminit.c branches/winldr/mm/mm.c branches/winldr/reactos/binhive.c branches/winldr/reactos/reactos.c branches/winldr/reactos/registry.c branches/winldr/reactos/setupldr.c branches/winldr/ui/ui.c branches/winldr/windows/conversion.c branches/winldr/windows/peloader.c branches/winldr/windows/winldr.c branches/winldr/windows/wlmemory.c branches/winldr/windows/wlregistry.c
Modified: branches/winldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hwacpi.c?rev=28... ============================================================================== --- branches/winldr/arch/i386/hwacpi.c (original) +++ branches/winldr/arch/i386/hwacpi.c Sat Aug 11 18:32:39 2007 @@ -19,8 +19,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
BOOLEAN AcpiPresent = FALSE; @@ -28,49 +26,49 @@ static BOOLEAN FindAcpiBios(VOID) { - PUCHAR Ptr; + PUCHAR Ptr;
- /* Find the 'Root System Descriptor Table Pointer' */ - Ptr = (PUCHAR)0xE0000; - while ((ULONG)Ptr < 0x100000) + /* Find the 'Root System Descriptor Table Pointer' */ + Ptr = (PUCHAR)0xE0000; + while ((ULONG)Ptr < 0x100000) { - if (!memcmp(Ptr, "RSD PTR ", 8)) - { - DbgPrint((DPRINT_HWDETECT, "ACPI supported\n")); + if (!memcmp(Ptr, "RSD PTR ", 8)) + { + DbgPrint((DPRINT_HWDETECT, "ACPI supported\n"));
- return TRUE; - } + return TRUE; + }
- Ptr = (PUCHAR)((ULONG)Ptr + 0x10); + Ptr = (PUCHAR)((ULONG)Ptr + 0x10); }
- DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n")); + DbgPrint((DPRINT_HWDETECT, "ACPI not supported\n"));
- return FALSE; + return FALSE; }
VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - WCHAR Buffer[80]; - FRLDRHKEY BiosKey; - LONG Error; + WCHAR Buffer[80]; + FRLDRHKEY BiosKey; + LONG Error;
- if (FindAcpiBios()) + if (FindAcpiBios()) { - AcpiPresent = TRUE; - /* Create new bus key */ - swprintf(Buffer, - L"MultifunctionAdapter\%u", *BusNumber); - Error = RegCreateKey(SystemKey, - Buffer, - &BiosKey); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); - return; - } + AcpiPresent = TRUE; + /* Create new bus key */ + swprintf(Buffer, + L"MultifunctionAdapter\%u", *BusNumber); + Error = RegCreateKey(SystemKey, + Buffer, + &BiosKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + }
#if 0 /* Set 'Component Information' */ @@ -80,20 +78,20 @@ 0xFFFFFFFF); #endif
- /* Increment bus number */ - (*BusNumber)++; + /* Increment bus number */ + (*BusNumber)++;
- /* Set 'Identifier' value */ - Error = RegSetValue(BiosKey, - L"Identifier", - REG_SZ, - (PCHAR)L"ACPI BIOS", - 10 * sizeof(WCHAR)); - if (Error != ERROR_SUCCESS) - { - DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); - return; - } + /* Set 'Identifier' value */ + Error = RegSetValue(BiosKey, + L"Identifier", + REG_SZ, + (PCHAR)L"ACPI BIOS", + 10 * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + return; + }
} }
Modified: branches/winldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/hwapm.c?rev=282... ============================================================================== --- branches/winldr/arch/i386/hwapm.c (original) +++ branches/winldr/arch/i386/hwapm.c Sat Aug 11 18:32:39 2007 @@ -47,7 +47,7 @@ return TRUE; }
- printf("No APM BIOS found\n"); + DbgPrint((DPRINT_HWDETECT, "No APM BIOS found\n"));
return FALSE; }
Modified: branches/winldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/arch/i386/pcdisk.c?rev=28... ============================================================================== --- branches/winldr/arch/i386/pcdisk.c (original) +++ branches/winldr/arch/i386/pcdisk.c Sat Aug 11 18:32:39 2007 @@ -121,7 +121,7 @@ }
// If we get here then the read failed - DiskError("Disk Read Failed", RegsOut.b.ah); + DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah);
return FALSE; } @@ -244,7 +244,7 @@ // If we retried 3 times then fail if (RetryCount >= 3) { - DiskError("Disk Read Failed", RegsOut.b.ah); + DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah); return FALSE; }
Modified: branches/winldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/cache/blocklist.c?rev=282... ============================================================================== --- branches/winldr/cache/blocklist.c (original) +++ branches/winldr/cache/blocklist.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
// Returns a pointer to a CACHE_BLOCK structure
Modified: branches/winldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/cache/cache.c?rev=28287&a... ============================================================================== --- branches/winldr/cache/cache.c (original) +++ branches/winldr/cache/cache.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
///////////////////////////////////////////////////////////////////////////////////////
Modified: branches/winldr/debug.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/debug.c?rev=28287&r1=... ============================================================================== --- branches/winldr/debug.c (original) +++ branches/winldr/debug.c Sat Aug 11 18:32:39 2007 @@ -356,4 +356,10 @@ } }
+#else + +VOID DebugPrint(ULONG Mask, char *format, ...) +{ +} + #endif // defined DBG
Modified: branches/winldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/disk/disk.c?rev=28287&... ============================================================================== --- branches/winldr/disk/disk.c (original) +++ branches/winldr/disk/disk.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
#undef UNIMPLEMENTED
Modified: branches/winldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/disk/partition.c?rev=2828... ============================================================================== --- branches/winldr/disk/partition.c (original) +++ branches/winldr/disk/partition.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
BOOLEAN DiskGetActivePartitionEntry(ULONG DriveNumber,
Modified: branches/winldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/drivemap.c?rev=28287&... ============================================================================== --- branches/winldr/drivemap.c (original) +++ branches/winldr/drivemap.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
#ifdef __i386__
Modified: branches/winldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/freeldr.c?rev=28287&r... ============================================================================== --- branches/winldr/freeldr.c (original) +++ branches/winldr/freeldr.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
VOID BootMain(LPSTR CmdLine)
Modified: branches/winldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/ext2.c?rev=28287&r... ============================================================================== --- branches/winldr/fs/ext2.c (original) +++ branches/winldr/fs/ext2.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
GEOMETRY Ext2DiskGeometry; // Ext2 file system disk geometry
Modified: branches/winldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/fat.c?rev=28287&r1... ============================================================================== --- branches/winldr/fs/fat.c (original) +++ branches/winldr/fs/fat.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
ULONG BytesPerSector; /* Number of bytes per sector */
Modified: branches/winldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/fs.c?rev=28287&r1=... ============================================================================== --- branches/winldr/fs/fs.c (original) +++ branches/winldr/fs/fs.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
/////////////////////////////////////////////////////////////////////////////////////////////
Modified: branches/winldr/fs/fsrec.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/fsrec.c?rev=28287&... ============================================================================== --- branches/winldr/fs/fsrec.c (original) +++ branches/winldr/fs/fsrec.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
/////////////////////////////////////////////////////////////////////////////////////////////
Modified: branches/winldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/iso.c?rev=28287&r1... ============================================================================== --- branches/winldr/fs/iso.c (original) +++ branches/winldr/fs/iso.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
#define SECTORSIZE 2048
Modified: branches/winldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/ntfs.c?rev=28287&r... ============================================================================== --- branches/winldr/fs/ntfs.c (original) +++ branches/winldr/fs/ntfs.c Sat Aug 11 18:32:39 2007 @@ -24,8 +24,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
PNTFS_BOOTSECTOR NtfsBootSector;
Modified: branches/winldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/branches/winldr/include/debug.h?rev=28287... ============================================================================== --- branches/winldr/include/debug.h (original) +++ branches/winldr/include/debug.h Sat Aug 11 18:32:39 2007 @@ -21,29 +21,30 @@ #ifndef __DEBUG_H #define __DEBUG_H
+#define DPRINT_NONE 0x00000000 // No debug print +#define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff +#define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages +#define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages +#define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages +#define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages +#define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages +#define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages +#define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages +#define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages +#define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages +#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 + +VOID DebugPrint(ULONG Mask, char *format, ...); + #ifdef DBG
- #define DPRINT_NONE 0x00000000 // No debug print - #define DPRINT_WARNING 0x00000001 // OR this with DebugPrintMask to enable debugger messages and other misc stuff - #define DPRINT_MEMORY 0x00000002 // OR this with DebugPrintMask to enable memory management messages - #define DPRINT_FILESYSTEM 0x00000004 // OR this with DebugPrintMask to enable file system messages - #define DPRINT_INIFILE 0x00000008 // OR this with DebugPrintMask to enable .ini file messages - #define DPRINT_UI 0x00000010 // OR this with DebugPrintMask to enable user interface messages - #define DPRINT_DISK 0x00000020 // OR this with DebugPrintMask to enable disk messages - #define DPRINT_CACHE 0x00000040 // OR this with DebugPrintMask to enable cache messages - #define DPRINT_REGISTRY 0x00000080 // OR this with DebugPrintMask to enable registry messages - #define DPRINT_REACTOS 0x00000100 // OR this with DebugPrintMask to enable ReactOS messages - #define DPRINT_LINUX 0x00000200 // OR this with DebugPrintMask to enable Linux messages - #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 - VOID DebugInit(VOID); - VOID DebugPrint(ULONG Mask, char *format, ...); VOID DebugPrint1(char *format, ...); VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length);
#define DbgPrint(_x_) DebugPrint _x_ ; - #define DPRINT1 DebugPrint1 + #define DPRINT1 DebugPrint1 #define BugCheck(_x_) { DebugPrint(DPRINT_WARNING, "Fatal Error: %s:%d(%s)\n", __FILE__, __LINE__, __FUNCTION__); DebugPrint _x_ ; for (;;); } #define DbgDumpBuffer(_x_, _y_, _z_) DebugDumpBuffer(_x_, _y_, _z_)
@@ -77,8 +78,8 @@ #else
#define DebugInit() - #define DbgPrint(_x_) - #define DPRINT1(_x_) + #define DbgPrint(_x_) { if (0) DebugPrint _x_; } + #define DPRINT1(_x_) { if (0) printf _x_; } #define BugCheck(_x_) #define DbgDumpBuffer(_x_, _y_, _z_)
Modified: branches/winldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/inifile/inifile.c?rev=282... ============================================================================== --- branches/winldr/inifile/inifile.c (original) +++ branches/winldr/inifile/inifile.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
BOOLEAN IniOpenSection(PCSTR SectionName, ULONG* SectionId)
Modified: branches/winldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/inifile/parse.c?rev=28287... ============================================================================== --- branches/winldr/inifile/parse.c (original) +++ branches/winldr/inifile/parse.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
PINI_SECTION IniFileSectionListHead = NULL;
Modified: branches/winldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/linuxboot.c?rev=28287&... ============================================================================== --- branches/winldr/linuxboot.c (original) +++ branches/winldr/linuxboot.c Sat Aug 11 18:32:39 2007 @@ -19,8 +19,6 @@
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
#ifdef __i386__
Modified: branches/winldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/meminit.c?rev=28287&am... ============================================================================== --- branches/winldr/mm/meminit.c (original) +++ branches/winldr/mm/meminit.c Sat Aug 11 18:32:39 2007 @@ -19,8 +19,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
#ifdef DBG
Modified: branches/winldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/mm.c?rev=28287&r1=... ============================================================================== --- branches/winldr/mm/mm.c (original) +++ branches/winldr/mm/mm.c Sat Aug 11 18:32:39 2007 @@ -19,13 +19,11 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
-#ifdef DBG ULONG AllocationCount = 0;
+#ifdef DBG VOID VerifyHeap(VOID); VOID DumpMemoryAllocMap(VOID); VOID IncrementAllocationCount(VOID);
Modified: branches/winldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/binhive.c?rev=282... ============================================================================== --- branches/winldr/reactos/binhive.c (original) +++ branches/winldr/reactos/binhive.c Sat Aug 11 18:32:39 2007 @@ -21,8 +21,6 @@
#include <freeldr.h> #include <cmlib.h> - -#define NDEBUG #include <debug.h>
/* FUNCTIONS ****************************************************************/
Modified: branches/winldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/reactos.c?rev=282... ============================================================================== --- branches/winldr/reactos/reactos.c (original) +++ branches/winldr/reactos/reactos.c Sat Aug 11 18:32:39 2007 @@ -20,8 +20,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
ROS_LOADER_PARAMETER_BLOCK LoaderBlock;
Modified: branches/winldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/registry.c?rev=28... ============================================================================== --- branches/winldr/reactos/registry.c (original) +++ branches/winldr/reactos/registry.c Sat Aug 11 18:32:39 2007 @@ -19,8 +19,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
static FRLDRHKEY RootKey;
Modified: branches/winldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/reactos/setupldr.c?rev=28... ============================================================================== --- branches/winldr/reactos/setupldr.c (original) +++ branches/winldr/reactos/setupldr.c Sat Aug 11 18:32:39 2007 @@ -19,6 +19,7 @@ */
#include <freeldr.h> +#include <debug.h>
ROS_LOADER_PARAMETER_BLOCK LoaderBlock; char reactos_kernel_cmdline[255]; // Command line passed to kernel
Modified: branches/winldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/ui/ui.c?rev=28287&r1=... ============================================================================== --- branches/winldr/ui/ui.c (original) +++ branches/winldr/ui/ui.c Sat Aug 11 18:32:39 2007 @@ -18,8 +18,6 @@ */
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
Modified: branches/winldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/conversion.c?rev=... ============================================================================== --- branches/winldr/windows/conversion.c (original) +++ branches/winldr/windows/conversion.c Sat Aug 11 18:32:39 2007 @@ -11,8 +11,6 @@ #include <freeldr.h>
//#include <ndk/ldrtypes.h> - -#define NDEBUG #include <debug.h>
/* FUNCTIONS **************************************************************/
Modified: branches/winldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/peloader.c?rev=28... ============================================================================== --- branches/winldr/windows/peloader.c (original) +++ branches/winldr/windows/peloader.c Sat Aug 11 18:32:39 2007 @@ -15,8 +15,6 @@
/* INCLUDES ***************************************************************/ #include <freeldr.h> - -//#define NDEBUG #include <debug.h>
Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=2828... ============================================================================== --- branches/winldr/windows/winldr.c (original) +++ branches/winldr/windows/winldr.c Sat Aug 11 18:32:39 2007 @@ -22,8 +22,6 @@ #include <freeldr.h>
#include <ndk/ldrtypes.h> - -//#define NDEBUG #include <debug.h>
//FIXME: Do a better way to retrieve Arc disk information
Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=28... ============================================================================== --- branches/winldr/windows/wlmemory.c (original) +++ branches/winldr/windows/wlmemory.c Sat Aug 11 18:32:39 2007 @@ -11,8 +11,6 @@ #include <freeldr.h>
#include <ndk/asm.h> - -#define NDEBUG #include <debug.h>
extern ULONG TotalNLSSize;
Modified: branches/winldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlregistry.c?rev=... ============================================================================== --- branches/winldr/windows/wlregistry.c (original) +++ branches/winldr/windows/wlregistry.c Sat Aug 11 18:32:39 2007 @@ -9,8 +9,6 @@ /* INCLUDES ***************************************************************/
#include <freeldr.h> - -#define NDEBUG #include <debug.h>
// The only global var here, used to mark mem pages as NLS in WinLdrTurnOnPaging()