Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ros-arm-bringup] 32176: We now return failed in FrLdrMapImage if the file could not be read. FreeLDR ARM now loads properly, however, we need to start building the ARM kernel and ARM boot drivers, otherwise their relocations will have byte offsets which will lead to alignment errors (on ARM relocaitons are DWORD-aligned). Next steps are to get the kernel building, then the HAL, then bootvid/kdcom.
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 08:25:37 2008 New Revision: 32176 URL: http://svn.reactos.org/svn/reactos?rev=32176&view=rev Log: We now return failed in FrLdrMapImage if the file could not be read. FreeLDR ARM now loads properly, however, we need to start building the ARM kernel and ARM boot drivers, otherwise their relocations will have byte offsets which will lead to alignment errors (on ARM relocaitons are DWORD-aligned). Next steps are to get the kernel building, then the HAL, then bootvid/kdcom. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Thu Feb 7 08:25:37 2008 @@ -13,6 +13,7 @@ /* GLOBALS ********************************************************************/ PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; +ULONG BootDrive, BootPartition; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/imageldr.c Thu Feb 7 08:25:37 2008 @@ -492,13 +492,18 @@ /* Allocate a temporary buffer for the read */ ReadBuffer = MmHeapAlloc(ImageSize); - + /* Load the file image */ - FsReadFile(Image, ImageSize, NULL, ReadBuffer); - + if (!FsReadFile(Image, ImageSize, NULL, ReadBuffer)) + { + /* Fail */ + DbgPrint("Failed to read image: %s\n", Name); + return NULL; + } + /* Map it into virtual memory */ ImageSize = FrLdrReMapImage(ReadBuffer, LoadBase); - + /* Free the temporary buffer */ MmHeapFree(ReadBuffer);

1 0

[navaraf] 32175: Make HvIsCellAllocated working.
by navaraf＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: navaraf Date: Thu Feb 7 06:32:47 2008 New Revision: 32175 URL: http://svn.reactos.org/svn/reactos?rev=32175&view=rev Log: Make HvIsCellAllocated working. Modified: trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Thu Feb 7 06:32:47 2008 @@ -46,26 +46,24 @@ HvIsCellAllocated(IN PHHIVE RegistryHive, IN HCELL_INDEX CellIndex) { - ULONG Type, Block; - - /* If it's a flat hive, the cell is always allocated */ - if (RegistryHive->Flat) return TRUE; - - /* Otherwise, get the type and make sure it's valid */ - Type = HvGetCellType(CellIndex); - if (((CellIndex % ~HCELL_TYPE_MASK) > RegistryHive->Storage[Type].Length) || - (CellIndex % (RegistryHive->Version >= 2 ? 8 : 16))) - { - /* Invalid cell index */ - return FALSE; - } - - /* Try to get the cell block */ - Block = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) return TRUE; - - /* No valid block, fail */ - return FALSE; + ULONG Type, Block; + + /* If it's a flat hive, the cell is always allocated */ + if (RegistryHive->Flat) + return TRUE; + + /* Otherwise, get the type and make sure it's valid */ + Type = HvGetCellType(CellIndex); + Block = HvGetCellBlock(CellIndex); + if (Block >= RegistryHive->Storage[Type].Length) + return FALSE; + + /* Try to get the cell block */ + if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) + return TRUE; + + /* No valid block, fail */ + return FALSE; } PVOID CMAPI @@ -88,13 +86,13 @@ HvGetCellSize(IN PHHIVE Hive, IN PVOID Address) { - PHCELL CellHeader; - LONG Size; - - CellHeader = (PHCELL)Address - 1; - Size = CellHeader->Size * -1; - Size -= sizeof(HCELL); - return Size; + PHCELL CellHeader; + LONG Size; + + CellHeader = (PHCELL)Address - 1; + Size = CellHeader->Size * -1; + Size -= sizeof(HCELL); + return Size; } BOOLEAN CMAPI @@ -126,14 +124,15 @@ HvIsCellDirty(IN PHHIVE Hive, IN HCELL_INDEX Cell) { - /* Sanity checks */ - ASSERT(Hive->ReadOnly == FALSE); - - /* Volatile cells are always "dirty" */ - if (HvGetCellType(Cell) == Volatile) return TRUE; - - /* Check if the dirty bit is set */ - return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); + /* Sanity checks */ + ASSERT(Hive->ReadOnly == FALSE); + + /* Volatile cells are always "dirty" */ + if (HvGetCellType(Cell) == Volatile) + return TRUE; + + /* Check if the dirty bit is set */ + return RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE); } static ULONG __inline CMAPI Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h (original) +++ trunk/reactos/lib/cmlib/hivedata.h Thu Feb 7 06:32:47 2008 @@ -92,6 +92,8 @@ #define HvGetCellType(Cell) \ ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) +#define HvGetCellBlock(Cell) \ + ((ULONG)((Cell & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT)) typedef enum {

1 0

[tkreuzer] 32174: make the table smaller
by tkreuzer＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: tkreuzer Date: Thu Feb 7 05:36:20 2008 New Revision: 32174 URL: http://svn.reactos.org/svn/reactos?rev=32174&view=rev Log: make the table smaller Modified: trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Thu Feb 7 05:36:20 2008 @@ -47,273 +47,34 @@ static const MUI_LANGUAGE LanguageList[] = { - { - L"00000409", /* The Language ID */ - L"00000409", /* Default Keyboard Layout for this language */ - L"1252", /* ANSI Codepage */ - L"437", /* OEM Codepage */ - L"10000", /* MAC Codepage */ - L"English", /* Language Name , not used just to make things easier when updating this file */ - enUSPages, /* Translated page strings */ - enUSErrorEntries /* Translated error strings */ - }, - { - L"00000402", - L"00000402", - L"1251", - L"866", - L"10007", - L"Bulgarian", - bgBGPages, - bgBGErrorEntries - }, - { - L"00000403", - L"00000403", - L"1252", - L"850", - L"10000", - L"Catalan", - enUSPages, - enUSErrorEntries - }, - { - L"00000804", - L"00000804", - L"936", - L"936", - L"10008", - L"Chinese (PRC)", - enUSPages, - enUSErrorEntries - }, - { - L"00000406", - L"00000406", - L"1252", - L"850", - L"10000", - L"Danish", - enUSPages, - enUSErrorEntries - }, - { - L"00000413", - L"00000813", - L"1252", - L"850", - L"10000", - L"Dutch", - enUSPages, - enUSErrorEntries - }, - { - L"0000040B", - L"0000040B", - L"1252", - L"850", - L"10000", - L"Finnish", - enUSPages, - enUSErrorEntries - }, - { - L"0000040C", - L"0000040C", - L"1252", - L"850", - L"10000", - L"French", - frFRPages, - frFRErrorEntries - }, - { - L"00000407", - L"00000407", - L"1252", - L"850", - L"10000", - L"German", - deDEPages, - deDEErrorEntries - }, - { - L"00000408", - L"00000408", - L"1253", - L"737", - L"10006", - L"Greek", - elGRPages, - elGRErrorEntries - }, - { - L"0000040D", - L"0000040D", - L"1255", - L"862", - L"10005", - L"Hebrew", - enUSPages, - enUSErrorEntries - }, - { - L"0000040E", - L"0000040E", - L"1250", - L"852", - L"10029", - L"Hungarian", - enUSPages, - enUSErrorEntries - }, - { - L"00000410", - L"00000410", - L"1252", - L"850", - L"10000", - L"Italian", - itITPages, - itITErrorEntries - }, - { - L"00000411", - L"00000411", - L"932", - L"932", - L"10001", - L"Japanese", - enUSPages, - enUSErrorEntries - }, - { - L"00000412", - L"00000412", - L"949", - L"949", - L"10003", - L"Korean", - enUSPages, - enUSErrorEntries - }, - { - L"00000427", - L"00000427", - L"1257", - L"775", - L"10029", - L"Lithuanian", - ltLTPages, - ltLTErrorEntries - }, - { - L"00000414", - L"00000414", - L"1252", - L"850", - L"10000", - L"Norwegian", - enUSPages, - enUSErrorEntries - }, - { - L"00000419", - L"00000419", - L"1251", - L"866", - L"10007", - L"Russian", - ruRUPages, - ruRUErrorEntries - }, - { - L"0000041B", - L"0000041B", - L"1250", - L"852", - L"10029", - L"Slovak", - skSKPages, - skSKErrorEntries - }, - { - L"0000040A", - L"0000040A", - L"1252", - L"850", - L"10000", - L"Spanish", - esESPages, - esESErrorEntries - }, - { - L"00000415", - L"00000415", - L"1250", - L"852", - L"10029", - L"Polish", - plPLPages, - plPLErrorEntries - }, - { - L"00000816", - L"00000816", - L"1252", - L"850", - L"10000", - L"Portuguese", - enUSPages, - enUSErrorEntries - }, - { - L"0000041D", - L"0000041D", - L"1252", - L"850", - L"10000", - L"Swedish", - svSEPages, - svSEErrorEntries - }, - { - L"0000041E", - L"0000041E", - L"874", - L"874", - L"10021", - L"Thai", - enUSPages, - enUSErrorEntries - }, - { - L"0000041F", - L"0000041F", - L"1254", - L"857", - L"10081", - L"Turkish", - enUSPages, - enUSErrorEntries - }, - { - L"00000422", - L"00000422", - L"1251", - L"866", - L"10017", - L"Ukrainian", - ukUAPages, - ukUAErrorEntries - }, - { - NULL, - NULL, - NULL, - NULL, - NULL - } + /* Lang ID, DefKbdLayout,ANSI CP, OEM CP, MAC CP, Language Name, page strgs,error strings */ + {L"00000409", L"00000409", L"1252", L"437", L"10000", L"English", enUSPages, enUSErrorEntries }, + {L"00000402", L"00000402", L"1251", L"866", L"10007", L"Bulgarian", bgBGPages, bgBGErrorEntries }, + {L"00000403", L"00000403", L"1252", L"850", L"10000", L"Catalan", enUSPages, enUSErrorEntries }, + {L"00000804", L"00000804", L"936", L"936", L"10008", L"Chinese (PRC)", enUSPages, enUSErrorEntries }, + {L"00000406", L"00000406", L"1252", L"850", L"10000", L"Danish", enUSPages, enUSErrorEntries }, + {L"00000413", L"00000813", L"1252", L"850", L"10000", L"Dutch", enUSPages, enUSErrorEntries }, + {L"0000040B", L"0000040B", L"1252", L"850", L"10000", L"Finnish", enUSPages, enUSErrorEntries }, + {L"0000040C", L"0000040C", L"1252", L"850", L"10000", L"French", frFRPages, frFRErrorEntries }, + {L"00000407", L"00000407", L"1252", L"850", L"10000", L"German", deDEPages, deDEErrorEntries }, + {L"00000408", L"00000408", L"1253", L"737", L"10006", L"Greek", elGRPages, elGRErrorEntries }, + {L"0000040D", L"0000040D", L"1255", L"862", L"10005", L"Hebrew", enUSPages, enUSErrorEntries }, + {L"0000040E", L"0000040E", L"1250", L"852", L"10029", L"Hungarian", enUSPages, enUSErrorEntries }, + {L"00000410", L"00000410", L"1252", L"850", L"10000", L"Italian", itITPages, itITErrorEntries }, + {L"00000411", L"00000411", L"932", L"932", L"10001", L"Japanese", enUSPages, enUSErrorEntries }, + {L"00000412", L"00000412", L"949", L"949", L"10003", L"Korean", enUSPages, enUSErrorEntries }, + {L"00000427", L"00000427", L"1257", L"775", L"10029", L"Lithuanian", ltLTPages, ltLTErrorEntries }, + {L"00000414", L"00000414", L"1252", L"850", L"10000", L"Norwegian", enUSPages, enUSErrorEntries }, + {L"00000419", L"00000419", L"1251", L"866", L"10007", L"Russian", ruRUPages, ruRUErrorEntries }, + {L"0000041B", L"0000041B", L"1250", L"852", L"10029", L"Slovak", skSKPages, skSKErrorEntries }, + {L"0000040A", L"0000040A", L"1252", L"850", L"10000", L"Spanish", esESPages, esESErrorEntries }, + {L"00000415", L"00000415", L"1250", L"852", L"10029", L"Polish", plPLPages, plPLErrorEntries }, + {L"00000816", L"00000816", L"1252", L"850", L"10000", L"Portuguese", enUSPages, enUSErrorEntries }, + {L"0000041D", L"0000041D", L"1252", L"850", L"10000", L"Swedish", svSEPages, svSEErrorEntries }, + {L"0000041E", L"0000041E", L"874", L"874", L"10021", L"Thai", enUSPages, enUSErrorEntries }, + {L"0000041F", L"0000041F", L"1254", L"857", L"10081", L"Turkish", enUSPages, enUSErrorEntries }, + {L"00000422", L"00000422", L"1251", L"866", L"10017", L"Ukrainian", ukUAPages, ukUAErrorEntries }, + {NULL, NULL, NULL, NULL, NULL} }; extern

1 0

[ros-arm-bringup] 32173: There was no reason to have most of the i386Disk routines as i386-only routines, since they are quite generic and portable assuming MBR-based disks. GPT disks are another matter, but in either case, any architecture should support both, and that's the real distinction. Made the ARM code use the shared disk routines, which allowed us to remove some hacks -> we now detect the boot/system volume just like on x86. FreeLDR now loads NTOSKRNL.EXE on ARM. Also made the DiskIsBo
by ros-arm-bringup＠svn.reactos.org 07 Feb '08

07 Feb '08

Author: ros-arm-bringup Date: Thu Feb 7 03:43:09 2008 New Revision: 32173 URL: http://svn.reactos.org/svn/reactos?rev=32173&view=rev Log: There was no reason to have most of the i386Disk routines as i386-only routines, since they are quite generic and portable assuming MBR-based disks. GPT disks are another matter, but in either case, any architecture should support both, and that's the real distinction. Made the ARM code use the shared disk routines, which allowed us to remove some hacks -> we now detect the boot/system volume just like on x86. FreeLDR now loads NTOSKRNL.EXE on ARM. Also made the DiskIsBootDeviceFloppy return FALSE for ramdisks. Finally, note that the disk routines were still kept as Machine-specific routines in the Mach Table, so other architectures can still override them if they really need to (for example, the XBOX port overrides one of them for a specific XBOX hack). Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Thu Feb 7 03:43:09 2008 @@ -24,7 +24,6 @@ // } - BOOLEAN ArmDiskGetDriveGeometry(IN ULONG DriveNumber, OUT PGEOMETRY Geometry) @@ -50,58 +49,6 @@ return FALSE; } -BOOLEAN -ArmDiskGetBootVolume(IN PULONG DriveNumber, - IN PULONGLONG StartSector, - IN PULONGLONG SectorCount, - OUT PINT FsType) -{ - // - // We only support RAM disk for now -- add support for NAND later - // - ASSERT(gRamDiskBase); - ASSERT(gRamDiskSize); - - // - // Use magic ramdisk drive number and count the number of 512-byte sectors - // - *DriveNumber = 0x49; - *StartSector = 63; - *SectorCount = gRamDiskSize * 512; - - // - // Ramdisk support is FAT-only for now - // - *FsType = FS_FAT; - - // - // Now that ramdisk is enabled, use ramdisk routines - // - RamDiskSwitchFromBios(); - return TRUE; -} - -BOOLEAN -ArmDiskGetSystemVolume(IN PCHAR SystemPath, - OUT PCHAR RemainingPath, - OUT PULONG Device, - OUT PULONG DriveNumber, - OUT PULONGLONG StartSector, - OUT PULONGLONG SectorCount, - OUT PINT FsType) -{ - while (TRUE); - return FALSE; -} - -BOOLEAN -ArmDiskNormalizeSystemPath(IN PCHAR SystemPath, - IN unsigned Size) -{ - while (TRUE); - return FALSE; -} - VOID ArmPrepareForReactOS(IN BOOLEAN Setup) { @@ -111,8 +58,32 @@ PCONFIGURATION_COMPONENT_DATA ArmHwDetect(VOID) { - while (TRUE); - return NULL; + PCONFIGURATION_COMPONENT_DATA RootNode; + + // + // Create the root node + // + FldrCreateSystemKey(&RootNode); + + // + // Write null component information + // + FldrSetComponentInformation(RootNode, + 0x0, + 0x0, + 0xFFFFFFFF); + + // + // TODO: + // There's no such thing as "PnP" on embedded hardware. + // The boot loader will send us a device tree, similar to ACPI + // or OpenFirmware device trees, and we will convert it to ARC. + // + + // + // Return the root node + // + return RootNode; } ULONG @@ -155,18 +126,31 @@ } // - // Setup generic ARM routines + // Setup generic ARM routines for all boards // MachVtbl.PrepareForReactOS = ArmPrepareForReactOS; MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = ArmDiskGetSystemVolume; - MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath; + MachVtbl.HwDetect = ArmHwDetect; + + // + // Setup disk I/O routines, switch to ramdisk ones for non-NAND boot + // MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; - MachVtbl.HwDetect = ArmHwDetect; - + RamDiskSwitchFromBios(); + + // + // Now set default disk handling routines -- we don't need to override + // + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; + MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; + // // We can now print to the console // Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S Thu Feb 7 03:43:09 2008 @@ -46,16 +46,16 @@ .code32 - /* Zero i386BootDrive and i386BootPartition */ + /* Zero BootDrive and BootPartition */ xorl %eax,%eax - movl %eax,(_i386BootDrive) - movl %eax,(_i386BootPartition) + movl %eax,(_BootDrive) + movl %eax,(_BootPartition) /* Store the boot drive */ - movb %dl,(_i386BootDrive) + movb %dl,(_BootDrive) /* Store the boot partition */ - movb %dh,(_i386BootPartition) + movb %dh,(_BootPartition) /* GO! */ pushl %eax @@ -395,12 +395,12 @@ movl MB_INFO_BOOT_DEVICE_OFFSET(%ebx),%eax shrl $16,%eax incb %al - movb %al,_i386BootPartition - movb %ah,_i386BootDrive + movb %al,_BootPartition + movb %ah,_BootDrive jmp mb6 mb5: /* No boot device known, assume first partition of first harddisk */ - movb $0x80,_i386BootDrive - movb $1,_i386BootPartition + movb $0x80,_BootDrive + movb $1,_BootPartition mb6: /* Check for command line */ mov $cmdline,%eax @@ -484,14 +484,14 @@ .word 0x3ff /* Limit */ .long 0 /* Base Address */ -EXTERN(_i386BootDrive) - .long 0 - -EXTERN(_i386BootPartition) - .long 0 - mb_info: .fill MB_INFO_SIZE, 1, 0 cmdline: .fill CMDLINE_SIZE, 1, 0 + +EXTERN(_BootDrive) + .long 0 + +EXTERN(_BootPartition) + .long 0 Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/boot.S Thu Feb 7 03:43:09 2008 @@ -31,7 +31,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Thu Feb 7 03:43:09 2008 @@ -198,309 +198,6 @@ return TRUE; } -BOOLEAN i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) -{ - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - ULONG ActivePartition; - - DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", i386BootDrive, i386BootPartition)); - - // Check and see if it is a floppy drive - // If so then just assume FAT12 file system type - if (DiskIsDriveRemovable(i386BootDrive)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); - - *DriveNumber = i386BootDrive; - *StartSector = 0; - *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ - *FsType = FS_FAT; - return TRUE; - } - - // Check for ISO9660 file system type - if (i386BootDrive >= 0x80 && FsRecIsIso9660(i386BootDrive)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); - - *DriveNumber = i386BootDrive; - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - // Get the requested partition entry - if (i386BootPartition == 0) - { - // Partition requested was zero which means the boot partition - if (! DiskGetActivePartitionEntry(i386BootDrive, &PartitionTableEntry, &ActivePartition)) - { - /* Try partition-less disk */ - *StartSector = 0; - *SectorCount = 0; - } - /* Check for valid partition */ - else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - else - { - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - } - } - else if (0xff == i386BootPartition) - { - /* Partition-less disk */ - *StartSector = 0; - *SectorCount = 0; - } - else - { - // Get requested partition - if (! MachDiskGetPartitionEntry(i386BootDrive, i386BootPartition, &PartitionTableEntry)) - { - return FALSE; - } - /* Check for valid partition */ - else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) - { - return FALSE; - } - else - { - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - } - } - - // Try to recognize the file system - if (!FsRecognizeVolume(i386BootDrive, *StartSector, &VolumeType)) - { - return FALSE; - } - - *DriveNumber = i386BootDrive; - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return TRUE; -} - -VOID -i386DiskGetBootDevice(PULONG BootDevice) -{ - ((char *)BootDevice)[0] = (char)i386BootDrive; - ((char *)BootDevice)[1] = (char)i386BootPartition; -} - -BOOLEAN -i386DiskBootingFromFloppy(VOID) -{ - return i386BootDrive < 0x80; -} - -#define IsRecognizedPartition(P) \ - ((P) == PARTITION_FAT_12 || \ - (P) == PARTITION_FAT_16 || \ - (P) == PARTITION_HUGE || \ - (P) == PARTITION_IFS || \ - (P) == PARTITION_EXT2 || \ - (P) == PARTITION_FAT32 || \ - (P) == PARTITION_FAT32_XINT13 || \ - (P) == PARTITION_XINT13) - -#define IsContainerPartition(P) \ - ((P) == PARTITION_EXTENDED || \ - (P) == PARTITION_XINT13_EXTENDED) - -BOOLEAN i386DiskGetSystemVolume(char *SystemPath, - char *RemainingPath, - PULONG Device, - PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, - int *FsType) -{ - ULONG PartitionNumber; - PARTITION_TABLE_ENTRY PartitionTableEntry; - UCHAR VolumeType; - CHAR BootPath[256]; - unsigned i, RosPartition; - - /* - * Verify system path - */ - if (!DissectArcPath(SystemPath, BootPath, DriveNumber, &PartitionNumber)) - { - return FALSE; - } - if (NULL != RemainingPath) - { - strcpy(RemainingPath, BootPath); - } - - /* 0xff -> no partition table present, use whole device */ - if (0xff == PartitionNumber) - { - PartitionTableEntry.SectorCountBeforePartition = 0; - i = 0xff; - } - else - { - /* recalculate the boot partition for freeldr */ - i = 0; - RosPartition = 0; - while (1) - { - if (!MachDiskGetPartitionEntry(*DriveNumber, ++i, &PartitionTableEntry)) - { - return FALSE; - } - if (!IsContainerPartition(PartitionTableEntry.SystemIndicator) && - PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) - { - if (++RosPartition == PartitionNumber) - { - break; - } - } - } - } - - /* Check for ISO9660 file system type */ - if (*DriveNumber >= 0x80 && FsRecIsIso9660(*DriveNumber)) - { - DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); - - if (NULL != Device) - { - ((char *)Device)[0] = (char)(*DriveNumber); - ((char *)Device)[1] = (char)i; - } - *StartSector = 0; - *SectorCount = 0; - *FsType = FS_ISO9660; - return TRUE; - } - - if (!FsRecognizeVolume(*DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) - { - return FALSE; - } - - if (NULL != Device) - { - ((char *)Device)[0] = (char)(*DriveNumber); - ((char *)Device)[1] = (char)i; - } - *StartSector = PartitionTableEntry.SectorCountBeforePartition; - *SectorCount = PartitionTableEntry.PartitionSectorCount; - - switch (VolumeType) - { - case PARTITION_FAT_12: - case PARTITION_FAT_16: - case PARTITION_HUGE: - case PARTITION_XINT13: - case PARTITION_FAT32: - case PARTITION_FAT32_XINT13: - *FsType = FS_FAT; - return TRUE; - case PARTITION_EXT2: - *FsType = FS_EXT2; - return TRUE; - case PARTITION_NTFS: - *FsType = FS_NTFS; - return TRUE; - default: - *FsType = 0; - return FALSE; - } - - return FALSE; -} - -BOOLEAN -i386DiskGetBootPath(char *BootPath, unsigned Size) -{ - static char Path[] = "multi(0)disk(0)"; - char Device[4]; - - _itoa(i386BootDrive, Device, 10); - if (Size <= sizeof(Path) + 6 + strlen(Device)) - { - return FALSE; - } - strcpy(BootPath, Path); - strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); - strcat(strcat(strcat(BootPath, "("), Device), ")"); - - return TRUE; -} - -BOOLEAN -i386DiskNormalizeSystemPath(char *SystemPath, unsigned Size) -{ - CHAR BootPath[256]; - ULONG PartitionNumber; - ULONG DriveNumber; - PARTITION_TABLE_ENTRY PartEntry; - char *p; - - if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) - { - return FALSE; - } - - if (0 != PartitionNumber) - { - return TRUE; - } - - if (! DiskGetActivePartitionEntry(DriveNumber, - &PartEntry, - &PartitionNumber) || - PartitionNumber < 1 || 9 < PartitionNumber) - { - return FALSE; - } - - p = SystemPath; - while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { - p++; - } - p = strchr(p, ')'); - if (NULL == p || '0' != *(p - 1)) { - return FALSE; - } - *(p - 1) = '0' + PartitionNumber; - - return TRUE; -} - #endif /* defined __i386__ */ /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/linux.S Thu Feb 7 03:43:09 2008 @@ -30,7 +30,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli @@ -66,7 +66,7 @@ .code16 /* Set the boot drive */ - movb (_i386BootDrive),%dl + movb (_BootDrive),%dl /* Load segment registers */ cli Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Thu Feb 7 03:43:09 2008 @@ -44,14 +44,14 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = PcPrepareForReactOS; MachVtbl.GetMemoryMap = PcMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = PcDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = PcDiskGetPartitionEntry; + MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Thu Feb 7 03:43:09 2008 @@ -47,12 +47,12 @@ MachVtbl.Beep = PcBeep; MachVtbl.PrepareForReactOS = XboxPrepareForReactOS; MachVtbl.GetMemoryMap = XboxMemGetMemoryMap; - MachVtbl.DiskGetBootVolume = i386DiskGetBootVolume; - MachVtbl.DiskGetSystemVolume = i386DiskGetSystemVolume; - MachVtbl.DiskGetBootPath = i386DiskGetBootPath; - MachVtbl.DiskGetBootDevice = i386DiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = i386DiskBootingFromFloppy; - MachVtbl.DiskNormalizeSystemPath = i386DiskNormalizeSystemPath; + MachVtbl.DiskGetBootVolume = DiskGetBootVolume; + MachVtbl.DiskGetSystemVolume = DiskGetSystemVolume; + MachVtbl.DiskGetBootPath = DiskGetBootPath; + MachVtbl.DiskGetBootDevice = DiskGetBootDevice; + MachVtbl.DiskBootingFromFloppy = DiskBootingFromFloppy; + MachVtbl.DiskNormalizeSystemPath = DiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = XboxDiskReadLogicalSectors; MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Thu Feb 7 03:43:09 2008 @@ -379,13 +379,6 @@ } BOOLEAN -PcDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - /* Just use the standard routine */ - return DiskGetPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); -} - -BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY Geometry) { REGS RegsIn; Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c Thu Feb 7 03:43:09 2008 @@ -91,7 +91,8 @@ // Hard disks use drive numbers >= 0x80 // So if the drive number indicates a hard disk // then return FALSE - if (DriveNumber >= 0x80) + // 0x49 is our magic ramdisk drive, so return FALSE for that too + if ((DriveNumber >= 0x80) || (DriveNumber == 0x49)) { return FALSE; } @@ -100,6 +101,310 @@ return TRUE; } +BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, PULONGLONG SectorCount, int *FsType) +{ + PARTITION_TABLE_ENTRY PartitionTableEntry; + UCHAR VolumeType; + ULONG ActivePartition; + + DbgPrint((DPRINT_FILESYSTEM, "FsOpenVolume() DriveNumber: 0x%x PartitionNumber: 0x%x\n", BootDrive, BootPartition)); + + // Check and see if it is a floppy drive + // If so then just assume FAT12 file system type + if (DiskIsDriveRemovable(BootDrive)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a floppy diskette drive. Assuming FAT12 file system.\n")); + + *DriveNumber = BootDrive; + *StartSector = 0; + *SectorCount = 2 * 80 * 18; /* FIXME hardcoded for 1.44 Mb */ + *FsType = FS_FAT; + return TRUE; + } + + // Check for ISO9660 file system type + if (BootDrive >= 0x80 && FsRecIsIso9660(BootDrive)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); + + *DriveNumber = BootDrive; + *StartSector = 0; + *SectorCount = 0; + *FsType = FS_ISO9660; + return TRUE; + } + + // Get the requested partition entry + if (BootPartition == 0) + { + // Partition requested was zero which means the boot partition + if (! DiskGetActivePartitionEntry(BootDrive, &PartitionTableEntry, &ActivePartition)) + { + /* Try partition-less disk */ + *StartSector = 0; + *SectorCount = 0; + } + /* Check for valid partition */ + else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) + { + return FALSE; + } + else + { + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + } + } + else if (0xff == BootPartition) + { + /* Partition-less disk */ + *StartSector = 0; + *SectorCount = 0; + } + else + { + // Get requested partition + if (! MachDiskGetPartitionEntry(BootDrive, BootPartition, &PartitionTableEntry)) + { + return FALSE; + } + /* Check for valid partition */ + else if (PartitionTableEntry.SystemIndicator == PARTITION_ENTRY_UNUSED) + { + return FALSE; + } + else + { + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + } + } + + // Try to recognize the file system + if (!FsRecognizeVolume(BootDrive, *StartSector, &VolumeType)) + { + return FALSE; + } + + *DriveNumber = BootDrive; + + switch (VolumeType) + { + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + *FsType = FS_FAT; + return TRUE; + case PARTITION_EXT2: + *FsType = FS_EXT2; + return TRUE; + case PARTITION_NTFS: + *FsType = FS_NTFS; + return TRUE; + default: + *FsType = 0; + return FALSE; + } + + return TRUE; +} + +VOID +DiskGetBootDevice(PULONG BootDevice) +{ + ((char *)BootDevice)[0] = (char)BootDrive; + ((char *)BootDevice)[1] = (char)BootPartition; +} + +BOOLEAN +DiskBootingFromFloppy(VOID) +{ + return BootDrive < 0x80; +} + +#define IsRecognizedPartition(P) \ + ((P) == PARTITION_FAT_12 || \ + (P) == PARTITION_FAT_16 || \ + (P) == PARTITION_HUGE || \ + (P) == PARTITION_IFS || \ + (P) == PARTITION_EXT2 || \ + (P) == PARTITION_FAT32 || \ + (P) == PARTITION_FAT32_XINT13 || \ + (P) == PARTITION_XINT13) + +#define IsContainerPartition(P) \ + ((P) == PARTITION_EXTENDED || \ + (P) == PARTITION_XINT13_EXTENDED) + +BOOLEAN DiskGetSystemVolume(char *SystemPath, + char *RemainingPath, + PULONG Device, + PULONG DriveNumber, + PULONGLONG StartSector, + PULONGLONG SectorCount, + int *FsType) +{ + ULONG PartitionNumber; + PARTITION_TABLE_ENTRY PartitionTableEntry; + UCHAR VolumeType; + CHAR BootPath[256]; + unsigned i, RosPartition; + + /* + * Verify system path + */ + if (!DissectArcPath(SystemPath, BootPath, DriveNumber, &PartitionNumber)) + { + return FALSE; + } + if (NULL != RemainingPath) + { + strcpy(RemainingPath, BootPath); + } + + /* 0xff -> no partition table present, use whole device */ + if (0xff == PartitionNumber) + { + PartitionTableEntry.SectorCountBeforePartition = 0; + i = 0xff; + } + else + { + /* recalculate the boot partition for freeldr */ + i = 0; + RosPartition = 0; + while (1) + { + if (!MachDiskGetPartitionEntry(*DriveNumber, ++i, &PartitionTableEntry)) + { + return FALSE; + } + if (!IsContainerPartition(PartitionTableEntry.SystemIndicator) && + PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) + { + if (++RosPartition == PartitionNumber) + { + break; + } + } + } + } + + /* Check for ISO9660 file system type */ + if (*DriveNumber >= 0x80 && FsRecIsIso9660(*DriveNumber)) + { + DbgPrint((DPRINT_FILESYSTEM, "Drive is a cdrom drive. Assuming ISO-9660 file system.\n")); + + if (NULL != Device) + { + ((char *)Device)[0] = (char)(*DriveNumber); + ((char *)Device)[1] = (char)i; + } + *StartSector = 0; + *SectorCount = 0; + *FsType = FS_ISO9660; + return TRUE; + } + + if (!FsRecognizeVolume(*DriveNumber, PartitionTableEntry.SectorCountBeforePartition, &VolumeType)) + { + return FALSE; + } + + if (NULL != Device) + { + ((char *)Device)[0] = (char)(*DriveNumber); + ((char *)Device)[1] = (char)i; + } + *StartSector = PartitionTableEntry.SectorCountBeforePartition; + *SectorCount = PartitionTableEntry.PartitionSectorCount; + + switch (VolumeType) + { + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + *FsType = FS_FAT; + return TRUE; + case PARTITION_EXT2: + *FsType = FS_EXT2; + return TRUE; + case PARTITION_NTFS: + *FsType = FS_NTFS; + return TRUE; + default: + *FsType = 0; + return FALSE; + } + + return FALSE; +} + +BOOLEAN +DiskGetBootPath(char *BootPath, unsigned Size) +{ + static char Path[] = "multi(0)disk(0)"; + char Device[4]; + + _itoa(BootDrive, Device, 10); + if (Size <= sizeof(Path) + 6 + strlen(Device)) + { + return FALSE; + } + strcpy(BootPath, Path); + strcat(BootPath, MachDiskBootingFromFloppy() ? "fdisk" : "cdrom"); + strcat(strcat(strcat(BootPath, "("), Device), ")"); + + return TRUE; +} + +BOOLEAN +DiskNormalizeSystemPath(char *SystemPath, unsigned Size) +{ + CHAR BootPath[256]; + ULONG PartitionNumber; + ULONG DriveNumber; + PARTITION_TABLE_ENTRY PartEntry; + char *p; + + if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber)) + { + return FALSE; + } + + if (0 != PartitionNumber) + { + return TRUE; + } + + if (! DiskGetActivePartitionEntry(DriveNumber, + &PartEntry, + &PartitionNumber) || + PartitionNumber < 1 || 9 < PartitionNumber) + { + return FALSE; + } + + p = SystemPath; + while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) { + p++; + } + p = strchr(p, ')'); + if (NULL == p || '0' != *(p - 1)) { + return FALSE; + } + *(p - 1) = '0' + PartitionNumber; + + return TRUE; +} + + // This function is in arch/i386/i386disk.c //VOID DiskStopFloppyMotor(VOID) Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c Thu Feb 7 03:43:09 2008 @@ -38,6 +38,7 @@ // // Allow 32KB transfers (64 sectors), emulating BIOS LBA // + ASSERT(Reserved == 0x49); return 64; } @@ -48,6 +49,7 @@ // // Should never be called when the caller expects valid Geometry! // + ASSERT(Reserved == 0x49); return TRUE; } @@ -59,7 +61,8 @@ { PVOID StartAddress; ULONG Length; - + ASSERT(Reserved == 0x49); + // // Get actual pointers and lengths // @@ -145,6 +148,8 @@ NTAPI RamDiskSwitchFromBios(VOID) { + extern ULONG BootDrive, BootPartition; + // // Check if we have a ramdisk, in which case we need to switch routines // @@ -161,5 +166,11 @@ // Also disable cached FAT reads // gCacheEnabled = FALSE; + + // + // Switch to ramdisk boot partition + // + BootDrive = 0x49; + BootPartition = 0; } } Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/i386.h Thu Feb 7 03:43:09 2008 @@ -22,19 +22,6 @@ #define __I386_I386_H_ -extern ULONG i386BootDrive; -extern ULONG i386BootPartition; - -extern BOOLEAN i386DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOLEAN i386DiskGetSystemVolume(char *SystemPath, char *RemainingPath, - PULONG Device, PULONG DriveNumber, - PULONGLONG StartSector, - PULONGLONG SectorCount, int *FsType); -extern BOOLEAN i386DiskGetBootPath(char *BootPath, unsigned Size); -extern VOID i386DiskGetBootDevice(PULONG BootDevice); -extern BOOLEAN i386DiskBootingFromFloppy(VOID); -extern BOOLEAN i386DiskNormalizeSystemPath(char *SystemPath, unsigned Size); #endif /* __I386_I386_H_ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h Thu Feb 7 03:43:09 2008 @@ -124,6 +124,20 @@ BOOLEAN DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOLEAN DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c +extern ULONG BootDrive; +extern ULONG BootPartition; + +BOOLEAN DiskGetBootVolume(PULONG DriveNumber, PULONGLONG StartSector, + PULONGLONG SectorCount, int *FsType); +BOOLEAN DiskGetSystemVolume(char *SystemPath, char *RemainingPath, + PULONG Device, PULONG DriveNumber, + PULONGLONG StartSector, + PULONGLONG SectorCount, int *FsType); +BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); +VOID DiskGetBootDevice(PULONG BootDevice); +BOOLEAN DiskBootingFromFloppy(VOID); +BOOLEAN DiskNormalizeSystemPath(char *SystemPath, unsigned Size); + /////////////////////////////////////////////////////////////////////////////////////// //

1 0

[gbrunmar] 32172: * Fixed compiling of the native d3d9.dll * Packed structures in d3d9types.h correctly to be compatible with Windows
by gbrunmar＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: gbrunmar Date: Thu Feb 7 00:22:23 2008 New Revision: 32172 URL: http://svn.reactos.org/svn/reactos?rev=32172&view=rev Log: * Fixed compiling of the native d3d9.dll * Packed structures in d3d9types.h correctly to be compatible with Windows Modified: trunk/reactos/include/psdk/d3d9.h trunk/reactos/include/psdk/d3d9types.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=32… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h (original) +++ trunk/reactos/include/psdk/d3d9.h Thu Feb 7 00:22:23 2008 @@ -66,6 +66,7 @@ #endif #define D3DADAPTER_DEFAULT 0 +#define D3DENUM_WHQL_LEVEL 0x00000002L #define D3DENUM_NO_WHQL_LEVEL 0x00000002L #define D3DPRESENT_BACK_BUFFERS_MAX 3L #define D3DSGR_NO_CALIBRATION 0x00000000L Modified: trunk/reactos/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r… ============================================================================== --- trunk/reactos/include/psdk/d3d9types.h (original) +++ trunk/reactos/include/psdk/d3d9types.h Thu Feb 7 00:22:23 2008 @@ -20,6 +20,8 @@ #ifndef __WINE_D3D9TYPES_H #define __WINE_D3D9TYPES_H + +#pragma pack(push, 4) /***************************************************************************** * Direct 3D v9 #defines @@ -1531,4 +1533,6 @@ UINT Depth; } D3DVOLUME_DESC; +#pragma pack(pop) + #endif /* __WINE_D3D9TYPES_H */

1 0

[ros-arm-bringup] 32171: Removed certain ARM Machine Callbacks which we shouldn't need at all until much later for SetupLDR. Kept the ArmDisk ones though since they'll be needed for NAND boot, but improved the assertions.
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 23:47:53 2008 New Revision: 32171 URL: http://svn.reactos.org/svn/reactos?rev=32171&view=rev Log: Removed certain ARM Machine Callbacks which we shouldn't need at all until much later for SetupLDR. Kept the ArmDisk ones though since they'll be needed for NAND boot, but improved the assertions. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 23:47:53 2008 @@ -22,6 +22,32 @@ // // Start the OS // +} + + +BOOLEAN +ArmDiskGetDriveGeometry(IN ULONG DriveNumber, + OUT PGEOMETRY Geometry) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +BOOLEAN +ArmDiskReadLogicalSectors(IN ULONG DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + IN PVOID Buffer) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; +} + +ULONG +ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) +{ + ASSERT(gRamDiskBase == NULL); + return FALSE; } BOOLEAN @@ -55,19 +81,6 @@ return TRUE; } -VOID -ArmDiskGetBootDevice(OUT PULONG BootDevice) -{ - while (TRUE); -} - -BOOLEAN -ArmDiskBootingFromFloppy(VOID) -{ - while (TRUE); - return FALSE; -} - BOOLEAN ArmDiskGetSystemVolume(IN PCHAR SystemPath, OUT PCHAR RemainingPath, @@ -82,52 +95,10 @@ } BOOLEAN -ArmDiskGetBootPath(IN PCHAR BootPath, - IN unsigned Size) -{ - while (TRUE); - return FALSE; -} - -BOOLEAN ArmDiskNormalizeSystemPath(IN PCHAR SystemPath, IN unsigned Size) { while (TRUE); - return FALSE; -} - -BOOLEAN -ArmDiskGetDriveGeometry(IN ULONG DriveNumber, - OUT PGEOMETRY Geometry) -{ - ASSERT(FALSE); - return FALSE; -} - -BOOLEAN -ArmDiskGetPartitionEntry(IN ULONG DriveNumber, - IN ULONG PartitionNumber, - OUT PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - while (TRUE); - return FALSE; -} - -BOOLEAN -ArmDiskReadLogicalSectors(IN ULONG DriveNumber, - IN ULONGLONG SectorNumber, - IN ULONG SectorCount, - IN PVOID Buffer) -{ - ASSERT(FALSE); - return FALSE; -} - -ULONG -ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) -{ - ASSERT(FALSE); return FALSE; } @@ -190,12 +161,8 @@ MachVtbl.GetMemoryMap = ArmMemGetMemoryMap; MachVtbl.DiskGetBootVolume = ArmDiskGetBootVolume; MachVtbl.DiskGetSystemVolume = ArmDiskGetSystemVolume; - MachVtbl.DiskGetBootPath = ArmDiskGetBootPath; - MachVtbl.DiskGetBootDevice = ArmDiskGetBootDevice; - MachVtbl.DiskBootingFromFloppy = ArmDiskBootingFromFloppy; MachVtbl.DiskNormalizeSystemPath = ArmDiskNormalizeSystemPath; MachVtbl.DiskReadLogicalSectors = ArmDiskReadLogicalSectors; - MachVtbl.DiskGetPartitionEntry = ArmDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = ArmDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = ArmDiskGetCacheableBlockCount; MachVtbl.HwDetect = ArmHwDetect;

1 0

[ros-arm-bringup] 32170: We now report the correct sector start for the ramdisk -- the actual volume boot sector is at 0x63, not 0x00 which is the MBR. FreeLDR now reads freeldr.ini correctly and continues all the way to hardware detection (ArmHwDetect)
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 23:38:59 2008 New Revision: 32170 URL: http://svn.reactos.org/svn/reactos?rev=32170&view=rev Log: We now report the correct sector start for the ramdisk -- the actual volume boot sector is at 0x63, not 0x00 which is the MBR. FreeLDR now reads freeldr.ini correctly and continues all the way to hardware detection (ArmHwDetect) Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c trunk/reactos/boot/freeldr/freeldr/ui/noui.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 23:38:59 2008 @@ -40,7 +40,7 @@ // Use magic ramdisk drive number and count the number of 512-byte sectors // *DriveNumber = 0x49; - *StartSector = 0; + *StartSector = 63; *SectorCount = gRamDiskSize * 512; // Modified: trunk/reactos/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/no… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/noui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/noui.c Wed Feb 6 23:38:59 2008 @@ -43,6 +43,7 @@ VOID NoUiDrawStatusText(PCSTR StatusText) { + printf("%s\n", StatusText); } VOID NoUiUpdateDateTime(VOID)

1 0

[ros-arm-bringup] 32169: We now enable ramdisk support by calling RamDiskSwitchFromBios() to allow the ramdisk routines to take control of disk r/w. Unlike the x86 virtual-ramdisk, the ramdisk here is also used as boot device, not only system device. Current FreeLDR output: Booting FreeLDR... FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 This file system has cluster sizes bigger than 64k. FreeLoader does not support this. Press any key
by ros-arm-bringup＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: ros-arm-bringup Date: Wed Feb 6 22:15:46 2008 New Revision: 32169 URL: http://svn.reactos.org/svn/reactos?rev=32169&view=rev Log: We now enable ramdisk support by calling RamDiskSwitchFromBios() to allow the ramdisk routines to take control of disk r/w. Unlike the x86 virtual-ramdisk, the ramdisk here is also used as boot device, not only system device. Current FreeLDR output: Booting FreeLDR... FreeLoader v3.0 for ARM Bootargs: rdbase=0x2000000 rdsize=0x1400000 This file system has cluster sizes bigger than 64k. FreeLoader does not support this. Press any key Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/stubs.c Wed Feb 6 22:15:46 2008 @@ -35,10 +35,23 @@ // ASSERT(gRamDiskBase); ASSERT(gRamDiskSize); + + // + // Use magic ramdisk drive number and count the number of 512-byte sectors + // *DriveNumber = 0x49; *StartSector = 0; *SectorCount = gRamDiskSize * 512; + + // + // Ramdisk support is FAT-only for now + // *FsType = FS_FAT; + + // + // Now that ramdisk is enabled, use ramdisk routines + // + RamDiskSwitchFromBios(); return TRUE; } @@ -88,7 +101,7 @@ ArmDiskGetDriveGeometry(IN ULONG DriveNumber, OUT PGEOMETRY Geometry) { - while (TRUE); + ASSERT(FALSE); return FALSE; } @@ -107,14 +120,14 @@ IN ULONG SectorCount, IN PVOID Buffer) { - while (TRUE); + ASSERT(FALSE); return FALSE; } ULONG ArmDiskGetCacheableBlockCount(IN ULONG DriveNumber) { - while (TRUE); + ASSERT(FALSE); return FALSE; }

1 0

[janderwald] 32168: - apply changes from prev rev
by janderwald＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: janderwald Date: Wed Feb 6 21:59:51 2008 New Revision: 32168 URL: http://svn.reactos.org/svn/reactos?rev=32168&view=rev Log: - apply changes from prev rev Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Wed Feb 6 21:59:51 2008 @@ -414,19 +414,18 @@ typedef struct { - LPCWSTR lpSource; - LPCWSTR lpTarget; - LPCWSTR lpExeName; + ULONG SourceLength; + ULONG ExeLength; + ULONG TargetLength; } CSRSS_ADD_CONSOLE_ALIAS, *PCSRSS_ADD_CONSOLE_ALIAS; typedef struct { - LPWSTR lpSource; - LPWSTR lpExeName; - DWORD BytesWritten; - DWORD TargetBufferLength; - LPWSTR TargetBuffer; - + ULONG SourceLength; + ULONG ExeLength; + ULONG BytesWritten; + ULONG TargetBufferLength; + PVOID TargetBuffer; } CSRSS_GET_CONSOLE_ALIAS, *PCSRSS_GET_CONSOLE_ALIAS; typedef struct @@ -468,6 +467,7 @@ /* WCHARs, not bytes! */ #define CSRSS_MAX_TITLE_LENGTH 80 +#define CSRSS_MAX_ALIAS_TARGET_LENGTH 80 #define CREATE_PROCESS (0x0) #define TERMINATE_PROCESS (0x1)

1 0

[janderwald] 32167: - partly fix AddConsoleAlias/GetConsoleAlias - add hack for GetConsoleAliasW to circumvent CsrCaptureMessageBuffer is not working
by janderwald＠svn.reactos.org 06 Feb '08

06 Feb '08

Author: janderwald Date: Wed Feb 6 21:59:18 2008 New Revision: 32167 URL: http://svn.reactos.org/svn/reactos?rev=32167&view=rev Log: - partly fix AddConsoleAlias/GetConsoleAlias - add hack for GetConsoleAliasW to circumvent CsrCaptureMessageBuffer is not working Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c Modified: trunk/reactos/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/alias.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/alias.c Wed Feb 6 21:59:18 2008 @@ -112,6 +112,7 @@ PALIAS_ENTRY RootHeader = Header->Data; while(RootHeader) { + DPRINT("IntGetAliasEntry>lpSource %S\n", RootHeader->lpSource); INT diff = _wcsicmp(RootHeader->lpSource, lpSrcName); if (!diff) return RootHeader; @@ -136,6 +137,7 @@ if (!CurrentEntry) { Header->Data = NewEntry; + NewEntry->Next = NULL; return; } @@ -235,10 +237,12 @@ Length += wcslen(CurEntry->lpTarget); Length += 2; // zero byte and '=' } + if (Length) - Length++; // extra zero - - return sizeof(WCHAR) * Length; + { + return (Length+1) * sizeof(WCHAR); + } + return 0; } UINT IntGetAllConsoleAliases(PALIAS_HEADER Header, LPWSTR TargetBuffer, UINT TargetBufferLength) @@ -298,17 +302,31 @@ { PALIAS_HEADER Header; PALIAS_ENTRY Entry; - - if (Request->Data.AddConsoleAlias.lpExeName == NULL || Request->Data.AddConsoleAlias.lpSource == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, Request->Data.AddConsoleAlias.lpExeName); - if (!Header && Request->Data.AddConsoleAlias.lpTarget != NULL) - { - Header = IntCreateAliasHeader(Request->Data.AddConsoleAlias.lpExeName); + WCHAR * lpExeName; + WCHAR * lpSource; + WCHAR * lpTarget; + ULONG TotalLength; + WCHAR * Ptr; + + TotalLength = Request->Data.AddConsoleAlias.SourceLength + Request->Data.AddConsoleAlias.ExeLength + Request->Data.AddConsoleAlias.TargetLength; + Ptr = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + + lpSource = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + lpExeName = (WCHAR*)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE) + Request->Data.AddConsoleAlias.SourceLength * sizeof(WCHAR)); + lpTarget = (Request->Data.AddConsoleAlias.TargetLength != 0 ? lpExeName + Request->Data.AddConsoleAlias.ExeLength : NULL); + + DPRINT("CsrAddConsoleAlias entered Request %p lpSource %p lpExeName %p lpTarget %p\n", Request, lpSource, lpExeName, lpTarget); + + if (lpExeName == NULL || lpSource == NULL) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, lpExeName); + if (!Header && lpTarget != NULL) + { + Header = IntCreateAliasHeader(lpExeName); if (!Header) { Request->Status = STATUS_INSUFFICIENT_RESOURCES; @@ -317,9 +335,9 @@ IntInsertAliasHeader(&RootHeader, Header); } - if (Request->Data.AddConsoleAlias.lpTarget == NULL) // delete the entry - { - Entry = IntGetAliasEntry(Header, Request->Data.AddConsoleAlias.lpSource); + if (lpTarget == NULL) // delete the entry + { + Entry = IntGetAliasEntry(Header, lpSource); if (Entry) { IntDeleteAliasEntry(Header, Entry); @@ -329,12 +347,10 @@ { Request->Status = STATUS_INVALID_PARAMETER; } - - return Request->Status; - } - - Entry = IntCreateAliasEntry(Request->Data.AddConsoleAlias.lpSource, - Request->Data.AddConsoleAlias.lpTarget); + return Request->Status; + } + + Entry = IntCreateAliasEntry(lpSource, lpTarget); if (!Entry) { @@ -343,7 +359,6 @@ } IntInsertAliasEntry(Header, Entry); - Request->Status = STATUS_SUCCESS; return Request->Status; } @@ -353,22 +368,33 @@ PALIAS_HEADER Header; PALIAS_ENTRY Entry; UINT Length; - - if (Request->Data.GetConsoleAlias.lpExeName == NULL || Request->Data.GetConsoleAlias.TargetBuffer == NULL || - Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.lpSource == NULL) - { - Request->Status = STATUS_INVALID_PARAMETER; - return Request->Status; - } - - Header = IntFindAliasHeader(RootHeader, Request->Data.GetAllConsoleAlias.lpExeName); + WCHAR * lpExeName; + WCHAR * lpSource; + WCHAR * lpTarget; + + lpSource = (LPWSTR)((ULONG_PTR)Request + sizeof(CSR_API_MESSAGE)); + lpExeName = lpSource + Request->Data.GetConsoleAlias.SourceLength; + lpTarget = (LPWSTR)lpExeName + Request->Data.GetConsoleAlias.ExeLength; + + + DPRINT("CsrGetConsoleAlias entered lpExeName %p lpSource %p TargetBuffer %p TargetBufferLength %u\n", + lpExeName, lpSource, lpTarget, Request->Data.GetConsoleAlias.TargetBufferLength); + + if (Request->Data.GetConsoleAlias.ExeLength == 0 || lpTarget == NULL || + Request->Data.GetConsoleAlias.TargetBufferLength == 0 || Request->Data.GetConsoleAlias.SourceLength == 0) + { + Request->Status = STATUS_INVALID_PARAMETER; + return Request->Status; + } + + Header = IntFindAliasHeader(RootHeader, lpExeName); if (!Header) { Request->Status = STATUS_INVALID_PARAMETER; return Request->Status; } - Entry = IntGetAliasEntry(Header, Request->Data.GetConsoleAlias.lpSource); + Entry = IntGetAliasEntry(Header, lpSource); if (!Entry) { Request->Status = STATUS_INVALID_PARAMETER; @@ -381,7 +407,20 @@ Request->Status = ERROR_INSUFFICIENT_BUFFER; return Request->Status; } - wcscpy(Request->Data.GetConsoleAlias.TargetBuffer, Entry->lpTarget); + +#if 0 + if (((PVOID)lpTarget < ProcessData->CsrSectionViewBase) + || (((ULONG_PTR)lpTarget + Request->Data.GetConsoleAlias.TargetBufferLength) > ((ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize))) + { + Request->Status = STATUS_ACCESS_VIOLATION; + DPRINT1("CsrGetConsoleAlias out of range lpTarget %p LowerViewBase %p UpperViewBase %p Size %p\n", lpTarget, + ProcessData->CsrSectionViewBase, (ULONG_PTR)ProcessData->CsrSectionViewBase + ProcessData->CsrSectionViewSize, ProcessData->CsrSectionViewSize); + return Request->Status; + } +#endif + + wcscpy(lpTarget, Entry->lpTarget); + lpTarget[CSRSS_MAX_ALIAS_TARGET_LENGTH-1] = '\0'; Request->Data.GetConsoleAlias.BytesWritten = Length; Request->Status = STATUS_SUCCESS; return Request->Status; @@ -448,7 +487,11 @@ CSR_API(CsrGetConsoleAliasesExes) { UINT BytesWritten; - UINT ExesLength = IntGetConsoleAliasesExesLength(RootHeader); + UINT ExesLength; + + DPRINT("CsrGetConsoleAliasesExes entered\n"); + + ExesLength = IntGetConsoleAliasesExesLength(RootHeader); if (ExesLength > Request->Data.GetConsoleAliasesExes.Length) { @@ -473,6 +516,8 @@ CSR_API(CsrGetConsoleAliasesExesLength) { + DPRINT("CsrGetConsoleAliasesExesLength entered\n"); + Request->Status = STATUS_SUCCESS; Request->Data.GetConsoleAliasesExesLength.Length = IntGetConsoleAliasesExesLength(RootHeader); return Request->Status;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs