Use ASSERT() instead of assert().

[reactos.git] / reactos / lib / kernel32 / process / proc.c

diff --git a/reactos/lib/kernel32/process/proc.c b/reactos/lib/kernel32/process/proc.c
index 900b326..7cc029c 100644 (file)
--- a/reactos/lib/kernel32/process/proc.c
+++ b/reactos/lib/kernel32/process/proc.c
@@ -1,4 +1,4 @@
-/* $Id: proc.c,v 1.68 2004/09/23 19:01:38 weiden Exp $
+/* $Id: proc.c,v 1.72 2004/11/05 12:26:55 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -26,10 +26,6 @@ LPSTARTUPINFOA lpLocalStartupInfo = NULL;
 VOID STDCALL
 RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle);
 
-BOOL STDCALL
-InternalGetProcessId (HANDLE hProcess, LPDWORD lpProcessId);
-
-
 /* FUNCTIONS ****************************************************************/
 
 /*
@@ -41,14 +37,13 @@ GetProcessAffinityMask (HANDLE hProcess,
                        LPDWORD lpSystemAffinityMask)
 {
   PROCESS_BASIC_INFORMATION ProcessInfo;
-  ULONG BytesWritten;
   NTSTATUS Status;
 
   Status = NtQueryInformationProcess (hProcess,
                                      ProcessBasicInformation,
                                      (PVOID)&ProcessInfo,
                                      sizeof(PROCESS_BASIC_INFORMATION),
-                                     &BytesWritten);
+                                     NULL);
   if (!NT_SUCCESS(Status))
     {
       SetLastErrorByStatus (Status);
@@ -280,14 +275,13 @@ GetExitCodeProcess(HANDLE hProcess,
                   LPDWORD lpExitCode)
 {
   PROCESS_BASIC_INFORMATION ProcessBasic;
-  ULONG BytesWritten;
   NTSTATUS Status;
 
   Status = NtQueryInformationProcess(hProcess,
                                     ProcessBasicInformation,
                                     &ProcessBasic,
                                     sizeof(PROCESS_BASIC_INFORMATION),
-                                    &BytesWritten);
+                                    NULL);
   if (!NT_SUCCESS(Status))
     {
       SetLastErrorByStatus(Status);
@@ -303,45 +297,25 @@ GetExitCodeProcess(HANDLE hProcess,
 /*
  * @implemented
  */
-BOOL STDCALL
-InternalGetProcessId(HANDLE hProcess,
-            LPDWORD lpProcessId)
+DWORD
+STDCALL
+GetProcessId(HANDLE Process)
 {
   PROCESS_BASIC_INFORMATION ProcessBasic;
-  ULONG BytesWritten;
   NTSTATUS Status;
 
-  Status = NtQueryInformationProcess(hProcess,
+  Status = NtQueryInformationProcess(Process,
                                     ProcessBasicInformation,
                                     &ProcessBasic,
                                     sizeof(PROCESS_BASIC_INFORMATION),
-                                    &BytesWritten);
+                                    NULL);
   if (!NT_SUCCESS(Status))
-    {
-      SetLastErrorByStatus(Status);
-      return(FALSE);
-    }
-
-  memcpy(lpProcessId, &ProcessBasic.UniqueProcessId, sizeof(DWORD));
-
-  return(TRUE);
-}
-
-
-/*
- * @implemented
- */
-DWORD
-STDCALL
-GetProcessId(HANDLE Process)
-{
-  DWORD ProcessId;
-  
-  if(!InternalGetProcessId(Process, &ProcessId))
   {
+    SetLastErrorByStatus(Status);
     return 0;
   }
-  return ProcessId;
+
+  return ProcessBasic.UniqueProcessId;
 }
 
 
@@ -356,7 +330,7 @@ OpenProcess(DWORD dwDesiredAccess,
    NTSTATUS errCode;
    HANDLE ProcessHandle;
    OBJECT_ATTRIBUTES ObjectAttributes;
-   CLIENT_ID ClientId ;
+   CLIENT_ID ClientId;
    
    ClientId.UniqueProcess = (HANDLE)dwProcessId;
    ClientId.UniqueThread = INVALID_HANDLE_VALUE;
@@ -661,7 +635,7 @@ ExitProcess(UINT uExitCode)
                      uExitCode);
 
   /* should never get here */
-  assert(0);
+  ASSERT(0);
   while(1);
 }
 
@@ -949,14 +923,14 @@ STDCALL
 GetProcessHandleCount(HANDLE hProcess,
                       PDWORD pdwHandleCount)
 {
-    ULONG phc, BytesWritten;
+    ULONG phc;
     NTSTATUS Status;
 
     Status = NtQueryInformationProcess(hProcess,
                                        ProcessHandleCount,
                                        &phc,
                                        sizeof(ULONG),
-                                       &BytesWritten);
+                                       NULL);
     if(NT_SUCCESS(Status))
     {
       *pdwHandleCount = phc;