From c8e6164e8c24fdf27d21fa8b9307e265cbb0a4fc Mon Sep 17 00:00:00 2001 From: James Tabor Date: Wed, 2 Mar 2005 07:11:26 +0000 Subject: [PATCH] Clean up. svn path=/trunk/; revision=13795 --- reactos/ntoskrnl/ex/sysinfo.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/reactos/ntoskrnl/ex/sysinfo.c b/reactos/ntoskrnl/ex/sysinfo.c index eb50a36487b..bf4c528484f 100644 --- a/reactos/ntoskrnl/ex/sysinfo.c +++ b/reactos/ntoskrnl/ex/sysinfo.c @@ -820,7 +820,6 @@ ObpGetNextHandleByProcessCount(PSYSTEM_HANDLE_TABLE_ENTRY_INFO pshi, /* Class 16 - Handle Information */ QSI_DEF(SystemHandleInformation) { - PSYSTEM_HANDLE_INFORMATION Shi = (PSYSTEM_HANDLE_INFORMATION) Buffer; @@ -845,35 +844,31 @@ QSI_DEF(SystemHandleInformation) do { hCount = hCount + ObpGetHandleCountByHandleTable(&pr->HandleTable); - - curSize = sizeof(SYSTEM_HANDLE_INFORMATION)+ - ( (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - - (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) )); - - Shi->NumberOfHandles = hCount; - - if (curSize > Size) - { - DPRINT1("SystemHandleInformation 2\n"); - *ReqSize = curSize; - if (pr != NULL) - { - ObDereferenceObject(pr); - } - return (STATUS_INFO_LENGTH_MISMATCH); - } - - pr = PsGetNextProcess(pr); + pr = PsGetNextProcess(pr); if ((pr == syspr) || (pr == NULL)) break; } while ((pr != syspr) && (pr != NULL)); + DPRINT("SystemHandleInformation 2\n"); + if (pr != NULL) { ObDereferenceObject(pr); } + curSize = sizeof(SYSTEM_HANDLE_INFORMATION)+ + ( (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) * hCount) - + (sizeof(SYSTEM_HANDLE_TABLE_ENTRY_INFO) )); + + Shi->NumberOfHandles = hCount; + + if (curSize > Size) + { + *ReqSize = curSize; + return (STATUS_INFO_LENGTH_MISMATCH); + } + DPRINT("SystemHandleInformation 3\n"); /* Now get Handles from all processs. */