Ros-diffs September 2015

ros-diffs@reactos.org

17 participants
535 discussions

[pschweitzer] 69410: [CDROM] Finally implement support for IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX
by pschweitzer＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: pschweitzer Date: Mon Sep 28 21:06:02 2015 New Revision: 69410 URL: http://svn.reactos.org/svn/reactos?rev=69410&view=rev Log: [CDROM] Finally implement support for IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Sep 28 21:06:02 2015 @@ -2181,7 +2181,9 @@ } case IOCTL_DISK_GET_LENGTH_INFO: + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: case IOCTL_DISK_GET_DRIVE_GEOMETRY: + case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { // @@ -3163,6 +3165,139 @@ break; } + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: + case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: { + + PREAD_CAPACITY_DATA readCapacityBuffer = srb->DataBuffer; + ULONG lastSector; + ULONG bps; + ULONG lastBit; + ULONG tmp; + PDISK_GEOMETRY_EX geometryEx; + + // + // Swizzle bytes from Read Capacity and translate into + // the necessary geometry information in the device extension. + // + + tmp = readCapacityBuffer->BytesPerBlock; + ((PFOUR_BYTE)&bps)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; + ((PFOUR_BYTE)&bps)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; + ((PFOUR_BYTE)&bps)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; + ((PFOUR_BYTE)&bps)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; + + // + // Insure that bps is a power of 2. + // This corrects a problem with the HP 4020i CDR where it + // returns an incorrect number for bytes per sector. + // + + if (!bps) { + bps = 2048; + } else { + lastBit = (ULONG) -1; + while (bps) { + lastBit++; + bps = bps >> 1; + } + + bps = 1 << lastBit; + } + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; + + DebugPrint((2, + "CdRomDeviceControlCompletion: Calculated bps %#x\n", + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); + + // + // Copy last sector in reverse byte order. + // + + tmp = readCapacityBuffer->LogicalBlockAddress; + ((PFOUR_BYTE)&lastSector)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; + ((PFOUR_BYTE)&lastSector)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; + ((PFOUR_BYTE)&lastSector)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; + ((PFOUR_BYTE)&lastSector)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; + + // + // Calculate sector to byte shift. + // + + WHICH_BIT(bps, deviceExtension->SectorShift); + + DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); + + DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", + lastSector + 1)); + + // + // Calculate media capacity in bytes. + // + + deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); + + // + // Calculate number of cylinders. + // + + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + + deviceExtension->PartitionLength.QuadPart = + (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); + + if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { + + // + // This device supports removable media. + // + + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; + + } else { + + // + // Assume media type is fixed disk. + // + + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; + } + + // + // Assume sectors per track are 32; + // + + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; + + // + // Assume tracks per cylinder (number of heads) is 64. + // + + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; + + // + // Copy the device extension's geometry info into the user buffer. + // + + geometryEx = realIrp->AssociatedIrp.SystemBuffer; + RtlMoveMemory(&geometryEx->Geometry, + &deviceExtension->DiskGeometry->Geometry, + sizeof(DISK_GEOMETRY)); + + // + // Copy the extended information + // + + geometryEx->DiskSize = deviceExtension->PartitionLength; + + // + // update information field. + // + + realIrp->IoStatus.Information = FIELD_OFFSET(DISK_GEOMETRY_EX, Data);; + break; + } + case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: {

1 0

[pschweitzer] 69409: [CDROM] - Don't support IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX for now - Properly implement IRP completion for IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DI...
by pschweitzer＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: pschweitzer Date: Mon Sep 28 20:20:46 2015 New Revision: 69409 URL: http://svn.reactos.org/svn/reactos?rev=69409&view=rev Log: [CDROM] - Don't support IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX for now - Properly implement IRP completion for IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DISK_GET_DRIVE_GEOMETRY Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Sep 28 20:20:46 2015 @@ -2181,9 +2181,7 @@ } case IOCTL_DISK_GET_LENGTH_INFO: - case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: case IOCTL_DISK_GET_DRIVE_GEOMETRY: - case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { // @@ -3041,6 +3039,131 @@ switch (realIrpStack->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_DISK_GET_LENGTH_INFO: { + + PREAD_CAPACITY_DATA readCapacityBuffer = srb->DataBuffer; + ULONG lastSector; + ULONG bps; + ULONG lastBit; + ULONG tmp; + + // + // Swizzle bytes from Read Capacity and translate into + // the necessary geometry information in the device extension. + // + + tmp = readCapacityBuffer->BytesPerBlock; + ((PFOUR_BYTE)&bps)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; + ((PFOUR_BYTE)&bps)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; + ((PFOUR_BYTE)&bps)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; + ((PFOUR_BYTE)&bps)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; + + // + // Insure that bps is a power of 2. + // This corrects a problem with the HP 4020i CDR where it + // returns an incorrect number for bytes per sector. + // + + if (!bps) { + bps = 2048; + } else { + lastBit = (ULONG) -1; + while (bps) { + lastBit++; + bps = bps >> 1; + } + + bps = 1 << lastBit; + } + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; + + DebugPrint((2, + "CdRomDeviceControlCompletion: Calculated bps %#x\n", + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); + + // + // Copy last sector in reverse byte order. + // + + tmp = readCapacityBuffer->LogicalBlockAddress; + ((PFOUR_BYTE)&lastSector)->Byte0 = ((PFOUR_BYTE)&tmp)->Byte3; + ((PFOUR_BYTE)&lastSector)->Byte1 = ((PFOUR_BYTE)&tmp)->Byte2; + ((PFOUR_BYTE)&lastSector)->Byte2 = ((PFOUR_BYTE)&tmp)->Byte1; + ((PFOUR_BYTE)&lastSector)->Byte3 = ((PFOUR_BYTE)&tmp)->Byte0; + + // + // Calculate sector to byte shift. + // + + WHICH_BIT(bps, deviceExtension->SectorShift); + + DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); + + DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", + lastSector + 1)); + + // + // Calculate media capacity in bytes. + // + + deviceExtension->PartitionLength.QuadPart = (LONGLONG)(lastSector + 1); + + // + // Calculate number of cylinders. + // + + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + + deviceExtension->PartitionLength.QuadPart = + (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); + + if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) { + + // + // This device supports removable media. + // + + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; + + } else { + + // + // Assume media type is fixed disk. + // + + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; + } + + // + // Assume sectors per track are 32; + // + + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; + + // + // Assume tracks per cylinder (number of heads) is 64. + // + + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; + + // + // Copy the device extension's geometry info into the user buffer. + // + + RtlMoveMemory(realIrp->AssociatedIrp.SystemBuffer, + &deviceExtension->PartitionLength, + sizeof(GET_LENGTH_INFORMATION)); + + // + // update information field. + // + + realIrp->IoStatus.Information = sizeof(DISK_GEOMETRY); + break; + } + + case IOCTL_DISK_GET_DRIVE_GEOMETRY: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { PREAD_CAPACITY_DATA readCapacityBuffer = srb->DataBuffer;

1 0

[aandrejevic] 69408: [NTVDM] Fix a division-by-zero problem by storing the mouse driver's Width and Height in DWORDs, thus avoiding the integer overflow which could make them zero.
by aandrejevic＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: aandrejevic Date: Mon Sep 28 18:55:26 2015 New Revision: 69408 URL: http://svn.reactos.org/svn/reactos?rev=69408&view=rev Log: [NTVDM] Fix a division-by-zero problem by storing the mouse driver's Width and Height in DWORDs, thus avoiding the integer overflow which could make them zero. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Mon Sep 28 18:55:26 2015 @@ -211,8 +211,8 @@ static VOID ToMouseCoordinates(PCOORD Position) { COORD Resolution = VgaGetDisplayResolution(); - WORD Width = DriverState.MaxX - DriverState.MinX + 1; - WORD Height = DriverState.MaxY - DriverState.MinY + 1; + DWORD Width = DriverState.MaxX - DriverState.MinX + 1; + DWORD Height = DriverState.MaxY - DriverState.MinY + 1; if (!VgaGetDoubleVisionState(NULL, NULL)) { @@ -227,8 +227,8 @@ static VOID FromMouseCoordinates(PCOORD Position) { COORD Resolution = VgaGetDisplayResolution(); - WORD Width = DriverState.MaxX - DriverState.MinX + 1; - WORD Height = DriverState.MaxY - DriverState.MinY + 1; + DWORD Width = DriverState.MaxX - DriverState.MinX + 1; + DWORD Height = DriverState.MaxY - DriverState.MinY + 1; if (!VgaGetDoubleVisionState(NULL, NULL)) {

1 0

[aandrejevic] 69407: [FAST486] - Always use the descriptor type, and never the limit, to identify legacy vs. modern TSSes. - Don't forget to write back the modified TSS link.
by aandrejevic＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: aandrejevic Date: Mon Sep 28 18:51:48 2015 New Revision: 69407 URL: http://svn.reactos.org/svn/reactos?rev=69407&view=rev Log: [FAST486] - Always use the descriptor type, and never the limit, to identify legacy vs. modern TSSes. - Don't forget to write back the modified TSS link. Modified: trunk/reactos/lib/fast486/common.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Mon Sep 28 18:51:48 2015 @@ -716,7 +716,8 @@ if (!Fast486ReadLinearMemory(State, NewTssAddress, &NewTss, - NewTssLimit >= (sizeof(FAST486_TSS) - 1) + (NewTssDescriptor.Signature == FAST486_TSS_SIGNATURE) + || (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) ? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS), FALSE)) { @@ -756,8 +757,37 @@ else { /* Store the link */ - if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) NewTss.Link = State->TaskReg.Selector; - else NewLegacyTss->Link = State->TaskReg.Selector; + if ((NewTssDescriptor.Signature == FAST486_TSS_SIGNATURE) + || (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE)) + { + NewTss.Link = State->TaskReg.Selector; + + /* Write back the new TSS link */ + if (!Fast486WriteLinearMemory(State, + NewTssAddress, + &NewTss.Link, + sizeof(NewTss.Link), + FALSE)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + NewLegacyTss->Link = State->TaskReg.Selector; + + /* Write back the new legacy TSS link */ + if (!Fast486WriteLinearMemory(State, + NewTssAddress, + &NewLegacyTss->Link, + sizeof(NewLegacyTss->Link), + FALSE)) + { + /* Exception occurred */ + return FALSE; + } + } } /* Save the current task into the TSS */ @@ -814,7 +844,17 @@ } /* Mark the new task as busy */ - NewTssDescriptor.Signature = FAST486_BUSY_TSS_SIGNATURE; + if (NewTssDescriptor.Signature == FAST486_TSS_SIGNATURE + || NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) + { + /* 32-bit TSS */ + NewTssDescriptor.Signature = FAST486_BUSY_TSS_SIGNATURE; + } + else + { + /* 16-bit TSS */ + NewTssDescriptor.Signature = FAST486_BUSY_TSS_16_SIGNATURE; + } /* Write back the new TSS descriptor */ if (!Fast486WriteLinearMemory(State, @@ -835,7 +875,7 @@ State->TaskReg.Base = NewTssAddress; State->TaskReg.Limit = NewTssLimit; - if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) + if (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) { /* Change the page directory */ State->ControlRegisters[FAST486_REG_CR3] = NewTss.Cr3; @@ -845,8 +885,14 @@ Fast486FlushTlb(State); /* Update the CPL */ - if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); - else State->Cpl = GET_SEGMENT_RPL(NewLegacyTss->Cs); + if (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) + { + State->Cpl = GET_SEGMENT_RPL(NewTss.Cs); + } + else + { + State->Cpl = GET_SEGMENT_RPL(NewLegacyTss->Cs); + } #ifndef FAST486_NO_PREFETCH /* Context switching invalidates the prefetch */ @@ -854,7 +900,7 @@ #endif /* Load the registers */ - if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) + if (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) { State->InstPtr.Long = State->SavedInstPtr.Long = NewTss.Eip; State->Flags.Long = NewTss.Eflags; @@ -970,7 +1016,7 @@ return FALSE; } - if (NewTssLimit >= (sizeof(FAST486_TSS) - 1)) + if (NewTssDescriptor.Signature == FAST486_BUSY_TSS_SIGNATURE) { if (!Fast486LoadSegmentInternal(State, FAST486_REG_FS,

1 0

[pschweitzer] 69406: [CDROM] Implement IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX. Dedicated to Peter Hater CORE-...
by pschweitzer＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: pschweitzer Date: Mon Sep 28 17:55:48 2015 New Revision: 69406 URL: http://svn.reactos.org/svn/reactos?rev=69406&view=rev Log: [CDROM] Implement IOCTL_DISK_GET_LENGTH_INFO, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX. Dedicated to Peter Hater CORE-10272 Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Sep 28 17:55:48 2015 @@ -2180,6 +2180,10 @@ return; } + case IOCTL_DISK_GET_LENGTH_INFO: + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: + case IOCTL_DISK_GET_DRIVE_GEOMETRY: + case IOCTL_CDROM_GET_DRIVE_GEOMETRY_EX: case IOCTL_CDROM_GET_DRIVE_GEOMETRY: { //

1 0

[akhaldi] 69405: [TOOLS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: akhaldi Date: Mon Sep 28 17:31:37 2015 New Revision: 69405 URL: http://svn.reactos.org/svn/reactos?rev=69405&view=rev Log: [TOOLS] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/tools/bin2c.c trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.cxx trunk/reactos/tools/cabman/raw.cxx trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/bin2c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.c?rev=69405&r1… ============================================================================== --- trunk/reactos/tools/bin2c.c [iso-8859-1] (original) +++ trunk/reactos/tools/bin2c.c [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS bin2c - * FILE: tools/bin2c/bin2c.c + * FILE: tools/bin2c.c * PURPOSE: Converts a binary file into a byte array * PROGRAMMER: Hermès Bélusca - Maïto */ Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/cabinet.cpp + * FILE: tools/cabman/cabinet.cxx * PURPOSE: Cabinet routines * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=6… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/dfp.cpp + * FILE: tools/cabman/dfp.cxx * PURPOSE: Directive file parser * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/main.cxx [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/main.cpp + * FILE: tools/cabman/main.cxx * PURPOSE: Main program * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/mszip.cxx [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/mszip.cpp + * FILE: tools/cabman/mszip.cxx * PURPOSE: CAB codec for MSZIP compressed data * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> Modified: trunk/reactos/tools/cabman/raw.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.cxx?rev=6… ============================================================================== --- trunk/reactos/tools/cabman/raw.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/raw.cxx [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS cabinet manager - * FILE: tools/cabman/raw.cpp + * FILE: tools/cabman/raw.cxx * PURPOSE: CAB codec for uncompressed "raw" data * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Colin Finck <mail(a)colinfinck.de> Modified: trunk/reactos/tools/mkhive/reginf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Mon Sep 28 17:31:37 2015 @@ -18,7 +18,7 @@ */ /* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS hive maker - * FILE: tools/mkhive/reginf.h + * FILE: tools/mkhive/reginf.c * PURPOSE: Inf file import code * PROGRAMMER: Eric Kohl * Hervé Poussineau

1 0

[dreimer] 69404: [RAPPS] Update German translation.
by dreimer＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: dreimer Date: Mon Sep 28 16:16:37 2015 New Revision: 69404 URL: http://svn.reactos.org/svn/reactos?rev=69404&view=rev Log: [RAPPS] Update German translation. Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Mon Sep 28 16:16:37 2015 @@ -197,5 +197,5 @@ IDS_INFORMATION "Informationen" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." -END + IDS_CERT_DOES_NOT_MATCH "ÃberprÃ¼fung des SSL-Zertifikats fehlgeschlagen." +END

1 0

[gadamopoulos] 69403: [SHELL32] - Actually use the localized name for Control Panel.
by gadamopoulos＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: gadamopoulos Date: Mon Sep 28 16:04:34 2015 New Revision: 69403 URL: http://svn.reactos.org/svn/reactos?rev=69403&view=rev Log: [SHELL32] - Actually use the localized name for Control Panel. Modified: trunk/reactos/dll/win32/shell32/res/rgs/controlpanel.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/controlpanel.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/controlpanel.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/controlpanel.rgs [iso-8859-1] Mon Sep 28 16:04:34 2015 @@ -5,6 +5,7 @@ ForceRemove {21EC2020-3AEA-1069-A2DD-08002B30309D} = s 'Control Panel' { val InfoTip = e '@%%SystemRoot%%\system32\SHELL32.dll,-31361' + val LocalizedString = e '@%%SystemRoot%%\system32\SHELL32.dll,-148' DefaultIcon = e '%%SystemRoot%%\System32\shell32.dll,-137' InprocServer32 = s '%MODULE%' {

1 0

[pschweitzer] 69402: [RAPPS] Update French translation
by pschweitzer＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: pschweitzer Date: Mon Sep 28 15:29:41 2015 New Revision: 69402 URL: http://svn.reactos.org/svn/reactos?rev=69402&view=rev Log: [RAPPS] Update French translation Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Mon Sep 28 15:29:41 2015 @@ -67,11 +67,11 @@ PUSHBUTTON "&SÃ©lectionner", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Supprimer l'installateur du programme aprÃ¨s l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 GROUPBOX "Proxy", -1, 4, 116, 240, 76 - CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 - CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 + CONTROL "ParamÃ¨tres du proxy systÃ¨me", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 + CONTROL "Direct (Pas de proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 27, 175, 64, 10 + LTEXT "Pas de proxy pour", -1, 27, 175, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 PUSHBUTTON "Accepter", IDOK, 116, 195, 60, 14 @@ -195,7 +195,7 @@ IDS_CHOOSE_FOLDER_ERROR "Le dossier que vous avez spÃ©cifiÃ© n'existe pas. Le crÃ©er ?" IDS_APP_REG_REMOVE "Etes-vous sÃ»r de vouloir supprimer les donnÃ©es du programme installÃ© du registre ?" IDS_INFORMATION "Information" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" + IDS_UNABLE_TO_DOWNLOAD "Impossible de tÃ©lÃ©charger le paquet : adresse non trouvÃ©e !" IDS_UNABLE_TO_REMOVE "Impossible de supprimer les donnÃ©es du programme du registre !" - IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." -END + IDS_CERT_DOES_NOT_MATCH "VÃ©rification du certificat SSL Ã©chouÃ©e." +END

1 0

[cwittich] 69401: [RAPPS] add support for SSL certificate pinning
by cwittich＠svn.reactos.org 28 Sep '15

28 Sep '15

Author: cwittich Date: Mon Sep 28 14:09:09 2015 New Revision: 69401 URL: http://svn.reactos.org/svn/reactos?rev=69401&view=rev Log: [RAPPS] add support for SSL certificate pinning Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/resource.h Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -16,6 +16,7 @@ winmain.c rapps.h) +add_definitions(-DUSE_CERT_PINNING) file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -201,4 +201,5 @@ IDS_INFORMATION "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ Ð¾Ñ ÑÐµÐ³Ð¸ÑÑÑÑÐ° Ðµ Ð½ÐµÐ²ÑÐ·Ð¼Ð¾Ð¶Ð½Ð¾!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -202,4 +202,5 @@ IDS_INFORMATION "Informace" IDS_UNABLE_TO_DOWNLOAD "Soubor se nepodaÅilo stÃ¡hnout! Adresa nenalezena!" IDS_UNABLE_TO_REMOVE "NepodaÅilo se odstranit data programu z registru!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "Informationen" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Konnte die Daten nicht aus der Registry lÃ¶schen!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -200,4 +200,5 @@ IDS_INFORMATION "InformaciÃ³n" IDS_UNABLE_TO_DOWNLOAD "No se pudo descargar el paquete. No se ha encontrado la direcciÃ³n de Internet." IDS_UNABLE_TO_REMOVE "No se pudieron borrar del Registro los datos de instalaciÃ³n del programa." -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Impossible de supprimer les donnÃ©es du programme du registre !" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -199,4 +199,5 @@ IDS_INFORMATION "××××¢" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "Informazioni" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Impossibile cancellare i dati dal registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "æå ±" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ã¬ã¸ã¹ããªãããã®ããã°ã©ã ã«é¢ãããã¼ã¿ãåé¤ã§ãã¾ãã!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -205,4 +205,5 @@ IDS_INFORMATION "Informacja" IDS_UNABLE_TO_DOWNLOAD "Nie moÅ¼na pobraÄ pakietu! Nie znaleziono adresu!" IDS_UNABLE_TO_REMOVE "Nie moÅ¼na byÅo usunÄÄ wpisu z rejestru!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -199,4 +199,5 @@ IDS_INFORMATION "InformaÃ§Ãµes" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "NÃ£o foi possÃvel remover as informaÃ§Ãµes do programa do registro!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -203,4 +203,5 @@ IDS_INFORMATION "InformaÈie" IDS_UNABLE_TO_DOWNLOAD "Pachetul nu poate fi descÄrcat! Adresa nu este gÄsitÄ!" IDS_UNABLE_TO_REMOVE "Nu se pot elimina datele din registru pentru acest program!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -197,4 +197,5 @@ IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ Ð¸Ð· ÑÐµÐµÑÑÑÐ°!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -202,4 +202,5 @@ IDS_INFORMATION "InformÃ¡cie" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Nie je moÅ¾nÃ© odstrÃ¡niÅ¥ z registrov Ãºdaje o programe!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -201,4 +201,5 @@ IDS_INFORMATION "Informacione" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "E pamundur te fshihen informacionet e programit nga regjistri!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -204,4 +204,5 @@ IDS_INFORMATION "Information" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "Det gick ej att ta bort programmets data frÃ¥n registret!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -199,4 +199,5 @@ IDS_INFORMATION "Bilgi" IDS_UNABLE_TO_DOWNLOAD "Paket indirilemez! Adres bulunamadÄ±!" IDS_UNABLE_TO_REMOVE "Ä°zlencenin giriÅi deÄer defterinden silinemiyor." -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -205,4 +205,5 @@ IDS_INFORMATION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð· ÑÐµÑÑÑÑÑ!" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -200,4 +200,5 @@ IDS_INFORMATION "ä¿¡æ¯" IDS_UNABLE_TO_DOWNLOAD "æ æ³ä¸è½½è¯¥è½¯ä»¶å ï¼æ¾ä¸å°ç½ç»çå°å ï¼" IDS_UNABLE_TO_REMOVE "æ æ³ä»æ³¨åè¡¨å é¤è¯¥ç¨åºçæ°æ®ï¼" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -199,4 +199,5 @@ IDS_INFORMATION "è³è¨" IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" IDS_UNABLE_TO_REMOVE "ç¡æ³å¾ç»éæªåªé¤è©²ç¨å¼çè³æï¼" -END + IDS_CERT_DOES_NOT_MATCH "SSL certificate verification failed." +END Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -201,6 +201,58 @@ return (IBindStatusCallback*) This; } +#ifdef USE_CERT_PINNING +static BOOL CertIsValid(HINTERNET hInternet, LPWSTR lpszHostName) +{ + HINTERNET hConnect; + HINTERNET hRequest; + DWORD certInfoLength; + BOOL Ret = FALSE; + INTERNET_CERTIFICATE_INFOW certInfo; + + hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + if (hConnect) + { + hRequest = HttpOpenRequestW(hConnect, L"HEAD", NULL, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + if (hRequest != NULL) + { + Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); + if (Ret) + { + certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW); + Ret = InternetQueryOptionW(hRequest, + INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + &certInfo, + &certInfoLength); + if (Ret) + { + if (certInfo.lpszEncryptionAlgName) + LocalFree(certInfo.lpszEncryptionAlgName); + if (certInfo.lpszIssuerInfo) + { + if (strcmp((LPSTR)certInfo.lpszIssuerInfo, CERT_ISSUER_INFO) != 0) + Ret = FALSE; + LocalFree(certInfo.lpszIssuerInfo); + } + if (certInfo.lpszProtocolName) + LocalFree(certInfo.lpszProtocolName); + if (certInfo.lpszSignatureAlgName) + LocalFree(certInfo.lpszSignatureAlgName); + if (certInfo.lpszSubjectInfo) + { + if (strcmp((LPSTR)certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0) + Ret = FALSE; + LocalFree(certInfo.lpszSubjectInfo); + } + } + } + InternetCloseHandle(hRequest); + } + } + return Ret; +} +#endif + static DWORD WINAPI ThreadFunc(LPVOID Context) @@ -307,6 +359,8 @@ urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); + urlComponents.dwHostNameLength = urlLength*sizeof(WCHAR); + urlComponents.lpszHostName = malloc(urlComponents.dwHostNameLength); if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; @@ -317,7 +371,21 @@ if(urlComponents.nScheme == INTERNET_SCHEME_FTP) dwContentLen = FtpGetFileSize(hFile, &dwStatus); +#ifdef USE_CERT_PINNING + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && (!CertIsValid(hOpen, urlComponents.lpszHostName))) + { + WCHAR szMsgText[MAX_STR_LEN]; + + if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) + goto end; + + MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + goto end; + } +#endif + free(urlComponents.lpszScheme); + free(urlComponents.lpszHostName); hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -25,6 +25,11 @@ #include <rappsmsg.h> #include "resource.h" + +#ifdef USE_CERT_PINNING + #define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" + #define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" +#endif #define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Mon Sep 28 14:09:09 2015 @@ -96,6 +96,7 @@ #define IDS_INFORMATION 117 #define IDS_UNABLE_TO_REMOVE 118 #define IDS_UNABLE_TO_DOWNLOAD 119 +#define IDS_CERT_DOES_NOT_MATCH 120 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2015