Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 70682: [FREELDR] - Move some code where it should better belong to. - Add few source code file headers. - Add missing partition IDs.
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 14:07:18 2016 New Revision: 70682 URL: http://svn.reactos.org/svn/reactos?rev=70682&view=rev Log: [FREELDR] - Move some code where it should better belong to. - Add few source code file headers. - Add missing partition IDs. Modified: trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c [iso-8859-1] Wed Feb 3 14:07:18 2016 @@ -15,6 +15,11 @@ /* GLOBALS ********************************************************************/ PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; + +// ARC Disk Information +ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; +ULONG reactos_disk_count = 0; +CHAR reactos_arc_strings[32][256]; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1] Wed Feb 3 14:07:18 2016 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: GPL - See COPYING in the top level directory -* FILE: boot/freeldr/freeldr/arch/i386/halstub.c -* PURPOSE: I/O Stub HAL Routines -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/arch/i386/halstub.c + * PURPOSE: I/O Stub HAL Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] Wed Feb 3 14:07:18 2016 @@ -1,9 +1,21 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/arch/i386/ntoskrnl.c + * PURPOSE: NTOS glue routines for the MINIHAL library + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + #include <ntoskrnl.h> /* For KeStallExecutionProcessor */ #if defined(_M_IX86) || defined(_M_AMD64) #include <arch/pc/pcbios.h> #endif + +/* FUNCTIONS *****************************************************************/ VOID NTAPI @@ -37,7 +49,6 @@ { } -NTKERNELAPI VOID FASTCALL IoAssignDriveLetters( @@ -48,7 +59,6 @@ { } -NTKERNELAPI NTSTATUS FASTCALL IoSetPartitionInformation( @@ -60,7 +70,18 @@ return STATUS_NOT_IMPLEMENTED; } -NTKERNELAPI +/* + * NTSTATUS + * FASTCALL + * IoReadPartitionTable( + * IN PDEVICE_OBJECT DeviceObject, + * IN ULONG SectorSize, + * IN BOOLEAN ReturnRecognizedPartitions, + * OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + * + * See boot/freeldr/freeldr/disk/partition.c + */ + NTSTATUS FASTCALL IoWritePartitionTable( @@ -68,12 +89,11 @@ IN ULONG SectorSize, IN ULONG SectorsPerTrack, IN ULONG NumberOfHeads, - IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer) + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) { return STATUS_NOT_IMPLEMENTED; } -NTHALAPI VOID NTAPI KeStallExecutionProcessor( Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Wed Feb 3 14:07:18 2016 @@ -24,11 +24,6 @@ /* GLOBALS ********************************************************************/ -// ARC Disk Information -ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; -ULONG reactos_disk_count = 0; -CHAR reactos_arc_strings[32][256]; - typedef VOID (*OS_LOADING_METHOD)(IN OperatingSystemItem* OperatingSystem, 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 [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Wed Feb 3 14:07:18 2016 @@ -89,6 +89,7 @@ #define PARTITION_EXTENDED 0x05 // Extended partition entry #define PARTITION_HUGE 0x06 // Huge partition MS-DOS V4 #define PARTITION_IFS 0x07 // IFS Partition +#define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot Manager/OPUS/Coherent swap #define PARTITION_FAT32 0x0B // FAT32 #define PARTITION_FAT32_XINT13 0x0C // FAT32 using extended int13 services #define PARTITION_XINT13 0x0E // Win95 partition using extended int13 services @@ -97,6 +98,12 @@ #define PARTITION_PREP 0x41 // PowerPC Reference Platform (PReP) Boot Partition #define PARTITION_LDM 0x42 // Logical Disk Manager partition #define PARTITION_UNIX 0x63 // Unix +#define VALID_NTFT 0xC0 // NTFT uses high order bits +#define PARTITION_NTFT 0x80 // NTFT partition +#ifdef __REACTOS__ +#define PARTITION_OLD_LINUX 0x43 +#define PARTITION_LINUX 0x83 +#endif /////////////////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h [iso-8859-1] Wed Feb 3 14:07:18 2016 @@ -1,3 +1,11 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: boot/freeldr/freeldr/include/ntoskrnl.h + * PURPOSE: NTOS glue routines for the MINIHAL library + * PROGRAMMERS: Hervé Poussineau <hpoussin(a)reactos.org> + */ + #include <ntdef.h> #undef _NTHAL_ //#undef DECLSPEC_IMPORT

1 0

[hbelusca] 70681: [i8042PRT]: Forgot this one, addendum to r70680.
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 00:40:37 2016 New Revision: 70681 URL: http://svn.reactos.org/svn/reactos?rev=70681&view=rev Log: [i8042PRT]: Forgot this one, addendum to r70680. Modified: trunk/reactos/drivers/input/i8042prt/pnp.c Modified: trunk/reactos/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/pnp… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/pnp.c [iso-8859-1] Wed Feb 3 00:40:37 2016 @@ -147,7 +147,7 @@ WARN_(I8042PRT, "Warning: can't write SET_LEDS (0x%08lx)\n", Status); } - /* Turn on translation and SF (Some machines don't reboot if SF is not set, see ReactOS bug #1842) */ + /* Turn on translation and SF (Some machines don't reboot if SF is not set, see ReactOS bug CORE-1713) */ if (!i8042ChangeMode(DeviceExtension, 0, CCB_TRANSLATE | CCB_SYSTEM_FLAG)) return;

1 0

[hbelusca] 70680: [FREELDR][STREAM][NTOS] Replace old bugzilla report IDs to their JIRA counterparts. [LIBUSB] The third parameter of IoRegisterDeviceInterface is a pointer (optional). Use NULL ins...
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 00:37:23 2016 New Revision: 70680 URL: http://svn.reactos.org/svn/reactos?rev=70680&view=rev Log: [FREELDR][STREAM][NTOS] Replace old bugzilla report IDs to their JIRA counterparts. [LIBUSB] The third parameter of IoRegisterDeviceInterface is a pointer (optional). Use NULL instead of 0. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Wed Feb 3 00:37:23 2016 @@ -223,7 +223,7 @@ { //strcpy(szErrorOut, "ACP NLS Setting exists, but isn't readable"); //return FALSE; - wcscpy(NameBuffer, L"c_1252.nls"); // HACK: ReactOS bug #6727 + wcscpy(NameBuffer, L"c_1252.nls"); // HACK: ReactOS bug CORE-6105 } sprintf(AnsiName, "%S", NameBuffer); @@ -242,7 +242,7 @@ { //strcpy(szErrorOut, "OEMCP NLS setting exists, but isn't readable"); //return FALSE; - wcscpy(NameBuffer, L"c_437.nls"); // HACK: ReactOS bug #6727 + wcscpy(NameBuffer, L"c_437.nls"); // HACK: ReactOS bug CORE-6105 } sprintf(OemName, "%S", NameBuffer); Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/filter.c [iso-8859-1] Wed Feb 3 00:37:23 2016 @@ -130,7 +130,7 @@ /* Register device interface */ Status = IoRegisterDeviceInterface(DeviceExtension->PhysicalDeviceObject, StreamInformation->Category, - NULL, /* see bug 4566 */ + NULL, /* see CORE-4218 and r42457 */ &SymbolicLink); if (NT_SUCCESS(Status)) Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con… ============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Wed Feb 3 00:37:23 2016 @@ -3828,7 +3828,7 @@ // // register device interface // - Status = IoRegisterDeviceInterface(m_HubControllerDeviceObject, &GUID_DEVINTERFACE_USB_HUB, 0, &m_HubDeviceInterfaceString); + Status = IoRegisterDeviceInterface(m_HubControllerDeviceObject, &GUID_DEVINTERFACE_USB_HUB, NULL, &m_HubDeviceInterfaceString); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=706… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Wed Feb 3 00:37:23 2016 @@ -608,7 +608,7 @@ else if (KeGetCurrentIrql() == DISPATCH_LEVEL && (!Timeout || Timeout->QuadPart != 0)) { - /* HACK: tcpip is broken and waits with spinlocks acquired (bug #7129) */ + /* HACK: tcpip is broken and waits with spinlocks acquired (CORE-6473) */ DPRINT("%s called at DISPATCH_LEVEL with non-zero timeout!\n", __FUNCTION__); }

1 0

[hbelusca] 70679: [FREELDR]: Remove deprecated code.
by hbelusca＠svn.reactos.org 03 Feb '16

03 Feb '16

Author: hbelusca Date: Wed Feb 3 00:04:05 2016 New Revision: 70679 URL: http://svn.reactos.org/svn/reactos?rev=70679&view=rev Log: [FREELDR]: Remove deprecated code. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Wed Feb 3 00:04:05 2016 @@ -420,10 +420,6 @@ /* UNIMPLEMENTED */ } -/* Compatibility functions that don't do much */ -VOID PpcVideoPrepareForReactOS(BOOLEAN Setup) { -} - void PpcDefaultMachVtbl() { MachVtbl.ConsPutChar = PpcOfwPutChar; @@ -442,7 +438,6 @@ MachVtbl.VideoSetPaletteColor = PpcVideoSetPaletteColor; MachVtbl.VideoGetPaletteColor = PpcVideoGetPaletteColor; MachVtbl.VideoSync = PpcVideoSync; - MachVtbl.VideoPrepareForReactOS = PpcVideoPrepareForReactOS; MachVtbl.GetMemoryMap = PpcGetMemoryMap; Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c [iso-8859-1] Wed Feb 3 00:04:05 2016 @@ -60,10 +60,6 @@ *Width = 80; *Height = 25; *Depth = 16; -} - -void PpcPrepVideoPrepareForReactOS(BOOLEAN setup) -{ } VOID PpcInitializeMmu(int max); @@ -141,8 +137,6 @@ MachVtbl.VideoSetDisplayMode = PpcPrepVideoSetDisplayMode; MachVtbl.VideoGetDisplaySize = PpcPrepVideoGetDisplaySize; - MachVtbl.VideoPrepareForReactOS = PpcPrepVideoPrepareForReactOS; - MachVtbl.GetMemoryMap = PpcPrepGetMemoryMap; MachVtbl.HwDetect = PpcPrepHwDetect; MachVtbl.HwIdle = PcPrepHwIdle;

1 0

[hbelusca] 70678: [NTOS:INBV] - Initialize global variables to known default values. - When Inbv initializes the display, reset the video mode *ONLY* if we do not have a custom boot logo (because o...
by hbelusca＠svn.reactos.org 02 Feb '16

02 Feb '16

Author: hbelusca Date: Tue Feb 2 23:28:45 2016 New Revision: 70678 URL: http://svn.reactos.org/svn/reactos?rev=70678&view=rev Log: [NTOS:INBV] - Initialize global variables to known default values. - When Inbv initializes the display, reset the video mode *ONLY* if we do not have a custom boot logo (because otherwise we want to see our custom boot logo!). This also fixes the video mode used by ReactOS when booting it using Windows ntldr! Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=7… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Feb 2 23:28:45 2016 @@ -31,15 +31,15 @@ static KSPIN_LOCK BootDriverLock; static KIRQL InbvOldIrql; -static INBV_DISPLAY_STATE InbvDisplayState; +static INBV_DISPLAY_STATE InbvDisplayState = INBV_DISPLAY_STATE_DISABLED; BOOLEAN InbvBootDriverInstalled = FALSE; static BOOLEAN InbvDisplayDebugStrings = FALSE; -static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter; -static ULONG ProgressBarLeft, ProgressBarTop; +static INBV_DISPLAY_STRING_FILTER InbvDisplayFilter = NULL; +static ULONG ProgressBarLeft = 0, ProgressBarTop = 0; static BOOLEAN ShowProgressBar = FALSE; static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; -static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; +static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters = NULL; static ULONG ResourceCount = 0; static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries. @@ -214,8 +214,8 @@ InLoadOrderLinks); /* Check for a match */ - if ((RtlEqualUnicodeString(&LdrEntry->BaseDllName, &UpString, TRUE)) || - (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &MpString, TRUE))) + if (RtlEqualUnicodeString(&LdrEntry->BaseDllName, &UpString, TRUE) || + RtlEqualUnicodeString(&LdrEntry->BaseDllName, &MpString, TRUE)) { /* Break out */ break; @@ -226,7 +226,7 @@ if (NextEntry != ListHead) { /* Try to find the resource */ - ResourceInfo.Type = 2; //RT_BITMAP; + ResourceInfo.Type = 2; // RT_BITMAP; ResourceInfo.Name = ResourceId; ResourceInfo.Language = 0; Status = LdrFindResource_U(LdrEntry->DllBase, @@ -260,7 +260,7 @@ IN ULONG Count) { PCHAR CommandLine; - BOOLEAN CustomLogo = FALSE; + BOOLEAN ResetMode = FALSE; // By default do not reset the video mode ULONG i; /* Quit if we're already installed */ @@ -270,18 +270,15 @@ KeInitializeSpinLock(&BootDriverLock); if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) { - /* Check if we have a custom boot logo */ + /* Reset the video mode in case we do not have a custom boot logo */ CommandLine = (LoaderBlock->LoadOptions ? _strupr(LoaderBlock->LoadOptions) : NULL); - CustomLogo = (CommandLine && strstr(CommandLine, "BOOTLOGO") != NULL); + ResetMode = (CommandLine == NULL) || (strstr(CommandLine, "BOOTLOGO") == NULL); } /* Initialize the video */ - InbvBootDriverInstalled = VidInitialize(FALSE); + InbvBootDriverInstalled = VidInitialize(ResetMode); if (InbvBootDriverInstalled) { - /* Now reset the display, but only if there's a custom boot logo */ - VidResetDisplay(CustomLogo); - /* Find bitmap resources in the kernel */ ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList) - 1); for (i = 1; i <= ResourceCount; i++) @@ -696,7 +693,7 @@ { /* Update the coordinates */ ProgressBarLeft = Left; - ProgressBarTop = Top; + ProgressBarTop = Top; /* Enable the progress bar */ ShowProgressBar = TRUE;

1 0

[spetreolle] 70677: MSVC: Properly define debug functions for release builds.
by spetreolle＠svn.reactos.org 02 Feb '16

02 Feb '16

Author: spetreolle Date: Tue Feb 2 20:51:50 2016 New Revision: 70677 URL: http://svn.reactos.org/svn/reactos?rev=70677&view=rev Log: MSVC: Properly define debug functions for release builds. Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Tue Feb 2 20:51:50 2016 @@ -137,15 +137,15 @@ #define UNIMPLEMENTED - #define ERR_ __noop - #define WARN_ __noop - #define TRACE_ __noop - #define INFO_ __noop - - #define ERR__ __noop - #define WARN__ __noop - #define TRACE__ __noop - #define INFO__ __noop + #define ERR_(ch, ...) __noop + #define WARN_(ch, ...) __noop + #define TRACE_(ch, ...) __noop + #define INFO_(ch, ...) __noop + + #define ERR__(ch, ...) __noop + #define WARN__(ch, ...) __noop + #define TRACE__(ch, ...) __noop + #define INFO__(ch, ...) __noop #else #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)

1 0

[hbelusca] 70676: [USETUP]: Enlarge some string buffers that hold localized printf-formatted strings.
by hbelusca＠svn.reactos.org 02 Feb '16

02 Feb '16

Author: hbelusca Date: Tue Feb 2 02:23:56 2016 New Revision: 70676 URL: http://svn.reactos.org/svn/reactos?rev=70676&view=rev Log: [USETUP]: Enlarge some string buffers that hold localized printf-formatted strings. Modified: trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/mui.c Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Tue Feb 2 02:23:56 2016 @@ -143,7 +143,7 @@ COORD coPos; DWORD Written; ULONG Index = 0; - CHAR Buffer[70]; + CHAR Buffer[128]; ListEntry = List->ListHead.Flink; while (ListEntry != &List->ListHead) Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Tue Feb 2 02:23:56 2016 @@ -626,7 +626,7 @@ VOID GenericListKeyPress( PGENERIC_LIST GenericList, - CHAR AsciChar) + CHAR AsciiChar) { PGENERIC_LIST_ENTRY ListEntry; PGENERIC_LIST_ENTRY OldListEntry; @@ -637,13 +637,13 @@ GenericList->Redraw = FALSE; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar) && + if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar) && (GenericList->CurrentEntry->Entry.Flink != &GenericList->ListHead)) { ScrollDownGenericList(GenericList); ListEntry = GenericList->CurrentEntry; - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar)) + if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) goto End; } @@ -654,7 +654,7 @@ for (;;) { - if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciChar)) + if ((strlen(ListEntry->Text) > 0) && (tolower(ListEntry->Text[0]) == AsciiChar)) { Flag = TRUE; break; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Feb 2 02:23:56 2016 @@ -1747,7 +1747,7 @@ INPUT_RECORD Ir; COORD coPos; DWORD Written; - CHAR Buffer[100]; + CHAR Buffer[128]; WCHAR PartitionSizeBuffer[100]; ULONG Index; WCHAR ch; 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Tue Feb 2 02:23:56 2016 @@ -257,7 +257,7 @@ { ULONG i; const MUI_STRING * entry; - CHAR szErr[100]; + CHAR szErr[128]; entry = FindMUIStringEntries(); if (entry)

1 0

[hbelusca] 70675: [USETUP] - Use defines instead of hardcoded values for partition type IDs. - Add some support for installing ReactOS on EXT2 partitions. - Add few code that will be needed when we...
by hbelusca＠svn.reactos.org 02 Feb '16

02 Feb '16

Author: hbelusca Date: Tue Feb 2 01:55:05 2016 New Revision: 70675 URL: http://svn.reactos.org/svn/reactos?rev=70675&view=rev Log: [USETUP] - Use defines instead of hardcoded values for partition type IDs. - Add some support for installing ReactOS on EXT2 partitions. - Add few code that will be needed when we support NTFS installation. - Refactor InstallFatBootcodeToPartition and its auxiliary functions. CORE-4870 Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/bootsup.h trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/native/fslist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -78,6 +78,16 @@ USHORT BootSectorMagic; // 0xAA55 } FAT32_BOOTSECTOR, *PFAT32_BOOTSECTOR; + +typedef struct _EXT2_BOOTSECTOR +{ + // The EXT2 bootsector is completely user-specific. + // No FS data is stored there. + UCHAR Fill[1024]; +} EXT2_BOOTSECTOR, *PEXT2_BOOTSECTOR; + +// TODO: Add more bootsector structures! + #include <poppack.h> extern PPARTLIST PartitionList; @@ -287,8 +297,9 @@ L"Seconds until highlighted choice will be started automatically: "); } +static NTSTATUS -CreateFreeLoaderEntry( +CreateNTOSEntry( PINICACHE IniCache, PINICACHESECTION OSSection, PWCHAR Section, @@ -323,7 +334,7 @@ L"SystemPath", ArcPath); - /* Options=*/ + /* Options= */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, @@ -345,58 +356,59 @@ IniSection = IniCacheAppendSection(IniCache, L"Operating Systems"); /* ReactOS */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS", L"\"ReactOS\"", - L"Windows2003", ArcPath, - L""); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS", L"\"ReactOS\"", + L"Windows2003", ArcPath, + L""); /* ReactOS_Debug */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_Debug", L"\"ReactOS (Debug)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_Debug", L"\"ReactOS (Debug)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); #ifdef _WINKD_ /* ReactOS_VBoxDebug */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_VBoxDebug", L"\"ReactOS (VBoxDebug)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=VBOX /SOS"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_VBoxDebug", L"\"ReactOS (VBoxDebug)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=VBOX /SOS"); #endif #if DBG #ifndef _WINKD_ /* ReactOS_KdSerial */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_KdSerial", L"\"ReactOS (RosDbg)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL"); #endif /* ReactOS_Screen */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_Screen", L"\"ReactOS (Screen)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=SCREEN /SOS"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_Screen", L"\"ReactOS (Screen)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=SCREEN /SOS"); /* ReactOS_LogFile */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_LogFile", L"\"ReactOS (Log file)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=FILE /SOS"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_LogFile", L"\"ReactOS (Log file)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=FILE /SOS"); /* ReactOS_Ram */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", - L"Windows2003", L"ramdisk(0)\\ReactOS", - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDPATH=reactos.img /RDIMAGEOFFSET=32256"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"", + L"Windows2003", L"ramdisk(0)\\ReactOS", + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDPATH=reactos.img /RDIMAGEOFFSET=32256"); /* ReactOS_EMS */ - CreateFreeLoaderEntry(IniCache, IniSection, - L"ReactOS_EMS", L"\"ReactOS (Emergency Management Services)\"", - L"Windows2003", ArcPath, - L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200"); + CreateNTOSEntry(IniCache, IniSection, + L"ReactOS_EMS", L"\"ReactOS (Emergency Management Services)\"", + L"Windows2003", ArcPath, + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /redirect=com2 /redirectbaudrate=115200"); #endif } +static NTSTATUS CreateFreeLoaderIniForReactOS( PWCHAR IniPath, @@ -420,10 +432,16 @@ return STATUS_SUCCESS; } +static NTSTATUS -CreateFreeLoaderIniForDos( +CreateFreeLoaderIniForReactOSAndBootSector( PWCHAR IniPath, - PWCHAR ArcPath) + PWCHAR ArcPath, + PWCHAR Section, + PWCHAR Description, + PWCHAR BootDrive, + PWCHAR BootPartition, + PWCHAR BootSector) { PINICACHE IniCache; PINICACHESECTION IniSection; @@ -440,15 +458,15 @@ /* Get "Operating Systems" section */ IniSection = IniCacheGetSection(IniCache, L"Operating Systems"); - /* DOS=DOS/Windows */ + /* Insert entry into "Operating Systems" section */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, - L"DOS", - L"\"DOS/Windows\""); - - /* Create the "DOS" section */ - IniSection = IniCacheAppendSection(IniCache, L"DOS"); + Section, + Description); + + /* Create new section */ + IniSection = IniCacheAppendSection(IniCache, Section); /* BootType=BootSector */ IniCacheInsertKey(IniSection, @@ -457,26 +475,26 @@ L"BootType", L"BootSector"); - /* BootDrive=hd0 */ + /* BootDrive= */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"BootDrive", - L"hd0"); - - /* BootPartition=1 */ + BootDrive); + + /* BootPartition= */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"BootPartition", - L"1"); - - /* BootSector=BOOTSECT.DOS */ + BootPartition); + + /* BootSector= */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, L"BootSectorFile", - L"BOOTSECT.DOS"); + BootSector); /* Save the INI file */ IniCacheSave(IniCache, IniPath); @@ -485,12 +503,13 @@ return STATUS_SUCCESS; } - +static NTSTATUS UpdateFreeLoaderIni( PWCHAR IniPath, PWCHAR ArcPath) { + NTSTATUS Status; PINICACHE IniCache; PINICACHESECTION IniSection; PINICACHESECTION OsIniSection; @@ -500,7 +519,6 @@ WCHAR SectionName2[200]; PWCHAR KeyData; ULONG i,j; - NTSTATUS Status; Status = IniCacheLoad(&IniCache, IniPath, FALSE); if (!NT_SUCCESS(Status)) @@ -597,10 +615,10 @@ } /* Create a new "ReactOS" entry */ - CreateFreeLoaderEntry(IniCache, IniSection, - SectionName, OsName, - L"Windows2003", ArcPath, - L""); + CreateNTOSEntry(IniCache, IniSection, + SectionName, OsName, + L"Windows2003", ArcPath, + L""); IniCacheSave(IniCache, IniPath); IniCacheDestroy(IniCache); @@ -608,23 +626,30 @@ return STATUS_SUCCESS; } - -NTSTATUS -SaveCurrentBootSector( - PWSTR RootPath, - PWSTR DstPath) +static +BOOLEAN +IsThereAValidBootSector(PWSTR RootPath) { + /* + * Check the first DWORD (4 bytes) of the bootsector for a potential + * "valid" instruction (the BIOS starts execution of the bootsector + * at its beginning). Currently the criterium is that this DWORD must + * be non-zero. + */ + + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PUCHAR BootSector; + ULONG Instruction; /* Allocate buffer for bootsector */ BootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); if (BootSector == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + return FALSE; // STATUS_INSUFFICIENT_RESOURCES; /* Read current boot sector into buffer */ RtlInitUnicodeString(&Name, RootPath); @@ -644,9 +669,10 @@ if (!NT_SUCCESS(Status)) { RtlFreeHeap(ProcessHeap, 0, BootSector); - return Status; - } - + return FALSE; // Status; + } + + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -654,7 +680,71 @@ &IoStatusBlock, BootSector, SECTORSIZE, - NULL, + &FileOffset, + NULL); + NtClose(FileHandle); + + Instruction = *(PULONG)BootSector; + + /* Free the boot sector */ + RtlFreeHeap(ProcessHeap, 0, BootSector); + + if (!NT_SUCCESS(Status)) + return FALSE; // Status; + + return (Instruction != 0x00000000); +} + +static +NTSTATUS +SaveCurrentBootSector( + PWSTR RootPath, + PWSTR DstPath, + ULONG Length) +{ + NTSTATUS Status; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + LARGE_INTEGER FileOffset; + PUCHAR BootSector; + + /* Allocate buffer for bootsector */ + BootSector = RtlAllocateHeap(ProcessHeap, 0, Length); + if (BootSector == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Read current boot sector into buffer */ + RtlInitUnicodeString(&Name, RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, BootSector); + return Status; + } + + FileOffset.QuadPart = 0ULL; + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + BootSector, + Length, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -695,36 +785,37 @@ NULL, &IoStatusBlock, BootSector, - SECTORSIZE, + Length, NULL, NULL); NtClose(FileHandle); - /* Free the new boot sector */ + /* Free the boot sector */ RtlFreeHeap(ProcessHeap, 0, BootSector); return Status; } - +static NTSTATUS InstallFat16BootCodeToFile( PWSTR SrcPath, PWSTR DstPath, PWSTR RootPath) { + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PFAT_BOOTSECTOR OrigBootSector; PFAT_BOOTSECTOR NewBootSector; /* Allocate buffer for original bootsector */ OrigBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); if (OrigBootSector == NULL) - return STATUS_INSUFFICIENT_RESOURCES ; + return STATUS_INSUFFICIENT_RESOURCES; /* Read current boot sector into buffer */ RtlInitUnicodeString(&Name, RootPath); @@ -747,6 +838,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -754,7 +846,7 @@ &IoStatusBlock, OrigBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -793,6 +885,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -800,7 +893,7 @@ &IoStatusBlock, NewBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -845,9 +938,7 @@ return Status; } -#if 0 - FilePosition.QuadPart = 0; -#endif + FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, NULL, @@ -865,21 +956,21 @@ return Status; } - +static NTSTATUS InstallFat32BootCodeToFile( PWSTR SrcPath, PWSTR DstPath, PWSTR RootPath) { + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PFAT32_BOOTSECTOR OrigBootSector; PFAT32_BOOTSECTOR NewBootSector; - LARGE_INTEGER FileOffset; /* Allocate buffer for original bootsector */ OrigBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); @@ -907,6 +998,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -1008,6 +1100,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, NULL, @@ -1072,11 +1165,12 @@ PWSTR SrcPath, PWSTR RootPath) { + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PPARTITION_SECTOR OrigBootSector; PPARTITION_SECTOR NewBootSector; @@ -1109,6 +1203,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -1116,7 +1211,7 @@ &IoStatusBlock, OrigBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -1204,6 +1299,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, NULL, @@ -1211,7 +1307,7 @@ &IoStatusBlock, NewBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); @@ -1221,17 +1317,18 @@ return Status; } - +static NTSTATUS InstallFat12BootCodeToFloppy( PWSTR SrcPath, PWSTR RootPath) { + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PFAT_BOOTSECTOR OrigBootSector; PFAT_BOOTSECTOR NewBootSector; @@ -1261,6 +1358,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -1268,7 +1366,7 @@ &IoStatusBlock, OrigBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -1357,9 +1455,7 @@ return Status; } -#if 0 - FilePosition.QuadPart = 0; -#endif + FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, NULL, @@ -1367,7 +1463,7 @@ &IoStatusBlock, NewBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); @@ -1377,17 +1473,18 @@ return Status; } - +static NTSTATUS InstallFat16BootCodeToDisk( PWSTR SrcPath, PWSTR RootPath) { + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PFAT_BOOTSECTOR OrigBootSector; PFAT_BOOTSECTOR NewBootSector; @@ -1417,6 +1514,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -1424,7 +1522,7 @@ &IoStatusBlock, OrigBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -1434,9 +1532,7 @@ } /* Allocate buffer for new bootsector */ - NewBootSector = RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + NewBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); if (NewBootSector == NULL) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1515,9 +1611,7 @@ return Status; } -#if 0 - FilePosition.QuadPart = 0; -#endif + FileOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandle, NULL, NULL, @@ -1525,7 +1619,7 @@ &IoStatusBlock, NewBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); @@ -1535,20 +1629,20 @@ return Status; } - +static NTSTATUS InstallFat32BootCodeToDisk( PWSTR SrcPath, PWSTR RootPath) { + NTSTATUS Status; + UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; HANDLE FileHandle; - NTSTATUS Status; + LARGE_INTEGER FileOffset; PFAT32_BOOTSECTOR OrigBootSector; PFAT32_BOOTSECTOR NewBootSector; - LARGE_INTEGER FileOffset; USHORT BackupBootSector; /* Allocate buffer for original bootsector */ @@ -1577,6 +1671,7 @@ return Status; } + FileOffset.QuadPart = 0ULL; Status = NtReadFile(FileHandle, NULL, NULL, @@ -1584,7 +1679,7 @@ &IoStatusBlock, OrigBootSector, SECTORSIZE, - NULL, + &FileOffset, NULL); NtClose(FileHandle); if (!NT_SUCCESS(Status)) @@ -1741,6 +1836,217 @@ return Status; } +static +NTSTATUS +InstallExt2BootCodeToDisk( + PWSTR SrcPath, + PWSTR RootPath) +{ + NTSTATUS Status; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + LARGE_INTEGER FileOffset; +// PEXT2_BOOTSECTOR OrigBootSector; + PEXT2_BOOTSECTOR NewBootSector; + // USHORT BackupBootSector; + +#if 0 + /* Allocate buffer for original bootsector */ + OrigBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); + if (OrigBootSector == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Read current boot sector into buffer */ + RtlInitUnicodeString(&Name, RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return Status; + } + + FileOffset.QuadPart = 0ULL; + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + OrigBootSector, + SECTORSIZE, + &FileOffset, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return Status; + } +#endif + + /* Allocate buffer for new bootsector */ + NewBootSector = RtlAllocateHeap(ProcessHeap, 0, sizeof(EXT2_BOOTSECTOR)); + if (NewBootSector == NULL) + { + // RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Read new bootsector from SrcPath */ + RtlInitUnicodeString(&Name, SrcPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + // RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + sizeof(EXT2_BOOTSECTOR), + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + // RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + +#if 0 + /* Adjust bootsector (copy a part of the FAT32 BPB) */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); + + NewBootSector->HiddenSectors = PartitionList->CurrentDisk->SectorsPerTrack; + + /* Get the location of the backup boot sector */ + BackupBootSector = OrigBootSector->BackupBootSector; + + /* Free the original boot sector */ + // RtlFreeHeap(ProcessHeap, 0, OrigBootSector); +#endif + + /* Write new bootsector to RootPath */ + RtlInitUnicodeString(&Name, RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_WRITE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + + /* Write sector 0 */ + FileOffset.QuadPart = 0ULL; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + sizeof(EXT2_BOOTSECTOR), + &FileOffset, + NULL); +#if 0 + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + + /* Write backup boot sector */ + if ((BackupBootSector != 0x0000) && (BackupBootSector != 0xFFFF)) + { + FileOffset.QuadPart = (ULONGLONG)((ULONG)BackupBootSector * SECTORSIZE); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + NtClose(FileHandle); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + } + + /* Write sector 14 */ + FileOffset.QuadPart = 14 * SECTORSIZE; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + ((PUCHAR)NewBootSector + SECTORSIZE), + SECTORSIZE, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtWriteFile() failed (Status %lx)\n", Status); + } +#endif + NtClose(FileHandle); + + /* Free the new boot sector */ + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + + return Status; +} static NTSTATUS @@ -1748,12 +2054,12 @@ PWSTR FileName, PULONG Attributes) { + NTSTATUS Status; UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInfo; HANDLE FileHandle; - NTSTATUS Status; RtlInitUnicodeString(&Name, FileName); @@ -1814,7 +2120,6 @@ NtClose(FileHandle); return Status; } - static NTSTATUS @@ -1822,12 +2127,12 @@ PWSTR FileName, ULONG Attributes) { + NTSTATUS Status; UNICODE_STRING Name; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInfo; HANDLE FileHandle; - NTSTATUS Status; RtlInitUnicodeString(&Name, FileName); @@ -1877,16 +2182,16 @@ return Status; } - +static NTSTATUS UpdateBootIni( PWSTR BootIniPath, PWSTR EntryName, PWSTR EntryValue) { + NTSTATUS Status; PINICACHE Cache = NULL; PINICACHESECTION Section = NULL; - NTSTATUS Status; ULONG FileAttribute; PWCHAR OldValue = NULL; @@ -1940,28 +2245,7 @@ return Status; } - -BOOLEAN -CheckInstallFatBootcodeToPartition( - PUNICODE_STRING SystemRootPath) -{ -#ifdef __REACTOS__ - if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") || - DoesFileExist(SystemRootPath->Buffer, L"boot.ini")) - { - return TRUE; - } - else if (DoesFileExist(SystemRootPath->Buffer, L"io.sys") || - DoesFileExist(SystemRootPath->Buffer, L"msdos.sys")) - { - return TRUE; - } -#endif - - return FALSE; -} - - +static NTSTATUS InstallFatBootcodeToPartition( PUNICODE_STRING SystemRootPath, @@ -1970,62 +2254,83 @@ UCHAR PartitionType) { #ifdef __REACTOS__ + NTSTATUS Status; + BOOLEAN DoesFreeLdrExist; WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; - NTSTATUS Status; /* FAT or FAT32 partition */ DPRINT("System path: '%wZ'\n", SystemRootPath); + /* Copy FreeLoader to the boot partition */ + wcscpy(SrcPath, SourceRootPath->Buffer); + wcscat(SrcPath, L"\\loader\\freeldr.sys"); + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\freeldr.sys"); + + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); + Status = SetupCopyFile(SrcPath, DstPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); + return Status; + } + + /* Prepare for possibly copying 'freeldr.ini' */ + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\freeldr.ini"); + + DoesFreeLdrExist = DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini"); + if (DoesFreeLdrExist) + { + /* Update existing 'freeldr.ini' */ + DPRINT1("Update existing 'freeldr.ini'\n"); + + Status = UpdateFreeLoaderIni(DstPath, DestinationArcPath->Buffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status); + return Status; + } + } + + /* Check for NT and other bootloaders */ + + // FIXME: Check for Vista+ bootloader! if (DoesFileExist(SystemRootPath->Buffer, L"ntldr") == TRUE || DoesFileExist(SystemRootPath->Buffer, L"boot.ini") == TRUE) { - /* Search root directory for 'ntldr' and 'boot.ini'. */ - DPRINT("Found Microsoft Windows NT/2000/XP boot loader\n"); - - /* Copy FreeLoader to the boot partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); - - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); - return Status; - } - - /* Create or update freeldr.ini */ - if (DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini") == FALSE) + /* Search root directory for 'ntldr' and 'boot.ini' */ + DPRINT1("Found Microsoft Windows NT/2000/XP boot loader\n"); + + /* Create or update 'freeldr.ini' */ + if (DoesFreeLdrExist == FALSE) { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - Status = CreateFreeLoaderIniForReactOS(DstPath, - DestinationArcPath->Buffer); + // wcscpy(DstPath, SystemRootPath->Buffer); + // wcscat(DstPath, L"\\freeldr.ini"); + + Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); return Status; } - /* Install new bootcode */ + /* Install new bootcode into a file */ + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\bootsect.ros"); + if (PartitionType == PARTITION_FAT32 || PartitionType == PARTITION_FAT32_XINT13) { /* Install FAT32 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat32.bin"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.ros"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, DstPath); - Status = InstallFat32BootCodeToFile(SrcPath, - DstPath, + Status = InstallFat32BootCodeToFile(SrcPath, DstPath, SystemRootPath->Buffer); if (!NT_SUCCESS(Status)) { @@ -2038,33 +2343,15 @@ /* Install FAT16 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat.bin"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.ros"); DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); - Status = InstallFat16BootCodeToFile(SrcPath, - DstPath, + Status = InstallFat16BootCodeToFile(SrcPath, DstPath, SystemRootPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat16BootCodeToFile() failed (Status %lx)\n", Status); return Status; } - } - } - else - { - /* Update existing 'freeldr.ini' */ - DPRINT1("Update existing 'freeldr.ini'\n"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - Status = UpdateFreeLoaderIni(DstPath, - DestinationArcPath->Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status); - return Status; } } @@ -2082,66 +2369,111 @@ return Status; } } - else if (DoesFileExist(SystemRootPath->Buffer, L"io.sys") == TRUE || - DoesFileExist(SystemRootPath->Buffer, L"msdos.sys") == TRUE) - { - /* Search for root directory for 'io.sys' and 'msdos.sys'. */ - DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); - - /* Copy FreeLoader to the boot partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); - - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath); - if (!NT_SUCCESS(Status)) + else + { + /* Non-NT bootloaders: install our own bootloader */ + + PWCHAR Section; + PWCHAR Description; + PWCHAR BootDrive; + PWCHAR BootPartition; + PWCHAR BootSector; + PWCHAR BootSectorFileName; + + if (DoesFileExist(SystemRootPath->Buffer, L"io.sys") == TRUE || + DoesFileExist(SystemRootPath->Buffer, L"msdos.sys") == TRUE) { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); - return Status; + /* Search for root directory for 'io.sys' and 'msdos.sys' */ + DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); + + Section = L"DOS"; + Description = L"\"DOS/Windows\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.DOS"; + + BootSectorFileName = L"\\bootsect.dos"; } + else + if (DoesFileExist(SystemRootPath->Buffer, L"kernel.sys") == TRUE) + { + /* Search for root directory for 'kernel.sys' */ + DPRINT1("Found FreeDOS boot loader\n"); + + Section = L"DOS"; + Description = L"\"FreeDOS\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.DOS"; + + BootSectorFileName = L"\\bootsect.dos"; + } + else + { + /* No or unknown boot loader */ + DPRINT1("No or unknown boot loader found\n"); + + Section = L"Unknown"; + Description = L"\"Unknown Operating System\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.OLD"; + + BootSectorFileName = L"\\bootsect.old"; + } /* Create or update 'freeldr.ini' */ - if (DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini") == FALSE) + if (DoesFreeLdrExist == FALSE) { /* Create new 'freeldr.ini' */ DPRINT1("Create new 'freeldr.ini'\n"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - Status = CreateFreeLoaderIniForDos(DstPath, - DestinationArcPath->Buffer); - if (!NT_SUCCESS(Status)) + // wcscpy(DstPath, SystemRootPath->Buffer); + // wcscat(DstPath, L"\\freeldr.ini"); + + if (IsThereAValidBootSector(SystemRootPath->Buffer)) { - DPRINT1("CreateFreeLoaderIniForDos() failed (Status %lx)\n", Status); - return Status; + Status = CreateFreeLoaderIniForReactOSAndBootSector( + DstPath, DestinationArcPath->Buffer, + Section, Description, + BootDrive, BootPartition, BootSector); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreateFreeLoaderIniForReactOSAndBootSector() failed (Status %lx)\n", Status); + return Status; + } + + /* Save current bootsector */ + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, BootSectorFileName); + + DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); + Status = SaveCurrentBootSector(SystemRootPath->Buffer, DstPath, SECTORSIZE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); + return Status; + } } - - /* Save current bootsector as 'BOOTSECT.DOS' */ - wcscpy(SrcPath, SystemRootPath->Buffer); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.dos"); - - DPRINT1("Save bootsector: %S ==> %S\n", SrcPath, DstPath); - Status = SaveCurrentBootSector(SrcPath, - DstPath); - if (!NT_SUCCESS(Status)) + else { - DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); - return Status; + Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); + return Status; + } } - /* Install new bootsector */ + /* Install new bootsector on the disk */ if (PartitionType == PARTITION_FAT32 || PartitionType == PARTITION_FAT32_XINT13) { + /* Install FAT32 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat32.bin"); DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); - Status = InstallFat32BootCodeToDisk(SrcPath, - SystemRootPath->Buffer); + Status = InstallFat32BootCodeToDisk(SrcPath, SystemRootPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat32BootCodeToDisk() failed (Status %lx)\n", Status); @@ -2150,12 +2482,12 @@ } else { + /* Install FAT16 bootcode */ wcscpy(SrcPath, SourceRootPath->Buffer); wcscat(SrcPath, L"\\loader\\fat.bin"); - DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); - Status = InstallFat16BootCodeToDisk(SrcPath, - SystemRootPath->Buffer); + DPRINT1("Install FAT16 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); + Status = InstallFat16BootCodeToDisk(SrcPath, SystemRootPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status); @@ -2163,111 +2495,122 @@ } } } - else + } + + return STATUS_SUCCESS; +#else + return STATUS_NOT_IMPLEMENTED; +#endif +} + +static +NTSTATUS +InstallExt2BootcodeToPartition( + PUNICODE_STRING SystemRootPath, + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING DestinationArcPath, + UCHAR PartitionType) +{ +#ifdef __REACTOS__ + NTSTATUS Status; + BOOLEAN DoesFreeLdrExist; + WCHAR SrcPath[MAX_PATH]; + WCHAR DstPath[MAX_PATH]; + + /* EXT2 partition */ + DPRINT("System path: '%wZ'\n", SystemRootPath); + + /* Copy FreeLoader to the boot partition */ + wcscpy(SrcPath, SourceRootPath->Buffer); + wcscat(SrcPath, L"\\loader\\freeldr.sys"); + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\freeldr.sys"); + + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); + Status = SetupCopyFile(SrcPath, DstPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); + return Status; + } + + /* Prepare for possibly copying 'freeldr.ini' */ + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\freeldr.ini"); + + DoesFreeLdrExist = DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini"); + if (DoesFreeLdrExist) + { + /* Update existing 'freeldr.ini' */ + DPRINT1("Update existing 'freeldr.ini'\n"); + + Status = UpdateFreeLoaderIni(DstPath, DestinationArcPath->Buffer); + if (!NT_SUCCESS(Status)) { - /* Update existing 'freeldr.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - Status = UpdateFreeLoaderIni(DstPath, DestinationArcPath->Buffer); + DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status); + return Status; + } + } + + /* Check for *nix bootloaders */ + + /* Create or update 'freeldr.ini' */ + if (DoesFreeLdrExist == FALSE) + { + /* Create new 'freeldr.ini' */ + DPRINT1("Create new 'freeldr.ini'\n"); + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\freeldr.ini"); + + /* Certainly SysLinux, GRUB, LILO... or an unknown boot loader */ + DPRINT1("*nix or unknown boot loader found\n"); + + if (IsThereAValidBootSector(SystemRootPath->Buffer)) + { + Status = CreateFreeLoaderIniForReactOSAndBootSector( + DstPath, DestinationArcPath->Buffer, + L"Linux", L"\"Linux\"", + L"hd0", L"1", L"BOOTSECT.OLD"); if (!NT_SUCCESS(Status)) { - DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status); + DPRINT1("CreateFreeLoaderIniForReactOSAndBootSector() failed (Status %lx)\n", Status); + return Status; + } + + /* Save current bootsector */ + wcscpy(DstPath, SystemRootPath->Buffer); + wcscat(DstPath, L"\\bootsect.old"); + + DPRINT1("Save bootsector: %S ==> %S\n", SystemRootPath->Buffer, DstPath); + Status = SaveCurrentBootSector(SystemRootPath->Buffer, DstPath, sizeof(EXT2_BOOTSECTOR)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); return Status; } } - } - else - { - /* No or unknown boot loader */ - DPRINT1("No or unknown boot loader found\n"); - - /* Copy FreeLoader to the boot partition */ - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\freeldr.sys"); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.sys"); - - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = SetupCopyFile(SrcPath, DstPath); - if (!NT_SUCCESS(Status)) + else { - DPRINT1("SetupCopyFile() failed (Status %lx)\n", Status); - return Status; - } - - /* Create or update 'freeldr.ini' */ - if (DoesFileExist(SystemRootPath->Buffer, L"freeldr.ini") == FALSE) - { - /* Create new freeldr.ini */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); - Status = CreateFreeLoaderIniForReactOS(DstPath, - DestinationArcPath->Buffer); + Status = CreateFreeLoaderIniForReactOS(DstPath, DestinationArcPath->Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("CreateFreeLoaderIniForReactOS() failed (Status %lx)\n", Status); return Status; } - - /* Save current bootsector as 'BOOTSECT.OLD' */ - wcscpy(SrcPath, SystemRootPath->Buffer); - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\bootsect.old"); - - DPRINT("Save bootsector: %S ==> %S\n", SrcPath, DstPath); - Status = SaveCurrentBootSector(SrcPath, - DstPath); + } + + /* Install new bootsector on the disk */ + // if (PartitionType == PARTITION_EXT2) + { + /* Install EXT2 bootcode */ + wcscpy(SrcPath, SourceRootPath->Buffer); + wcscat(SrcPath, L"\\loader\\ext2.bin"); + + DPRINT1("Install EXT2 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); + Status = InstallExt2BootCodeToDisk(SrcPath, SystemRootPath->Buffer); if (!NT_SUCCESS(Status)) { - DPRINT1("SaveCurrentBootSector() failed (Status %lx)\n", Status); - return Status; - } - - /* Install new bootsector */ - if ((PartitionType == PARTITION_FAT32) || - (PartitionType == PARTITION_FAT32_XINT13)) - { - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat32.bin"); - - DPRINT("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); - Status = InstallFat32BootCodeToDisk(SrcPath, - SystemRootPath->Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InstallFat32BootCodeToDisk() failed (Status %lx)\n", Status); - return Status; - } - } - else - { - wcscpy(SrcPath, SourceRootPath->Buffer); - wcscat(SrcPath, L"\\loader\\fat.bin"); - - DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer); - Status = InstallFat16BootCodeToDisk(SrcPath, - SystemRootPath->Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status); - return Status; - } - } - } - else - { - /* Update existing 'freeldr.ini' */ - wcscpy(DstPath, SystemRootPath->Buffer); - wcscat(DstPath, L"\\freeldr.ini"); - - Status = UpdateFreeLoaderIni(DstPath, - DestinationArcPath->Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT1("UpdateFreeLoaderIni() failed (Status %lx)\n", Status); + DPRINT1("InstallExt2BootCodeToDisk() failed (Status %lx)\n", Status); return Status; } } @@ -2287,17 +2630,35 @@ PUNICODE_STRING DestinationArcPath, UCHAR PartitionType) { - if ((PartitionType == PARTITION_FAT_12) || - (PartitionType == PARTITION_FAT_16) || - (PartitionType == PARTITION_HUGE) || - (PartitionType == PARTITION_XINT13) || - (PartitionType == PARTITION_FAT32) || - (PartitionType == PARTITION_FAT32_XINT13)) - { - return InstallFatBootcodeToPartition(SystemRootPath, - SourceRootPath, - DestinationArcPath, - PartitionType); + switch (PartitionType) + { + case PARTITION_FAT_12: + case PARTITION_FAT_16: + case PARTITION_HUGE: + case PARTITION_XINT13: + case PARTITION_FAT32: + case PARTITION_FAT32_XINT13: + { + return InstallFatBootcodeToPartition(SystemRootPath, + SourceRootPath, + DestinationArcPath, + PartitionType); + } + + case PARTITION_EXT2: + { + return InstallExt2BootcodeToPartition(SystemRootPath, + SourceRootPath, + DestinationArcPath, + PartitionType); + } + + case PARTITION_IFS: + break; + + default: + DPRINT1("PartitionType 0x%02x unknown!\n", PartitionType); + break; } return STATUS_UNSUCCESSFUL; @@ -2310,10 +2671,10 @@ PUNICODE_STRING DestinationArcPath) { #ifdef __REACTOS__ + NTSTATUS Status; UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0"); WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; - NTSTATUS Status; /* Format the floppy first */ Status = VfatFormat(&FloppyDevice, Modified: trunk/reactos/base/setup/usetup/bootsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.h [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -27,68 +27,9 @@ #pragma once NTSTATUS -CreateFreeLoaderIniForDos( - PWCHAR IniPath, - PWCHAR ArcPath); - -NTSTATUS -CreateFreeLoaderIniForReactOS( - PWCHAR IniPath, - PWCHAR ArcPath); - -NTSTATUS -UpdateFreeLoaderIni( - PWCHAR IniPath, - PWCHAR ArcPath); - -NTSTATUS -SaveCurrentBootSector( - PWSTR RootPath, - PWSTR DstPath); - -NTSTATUS -InstallFat16BootCodeToFile( - PWSTR SrcPath, - PWSTR DstPath, - PWSTR RootPath); - -NTSTATUS -InstallFat32BootCodeToFile( - PWSTR SrcPath, - PWSTR DstPath, - PWSTR RootPath); - -NTSTATUS InstallMbrBootCodeToDisk( PWSTR SrcPath, PWSTR RootPath); - -NTSTATUS -InstallFat16BootCodeToDisk( - PWSTR SrcPath, - PWSTR RootPath); - -NTSTATUS -InstallFat32BootCodeToDisk( - PWSTR SrcPath, - PWSTR RootPath); - -NTSTATUS -UpdateBootIni( - PWSTR BootIniPath, - PWSTR EntryName, - PWSTR EntryValue); - -BOOLEAN -CheckInstallFatBootcodeToPartition( - PUNICODE_STRING SystemRootPath); - -NTSTATUS -InstallFatBootcodeToPartition( - PUNICODE_STRING SystemRootPath, - PUNICODE_STRING SourceRootPath, - PUNICODE_STRING DestinationArcPath, - UCHAR PartitionType); NTSTATUS InstallVBRToPartition( Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -354,7 +354,7 @@ RegionSize = (ULONG)PAGE_ROUND_UP(FileStandard.EndOfFile.u.LowPart); IoStatusBlock.Status = 0; - ByteOffset.QuadPart = 0; + ByteOffset.QuadPart = 0ULL; Status = NtWriteFile(FileHandleDest, NULL, NULL, Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -2955,6 +2955,14 @@ DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } + else if (wcscmp(PartEntry->FileSystem->FileSystemName, L"NTFS") == 0) + { + PartEntry->PartitionType = PARTITION_IFS; + + DiskEntry->Dirty = TRUE; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; + } #endif else if (!PartEntry->FileSystem->FormatFunc) { @@ -3149,7 +3157,6 @@ DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); sprintf(Buffer, "Setup failed to verify the selected partition.\n" "(Status 0x%08lx).\n", Status); - PopupError(Buffer, MUIGetString(STRING_REBOOTCOMPUTER), Ir, POPUP_WAIT_ENTER); @@ -3986,7 +3993,6 @@ } /* Create the default hives */ -#ifdef __REACTOS__ Status = NtInitializeRegistry(CM_BOOT_FLAG_SETUP); if (!NT_SUCCESS(Status)) { @@ -3994,9 +4000,6 @@ MUIDisplayError(ERROR_CREATE_HIVE, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } -#else - RegInitializeRegistry(); -#endif /* Update registry */ CONSOLE_SetStatusText(MUIGetString(STRING_REGHIVEUPDATE)); @@ -4165,22 +4168,24 @@ DPRINT("Error: active partition invalid (unused)\n"); InstallOnFloppy = TRUE; } - else if (PartitionType == 0x0A) + else if (PartitionType == PARTITION_OS2BOOTMGR) { /* OS/2 boot manager partition */ DPRINT("Found OS/2 boot manager partition\n"); InstallOnFloppy = TRUE; } - else if (PartitionType == 0x83) + else if (PartitionType == PARTITION_EXT2) { /* Linux ext2 partition */ DPRINT("Found Linux ext2 partition\n"); - InstallOnFloppy = TRUE; + InstallOnFloppy = FALSE; } else if (PartitionType == PARTITION_IFS) { /* NTFS partition */ DPRINT("Found NTFS partition\n"); + + // FIXME: Make it FALSE when we'll support NTFS installation! InstallOnFloppy = TRUE; } else if ((PartitionType == PARTITION_FAT_12) || Modified: trunk/reactos/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/f… ============================================================================== --- trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -7,6 +7,7 @@ FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); #if 0 FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); + FS_AddProvider(List, L"NTFS", NtfsFormat, NtfsChkdsk); #endif return TRUE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -25,9 +25,6 @@ #pragma once -/* We have to define it there, because it is not in the MS DDK */ -#define PARTITION_EXT2 0x83 - typedef enum _FORMATSTATE { Unformatted, Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.h [iso-8859-1] Tue Feb 2 01:55:05 2016 @@ -53,8 +53,10 @@ #include <ndk/setypes.h> /* Filesystem headers */ +#include <reactos/rosioctl.h> +#include <fslib/vfatlib.h> #include <fslib/ext2lib.h> -#include <fslib/vfatlib.h> +// #include <fslib/ntfslib.h> /* Internal Headers */ #include "interface/consup.h"

1 0

[hbelusca] 70674: [CMLIB]: Demote the DPRINT1 saying that we leak the security block descriptor to a DPRINT. People (Alex & me) working on cmlib already know this. "Fixes" timeout problems of the t...
by hbelusca＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: hbelusca Date: Mon Feb 1 23:10:38 2016 New Revision: 70674 URL: http://svn.reactos.org/svn/reactos?rev=70674&view=rev Log: [CMLIB]: Demote the DPRINT1 saying that we leak the security block descriptor to a DPRINT. People (Alex & me) working on cmlib already know this. "Fixes" timeout problems of the testbots due to spamming this dprint. Modified: trunk/reactos/lib/cmlib/cmkeydel.c Modified: trunk/reactos/lib/cmlib/cmkeydel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmkeydel.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmkeydel.c [iso-8859-1] Mon Feb 1 23:10:38 2016 @@ -215,7 +215,7 @@ } /* FIXME: This leaks the security desriptor! */ - DPRINT1("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); + DPRINT("Potentially leaking key security descriptor. Please call CmpFreeSecurityDescriptor\n"); /* Free the key body itself, and then return our status */ if (!CmpFreeKeyBody(Hive, Cell)) return STATUS_INSUFFICIENT_RESOURCES;

1 0

[pschweitzer] 70673: [BOOTDATA] Drop last references to rosvboxmgmt! CORE-10032 ROSAPPS-303
by pschweitzer＠svn.reactos.org 01 Feb '16

01 Feb '16

Author: pschweitzer Date: Mon Feb 1 22:18:47 2016 New Revision: 70673 URL: http://svn.reactos.org/svn/reactos?rev=70673&view=rev Log: [BOOTDATA] Drop last references to rosvboxmgmt! CORE-10032 ROSAPPS-303 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Mon Feb 1 22:18:47 2016 @@ -140,10 +140,6 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","",0x00000000,"cmd /c md ""%programfiles%\Internet Explorer\"" && move %windir%\iexplore.exe ""%programfiles%\Internet Explorer\"" && ""%programfiles%\Internet Explorer\iexplore.exe"" /RegServer" ; Create .NET Framework InstallRoot key, reg_sz & full path HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce","InstallRoot.NET",0x00000000,"cmd /c reg add HKLM\SOFTWARE\Microsoft\.NETFramework /v InstallRoot /t REG_SZ /d %SystemRoot%\Microsoft.NET\Framework\" - -; HACK - Start rosvboxmgmt - ROSAPPS-303 -;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Handle VBox SF",0x00000000,"%windir%\bin\rosvboxmgmt autolink" -;HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run","Handle VBox SF",0x00000000,"%windir%\bin\rosvboxmgmt autoassign" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012

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