Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 74573: [USETUP]: Consolidate the PartList module of the setuplib. - The 'FORMATMACHINESTATE FormatState' machine-state and the 'TempPartition' members of the partition list structure is ...
by hbelusca＠svn.reactos.org 17 May '17

17 May '17

Author: hbelusca Date: Wed May 17 23:37:07 2017 New Revision: 74573 URL: http://svn.reactos.org/svn/reactos?rev=74573&view=rev Log: [USETUP]: Consolidate the PartList module of the setuplib. - The 'FORMATMACHINESTATE FormatState' machine-state and the 'TempPartition' members of the partition list structure is purely a USETUP convenience, so remove them from the PARTLIST structure and move them back into USETUP. - Attempt to recognize the filesystem (set the 'FileSystem' member of PARTENTRY) of partitions we are adding into the PARTLIST list. - Fix the return value of the SelectPartition function, which is by the way completely broken (it doesn't do what it is supposed to do; alternatively its naming is completely wrong...). Modified: branches/setup_improvements/base/setup/lib/partlist.c branches/setup_improvements/base/setup/lib/partlist.h branches/setup_improvements/base/setup/usetup/partlist.h Modified: branches/setup_improvements/base/setup/lib/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Wed May 17 23:37:07 2017 @@ -488,17 +488,18 @@ PPARTENTRY PartEntry; PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartitionIndex]; + if (PartitionInfo->PartitionType == PARTITION_ENTRY_UNUSED || (LogicalPartition == TRUE && IsContainerPartition(PartitionInfo->PartitionType))) + { return; + } PartEntry = RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(PARTENTRY)); if (PartEntry == NULL) - { return; - } PartEntry->DiskEntry = DiskEntry; @@ -522,12 +523,10 @@ if (LogicalPartition == FALSE && DiskEntry->ExtendedPartition == NULL) DiskEntry->ExtendedPartition = PartEntry; } -#if 0 else if (IsRecognizedPartition(PartEntry->PartitionType)) { - // FIXME FIXME! We should completely rework how we get this 'FileSystemList' available... - PartEntry->FileSystem = GetFileSystem(/*FileSystemList,*/ PartEntry); - if (!PartEntry->FileSystem) + PartEntry->FileSystem = GetFileSystem(PartEntry); + if (PartEntry->FileSystem) PartEntry->FormatState = Preformatted; else PartEntry->FormatState = Unformatted; @@ -535,63 +534,7 @@ } else { - /* Unknown partition, so unknown partition format (may or may not be actually formatted) */ - PartEntry->FormatState = UnknownFormat; - } -#endif - else if ((PartEntry->PartitionType == PARTITION_FAT_12) || - (PartEntry->PartitionType == PARTITION_FAT_16) || - (PartEntry->PartitionType == PARTITION_HUGE) || - (PartEntry->PartitionType == PARTITION_XINT13) || - (PartEntry->PartitionType == PARTITION_FAT32) || - (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) - { -#if 0 - if (CheckFatFormat()) - { - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = Unformatted; - } -#endif - PartEntry->FormatState = Preformatted; - } - else if (PartEntry->PartitionType == PARTITION_EXT2) - { -#if 0 - if (CheckExt2Format()) - { - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = Unformatted; - } -#endif - PartEntry->FormatState = Preformatted; - } - else if (PartEntry->PartitionType == PARTITION_IFS) - { -#if 0 - if (CheckNtfsFormat()) - { - PartEntry->FormatState = Preformatted; - } - else if (CheckHpfsFormat()) - { - PartEntry->FormatState = Preformatted; - } - else - { - PartEntry->FormatState = Unformatted; - } -#endif - PartEntry->FormatState = Preformatted; - } - else - { + /* Unknown partition, hence unknown partition format (may or may not be actually formatted) */ PartEntry->FormatState = UnknownFormat; } @@ -1256,9 +1199,6 @@ List->SystemPartition = NULL; List->OriginalSystemPartition = NULL; - List->TempPartition = NULL; - List->FormatState = Start; - InitializeListHead(&List->DiskListHead); InitializeListHead(&List->BiosDiskListHead); @@ -1392,7 +1332,10 @@ RtlFreeHeap(ProcessHeap, 0, List); } -ULONG +// +// FIXME: This function is COMPLETELY BROKEN!!!! +// +BOOLEAN SelectPartition( IN PPARTLIST List, IN ULONG DiskNumber, @@ -2392,9 +2335,7 @@ VOID CheckActiveSystemPartition( - IN PPARTLIST List // , - // IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ - ) + IN PPARTLIST List) { PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2571,7 +2512,7 @@ * NOTE also that for those architectures looking for a * partition boot indicator is insufficient. */ - FileSystem = GetFileSystem(/*FileSystemList,*/ List->OriginalSystemPartition); + FileSystem = GetFileSystem(List->OriginalSystemPartition); if (FileSystem == NULL) { DPRINT1("System partition %lu in disk %lu with no FS?!\n", @@ -2580,7 +2521,7 @@ goto FindAndUseAlternativeSystemPartition; } // HACK: WARNING: We cannot write on this FS yet! - // See fslist.c:GetFileSystem() + // See fsutil.c:GetFileSystem() if (List->OriginalSystemPartition->PartitionType == PARTITION_EXT2 || List->OriginalSystemPartition->PartitionType == PARTITION_IFS) { Modified: branches/setup_improvements/base/setup/lib/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/partlist.h [iso-8859-1] Wed May 17 23:37:07 2017 @@ -16,19 +16,6 @@ Preformatted, Formatted } FORMATSTATE, *PFORMATSTATE; - -typedef enum _FORMATMACHINESTATE -{ - Start, - FormatSystemPartition, - FormatInstallPartition, - FormatOtherPartition, - FormatDone, - CheckSystemPartition, - CheckInstallPartition, - CheckOtherPartition, - CheckDone -} FORMATMACHINESTATE, *PFORMATMACHINESTATE; struct _FILE_SYSTEM; @@ -165,9 +152,6 @@ */ PPARTENTRY OriginalSystemPartition; - PPARTENTRY TempPartition; - FORMATMACHINESTATE FormatState; - LIST_ENTRY DiskListHead; LIST_ENTRY BiosDiskListHead; @@ -236,7 +220,7 @@ DestroyPartitionList( IN PPARTLIST List); -ULONG +BOOLEAN SelectPartition( IN PPARTLIST List, IN ULONG DiskNumber, @@ -273,9 +257,7 @@ VOID CheckActiveSystemPartition( - IN PPARTLIST List // , - // IN PFILE_SYSTEM_LIST FileSystemList /* Needed for checking the FS of the candidate system partition */ - ); + IN PPARTLIST List); BOOLEAN WritePartitionsToDisk( Modified: branches/setup_improvements/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/partlist.h [iso-8859-1] Wed May 17 23:37:07 2017 @@ -27,7 +27,6 @@ #include "../lib/partlist.h" -#if 0 typedef enum _FORMATMACHINESTATE { Start, @@ -40,7 +39,6 @@ CheckOtherPartition, CheckDone } FORMATMACHINESTATE, *PFORMATMACHINESTATE; -#endif typedef struct _PARTLIST_UI {

1 0

[hbelusca] 74572: [USETUP]: Consolidate the FsUtil module of the setuplib. - Add a PreparePartitionForFormatting routine that sets the partition ID depending on the chosen filesystem.
by hbelusca＠svn.reactos.org 17 May '17

17 May '17

Author: hbelusca Date: Wed May 17 23:31:52 2017 New Revision: 74572 URL: http://svn.reactos.org/svn/reactos?rev=74572&view=rev Log: [USETUP]: Consolidate the FsUtil module of the setuplib. - Add a PreparePartitionForFormatting routine that sets the partition ID depending on the chosen filesystem. Modified: branches/setup_improvements/base/setup/lib/fsutil.c branches/setup_improvements/base/setup/lib/fsutil.h Modified: branches/setup_improvements/base/setup/lib/fsutil.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/fsutil.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/fsutil.c [iso-8859-1] Wed May 17 23:31:52 2017 @@ -15,14 +15,12 @@ #include "fsutil.h" #include "partlist.h" -/** For FileSystems **/ #include <fslib/vfatlib.h> -#include <fslib/ext2lib.h> +// #include <fslib/ext2lib.h> // #include <fslib/ntfslib.h> #define NDEBUG #include <debug.h> - FILE_SYSTEM RegisteredFileSystems[] = @@ -30,8 +28,15 @@ { L"FAT" , VfatFormat, VfatChkdsk }, // { L"FAT32", VfatFormat, VfatChkdsk }, #if 0 + { L"FATX" , VfatxFormat, VfatxChkdsk }, + { L"NTFS" , NtfsFormat, NtfsChkdsk }, + { L"EXT2" , Ext2Format, Ext2Chkdsk }, - { L"NTFS" , NtfsFormat, NtfsChkdsk } + { L"EXT3" , Ext2Format, Ext2Chkdsk }, + { L"EXT4" , Ext2Format, Ext2Chkdsk }, + { L"BTRFS", BtrfsFormatEx, BtrfsChkdskEx }, + { L"FFS" , FfsFormat , FfsChkdsk }, + { L"REISERFS", ReiserfsFormat, ReiserfsChkdsk }, #endif }; @@ -189,7 +194,44 @@ CurrentFileSystem = NULL; -#if 0 // FIXME: To be fully enabled when our storage stack & al. will work better! +#if 0 // This is an example of old code... + + if ((PartEntry->PartitionType == PARTITION_FAT_12) || + (PartEntry->PartitionType == PARTITION_FAT_16) || + (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_XINT13) || + (PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + { + if (CheckFatFormat()) + FileSystemName = L"FAT"; + else + FileSystemName = NULL; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { + if (CheckExt2Format()) + FileSystemName = L"EXT2"; + else + FileSystemName = NULL; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { + if (CheckNtfsFormat()) + FileSystemName = L"NTFS"; + else if (CheckHpfsFormat()) + FileSystemName = L"HPFS"; + else + FileSystemName = NULL; + } + else + { + FileSystemName = NULL; + } + +#endif + +#if 0 // FIXME: To be fully enabled when our storage stack & al. work better! /* * We don't have one... @@ -237,11 +279,13 @@ { // WARNING: See the warning above. FileSystemName = L"EXT2"; + // FIXME: We may have EXT3, 4 too... } else if (PartEntry->PartitionType == PARTITION_IFS) { // WARNING: See the warning above. FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ + // FIXME: We may have HPFS too... } #if 0 @@ -259,17 +303,102 @@ PartEntry->PartitionType, FileSystemName ? FileSystemName : L"None"); if (FileSystemName != NULL) - CurrentFileSystem = GetFileSystemByName(/*FileSystemList,*/ FileSystemName); + CurrentFileSystem = GetFileSystemByName(FileSystemName); return CurrentFileSystem; } // +// Formatting routines +// + +BOOLEAN +PreparePartitionForFormatting( + IN struct _PARTENTRY* PartEntry, + IN PFILE_SYSTEM FileSystem) +{ + if (!FileSystem) + { + DPRINT1("No file system specified?\n"); + return FALSE; + } + + if (wcscmp(FileSystem->FileSystemName, L"FAT") == 0) + { + if (PartEntry->SectorCount.QuadPart < 8192) + { + /* FAT12 CHS partition (disk is smaller than 4.1MB) */ + SetPartitionType(PartEntry, PARTITION_FAT_12); + } + else if (PartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + + if (PartEntry->SectorCount.QuadPart < 65536) + { + /* FAT16 CHS partition (partition size < 32MB) */ + SetPartitionType(PartEntry, PARTITION_FAT_16); + } + else if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 CHS partition (partition size < 512MB) */ + SetPartitionType(PartEntry, PARTITION_HUGE); + } + else + { + /* FAT32 CHS partition (partition size >= 512MB) */ + SetPartitionType(PartEntry, PARTITION_FAT32); + } + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + + if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 LBA partition (partition size < 512MB) */ + SetPartitionType(PartEntry, PARTITION_XINT13); + } + else + { + /* FAT32 LBA partition (partition size >= 512MB) */ + SetPartitionType(PartEntry, PARTITION_FAT32_XINT13); + } + } + } +#if 0 + else if (wcscmp(FileSystem->FileSystemName, L"EXT2") == 0) + { + SetPartitionType(PartEntry, PARTITION_EXT2); + } + else if (wcscmp(FileSystem->FileSystemName, L"NTFS") == 0) + { + SetPartitionType(PartEntry, PARTITION_IFS); + } +#endif + else + { + /* Unknown file system? */ + DPRINT1("Unknown file system \"%S\"?\n", FileSystem->FileSystemName); + return FALSE; + } + +// +// FIXME: Do this now, or after the partition was actually formatted?? +// + /* Set the new partition's file system proper */ + PartEntry->FormatState = Formatted; // Well... This may be set after the real formatting takes place (in which case we should change the FormatState to another value) + PartEntry->FileSystem = FileSystem; + + return TRUE; +} + + + // Unused code (for now??) -// - -#if 0 // Unused anymore. This portion of code is actually called in format.c "FormatPartition" function... + +#if 0 // Not used anymore. This portion of code is actually called in format.c "FormatPartition" function... BOOLEAN NATIVE_FormatPartition( IN PFILE_SYSTEM FileSystem, // IN PFILE_SYSTEM_ITEM FileSystem, Modified: branches/setup_improvements/base/setup/lib/fsutil.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/fsutil.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/fsutil.h [iso-8859-1] Wed May 17 23:31:52 2017 @@ -24,7 +24,13 @@ IN struct _PARTENTRY* PartEntry); -#if 0 // Unused anymore. This portion of code is actually called in format.c "FormatPartition" function... +BOOLEAN +PreparePartitionForFormatting( + IN struct _PARTENTRY* PartEntry, + IN PFILE_SYSTEM FileSystem); + + +#if 0 // Not used anymore. This portion of code is actually called in format.c "FormatPartition" function... #define HOST_FormatPartition NATIVE_FormatPartition BOOLEAN

1 0

[tfaber] 74571: [BOOTLIB] - Avoid uninitialized ComputeHash variable in BlImgLoadImageWithProgress2 CORE-13265 #resolve
by tfaber＠svn.reactos.org 17 May '17

17 May '17

Author: tfaber Date: Wed May 17 16:06:24 2017 New Revision: 74571 URL: http://svn.reactos.org/svn/reactos?rev=74571&view=rev Log: [BOOTLIB] - Avoid uninitialized ComputeHash variable in BlImgLoadImageWithProgress2 CORE-13265 #resolve Modified: trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Wed May 17 16:06:24 2017 @@ -507,6 +507,7 @@ /* Check if we should compute hash and/or signatures */ ComputeSignature = ImageFlags & BL_LOAD_IMG_COMPUTE_SIGNATURE; + ComputeHash = FALSE; if ((ComputeSignature) || (ImageFlags & BL_LOAD_IMG_COMPUTE_HASH)) { ComputeHash = TRUE; @@ -561,7 +562,7 @@ } /* Is the read fully complete? We need to finalize the hash if requested */ - if (ComputeHash != RemainingLength) + if (ComputeHash) { // todo: CRYPTO IS HARD }

1 0

[hbelusca] 74570: [USETUP]: Introduce "setuplib". - Add a "setuplib" library (not yet complete), whose aim is to be shared between the (currently existing) 1st-stage text-mode installer, and the (f...
by hbelusca＠svn.reactos.org 17 May '17

17 May '17

Author: hbelusca Date: Wed May 17 15:48:06 2017 New Revision: 74570 URL: http://svn.reactos.org/svn/reactos?rev=74570&view=rev Log: [USETUP]: Introduce "setuplib". - Add a "setuplib" library (not yet complete), whose aim is to be shared between the (currently existing) 1st-stage text-mode installer, and the (future) 1st-stage GUI installer. - Finish to split the GenList and PartList codes into their UI part, which remain in usetup, and their algorithmic part, which go into setuplib. - Move SetMountedDeviceValue into the PartList module. - Split the FileSystem list code into its UI and the algorithmic part (which goes into setuplib under the name fsutil.c). * The algo part is meant to be able to manage the filesystems available on the running system, similarly to what is mostly done (in scattered form) in fmifs, format, chkdsk / autochk codes... It also manages the partition filesystem recognition, using OS routines. * The UI part manages the FS list as it appears on screen, showing only the possible FSes that can be used to format the selected partition (a bit similar to what we do in the shell32's drive.c, etc...). - Adapt the calling code to these changes. - Remove some "host" code that was dating back from the dark old times. Added: branches/setup_improvements/base/setup/lib/ branches/setup_improvements/base/setup/lib/CMakeLists.txt (with props) branches/setup_improvements/base/setup/lib/errorcode.h - copied, changed from r74569, branches/setup_improvements/base/setup/usetup/errorcode.h branches/setup_improvements/base/setup/lib/fsutil.c - copied, changed from r74569, branches/setup_improvements/base/setup/usetup/fslist.c branches/setup_improvements/base/setup/lib/fsutil.h (with props) branches/setup_improvements/base/setup/lib/genlist.c - copied, changed from r74569, branches/setup_improvements/base/setup/usetup/genlist.c branches/setup_improvements/base/setup/lib/genlist.h - copied, changed from r74569, branches/setup_improvements/base/setup/usetup/genlist.h branches/setup_improvements/base/setup/lib/linklist.h (with props) branches/setup_improvements/base/setup/lib/partlist.c - copied, changed from r74569, branches/setup_improvements/base/setup/usetup/partlist.c branches/setup_improvements/base/setup/lib/partlist.h - copied, changed from r74569, branches/setup_improvements/base/setup/usetup/partlist.h branches/setup_improvements/base/setup/lib/precomp.h (with props) branches/setup_improvements/base/setup/lib/setuplib.h (with props) Removed: branches/setup_improvements/base/setup/usetup/native/fslist.c Modified: branches/setup_improvements/base/setup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/CMakeLists.txt branches/setup_improvements/base/setup/usetup/bootsup.c branches/setup_improvements/base/setup/usetup/chkdsk.c branches/setup_improvements/base/setup/usetup/chkdsk.h branches/setup_improvements/base/setup/usetup/format.c branches/setup_improvements/base/setup/usetup/format.h branches/setup_improvements/base/setup/usetup/fslist.c branches/setup_improvements/base/setup/usetup/fslist.h branches/setup_improvements/base/setup/usetup/genlist.c branches/setup_improvements/base/setup/usetup/genlist.h branches/setup_improvements/base/setup/usetup/host.h branches/setup_improvements/base/setup/usetup/interface/usetup.c branches/setup_improvements/base/setup/usetup/partlist.c branches/setup_improvements/base/setup/usetup/partlist.h branches/setup_improvements/base/setup/usetup/registry.c branches/setup_improvements/base/setup/usetup/registry.h branches/setup_improvements/base/setup/usetup/usetup.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/setup_improvements/base/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/C… Added: branches/setup_improvements/base/setup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/errorcode.h (from r74569, branches/setup_improvements/base/setup/usetup/errorcode.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/fsutil.c (from r74569, branches/setup_improvements/base/setup/usetup/fslist.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Added: branches/setup_improvements/base/setup/lib/fsutil.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/genlist.c (from r74569, branches/setup_improvements/base/setup/usetup/genlist.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/genlist.h (from r74569, branches/setup_improvements/base/setup/usetup/genlist.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Added: branches/setup_improvements/base/setup/lib/linklist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/partlist.c (from r74569, branches/setup_improvements/base/setup/usetup/partlist.c) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Copied: branches/setup_improvements/base/setup/lib/partlist.h (from r74569, branches/setup_improvements/base/setup/usetup/partlist.h) URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Added: branches/setup_improvements/base/setup/lib/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Added: branches/setup_improvements/base/setup/lib/setuplib.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… Modified: branches/setup_improvements/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/chkdsk.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/chkdsk.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/format.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/genlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/host.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Removed: branches/setup_improvements/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/registry.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… Modified: branches/setup_improvements/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u…

1 0

[tfaber] 74569: [0.4.5] - Tag the release
by tfaber＠svn.reactos.org 17 May '17

17 May '17

Author: tfaber Date: Wed May 17 15:29:35 2017 New Revision: 74569 URL: http://svn.reactos.org/svn/reactos?rev=74569&view=rev Log: [0.4.5] - Tag the release Added: tags/ReactOS-0.4.5/ (props changed) - copied from r74568, branches/ros-branch-0_4_5/ Removed: branches/ros-branch-0_4_5/ Propchange: tags/ReactOS-0.4.5/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Wed May 17 15:29:35 2017 @@ -0,0 +1,2 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595 +/trunk:74437-74438,74440-74441,74443

1 0

[phater] 74568: [MSTSC] Fix parsing of settings. Patch by Stas'M. Thanks. CORE-13223
by phater＠svn.reactos.org 17 May '17

17 May '17

Author: phater Date: Wed May 17 10:53:54 2017 New Revision: 74568 URL: http://svn.reactos.org/svn/reactos?rev=74568&view=rev Log: [MSTSC] Fix parsing of settings. Patch by Stas'M. Thanks. CORE-13223 Modified: trunk/reactos/base/applications/mstsc/settings.c Modified: trunk/reactos/base/applications/mstsc/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… ============================================================================== --- trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/settings.c [iso-8859-1] Wed May 17 10:53:54 2017 @@ -275,7 +275,10 @@ else if (lpToken[0] == L's') { pRdpSettings->pSettings[i].Type = lpToken[0]; - lpToken = wcstok(NULL, szNewline); + if (lpToken[2] == 13 || lpToken[2] == 10 || lpToken[2] == 0) + lpToken[0] = 0; // terminate string + else + lpToken = wcstok(NULL, szNewline); if (lpToken != NULL) wcscpy(pRdpSettings->pSettings[i].Value.s, lpToken); }

1 0

[phater] 74567: [MSTSC] Send computer name as client name when available. Patch by Stas'M. Thanks. CORE-13237
by phater＠svn.reactos.org 17 May '17

17 May '17

Author: phater Date: Wed May 17 10:47:39 2017 New Revision: 74567 URL: http://svn.reactos.org/svn/reactos?rev=74567&view=rev Log: [MSTSC] Send computer name as client name when available. Patch by Stas'M. Thanks. CORE-13237 Modified: trunk/reactos/base/applications/mstsc/win32.c Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… ============================================================================== --- trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/win32.c [iso-8859-1] Wed May 17 10:47:39 2017 @@ -1125,6 +1125,7 @@ pRdpSettings)) { char szValue[MAXVALUE]; + DWORD dwSize = MAXVALUE; uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"full address")); @@ -1134,7 +1135,10 @@ uni_to_str(szValue, GetStringFromSettings(pRdpSettings, L"username")); SetDomainAndUsername(szValue); strcpy(g_password, ""); - strcpy(g_hostname, tcp_get_address()); + if (GetComputerNameA(szValue, &dwSize)) + strcpy(g_hostname, szValue); + else + strcpy(g_hostname, tcp_get_address()); g_server_depth = GetIntegerFromSettings(pRdpSettings, L"session bpp"); g_screen_width = GetSystemMetrics(SM_CXSCREEN); g_screen_height = GetSystemMetrics(SM_CYSCREEN);

1 0

[hbelusca] 74566: [FORMAT]: Use a better variable type for the media flag.
by hbelusca＠svn.reactos.org 16 May '17

16 May '17

Author: hbelusca Date: Tue May 16 20:17:18 2017 New Revision: 74566 URL: http://svn.reactos.org/svn/reactos?rev=74566&view=rev Log: [FORMAT]: Use a better variable type for the media flag. Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Tue May 16 20:17:18 2017 @@ -360,7 +360,7 @@ int wmain(int argc, WCHAR *argv[]) { int badArg; - DWORD media = FMIFS_HARDDISK; + FMIFS_MEDIA_FLAG media = FMIFS_HARDDISK; DWORD driveType; WCHAR fileSystem[1024]; WCHAR volumeName[1024];

1 0

[hbelusca] 74565: [SHELL32]: Fix a FIXME: Recognize the media type for formatting, by calling GetDriveTypeW(). Based on what format.com does too.
by hbelusca＠svn.reactos.org 16 May '17

16 May '17

Author: hbelusca Date: Tue May 16 20:16:43 2017 New Revision: 74565 URL: http://svn.reactos.org/svn/reactos?rev=74565&view=rev Log: [SHELL32]: Fix a FIXME: Recognize the media type for formatting, by calling GetDriveTypeW(). Based on what format.com does too. Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/drive.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drive.cpp [iso-8859-1] Tue May 16 20:16:43 2017 @@ -473,6 +473,8 @@ HWND hDlgCtrl; BOOL QuickFormat; DWORD ClusterSize; + DWORD DriveType; + FMIFS_MEDIA_FLAG MediaFlag = FMIFS_HARDDISK; /* set volume path */ szDrive[0] = pContext->Drive + L'A'; @@ -539,8 +541,32 @@ */ FormatDrvDialog = hwndDlg; + /* See if the drive is removable or not */ + DriveType = GetDriveTypeW(szDrive); + switch (DriveType) + { + case DRIVE_UNKNOWN: + case DRIVE_REMOTE: + case DRIVE_CDROM: + case DRIVE_NO_ROOT_DIR: + { + FIXME("\n"); + return; + } + + case DRIVE_REMOVABLE: + MediaFlag = FMIFS_FLOPPY; + break; + + case DRIVE_FIXED: + case DRIVE_RAMDISK: + MediaFlag = FMIFS_HARDDISK; + break; + } + + /* Format the drive */ FormatEx(szDrive, - FMIFS_HARDDISK, /* FIXME */ + MediaFlag, szFileSys, szLabel, QuickFormat, @@ -559,7 +585,7 @@ } else { - pContext->Result = FALSE; + pContext->Result = FALSE; } }

1 0

[phater] 74564: [MSTSC] Fix unwanted change
by phater＠svn.reactos.org 16 May '17

16 May '17

Author: phater Date: Tue May 16 18:01:31 2017 New Revision: 74564 URL: http://svn.reactos.org/svn/reactos?rev=74564&view=rev Log: [MSTSC] Fix unwanted change Modified: trunk/reactos/base/applications/mstsc/rdp.c Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… ============================================================================== --- trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rdp.c [iso-8859-1] Tue May 16 18:01:31 2017 @@ -368,6 +368,7 @@ if (g_rdp_version == RDP_V4 || 1 == g_server_rdp_version) { + DEBUG_RDP5(("Sending RDP4-style Logon packet\n")); s = sec_init(sec_flags, 18 + len_domain + len_user + len_password + len_program + len_directory + 10);

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