Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 70452: [0.4.0] * Merge the streamout NULL buffer handling fix by Timo in r70443.
by akhaldi＠svn.reactos.org 28 Dec '15

28 Dec '15

Author: akhaldi Date: Mon Dec 28 10:16:01 2015 New Revision: 70452 URL: http://svn.reactos.org/svn/reactos?rev=70452&view=rev Log: [0.4.0] * Merge the streamout NULL buffer handling fix by Timo in r70443. Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 28 10:16:01 2015 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 28 10:16:01 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443 Modified: branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/lib/sd… ============================================================================== --- branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Mon Dec 28 10:16:01 2015 @@ -227,11 +227,10 @@ int streamout_char(FILE *stream, int chr) { -#ifdef _LIBCNT_ - if ((stream->_flag & _IOSTRG) && (!stream->_ptr)) +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) return 1; -#endif - +#endif #if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) @@ -254,6 +253,11 @@ TCHAR chr; int written = 0; +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif + while (count--) { #ifdef _UNICODE @@ -276,6 +280,11 @@ { wchar_t chr; int written = 0; + +#if defined(_UNICODE) && !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif while (count--) {

1 0

[hbelusca] 70451: [BOOTDATA]: ReactOS can install and run fine on volumes of at least 450 MB (for example, on a volume of 450 MB and after creation of the pagefile, it leaves you 60+ MB of free spa...
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 22:41:48 2015 New Revision: 70451 URL: http://svn.reactos.org/svn/reactos?rev=70451&view=rev Log: [BOOTDATA]: ReactOS can install and run fine on volumes of at least 450 MB (for example, on a volume of 450 MB and after creation of the pagefile, it leaves you 60+ MB of free space, which should be enough for you if you're already happy using HDDs of such small sizes ^^). Modified: trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Dec 27 22:41:48 2015 @@ -16,7 +16,7 @@ [DiskSpaceRequirements] ; Required free system partition disk space in MB -FreeSysPartDiskSpace=550 +FreeSysPartDiskSpace=450 [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4

1 0

[tkreuzer] 70450: [CRT] Fix a typo in a comment and make it clearer, what we do here. CORE-10754 #resolve
by tkreuzer＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: tkreuzer Date: Sun Dec 27 20:24:04 2015 New Revision: 70450 URL: http://svn.reactos.org/svn/reactos?rev=70450&view=rev Log: [CRT] Fix a typo in a comment and make it clearer, what we do here. CORE-10754 #resolve Modified: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc Modified: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc [iso-8859-1] Sun Dec 27 20:24:04 2015 @@ -29,9 +29,11 @@ /* Now compare the characters until a 0 is found */ repne _tscas - /* Calculate the count (eax = -ecx - 1) */ + /* Calculate the count. For n characters, we do (n + 1) comparisons. Initial + value of ecx was -1, so end value of ecx is (-1 - (n + 1)) = -(n + 2). + => n = -ecx - 2 = ~ecx - 1 */ not ecx - lea eax, [ecx-1] + lea eax, [ecx - 1] /* Restore eflags/edi and return the result */ popfd

1 0

[hbelusca] 70449: [VFATLIB] Now, the fix: the FAT disk checker expected that the free cluster count member of the FAT32 FSInfo sector be really initialized (not to 0xFFFFFFFF), and it expected the ...
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 20:01:24 2015 New Revision: 70449 URL: http://svn.reactos.org/svn/reactos?rev=70449&view=rev Log: [VFATLIB] Now, the fix: the FAT disk checker expected that the free cluster count member of the FAT32 FSInfo sector be really initialized (not to 0xFFFFFFFF), and it expected the presence of the backup of the FSInfo sector as well as the free sector following the FSInfo sector. Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sun Dec 27 20:01:24 2015 @@ -103,6 +103,7 @@ NTSTATUS Status; PFAT32_FSINFO FsInfo; LARGE_INTEGER FileOffset; + ULONGLONG FirstDataSector; /* Allocate buffer for new sector */ FsInfo = (PFAT32_FSINFO)RtlAllocateHeap(RtlGetProcessHeap(), @@ -111,16 +112,19 @@ if (FsInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; - /* Zero the new sector */ + /* Zero the first FsInfo sector */ RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + + FirstDataSector = BootSector->ReservedSectors + + (BootSector->FATCount * BootSector->FATSectors32) + 0 /* RootDirSectors */; FsInfo->LeadSig = FSINFO_SECTOR_BEGIN_SIGNATURE; FsInfo->StrucSig = FSINFO_SIGNATURE; - FsInfo->FreeCount = 0xffffffff; + FsInfo->FreeCount = (BootSector->SectorsHuge - FirstDataSector) / BootSector->SectorsPerCluster - 1; FsInfo->NextFree = 0xffffffff; FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; - /* Write sector */ + /* Write the first FsInfo sector */ FileOffset.QuadPart = BootSector->FSInfoSector * BootSector->BytesPerSector; Status = NtWriteFile(FileHandle, NULL, @@ -138,6 +142,76 @@ } UpdateProgress(Context, 1); + + /* Write backup of the first FsInfo sector */ + if (BootSector->BootBackup != 0x0000) + { + /* Reset the free cluster count for the backup */ + FsInfo->FreeCount = 0xffffffff; + + FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup + (ULONG)BootSector->FSInfoSector) * BootSector->BytesPerSector); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + } + + /* Zero the second FsInfo sector */ + RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; + + /* Write the second FsInfo sector */ + FileOffset.QuadPart = (BootSector->FSInfoSector + 1) * BootSector->BytesPerSector; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + + /* Write backup of the second FsInfo sector */ + if (BootSector->BootBackup != 0x0000) + { + FileOffset.QuadPart = (ULONGLONG)(((ULONG)BootSector->BootBackup + (ULONG)BootSector->FSInfoSector + 1) * BootSector->BytesPerSector); + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + FsInfo, + BootSector->BytesPerSector, + &FileOffset, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtWriteFile() failed (Status %lx)\n", Status); + goto done; + } + + UpdateProgress(Context, 1); + } done: /* Free the buffer */

1 0

[hbelusca] 70448: Remove a forgotten DPRINT1.
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 19:57:10 2015 New Revision: 70448 URL: http://svn.reactos.org/svn/reactos?rev=70448&view=rev Log: Remove a forgotten DPRINT1. Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 19:57:10 2015 @@ -404,8 +404,6 @@ if (fs_changed()) { - DPRINT1("fs_changed is TRUE!\n"); - if (FixErrors) { if (FsCheckFlags & FSCHECK_INTERACTIVE)

1 0

[hbelusca] 70447: [VFATLIB] - DPRINT messages printed via VfatPrint by the check-disk procedure. - Addendum to r70434 and r70435 : The return value of fs_close is equal to the number of corrections...
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 19:55:47 2015 New Revision: 70447 URL: http://svn.reactos.org/svn/reactos?rev=70447&view=rev Log: [VFATLIB] - DPRINT messages printed via VfatPrint by the check-disk procedure. - Addendum to r70434 and r70435 : The return value of fs_close is equal to the number of corrections made on the disk (0 corrections --> success; 1+ --> something was corrected). That way, the old code "return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL;" that we had since eons (which always happened to return STATUS_SUCCESS) was actually indicating to us that our FAT32-formatted volumes were corrupted. If you test this revision, you should see something happening if you try to install ReactOS now (something that should have happened since ages actually). Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sun Dec 27 19:55:47 2015 @@ -265,7 +265,6 @@ DPRINT1("Failed to umount volume (Status: 0x%x)\n", LockStatus); } - LockStatus = NtFsControlFile(FileHandle, NULL, NULL, @@ -302,7 +301,6 @@ ULONG NewPercent; Context->CurrentSectorCount += (ULONGLONG)Increment; - NewPercent = (Context->CurrentSectorCount * 100ULL) / Context->TotalSectorCount; @@ -331,6 +329,8 @@ /* Prepare parameters */ TextOut.Lines = 1; TextOut.Output = TextBuf; + + DPRINT1("VfatPrint -- %s", TextBuf); /* Do the callback */ if (ChkdskCallback) @@ -351,7 +351,6 @@ BOOLEAN salvage_files; ULONG free_clusters; DOS_FS fs; - int ret; /* Store callback pointer */ ChkdskCallback = Callback; @@ -373,11 +372,7 @@ if (CheckOnlyIfDirty && !fs_isdirty()) { /* No need to check FS */ - // NOTE: Returning the value of fs_close looks suspicious. - // return fs_close(FALSE); - ret = fs_close(FALSE); - DPRINT1("No need to check FS; fs_close returning %d\n", (unsigned int)ret); - return STATUS_SUCCESS; + return (fs_close(FALSE) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } read_boot(&fs); @@ -425,7 +420,7 @@ } VfatPrint("%wZ: %u files, %lu/%lu clusters\n", DriveRoot, - FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters ); + FsCheckTotalFiles, fs.clusters - free_clusters, fs.clusters); if (FixErrors) { @@ -437,11 +432,7 @@ } /* Close the volume */ - // NOTE: Returning the value of fs_close looks suspicious. - // return fs_close(FixErrors) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; - ret = fs_close(FixErrors); - DPRINT1("fs_close returning %d\n", (unsigned int)ret); - return STATUS_SUCCESS; + return (fs_close(FixErrors) == 0 ? STATUS_SUCCESS : STATUS_DISK_CORRUPT_ERROR); } /* EOF */

1 0

[hbelusca] 70446: [VFATLIB] - Formatting + RtlZero/FillMemory modifications as addendum to r70445. - Do not hardcode FSInfo signature values, use instead the same set of macros fastfat_new introduces.
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 19:38:13 2015 New Revision: 70446 URL: http://svn.reactos.org/svn/reactos?rev=70446&view=rev Log: [VFATLIB] - Formatting + RtlZero/FillMemory modifications as addendum to r70445. - Do not hardcode FSInfo signature values, use instead the same set of macros fastfat_new introduces. Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c trunk/reactos/lib/fslib/vfatlib/vfatlib.h Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat32.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat32.c [iso-8859-1] Sun Dec 27 19:38:13 2015 @@ -35,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT32 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); /* FAT32 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, OEMName)); + /* FAT32 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -59,8 +60,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); @@ -81,16 +81,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); } - /* Free the new boot sector */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; } @@ -113,13 +112,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new sector */ - memset(FsInfo, 0, BootSector->BytesPerSector); - - FsInfo->LeadSig = 0x41615252; - FsInfo->StrucSig = 0x61417272; + RtlZeroMemory(FsInfo, BootSector->BytesPerSector); + + FsInfo->LeadSig = FSINFO_SECTOR_BEGIN_SIGNATURE; + FsInfo->StrucSig = FSINFO_SIGNATURE; FsInfo->FreeCount = 0xffffffff; - FsInfo->NextFree = 0xffffffff; - FsInfo->TrailSig = 0xaa550000; + FsInfo->NextFree = 0xffffffff; + FsInfo->TrailSig = FSINFO_SECTOR_END_SIGNATURE; /* Write sector */ FileOffset.QuadPart = BootSector->FSInfoSector * BootSector->BytesPerSector; @@ -135,15 +134,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo); - return Status; + goto done; } UpdateProgress(Context, 1); - /* Free the new sector buffer */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, FsInfo); - return Status; } @@ -169,7 +167,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 64 * 1024); + RtlZeroMemory(Buffer, 64 * 1024); /* FAT cluster 0 */ Buffer[0] = 0xf8; /* Media type */ @@ -203,14 +201,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 12); + RtlZeroMemory(Buffer, 12); /* Zero the rest of the FAT */ Sectors = 64 * 1024 / BootSector->BytesPerSector; @@ -236,16 +233,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -270,7 +266,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, BootSector->SectorsPerCluster * BootSector->BytesPerSector); + RtlZeroMemory(Buffer, BootSector->SectorsPerCluster * BootSector->BytesPerSector); DPRINT("BootSector->ReservedSectors = %lu\n", BootSector->ReservedSectors); DPRINT("BootSector->FATSectors32 = %lu\n", BootSector->FATSectors32); @@ -301,15 +297,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, (ULONG)BootSector->SectorsPerCluster); +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -390,7 +385,6 @@ done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -435,7 +429,7 @@ } } - memset(&BootSector, 0, sizeof(FAT32_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT32_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -466,7 +460,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.h [iso-8859-1] Sun Dec 27 19:38:13 2015 @@ -104,6 +104,10 @@ } FAT32_FSINFO, *PFAT32_FSINFO; #include <poppack.h> +#define FSINFO_SECTOR_BEGIN_SIGNATURE 0x41615252 // 'RRaA' +#define FSINFO_SECTOR_END_SIGNATURE 0xAA550000 +#define FSINFO_SIGNATURE 0x61417272 // 'rrAa' + typedef struct _FORMAT_CONTEXT { PFMIFSCALLBACK Callback;

1 0

[hbelusca] 70445: [VFATLIB] - Formatting fixes. - Use RtlZeroMemory/RtlFillMemory instead of memset.
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 19:30:53 2015 New Revision: 70445 URL: http://svn.reactos.org/svn/reactos?rev=70445&view=rev Log: [VFATLIB] - Formatting fixes. - Use RtlZeroMemory/RtlFillMemory instead of memset. Modified: trunk/reactos/lib/fslib/vfatlib/common.c trunk/reactos/lib/fslib/vfatlib/fat12.c trunk/reactos/lib/fslib/vfatlib/fat16.c Modified: trunk/reactos/lib/fslib/vfatlib/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/common.c… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/common.c [iso-8859-1] Sun Dec 27 19:30:53 2015 @@ -129,7 +129,6 @@ done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } Modified: trunk/reactos/lib/fslib/vfatlib/fat12.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat12.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat12.c [iso-8859-1] Sun Dec 27 19:30:53 2015 @@ -35,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -59,15 +60,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; - } - - /* Free the new boot sector */ + goto done; + } + + UpdateProgress(Context, 1); + +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - - UpdateProgress(Context, 1); - return Status; } @@ -94,7 +94,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); /* FAT cluster 0 & 1*/ Buffer[0] = 0xf8; /* Media type */ @@ -115,14 +115,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 3); + RtlZeroMemory(Buffer, 3); /* Zero the rest of the FAT */ Sectors = 32 * 1024 / BootSector->BytesPerSector; @@ -148,16 +147,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -198,7 +196,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); Sectors = 32 * 1024 / BootSector->BytesPerSector; for (i = 0; i < RootDirSectors; i += Sectors) @@ -225,16 +223,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -277,7 +274,7 @@ DPRINT("SectorCount = %lu\n", SectorCount); - memset(&BootSector, 0, sizeof(FAT16_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -301,7 +298,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel); Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/fat16.c?… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/fat16.c [iso-8859-1] Sun Dec 27 19:30:53 2015 @@ -35,12 +35,13 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the new bootsector */ - memset(NewBootSector, 0, BootSector->BytesPerSector); + RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ memcpy(&NewBootSector->OEMName[0], &BootSector->OEMName[0], - FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); /* FAT16 BPB length (up to (not including) Res2) */ + FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, OEMName)); + /* FAT16 BPB length (up to (not including) Res2) */ /* Write the boot sector signature */ NewBootSector->Signature1 = 0xAA550000; @@ -59,15 +60,14 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; + goto done; } UpdateProgress(Context, 1); - /* Free the new boot sector */ +done: + /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, NewBootSector); - return Status; } @@ -93,7 +93,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); /* FAT cluster 0 */ Buffer[0] = 0xf8; /* Media type */ @@ -117,14 +117,13 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, 1); /* Zero the begin of the buffer */ - memset(Buffer, 0, 4); + RtlZeroMemory(Buffer, 4); /* Zero the rest of the FAT */ Sectors = 32 * 1024 / BootSector->BytesPerSector; @@ -150,16 +149,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -199,7 +197,7 @@ return STATUS_INSUFFICIENT_RESOURCES; /* Zero the buffer */ - memset(Buffer, 0, 32 * 1024); + RtlZeroMemory(Buffer, 32 * 1024); Sectors = 32 * 1024 / BootSector->BytesPerSector; for (i = 0; i < RootDirSectors; i += Sectors) @@ -224,16 +222,15 @@ if (!NT_SUCCESS(Status)) { DPRINT("NtWriteFile() failed (Status %lx)\n", Status); - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; + goto done; } UpdateProgress(Context, Sectors); } +done: /* Free the buffer */ RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - return Status; } @@ -284,7 +281,7 @@ SectorCount = PartitionInfo->PartitionLength.QuadPart >> GetShiftCount(DiskGeometry->BytesPerSector); /* Use shifting to avoid 64-bit division */ - memset(&BootSector, 0, sizeof(FAT16_BOOT_SECTOR)); + RtlZeroMemory(&BootSector, sizeof(FAT16_BOOT_SECTOR)); memcpy(&BootSector.OEMName[0], "MSWIN4.1", 8); BootSector.BytesPerSector = DiskGeometry->BytesPerSector; BootSector.SectorsPerCluster = ClusterSize / BootSector.BytesPerSector; @@ -308,7 +305,7 @@ else { RtlUnicodeStringToOemString(&VolumeLabel, Label, TRUE); - memset(&BootSector.VolumeLabel[0], ' ', 11); + RtlFillMemory(&BootSector.VolumeLabel[0], 11, ' '); memcpy(&BootSector.VolumeLabel[0], VolumeLabel.Buffer, VolumeLabel.Length < 11 ? VolumeLabel.Length : 11); RtlFreeOemString(&VolumeLabel);

1 0

[hbelusca] 70444: [TASKMGR]: Use taskmgr's icon for its run file dialog. Inspired by Wine.
by hbelusca＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: hbelusca Date: Sun Dec 27 19:06:16 2015 New Revision: 70444 URL: http://svn.reactos.org/svn/reactos?rev=70444&view=rev Log: [TASKMGR]: Use taskmgr's icon for its run file dialog. Inspired by Wine. Modified: trunk/reactos/base/applications/taskmgr/run.c Modified: trunk/reactos/base/applications/taskmgr/run.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/run.c [iso-8859-1] Sun Dec 27 19:06:16 2015 @@ -34,16 +34,19 @@ LoadStringW(hInst, IDS_CREATENEWTASK, szTitle, sizeof(szTitle) / sizeof(szTitle[0])); LoadStringW(hInst, IDS_CREATENEWTASK_DESC, szText, sizeof(szText) / sizeof(szText[0])); - hShell32 = LoadLibraryW(L"SHELL32.DLL"); - RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (LPCSTR)0x3D); + RunFileDlg = (RUNFILEDLG)(FARPROC)GetProcAddress(hShell32, (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) { + HICON hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER)); + /* NOTE - don't check whether running on win 9x or NT, let's just assume that a unicode build only runs on NT */ - RunFileDlg(hMainWnd, 0, NULL, NULL, szText, RFF_CALCDIRECTORY); + RunFileDlg(hMainWnd, hIcon, NULL, NULL, szText, RFF_CALCDIRECTORY); + + DeleteObject(hIcon); } FreeLibrary(hShell32);

1 0

[tkreuzer] 70443: [CRT] Fix handling of NULL buffer in streamout. Fixes a few msvcrt_crt_apitests, while it breaks a few for crtdll. crtdll is broken anyway and obsolete, nothing uses it, so it doe...
by tkreuzer＠svn.reactos.org 27 Dec '15

27 Dec '15

Author: tkreuzer Date: Sun Dec 27 18:22:13 2015 New Revision: 70443 URL: http://svn.reactos.org/svn/reactos?rev=70443&view=rev Log: [CRT] Fix handling of NULL buffer in streamout. Fixes a few msvcrt_crt_apitests, while it breaks a few for crtdll. crtdll is broken anyway and obsolete, nothing uses it, so it doesn't really matter. CORE-9105 #resolve Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c Modified: trunk/reactos/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/streamo… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/streamout.c [iso-8859-1] Sun Dec 27 18:22:13 2015 @@ -227,11 +227,10 @@ int streamout_char(FILE *stream, int chr) { -#ifdef _LIBCNT_ - if ((stream->_flag & _IOSTRG) && (!stream->_ptr)) +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) return 1; -#endif - +#endif #if defined(_USER32_WSPRINTF) || defined(_LIBCNT_) /* Check if the buffer is full */ if (stream->_cnt < sizeof(TCHAR)) @@ -254,6 +253,11 @@ TCHAR chr; int written = 0; +#if !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif + while (count--) { #ifdef _UNICODE @@ -276,6 +280,11 @@ { wchar_t chr; int written = 0; + +#if defined(_UNICODE) && !defined(_USER32_WSPRINTF) + if ((stream->_flag & _IOSTRG) && (stream->_base == NULL)) + return count; +#endif while (count--) {

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