mirror of
https://github.com/python/cpython.git
synced 2025-11-01 10:45:30 +00:00
Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines Untabify C files. Will watch buildbots. ........
This commit is contained in:
Antoine Pitrou
parent
bd25030019
commit
f95a1b3c53
248 changed files with 113361 additions and 113361 deletions
730
PC/_subprocess.c
730
PC/_subprocess.c
|
|
@ -46,8 +46,8 @@
|
|||
the wrapper is used to provide Detach and Close methods */
|
||||
|
||||
typedef struct {
|
||||
PyObject_HEAD
|
||||
HANDLE handle;
|
||||
PyObject_HEAD
|
||||
HANDLE handle;
|
||||
} sp_handle_object;
|
||||
|
||||
static PyTypeObject sp_handle_type;
|
||||
|
|
@ -55,104 +55,104 @@ static PyTypeObject sp_handle_type;
|
|||
static PyObject*
|
||||
sp_handle_new(HANDLE handle)
|
||||
{
|
||||
sp_handle_object* self;
|
||||
sp_handle_object* self;
|
||||
|
||||
self = PyObject_NEW(sp_handle_object, &sp_handle_type);
|
||||
if (self == NULL)
|
||||
return NULL;
|
||||
self = PyObject_NEW(sp_handle_object, &sp_handle_type);
|
||||
if (self == NULL)
|
||||
return NULL;
|
||||
|
||||
self->handle = handle;
|
||||
self->handle = handle;
|
||||
|
||||
return (PyObject*) self;
|
||||
return (PyObject*) self;
|
||||
}
|
||||
|
||||
#if defined(MS_WIN32) && !defined(MS_WIN64)
|
||||
#define HANDLE_TO_PYNUM(handle) PyLong_FromLong((long) handle)
|
||||
#define PY_HANDLE_PARAM "l"
|
||||
#define HANDLE_TO_PYNUM(handle) PyLong_FromLong((long) handle)
|
||||
#define PY_HANDLE_PARAM "l"
|
||||
#else
|
||||
#define HANDLE_TO_PYNUM(handle) PyLong_FromLongLong((long long) handle)
|
||||
#define PY_HANDLE_PARAM "L"
|
||||
#define HANDLE_TO_PYNUM(handle) PyLong_FromLongLong((long long) handle)
|
||||
#define PY_HANDLE_PARAM "L"
|
||||
#endif
|
||||
|
||||
static PyObject*
|
||||
sp_handle_detach(sp_handle_object* self, PyObject* args)
|
||||
{
|
||||
HANDLE handle;
|
||||
HANDLE handle;
|
||||
|
||||
if (! PyArg_ParseTuple(args, ":Detach"))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, ":Detach"))
|
||||
return NULL;
|
||||
|
||||
handle = self->handle;
|
||||
handle = self->handle;
|
||||
|
||||
self->handle = INVALID_HANDLE_VALUE;
|
||||
self->handle = INVALID_HANDLE_VALUE;
|
||||
|
||||
/* note: return the current handle, as an integer */
|
||||
return HANDLE_TO_PYNUM(handle);
|
||||
/* note: return the current handle, as an integer */
|
||||
return HANDLE_TO_PYNUM(handle);
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
sp_handle_close(sp_handle_object* self, PyObject* args)
|
||||
{
|
||||
if (! PyArg_ParseTuple(args, ":Close"))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, ":Close"))
|
||||
return NULL;
|
||||
|
||||
if (self->handle != INVALID_HANDLE_VALUE) {
|
||||
CloseHandle(self->handle);
|
||||
self->handle = INVALID_HANDLE_VALUE;
|
||||
}
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
if (self->handle != INVALID_HANDLE_VALUE) {
|
||||
CloseHandle(self->handle);
|
||||
self->handle = INVALID_HANDLE_VALUE;
|
||||
}
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
|
||||
static void
|
||||
sp_handle_dealloc(sp_handle_object* self)
|
||||
{
|
||||
if (self->handle != INVALID_HANDLE_VALUE)
|
||||
CloseHandle(self->handle);
|
||||
PyObject_FREE(self);
|
||||
if (self->handle != INVALID_HANDLE_VALUE)
|
||||
CloseHandle(self->handle);
|
||||
PyObject_FREE(self);
|
||||
}
|
||||
|
||||
static PyMethodDef sp_handle_methods[] = {
|
||||
{"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS},
|
||||
{"Close", (PyCFunction) sp_handle_close, METH_VARARGS},
|
||||
{NULL, NULL}
|
||||
{"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS},
|
||||
{"Close", (PyCFunction) sp_handle_close, METH_VARARGS},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
static PyObject*
|
||||
sp_handle_as_int(sp_handle_object* self)
|
||||
{
|
||||
return HANDLE_TO_PYNUM(self->handle);
|
||||
return HANDLE_TO_PYNUM(self->handle);
|
||||
}
|
||||
|
||||
static PyNumberMethods sp_handle_as_number;
|
||||
|
||||
static PyTypeObject sp_handle_type = {
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"_subprocess_handle", sizeof(sp_handle_object), 0,
|
||||
(destructor) sp_handle_dealloc, /*tp_dealloc*/
|
||||
0, /*tp_print*/
|
||||
0, /*tp_getattr*/
|
||||
0, /*tp_setattr*/
|
||||
0, /*tp_reserved*/
|
||||
0, /*tp_repr*/
|
||||
&sp_handle_as_number, /*tp_as_number */
|
||||
0, /*tp_as_sequence */
|
||||
0, /*tp_as_mapping */
|
||||
0, /*tp_hash*/
|
||||
0, /*tp_call*/
|
||||
0, /*tp_str*/
|
||||
0, /*tp_getattro*/
|
||||
0, /*tp_setattro*/
|
||||
0, /*tp_as_buffer*/
|
||||
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
||||
0, /*tp_doc*/
|
||||
0, /*tp_traverse*/
|
||||
0, /*tp_clear*/
|
||||
0, /*tp_richcompare*/
|
||||
0, /*tp_weaklistoffset*/
|
||||
0, /*tp_iter*/
|
||||
0, /*tp_iternext*/
|
||||
sp_handle_methods, /*tp_methods*/
|
||||
PyVarObject_HEAD_INIT(NULL, 0)
|
||||
"_subprocess_handle", sizeof(sp_handle_object), 0,
|
||||
(destructor) sp_handle_dealloc, /*tp_dealloc*/
|
||||
0, /*tp_print*/
|
||||
0, /*tp_getattr*/
|
||||
0, /*tp_setattr*/
|
||||
0, /*tp_reserved*/
|
||||
0, /*tp_repr*/
|
||||
&sp_handle_as_number, /*tp_as_number */
|
||||
0, /*tp_as_sequence */
|
||||
0, /*tp_as_mapping */
|
||||
0, /*tp_hash*/
|
||||
0, /*tp_call*/
|
||||
0, /*tp_str*/
|
||||
0, /*tp_getattro*/
|
||||
0, /*tp_setattro*/
|
||||
0, /*tp_as_buffer*/
|
||||
Py_TPFLAGS_DEFAULT, /*tp_flags*/
|
||||
0, /*tp_doc*/
|
||||
0, /*tp_traverse*/
|
||||
0, /*tp_clear*/
|
||||
0, /*tp_richcompare*/
|
||||
0, /*tp_weaklistoffset*/
|
||||
0, /*tp_iter*/
|
||||
0, /*tp_iternext*/
|
||||
sp_handle_methods, /*tp_methods*/
|
||||
};
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
@ -168,26 +168,26 @@ The integer associated with the handle object is returned.");
|
|||
static PyObject *
|
||||
sp_GetStdHandle(PyObject* self, PyObject* args)
|
||||
{
|
||||
HANDLE handle;
|
||||
int std_handle;
|
||||
HANDLE handle;
|
||||
int std_handle;
|
||||
|
||||
if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle))
|
||||
return NULL;
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
handle = GetStdHandle((DWORD) std_handle);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
handle = GetStdHandle((DWORD) std_handle);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (handle == INVALID_HANDLE_VALUE)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (handle == INVALID_HANDLE_VALUE)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
if (! handle) {
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
if (! handle) {
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
|
||||
/* note: returns integer, not handle object */
|
||||
return HANDLE_TO_PYNUM(handle);
|
||||
/* note: returns integer, not handle object */
|
||||
return HANDLE_TO_PYNUM(handle);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(GetCurrentProcess_doc,
|
||||
|
|
@ -198,10 +198,10 @@ Return a handle object for the current process.");
|
|||
static PyObject *
|
||||
sp_GetCurrentProcess(PyObject* self, PyObject* args)
|
||||
{
|
||||
if (! PyArg_ParseTuple(args, ":GetCurrentProcess"))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, ":GetCurrentProcess"))
|
||||
return NULL;
|
||||
|
||||
return sp_handle_new(GetCurrentProcess());
|
||||
return sp_handle_new(GetCurrentProcess());
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(DuplicateHandle_doc,
|
||||
|
|
@ -218,43 +218,43 @@ through both handles.");
|
|||
static PyObject *
|
||||
sp_DuplicateHandle(PyObject* self, PyObject* args)
|
||||
{
|
||||
HANDLE target_handle;
|
||||
BOOL result;
|
||||
HANDLE target_handle;
|
||||
BOOL result;
|
||||
|
||||
HANDLE source_process_handle;
|
||||
HANDLE source_handle;
|
||||
HANDLE target_process_handle;
|
||||
int desired_access;
|
||||
int inherit_handle;
|
||||
int options = 0;
|
||||
HANDLE source_process_handle;
|
||||
HANDLE source_handle;
|
||||
HANDLE target_process_handle;
|
||||
int desired_access;
|
||||
int inherit_handle;
|
||||
int options = 0;
|
||||
|
||||
if (! PyArg_ParseTuple(args,
|
||||
PY_HANDLE_PARAM PY_HANDLE_PARAM PY_HANDLE_PARAM
|
||||
"ii|i:DuplicateHandle",
|
||||
&source_process_handle,
|
||||
&source_handle,
|
||||
&target_process_handle,
|
||||
&desired_access,
|
||||
&inherit_handle,
|
||||
&options))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args,
|
||||
PY_HANDLE_PARAM PY_HANDLE_PARAM PY_HANDLE_PARAM
|
||||
"ii|i:DuplicateHandle",
|
||||
&source_process_handle,
|
||||
&source_handle,
|
||||
&target_process_handle,
|
||||
&desired_access,
|
||||
&inherit_handle,
|
||||
&options))
|
||||
return NULL;
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = DuplicateHandle(
|
||||
source_process_handle,
|
||||
source_handle,
|
||||
target_process_handle,
|
||||
&target_handle,
|
||||
desired_access,
|
||||
inherit_handle,
|
||||
options
|
||||
);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = DuplicateHandle(
|
||||
source_process_handle,
|
||||
source_handle,
|
||||
target_process_handle,
|
||||
&target_handle,
|
||||
desired_access,
|
||||
inherit_handle,
|
||||
options
|
||||
);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
return sp_handle_new(target_handle);
|
||||
return sp_handle_new(target_handle);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(CreatePipe_doc,
|
||||
|
|
@ -268,25 +268,25 @@ pipe_attrs is ignored internally and can be None.");
|
|||
static PyObject *
|
||||
sp_CreatePipe(PyObject* self, PyObject* args)
|
||||
{
|
||||
HANDLE read_pipe;
|
||||
HANDLE write_pipe;
|
||||
BOOL result;
|
||||
HANDLE read_pipe;
|
||||
HANDLE write_pipe;
|
||||
BOOL result;
|
||||
|
||||
PyObject* pipe_attributes; /* ignored */
|
||||
int size;
|
||||
PyObject* pipe_attributes; /* ignored */
|
||||
int size;
|
||||
|
||||
if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size))
|
||||
return NULL;
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = CreatePipe(&read_pipe, &write_pipe, NULL, size);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = CreatePipe(&read_pipe, &write_pipe, NULL, size);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
return Py_BuildValue(
|
||||
"NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe));
|
||||
return Py_BuildValue(
|
||||
"NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe));
|
||||
}
|
||||
|
||||
/* helpers for createprocess */
|
||||
|
|
@ -294,110 +294,110 @@ sp_CreatePipe(PyObject* self, PyObject* args)
|
|||
static int
|
||||
getint(PyObject* obj, char* name)
|
||||
{
|
||||
PyObject* value;
|
||||
int ret;
|
||||
PyObject* value;
|
||||
int ret;
|
||||
|
||||
value = PyObject_GetAttrString(obj, name);
|
||||
if (! value) {
|
||||
PyErr_Clear(); /* FIXME: propagate error? */
|
||||
return 0;
|
||||
}
|
||||
ret = (int) PyLong_AsLong(value);
|
||||
Py_DECREF(value);
|
||||
return ret;
|
||||
value = PyObject_GetAttrString(obj, name);
|
||||
if (! value) {
|
||||
PyErr_Clear(); /* FIXME: propagate error? */
|
||||
return 0;
|
||||
}
|
||||
ret = (int) PyLong_AsLong(value);
|
||||
Py_DECREF(value);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static HANDLE
|
||||
gethandle(PyObject* obj, char* name)
|
||||
{
|
||||
sp_handle_object* value;
|
||||
HANDLE ret;
|
||||
sp_handle_object* value;
|
||||
HANDLE ret;
|
||||
|
||||
value = (sp_handle_object*) PyObject_GetAttrString(obj, name);
|
||||
if (! value) {
|
||||
PyErr_Clear(); /* FIXME: propagate error? */
|
||||
return NULL;
|
||||
}
|
||||
if (Py_TYPE(value) != &sp_handle_type)
|
||||
ret = NULL;
|
||||
else
|
||||
ret = value->handle;
|
||||
Py_DECREF(value);
|
||||
return ret;
|
||||
value = (sp_handle_object*) PyObject_GetAttrString(obj, name);
|
||||
if (! value) {
|
||||
PyErr_Clear(); /* FIXME: propagate error? */
|
||||
return NULL;
|
||||
}
|
||||
if (Py_TYPE(value) != &sp_handle_type)
|
||||
ret = NULL;
|
||||
else
|
||||
ret = value->handle;
|
||||
Py_DECREF(value);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static PyObject*
|
||||
getenvironment(PyObject* environment)
|
||||
{
|
||||
int i, envsize;
|
||||
PyObject* out = NULL;
|
||||
PyObject* keys;
|
||||
PyObject* values;
|
||||
Py_UNICODE* p;
|
||||
int i, envsize;
|
||||
PyObject* out = NULL;
|
||||
PyObject* keys;
|
||||
PyObject* values;
|
||||
Py_UNICODE* p;
|
||||
|
||||
/* convert environment dictionary to windows enviroment string */
|
||||
if (! PyMapping_Check(environment)) {
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError, "environment must be dictionary or None");
|
||||
return NULL;
|
||||
}
|
||||
/* convert environment dictionary to windows enviroment string */
|
||||
if (! PyMapping_Check(environment)) {
|
||||
PyErr_SetString(
|
||||
PyExc_TypeError, "environment must be dictionary or None");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
envsize = PyMapping_Length(environment);
|
||||
envsize = PyMapping_Length(environment);
|
||||
|
||||
keys = PyMapping_Keys(environment);
|
||||
values = PyMapping_Values(environment);
|
||||
if (!keys || !values)
|
||||
goto error;
|
||||
keys = PyMapping_Keys(environment);
|
||||
values = PyMapping_Values(environment);
|
||||
if (!keys || !values)
|
||||
goto error;
|
||||
|
||||
out = PyUnicode_FromUnicode(NULL, 2048);
|
||||
if (! out)
|
||||
goto error;
|
||||
out = PyUnicode_FromUnicode(NULL, 2048);
|
||||
if (! out)
|
||||
goto error;
|
||||
|
||||
p = PyUnicode_AS_UNICODE(out);
|
||||
p = PyUnicode_AS_UNICODE(out);
|
||||
|
||||
for (i = 0; i < envsize; i++) {
|
||||
int ksize, vsize, totalsize;
|
||||
PyObject* key = PyList_GET_ITEM(keys, i);
|
||||
PyObject* value = PyList_GET_ITEM(values, i);
|
||||
for (i = 0; i < envsize; i++) {
|
||||
int ksize, vsize, totalsize;
|
||||
PyObject* key = PyList_GET_ITEM(keys, i);
|
||||
PyObject* value = PyList_GET_ITEM(values, i);
|
||||
|
||||
if (! PyUnicode_Check(key) || ! PyUnicode_Check(value)) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"environment can only contain strings");
|
||||
goto error;
|
||||
}
|
||||
ksize = PyUnicode_GET_SIZE(key);
|
||||
vsize = PyUnicode_GET_SIZE(value);
|
||||
totalsize = (p - PyUnicode_AS_UNICODE(out)) + ksize + 1 +
|
||||
vsize + 1 + 1;
|
||||
if (totalsize > PyUnicode_GET_SIZE(out)) {
|
||||
int offset = p - PyUnicode_AS_UNICODE(out);
|
||||
PyUnicode_Resize(&out, totalsize + 1024);
|
||||
p = PyUnicode_AS_UNICODE(out) + offset;
|
||||
}
|
||||
Py_UNICODE_COPY(p, PyUnicode_AS_UNICODE(key), ksize);
|
||||
p += ksize;
|
||||
*p++ = '=';
|
||||
Py_UNICODE_COPY(p, PyUnicode_AS_UNICODE(value), vsize);
|
||||
p += vsize;
|
||||
*p++ = '\0';
|
||||
}
|
||||
if (! PyUnicode_Check(key) || ! PyUnicode_Check(value)) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"environment can only contain strings");
|
||||
goto error;
|
||||
}
|
||||
ksize = PyUnicode_GET_SIZE(key);
|
||||
vsize = PyUnicode_GET_SIZE(value);
|
||||
totalsize = (p - PyUnicode_AS_UNICODE(out)) + ksize + 1 +
|
||||
vsize + 1 + 1;
|
||||
if (totalsize > PyUnicode_GET_SIZE(out)) {
|
||||
int offset = p - PyUnicode_AS_UNICODE(out);
|
||||
PyUnicode_Resize(&out, totalsize + 1024);
|
||||
p = PyUnicode_AS_UNICODE(out) + offset;
|
||||
}
|
||||
Py_UNICODE_COPY(p, PyUnicode_AS_UNICODE(key), ksize);
|
||||
p += ksize;
|
||||
*p++ = '=';
|
||||
Py_UNICODE_COPY(p, PyUnicode_AS_UNICODE(value), vsize);
|
||||
p += vsize;
|
||||
*p++ = '\0';
|
||||
}
|
||||
|
||||
/* add trailing null byte */
|
||||
*p++ = '\0';
|
||||
PyUnicode_Resize(&out, p - PyUnicode_AS_UNICODE(out));
|
||||
/* add trailing null byte */
|
||||
*p++ = '\0';
|
||||
PyUnicode_Resize(&out, p - PyUnicode_AS_UNICODE(out));
|
||||
|
||||
/* PyObject_Print(out, stdout, 0); */
|
||||
/* PyObject_Print(out, stdout, 0); */
|
||||
|
||||
Py_XDECREF(keys);
|
||||
Py_XDECREF(values);
|
||||
Py_XDECREF(keys);
|
||||
Py_XDECREF(values);
|
||||
|
||||
return out;
|
||||
return out;
|
||||
|
||||
error:
|
||||
Py_XDECREF(out);
|
||||
Py_XDECREF(keys);
|
||||
Py_XDECREF(values);
|
||||
return NULL;
|
||||
Py_XDECREF(out);
|
||||
Py_XDECREF(keys);
|
||||
Py_XDECREF(values);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(CreateProcess_doc,
|
||||
|
|
@ -415,77 +415,77 @@ proc_attrs and thread_attrs are ignored internally and can be None.");
|
|||
static PyObject *
|
||||
sp_CreateProcess(PyObject* self, PyObject* args)
|
||||
{
|
||||
BOOL result;
|
||||
PROCESS_INFORMATION pi;
|
||||
STARTUPINFOW si;
|
||||
PyObject* environment;
|
||||
BOOL result;
|
||||
PROCESS_INFORMATION pi;
|
||||
STARTUPINFOW si;
|
||||
PyObject* environment;
|
||||
|
||||
Py_UNICODE* application_name;
|
||||
Py_UNICODE* command_line;
|
||||
PyObject* process_attributes; /* ignored */
|
||||
PyObject* thread_attributes; /* ignored */
|
||||
int inherit_handles;
|
||||
int creation_flags;
|
||||
PyObject* env_mapping;
|
||||
Py_UNICODE* current_directory;
|
||||
PyObject* startup_info;
|
||||
Py_UNICODE* application_name;
|
||||
Py_UNICODE* command_line;
|
||||
PyObject* process_attributes; /* ignored */
|
||||
PyObject* thread_attributes; /* ignored */
|
||||
int inherit_handles;
|
||||
int creation_flags;
|
||||
PyObject* env_mapping;
|
||||
Py_UNICODE* current_directory;
|
||||
PyObject* startup_info;
|
||||
|
||||
if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess",
|
||||
&application_name,
|
||||
&command_line,
|
||||
&process_attributes,
|
||||
&thread_attributes,
|
||||
&inherit_handles,
|
||||
&creation_flags,
|
||||
&env_mapping,
|
||||
¤t_directory,
|
||||
&startup_info))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, "ZZOOiiOZO:CreateProcess",
|
||||
&application_name,
|
||||
&command_line,
|
||||
&process_attributes,
|
||||
&thread_attributes,
|
||||
&inherit_handles,
|
||||
&creation_flags,
|
||||
&env_mapping,
|
||||
¤t_directory,
|
||||
&startup_info))
|
||||
return NULL;
|
||||
|
||||
ZeroMemory(&si, sizeof(si));
|
||||
si.cb = sizeof(si);
|
||||
ZeroMemory(&si, sizeof(si));
|
||||
si.cb = sizeof(si);
|
||||
|
||||
/* note: we only support a small subset of all SI attributes */
|
||||
si.dwFlags = getint(startup_info, "dwFlags");
|
||||
si.wShowWindow = getint(startup_info, "wShowWindow");
|
||||
si.hStdInput = gethandle(startup_info, "hStdInput");
|
||||
si.hStdOutput = gethandle(startup_info, "hStdOutput");
|
||||
si.hStdError = gethandle(startup_info, "hStdError");
|
||||
/* note: we only support a small subset of all SI attributes */
|
||||
si.dwFlags = getint(startup_info, "dwFlags");
|
||||
si.wShowWindow = getint(startup_info, "wShowWindow");
|
||||
si.hStdInput = gethandle(startup_info, "hStdInput");
|
||||
si.hStdOutput = gethandle(startup_info, "hStdOutput");
|
||||
si.hStdError = gethandle(startup_info, "hStdError");
|
||||
|
||||
if (PyErr_Occurred())
|
||||
return NULL;
|
||||
if (PyErr_Occurred())
|
||||
return NULL;
|
||||
|
||||
if (env_mapping == Py_None)
|
||||
environment = NULL;
|
||||
else {
|
||||
environment = getenvironment(env_mapping);
|
||||
if (! environment)
|
||||
return NULL;
|
||||
}
|
||||
if (env_mapping == Py_None)
|
||||
environment = NULL;
|
||||
else {
|
||||
environment = getenvironment(env_mapping);
|
||||
if (! environment)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = CreateProcessW(application_name,
|
||||
command_line,
|
||||
NULL,
|
||||
NULL,
|
||||
inherit_handles,
|
||||
creation_flags | CREATE_UNICODE_ENVIRONMENT,
|
||||
environment ? PyUnicode_AS_UNICODE(environment) : NULL,
|
||||
current_directory,
|
||||
&si,
|
||||
&pi);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = CreateProcessW(application_name,
|
||||
command_line,
|
||||
NULL,
|
||||
NULL,
|
||||
inherit_handles,
|
||||
creation_flags | CREATE_UNICODE_ENVIRONMENT,
|
||||
environment ? PyUnicode_AS_UNICODE(environment) : NULL,
|
||||
current_directory,
|
||||
&si,
|
||||
&pi);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
Py_XDECREF(environment);
|
||||
Py_XDECREF(environment);
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
return Py_BuildValue("NNii",
|
||||
sp_handle_new(pi.hProcess),
|
||||
sp_handle_new(pi.hThread),
|
||||
pi.dwProcessId,
|
||||
pi.dwThreadId);
|
||||
return Py_BuildValue("NNii",
|
||||
sp_handle_new(pi.hProcess),
|
||||
sp_handle_new(pi.hThread),
|
||||
pi.dwProcessId,
|
||||
pi.dwThreadId);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(TerminateProcess_doc,
|
||||
|
|
@ -496,21 +496,21 @@ Terminate the specified process and all of its threads.");
|
|||
static PyObject *
|
||||
sp_TerminateProcess(PyObject* self, PyObject* args)
|
||||
{
|
||||
BOOL result;
|
||||
BOOL result;
|
||||
|
||||
HANDLE process;
|
||||
int exit_code;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:TerminateProcess",
|
||||
&process, &exit_code))
|
||||
return NULL;
|
||||
HANDLE process;
|
||||
int exit_code;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:TerminateProcess",
|
||||
&process, &exit_code))
|
||||
return NULL;
|
||||
|
||||
result = TerminateProcess(process, exit_code);
|
||||
result = TerminateProcess(process, exit_code);
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(GetExitCodeProcess_doc,
|
||||
|
|
@ -521,19 +521,19 @@ Return the termination status of the specified process.");
|
|||
static PyObject *
|
||||
sp_GetExitCodeProcess(PyObject* self, PyObject* args)
|
||||
{
|
||||
DWORD exit_code;
|
||||
BOOL result;
|
||||
DWORD exit_code;
|
||||
BOOL result;
|
||||
|
||||
HANDLE process;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetExitCodeProcess", &process))
|
||||
return NULL;
|
||||
HANDLE process;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetExitCodeProcess", &process))
|
||||
return NULL;
|
||||
|
||||
result = GetExitCodeProcess(process, &exit_code);
|
||||
result = GetExitCodeProcess(process, &exit_code);
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
return PyLong_FromLong(exit_code);
|
||||
return PyLong_FromLong(exit_code);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(WaitForSingleObject_doc,
|
||||
|
|
@ -546,23 +546,23 @@ in milliseconds.");
|
|||
static PyObject *
|
||||
sp_WaitForSingleObject(PyObject* self, PyObject* args)
|
||||
{
|
||||
DWORD result;
|
||||
DWORD result;
|
||||
|
||||
HANDLE handle;
|
||||
int milliseconds;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:WaitForSingleObject",
|
||||
&handle,
|
||||
&milliseconds))
|
||||
return NULL;
|
||||
HANDLE handle;
|
||||
int milliseconds;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM "i:WaitForSingleObject",
|
||||
&handle,
|
||||
&milliseconds))
|
||||
return NULL;
|
||||
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = WaitForSingleObject(handle, (DWORD) milliseconds);
|
||||
Py_END_ALLOW_THREADS
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
result = WaitForSingleObject(handle, (DWORD) milliseconds);
|
||||
Py_END_ALLOW_THREADS
|
||||
|
||||
if (result == WAIT_FAILED)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (result == WAIT_FAILED)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
return PyLong_FromLong((int) result);
|
||||
return PyLong_FromLong((int) result);
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(GetVersion_doc,
|
||||
|
|
@ -573,10 +573,10 @@ Return the version number of the current operating system.");
|
|||
static PyObject *
|
||||
sp_GetVersion(PyObject* self, PyObject* args)
|
||||
{
|
||||
if (! PyArg_ParseTuple(args, ":GetVersion"))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, ":GetVersion"))
|
||||
return NULL;
|
||||
|
||||
return PyLong_FromLong((int) GetVersion());
|
||||
return PyLong_FromLong((int) GetVersion());
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(GetModuleFileName_doc,
|
||||
|
|
@ -594,41 +594,41 @@ of the current process.");
|
|||
static PyObject *
|
||||
sp_GetModuleFileName(PyObject* self, PyObject* args)
|
||||
{
|
||||
BOOL result;
|
||||
HMODULE module;
|
||||
WCHAR filename[MAX_PATH];
|
||||
BOOL result;
|
||||
HMODULE module;
|
||||
WCHAR filename[MAX_PATH];
|
||||
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetModuleFileName",
|
||||
&module))
|
||||
return NULL;
|
||||
if (! PyArg_ParseTuple(args, PY_HANDLE_PARAM ":GetModuleFileName",
|
||||
&module))
|
||||
return NULL;
|
||||
|
||||
result = GetModuleFileNameW(module, filename, MAX_PATH);
|
||||
filename[MAX_PATH-1] = '\0';
|
||||
result = GetModuleFileNameW(module, filename, MAX_PATH);
|
||||
filename[MAX_PATH-1] = '\0';
|
||||
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
if (! result)
|
||||
return PyErr_SetFromWindowsErr(GetLastError());
|
||||
|
||||
return PyUnicode_FromUnicode(filename, Py_UNICODE_strlen(filename));
|
||||
return PyUnicode_FromUnicode(filename, Py_UNICODE_strlen(filename));
|
||||
}
|
||||
|
||||
static PyMethodDef sp_functions[] = {
|
||||
{"GetStdHandle", sp_GetStdHandle, METH_VARARGS, GetStdHandle_doc},
|
||||
{"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS,
|
||||
GetCurrentProcess_doc},
|
||||
{"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS,
|
||||
DuplicateHandle_doc},
|
||||
{"CreatePipe", sp_CreatePipe, METH_VARARGS, CreatePipe_doc},
|
||||
{"CreateProcess", sp_CreateProcess, METH_VARARGS, CreateProcess_doc},
|
||||
{"TerminateProcess", sp_TerminateProcess, METH_VARARGS,
|
||||
TerminateProcess_doc},
|
||||
{"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS,
|
||||
GetExitCodeProcess_doc},
|
||||
{"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS,
|
||||
WaitForSingleObject_doc},
|
||||
{"GetVersion", sp_GetVersion, METH_VARARGS, GetVersion_doc},
|
||||
{"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS,
|
||||
GetModuleFileName_doc},
|
||||
{NULL, NULL}
|
||||
{"GetStdHandle", sp_GetStdHandle, METH_VARARGS, GetStdHandle_doc},
|
||||
{"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS,
|
||||
GetCurrentProcess_doc},
|
||||
{"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS,
|
||||
DuplicateHandle_doc},
|
||||
{"CreatePipe", sp_CreatePipe, METH_VARARGS, CreatePipe_doc},
|
||||
{"CreateProcess", sp_CreateProcess, METH_VARARGS, CreateProcess_doc},
|
||||
{"TerminateProcess", sp_TerminateProcess, METH_VARARGS,
|
||||
TerminateProcess_doc},
|
||||
{"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS,
|
||||
GetExitCodeProcess_doc},
|
||||
{"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS,
|
||||
WaitForSingleObject_doc},
|
||||
{"GetVersion", sp_GetVersion, METH_VARARGS, GetVersion_doc},
|
||||
{"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS,
|
||||
GetModuleFileName_doc},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
|
@ -636,53 +636,53 @@ static PyMethodDef sp_functions[] = {
|
|||
static void
|
||||
defint(PyObject* d, const char* name, int value)
|
||||
{
|
||||
PyObject* v = PyLong_FromLong((long) value);
|
||||
if (v) {
|
||||
PyDict_SetItemString(d, (char*) name, v);
|
||||
Py_DECREF(v);
|
||||
}
|
||||
PyObject* v = PyLong_FromLong((long) value);
|
||||
if (v) {
|
||||
PyDict_SetItemString(d, (char*) name, v);
|
||||
Py_DECREF(v);
|
||||
}
|
||||
}
|
||||
|
||||
static struct PyModuleDef _subprocessmodule = {
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"_subprocess",
|
||||
NULL,
|
||||
-1,
|
||||
sp_functions,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
PyModuleDef_HEAD_INIT,
|
||||
"_subprocess",
|
||||
NULL,
|
||||
-1,
|
||||
sp_functions,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
|
||||
PyMODINIT_FUNC
|
||||
PyInit__subprocess()
|
||||
{
|
||||
PyObject *d;
|
||||
PyObject *m;
|
||||
PyObject *d;
|
||||
PyObject *m;
|
||||
|
||||
/* patch up object descriptors */
|
||||
sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int;
|
||||
if (PyType_Ready(&sp_handle_type) < 0)
|
||||
return NULL;
|
||||
/* patch up object descriptors */
|
||||
sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int;
|
||||
if (PyType_Ready(&sp_handle_type) < 0)
|
||||
return NULL;
|
||||
|
||||
m = PyModule_Create(&_subprocessmodule);
|
||||
if (m == NULL)
|
||||
return NULL;
|
||||
d = PyModule_GetDict(m);
|
||||
m = PyModule_Create(&_subprocessmodule);
|
||||
if (m == NULL)
|
||||
return NULL;
|
||||
d = PyModule_GetDict(m);
|
||||
|
||||
/* constants */
|
||||
defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE);
|
||||
defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE);
|
||||
defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE);
|
||||
defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS);
|
||||
defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES);
|
||||
defint(d, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW);
|
||||
defint(d, "SW_HIDE", SW_HIDE);
|
||||
defint(d, "INFINITE", INFINITE);
|
||||
defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0);
|
||||
defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE);
|
||||
defint(d, "CREATE_NEW_PROCESS_GROUP", CREATE_NEW_PROCESS_GROUP);
|
||||
/* constants */
|
||||
defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE);
|
||||
defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE);
|
||||
defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE);
|
||||
defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS);
|
||||
defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES);
|
||||
defint(d, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW);
|
||||
defint(d, "SW_HIDE", SW_HIDE);
|
||||
defint(d, "INFINITE", INFINITE);
|
||||
defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0);
|
||||
defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE);
|
||||
defint(d, "CREATE_NEW_PROCESS_GROUP", CREATE_NEW_PROCESS_GROUP);
|
||||
|
||||
return m;
|
||||
return m;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue