mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed processhandle handling to new system

Browse Source
This commit is contained in:
Martin Haimberger 2014-12-02 00:08:10 -08:00
parent 128458d380
commit fa6d551676
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winpr/libwinpr/handle/handle.c
View File

@ -3,6 +3,7 @@
* Handle Management * Handle Management
* *
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com> * Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
* Copyright 2014 DI (FH) Martin Haimberger <martin.haimberger@thincast.com>
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -127,14 +128,7 @@ BOOL CloseHandle(HANDLE hObject)
LeaveCriticalSection(&_HandleCloseCbsLock); LeaveCriticalSection(&_HandleCloseCbsLock);
if (Type == HANDLE_TYPE_PROCESS) if (Type == HANDLE_TYPE_MUTEX)
{
WINPR_PROCESS* process;
process = (WINPR_PROCESS*) Object;
free(process);
return TRUE;
}
else if (Type == HANDLE_TYPE_MUTEX)
{ {
WINPR_MUTEX* mutex; WINPR_MUTEX* mutex;
mutex = (WINPR_MUTEX*) Object; mutex = (WINPR_MUTEX*) Object;

63
winpr/libwinpr/thread/process.c
View File

@ -80,6 +80,9 @@
#include "../handle/handle.h" #include "../handle/handle.h"
#include "../security/security.h" #include "../security/security.h"
static HANDLE_CLOSE_CB _ProcessHandleCloseCb;
static pthread_once_t process_initialized = PTHREAD_ONCE_INIT;
char** EnvironmentBlockToEnvpA(LPCH lpszEnvironmentBlock) char** EnvironmentBlockToEnvpA(LPCH lpszEnvironmentBlock)
{ {
char* p; char* p;
@ -174,6 +177,8 @@ char* FindApplicationPath(char* application)
return filename; return filename;
} }
HANDLE CreateProcessHandle(pid_t pid);
BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags, BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags,
LPCSTR lpApplicationName, LPSTR lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPCSTR lpApplicationName, LPSTR lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes,
LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment,
@ -186,7 +191,7 @@ BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags,
char** envp = NULL; char** envp = NULL;
char* filename = NULL; char* filename = NULL;
HANDLE thread; HANDLE thread;
WINPR_PROCESS* process; HANDLE process;
WINPR_ACCESS_TOKEN* token; WINPR_ACCESS_TOKEN* token;
LPTCH lpszEnvironmentBlock; LPTCH lpszEnvironmentBlock;
BOOL ret = FALSE; BOOL ret = FALSE;
@ -275,21 +280,13 @@ BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags,
/* parent process */ /* parent process */
} }
process = (WINPR_PROCESS*) malloc(sizeof(WINPR_PROCESS)); process = CreateProcessHandle(pid);
if (!process) if (!process)
{ {
goto finish; goto finish;
} }
ZeroMemory(process, sizeof(WINPR_PROCESS));
WINPR_HANDLE_SET_TYPE(process, HANDLE_TYPE_PROCESS);
process->pid = pid;
process->status = 0;
process->dwExitCode = 0;
thread = CreateNoneHandle(); thread = CreateNoneHandle();
if (!thread) if (!thread)
@ -297,7 +294,7 @@ BOOL _CreateProcessExA(HANDLE hToken, DWORD dwLogonFlags,
goto finish; goto finish;
} }
lpProcessInformation->hProcess = (HANDLE) process; lpProcessInformation->hProcess = process;
lpProcessInformation->hThread = thread; lpProcessInformation->hThread = thread;
lpProcessInformation->dwProcessId = (DWORD) pid; lpProcessInformation->dwProcessId = (DWORD) pid;
lpProcessInformation->dwThreadId = (DWORD) pid; lpProcessInformation->dwThreadId = (DWORD) pid;
@ -458,5 +455,49 @@ BOOL TerminateProcess(HANDLE hProcess, UINT uExitCode)
return TRUE; return TRUE;
} }
static BOOL ProcessHandleCloseHandle(HANDLE handle)
{
WINPR_PROCESS* process = (WINPR_PROCESS*) handle;
free(process);
return TRUE;
}
static BOOL ProcessHandleIsHandle(HANDLE handle)
{
WINPR_PROCESS* process = (WINPR_PROCESS*) handle;
if (!process || process->Type != HANDLE_TYPE_PROCESS)
{
SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
return TRUE;
}
static void ProcessHandleInitialize(void)
{
_ProcessHandleCloseCb.IsHandled = ProcessHandleIsHandle;
_ProcessHandleCloseCb.CloseHandle = ProcessHandleCloseHandle;
RegisterHandleCloseCb(&_ProcessHandleCloseCb);
}
HANDLE CreateProcessHandle(pid_t pid)
{
WINPR_PROCESS* process;
process = (WINPR_PROCESS*) calloc(1, sizeof(WINPR_PROCESS));
if (!process)
return NULL;
pthread_once(&process_initialized, ProcessHandleInitialize);
process->pid = pid;
process->Type = HANDLE_TYPE_PROCESS;
return (HANDLE)process;
}
#endif #endif