generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 17:30:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pocoproject/poco into develop

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2013-06-03 23:46:34 -05:00
parent 60e5aa1a98 37a7c3bca7
commit b2d72dcacb
15 changed files with 73 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Foundation/src/Process.cpp
View File

@@ -200,7 +200,7 @@ int Process::wait(const ProcessHandle& handle)
}
void Process::kill(const ProcessHandle& handle)
void Process::kill(ProcessHandle& handle)
{
killImpl(*handle._pImpl);
}

2
Foundation/src/Process_UNIX.cpp
View File

@@ -218,7 +218,7 @@ ProcessHandleImpl* ProcessImpl::launchByForkExecImpl(const std::string& command,
}
void ProcessImpl::killImpl(const ProcessHandleImpl& handle)
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
killImpl(handle.id());
}

2
Foundation/src/Process_VMS.cpp
View File

@@ -137,7 +137,7 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
}
void ProcessImpl::killImpl(const ProcessHandleImpl& handle)
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
killImpl(handle.id());
}

2
Foundation/src/Process_VX.cpp
View File

@@ -89,7 +89,7 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
}
void ProcessImpl::killImpl(const ProcessHandleImpl& handle)
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
throw Poco::NotImplementedException("Process::kill()");
}

24
Foundation/src/Process_WIN32.cpp
View File

@@ -56,9 +56,17 @@ ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid):
ProcessHandleImpl::~ProcessHandleImpl()
{
CloseHandle(_hProcess);
closeHandle();
}
void ProcessHandleImpl::closeHandle()
{
if (_hProcess)
{
CloseHandle(_hProcess);
_hProcess = NULL;
}
}
UInt32 ProcessHandleImpl::id() const
{
@@ -228,17 +236,19 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
}
void ProcessImpl::killImpl(const ProcessHandleImpl& handle)
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
if (TerminateProcess(handle.process(), 0) == 0)
if (handle.process())
{
CloseHandle(handle.process());
throw SystemException("cannot kill process");
if (TerminateProcess(handle.process(), 0) == 0)
{
handle.closeHandle();
throw SystemException("cannot kill process");
}
handle.closeHandle();
}
CloseHandle(handle.process());
}
void ProcessImpl::killImpl(PIDImpl pid)
{
HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, pid);

24
Foundation/src/Process_WIN32U.cpp
View File

@@ -57,9 +57,17 @@ ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid):
ProcessHandleImpl::~ProcessHandleImpl()
{
CloseHandle(_hProcess);
closeHandle();
}
void ProcessHandleImpl::closeHandle()
{
if (_hProcess)
{
CloseHandle(_hProcess);
_hProcess = NULL;
}
}
UInt32 ProcessHandleImpl::id() const
{
@@ -234,17 +242,19 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
}
void ProcessImpl::killImpl(const ProcessHandleImpl& handle)
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
if (TerminateProcess(handle.process(), 0) == 0)
if (handle.process())
{
CloseHandle(handle.process());
throw SystemException("cannot kill process");
if (TerminateProcess(handle.process(), 0) == 0)
{
handle.closeHandle();
throw SystemException("cannot kill process");
}
handle.closeHandle();
}
CloseHandle(handle.process());
}
void ProcessImpl::killImpl(PIDImpl pid)
{
HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, pid);

23
Foundation/src/Process_WINCE.cpp
View File

@@ -57,9 +57,17 @@ ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid):
ProcessHandleImpl::~ProcessHandleImpl()
{
CloseHandle(_hProcess);
closeHandle();
}
void ProcessHandleImpl::closeHandle()
{
if (_hProcess)
{
CloseHandle(_hProcess);
_hProcess = NULL;
}
}
UInt32 ProcessHandleImpl::id() const
{
@@ -158,14 +166,17 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg
}
void ProcessImpl::killImpl(const ProcessHandleImpl& handle)
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
if (TerminateProcess(handle.process(), 0) == 0)
if (handle.process())
{
CloseHandle(handle.process());
throw SystemException("cannot kill process");
if (TerminateProcess(handle.process(), 0) == 0)
{
handle.closeHandle();
throw SystemException("cannot kill process");
}
handle.closeHandle();
}
CloseHandle(handle.process());
}