Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 71162: [KMTESTS:FSRTL] Add more non-failing tests CORE-11002
by pschweitzer＠svn.reactos.org 15 Apr '16

15 Apr '16

Author: pschweitzer Date: Fri Apr 15 19:43:12 2016 New Revision: 71162 URL: http://svn.reactos.org/svn/reactos?rev=71162&view=rev Log: [KMTESTS:FSRTL] Add more non-failing tests CORE-11002 Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlM… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] Fri Apr 15 19:43:12 2016 @@ -299,6 +299,24 @@ ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); DumpAllRuns(&LargeMcb); + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 0, 0, 1024) == FALSE, "expected FALSE, got TRUE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 1, "Expected 1 runs, got: %lu\n", NbRuns); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + DumpAllRuns(&LargeMcb); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1, 2, 1023) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 1, "Expected 1 runs, got: %lu\n", NbRuns); + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + DumpAllRuns(&LargeMcb); + FsRtlUninitializeLargeMcb(&LargeMcb); }

1 0

[tfaber] 71161: [NTOS:MM] - Fix list walk in MmGetSessionById
by tfaber＠svn.reactos.org 15 Apr '16

15 Apr '16

Author: tfaber Date: Fri Apr 15 18:30:18 2016 New Revision: 71161 URL: http://svn.reactos.org/svn/reactos?rev=71161&view=rev Log: [NTOS:MM] - Fix list walk in MmGetSessionById Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Fri Apr 15 18:30:18 2016 @@ -1053,6 +1053,7 @@ while (ListEntry != &MiSessionWsList) { Session = CONTAINING_RECORD(ListEntry, MM_SESSION_SPACE, WsListEntry); + ListEntry = ListEntry->Flink; /* Check if this is the session we are looking for */ if (Session->SessionId == SessionId)

1 0

[pschweitzer] 71160: [FREELDR] Cherrypick r71159
by pschweitzer＠svn.reactos.org 14 Apr '16

14 Apr '16

Author: pschweitzer Date: Thu Apr 14 20:42:12 2016 New Revision: 71160 URL: http://svn.reactos.org/svn/reactos?rev=71160&view=rev Log: [FREELDR] Cherrypick r71159 Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/f… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/fs/ntfs.c [iso-8859-1] Thu Apr 14 20:42:12 2016 @@ -302,8 +302,8 @@ ReadLength = (ULONG)min(DataRunLength * Volume->ClusterSize - (Offset - CurrentOffset), Length); if (DataRunStartLCN == -1) - RtlZeroMemory(Buffer, ReadLength); - if (NtfsDiskRead(Volume, DataRunStartLCN * Volume->ClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) + RtlZeroMemory(Buffer, ReadLength); + if (DataRunStartLCN == -1 || NtfsDiskRead(Volume, DataRunStartLCN * Volume->ClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) { Length -= ReadLength; Buffer += ReadLength;

1 0

[pschweitzer] 71159: [NTFS] Don't attempt to read a sparse run of the disk. Patch by Trevor Thompson CORE-10998
by pschweitzer＠svn.reactos.org 14 Apr '16

14 Apr '16

Author: pschweitzer Date: Thu Apr 14 20:39:55 2016 New Revision: 71159 URL: http://svn.reactos.org/svn/reactos?rev=71159&view=rev Log: [NTFS] Don't attempt to read a sparse run of the disk. Patch by Trevor Thompson CORE-10998 Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Thu Apr 14 20:39:55 2016 @@ -243,13 +243,19 @@ ReadLength = (ULONG)min(DataRunLength * Vcb->NtfsInfo.BytesPerCluster - (Offset - CurrentOffset), Length); if (DataRunStartLCN == -1) + { RtlZeroMemory(Buffer, ReadLength); - Status = NtfsReadDisk(Vcb->StorageDevice, - DataRunStartLCN * Vcb->NtfsInfo.BytesPerCluster + Offset - CurrentOffset, - ReadLength, - Vcb->NtfsInfo.BytesPerSector, - (PVOID)Buffer, - FALSE); + Status = STATUS_SUCCESS; + } + else + { + Status = NtfsReadDisk(Vcb->StorageDevice, + DataRunStartLCN * Vcb->NtfsInfo.BytesPerCluster + Offset - CurrentOffset, + ReadLength, + Vcb->NtfsInfo.BytesPerSector, + (PVOID)Buffer, + FALSE); + } if (NT_SUCCESS(Status)) { Length -= ReadLength;

1 0

[tfaber] 71158: [ACPICA] - Revert the changes adding arbitrary bit length read/write support since they cause problems on VirtualBox and will be reworked upstream. CORE-11115 #resolve
by tfaber＠svn.reactos.org 14 Apr '16

14 Apr '16

Author: tfaber Date: Thu Apr 14 19:38:40 2016 New Revision: 71158 URL: http://svn.reactos.org/svn/reactos?rev=71158&view=rev Log: [ACPICA] - Revert the changes adding arbitrary bit length read/write support since they cause problems on VirtualBox and will be reworked upstream. CORE-11115 #resolve Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/hardware/hwregs.c [iso-8859-1] Thu Apr 14 19:38:40 2016 @@ -91,9 +91,6 @@ UINT8 MaxBitWidth, UINT64 *Address) { - UINT8 BitWidth; - UINT8 AccessWidth; - /* Must have a valid pointer to a GAS structure */ @@ -123,26 +120,24 @@ return (AE_SUPPORT); } - /* Validate the AccessWidth */ - - if (Reg->AccessWidth > 4) + /* Validate the BitWidth */ + + if ((Reg->BitWidth != 8) && + (Reg->BitWidth != 16) && + (Reg->BitWidth != 32) && + (Reg->BitWidth != MaxBitWidth)) { ACPI_ERROR ((AE_INFO, - "Unsupported register access width: 0x%X", Reg->AccessWidth)); + "Unsupported register bit width: 0x%X", Reg->BitWidth)); return (AE_SUPPORT); } - /* Validate the BitWidth, convert AccessWidth into number of bits */ - - AccessWidth = Reg->AccessWidth ? Reg->AccessWidth : 1; - AccessWidth = 1 << (AccessWidth + 2); - BitWidth = ACPI_ROUND_UP (Reg->BitOffset + Reg->BitWidth, AccessWidth); - if (MaxBitWidth < BitWidth) + /* Validate the BitOffset. Just a warning for now. */ + + if (Reg->BitOffset != 0) { ACPI_WARNING ((AE_INFO, - "Requested bit width 0x%X is smaller than register bit width 0x%X", - MaxBitWidth, BitWidth)); - return (AE_SUPPORT); + "Unsupported register bit offset: 0x%X", Reg->BitOffset)); } return (AE_OK); @@ -163,7 +158,10 @@ * 64-bit values is not needed. * * LIMITATIONS: <These limitations also apply to AcpiHwWrite> + * BitWidth must be exactly 8, 16, or 32. * SpaceID must be SystemMemory or SystemIO. + * BitOffset and AccessWidth are currently ignored, as there has + * not been a need to implement these. * ******************************************************************************/ @@ -173,12 +171,7 @@ ACPI_GENERIC_ADDRESS *Reg) { UINT64 Address; - UINT8 AccessWidth; - UINT32 BitWidth; - UINT8 BitOffset; UINT64 Value64; - UINT32 Value32; - UINT8 Index; ACPI_STATUS Status; @@ -193,65 +186,30 @@ return (Status); } - /* - * Initialize entire 32-bit return value to zero, convert AccessWidth - * into number of bits based - */ + /* Initialize entire 32-bit return value to zero */ + *Value = 0; - AccessWidth = Reg->AccessWidth ? Reg->AccessWidth : 1; - AccessWidth = 1 << (AccessWidth + 2); - BitWidth = ACPI_ROUND_UP (Reg->BitOffset + Reg->BitWidth, AccessWidth); - BitOffset = Reg->BitOffset; /* * Two address spaces supported: Memory or IO. PCI_Config is * not supported here because the GAS structure is insufficient */ - Index = 0; - while (BitWidth) - { - if (BitOffset > AccessWidth) - { - Value32 = 0; - BitOffset -= AccessWidth; - } - else - { - if (Reg->SpaceId == ACPI_ADR_SPACE_SYSTEM_MEMORY) - { - Status = AcpiOsReadMemory ((ACPI_PHYSICAL_ADDRESS) - Address + Index * ACPI_DIV_8 (AccessWidth), - &Value64, AccessWidth); - Value32 = (UINT32) Value64; - } - else /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */ - { - Status = AcpiHwReadPort ((ACPI_IO_ADDRESS) - Address + Index * ACPI_DIV_8 (AccessWidth), - &Value32, AccessWidth); - } - - if (BitOffset) - { - Value32 &= ACPI_MASK_BITS_BELOW (BitOffset); - BitOffset = 0; - } - if (BitWidth < AccessWidth) - { - Value32 &= ACPI_MASK_BITS_ABOVE (BitWidth); - } - } - - ACPI_SET_BITS (Value, Index * AccessWidth, - ((1 << AccessWidth) - 1), Value32); - - BitWidth -= BitWidth > AccessWidth ? AccessWidth : BitWidth; - Index++; + if (Reg->SpaceId == ACPI_ADR_SPACE_SYSTEM_MEMORY) + { + Status = AcpiOsReadMemory ((ACPI_PHYSICAL_ADDRESS) + Address, &Value64, Reg->BitWidth); + + *Value = (UINT32) Value64; + } + else /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */ + { + Status = AcpiHwReadPort ((ACPI_IO_ADDRESS) + Address, Value, Reg->BitWidth); } ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Read: %8.8X width %2d from %8.8X%8.8X (%s)\n", - *Value, AccessWidth, ACPI_FORMAT_UINT64 (Address), + *Value, Reg->BitWidth, ACPI_FORMAT_UINT64 (Address), AcpiUtGetRegionName (Reg->SpaceId))); return (Status); @@ -279,12 +237,6 @@ ACPI_GENERIC_ADDRESS *Reg) { UINT64 Address; - UINT8 AccessWidth; - UINT32 BitWidth; - UINT8 BitOffset; - UINT64 Value64; - UINT32 NewValue32, OldValue32; - UINT8 Index; ACPI_STATUS Status; @@ -298,111 +250,25 @@ { return (Status); } - - /* Convert AccessWidth into number of bits based */ - - AccessWidth = Reg->AccessWidth ? Reg->AccessWidth : 1; - AccessWidth = 1 << (AccessWidth + 2); - BitWidth = ACPI_ROUND_UP (Reg->BitOffset + Reg->BitWidth, AccessWidth); - BitOffset = Reg->BitOffset; /* * Two address spaces supported: Memory or IO. PCI_Config is * not supported here because the GAS structure is insufficient */ - Index = 0; - while (BitWidth) - { - NewValue32 = ACPI_GET_BITS (&Value, (Index * AccessWidth), - ((1 << AccessWidth) - 1)); - - if (BitOffset > AccessWidth) - { - BitOffset -= AccessWidth; - } - else - { - if (BitOffset) - { - NewValue32 &= ACPI_MASK_BITS_BELOW (BitOffset); - } - - if (BitWidth < AccessWidth) - { - NewValue32 &= ACPI_MASK_BITS_ABOVE (BitWidth); - } - - if (Reg->SpaceId == ACPI_ADR_SPACE_SYSTEM_MEMORY) - { - if (BitOffset || BitWidth < AccessWidth) - { - /* - * Read old values in order not to modify the bits that - * are beyond the register BitWidth/BitOffset setting. - */ - Status = AcpiOsReadMemory ((ACPI_PHYSICAL_ADDRESS) - Address + Index * ACPI_DIV_8 (AccessWidth), - &Value64, AccessWidth); - OldValue32 = (UINT32) Value64; - - if (BitOffset) - { - OldValue32 &= ACPI_MASK_BITS_ABOVE (BitOffset + 1); - BitOffset = 0; - } - - if (BitWidth < AccessWidth) - { - OldValue32 &= ACPI_MASK_BITS_BELOW (BitWidth - 1); - } - - NewValue32 |= OldValue32; - } - - Value64 = (UINT64) NewValue32; - Status = AcpiOsWriteMemory ((ACPI_PHYSICAL_ADDRESS) - Address + Index * ACPI_DIV_8 (AccessWidth), - Value64, AccessWidth); - } - else /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */ - { - if (BitOffset || BitWidth < AccessWidth) - { - /* - * Read old values in order not to modify the bits that - * are beyond the register BitWidth/BitOffset setting. - */ - Status = AcpiHwReadPort ((ACPI_IO_ADDRESS) - Address + Index * ACPI_DIV_8 (AccessWidth), - &OldValue32, AccessWidth); - - if (BitOffset) - { - OldValue32 &= ACPI_MASK_BITS_ABOVE (BitOffset + 1); - BitOffset = 0; - } - - if (BitWidth < AccessWidth) - { - OldValue32 &= ACPI_MASK_BITS_BELOW (BitWidth - 1); - } - - NewValue32 |= OldValue32; - } - - Status = AcpiHwWritePort ((ACPI_IO_ADDRESS) - Address + Index * ACPI_DIV_8 (AccessWidth), - NewValue32, AccessWidth); - } - } - - BitWidth -= BitWidth > AccessWidth ? AccessWidth : BitWidth; - Index++; + if (Reg->SpaceId == ACPI_ADR_SPACE_SYSTEM_MEMORY) + { + Status = AcpiOsWriteMemory ((ACPI_PHYSICAL_ADDRESS) + Address, (UINT64) Value, Reg->BitWidth); + } + else /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */ + { + Status = AcpiHwWritePort ((ACPI_IO_ADDRESS) + Address, Value, Reg->BitWidth); } ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Wrote: %8.8X width %2d to %8.8X%8.8X (%s)\n", - Value, AccessWidth, ACPI_FORMAT_UINT64 (Address), + Value, Reg->BitWidth, ACPI_FORMAT_UINT64 (Address), AcpiUtGetRegionName (Reg->SpaceId))); return (Status);

1 0

[tfaber] 71157: [NTOS:IO] - Avoid excessive stack usage in IopInitializeDriverModule.
by tfaber＠svn.reactos.org 14 Apr '16

14 Apr '16

Author: tfaber Date: Thu Apr 14 15:18:53 2016 New Revision: 71157 URL: http://svn.reactos.org/svn/reactos?rev=71157&view=rev Log: [NTOS:IO] - Avoid excessive stack usage in IopInitializeDriverModule. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Apr 14 15:18:53 2016 @@ -463,8 +463,7 @@ IN BOOLEAN FileSystemDriver, OUT PDRIVER_OBJECT *DriverObject) { - const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; - WCHAR NameBuffer[MAX_PATH]; + static const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; UNICODE_STRING DriverName; UNICODE_STRING RegistryKey; PDRIVER_INITIALIZE DriverEntry; @@ -477,7 +476,9 @@ { RegistryKey.Length = 0; RegistryKey.MaximumLength = sizeof(ServicesKeyName) + ServiceName->Length; - RegistryKey.Buffer = ExAllocatePool(PagedPool, RegistryKey.MaximumLength); + RegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, + RegistryKey.MaximumLength, + TAG_IO); if (RegistryKey.Buffer == NULL) { return STATUS_INSUFFICIENT_RESOURCES; @@ -487,26 +488,35 @@ } else { - RtlInitUnicodeString(&RegistryKey, NULL); + RtlInitEmptyUnicodeString(&RegistryKey, NULL, 0); } /* Create ModuleName string */ if (ServiceName && ServiceName->Length > 0) { + DriverName.Length = 0; + DriverName.MaximumLength = sizeof(FILESYSTEM_ROOT_NAME) + ServiceName->Length; + DriverName.Buffer = ExAllocatePoolWithTag(PagedPool, + DriverName.MaximumLength, + TAG_IO); + if (DriverName.Buffer == NULL) + { + RtlFreeUnicodeString(&RegistryKey); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (FileSystemDriver != FALSE) - wcscpy(NameBuffer, FILESYSTEM_ROOT_NAME); + RtlAppendUnicodeToString(&DriverName, FILESYSTEM_ROOT_NAME); else - wcscpy(NameBuffer, DRIVER_ROOT_NAME); - - RtlInitUnicodeString(&DriverName, NameBuffer); - DriverName.MaximumLength = sizeof(NameBuffer); - + RtlAppendUnicodeToString(&DriverName, DRIVER_ROOT_NAME); RtlAppendUnicodeStringToString(&DriverName, ServiceName); DPRINT("Driver name: '%wZ'\n", &DriverName); } else - DriverName.Length = 0; + { + RtlInitEmptyUnicodeString(&DriverName, NULL, 0); + } Status = IopCreateDriver(DriverName.Length > 0 ? &DriverName : NULL, DriverEntry, @@ -515,6 +525,7 @@ ModuleObject, &Driver); RtlFreeUnicodeString(&RegistryKey); + RtlFreeUnicodeString(&DriverName); *DriverObject = Driver; if (!NT_SUCCESS(Status))

1 0

[pschweitzer] 71156: [NTFS] Don't perform an overestimated allocation in NtfsReadFile() Patch by Trevor Thompson CORE-10998
by pschweitzer＠svn.reactos.org 13 Apr '16

13 Apr '16

Author: pschweitzer Date: Wed Apr 13 20:06:56 2016 New Revision: 71156 URL: http://svn.reactos.org/svn/reactos?rev=71156&view=rev Log: [NTFS] Don't perform an overestimated allocation in NtfsReadFile() Patch by Trevor Thompson CORE-10998 Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Wed Apr 13 20:06:56 2016 @@ -150,7 +150,7 @@ RealLength += DeviceExt->NtfsInfo.BytesPerSector; - ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength + (DeviceExt->NtfsInfo.BytesPerSector * 2), TAG_NTFS); + ReadBuffer = ExAllocatePoolWithTag(NonPagedPool, RealLength, TAG_NTFS); if (ReadBuffer == NULL) { DPRINT1("Not enough memory!\n");

1 0

[pschweitzer] 71155: [NTFS] Don't leak memory in case of failures in NtfsReadDisk(). Based on a patch by Trevor Thompson. CORE-10998
by pschweitzer＠svn.reactos.org 13 Apr '16

13 Apr '16

Author: pschweitzer Date: Wed Apr 13 19:52:42 2016 New Revision: 71155 URL: http://svn.reactos.org/svn/reactos?rev=71155&view=rev Log: [NTFS] Don't leak memory in case of failures in NtfsReadDisk(). Based on a patch by Trevor Thompson. CORE-10998 Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c Modified: trunk/reactos/drivers/filesystems/ntfs/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/b… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/blockdev.c [iso-8859-1] Wed Apr 13 19:52:42 2016 @@ -87,6 +87,12 @@ if (Irp == NULL) { DPRINT("IoBuildSynchronousFsdRequest failed\n"); + + if (AllocatedBuffer) + { + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); + } + return STATUS_INSUFFICIENT_RESOURCES; } @@ -108,9 +114,13 @@ Status = IoStatus.Status; } - if (NT_SUCCESS(Status) && AllocatedBuffer) - { - RtlCopyMemory(Buffer, ReadBuffer + (StartingOffset - RealReadOffset), Length); + if (AllocatedBuffer) + { + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(Buffer, ReadBuffer + (StartingOffset - RealReadOffset), Length); + } + ExFreePoolWithTag(ReadBuffer, TAG_NTFS); }

1 0

[mjansen] 71154: [APPHELP] Change the ApphelpCheckInstallShieldPackage stub to a non-throwing one, use OutputDebugString by default. CORE-8591
by mjansen＠svn.reactos.org 13 Apr '16

13 Apr '16

Author: mjansen Date: Wed Apr 13 18:23:54 2016 New Revision: 71154 URL: http://svn.reactos.org/svn/reactos?rev=71154&view=rev Log: [APPHELP] Change the ApphelpCheckInstallShieldPackage stub to a non-throwing one, use OutputDebugString by default. CORE-8591 Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c trunk/reactos/dll/appcompat/apphelp/apphelp.spec Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.c [iso-8859-1] Wed Apr 13 18:23:54 2016 @@ -26,8 +26,6 @@ #include "apphelp.h" #include "wine/winternl.h" -#include "wine/debug.h" -#include "wine/unicode.h" /* from dpfilter.h */ #define DPFLTR_APPCOMPAT_ID 123 @@ -82,6 +80,12 @@ return TRUE; } +BOOL WINAPI ApphelpCheckInstallShieldPackage(void* ptr, LPCWSTR path) +{ + SHIM_WARN("stub: ptr=%p path='%S'\r\n", ptr, path); + return TRUE; +} + /** * Outputs diagnostic info. @@ -130,6 +134,11 @@ va_start(ArgList, Format); StringCchVPrintfExA(Current, Length, &Current, &Length, STRSAFE_NULL_ON_FAILURE, Format, ArgList); va_end(ArgList); +#if defined(APPCOMPAT_USE_DBGPRINTEX) && APPCOMPAT_USE_DBGPRINTEX return NT_SUCCESS(DbgPrintEx(DPFLTR_APPCOMPAT_ID, Level, "%s", Buffer)); +#else + OutputDebugStringA(Buffer); + return TRUE; +#endif } Modified: trunk/reactos/dll/appcompat/apphelp/apphelp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/apphelp/apph… ============================================================================== --- trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/apphelp/apphelp.spec [iso-8859-1] Wed Apr 13 18:23:54 2016 @@ -1,6 +1,6 @@ @ stdcall AllowPermLayer(wstr) @ stub ApphelpCheckExe -@ stub ApphelpCheckInstallShieldPackage +@ stdcall ApphelpCheckInstallShieldPackage(ptr wstr) @ stub ApphelpCheckMsiPackage @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx

1 0

[tfaber] 71153: [NTOS:PS] - Return sensible values for KernelTime/UserTime from NtQueryInformationProcess:ProcessTimes CORE-7007 #resolve
by tfaber＠svn.reactos.org 12 Apr '16

12 Apr '16

Author: tfaber Date: Tue Apr 12 17:44:47 2016 New Revision: 71153 URL: http://svn.reactos.org/svn/reactos?rev=71153&view=rev Log: [NTOS:PS] - Return sensible values for KernelTime/UserTime from NtQueryInformationProcess:ProcessTimes CORE-7007 #resolve Modified: trunk/reactos/ntoskrnl/ps/query.c trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=71… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Tue Apr 12 17:44:47 2016 @@ -70,6 +70,7 @@ PPROCESS_BASIC_INFORMATION ProcessBasicInfo = (PPROCESS_BASIC_INFORMATION)ProcessInformation; PKERNEL_USER_TIMES ProcessTime = (PKERNEL_USER_TIMES)ProcessInformation; + ULONG UserTime, KernelTime; PPROCESS_PRIORITY_CLASS PsPriorityClass = (PPROCESS_PRIORITY_CLASS)ProcessInformation; ULONG HandleCount; PPROCESS_SESSION_INFORMATION SessionInfo = @@ -296,12 +297,10 @@ _SEH2_TRY { /* Copy time information from EPROCESS/KPROCESS */ - /* FIXME: Call KeQueryRuntimeProcess */ + KernelTime = KeQueryRuntimeProcess(&Process->Pcb, &UserTime); ProcessTime->CreateTime = Process->CreateTime; - ProcessTime->UserTime.QuadPart = Process->Pcb.UserTime * - KeMaximumIncrement; - ProcessTime->KernelTime.QuadPart = Process->Pcb.KernelTime * - KeMaximumIncrement; + ProcessTime->UserTime.QuadPart = (LONGLONG)UserTime * KeMaximumIncrement; + ProcessTime->KernelTime.QuadPart = (LONGLONG)KernelTime * KeMaximumIncrement; ProcessTime->ExitTime = Process->ExitTime; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) Modified: trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtQueryInf… ============================================================================== --- trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtQueryInformationProcess.c [iso-8859-1] Tue Apr 12 17:44:47 2016 @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS API tests - * LICENSE: LGPLv2.1+ - See COPYING in the top level directory + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Tests for the NtQueryInformationProcess API * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> */

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