Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 49129: [CLASS2] Switch use from DISK_GEOMETRY to DISK_GEOMETRY_EX. It's needed to handle some Windows 2003's kernel routines. [CDROM] Reflect changes in Class2. [DISK] Reflect changes...
by pschweitzer＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: pschweitzer Date: Tue Oct 12 20:17:55 2010 New Revision: 49129 URL: http://svn.reactos.org/svn/reactos?rev=49129&view=rev Log: [CLASS2] Switch use from DISK_GEOMETRY to DISK_GEOMETRY_EX. It's needed to handle some Windows 2003's kernel routines. [CDROM] Reflect changes in Class2. [DISK] Reflect changes in Class2. Also added support for IOCTL_DISK_GET_DRIVE_GEOMETRY_EX. Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/class/include/class2.h 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] Tue Oct 12 20:17:55 2010 @@ -955,7 +955,7 @@ // deviceExtension->DiskGeometry = - ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY)); + ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY_EX)); if (deviceExtension->DiskGeometry == NULL) { @@ -1006,7 +1006,7 @@ // status = ScsiClassReadDriveCapacity(deviceObject); - bps = deviceExtension->DiskGeometry->BytesPerSector; + bps = deviceExtension->DiskGeometry->Geometry.BytesPerSector; if (!NT_SUCCESS(status) || !bps) { @@ -1037,7 +1037,7 @@ bps = 1 << lastBit; } - deviceExtension->DiskGeometry->BytesPerSector = bps; + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; DebugPrint((2, "CreateCdRomDeviceObject: Calc'd bps = %x\n", bps)); // @@ -2828,12 +2828,12 @@ startingOffset.QuadPart = currentIrpStack->Parameters.Read.ByteOffset.QuadPart + transferByteCount; - if (!deviceExtension->DiskGeometry->BytesPerSector) { - deviceExtension->DiskGeometry->BytesPerSector = 2048; + if (!deviceExtension->DiskGeometry->Geometry.BytesPerSector) { + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; } if ((startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) || - (transferByteCount & (deviceExtension->DiskGeometry->BytesPerSector - 1))) { + (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1))) { DebugPrint((1,"ScsiCdRomRead: Invalid I/O parameters\n")); DebugPrint((1, "\toffset %x:%x, Length %x:%x\n", @@ -2841,7 +2841,7 @@ startingOffset.u.LowPart, deviceExtension->PartitionLength.u.HighPart, deviceExtension->PartitionLength.u.LowPart)); - DebugPrint((1, "\tbps %x\n", deviceExtension->DiskGeometry->BytesPerSector)); + DebugPrint((1, "\tbps %x\n", deviceExtension->DiskGeometry->Geometry.BytesPerSector)); // // Fail request with status of invalid parameters. @@ -3059,11 +3059,11 @@ bps = 1 << lastBit; } - deviceExtension->DiskGeometry->BytesPerSector = bps; + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; DebugPrint((2, "CdRomDeviceControlCompletion: Calculated bps %#x\n", - deviceExtension->DiskGeometry->BytesPerSector)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); // // Copy last sector in reverse byte order. @@ -3082,7 +3082,7 @@ WHICH_BIT(bps, deviceExtension->SectorShift); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->BytesPerSector)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", lastSector + 1)); @@ -3097,7 +3097,7 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); @@ -3108,7 +3108,7 @@ // This device supports removable media. // - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } else { @@ -3116,20 +3116,20 @@ // Assume media type is fixed disk. // - deviceExtension->DiskGeometry->MediaType = FixedMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; } // // Assume sectors per track are 32; // - deviceExtension->DiskGeometry->SectorsPerTrack = 32; + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; // // Assume tracks per cylinder (number of heads) is 64. // - deviceExtension->DiskGeometry->TracksPerCylinder = 64; + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; // // Copy the device extension's geometry info into the user buffer. @@ -6530,7 +6530,7 @@ // from = (PFOUR_BYTE) &readCapacityBuffer->BytesPerBlock; - to = (PFOUR_BYTE) &deviceExtension->DiskGeometry->BytesPerSector; + to = (PFOUR_BYTE) &deviceExtension->DiskGeometry->Geometry.BytesPerSector; to->Byte0 = from->Byte3; to->Byte1 = from->Byte2; to->Byte2 = from->Byte1; @@ -6540,7 +6540,7 @@ // Using the new BytesPerBlock, calculate and store the SectorShift. // - WHICH_BIT(deviceExtension->DiskGeometry->BytesPerSector, deviceExtension->SectorShift); + WHICH_BIT(deviceExtension->DiskGeometry->Geometry.BytesPerSector, deviceExtension->SectorShift); // // Copy last sector in reverse byte order. @@ -6558,22 +6558,22 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; // // Assume sectors per track are 32; // - deviceExtension->DiskGeometry->SectorsPerTrack = 32; + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; // // Assume tracks per cylinder (number of heads) is 64. // - deviceExtension->DiskGeometry->TracksPerCylinder = 64; + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; } else { @@ -6660,11 +6660,11 @@ // originalIrp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY)); - deviceExtension->DiskGeometry->BytesPerSector = 2048; + RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY_EX)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; deviceExtension->SectorShift = 11; deviceExtension->PartitionLength.QuadPart = (LONGLONG)(0x7fffffff); - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } } else { @@ -6672,11 +6672,11 @@ // Set up reasonable defaults // - RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY)); - deviceExtension->DiskGeometry->BytesPerSector = 2048; + RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY_EX)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; deviceExtension->SectorShift = 11; deviceExtension->PartitionLength.QuadPart = (LONGLONG)(0x7fffffff); - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } } Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -748,16 +748,16 @@ // in reverse byte order. // - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte0 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte0 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte3; - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte1 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte1 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte2; - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte2 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte2 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte1; - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte3 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte3 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte0; // @@ -780,10 +780,10 @@ // Calculate sector to byte shift. // - WHICH_BIT(deviceExtension->DiskGeometry->BytesPerSector, deviceExtension->SectorShift); + WHICH_BIT(deviceExtension->DiskGeometry->Geometry.BytesPerSector, deviceExtension->SectorShift); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->BytesPerSector)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", lastSector + 1)); @@ -798,7 +798,7 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); @@ -809,7 +809,7 @@ // This device supports removable media. // - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } else { @@ -817,20 +817,20 @@ // Assume media type is fixed disk. // - deviceExtension->DiskGeometry->MediaType = FixedMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; } // // Assume sectors per track are 32; // - deviceExtension->DiskGeometry->SectorsPerTrack = 32; + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; // // Assume tracks per cylinder (number of heads) is 64. // - deviceExtension->DiskGeometry->TracksPerCylinder = 64; + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; } if (status == STATUS_VERIFY_REQUIRED) { @@ -860,8 +860,8 @@ // except for the bytes per sector and sector shift. // - RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY)); - deviceExtension->DiskGeometry->BytesPerSector = 512; + RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY_EX)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 512; deviceExtension->SectorShift = 9; deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0; @@ -871,7 +871,7 @@ // This device supports removable media. // - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } else { @@ -879,7 +879,7 @@ // Assume media type is fixed disk. // - deviceExtension->DiskGeometry->MediaType = FixedMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; } } @@ -2752,7 +2752,7 @@ errorLogEntry->DeviceOffset.QuadPart = (LONGLONG) badSector; errorLogEntry->DeviceOffset = RtlExtendedIntegerMultiply( errorLogEntry->DeviceOffset, - deviceExtension->DiskGeometry->BytesPerSector); + deviceExtension->DiskGeometry->Geometry.BytesPerSector); } errorLogEntry->ErrorCode = logStatus; Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -652,7 +652,7 @@ NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; PDEVICE_OBJECT physicalDevice; - PDISK_GEOMETRY diskGeometry = NULL; + PDISK_GEOMETRY_EX diskGeometry = NULL; PDEVICE_EXTENSION deviceExtension = NULL; PDEVICE_EXTENSION physicalDeviceExtension; UCHAR pathId = LunInfo->PathId; @@ -880,7 +880,7 @@ // Allocate buffer for drive geometry. // - diskGeometry = ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY)); + diskGeometry = ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY_EX)); if (diskGeometry == NULL) { @@ -1065,7 +1065,7 @@ ULONG partitionNumber = 0; NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; - PDISK_GEOMETRY diskGeometry = NULL; + PDISK_GEOMETRY_EX diskGeometry = NULL; PDRIVE_LAYOUT_INFORMATION partitionList = NULL; PDEVICE_EXTENSION deviceExtension; PDEVICE_EXTENSION physicalDeviceExtension; @@ -1087,7 +1087,7 @@ physicalDeviceExtension = PhysicalDeviceObject->DeviceExtension; diskGeometry = physicalDeviceExtension->DiskGeometry; - bytesPerSector = diskGeometry->BytesPerSector; + bytesPerSector = diskGeometry->Geometry.BytesPerSector; // // Make sure sector size is not zero. @@ -1099,7 +1099,7 @@ // Default sector size for disk is 512. // - bytesPerSector = diskGeometry->BytesPerSector = 512; + bytesPerSector = diskGeometry->Geometry.BytesPerSector = 512; } sectorShift = physicalDeviceExtension->SectorShift; @@ -1118,7 +1118,7 @@ // HalExamineMBR(PhysicalDeviceObject, - physicalDeviceExtension->DiskGeometry->BytesPerSector, + physicalDeviceExtension->DiskGeometry->Geometry.BytesPerSector, (ULONG)0x54, (PVOID)&dmSkew); @@ -1149,7 +1149,7 @@ // status = IoReadPartitionTable(PhysicalDeviceObject, - physicalDeviceExtension->DiskGeometry->BytesPerSector, + physicalDeviceExtension->DiskGeometry->Geometry.BytesPerSector, TRUE, (PVOID)&partitionList); @@ -1432,7 +1432,7 @@ // deviceExtension->TimeOutValue = physicalDeviceExtension->TimeOutValue; - deviceExtension->DiskGeometry->BytesPerSector = bytesPerSector; + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bytesPerSector; deviceExtension->SectorShift = sectorShift; deviceExtension->DeviceObject = deviceObject; deviceExtension->DeviceFlags |= physicalDeviceExtension->DeviceFlags; @@ -1512,7 +1512,7 @@ transferByteCount); if ((startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) || - (transferByteCount & (deviceExtension->DiskGeometry->BytesPerSector - 1))) { + (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1))) { // // This error maybe caused by the fact that the drive is not ready. @@ -2014,6 +2014,7 @@ } case IOCTL_DISK_GET_DRIVE_GEOMETRY: + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: { PDEVICE_EXTENSION physicalDeviceExtension; @@ -2021,8 +2022,12 @@ BOOLEAN removable = FALSE; BOOLEAN listInitialized = FALSE; - if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < - sizeof( DISK_GEOMETRY ) ) { + if ((irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY && + irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof(DISK_GEOMETRY)) || + (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY_EX && + irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof(DISK_GEOMETRY_EX))) { status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -2083,10 +2088,15 @@ RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, deviceExtension->DiskGeometry, - sizeof(DISK_GEOMETRY)); + (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? + sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY_EX)); status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); + Irp->IoStatus.Information = + (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? + sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY_EX); } break; @@ -2285,7 +2295,7 @@ status = IoSetPartitionInformation( deviceExtension->PhysicalDevice, - deviceExtension->DiskGeometry->BytesPerSector, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, diskData->PartitionOrdinal, inputBuffer->PartitionType); @@ -2323,7 +2333,7 @@ // status = IoReadPartitionTable(deviceExtension->PhysicalDevice, - deviceExtension->DiskGeometry->BytesPerSector, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, FALSE, &partitionList); @@ -2504,9 +2514,9 @@ status = IoWritePartitionTable( deviceExtension->DeviceObject, - deviceExtension->DiskGeometry->BytesPerSector, - deviceExtension->DiskGeometry->SectorsPerTrack, - deviceExtension->DiskGeometry->TracksPerCylinder, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack, + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder, partitionList); } @@ -3455,7 +3465,7 @@ // Get sector size. // - sectorSize = DeviceExtension->DiskGeometry->BytesPerSector; + sectorSize = DeviceExtension->DiskGeometry->Geometry.BytesPerSector; // // Make sure sector size is at least 512 bytes. @@ -4102,9 +4112,11 @@ // Update the actual geometry information. // - DeviceExtension->DiskGeometry->SectorsPerTrack = sectorsPerTrack; - DeviceExtension->DiskGeometry->TracksPerCylinder = tracksPerCylinder; - DeviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)cylinders; + DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack = sectorsPerTrack; + DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder; + DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)cylinders; + DeviceExtension->DiskGeometry->DiskSize.QuadPart = cylinders * tracksPerCylinder * sectorsPerTrack * + DeviceExtension->DiskGeometry->Geometry.BytesPerSector; DebugPrint((3, "SCSIDISK: UpdateGeometry: BIOS spt %x, #heads %x, #cylinders %x\n", @@ -4119,7 +4131,7 @@ if (!DeviceExtension->DMActive) { HalExamineMBR(DeviceExtension->DeviceObject, - DeviceExtension->DiskGeometry->BytesPerSector, + DeviceExtension->DiskGeometry->Geometry.BytesPerSector, (ULONG)0x55, &tmpPtr ); @@ -4155,18 +4167,19 @@ cylinders -= 1; - DeviceExtension->DiskGeometry->Cylinders.QuadPart = cylinders + 1; - DeviceExtension->DiskGeometry->TracksPerCylinder = tracksPerCylinder + 1; + DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = cylinders + 1; + DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder + 1; DeviceExtension->PartitionLength.QuadPart = - DeviceExtension->DiskGeometry->Cylinders.QuadPart * - DeviceExtension->DiskGeometry->SectorsPerTrack * - DeviceExtension->DiskGeometry->BytesPerSector * - DeviceExtension->DiskGeometry->TracksPerCylinder; + DeviceExtension->DiskGeometry->DiskSize.QuadPart = + DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart * + DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack * + DeviceExtension->DiskGeometry->Geometry.BytesPerSector * + DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder; if (DeviceExtension->DMActive) { - DeviceExtension->DMByteSkew = DeviceExtension->DMSkew * DeviceExtension->DiskGeometry->BytesPerSector; + DeviceExtension->DMByteSkew = DeviceExtension->DMSkew * DeviceExtension->DiskGeometry->Geometry.BytesPerSector; } @@ -4250,7 +4263,7 @@ // status = IoReadPartitionTable(deviceExtension->PhysicalDevice, - deviceExtension->DiskGeometry->BytesPerSector, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, TRUE, &partitionList); Modified: trunk/reactos/drivers/storage/class/include/class2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/incl… ============================================================================== --- trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -112,7 +112,7 @@ PCLASS_CREATE_CLOSE ClassCreateClose; PDRIVER_STARTIO ClassStartIo; PIO_SCSI_CAPABILITIES PortCapabilities; - PDISK_GEOMETRY DiskGeometry; + PDISK_GEOMETRY_EX DiskGeometry; PDEVICE_OBJECT PhysicalDevice; PSENSE_DATA SenseData; ULONG TimeOutValue;

1 0

[ekohl] 49128: [D3D] Preparations for update to widl 1.3.4.
by ekohl＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: ekohl Date: Tue Oct 12 20:07:58 2010 New Revision: 49128 URL: http://svn.reactos.org/svn/reactos?rev=49128&view=rev Log: [D3D] Preparations for update to widl 1.3.4. Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Tue Oct 12 20:07:58 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" unicode="yes"> +<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="d3d8.spec" /> <include base="d3d8">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild [iso-8859-1] Tue Oct 12 20:07:58 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" unicode="yes"> +<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="d3d9.spec" /> <include base="d3d9">.</include> <include base="ReactOS">include/reactos/wine</include>

1 0

[cgutman] 49127: [HAL] - Check that the interrupt line is not 255 - Check that the interrupt pin is not 0 - Fixes a failed assertion that Caemyr experienced with an ATI Rage graphics card
by cgutman＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: cgutman Date: Tue Oct 12 20:02:15 2010 New Revision: 49127 URL: http://svn.reactos.org/svn/reactos?rev=49127&view=rev Log: [HAL] - Check that the interrupt line is not 255 - Check that the interrupt pin is not 0 - Fixes a failed assertion that Caemyr experienced with an ATI Rage graphics card Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Tue Oct 12 20:02:15 2010 @@ -753,7 +753,9 @@ } /* Interrupt resource */ - if (0 != PciConfig.u.type0.InterruptLine) + if (0 != PciConfig.u.type0.InterruptPin && + 0 != PciConfig.u.type0.InterruptLine && + 0xFF != PciConfig.u.type0.InterruptLine) ResourceCount++; /* Allocate output buffer and initialize */ @@ -806,7 +808,9 @@ } } - if (0 != PciConfig.u.type0.InterruptLine) + if (0 != PciConfig.u.type0.InterruptPin && + 0 != PciConfig.u.type0.InterruptLine && + 0xFF != PciConfig.u.type0.InterruptLine) { Descriptor->Type = CmResourceTypeInterrupt; Descriptor->ShareDisposition = CmResourceShareShared; /* FIXME Just a guess */ Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Tue Oct 12 20:02:15 2010 @@ -785,7 +785,9 @@ if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x200) DbgPrint(" medium devsel,"); if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x400) DbgPrint(" fast devsel,"); DbgPrint(" latency %d", PciData->LatencyTimer); - if (PciData->u.type0.InterruptLine) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); + if (PciData->u.type0.InterruptPin != 0 && + PciData->u.type0.InterruptLine != 0 && + PciData->u.type0.InterruptLine != 0xFF) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); DbgPrint("\n"); /* Scan addresses */

1 0

[fireball] 49126: [HEAP] - Implement heap validation support.
by fireball＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: fireball Date: Tue Oct 12 18:34:48 2010 New Revision: 49126 URL: http://svn.reactos.org/svn/reactos?rev=49126&view=rev Log: [HEAP] - Implement heap validation support. Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Tue Oct 12 18:34:48 2010 @@ -66,6 +66,20 @@ return RtlpBitsClearLow[(Bits >> 24) & 0xFF] + 24; /* Highest byte */ } } + +/* Maximum size of a tail-filling pattern used for compare operation */ +UCHAR FillPattern[HEAP_ENTRY_SIZE] = +{ + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL +}; + ULONG NTAPI RtlCompareMemoryUlong(PVOID Source, ULONG Length, ULONG Value); @@ -3160,6 +3174,437 @@ return EntrySize; } +BOOLEAN NTAPI +RtlpCheckInUsePattern(PHEAP_ENTRY HeapEntry) +{ + SIZE_T Size, Result; + PCHAR TailPart; + + /* Calculate size */ + if (HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) + Size = RtlpGetSizeOfBigBlock(HeapEntry); + else + Size = (HeapEntry->Size << HEAP_ENTRY_SHIFT) - HeapEntry->UnusedBytes; + + /* Calculate pointer to the tail part of the block */ + TailPart = (PCHAR)(HeapEntry + 1) + Size; + + /* Compare tail pattern */ + Result = RtlCompareMemory(TailPart, + FillPattern, + HEAP_ENTRY_SIZE); + + if (Result != HEAP_ENTRY_SIZE) + { + DPRINT1("HEAP: Heap entry (size %x) %p tail is modified at %p\n", Size, HeapEntry, TailPart + Result); + return FALSE; + } + + /* All is fine */ + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeapHeaders( + PHEAP Heap, + BOOLEAN Recalculate) +{ + // We skip header validation for now + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeapEntry( + PHEAP Heap, + PHEAP_ENTRY HeapEntry) +{ + BOOLEAN BigAllocation, EntryFound = FALSE; + PHEAP_SEGMENT Segment; + ULONG SegmentOffset; + + /* Perform various consistency checks of this entry */ + if (!HeapEntry) goto invalid_entry; + if ((ULONG_PTR)HeapEntry & (HEAP_ENTRY_SIZE - 1)) goto invalid_entry; + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) goto invalid_entry; + + BigAllocation = HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC; + Segment = Heap->Segments[HeapEntry->SegmentOffset]; + + if (BigAllocation && + (((ULONG_PTR)HeapEntry & (PAGE_SIZE - 1)) != FIELD_OFFSET(HEAP_VIRTUAL_ALLOC_ENTRY, BusyBlock))) + goto invalid_entry; + + if (!BigAllocation && (HeapEntry->SegmentOffset >= HEAP_SEGMENTS || + !Segment || + HeapEntry < Segment->FirstEntry || + HeapEntry >= Segment->LastValidEntry)) + goto invalid_entry; + + if ((HeapEntry->Flags & HEAP_ENTRY_FILL_PATTERN) && + !RtlpCheckInUsePattern(HeapEntry)) + goto invalid_entry; + + /* Checks are done, if this is a virtual entry, that's all */ + if (HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) return TRUE; + + /* Go through segments and check if this entry fits into any of them */ + for (SegmentOffset = 0; SegmentOffset < HEAP_SEGMENTS; SegmentOffset++) + { + Segment = Heap->Segments[SegmentOffset]; + if (!Segment) continue; + + if ((HeapEntry >= Segment->FirstEntry) && + (HeapEntry < Segment->LastValidEntry)) + { + /* Got it */ + EntryFound = TRUE; + break; + } + } + + /* Return our result of finding entry in the segments */ + return EntryFound; + +invalid_entry: + DPRINT1("HEAP: Invalid heap entry %p in heap %p\n", HeapEntry, Heap); + return FALSE; +} + +BOOLEAN NTAPI +RtlpValidateHeapSegment( + PHEAP Heap, + PHEAP_SEGMENT Segment, + UCHAR SegmentOffset, + PULONG FreeEntriesCount, + PSIZE_T TotalFreeSize, + PSIZE_T TagEntries, + PSIZE_T PseudoTagEntries) +{ + PHEAP_UCR_DESCRIPTOR UcrDescriptor; + PLIST_ENTRY UcrEntry; + SIZE_T ByteSize, Size, Result; + PHEAP_ENTRY CurrentEntry; + ULONG UnCommittedPages; + ULONG UnCommittedRanges; + ULONG PreviousSize; + + UnCommittedPages = 0; + UnCommittedRanges = 0; + + if (IsListEmpty(&Segment->UCRSegmentList)) + { + UcrEntry = NULL; + UcrDescriptor = NULL; + } + else + { + UcrEntry = Segment->UCRSegmentList.Flink; + UcrDescriptor = CONTAINING_RECORD(UcrEntry, HEAP_UCR_DESCRIPTOR, SegmentEntry); + } + + if (Segment->BaseAddress == Heap) + CurrentEntry = &Heap->Entry; + else + CurrentEntry = &Segment->Entry; + + while (CurrentEntry < Segment->LastValidEntry) + { + if (UcrDescriptor && + ((PVOID)CurrentEntry >= UcrDescriptor->Address)) + { + DPRINT1("HEAP: Entry %p is not inside uncommited range [%p .. %p)\n", + CurrentEntry, UcrDescriptor->Address, + (PCHAR)UcrDescriptor->Address + UcrDescriptor->Size); + + return FALSE; + } + + PreviousSize = 0; + + while (CurrentEntry < Segment->LastValidEntry) + { + if (PreviousSize != CurrentEntry->PreviousSize) + { + DPRINT1("HEAP: Entry %p has incorrect PreviousSize %x instead of %x\n", + CurrentEntry, CurrentEntry->PreviousSize, PreviousSize); + + return FALSE; + } + + PreviousSize = CurrentEntry->Size; + Size = CurrentEntry->Size << HEAP_ENTRY_SHIFT; + + if (CurrentEntry->Flags & HEAP_ENTRY_BUSY) + { + if (TagEntries) + { + UNIMPLEMENTED; + } + + /* Check fill pattern */ + if (CurrentEntry->Flags & HEAP_ENTRY_FILL_PATTERN) + { + if (!RtlpCheckInUsePattern(CurrentEntry)) + return FALSE; + } + } + else + { + /* The entry is free, increase free entries count and total free size */ + *FreeEntriesCount = *FreeEntriesCount + 1; + *TotalFreeSize += CurrentEntry->Size; + + if ((Heap->Flags & HEAP_FREE_CHECKING_ENABLED) && + (CurrentEntry->Flags & HEAP_ENTRY_FILL_PATTERN)) + { + ByteSize = Size - sizeof(HEAP_FREE_ENTRY); + + if ((CurrentEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) && + (ByteSize > sizeof(HEAP_FREE_ENTRY_EXTRA))) + { + ByteSize -= sizeof(HEAP_FREE_ENTRY_EXTRA); + } + + Result = RtlCompareMemoryUlong((PCHAR)((PHEAP_FREE_ENTRY)CurrentEntry + 1), + ByteSize, + ARENA_FREE_FILLER); + + if (Result != ByteSize) + { + DPRINT1("HEAP: Free heap block %p modified at %p after it was freed\n", + CurrentEntry, + (PCHAR)(CurrentEntry + 1) + Result); + + return FALSE; + } + } + } + + if (CurrentEntry->SegmentOffset != SegmentOffset) + { + DPRINT1("HEAP: Heap entry %p SegmentOffset is incorrect %x (should be %x)\n", CurrentEntry, SegmentOffset, CurrentEntry->SegmentOffset); + return FALSE; + } + + /* Check if it's the last entry */ + if (CurrentEntry->Flags & HEAP_ENTRY_LAST_ENTRY) + { + CurrentEntry = (PHEAP_ENTRY)((PCHAR)CurrentEntry + Size); + + if (!UcrDescriptor) + { + /* Check if it's not really the last one */ + if (CurrentEntry != Segment->LastValidEntry) + { + DPRINT1("HEAP: Heap entry %p is not last block in segment (%x)\n", CurrentEntry, Segment->LastValidEntry); + return FALSE; + } + } + else if (CurrentEntry != UcrDescriptor->Address) + { + DPRINT1("HEAP: Heap entry %p does not match next uncommitted address (%p)\n", + CurrentEntry, UcrDescriptor->Address); + + return FALSE; + } + else + { + UnCommittedPages += (UcrDescriptor->Size / PAGE_SIZE); + UnCommittedRanges++; + + CurrentEntry = (PHEAP_ENTRY)((PCHAR)UcrDescriptor->Address + UcrDescriptor->Size); + + /* Go to the next UCR descriptor */ + UcrEntry = UcrEntry->Flink; + if (UcrEntry == &Segment->UCRSegmentList) + { + UcrEntry = NULL; + UcrDescriptor = NULL; + } + else + { + UcrDescriptor = CONTAINING_RECORD(UcrEntry, HEAP_UCR_DESCRIPTOR, SegmentEntry); + } + } + + break; + } + + /* Advance to the next entry */ + CurrentEntry = (PHEAP_ENTRY)((PCHAR)CurrentEntry + Size); + } + } + + /* Check total numbers of UCP and UCR */ + if (Segment->NumberOfUnCommittedPages != UnCommittedPages) + { + DPRINT1("HEAP: Segment %p NumberOfUnCommittedPages is invalid (%x != %x)\n", + Segment, Segment->NumberOfUnCommittedPages, UnCommittedPages); + + return FALSE; + } + + if (Segment->NumberOfUnCommittedRanges != UnCommittedRanges) + { + DPRINT1("HEAP: Segment %p NumberOfUnCommittedRanges is invalid (%x != %x)\n", + Segment, Segment->NumberOfUnCommittedRanges, UnCommittedRanges); + + return FALSE; + } + + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeap(PHEAP Heap, + BOOLEAN ForceValidation) +{ + PHEAP_SEGMENT Segment; + BOOLEAN EmptyList; + UCHAR SegmentOffset; + SIZE_T Size, TotalFreeSize; + ULONG PreviousSize; + PHEAP_VIRTUAL_ALLOC_ENTRY VirtualAllocBlock; + PLIST_ENTRY ListHead, NextEntry; + PHEAP_FREE_ENTRY FreeEntry; + ULONG FreeBlocksCount, FreeListEntriesCount; + + /* Check headers */ + if (!RtlpValidateHeapHeaders(Heap, FALSE)) + return FALSE; + + /* Skip validation if it's not needed */ + if (!ForceValidation && !(Heap->Flags & HEAP_VALIDATE_ALL_ENABLED)) + return TRUE; + + /* Check free lists bitmaps */ + FreeListEntriesCount = 0; + ListHead = &Heap->FreeLists[0]; + + for (Size = 0; Size < HEAP_FREELISTS; Size++) + { + if (Size) + { + /* This is a dedicated list. Check if it's empty */ + EmptyList = IsListEmpty(ListHead); + + if (Heap->u.FreeListsInUseBytes[Size >> 3] & (1 << (Size & 7))) + { + if (EmptyList) + { + DPRINT1("HEAP: Empty %x-free list marked as non-empty\n", Size); + return FALSE; + } + } + else + { + if (!EmptyList) + { + DPRINT1("HEAP: Non-empty %x-free list marked as empty\n", Size); + return FALSE; + } + } + } + + /* Now check this list entries */ + NextEntry = ListHead->Flink; + PreviousSize = 0; + + while (ListHead != NextEntry) + { + FreeEntry = CONTAINING_RECORD(NextEntry, HEAP_FREE_ENTRY, FreeList); + NextEntry = NextEntry->Flink; + + /* If there is an in-use entry in a free list - that's quite a big problem */ + if (FreeEntry->Flags & HEAP_ENTRY_BUSY) + { + DPRINT1("HEAP: %x-dedicated list free element %x is marked in-use\n", Size, FreeEntry); + return FALSE; + } + + /* Check sizes according to that specific list's size */ + if ((Size == 0) && (FreeEntry->Size < HEAP_FREELISTS)) + { + DPRINT1("HEAP: Non dedicated list free element %x has size %x which would fit a dedicated list\n", FreeEntry, FreeEntry->Size); + return FALSE; + } + else if (Size && (FreeEntry->Size != Size)) + { + DPRINT1("HEAP: %x-dedicated list free element %x has incorrect size %x\n", Size, FreeEntry, FreeEntry->Size); + return FALSE; + } + else if ((Size == 0) && (FreeEntry->Size < PreviousSize)) + { + DPRINT1("HEAP: Non dedicated list free element %x is not put in order\n", FreeEntry); + return FALSE; + } + + /* Remember previous size*/ + PreviousSize = FreeEntry->Size; + + /* Add up to the total amount of free entries */ + FreeListEntriesCount++; + } + + /* Go to the head of the next free list */ + ListHead++; + } + + /* Check big allocations */ + ListHead = &Heap->VirtualAllocdBlocks; + NextEntry = ListHead->Flink; + + while (ListHead != NextEntry) + { + VirtualAllocBlock = CONTAINING_RECORD(NextEntry, HEAP_VIRTUAL_ALLOC_ENTRY, Entry); + + /* We can only check the fill pattern */ + if (VirtualAllocBlock->BusyBlock.Flags & HEAP_ENTRY_FILL_PATTERN) + { + if (!RtlpCheckInUsePattern(&VirtualAllocBlock->BusyBlock)) + return FALSE; + } + + NextEntry = NextEntry->Flink; + } + + /* Check all segments */ + FreeBlocksCount = 0; + TotalFreeSize = 0; + + for (SegmentOffset = 0; SegmentOffset < HEAP_SEGMENTS; SegmentOffset++) + { + Segment = Heap->Segments[SegmentOffset]; + + /* Go to the next one if there is no segment */ + if (!Segment) continue; + + if (!RtlpValidateHeapSegment(Heap, + Segment, + SegmentOffset, + &FreeBlocksCount, + &TotalFreeSize, + NULL, + NULL)) + { + return FALSE; + } + } + + if (FreeListEntriesCount != FreeBlocksCount) + { + DPRINT1("HEAP: Free blocks count in arena (%d) does not match free blocks number in the free lists (%d)\n", FreeBlocksCount, FreeListEntriesCount); + return FALSE; + } + + if (Heap->TotalFreeSize != TotalFreeSize) + { + DPRINT1("HEAP: Total size of free blocks in arena (%d) does not equal to the one in heap header (%d)\n", TotalFreeSize, Heap->TotalFreeSize); + return FALSE; + } + + return TRUE; +} /*********************************************************************** * RtlValidateHeap @@ -3180,15 +3625,47 @@ * @implemented */ BOOLEAN NTAPI RtlValidateHeap( - HANDLE Heap, + HANDLE HeapPtr, ULONG Flags, PVOID Block ) { - UNIMPLEMENTED; - - /* Imitate success */ - return TRUE; + PHEAP Heap = (PHEAP)HeapPtr; + BOOLEAN HeapLocked = FALSE; + BOOLEAN HeapValid; + + // FIXME Check for special heap + + /* Check signature */ + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Signature %x is invalid for heap %p\n", Heap->Signature, Heap); + return FALSE; + } + + /* Force flags */ + Flags = Heap->ForceFlags; + + /* Acquire the lock if necessary */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Either validate whole heap or just one entry */ + if (!Block) + HeapValid = RtlpValidateHeap(Heap, TRUE); + else + HeapValid = RtlpValidateHeapEntry(Heap, (PHEAP_ENTRY)Block - 1); + + /* Unlock if it's lockable */ + if (HeapLocked) + { + RtlLeaveHeapLock(Heap->LockVariable); + } + + return HeapValid; } VOID

1 0

[akhaldi] 49125: [DDK] - Fix ClassDebugPrint prototype.
by akhaldi＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: akhaldi Date: Tue Oct 12 16:39:38 2010 New Revision: 49125 URL: http://svn.reactos.org/svn/reactos?rev=49125&view=rev Log: [DDK] - Fix ClassDebugPrint prototype. Modified: trunk/reactos/include/ddk/classpnp.h Modified: trunk/reactos/include/ddk/classpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/classpnp.h?rev… ============================================================================== --- trunk/reactos/include/ddk/classpnp.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/classpnp.h [iso-8859-1] Tue Oct 12 16:39:38 2010 @@ -944,7 +944,6 @@ SCSIPORTAPI VOID -NTAPI ClassDebugPrint( CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage,

1 0

[khornicek] 49124: Attempt nr. 2: link wined3d to crt on amd64 build.
by khornicek＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: khornicek Date: Tue Oct 12 15:02:31 2010 New Revision: 49124 URL: http://svn.reactos.org/svn/reactos?rev=49124&view=rev Log: Attempt nr. 2: link wined3d to crt on amd64 build. Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] Tue Oct 12 15:02:31 2010 @@ -13,6 +13,9 @@ <library>gdi32</library> <library>advapi32</library> <library>uuid</library> + <if property="ARCH" value="amd64"> + <library>crt</library> + </if> <file>ati_fragment_shader.c</file> <file>arb_program_shader.c</file>

1 0

[khornicek] 49123: Fix amd64 build.
by khornicek＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: khornicek Date: Tue Oct 12 14:24:58 2010 New Revision: 49123 URL: http://svn.reactos.org/svn/reactos?rev=49123&view=rev Log: Fix amd64 build. Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Tue Oct 12 14:24:58 2010 @@ -2631,7 +2631,7 @@ const char *debug_d3ddeclmethod(WINED3DDECLMETHOD method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) DECLSPEC_HIDDEN; -const char *debug_d3drenderstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3drenderstate(WINED3DRENDERSTATETYPE state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN;

1 0

[fireball] 49122: [NTDLL] - Don't access unitialized memory. Caught thanks to a new heap manager, and this fixes all weird actctx exceptions in kernel32_winetest heap.
by fireball＠svn.reactos.org 12 Oct '10

12 Oct '10

Author: fireball Date: Tue Oct 12 09:03:39 2010 New Revision: 49122 URL: http://svn.reactos.org/svn/reactos?rev=49122&view=rev Log: [NTDLL] - Don't access unitialized memory. Caught thanks to a new heap manager, and this fixes all weird actctx exceptions in kernel32_winetest heap. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Tue Oct 12 09:03:39 2010 @@ -489,7 +489,7 @@ /* add entry for executable (becomes first list entry) */ ExeModule = (PLDR_DATA_TABLE_ENTRY) RtlAllocateHeap(Peb->ProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(LDR_DATA_TABLE_ENTRY)); if (ExeModule == NULL) {

1 0

[zguo] 49121: Fix bad revert of wininet wine sync and remove the actual sync. See issue #5663 for more details.
by zguo＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: zguo Date: Mon Oct 11 20:21:12 2010 New Revision: 49121 URL: http://svn.reactos.org/svn/reactos?rev=49121&view=rev Log: Fix bad revert of wininet wine sync and remove the actual sync. See issue #5663 for more details. Modified: branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h Modified: branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/inclu… ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Oct 11 20:21:12 2010 @@ -99,37 +99,43 @@ #define HAVE_FPCLASS 1 /* Define if FreeType 2 is installed */ -/* #undef HAVE_FREETYPE */ +#define HAVE_FREETYPE 1 /* Define to 1 if you have the <freetype/freetype.h> header file. */ -/* #undef HAVE_FREETYPE_FREETYPE_H */ +#define HAVE_FREETYPE_FREETYPE_H 1 /* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -/* #undef HAVE_FREETYPE_FTGLYPH_H */ +#define HAVE_FREETYPE_FTGLYPH_H 1 + +/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ +#define HAVE_FREETYPE_FTLCDFIL_H 1 + +/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ +#define HAVE_FREETYPE_FTMODAPI_H 1 /* Define to 1 if you have the <freetype/ftnames.h> header file. */ /* #undef HAVE_FREETYPE_FTNAMES_H */ /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -/* #undef HAVE_FREETYPE_FTOUTLN_H */ +#define HAVE_FREETYPE_FTOUTLN_H 1 /* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -/* #undef HAVE_FREETYPE_FTSNAMES_H */ +#define HAVE_FREETYPE_FTSNAMES_H 1 /* Define if you have the <freetype/fttrigon.h> header file. */ -/* #undef HAVE_FREETYPE_FTTRIGON_H */ +#define HAVE_FREETYPE_FTTRIGON_H 1 /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -/* #undef HAVE_FREETYPE_FTWINFNT_H */ +#define HAVE_FREETYPE_FTWINFNT_H 1 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -/* #undef HAVE_FREETYPE_TTNAMEID_H */ +#define HAVE_FREETYPE_TTNAMEID_H 1 /* Define to 1 if you have the <freetype/tttables.h> header file. */ -/* #undef HAVE_FREETYPE_TTTABLES_H */ +#define HAVE_FREETYPE_TTTABLES_H 1 /* Define to 1 if the system has the type `fsblkcnt_t'. */ /* #undef HAVE_FSBLKCNT_T */ @@ -144,7 +150,13 @@ /* #undef HAVE_FSTATVFS */ /* Define to 1 if you have the <ft2build.h> header file. */ -/* #undef HAVE_FT2BUILD_H */ +#define HAVE_FT2BUILD_H 1 + +/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ +/* #undef HAVE_FT_LOAD_SFNT_TABLE */ + +/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ +#define HAVE_FT_TRUETYPEENGINETYPE 1 /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 @@ -444,12 +456,6 @@ /* Define to 1 if you have the <openssl/ssl.h> header file. */ /* #undef HAVE_OPENSSL_SSL_H */ - -/* Define to 1 if you have the `z' library (-lz). */ -#define HAVE_ZLIB 1 - -/* Define to 1 if you have the <zlib.h> header file. */ -#define HAVE_ZLIB_H 1 /* Define to 1 if you have the `pclose' function. */ #define HAVE_PCLOSE 1

1 0

[zguo] 49120: Revert wininet sync take two. Hopefully caught all of the changes this in winnet folder this time. See issue #5663 for more details.
by zguo＠svn.reactos.org 11 Oct '10

11 Oct '10

Author: zguo Date: Mon Oct 11 19:57:17 2010 New Revision: 49120 URL: http://svn.reactos.org/svn/reactos?rev=49120&view=rev Log: Revert wininet sync take two. Hopefully caught all of the changes this in winnet folder this time. See issue #5663 for more details. Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -2395,7 +2395,7 @@ return ERROR_SUCCESS; } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); } static const object_vtbl_t FTPSESSIONVtbl = { @@ -3476,7 +3476,7 @@ return ERROR_SUCCESS; } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); } static DWORD FTPFINDNEXT_FindNextFileW(object_header_t *hdr, void *data) Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -3464,10 +3464,6 @@ * for all the data */ HTTP_DrainContent(lpwhr); lpwhr->dwContentRead = 0; - if(redirected) { - lpwhr->dwContentLength = ~0u; - lpwhr->dwBytesToWrite = 0; - } if (TRACE_ON(wininet)) { @@ -3674,7 +3670,7 @@ HTTP_ReceiveRequestData(lpwhr, TRUE); else { - iar.dwResult = 0; + iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -4168,7 +4164,7 @@ return ERROR_SUCCESS; } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); } static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size) @@ -4265,8 +4261,11 @@ if(hIC->lpszProxyBypass) FIXME("Proxy bypass is ignored.\n"); } - lpwhs->lpszServerName = heap_strdupW(lpszServerName); - lpwhs->lpszHostName = heap_strdupW(lpszServerName); + if (lpszServerName && lpszServerName[0]) + { + lpwhs->lpszServerName = heap_strdupW(lpszServerName); + lpwhs->lpszHostName = heap_strdupW(lpszServerName); + } if (lpszUserName && lpszUserName[0]) lpwhs->lpszUserName = heap_strdupW(lpszUserName); if (lpszPassword && lpszPassword[0]) @@ -4363,10 +4362,6 @@ if(res != ERROR_SUCCESS) goto lend; - INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, - INTERNET_STATUS_CONNECTED_TO_SERVER, - szaddr, strlen(szaddr)+1); - if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) { /* Note: we differ from Microsoft's WinINet here. they seem to have @@ -4375,31 +4370,20 @@ * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) { - HTTPREQ_CloseConnection(&lpwhr->hdr); + if (hIC->lpszProxy && (res = HTTP_SecureProxyConnect(lpwhr)) != ERROR_SUCCESS) goto lend; - } res = NETCON_secure_connect(&lpwhr->netConnection, lpwhs->lpszHostName); if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); - - if((lpwhr->hdr.ErrorMask&INTERNET_ERROR_MASK_COMBINED_SEC_CERT) && ( - res == ERROR_INTERNET_SEC_CERT_DATE_INVALID - || res == ERROR_INTERNET_INVALID_CA - || res == ERROR_INTERNET_SEC_CERT_NO_REV - || res == ERROR_INTERNET_SEC_CERT_REV_FAILED - || res == ERROR_INTERNET_SEC_CERT_REVOKED - || res == ERROR_INTERNET_SEC_INVALID_CERT - || res == ERROR_INTERNET_SEC_CERT_CN_INVALID)) - res = ERROR_INTERNET_SEC_CERT_ERRORS; - - HTTPREQ_CloseConnection(&lpwhr->hdr); goto lend; } } + INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, + INTERNET_STATUS_CONNECTED_TO_SERVER, + szaddr, strlen(szaddr)+1); lend: lpwhr->read_pos = lpwhr->read_size = 0; Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -1447,7 +1447,7 @@ lpUrlComponents->nScheme = UCW.nScheme; lpUrlComponents->nPort = UCW.nPort; - TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_a(lpszUrl), + TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", lpszUrl, debugstr_an(lpUrlComponents->lpszScheme, lpUrlComponents->dwSchemeLength), debugstr_an(lpUrlComponents->lpszHostName, lpUrlComponents->dwHostNameLength), debugstr_an(lpUrlComponents->lpszUrlPath, lpUrlComponents->dwUrlPathLength), @@ -1860,7 +1860,7 @@ DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE; TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer, - lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1); + lpdwBufferLength, lpdwBufferLength ? *lpdwBufferLength : -1, dwFlags); if(dwFlags & ICU_DECODE) { @@ -2194,7 +2194,7 @@ return res == ERROR_SUCCESS; } -DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) +DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode) { static BOOL warn = TRUE; @@ -2357,25 +2357,6 @@ return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; case INTERNET_OPTION_POLICY: return ERROR_INVALID_PARAMETER; - case INTERNET_OPTION_CONTEXT_VALUE: - { - if (!hdr) - return ERROR_INTERNET_INCORRECT_HANDLE_TYPE; - if (!size) - return ERROR_INVALID_PARAMETER; - - if (*size < sizeof(DWORD_PTR)) - { - *size = sizeof(DWORD_PTR); - return ERROR_INSUFFICIENT_BUFFER; - } - if (!buffer) - return ERROR_INVALID_PARAMETER; - - *(DWORD_PTR *)buffer = hdr->dwContext; - *size = sizeof(DWORD_PTR); - return ERROR_SUCCESS; - } } FIXME("Stub for %d\n", option); @@ -2407,7 +2388,7 @@ WININET_Release(hdr); } }else { - res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, TRUE); + res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, TRUE); } if(res != ERROR_SUCCESS) @@ -2440,7 +2421,7 @@ WININET_Release(hdr); } }else { - res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, FALSE); + res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, FALSE); } if(res != ERROR_SUCCESS) @@ -2503,19 +2484,8 @@ break; case INTERNET_OPTION_ERROR_MASK: { - if(!lpwhh) { - SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } else if(*(ULONG*)lpBuffer & (~(INTERNET_ERROR_MASK_INSERT_CDROM| - INTERNET_ERROR_MASK_COMBINED_SEC_CERT| - INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY))) { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - } else if(dwBufferLength != sizeof(ULONG)) { - SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH); - ret = FALSE; - } else - lpwhh->ErrorMask = *(ULONG*)lpBuffer; + ULONG flags = *(ULONG *)lpBuffer; + FIXME("Option INTERNET_OPTION_ERROR_MASK(%d): STUB\n", flags); } break; case INTERNET_OPTION_CODEPAGE: @@ -2580,21 +2550,8 @@ break; } case INTERNET_OPTION_CONTEXT_VALUE: - { - if (!lpwhh) - { - SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - if (!lpBuffer || dwBufferLength != sizeof(DWORD_PTR)) - { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; - } - else - lpwhh->dwContext = *(DWORD_PTR *)lpBuffer; - break; - } + FIXME("Option INTERNET_OPTION_CONTEXT_VALUE; STUB\n"); + break; case INTERNET_OPTION_SECURITY_FLAGS: FIXME("Option INTERNET_OPTION_SECURITY_FLAGS; STUB\n"); break; Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -392,7 +392,7 @@ BOOL WININET_Release( object_header_t *info ); BOOL WININET_FreeHandle( HINTERNET hinternet ); -DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL ); +DWORD INET_QueryOption(DWORD,void*,DWORD*,BOOL); time_t ConvertTimeString(LPCWSTR asctime); Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -330,9 +330,7 @@ CertFreeCertificateContext(endCert); CertCloseStore(store, 0); } - } else - pSSL_set_ex_data(ssl, error_idx, (void *)ERROR_INTERNET_SEC_CERT_ERRORS); - + } return ret; } @@ -394,7 +392,6 @@ DYNSSL(SSL_write); DYNSSL(SSL_read); DYNSSL(SSL_pending); - DYNSSL(SSL_get_error); DYNSSL(SSL_get_ex_new_index); DYNSSL(SSL_get_ex_data); DYNSSL(SSL_set_ex_data); @@ -775,12 +772,6 @@ { #ifdef SONAME_LIBSSL *recvd = pSSL_read(connection->ssl_s, buf, len); - - /* Check if EOF was received */ - if(!*recvd && (pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_ZERO_RETURN - || pSSL_get_error(connection->ssl_s, *recvd)==SSL_ERROR_SYSCALL)) - return ERROR_SUCCESS; - return *recvd > 0 ? ERROR_SUCCESS : ERROR_INTERNET_CONNECTION_ABORTED; #else return ERROR_NOT_SUPPORTED; Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -2556,6 +2556,7 @@ dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1); if (lpszLocalFileName) { + len = WideCharToMultiByte(CP_ACP, 0, lpszUrlName, -1, NULL, 0, NULL, NULL); dwOffsetLocalFileName = dwBytesNeeded; dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(pchLocalFileName) + 1); } Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/w… ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c [iso-8859-1] Mon Oct 11 19:57:17 2010 @@ -325,7 +325,6 @@ case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT: lpvNewInfo = heap_strdupWtoA(lpvStatusInfo); - dwStatusInfoLength /= sizeof(WCHAR); break; } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs