Ros-diffs January 2020

ros-diffs@reactos.org

21 participants
133 discussions

[reactos] 01/01: [HAL][FREELDR] Fix system timer oscillator frequency on a Xbox (#2245)

by disean

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5c00524662f1396a8894… commit e5c00524662f1396a889411fd7dfa81403121de7 Author: disean <di.sean(a)protonmail.com> AuthorDate: Tue Jan 14 23:47:36 2020 +0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 18:47:36 2020 +0100 [HAL][FREELDR] Fix system timer oscillator frequency on a Xbox (#2245) See https://xboxdevwiki.net/Porting_an_Operating_System_to_the_Xbox_HOWTO#Timer… --- boot/freeldr/freeldr/arch/i386/hardware.c | 7 ++++++- hal/halx86/include/halp.h | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hardware.c b/boot/freeldr/freeldr/arch/i386/hardware.c index 0cac33d4986..67074c0fd30 100644 --- a/boot/freeldr/freeldr/arch/i386/hardware.c +++ b/boot/freeldr/freeldr/arch/i386/hardware.c @@ -27,8 +27,13 @@ DBG_DEFAULT_CHANNEL(HWDETECT); #define MILLISEC (10) #define PRECISION (8) +#if defined(SARCH_XBOX) +#define CLOCK_TICK_RATE 1125000 +#else +#define CLOCK_TICK_RATE 1193182 +#endif + #define HZ (100) -#define CLOCK_TICK_RATE (1193182) #define LATCH (CLOCK_TICK_RATE / HZ) static unsigned int delay_count = 1; diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 9c03a96f43d..0ef52df2a93 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -86,11 +86,18 @@ VOID // #define GRAPHICS_MODE_12 0x12 /* 80x30 8x16 640x480 16/256K */ +#if defined(SARCH_XBOX) +// +// For some unknown reason the PIT of the Xbox is fixed at 1.125000 MHz, +// which is ~5.7% lower than on the PC. +// +#define PIT_FREQUENCY 1125000 +#else // // Commonly stated as being 1.19318MHz // // See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) -// P. 471 +// p. 471 // // However, the true value is closer to 1.19318181[...]81MHz since this is 1/3rd // of the NTSC color subcarrier frequency which runs at 3.57954545[...]45MHz. @@ -104,6 +111,7 @@ VOID // number is quite long. // #define PIT_FREQUENCY 1193182 +#endif // // These ports are controlled by the i8254 Programmable Interrupt Timer (PIT)

4 years, 11 months

[reactos] 01/01: [FREELDR] Cache INT13h drive data in pcdisk.c (#2097)

by disean

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c93350e05f7105afd6fe… commit 7c93350e05f7105afd6fedc8498d68c9a8841e31 Author: disean <di.sean(a)protonmail.com> AuthorDate: Tue Jan 14 09:08:53 2020 +0600 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 14 04:08:53 2020 +0100 [FREELDR] Cache INT13h drive data in pcdisk.c (#2097) * [FREELDR] Cache the drive geometry in the PcDiskReadLogicalSectorsCHS() Speed up the loading time a bit. * [FREELDR] Generalize the cache to all the geometry data + INT 13h extensions-supported status. The data structure used is "PC_DISK_DRIVE". - Adapt the associated functions; - Make DiskGetExtendedDriveParameters() private to pcdisk.c - Introduce PcDiskDriveNumberToDrive(), that is similar to the XBOX function XboxDiskDriveNumberToDeviceUnit(), that retrieves a valid pointer to the cached disk corresponding to the given BIOS DriveNumber. If needed the cached data gets initialized. - Make XboxDiskDriveNumberToDeviceUnit() simpler by just returning the pointer to the corresponding drive, of NULL if there is none. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 2 + boot/freeldr/freeldr/arch/i386/machpc.c | 7 +- boot/freeldr/freeldr/arch/i386/pcdisk.c | 731 ++++++++++++++++---------- boot/freeldr/freeldr/arch/i386/xboxdisk.c | 52 +- boot/freeldr/freeldr/include/arch/pc/machpc.h | 2 +- 5 files changed, 498 insertions(+), 296 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 7aec1c3db99..cf23c60ac21 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -396,6 +396,8 @@ EnumerateHarddisks(OUT PBOOLEAN BootDriveReported) return DiskCount; } +// FIXME: Copied from pcdisk.c +// Actually this function is REALLY PC-specific!! static BOOLEAN DiskIsDriveRemovable(UCHAR DriveNumber) { diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 712a0575b44..95253971c02 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -105,7 +105,7 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; - EXTENDED_GEOMETRY ExtGeometry; + // EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; @@ -139,6 +139,7 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) DiskGeometry = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Get the disk geometry */ +#if 0 // This is somehow replaced by what PcDiskGetDriveGeometry() does internally. ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); if (DiskGetExtendedDriveParameters(DriveNumber, &ExtGeometry, ExtGeometry.Size)) { @@ -147,7 +148,9 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) DiskGeometry->SectorsPerTrack = ExtGeometry.SectorsPerTrack; DiskGeometry->NumberOfHeads = ExtGeometry.Heads; } - else if (PcDiskGetDriveGeometry(DriveNumber, &Geometry)) + else +#endif + if (PcDiskGetDriveGeometry(DriveNumber, &Geometry)) { DiskGeometry->BytesPerSector = Geometry.BytesPerSector; DiskGeometry->NumberOfCylinders = Geometry.Cylinders; diff --git a/boot/freeldr/freeldr/arch/i386/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pcdisk.c index f9fc4f0c1ba..37058bced70 100644 --- a/boot/freeldr/freeldr/arch/i386/pcdisk.c +++ b/boot/freeldr/freeldr/arch/i386/pcdisk.c @@ -24,6 +24,9 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); +/* Enable this line if you want to support multi-drive caching (increases FreeLdr size!) */ +// #define CACHE_MULTI_DRIVES + #include <pshpack2.h> typedef struct @@ -73,6 +76,43 @@ typedef struct #include <poppack.h> +typedef struct _PC_DISK_DRIVE +{ + /* Disk geometry (legacy BIOS and INT13 extended) */ + GEOMETRY Geometry; + EXTENDED_GEOMETRY ExtGeometry; + + /* TRUE when INT 13h extensions are supported */ + BOOLEAN Int13ExtensionsSupported; + + /* + * 'IsRemovable' flag: TRUE when the drive is removable (e.g. floppy, CD-ROM...). + * In that case some of the cached information might need to be refreshed regularly. + */ + BOOLEAN IsRemovable; + +#ifdef CACHE_MULTI_DRIVES + /* + * 'Initialized' flag: if TRUE then the drive has been initialized; + * if FALSE then it needs to be initialized; if its high bit is set + * then there has been an error; don't try to use it. + */ + BOOLEAN Initialized; +#endif +} PC_DISK_DRIVE, *PPC_DISK_DRIVE; + +#ifdef CACHE_MULTI_DRIVES +/* Cache of all possible PC disk drives */ +// Maximum number of disks is 0x100, indexed from 0x00 to 0xFF. +static PC_DISK_DRIVE PcDiskDrive[0x100]; +#else +/* Cached data for the last-accessed PC disk drive */ +// We use a USHORT so that we can initialize it with a drive number that cannot exist +// on the system (they are <= 0xFF), therefore forcing drive caching on first access. +static USHORT LastDriveNumber = 0xFFFF; +static PC_DISK_DRIVE PcDiskDrive; +#endif /* CACHE_MULTI_DRIVES */ + /* DISK IO ERROR SUPPORT *****************************************************/ static LONG lReportError = 0; // >= 0: display errors; < 0: hide errors. @@ -130,7 +170,7 @@ static VOID DiskError(PCSTR ErrorString, ULONG ErrorCode) sprintf(ErrorCodeString, "%s\n\nError Code: 0x%lx\nError: %s", ErrorString, ErrorCode, DiskGetErrorCodeString(ErrorCode)); - TRACE("%s\n", ErrorCodeString); + ERR("%s\n", ErrorCodeString); UiMessageBox(ErrorCodeString); } @@ -161,15 +201,370 @@ BOOLEAN DiskResetController(UCHAR DriveNumber) return INT386_SUCCESS(RegsOut); } -static BOOLEAN PcDiskReadLogicalSectorsLBA(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) +static BOOLEAN +DiskIsDriveRemovable(UCHAR DriveNumber) +{ + /* + * Hard disks use drive numbers >= 0x80 . So if the drive number + * indicates a hard disk then return FALSE. + * 0x49 is our magic ramdisk drive, so return FALSE for that too. + */ + if ((DriveNumber >= 0x80) || (DriveNumber == 0x49)) + return FALSE; + + /* The drive is a floppy diskette so return TRUE */ + return TRUE; +} + +static BOOLEAN +DiskInt13ExtensionsSupported(IN UCHAR DriveNumber) +{ + REGS RegsIn, RegsOut; + + /* + * Some BIOSes report that extended disk access functions are not supported + * when booting from a CD (e.g. Phoenix BIOS v6.00PG and Insyde BIOS shipping + * with Intel Macs). Therefore we just return TRUE if we're booting from a CD + * - we can assume that all El Torito capable BIOSes support INT 13 extensions. + * We simply detect whether we're booting from CD by checking whether the drive + * number is >= 0x8A. It's 0x90 on the Insyde BIOS, and 0x9F on most other BIOSes. + */ + if (DriveNumber >= 0x8A) + return TRUE; + + /* + * IBM/MS INT 13 Extensions - INSTALLATION CHECK + * AH = 41h + * BX = 55AAh + * DL = drive (80h-FFh) + * Return: + * CF set on error (extensions not supported) + * AH = 01h (invalid function) + * CF clear if successful + * BX = AA55h if installed + * AH = major version of extensions + * 01h = 1.x + * 20h = 2.0 / EDD-1.0 + * 21h = 2.1 / EDD-1.1 + * 30h = EDD-3.0 + * AL = internal use + * CX = API subset support bitmap + * DH = extension version (v2.0+ ??? -- not present in 1.x) + * + * Bitfields for IBM/MS INT 13 Extensions API support bitmap + * Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported + * Bit 1, removable drive controller functions (AH=45h,46h,48h,49h,INT 15/AH=52h) supported + * Bit 2, enhanced disk drive (EDD) functions (AH=48h,AH=4Eh) supported + * extended drive parameter table is valid + * Bits 3-15 reserved + */ + RegsIn.b.ah = 0x41; + RegsIn.w.bx = 0x55AA; + RegsIn.b.dl = DriveNumber; + + /* Reset the disk controller */ + Int386(0x13, &RegsIn, &RegsOut); + if (!INT386_SUCCESS(RegsOut)) + { + /* CF set on error (extensions not supported) */ + return FALSE; + } + + if (RegsOut.w.bx != 0xAA55) + { + /* BX = AA55h if installed */ + return FALSE; + } + + if (!(RegsOut.w.cx & 0x0001)) + { + /* + * CX = API subset support bitmap. + * Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported. + */ + WARN("Suspicious API subset support bitmap 0x%x on device 0x%lx\n", + RegsOut.w.cx, DriveNumber); + return FALSE; + } + + return TRUE; +} + +static BOOLEAN +DiskGetExtendedDriveParameters( + IN UCHAR DriveNumber, + IN PPC_DISK_DRIVE DiskDrive, + OUT PVOID Buffer, + IN USHORT BufferSize) +{ + REGS RegsIn, RegsOut; + PUSHORT Ptr = (PUSHORT)(BIOSCALLBUFFER); + + TRACE("DiskGetExtendedDriveParameters(0x%x)\n", DriveNumber); + + if (!DiskDrive->Int13ExtensionsSupported) + return FALSE; + + /* Initialize transfer buffer */ + *Ptr = BufferSize; + + /* + * BIOS Int 13h, function 48h - Get drive parameters + * AH = 48h + * DL = drive (bit 7 set for hard disk) + * DS:SI = result buffer + * Return: + * CF set on error + * AH = status (07h) + * CF clear if successful + * AH = 00h + * DS:SI -> result buffer + */ + RegsIn.b.ah = 0x48; + RegsIn.b.dl = DriveNumber; + RegsIn.x.ds = BIOSCALLBUFSEGMENT; // DS:SI -> result buffer + RegsIn.w.si = BIOSCALLBUFOFFSET; + + /* Get drive parameters */ + Int386(0x13, &RegsIn, &RegsOut); + if (!INT386_SUCCESS(RegsOut)) + return FALSE; + + RtlCopyMemory(Buffer, Ptr, BufferSize); + +#if DBG + TRACE("size of buffer: %x\n", Ptr[0]); + TRACE("information flags: %x\n", Ptr[1]); + TRACE("number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]); + TRACE("number of physical heads on drive: %u\n", *(PULONG)&Ptr[4]); + TRACE("number of physical sectors per track: %u\n", *(PULONG)&Ptr[6]); + TRACE("total number of sectors on drive: %I64u\n", *(unsigned long long*)&Ptr[8]); + TRACE("bytes per sector: %u\n", Ptr[12]); + if (Ptr[0] >= 0x1e) + { + TRACE("EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14]); + if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) + { + PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[13] << 4) + Ptr[14]); + TRACE("SpecPtr: %x\n", SpecPtr); + TRACE("physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0]); + TRACE("disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2]); + TRACE("drive flags: %x\n", SpecPtr[4]); + TRACE("proprietary information: %x\n", SpecPtr[5]); + TRACE("IRQ for drive: %u\n", SpecPtr[6]); + TRACE("sector count for multi-sector transfers: %u\n", SpecPtr[7]); + TRACE("DMA control: %x\n", SpecPtr[8]); + TRACE("programmed I/O control: %x\n", SpecPtr[9]); + TRACE("drive options: %x\n", *(PUSHORT)&SpecPtr[10]); + } + } + if (Ptr[0] >= 0x42) + { + TRACE("signature: %x\n", Ptr[15]); + } +#endif + + return TRUE; +} + +static BOOLEAN +InitDriveGeometry( + IN UCHAR DriveNumber, + IN PPC_DISK_DRIVE DiskDrive) +{ + BOOLEAN Success; + REGS RegsIn, RegsOut; + ULONG Cylinders; + + /* Get the extended geometry first */ + DiskDrive->ExtGeometry.Size = sizeof(DiskDrive->ExtGeometry); + Success = DiskGetExtendedDriveParameters(DriveNumber, DiskDrive, + &DiskDrive->ExtGeometry, + DiskDrive->ExtGeometry.Size); + if (!Success) + { + /* Failed, zero it out */ + RtlZeroMemory(&DiskDrive->ExtGeometry, sizeof(DiskDrive->ExtGeometry)); + } + else + { + TRACE("DiskGetExtendedDriveParameters(0x%x) returned:\n" + "Cylinders : 0x%x\n" + "Heads : 0x%x\n" + "Sects/Track: 0x%x\n" + "Bytes/Sect : 0x%x\n", + DriveNumber, + DiskDrive->ExtGeometry.Cylinders, + DiskDrive->ExtGeometry.Heads, + DiskDrive->ExtGeometry.SectorsPerTrack, + DiskDrive->ExtGeometry.BytesPerSector); + } + + /* Now try the legacy geometry */ + RtlZeroMemory(&DiskDrive->Geometry, sizeof(DiskDrive->Geometry)); + + /* + * BIOS Int 13h, function 08h - Get drive parameters + * AH = 08h + * DL = drive (bit 7 set for hard disk) + * ES:DI = 0000h:0000h to guard against BIOS bugs + * Return: + * CF set on error + * AH = status (07h) + * CF clear if successful + * AH = 00h + * AL = 00h on at least some BIOSes + * BL = drive type (AT/PS2 floppies only) + * CH = low eight bits of maximum cylinder number + * CL = maximum sector number (bits 5-0) + * high two bits of maximum cylinder number (bits 7-6) + * DH = maximum head number + * DL = number of drives + * ES:DI -> drive parameter table (floppies only) + */ + RegsIn.b.ah = 0x08; + RegsIn.b.dl = DriveNumber; + RegsIn.w.es = 0x0000; + RegsIn.w.di = 0x0000; + + /* Get drive parameters */ + Int386(0x13, &RegsIn, &RegsOut); + if (!INT386_SUCCESS(RegsOut)) + { + /* We failed, return the result of the previous call (extended geometry) */ + return Success; + } + /* OR it with the old result, so that we return TRUE whenever either call succeeded */ + Success |= TRUE; + + Cylinders = (RegsOut.b.cl & 0xC0) << 2; + Cylinders += RegsOut.b.ch; + Cylinders++; + DiskDrive->Geometry.Cylinders = Cylinders; + DiskDrive->Geometry.Heads = RegsOut.b.dh + 1; + DiskDrive->Geometry.Sectors = RegsOut.b.cl & 0x3F; + DiskDrive->Geometry.BytesPerSector = 512; /* Just assume 512 bytes per sector */ + + TRACE("Regular Int13h(0x%x) returned:\n" + "Cylinders : 0x%x\n" + "Heads : 0x%x\n" + "Sects/Track: 0x%x (original 0x%x)\n" + "Bytes/Sect : 0x%x\n", + DriveNumber, + DiskDrive->Geometry.Cylinders, + DiskDrive->Geometry.Heads, + DiskDrive->Geometry.Sectors, RegsOut.b.cl, + DiskDrive->Geometry.BytesPerSector); + + return Success; +} + +static BOOLEAN +PcDiskDriveInit( + IN UCHAR DriveNumber, + IN OUT PPC_DISK_DRIVE DiskDrive) +{ + DiskDrive->IsRemovable = DiskIsDriveRemovable(DriveNumber); + + /* + * Check to see if it is a fixed disk drive. + * If so then check to see if INT 13h extensions work. + * If they do then use them, otherwise default back to BIOS calls. + */ + DiskDrive->Int13ExtensionsSupported = DiskInt13ExtensionsSupported(DriveNumber); + + if (!InitDriveGeometry(DriveNumber, DiskDrive)) + return FALSE; + + TRACE("\n" + "DriveNumber: 0x%x\n" + "IsRemovable = %s\n" + "Int13ExtensionsSupported = %s\n", + DriveNumber, + DiskDrive->IsRemovable ? "TRUE" : "FALSE", + DiskDrive->Int13ExtensionsSupported ? "TRUE" : "FALSE"); + + return TRUE; +} + +static inline +PPC_DISK_DRIVE +PcDiskDriveNumberToDrive(IN UCHAR DriveNumber) +{ +#ifdef CACHE_MULTI_DRIVES + PPC_DISK_DRIVE DiskDrive; + + ASSERT((0 <= DriveNumber) && (DriveNumber < RTL_NUMBER_OF(PcDiskDrive))); + + /* Retrieve a slot */ + DiskDrive = &PcDiskDrive[DriveNumber]; + + /* If the drive has not been initialized before... */ + if (!DiskDrive->Initialized) + { + /* ... try to initialize it now. */ + if (!PcDiskDriveInit(DriveNumber, DiskDrive)) + { + /* + * If we failed, there is no drive at this number + * and flag it as such (set its high bit). + */ + DiskDrive->Initialized |= 0x80; + return NULL; + } + DiskDrive->Initialized = TRUE; + } + else if (DiskDrive->Initialized & 0x80) + { + /* + * The disk failed to be initialized previously, reset its flag to give + * it chance to be initialized again later, but just fail for the moment. + */ + DiskDrive->Initialized = FALSE; + return NULL; + } + + return DiskDrive; +#else + static PC_DISK_DRIVE NewDiskDrive; + + ASSERT((0 <= DriveNumber) && (DriveNumber <= 0xFF)); + + /* Update cached information */ + + /* If the drive has not been accessed last before... */ + if ((USHORT)DriveNumber != LastDriveNumber) + { + /* ... try to (re-)initialize and cache it now. */ + RtlZeroMemory(&NewDiskDrive, sizeof(NewDiskDrive)); + if (!PcDiskDriveInit(DriveNumber, &NewDiskDrive)) + { + /* + * If we failed, there is no drive at this number. + * Keep the last-accessed valid drive cached. + */ + return NULL; + } + /* We succeeded, cache the drive data */ + PcDiskDrive = NewDiskDrive; + LastDriveNumber = (USHORT)DriveNumber; + } + + return &PcDiskDrive; +#endif /* CACHE_MULTI_DRIVES */ +} + +static BOOLEAN +PcDiskReadLogicalSectorsLBA( + IN UCHAR DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + OUT PVOID Buffer) { REGS RegsIn, RegsOut; ULONG RetryCount; PI386_DISK_ADDRESS_PACKET Packet = (PI386_DISK_ADDRESS_PACKET)(BIOSCALLBUFFER); - TRACE("PcDiskReadLogicalSectorsLBA() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", DriveNumber, SectorNumber, SectorCount, Buffer); - ASSERT(((ULONG_PTR)Buffer) <= 0xFFFFF); - /* Setup disk address packet */ RtlZeroMemory(Packet, sizeof(*Packet)); Packet->PacketSize = sizeof(*Packet); @@ -196,7 +591,7 @@ static BOOLEAN PcDiskReadLogicalSectorsLBA(UCHAR DriveNumber, ULONGLONG SectorNu RegsIn.w.si = BIOSCALLBUFOFFSET; /* Retry 3 times */ - for (RetryCount=0; RetryCount<3; RetryCount++) + for (RetryCount = 0; RetryCount < 3; ++RetryCount) { Int386(0x13, &RegsIn, &RegsOut); @@ -227,7 +622,13 @@ static BOOLEAN PcDiskReadLogicalSectorsLBA(UCHAR DriveNumber, ULONGLONG SectorNu return FALSE; } -static BOOLEAN PcDiskReadLogicalSectorsCHS(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) +static BOOLEAN +PcDiskReadLogicalSectorsCHS( + IN UCHAR DriveNumber, + IN PPC_DISK_DRIVE DiskDrive, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + OUT PVOID Buffer) { UCHAR PhysicalSector; UCHAR PhysicalHead; @@ -237,19 +638,11 @@ static BOOLEAN PcDiskReadLogicalSectorsCHS(UCHAR DriveNumber, ULONGLONG SectorNu REGS RegsIn, RegsOut; ULONG RetryCount; - TRACE("PcDiskReadLogicalSectorsCHS()\n"); - - /* Get the drive geometry */ - // - // TODO: Cache this information for the given drive. - // - if (!PcDiskGetDriveGeometry(DriveNumber, &DriveGeometry) || - DriveGeometry.Sectors == 0 || DriveGeometry.Heads == 0) - { + DriveGeometry = DiskDrive->Geometry; + if (DriveGeometry.Sectors == 0 || DriveGeometry.Heads == 0) return FALSE; - } - while (SectorCount) + while (SectorCount > 0) { /* * Calculate the physical disk offsets. @@ -313,7 +706,7 @@ static BOOLEAN PcDiskReadLogicalSectorsCHS(UCHAR DriveNumber, ULONGLONG SectorNu RegsIn.w.bx = ((ULONG_PTR)Buffer) & 0x0F; /* Perform the read. Retry 3 times. */ - for (RetryCount=0; RetryCount<3; RetryCount++) + for (RetryCount = 0; RetryCount < 3; ++RetryCount) { Int386(0x13, &RegsIn, &RegsOut); @@ -327,7 +720,7 @@ static BOOLEAN PcDiskReadLogicalSectorsCHS(UCHAR DriveNumber, ULONGLONG SectorNu { break; } - /* If it failed the do the next retry */ + /* If it failed then do the next retry */ else { DiskResetController(DriveNumber); @@ -345,11 +738,13 @@ static BOOLEAN PcDiskReadLogicalSectorsCHS(UCHAR DriveNumber, ULONGLONG SectorNu return FALSE; } - // I have learned that not all BIOSes return - // the sector read count in the AL register (at least mine doesn't) - // even if the sectors were read correctly. So instead - // of checking the sector read count we will rely solely - // on the carry flag being set on error + /* + * I have learned that not all BIOSes return + * the sector read count in the AL register (at least mine doesn't) + * even if the sectors were read correctly. So instead + * of checking the sector read count we will rely solely + * on the carry flag being set on error. + */ Buffer = (PVOID)((ULONG_PTR)Buffer + (NumberOfSectorsToRead * DriveGeometry.BytesPerSector)); SectorCount -= NumberOfSectorsToRead; @@ -359,128 +754,37 @@ static BOOLEAN PcDiskReadLogicalSectorsCHS(UCHAR DriveNumber, ULONGLONG SectorNu return TRUE; } -static BOOLEAN DiskInt13ExtensionsSupported(UCHAR DriveNumber) -{ - static UCHAR LastDriveNumber = 0xff; - static BOOLEAN LastSupported; - REGS RegsIn, RegsOut; - - TRACE("DiskInt13ExtensionsSupported()\n"); - - if (DriveNumber == LastDriveNumber) - { - TRACE("Using cached value %s for drive 0x%x\n", - LastSupported ? "TRUE" : "FALSE", DriveNumber); - return LastSupported; - } - - /* - * Some BIOSes report that extended disk access functions are not supported - * when booting from a CD (e.g. Phoenix BIOS v6.00PG and Insyde BIOS shipping - * with Intel Macs). Therefore we just return TRUE if we're booting from a CD - - * we can assume that all El Torito capable BIOSes support INT 13 extensions. - * We simply detect whether we're booting from CD by checking whether the drive - * number is >= 0x8A. It's 0x90 on the Insyde BIOS, and 0x9F on most other BIOSes. - */ - if (DriveNumber >= 0x8A) - { - LastSupported = TRUE; - return TRUE; - } - - LastDriveNumber = DriveNumber; - - /* - * IBM/MS INT 13 Extensions - INSTALLATION CHECK - * AH = 41h - * BX = 55AAh - * DL = drive (80h-FFh) - * Return: - * CF set on error (extensions not supported) - * AH = 01h (invalid function) - * CF clear if successful - * BX = AA55h if installed - * AH = major version of extensions - * 01h = 1.x - * 20h = 2.0 / EDD-1.0 - * 21h = 2.1 / EDD-1.1 - * 30h = EDD-3.0 - * AL = internal use - * CX = API subset support bitmap - * DH = extension version (v2.0+ ??? -- not present in 1.x) - * - * Bitfields for IBM/MS INT 13 Extensions API support bitmap - * Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported - * Bit 1, removable drive controller functions (AH=45h,46h,48h,49h,INT 15/AH=52h) supported - * Bit 2, enhanced disk drive (EDD) functions (AH=48h,AH=4Eh) supported - * extended drive parameter table is valid - * Bits 3-15 reserved - */ - RegsIn.b.ah = 0x41; - RegsIn.w.bx = 0x55AA; - RegsIn.b.dl = DriveNumber; - - /* Reset the disk controller */ - Int386(0x13, &RegsIn, &RegsOut); - - if (!INT386_SUCCESS(RegsOut)) - { - /* CF set on error (extensions not supported) */ - LastSupported = FALSE; - return FALSE; - } - - if (RegsOut.w.bx != 0xAA55) - { - /* BX = AA55h if installed */ - LastSupported = FALSE; - return FALSE; - } - - if (!(RegsOut.w.cx & 0x0001)) - { - /* - * CX = API subset support bitmap. - * Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported. - */ - DbgPrint("Suspicious API subset support bitmap 0x%x on device 0x%lx\n", - RegsOut.w.cx, DriveNumber); - LastSupported = FALSE; - return FALSE; - } - - LastSupported = TRUE; - return TRUE; -} - -BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) +BOOLEAN +PcDiskReadLogicalSectors( + IN UCHAR DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + OUT PVOID Buffer) { - BOOLEAN ExtensionsSupported; + PPC_DISK_DRIVE DiskDrive; TRACE("PcDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", DriveNumber, SectorNumber, SectorCount, Buffer); - /* - * Check to see if it is a fixed disk drive. - * If so then check to see if Int13 extensions work. - * If they do then use them, otherwise default back to BIOS calls. - */ - ExtensionsSupported = DiskInt13ExtensionsSupported(DriveNumber); + /* 16-bit BIOS addressing limitation */ + ASSERT(((ULONG_PTR)Buffer) <= 0xFFFFF); - if ((DriveNumber >= 0x80) && ExtensionsSupported) - { - TRACE("Using Int 13 Extensions for read. DiskInt13ExtensionsSupported(%d) = %s\n", DriveNumber, ExtensionsSupported ? "TRUE" : "FALSE"); + DiskDrive = PcDiskDriveNumberToDrive(DriveNumber); + if (!DiskDrive) + return FALSE; + if ((DriveNumber >= 0x80) && DiskDrive->Int13ExtensionsSupported) + { /* LBA is easy, nothing to calculate. Just do the read. */ + TRACE("--> Using LBA\n"); return PcDiskReadLogicalSectorsLBA(DriveNumber, SectorNumber, SectorCount, Buffer); } else { - /* LBA is not supported default to the CHS calls */ - return PcDiskReadLogicalSectorsCHS(DriveNumber, SectorNumber, SectorCount, Buffer); + /* LBA is not supported, default to CHS */ + TRACE("--> Using CHS\n"); + return PcDiskReadLogicalSectorsCHS(DriveNumber, DiskDrive, SectorNumber, SectorCount, Buffer); } - - return TRUE; } #if defined(__i386__) || defined(_M_AMD64) @@ -490,159 +794,52 @@ VOID __cdecl DiskStopFloppyMotor(VOID) } #endif // defined __i386__ || defined(_M_AMD64) -BOOLEAN DiskGetExtendedDriveParameters(UCHAR DriveNumber, PVOID Buffer, USHORT BufferSize) +BOOLEAN +PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) { - REGS RegsIn, RegsOut; - PUSHORT Ptr = (PUSHORT)(BIOSCALLBUFFER); + PPC_DISK_DRIVE DiskDrive; - TRACE("DiskGetExtendedDriveParameters()\n"); + TRACE("PcDiskGetDriveGeometry(0x%x)\n", DriveNumber); - if (!DiskInt13ExtensionsSupported(DriveNumber)) + DiskDrive = PcDiskDriveNumberToDrive(DriveNumber); + if (!DiskDrive) return FALSE; - /* Initialize transfer buffer */ - *Ptr = BufferSize; - - /* - * BIOS Int 13h, function 48h - Get drive parameters - * AH = 48h - * DL = drive (bit 7 set for hard disk) - * DS:SI = result buffer - * Return: - * CF set on error - * AH = status (07h) - * CF clear if successful - * AH = 00h - * DS:SI -> result buffer - */ - RegsIn.b.ah = 0x48; - RegsIn.b.dl = DriveNumber; - RegsIn.x.ds = BIOSCALLBUFSEGMENT; // DS:SI -> result buffer - RegsIn.w.si = BIOSCALLBUFOFFSET; - - /* Get drive parameters */ - Int386(0x13, &RegsIn, &RegsOut); - if (!INT386_SUCCESS(RegsOut)) - return FALSE; - - memcpy(Buffer, Ptr, BufferSize); - -#if DBG - TRACE("size of buffer: %x\n", Ptr[0]); - TRACE("information flags: %x\n", Ptr[1]); - TRACE("number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2]); - TRACE("number of physical heads on drive: %u\n", *(PULONG)&Ptr[4]); - TRACE("number of physical sectors per track: %u\n", *(PULONG)&Ptr[6]); - TRACE("total number of sectors on drive: %I64u\n", *(unsigned long long*)&Ptr[8]); - TRACE("bytes per sector: %u\n", Ptr[12]); - if (Ptr[0] >= 0x1e) + /* Try to get the extended geometry first */ + if (DiskDrive->ExtGeometry.Size == sizeof(DiskDrive->ExtGeometry)) { - TRACE("EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14]); - if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) - { - PUCHAR SpecPtr = (PUCHAR)(ULONG_PTR)((Ptr[13] << 4) + Ptr[14]); - TRACE("SpecPtr: %x\n", SpecPtr); - TRACE("physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0]); - TRACE("disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2]); - TRACE("drive flags: %x\n", SpecPtr[4]); - TRACE("proprietary information: %x\n", SpecPtr[5]); - TRACE("IRQ for drive: %u\n", SpecPtr[6]); - TRACE("sector count for multi-sector transfers: %u\n", SpecPtr[7]); - TRACE("DMA control: %x\n", SpecPtr[8]); - TRACE("programmed I/O control: %x\n", SpecPtr[9]); - TRACE("drive options: %x\n", *(PUSHORT)&SpecPtr[10]); - } + /* Extended geometry has been initialized, return it */ + Geometry->Cylinders = DiskDrive->ExtGeometry.Cylinders; + Geometry->Heads = DiskDrive->ExtGeometry.Heads; + Geometry->Sectors = DiskDrive->ExtGeometry.SectorsPerTrack; + Geometry->BytesPerSector = DiskDrive->ExtGeometry.BytesPerSector; } - if (Ptr[0] >= 0x42) + else + /* Fall back to legacy BIOS geometry */ { - TRACE("signature: %x\n", Ptr[15]); + *Geometry = DiskDrive->Geometry; } -#endif return TRUE; } -BOOLEAN -PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) +ULONG +PcDiskGetCacheableBlockCount(UCHAR DriveNumber) { - EXTENDED_GEOMETRY ExtGeometry; - REGS RegsIn, RegsOut; - ULONG Cylinders; - - TRACE("DiskGetDriveGeometry()\n"); + PPC_DISK_DRIVE DiskDrive; - /* Try to get the extended geometry first */ - ExtGeometry.Size = sizeof(ExtGeometry); - if (DiskGetExtendedDriveParameters(DriveNumber, &ExtGeometry, ExtGeometry.Size)) - { - Geometry->Cylinders = ExtGeometry.Cylinders; - Geometry->Heads = ExtGeometry.Heads; - Geometry->Sectors = ExtGeometry.SectorsPerTrack; - Geometry->BytesPerSector = ExtGeometry.BytesPerSector; - return TRUE; - } + DiskDrive = PcDiskDriveNumberToDrive(DriveNumber); + if (!DiskDrive) + return 1; // Unknown count. /* - * BIOS Int 13h, function 08h - Get drive parameters - * AH = 08h - * DL = drive (bit 7 set for hard disk) - * ES:DI = 0000h:0000h to guard against BIOS bugs - * Return: - * CF set on error - * AH = status (07h) - * CF clear if successful - * AH = 00h - * AL = 00h on at least some BIOSes - * BL = drive type (AT/PS2 floppies only) - * CH = low eight bits of maximum cylinder number - * CL = maximum sector number (bits 5-0) - * high two bits of maximum cylinder number (bits 7-6) - * DH = maximum head number - * DL = number of drives - * ES:DI -> drive parameter table (floppies only) + * If LBA is supported then the block size will be 64 sectors (32k). + * If not then the block size is the size of one track. */ - RegsIn.b.ah = 0x08; - RegsIn.b.dl = DriveNumber; - RegsIn.w.es = 0x0000; - RegsIn.w.di = 0x0000; - - /* Get drive parameters */ - Int386(0x13, &RegsIn, &RegsOut); - if (!INT386_SUCCESS(RegsOut)) - return FALSE; - - Cylinders = (RegsOut.b.cl & 0xC0) << 2; - Cylinders += RegsOut.b.ch; - Cylinders++; - Geometry->Cylinders = Cylinders; - Geometry->Heads = RegsOut.b.dh + 1; - Geometry->Sectors = RegsOut.b.cl & 0x3F; - Geometry->BytesPerSector = 512; /* Just assume 512 bytes per sector */ - - return TRUE; -} - -ULONG -PcDiskGetCacheableBlockCount(UCHAR DriveNumber) -{ - GEOMETRY Geometry; - - /* If LBA is supported then the block size will be 64 sectors (32k) - * If not then the block size is the size of one track. */ - if (DiskInt13ExtensionsSupported(DriveNumber)) - { + if (DiskDrive->Int13ExtensionsSupported) return 64; - } - /* Get the disk geometry. If this fails then we will - * just return 1 sector to be safe. */ - else if (!PcDiskGetDriveGeometry(DriveNumber, &Geometry)) - { - return 1; - } else - { - return Geometry.Sectors; - } + return DiskDrive->Geometry.Sectors; } /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xboxdisk.c index 26a00e1136c..06e7e2d6691 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xboxdisk.c @@ -58,44 +58,42 @@ XboxDiskInit(BOOLEAN Init) } } -static -inline -BOOLEAN -XboxDiskDriveNumberToDeviceUnit(UCHAR DriveNumber, PDEVICE_UNIT *DeviceUnit) +static inline +PDEVICE_UNIT +XboxDiskDriveNumberToDeviceUnit(UCHAR DriveNumber) { /* Xbox has only 1 IDE controller and no floppy */ if (DriveNumber < 0x80 || (DriveNumber & 0x0F) >= 2) - return FALSE; + return NULL; if (!AtaInitialized) XboxDiskInit(TRUE); /* HDD */ if ((DriveNumber == 0x80) && HardDrive) - { - *DeviceUnit = HardDrive; - return TRUE; - } + return HardDrive; /* CD */ - if ((DriveNumber & 0xF0) > 0x80 && CdDrive) - { - *DeviceUnit = CdDrive; - return TRUE; - } + if (((DriveNumber & 0xF0) > 0x80) && CdDrive) + return CdDrive; - return FALSE; + return NULL; } BOOLEAN -XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) +XboxDiskReadLogicalSectors( + IN UCHAR DriveNumber, + IN ULONGLONG SectorNumber, + IN ULONG SectorCount, + OUT PVOID Buffer) { - PDEVICE_UNIT DeviceUnit = NULL; + PDEVICE_UNIT DeviceUnit; TRACE("XboxDiskReadLogicalSectors() DriveNumber: 0x%x SectorNumber: %I64d SectorCount: %d Buffer: 0x%x\n", DriveNumber, SectorNumber, SectorCount, Buffer); - if (!XboxDiskDriveNumberToDeviceUnit(DriveNumber, &DeviceUnit)) + DeviceUnit = XboxDiskDriveNumberToDeviceUnit(DriveNumber); + if (!DeviceUnit) return FALSE; return AtaAtapiReadLogicalSectorsLBA(DeviceUnit, SectorNumber, SectorCount, Buffer); @@ -104,11 +102,12 @@ XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG Sect BOOLEAN XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) { - PDEVICE_UNIT DeviceUnit = NULL; + PDEVICE_UNIT DeviceUnit; TRACE("XboxDiskGetDriveGeometry(0x%x)\n", DriveNumber); - if (!XboxDiskDriveNumberToDeviceUnit(DriveNumber, &DeviceUnit)) + DeviceUnit = XboxDiskDriveNumberToDeviceUnit(DriveNumber); + if (!DeviceUnit) return FALSE; Geometry->Cylinders = DeviceUnit->Cylinders; @@ -122,15 +121,14 @@ XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) ULONG XboxDiskGetCacheableBlockCount(UCHAR DriveNumber) { - PDEVICE_UNIT DeviceUnit = NULL; + PDEVICE_UNIT DeviceUnit; - TRACE("XboxDiskGetCacheableBlockCount(0x%x)\n", DriveNumber); - - if (!XboxDiskDriveNumberToDeviceUnit(DriveNumber, &DeviceUnit)) - return 0; + DeviceUnit = XboxDiskDriveNumberToDeviceUnit(DriveNumber); + if (!DeviceUnit) + return 1; // Unknown count. /* - * If LBA is supported then the block size will be 64 sectors (32k) + * If LBA is supported then the block size will be 64 sectors (32k). * If not then the block size is the size of one track. */ if (DeviceUnit->Flags & ATA_DEVICE_LBA) @@ -138,3 +136,5 @@ XboxDiskGetCacheableBlockCount(UCHAR DriveNumber) else return DeviceUnit->Sectors; } + +/* EOF */ diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index d5d8bebce1d..b76e55e776a 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -60,7 +60,7 @@ extern ULONG FrldrBootPartition; LONG DiskReportError(BOOLEAN bShowError); BOOLEAN DiskResetController(UCHAR DriveNumber); -BOOLEAN DiskGetExtendedDriveParameters(UCHAR DriveNumber, PVOID Buffer, USHORT BufferSize); +// BOOLEAN DiskGetExtendedDriveParameters(UCHAR DriveNumber, PVOID Buffer, USHORT BufferSize); BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); BOOLEAN PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY DriveGeometry);

4 years, 11 months

[reactos] 01/01: [MSGINA] Improve Japanese status dialog (#2248)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11851e1a81d6884beb626… commit 11851e1a81d6884beb626b675fae185841bff335 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 13 23:01:39 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 13 23:01:39 2020 +0900 [MSGINA] Improve Japanese status dialog (#2248) Improve Japanese translation (IDD_STATUS). --- dll/win32/msgina/lang/ja-JP.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index a2917d66ed4..18a65cb1772 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -1,13 +1,13 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -IDD_STATUS DIALOGEX 0, 0, 275, 78 +IDD_STATUS DIALOGEX 0, 0, 236, 78 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "お待ちください..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 CONTROL "", IDC_BAR, "Static", SS_OWNERDRAW, 0, 44, 275, 4 - LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 261, 12, SS_WORDELLIPSIS + LTEXT "", IDC_STATUS_MESSAGE, 7, 59, 229, 12, SS_WORDELLIPSIS END IDD_WELCOME DIALOGEX 0, 0, 275, 78

4 years, 11 months

[reactos] 01/01: [SHELL32] Improve Japanese folder property sheet (#2247)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61737d1b3f06b9c138ff1… commit 61737d1b3f06b9c138ff1cd91c242f72c9c20a56 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 13 22:47:26 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 13 22:47:26 2020 +0900 [SHELL32] Improve Japanese folder property sheet (#2247) Improve Japanese translation. --- dll/win32/shell32/lang/ja-JP.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index f6efb2ef254..06fac587cd4 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -234,16 +234,16 @@ BEGIN EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "物理サイズ:", 140101, 8, 88, 55, 10 EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "収容サイズ:", 14026, 8, 104, 55, 10 + LTEXT "内容:", 14026, 8, 104, 55, 10 EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "作成日時:", 14014, 8, 128, 55, 10 EDITTEXT 14015, 58, 128, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "属性:", 14020, 8, 152, 46, 10 - AUTOCHECKBOX "読み取り専用(&R)", 14021, 58, 151, 70, 10 - AUTOCHECKBOX "隠しファイル(&H)", 14022, 126, 151, 70, 10 - AUTOCHECKBOX "アーカイブ(&A)", 14023, 181, 151, 70, 10 + LTEXT "属性:", 14020, 8, 152, 22, 10 + AUTOCHECKBOX "読み取り専用(&R)", 14021, 30, 151, 67, 10 + AUTOCHECKBOX "隠しファイル(&H)", 14022, 99, 151, 67, 10 + AUTOCHECKBOX "アーカイブ(&A)", 14023, 170, 151, 55, 10 PUSHBUTTON "詳細設定(&D)...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END

4 years, 11 months

[reactos] 01/01: [SHELL32][SHLWAPI] Improve Japanese file property sheet (#2246)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd5681c027d43c0284aad… commit bd5681c027d43c0284aade8998cc700822e0953b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jan 13 22:33:50 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jan 13 22:33:50 2020 +0900 [SHELL32][SHLWAPI] Improve Japanese file property sheet (#2246) - Improve file property dialog (IDD_FILE_PROPERTIES). - Translate shlwapi resource into Japanese. --- dll/win32/shell32/lang/ja-JP.rc | 8 ++++---- dll/win32/shlwapi/lang/shlwapi_Ja.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 75e36307eda..f6efb2ef254 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -276,10 +276,10 @@ BEGIN LTEXT "アクセス日時:", 14018, 8, 163, 45, 10 EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "属性:", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "読み取り専用(&R)", 14021, 58, 188, 67, 10 - AUTOCHECKBOX "隠しファイル(&H)", 14022, 126, 188, 50, 10 - AUTOCHECKBOX "アーカイブ(&A)", 14023, 181, 188, 49, 10 + LTEXT "属性:", 14020, 8, 188, 30, 10 + AUTOCHECKBOX "読み取り専用(&R)", 14021, 40, 188, 65, 10 + AUTOCHECKBOX "隠しファイル(&H)", 14022, 107, 188, 62, 10 + AUTOCHECKBOX "アーカイブ(&A)", 14023, 175, 188, 54, 10 PUSHBUTTON "詳細設定(&D)...", 14028, 180, 185, 50, 15, WS_TABSTOP END diff --git a/dll/win32/shlwapi/lang/shlwapi_Ja.rc b/dll/win32/shlwapi/lang/shlwapi_Ja.rc index 617a692da63..eacf29b09df 100644 --- a/dll/win32/shlwapi/lang/shlwapi_Ja.rc +++ b/dll/win32/shlwapi/lang/shlwapi_Ja.rc @@ -25,10 +25,10 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE { - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_BYTES_FORMAT "%ld バイト" + IDS_TIME_INTERVAL_HOURS " 時間" + IDS_TIME_INTERVAL_MINUTES " 分" + IDS_TIME_INTERVAL_SECONDS " 秒" } IDD_ERR_DIALOG DIALOGEX 0, 0, 220, 60

4 years, 11 months

[reactos] 02/02: [DNSAPI] Answer queries for ip addresses before they are passed to the resolver cache.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7789ce1ebc9267d11346d… commit 7789ce1ebc9267d11346d89e532df909e80dec56 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jan 12 15:15:06 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 12 15:15:55 2020 +0100 [DNSAPI] Answer queries for ip addresses before they are passed to the resolver cache. --- dll/win32/dnsapi/query.c | 294 +++++++++++++++++++++++++++-------------------- 1 file changed, 167 insertions(+), 127 deletions(-) diff --git a/dll/win32/dnsapi/query.c b/dll/win32/dnsapi/query.c index 0603b322390..c92f9a14441 100644 --- a/dll/win32/dnsapi/query.c +++ b/dll/win32/dnsapi/query.c @@ -16,6 +16,123 @@ #define NDEBUG #include <debug.h> +static +BOOL +ParseIpv4Address( + _In_ PCWSTR AddressString, + _Out_ PIN_ADDR pAddress) +{ + PCWSTR pTerminator = NULL; + NTSTATUS Status; + + Status = RtlIpv4StringToAddressW(AddressString, + TRUE, + &pTerminator, + pAddress); + if (NT_SUCCESS(Status) && pTerminator != NULL && *pTerminator == L'\0') + return TRUE; + + return FALSE; +} + + +static +BOOL +ParseIpv6Address( + _In_ PCWSTR AddressString, + _Out_ PIN6_ADDR pAddress) +{ + PCWSTR pTerminator = NULL; + NTSTATUS Status; + + Status = RtlIpv6StringToAddressW(AddressString, + &pTerminator, + pAddress); + if (NT_SUCCESS(Status) && pTerminator != NULL && *pTerminator == L'\0') + return TRUE; + + return FALSE; +} + + +static +PDNS_RECORDW +CreateRecordForIpAddress( + _In_ PCWSTR Name, + _In_ WORD Type) +{ + IN_ADDR Ip4Address; + IN6_ADDR Ip6Address; + PDNS_RECORDW pRecord = NULL; + + if (Type == DNS_TYPE_A) + { + if (ParseIpv4Address(Name, &Ip4Address)) + { + pRecord = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(DNS_RECORDW)); + if (pRecord == NULL) + return NULL; + + pRecord->pName = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(Name) + 1) * sizeof(WCHAR)); + if (pRecord == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pRecord); + return NULL; + } + + wcscpy(pRecord->pName, Name); + pRecord->wType = DNS_TYPE_A; + pRecord->wDataLength = sizeof(DNS_A_DATA); + pRecord->Flags.S.Section = DnsSectionQuestion; + pRecord->Flags.S.CharSet = DnsCharSetUnicode; + pRecord->dwTtl = 7 * 24 * 60 * 60; + + pRecord->Data.A.IpAddress = Ip4Address.S_un.S_addr; + + return pRecord; + } + } + else if (Type == DNS_TYPE_AAAA) + { + if (ParseIpv6Address(Name, &Ip6Address)) + { + pRecord = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(DNS_RECORDW)); + if (pRecord == NULL) + return NULL; + + pRecord->pName = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (wcslen(Name) + 1) * sizeof(WCHAR)); + if (pRecord == NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, pRecord); + return NULL; + } + + wcscpy(pRecord->pName, Name); + pRecord->wType = DNS_TYPE_AAAA; + pRecord->wDataLength = sizeof(DNS_AAAA_DATA); + pRecord->Flags.S.Section = DnsSectionQuestion; + pRecord->Flags.S.CharSet = DnsCharSetUnicode; + pRecord->dwTtl = 7 * 24 * 60 * 60; + + CopyMemory(&pRecord->Data.AAAA.Ip6Address, + &Ip6Address.u.Byte, + sizeof(IN6_ADDR)); + + return pRecord; + } + } + + return NULL; +} + /* DnsQuery **************************** * Begin a DNS query, and allow the result to be placed in the application @@ -347,6 +464,56 @@ DnsQuery_UTF8(LPCSTR Name, return DnsQuery_CodePage(CP_UTF8, Name, Type, Options, Extra, QueryResultSet, Reserved); } +DNS_STATUS +WINAPI +DnsQuery_W(LPCWSTR Name, + WORD Type, + DWORD Options, + PVOID Extra, + PDNS_RECORD *QueryResultSet, + PVOID *Reserved) +{ + DWORD dwRecords = 0; + PDNS_RECORDW pRecord = NULL; + DNS_STATUS Status = ERROR_SUCCESS; + + DPRINT("DnsQuery_W()\n"); + + if ((Name == NULL) || + (QueryResultSet == NULL)) + return ERROR_INVALID_PARAMETER; + + *QueryResultSet = NULL; + + /* Create an A or AAAA record for an IP4 or IP6 address */ + pRecord = CreateRecordForIpAddress(Name, + Type); + if (pRecord != NULL) + { + *QueryResultSet = (PDNS_RECORD)pRecord; + return ERROR_SUCCESS; + } + + RpcTryExcept + { + Status = R_ResolverQuery(NULL, + Name, + Type, + Options, + &dwRecords, + (DNS_RECORDW **)QueryResultSet); + DPRINT("R_ResolverQuery() returned %lu\n", Status); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = RpcExceptionCode(); + DPRINT("Exception returned %lu\n", Status); + } + RpcEndExcept; + + return Status; +} + WCHAR *xstrsave(const WCHAR *str) { @@ -455,111 +622,6 @@ CheckForCurrentHostname(CONST CHAR * Name, PFIXED_INFO network_info) return ret; } -BOOL -ParseV4Address(LPCSTR AddressString, - OUT PDWORD pAddress) -{ - CHAR * cp = (CHAR *)AddressString; - DWORD val, base; - unsigned char c; - DWORD parts[4], *pp = parts; - if (!AddressString) - return FALSE; - if (!isdigit(*cp)) return FALSE; - -again: - /* - * Collect number up to ``.''. - * Values are specified as for C: - * 0x=hex, 0=octal, other=decimal. - */ - val = 0; base = 10; - if (*cp == '0') { - if (*++cp == 'x' || *cp == 'X') - base = 16, cp++; - else - base = 8; - } - while ((c = *cp)) { - if (isdigit(c)) { - val = (val * base) + (c - '0'); - cp++; - continue; - } - if (base == 16 && isxdigit(c)) { - val = (val << 4) + (c + 10 - (islower(c) ? 'a' : 'A')); - cp++; - continue; - } - break; - } - if (*cp == '.') { - /* - * Internet format: - * a.b.c.d - */ - if (pp >= parts + 4) return FALSE; - *pp++ = val; - cp++; - goto again; - } - /* - * Check for trailing characters. - */ - if (*cp && *cp > ' ') return FALSE; - - if (pp >= parts + 4) return FALSE; - *pp++ = val; - /* - * Concoct the address according to - * the number of parts specified. - */ - if ((DWORD)(pp - parts) != 4) return FALSE; - if (parts[0] > 0xff || parts[1] > 0xff || parts[2] > 0xff || parts[3] > 0xff) return FALSE; - val = (parts[3] << 24) | (parts[2] << 16) | (parts[1] << 8) | parts[0]; - - if (pAddress) - *pAddress = val; - - return TRUE; -} - - -DNS_STATUS WINAPI -DnsQuery_W(LPCWSTR Name, - WORD Type, - DWORD Options, - PVOID Extra, - PDNS_RECORD *QueryResultSet, - PVOID *Reserved) -{ - DWORD dwRecords = 0; - DNS_STATUS Status = ERROR_SUCCESS; - - DPRINT("DnsQuery_W()\n"); - - *QueryResultSet = NULL; - - RpcTryExcept - { - Status = R_ResolverQuery(NULL, - Name, - Type, - Options, - &dwRecords, - (DNS_RECORDW **)QueryResultSet); - DPRINT("R_ResolverQuery() returned %lu\n", Status); - } - RpcExcept(EXCEPTION_EXECUTE_HANDLER) - { - Status = RpcExceptionCode(); - DPRINT("Exception returned %lu\n", Status); - } - RpcEndExcept; - - return Status; -} - DNS_STATUS WINAPI @@ -617,28 +679,6 @@ Query_Main(LPCWSTR Name, NULL, 0); NameLen--; - /* Is it an IPv4 address? */ - if (ParseV4Address(AnsiName, &Address)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); - *QueryResultSet = (PDNS_RECORD)RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(DNS_RECORD)); - - if (NULL == *QueryResultSet) - { - return ERROR_OUTOFMEMORY; - } - - (*QueryResultSet)->pNext = NULL; - (*QueryResultSet)->wType = Type; - (*QueryResultSet)->wDataLength = sizeof(DNS_A_DATA); - (*QueryResultSet)->Flags.S.Section = DnsSectionAnswer; - (*QueryResultSet)->Flags.S.CharSet = DnsCharSetUnicode; - (*QueryResultSet)->Data.A.IpAddress = Address; - - (*QueryResultSet)->pName = (LPSTR)xstrsave(Name); - - return (*QueryResultSet)->pName ? ERROR_SUCCESS : ERROR_OUTOFMEMORY; - } /* Check allowed characters * According to RFC a-z,A-Z,0-9,-,_, but can't start or end with - or _

4 years, 11 months

[reactos] 01/02: [NETCFGX] Notify the installer of changes to the properties

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c6cba1fc8029db1df59c… commit 2c6cba1fc8029db1df59c317a64339151372af09 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jan 11 16:25:37 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jan 12 15:15:54 2020 +0100 [NETCFGX] Notify the installer of changes to the properties --- dll/win32/netcfgx/propertypage.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index a7ded46a051..3742e1bfe8f 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -746,6 +746,7 @@ WriteParameterArray( _In_ HWND hwnd, _In_ PPARAMETER_ARRAY ParamArray) { + SP_DEVINSTALL_PARAMS_W InstallParams; PPARAMETER Param; HKEY hDriverKey; INT i; @@ -793,6 +794,19 @@ WriteParameterArray( } RegCloseKey(hDriverKey); + + /* Notify the installer of changes to the properties */ + InstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + if (SetupDiGetDeviceInstallParamsW(ParamArray->DeviceInfoSet, + ParamArray->DeviceInfoData, + &InstallParams)) + { + InstallParams.FlagsEx |= DI_FLAGSEX_PROPCHANGE_PENDING; + + SetupDiSetDeviceInstallParamsW(ParamArray->DeviceInfoSet, + ParamArray->DeviceInfoData, + &InstallParams); + } }

4 years, 11 months

[reactos] 01/01: [WIN32SS][WINSRV] Fullwidth character handling Part 2 (#2240)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b41299470b8d5d7fe43a9… commit b41299470b8d5d7fe43a90e9d9bc16ab428b5652 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Jan 12 22:04:57 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Jan 12 22:04:57 2020 +0900 [WIN32SS][WINSRV] Fullwidth character handling Part 2 (#2240) Follow-up of #2231. Also fix FillConsoleOutputAttribute, WriteConsoleOutputCharacterW and WriteConsoleOutputAttribute functions. CORE-12451 --- win32ss/user/winsrv/consrv/condrv/text.c | 310 ++++++++++++++------- win32ss/user/winsrv/consrv/frontends/gui/conwnd.c | 13 +- win32ss/user/winsrv/consrv/frontends/gui/guiterm.h | 7 - win32ss/user/winsrv/consrv/frontends/gui/text.c | 152 ++++++---- win32ss/user/winsrv/consrv/frontends/terminal.c | 11 + 5 files changed, 316 insertions(+), 177 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/text.c b/win32ss/user/winsrv/consrv/condrv/text.c index de0c740e58f..92a6f4dfcfa 100644 --- a/win32ss/user/winsrv/consrv/condrv/text.c +++ b/win32ss/user/winsrv/consrv/condrv/text.c @@ -14,6 +14,8 @@ #define NDEBUG #include <debug.h> +#define COMMON_LEAD_TRAIL (COMMON_LVB_LEADING_BYTE | COMMON_LVB_TRAILING_BYTE) + /* GLOBALS ********************************************************************/ /* @@ -512,8 +514,7 @@ ConDrvReadConsoleOutput(IN PCONSOLE Console, WideCharToMultiByte(Console->OutputCodePage, 0, &Ptr->Char.UnicodeChar, 1, &CurCharInfo->Char.AsciiChar, 1, NULL, NULL); } - CurCharInfo->Attributes = - (Ptr->Attributes & ~(COMMON_LVB_LEADING_BYTE | COMMON_LVB_TRAILING_BYTE)); + CurCharInfo->Attributes = (Ptr->Attributes & ~COMMON_LEAD_TRAIL); ++Ptr; ++CurCharInfo; } @@ -734,7 +735,7 @@ IntReadConsoleOutputStringAscii(IN PCONSOLE Console, SHORT Ypos = (ReadCoord->Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; ULONG i; PCHAR_INFO Ptr; - BOOL bCJK = Console->IsCJK; + BOOLEAN bCJK = Console->IsCJK; for (i = 0; i < NumCodesToRead; ++i) { @@ -791,7 +792,7 @@ IntReadConsoleOutputStringUnicode(IN PCONSOLE Console, SHORT Ypos = (ReadCoord->Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; ULONG i, nNumChars = 0; PCHAR_INFO Ptr; - BOOL bCJK = Console->IsCJK; + BOOLEAN bCJK = Console->IsCJK; for (i = 0; i < NumCodesToRead; ++i, ++nNumChars) { @@ -932,138 +933,236 @@ ConDrvReadConsoleOutputString(IN PCONSOLE Console, } } -NTSTATUS NTAPI -ConDrvWriteConsoleOutputString(IN PCONSOLE Console, - IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN CODE_TYPE CodeType, - IN PVOID StringBuffer, - IN ULONG NumCodesToWrite, - IN PCOORD WriteCoord, - // OUT PCOORD EndCoord, - OUT PULONG NumCodesWritten OPTIONAL) +static NTSTATUS +IntWriteConsoleOutputStringUnicode( + IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PVOID StringBuffer, + IN ULONG NumCodesToWrite, + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; - PVOID WriteBuffer = NULL; - PWCHAR tmpString = NULL; - ULONG X, Y, Length; // , Written = 0; - ULONG CodeSize; + PWCHAR WriteBuffer = StringBuffer; + ULONG i, X, Y, Length; PCHAR_INFO Ptr; + BOOLEAN bCJK = Console->IsCJK; - if (Console == NULL || Buffer == NULL || WriteCoord == NULL /* || EndCoord == NULL */) - { - return STATUS_INVALID_PARAMETER; - } + if (!StringBuffer) + goto Cleanup; - /* Validity checks */ - ASSERT(Console == Buffer->Header.Console); - ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToWrite == 0)); - - // - // FIXME: Make overflow checks on WriteCoord !!!!!! - // - - if (NumCodesWritten) *NumCodesWritten = 0; + X = WriteCoord->X; + Y = (WriteCoord->Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; + Length = NumCodesToWrite; - switch (CodeType) + for (i = 0; i < Length; ++i) { - case CODE_ASCII: - CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); - break; - - case CODE_UNICODE: - CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); - break; - - case CODE_ATTRIBUTE: - CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); - break; + Ptr = ConioCoordToPointer(Buffer, X, Y); - default: - return STATUS_INVALID_PARAMETER; - } + Ptr->Char.UnicodeChar = *WriteBuffer; + ++WriteBuffer; - if (CodeType == CODE_ASCII) - { - /* Convert the ASCII string into Unicode before writing it to the console */ - Length = MultiByteToWideChar(Console->OutputCodePage, 0, - (PCHAR)StringBuffer, - NumCodesToWrite, - NULL, 0); - tmpString = WriteBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length * sizeof(WCHAR)); - if (WriteBuffer) + ++X; + if (X == Buffer->ScreenBufferSize.X) { - MultiByteToWideChar(Console->OutputCodePage, 0, - (PCHAR)StringBuffer, - NumCodesToWrite, - (PWCHAR)WriteBuffer, Length); + X = 0; + ++Y; + if (Y == Buffer->ScreenBufferSize.Y) + { + Y = 0; + } } - else + + /* For Chinese, Japanese and Korean */ + if (bCJK && Ptr->Char.UnicodeChar >= 0x80 && + mk_wcwidth_cjk(Ptr->Char.UnicodeChar) == 2) { - Status = STATUS_NO_MEMORY; - } + /* A full-width character cannot cross a line boundary */ + if (X == Buffer->ScreenBufferSize.X - 1) + { + /* go to next line */ + X = 0; + ++Y; + if (Y == Buffer->ScreenBufferSize.Y) + { + Y = 0; + } + Ptr = ConioCoordToPointer(Buffer, X, Y); + } - // FIXME: Quick fix: fix the CodeType and CodeSize since the - // ASCII string was converted into UNICODE. - // A proper fix needs to be written. - CodeType = CODE_UNICODE; - CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); + /* the leading byte */ + Ptr->Attributes = Buffer->ScreenDefaultAttrib; + Ptr->Attributes |= COMMON_LVB_LEADING_BYTE; + ++i; + + /* the trailing byte */ + Ptr = ConioCoordToPointer(Buffer, X, Y); + Ptr->Attributes = Buffer->ScreenDefaultAttrib; + Ptr->Attributes |= COMMON_LVB_TRAILING_BYTE; + + ++X; + if (X == Buffer->ScreenBufferSize.X) + { + X = 0; + ++Y; + if (Y == Buffer->ScreenBufferSize.Y) + { + Y = 0; + } + } + } } - else + +Cleanup: + if (NumCodesWritten) + *NumCodesWritten = NumCodesToWrite; + return Status; +} + +static NTSTATUS +IntWriteConsoleOutputStringAscii( + IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PVOID StringBuffer, + IN ULONG NumCodesToWrite, + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL) +{ + NTSTATUS Status; + PWCHAR tmpString; + ULONG Length; + + if (!StringBuffer) { - /* For CODE_UNICODE or CODE_ATTRIBUTE, we are already OK */ - WriteBuffer = StringBuffer; + if (NumCodesWritten) + *NumCodesWritten = NumCodesToWrite; + + return STATUS_SUCCESS; } - if (WriteBuffer == NULL || !NT_SUCCESS(Status)) goto Cleanup; + /* Convert the ASCII string into Unicode before writing it to the console */ + Length = MultiByteToWideChar(Console->OutputCodePage, 0, + StringBuffer, + NumCodesToWrite, + NULL, 0); + tmpString = ConsoleAllocHeap(0, Length * sizeof(WCHAR)); + if (!tmpString) + return STATUS_NO_MEMORY; + + MultiByteToWideChar(Console->OutputCodePage, 0, + StringBuffer, + NumCodesToWrite, + tmpString, Length); + + Status = IntWriteConsoleOutputStringUnicode(Console, + Buffer, + tmpString, + Length, + WriteCoord, + NumCodesWritten); + ConsoleFreeHeap(tmpString); + return Status; +} + +static NTSTATUS +IntWriteConsoleOutputStringAttribute( + IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PVOID StringBuffer, + IN ULONG NumCodesToWrite, + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL) +{ + NTSTATUS Status = STATUS_SUCCESS; + PWORD WriteBuffer = StringBuffer; + ULONG i, X, Y, Length; + PCHAR_INFO Ptr; + + if (!StringBuffer) + goto Cleanup; X = WriteCoord->X; Y = (WriteCoord->Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; Length = NumCodesToWrite; - while (Length--) + for (i = 0; i < Length; ++i) { Ptr = ConioCoordToPointer(Buffer, X, Y); - switch (CodeType) - { - case CODE_ASCII: - case CODE_UNICODE: - Ptr->Char.UnicodeChar = *(PWCHAR)WriteBuffer; - break; - - case CODE_ATTRIBUTE: - Ptr->Attributes = *(PWORD)WriteBuffer; - break; - } - WriteBuffer = (PVOID)((ULONG_PTR)WriteBuffer + CodeSize); - // ++Ptr; + Ptr->Attributes = (*WriteBuffer & ~COMMON_LEAD_TRAIL); + ++WriteBuffer; - // Written++; - if (++X == Buffer->ScreenBufferSize.X) + ++X; + if (X == Buffer->ScreenBufferSize.X) { X = 0; - - if (++Y == Buffer->ScreenBufferSize.Y) + ++Y; + if (Y == Buffer->ScreenBufferSize.Y) { Y = 0; } } } +Cleanup: + if (NumCodesWritten) + *NumCodesWritten = NumCodesToWrite; + return Status; +} + +NTSTATUS NTAPI +ConDrvWriteConsoleOutputString( + IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN CODE_TYPE CodeType, + IN PVOID StringBuffer, + IN ULONG NumCodesToWrite, + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL) +{ + NTSTATUS Status; + SMALL_RECT UpdateRect; + + if (Console == NULL || Buffer == NULL || WriteCoord == NULL /* || EndCoord == NULL */) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validity checks */ + ASSERT(Console == Buffer->Header.Console); + ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToWrite == 0)); + + if (NumCodesWritten) + *NumCodesWritten = 0; + + switch (CodeType) + { + case CODE_ASCII: + Status = IntWriteConsoleOutputStringAscii( + Console, Buffer, StringBuffer, NumCodesToWrite, WriteCoord, NumCodesWritten); + break; + + case CODE_UNICODE: + Status = IntWriteConsoleOutputStringUnicode( + Console, Buffer, StringBuffer, NumCodesToWrite, WriteCoord, NumCodesWritten); + break; + + case CODE_ATTRIBUTE: + Status = IntWriteConsoleOutputStringAttribute( + Console, Buffer, StringBuffer, NumCodesToWrite, WriteCoord, NumCodesWritten); + break; + + default: + Status = STATUS_INVALID_PARAMETER; + break; + } + if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) { - SMALL_RECT UpdateRect; ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite); TermDrawRegion(Console, &UpdateRect); } - // EndCoord->X = X; - // EndCoord->Y = (Y + Buffer->ScreenBufferSize.Y - Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; - -Cleanup: - if (tmpString) RtlFreeHeap(RtlGetProcessHeap(), 0, tmpString); - - if (NumCodesWritten) *NumCodesWritten = NumCodesToWrite; // Written; return Status; } @@ -1078,7 +1177,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console, { ULONG X, Y, i; PCHAR_INFO Ptr; - BOOL bLead, bFullwidth; + BOOLEAN bLead, bFullwidth; if (Console == NULL || Buffer == NULL || WriteCoord == NULL) { @@ -1133,7 +1232,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console, case CODE_ASCII: case CODE_UNICODE: Ptr->Char.UnicodeChar = Code.UnicodeChar; - Ptr->Attributes &= ~(COMMON_LVB_LEADING_BYTE | COMMON_LVB_TRAILING_BYTE); + Ptr->Attributes &= ~COMMON_LEAD_TRAIL; if (bFullwidth) { if (bLead) @@ -1144,18 +1243,17 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console, break; case CODE_ATTRIBUTE: - Ptr->Attributes &= ~0xFF; - Ptr->Attributes |= (Code.Attribute & 0xFF); + Ptr->Attributes &= ~COMMON_LEAD_TRAIL; + Ptr->Attributes |= (Code.Attribute & ~COMMON_LEAD_TRAIL); break; } - // ++Ptr; - // Written++; - if (++X == Buffer->ScreenBufferSize.X) + ++X; + if (X == Buffer->ScreenBufferSize.X) { X = 0; - - if (++Y == Buffer->ScreenBufferSize.Y) + ++Y; + if (Y == Buffer->ScreenBufferSize.Y) { Y = 0; } @@ -1170,7 +1268,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console, { Ptr = ConioCoordToPointer(Buffer, X - 1, Y); Ptr->Char.UnicodeChar = L' '; - Ptr->Attributes &= ~(COMMON_LVB_LEADING_BYTE | COMMON_LVB_TRAILING_BYTE); + Ptr->Attributes &= ~COMMON_LEAD_TRAIL; } } diff --git a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c index eda0e822861..633317cd039 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c @@ -991,17 +991,8 @@ OnPaint(PGUI_CONSOLE_DATA GuiData) /* Compose the current screen-buffer on-memory */ if (GetType(ActiveBuffer) == TEXTMODE_BUFFER) { - if (IsCJKCodePage(ActiveBuffer->Header.Console->OutputCodePage)) - { - /* For Chinese, Japanese and Korean */ - GuiPaintTextModeBufferCJK((PTEXTMODE_SCREEN_BUFFER)ActiveBuffer, - GuiData, &ps.rcPaint, &rcPaint); - } - else - { - GuiPaintTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)ActiveBuffer, - GuiData, &ps.rcPaint, &rcPaint); - } + GuiPaintTextModeBuffer((PTEXTMODE_SCREEN_BUFFER)ActiveBuffer, + GuiData, &ps.rcPaint, &rcPaint); } else /* if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) */ { diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h index 2e4a6dfd90f..4ed6c1e8c19 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h +++ b/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h @@ -121,11 +121,4 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, PRECT rcView, PRECT rcFramebuffer); -/* For Chinese, Japanese and Korean */ -VOID -GuiPaintTextModeBufferCJK(PTEXTMODE_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData, - PRECT rcView, - PRECT rcFramebuffer); - /* EOF */ diff --git a/win32ss/user/winsrv/consrv/frontends/gui/text.c b/win32ss/user/winsrv/consrv/frontends/gui/text.c index 8b12645df77..1751dfeb865 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/text.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/text.c @@ -405,54 +405,88 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, NewFont = GuiData->Font[IsUnderline ? FONT_BOLD : FONT_NORMAL]; OldFont = SelectObject(GuiData->hMemDC, NewFont); - for (Line = TopLine; Line <= BottomLine; Line++) + if (Console->IsCJK) { - WCHAR LineBuffer[80]; // Buffer containing a part or all the line to be displayed - From = ConioCoordToPointer(Buffer, LeftColumn, Line); // Get the first code of the line - Start = LeftColumn; - To = LineBuffer; - - for (Char = LeftColumn; Char <= RightColumn; Char++) + for (Line = TopLine; Line <= BottomLine; Line++) { - /* - * We flush the buffer if the new attribute is different - * from the current one, or if the buffer is full. - */ - if (From->Attributes != LastAttribute || (Char - Start == sizeof(LineBuffer) / sizeof(WCHAR))) + for (Char = LeftColumn; Char <= RightColumn; Char++) { - TextOutW(GuiData->hMemDC, - Start * GuiData->CharWidth, - Line * GuiData->CharHeight, - LineBuffer, - Char - Start); - Start = Char; - To = LineBuffer; + From = ConioCoordToPointer(Buffer, Char, Line); Attribute = From->Attributes; - if (Attribute != LastAttribute) + SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); + SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(Attribute))); + + /* Change underline state if needed */ + if (!!(Attribute & COMMON_LVB_UNDERSCORE) != IsUnderline) { - LastAttribute = Attribute; - SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(LastAttribute))); - SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(LastAttribute))); + IsUnderline = !!(Attribute & COMMON_LVB_UNDERSCORE); + + /* Select the new font */ + NewFont = GuiData->Font[IsUnderline ? FONT_BOLD : FONT_NORMAL]; + SelectObject(GuiData->hMemDC, NewFont); + } + + if (Attribute & COMMON_LVB_TRAILING_BYTE) + continue; + + TextOutW(GuiData->hMemDC, + Char * GuiData->CharWidth, + Line * GuiData->CharHeight, + &From->Char.UnicodeChar, 1); + } + } + } + else + { + for (Line = TopLine; Line <= BottomLine; Line++) + { + WCHAR LineBuffer[80]; // Buffer containing a part or all the line to be displayed + From = ConioCoordToPointer(Buffer, LeftColumn, Line); // Get the first code of the line + Start = LeftColumn; + To = LineBuffer; - /* Change underline state if needed */ - if (!!(LastAttribute & COMMON_LVB_UNDERSCORE) != IsUnderline) + for (Char = LeftColumn; Char <= RightColumn; Char++) + { + /* + * We flush the buffer if the new attribute is different + * from the current one, or if the buffer is full. + */ + if (From->Attributes != LastAttribute || (Char - Start == sizeof(LineBuffer) / sizeof(WCHAR))) + { + TextOutW(GuiData->hMemDC, + Start * GuiData->CharWidth, + Line * GuiData->CharHeight, + LineBuffer, + Char - Start); + Start = Char; + To = LineBuffer; + Attribute = From->Attributes; + if (Attribute != LastAttribute) { - IsUnderline = !!(LastAttribute & COMMON_LVB_UNDERSCORE); - /* Select the new font */ - NewFont = GuiData->Font[IsUnderline ? FONT_BOLD : FONT_NORMAL]; - /* OldFont = */ SelectObject(GuiData->hMemDC, NewFont); + LastAttribute = Attribute; + SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(LastAttribute))); + SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(LastAttribute))); + + /* Change underline state if needed */ + if (!!(LastAttribute & COMMON_LVB_UNDERSCORE) != IsUnderline) + { + IsUnderline = !!(LastAttribute & COMMON_LVB_UNDERSCORE); + /* Select the new font */ + NewFont = GuiData->Font[IsUnderline ? FONT_BOLD : FONT_NORMAL]; + SelectObject(GuiData->hMemDC, NewFont); + } } } + + *(To++) = (From++)->Char.UnicodeChar; } - *(To++) = (From++)->Char.UnicodeChar; + TextOutW(GuiData->hMemDC, + Start * GuiData->CharWidth, + Line * GuiData->CharHeight, + LineBuffer, + RightColumn - Start + 1); } - - TextOutW(GuiData->hMemDC, - Start * GuiData->CharWidth, - Line * GuiData->CharHeight, - LineBuffer, - RightColumn - Start + 1); } /* Restore the old font */ @@ -479,12 +513,35 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, CursorBrush = CreateSolidBrush(PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute))); OldBrush = SelectObject(GuiData->hMemDC, CursorBrush); - PatBlt(GuiData->hMemDC, - CursorX * GuiData->CharWidth, - CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), - GuiData->CharWidth, - CursorHeight, - PATCOPY); + if (Attribute & COMMON_LVB_LEADING_BYTE) + { + /* The caret is on the leading byte */ + PatBlt(GuiData->hMemDC, + CursorX * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth * 2, + CursorHeight, + PATCOPY); + } + else if (Attribute & COMMON_LVB_TRAILING_BYTE) + { + /* The caret is on the trailing byte */ + PatBlt(GuiData->hMemDC, + (CursorX - 1) * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth * 2, + CursorHeight, + PATCOPY); + } + else + { + PatBlt(GuiData->hMemDC, + CursorX * GuiData->CharWidth, + CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + GuiData->CharWidth, + CursorHeight, + PATCOPY); + } SelectObject(GuiData->hMemDC, OldBrush); DeleteObject(CursorBrush); @@ -494,15 +551,4 @@ GuiPaintTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer, LeaveCriticalSection(&Console->Lock); } -/* For Chinese, Japanese and Korean */ -VOID -GuiPaintTextModeBufferCJK(PTEXTMODE_SCREEN_BUFFER Buffer, - PGUI_CONSOLE_DATA GuiData, - PRECT rcView, - PRECT rcFramebuffer) -{ - /* FIXME */ - GuiPaintTextModeBuffer(Buffer, GuiData, rcView, rcFramebuffer); -} - /* EOF */ diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c index 6603d844050..bae13a880a2 100644 --- a/win32ss/user/winsrv/consrv/frontends/terminal.c +++ b/win32ss/user/winsrv/consrv/frontends/terminal.c @@ -558,6 +558,17 @@ ConioWriteConsole(PFRONTEND FrontEnd, } Ptr = ConioCoordToPointer(Buff, Buff->CursorPosition.X, Buff->CursorPosition.Y); Ptr->Char.UnicodeChar = L' '; + + if (Ptr->Attributes & COMMON_LVB_TRAILING_BYTE) + { + /* Delete a full-width character */ + Ptr->Attributes = Buff->ScreenDefaultAttrib; + if (Buff->CursorPosition.X > 0) + Buff->CursorPosition.X--; + Ptr = ConioCoordToPointer(Buff, Buff->CursorPosition.X, Buff->CursorPosition.Y); + Ptr->Char.UnicodeChar = L' '; + } + Ptr->Attributes = Buff->ScreenDefaultAttrib; UpdateRect.Left = min(UpdateRect.Left, Buff->CursorPosition.X); UpdateRect.Right = max(UpdateRect.Right, Buff->CursorPosition.X);

4 years, 11 months

[reactos] 01/01: [CMD_APITEST] Add more regression tests for attrib

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbe1d36e5b0b2823166b6… commit dbe1d36e5b0b2823166b6cb7b0f621fdcf192c67 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Dec 8 08:23:22 2019 -0600 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 11 14:20:33 2020 +0100 [CMD_APITEST] Add more regression tests for attrib --- modules/rostests/apitests/cmd/cmd.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/modules/rostests/apitests/cmd/cmd.c b/modules/rostests/apitests/cmd/cmd.c index 2d1a33c53b7..00e527f9c35 100644 --- a/modules/rostests/apitests/cmd/cmd.c +++ b/modules/rostests/apitests/cmd/cmd.c @@ -162,6 +162,10 @@ static const TEST_ENTRY s_attrib_entries[] = { __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, " H " }, { __LINE__, 0, "attrib /S -H attr-te*.txt", FALSE, FALSE }, { __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S -H", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, { __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" }, { __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" }, @@ -285,6 +289,34 @@ static const TEST_ENTRY s_attrib_entries[] = { __LINE__, 0, "attrib /S /D -H attr-dir\\dir1", FALSE, FALSE }, { __LINE__, 0, "attrib /S /D -H attr-dir", FALSE, FALSE }, { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + + /* /S attr-dir, attr-dir\\dir1\\file.txt */ + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + { __LINE__, 0, "cmd /c mkdir attr-dir", FALSE, FALSE }, + { __LINE__, 0, "attrib /S /D attr-dir", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-dir echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "cmd /c mkdir attr-dir\\dir1", FALSE, FALSE }, + { __LINE__, 0, "cmd /c if exist attr-dir\\dir1 echo OK", TRUE, FALSE, "OK" }, + { __LINE__, 0, "cmd /c copy NUL attr-dir\\dir1\\attr-test.txt ", TRUE, FALSE }, + { __LINE__, 0, "attrib attr-dir\\dir1\\attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-dir\\dir1\\attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S -H attr-dir\\dir1\\attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S -H attr-test.txt", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S +H", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S attr-tes*.*", TRUE, FALSE, " H " }, + { __LINE__, 0, "attrib /S -H", FALSE, FALSE }, + { __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "attrib /S attr-tes*.*", TRUE, FALSE, NULL, NULL, " H " }, + { __LINE__, 0, "cmd /c if exist attr-dir/dir1/test.txt attrib -H attr-dir/dir1/test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-dir/dir1/test.txt del /Q attr-dir/dir1/test.txt" }, + { __LINE__, 0, "cmd /c if exist attr-dir rmdir /s /q attr-dir" }, + }; static BOOL MyDuplicateHandle(HANDLE hFile, PHANDLE phFile, BOOL bInherit)

4 years, 11 months

[reactos] 01/01: [NTFS] Fix use after free in failure case of NtfsMountVolume.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd7121862a58f1dd10587… commit bd7121862a58f1dd10587fab67a8479b0d834207 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Jan 11 14:08:20 2020 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jan 11 14:10:55 2020 +0100 [NTFS] Fix use after free in failure case of NtfsMountVolume. NtfsGetVolumeData frees FileRecLookasideList in case of failure, so don't free it again. Dereferencing NewDeviceObject invalidates Vcb. --- drivers/filesystems/ntfs/fsctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index a8c2a425619..a08a227c3dd 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -452,8 +452,6 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(Status)) goto ByeBye; - Lookaside = TRUE; - NewDeviceObject->Flags |= DO_DIRECT_IO; Vcb = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(Vcb, sizeof(NTFS_VCB)); @@ -466,6 +464,8 @@ NtfsMountVolume(PDEVICE_OBJECT DeviceObject, if (!NT_SUCCESS(Status)) goto ByeBye; + Lookaside = TRUE; + NewDeviceObject->Vpb = DeviceToMount->Vpb; Vcb->StorageDevice = DeviceToMount; @@ -564,11 +564,11 @@ ByeBye: if (Ccb) ExFreePool(Ccb); - if (NewDeviceObject) - IoDeleteDevice(NewDeviceObject); - if (Lookaside) ExDeleteNPagedLookasideList(&Vcb->FileRecLookasideList); + + if (NewDeviceObject) + IoDeleteDevice(NewDeviceObject); } DPRINT("NtfsMountVolume() done (Status: %lx)\n", Status);

4 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2020