From 60742b0408532030778fa6afd32ee89b0267dda2 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 14 Feb 1999 17:51:01 +0000 Subject: [PATCH] Removed PROCESS_GetPtr. --- include/process.h | 1 - scheduler/handle.c | 6 ++++-- scheduler/process.c | 11 ----------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/include/process.h b/include/process.h index 7454fae4583..f24e8d79048 100644 --- a/include/process.h +++ b/include/process.h @@ -153,7 +153,6 @@ extern BOOL32 PROCESS_Init( void ); extern PDB32 *PROCESS_Current(void); extern BOOL32 PROCESS_IsCurrent( HANDLE32 handle ); extern PDB32 *PROCESS_Initial(void); -extern PDB32 *PROCESS_GetPtr( HANDLE32 handle, DWORD access, int *server_handle ); extern PDB32 *PROCESS_IdToPDB( DWORD id ); extern PDB32 *PROCESS_Create( struct _NE_MODULE *pModule, LPCSTR cmd_line, LPCSTR env, HINSTANCE16 hInstance, diff --git a/scheduler/handle.c b/scheduler/handle.c index 7e58820958f..d8289843bd1 100644 --- a/scheduler/handle.c +++ b/scheduler/handle.c @@ -374,7 +374,8 @@ BOOL32 WINAPI DuplicateHandle( HANDLE32 source_process, HANDLE32 source, SYSTEM_LOCK(); - if (!(src_pdb = PROCESS_GetPtr( source_process, PROCESS_DUP_HANDLE, &src_process ))) + if (!(src_pdb = (PDB32 *)HANDLE_GetObjPtr( PROCESS_Current(), source_process, + K32OBJ_PROCESS, PROCESS_DUP_HANDLE, &src_process ))) goto done; if (!(obj = HANDLE_GetObjPtr( src_pdb, source, K32OBJ_UNKNOWN, 0, &src_handle ))) goto done; @@ -388,7 +389,8 @@ BOOL32 WINAPI DuplicateHandle( HANDLE32 source_process, HANDLE32 source, /* And duplicate the handle in the dest process */ - if (!(dst_pdb = PROCESS_GetPtr( dest_process, PROCESS_DUP_HANDLE, &dst_process ))) + if (!(dst_pdb = (PDB32 *)HANDLE_GetObjPtr( PROCESS_Current(), dest_process, + K32OBJ_PROCESS, PROCESS_DUP_HANDLE, &dst_process ))) goto done; if ((src_process != -1) && (src_handle != -1) && (dst_process != -1)) diff --git a/scheduler/process.c b/scheduler/process.c index 41736ddecd9..10ddce3ce0f 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -55,17 +55,6 @@ PDB32 *PROCESS_Initial(void) return PROCESS_IdToPDB( PROCESS_InitialProcessID ); } -/*********************************************************************** - * PROCESS_GetPtr - * - * Get a process from a handle, incrementing the PDB refcount. - */ -PDB32 *PROCESS_GetPtr( HANDLE32 handle, DWORD access, int *server_handle ) -{ - return (PDB32 *)HANDLE_GetObjPtr( PROCESS_Current(), handle, - K32OBJ_PROCESS, access, server_handle ); -} - /*********************************************************************** * PROCESS_QueryInfo *