From fc017a90e2aa01d44541ed65bd7a0715cf3563b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 15 Aug 2015 16:34:21 +0000 Subject: [PATCH] [CSRSRV] - Don't use hardcoded structure types in sizeof's where possible. - Fix the parameters of NtSetInformationProcess calls in CsrSetBackground/ForegroundPriority. CORE-9911 svn path=/trunk/; revision=68715 --- reactos/subsystems/win32/csrsrv/procsup.c | 42 +++++++++++----------- reactos/subsystems/win32/csrsrv/session.c | 6 ++-- reactos/subsystems/win32/csrsrv/thredsup.c | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/reactos/subsystems/win32/csrsrv/procsup.c b/reactos/subsystems/win32/csrsrv/procsup.c index e2ae6ce0a47..2d88a6b11c4 100644 --- a/reactos/subsystems/win32/csrsrv/procsup.c +++ b/reactos/subsystems/win32/csrsrv/procsup.c @@ -57,7 +57,7 @@ CsrSetToNormalPriority(VOID) NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, &BasePriority, - sizeof(KPRIORITY)); + sizeof(BasePriority)); } /*++ @@ -79,7 +79,7 @@ VOID NTAPI CsrSetToShutdownPriority(VOID) { - KPRIORITY SetBasePriority = (8 + 1) + 6; + KPRIORITY BasePriority = (8 + 1) + 6; BOOLEAN Old; /* Get the shutdown privilege */ @@ -91,8 +91,8 @@ CsrSetToShutdownPriority(VOID) /* Set the Priority */ NtSetInformationProcess(NtCurrentProcess(), ProcessBasePriority, - &SetBasePriority, - sizeof(KPRIORITY)); + &BasePriority, + sizeof(BasePriority)); } } @@ -488,11 +488,11 @@ CsrCreateProcess(IN HANDLE hProcess, } } - /* Set the Exception port for us */ + /* Set the Exception Port for us */ Status = NtSetInformationProcess(hProcess, ProcessExceptionPort, &CsrApiPort, - sizeof(HANDLE)); + sizeof(CsrApiPort)); if (!NT_SUCCESS(Status)) { /* Failed */ @@ -549,7 +549,7 @@ CsrCreateProcess(IN HANDLE hProcess, Status = NtSetInformationProcess(hProcess, ProcessDebugPort, &CsrApiPort, - sizeof(HANDLE)); + sizeof(CsrApiPort)); ASSERT(NT_SUCCESS(Status)); if (!NT_SUCCESS(Status)) { @@ -563,7 +563,7 @@ CsrCreateProcess(IN HANDLE hProcess, /* Get the Thread Create Time */ Status = NtQueryInformationThread(hThread, ThreadTimes, - (PVOID)&KernelTimes, + &KernelTimes, sizeof(KernelTimes), NULL); if (!NT_SUCCESS(Status)) @@ -1072,7 +1072,7 @@ CsrRevertToSelf(VOID) Status = NtSetInformationThread(NtCurrentThread(), ThreadImpersonationToken, &ImpersonationToken, - sizeof(HANDLE)); + sizeof(ImpersonationToken)); /* Return TRUE or FALSE */ return NT_SUCCESS(Status); @@ -1097,16 +1097,16 @@ VOID NTAPI CsrSetBackgroundPriority(IN PCSR_PROCESS CsrProcess) { - PROCESS_PRIORITY_CLASS PriorityClass; + PROCESS_FOREGROUND_BACKGROUND ProcessPriority; /* Set the Foreground bit off */ - PriorityClass.Foreground = FALSE; + ProcessPriority.Foreground = FALSE; - /* Set the new Priority */ + /* Set the new priority */ NtSetInformationProcess(CsrProcess->ProcessHandle, - ProcessPriorityClass, - &PriorityClass, - sizeof(PriorityClass)); + ProcessForegroundInformation, + &ProcessPriority, + sizeof(ProcessPriority)); } /*++ @@ -1128,16 +1128,16 @@ VOID NTAPI CsrSetForegroundPriority(IN PCSR_PROCESS CsrProcess) { - PROCESS_PRIORITY_CLASS PriorityClass; + PROCESS_FOREGROUND_BACKGROUND ProcessPriority; /* Set the Foreground bit on */ - PriorityClass.Foreground = TRUE; + ProcessPriority.Foreground = TRUE; - /* Set the new Priority */ + /* Set the new priority */ NtSetInformationProcess(CsrProcess->ProcessHandle, - ProcessPriorityClass, - &PriorityClass, - sizeof(PriorityClass)); + ProcessForegroundInformation, + &ProcessPriority, + sizeof(ProcessPriority)); } /*++ diff --git a/reactos/subsystems/win32/csrsrv/session.c b/reactos/subsystems/win32/csrsrv/session.c index 20c7204f0fd..381bb16df6f 100644 --- a/reactos/subsystems/win32/csrsrv/session.c +++ b/reactos/subsystems/win32/csrsrv/session.c @@ -234,11 +234,11 @@ CsrSbCreateSession(IN PSB_API_MSG ApiMessage) return TRUE; } - /* Set the exception port */ + /* Set the Exception Port for us */ Status = NtSetInformationProcess(hProcess, ProcessExceptionPort, &CsrApiPort, - sizeof(HANDLE)); + sizeof(CsrApiPort)); /* Check for success */ if (!NT_SUCCESS(Status)) @@ -255,7 +255,7 @@ CsrSbCreateSession(IN PSB_API_MSG ApiMessage) Status = NtQueryInformationThread(hThread, ThreadTimes, &KernelTimes, - sizeof(KERNEL_USER_TIMES), + sizeof(KernelTimes), NULL); /* Check for success */ diff --git a/reactos/subsystems/win32/csrsrv/thredsup.c b/reactos/subsystems/win32/csrsrv/thredsup.c index b0cfac8314b..678a468812c 100644 --- a/reactos/subsystems/win32/csrsrv/thredsup.c +++ b/reactos/subsystems/win32/csrsrv/thredsup.c @@ -714,7 +714,7 @@ CsrCreateThread(IN PCSR_PROCESS CsrProcess, /* Get the Thread Create Time */ Status = NtQueryInformationThread(hThread, ThreadTimes, - (PVOID)&KernelTimes, + &KernelTimes, sizeof(KernelTimes), NULL); if (!NT_SUCCESS(Status))