mirror of
https://github.com/reactos/reactos.git
synced 2025-05-08 19:27:00 +00:00
revert hackfix (revision 39704)
svn path=/trunk/; revision=39705
This commit is contained in:
Matthias Kupfer
parent
0ef3ed3fb1
commit
c5dfe0ed6f
1 changed files with 141 additions and 179 deletions
|
|
@ -701,7 +701,7 @@ QSI_DEF(SystemPathInformation)
|
||||||
/* Class 5 - Process Information */
|
/* Class 5 - Process Information */
|
||||||
QSI_DEF(SystemProcessInformation)
|
QSI_DEF(SystemProcessInformation)
|
||||||
{
|
{
|
||||||
PSYSTEM_PROCESS_INFORMATION SpiCurrent = NULL;
|
PSYSTEM_PROCESS_INFORMATION SpiCurrent;
|
||||||
PSYSTEM_THREAD_INFORMATION ThreadInfo;
|
PSYSTEM_THREAD_INFORMATION ThreadInfo;
|
||||||
PEPROCESS Process = NULL, SystemProcess;
|
PEPROCESS Process = NULL, SystemProcess;
|
||||||
PETHREAD CurrentThread;
|
PETHREAD CurrentThread;
|
||||||
|
|
@ -712,213 +712,176 @@ QSI_DEF(SystemProcessInformation)
|
||||||
PLIST_ENTRY CurrentEntry;
|
PLIST_ENTRY CurrentEntry;
|
||||||
ULONG TotalSize = 0, ThreadsCount;
|
ULONG TotalSize = 0, ThreadsCount;
|
||||||
ULONG TotalUser, TotalKernel;
|
ULONG TotalUser, TotalKernel;
|
||||||
PUCHAR Current = NULL;
|
PUCHAR Current;
|
||||||
NTSTATUS Status = STATUS_SUCCESS;
|
NTSTATUS Status = STATUS_SUCCESS;
|
||||||
PUNICODE_STRING ProcessImageName;
|
PUNICODE_STRING ProcessImageName;
|
||||||
PWCHAR szSrc;
|
PWCHAR szSrc;
|
||||||
|
|
||||||
//1 Write in to bufer
|
|
||||||
//2 Calc size buffer
|
|
||||||
//4 Vista compatible
|
|
||||||
//Flags always start write and calculate size
|
|
||||||
//For Vista compatible add "| 4"
|
|
||||||
USHORT OSMode = 1 | 2;
|
|
||||||
|
|
||||||
_SEH2_TRY
|
_SEH2_TRY
|
||||||
{
|
{
|
||||||
/* scan the process list */
|
/* scan the process list */
|
||||||
|
|
||||||
PSYSTEM_PROCESS_INFORMATION Spi
|
PSYSTEM_PROCESS_INFORMATION Spi
|
||||||
= (PSYSTEM_PROCESS_INFORMATION) Buffer;
|
= (PSYSTEM_PROCESS_INFORMATION) Buffer;
|
||||||
|
|
||||||
while ((OSMode & 1) || (OSMode & 2))
|
*ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION);
|
||||||
|
|
||||||
|
if (Size < sizeof(SYSTEM_PROCESS_INFORMATION))
|
||||||
{
|
{
|
||||||
//Vista first cycle only calc size and readonly
|
_SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small
|
||||||
if (OSMode & 4 && OSMode & 1)
|
}
|
||||||
OSMode ^= 1;
|
RtlZeroMemory(Spi, Size);
|
||||||
//not exists byffer or size protect write, only calc size
|
|
||||||
if (OSMode & 1 && ((Size == 0) || (!Buffer)))
|
|
||||||
OSMode ^= 1;
|
|
||||||
|
|
||||||
if (OSMode & 1)
|
SystemProcess = PsIdleProcess;
|
||||||
{
|
Process = SystemProcess;
|
||||||
//Only in second cycle and vista compatible
|
Current = (PUCHAR) Spi;
|
||||||
if (TotalSize > 0 && TotalSize > Size)
|
|
||||||
{
|
|
||||||
*ReqSize = TotalSize;
|
|
||||||
_SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small
|
|
||||||
}
|
|
||||||
if (Size > 0)
|
|
||||||
RtlZeroMemory(Spi, Size);
|
|
||||||
Current = (PUCHAR) Spi;
|
|
||||||
SpiCurrent = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
SystemProcess = PsIdleProcess;
|
do
|
||||||
Process = SystemProcess;
|
{
|
||||||
|
SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current;
|
||||||
|
|
||||||
do
|
ThreadsCount = 0;
|
||||||
{
|
CurrentEntry = Process->ThreadListHead.Flink;
|
||||||
ThreadsCount = 0;
|
while (CurrentEntry != &Process->ThreadListHead)
|
||||||
CurrentEntry = Process->ThreadListHead.Flink;
|
{
|
||||||
while (CurrentEntry != &Process->ThreadListHead)
|
|
||||||
{
|
|
||||||
ThreadsCount++;
|
ThreadsCount++;
|
||||||
CurrentEntry = CurrentEntry->Flink;
|
CurrentEntry = CurrentEntry->Flink;
|
||||||
}
|
}
|
||||||
|
|
||||||
// size of the structure for every process
|
// size of the structure for every process
|
||||||
CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount;
|
CurrentSize = sizeof(SYSTEM_PROCESS_INFORMATION) + sizeof(SYSTEM_THREAD_INFORMATION) * ThreadsCount;
|
||||||
ImageNameLength = 0;
|
ImageNameLength = 0;
|
||||||
Status = SeLocateProcessImageName(Process, &ProcessImageName);
|
Status = SeLocateProcessImageName(Process, &ProcessImageName);
|
||||||
szSrc = NULL;
|
szSrc = NULL;
|
||||||
if (NT_SUCCESS(Status) && ProcessImageName->Length > 0)
|
if (NT_SUCCESS(Status))
|
||||||
|
{
|
||||||
|
szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length);
|
||||||
|
/* Loop the file name*/
|
||||||
|
while (szSrc > ProcessImageName->Buffer)
|
||||||
{
|
{
|
||||||
szSrc = (PWCHAR)((PCHAR)ProcessImageName->Buffer + ProcessImageName->Length);
|
/* Make sure this isn't a backslash */
|
||||||
/* Loop the file name*/
|
if (*--szSrc == OBJ_NAME_PATH_SEPARATOR)
|
||||||
while (szSrc > ProcessImageName->Buffer)
|
|
||||||
{
|
{
|
||||||
/* Make sure this isn't a backslash */
|
|
||||||
if (*--szSrc == OBJ_NAME_PATH_SEPARATOR)
|
|
||||||
{
|
|
||||||
szSrc++;
|
szSrc++;
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ImageNameLength += sizeof(WCHAR);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName)
|
|
||||||
{
|
|
||||||
ImageNameLength = strlen(Process->ImageFileName) * sizeof(WCHAR);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Round up the image name length as NT does */
|
|
||||||
ImageNameMaximumLength =
|
|
||||||
(ImageNameLength > 0 ? ROUND_UP(ImageNameLength+1, 8) : 0);
|
|
||||||
|
|
||||||
if (OSMode & 2)
|
|
||||||
TotalSize += CurrentSize + ImageNameMaximumLength;
|
|
||||||
|
|
||||||
if ((OSMode & 1) && Buffer && TotalSize <= Size)
|
|
||||||
{
|
|
||||||
//Set prev structure NextEntryOffset next structure only exists write buffer
|
|
||||||
if (SpiCurrent && TotalSize <= Size)
|
|
||||||
SpiCurrent->NextEntryOffset = Current - (PUCHAR)SpiCurrent;// relative offset to the beginnnig of the next structure
|
|
||||||
SpiCurrent = (PSYSTEM_PROCESS_INFORMATION) Current;
|
|
||||||
|
|
||||||
/* Fill system information */
|
|
||||||
SpiCurrent->NumberOfThreads = ThreadsCount;
|
|
||||||
SpiCurrent->CreateTime = Process->CreateTime;
|
|
||||||
SpiCurrent->ImageName.Length = ImageNameLength;
|
|
||||||
SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength;
|
|
||||||
SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize);
|
|
||||||
|
|
||||||
/* Copy name to the end of the struct */
|
|
||||||
if(Process != PsIdleProcess)
|
|
||||||
{
|
|
||||||
if (szSrc)
|
|
||||||
{
|
|
||||||
RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length);
|
|
||||||
}
|
|
||||||
else if (Process->ImageFileName)
|
|
||||||
{
|
|
||||||
RtlInitAnsiString(&ImageName, Process->ImageFileName);
|
|
||||||
RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
RtlInitUnicodeString(&SpiCurrent->ImageName, NULL);
|
ImageNameLength += sizeof(WCHAR);
|
||||||
}
|
}
|
||||||
|
|
||||||
SpiCurrent->BasePriority = Process->Pcb.BasePriority;
|
|
||||||
SpiCurrent->UniqueProcessId = Process->UniqueProcessId;
|
|
||||||
SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId;
|
|
||||||
SpiCurrent->HandleCount = ObGetProcessHandleCount(Process);
|
|
||||||
SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize;
|
|
||||||
SpiCurrent->VirtualSize = Process->VirtualSize;
|
|
||||||
SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount;
|
|
||||||
SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize;
|
|
||||||
SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize;
|
|
||||||
SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0];
|
|
||||||
SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0];
|
|
||||||
SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1];
|
|
||||||
SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1];
|
|
||||||
SpiCurrent->PagefileUsage = Process->QuotaUsage[2];
|
|
||||||
SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2];
|
|
||||||
SpiCurrent->PrivatePageCount = Process->CommitCharge;
|
|
||||||
ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1);
|
|
||||||
|
|
||||||
CurrentEntry = Process->ThreadListHead.Flink;
|
|
||||||
while (CurrentEntry != &Process->ThreadListHead)
|
|
||||||
{
|
|
||||||
CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD,
|
|
||||||
ThreadListEntry);
|
|
||||||
|
|
||||||
ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement);
|
|
||||||
ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement);
|
|
||||||
ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart;
|
|
||||||
ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime;
|
|
||||||
ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress;
|
|
||||||
ThreadInfo->ClientId = CurrentThread->Cid;
|
|
||||||
ThreadInfo->Priority = CurrentThread->Tcb.Priority;
|
|
||||||
ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority;
|
|
||||||
ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches;
|
|
||||||
ThreadInfo->ThreadState = CurrentThread->Tcb.State;
|
|
||||||
ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason;
|
|
||||||
|
|
||||||
ThreadInfo++;
|
|
||||||
CurrentEntry = CurrentEntry->Flink;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Query total user/kernel times of a process */
|
|
||||||
TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser);
|
|
||||||
SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement);
|
|
||||||
SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement);
|
|
||||||
}
|
}
|
||||||
/* Release the memory allocated by SeLocateProcessImageName */
|
}
|
||||||
if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName);
|
if (!ImageNameLength && Process != PsIdleProcess && Process->ImageFileName)
|
||||||
|
{
|
||||||
|
ImageNameLength = strlen(Process->ImageFileName) * sizeof(WCHAR);
|
||||||
|
}
|
||||||
|
|
||||||
/* Handle idle process entry */
|
/* Round up the image name length as NT does */
|
||||||
if (Process == PsIdleProcess) Process = NULL;
|
ImageNameMaximumLength = ROUND_UP(ImageNameLength, 8);
|
||||||
|
|
||||||
Process = PsGetNextProcess(Process);
|
TotalSize += CurrentSize + ImageNameMaximumLength;
|
||||||
ThreadsCount = 0;
|
|
||||||
if ((Process == SystemProcess) || (Process == NULL))
|
if (TotalSize > Size)
|
||||||
|
{
|
||||||
|
*ReqSize = TotalSize;
|
||||||
|
ObDereferenceObject(Process);
|
||||||
|
|
||||||
|
/* Release the memory allocated by SeLocateProcessImageName */
|
||||||
|
if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName);
|
||||||
|
|
||||||
|
_SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fill system information */
|
||||||
|
SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure
|
||||||
|
SpiCurrent->NumberOfThreads = ThreadsCount;
|
||||||
|
SpiCurrent->CreateTime = Process->CreateTime;
|
||||||
|
SpiCurrent->ImageName.Length = ImageNameLength;
|
||||||
|
SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength;
|
||||||
|
SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize);
|
||||||
|
|
||||||
|
/* Copy name to the end of the struct */
|
||||||
|
if(Process != PsIdleProcess)
|
||||||
|
{
|
||||||
|
if (szSrc)
|
||||||
{
|
{
|
||||||
|
RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length);
|
||||||
|
|
||||||
|
/* Release the memory allocated by SeLocateProcessImageName */
|
||||||
|
ExFreePool(ProcessImageName);
|
||||||
|
}
|
||||||
|
else if (Process->ImageFileName)
|
||||||
|
{
|
||||||
|
RtlInitAnsiString(&ImageName, Process->ImageFileName);
|
||||||
|
RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
RtlInitUnicodeString(&SpiCurrent->ImageName, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
SpiCurrent->BasePriority = Process->Pcb.BasePriority;
|
||||||
|
SpiCurrent->UniqueProcessId = Process->UniqueProcessId;
|
||||||
|
SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId;
|
||||||
|
SpiCurrent->HandleCount = ObGetProcessHandleCount(Process);
|
||||||
|
SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize;
|
||||||
|
SpiCurrent->VirtualSize = Process->VirtualSize;
|
||||||
|
SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount;
|
||||||
|
SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize;
|
||||||
|
SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize;
|
||||||
|
SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0];
|
||||||
|
SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0];
|
||||||
|
SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1];
|
||||||
|
SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1];
|
||||||
|
SpiCurrent->PagefileUsage = Process->QuotaUsage[2];
|
||||||
|
SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2];
|
||||||
|
SpiCurrent->PrivatePageCount = Process->CommitCharge;
|
||||||
|
ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1);
|
||||||
|
|
||||||
|
CurrentEntry = Process->ThreadListHead.Flink;
|
||||||
|
while (CurrentEntry != &Process->ThreadListHead)
|
||||||
|
{
|
||||||
|
CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD,
|
||||||
|
ThreadListEntry);
|
||||||
|
|
||||||
|
ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement);
|
||||||
|
ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement);
|
||||||
|
ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart;
|
||||||
|
ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime;
|
||||||
|
ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress;
|
||||||
|
ThreadInfo->ClientId = CurrentThread->Cid;
|
||||||
|
ThreadInfo->Priority = CurrentThread->Tcb.Priority;
|
||||||
|
ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority;
|
||||||
|
ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches;
|
||||||
|
ThreadInfo->ThreadState = CurrentThread->Tcb.State;
|
||||||
|
ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason;
|
||||||
|
|
||||||
|
ThreadInfo++;
|
||||||
|
CurrentEntry = CurrentEntry->Flink;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Query total user/kernel times of a process */
|
||||||
|
TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser);
|
||||||
|
SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement);
|
||||||
|
SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement);
|
||||||
|
|
||||||
|
/* Handle idle process entry */
|
||||||
|
if (Process == PsIdleProcess) Process = NULL;
|
||||||
|
|
||||||
|
Process = PsGetNextProcess(Process);
|
||||||
|
ThreadsCount = 0;
|
||||||
|
if ((Process == SystemProcess) || (Process == NULL))
|
||||||
|
{
|
||||||
|
SpiCurrent->NextEntryOffset = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
Current += CurrentSize + ImageNameMaximumLength;
|
||||||
if (Current)
|
|
||||||
Current += CurrentSize + ImageNameMaximumLength;
|
|
||||||
}
|
|
||||||
} while ((Process != SystemProcess) && (Process != NULL));
|
} while ((Process != SystemProcess) && (Process != NULL));
|
||||||
//Break parameters information for only calc size
|
|
||||||
if ((Size == 0) || (!Buffer))
|
|
||||||
break;
|
|
||||||
//Stop write in to buffer
|
|
||||||
if (OSMode & 1)
|
|
||||||
OSMode ^= 1;
|
|
||||||
//Only first cycle calc size
|
|
||||||
if (OSMode & 2)
|
|
||||||
OSMode ^= 2;
|
|
||||||
//Vista next cycle write in to Buffer
|
|
||||||
if (OSMode & 4)
|
|
||||||
{
|
|
||||||
OSMode |= 1;
|
|
||||||
OSMode ^= 4;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if(Process != NULL)
|
if(Process != NULL)
|
||||||
ObDereferenceObject(Process);
|
ObDereferenceObject(Process);
|
||||||
if ((Size == 0) || (!Buffer) || (TotalSize > Size))
|
|
||||||
Status = STATUS_INFO_LENGTH_MISMATCH;
|
|
||||||
else
|
|
||||||
Status = STATUS_SUCCESS;
|
Status = STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
|
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
|
||||||
|
|
@ -1925,9 +1888,8 @@ NtQuerySystemInformation(IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
|
||||||
if (PreviousMode != KernelMode)
|
if (PreviousMode != KernelMode)
|
||||||
{
|
{
|
||||||
/* SystemKernelDebuggerInformation needs only BOOLEAN alignment */
|
/* SystemKernelDebuggerInformation needs only BOOLEAN alignment */
|
||||||
if (SystemInformation)
|
ProbeForWrite(SystemInformation, Length, 1);
|
||||||
ProbeForWrite(SystemInformation, Length, 1);
|
if (UnsafeResultLength != NULL)
|
||||||
if (UnsafeResultLength)
|
|
||||||
ProbeForWriteUlong(UnsafeResultLength);
|
ProbeForWriteUlong(UnsafeResultLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue