traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-20486: Implement Database.Close() method in msilib (GH-4141)

This commit is contained in:
Berker Peksag 2017-11-07 15:58:53 +03:00 committed by GitHub
parent 3cc4c53a64
commit a935654f06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/msilib.rst
View File

@ -152,12 +152,18 @@ Database Objects
:c:func:`MsiGetSummaryInformation`. *count* is the maximum number of updated
values.
.. method:: Database.Close()
Close the database object, through :c:func:`MsiCloseHandle`.
.. versionadded:: 3.7
.. seealso::
`MSIDatabaseOpenView <https://msdn.microsoft.com/library?url=/library/en-us/msi/setup/msidatabaseopenview.asp>`_
`MSIDatabaseCommit <https://msdn.microsoft.com/library?url=/library/en-us/msi/setup/msidatabasecommit.asp>`_
`MSIGetSummaryInformation <https://msdn.microsoft.com/library?url=/library/en-us/msi/setup/msigetsummaryinformation.asp>`_
`MsiCloseHandle <https://msdn.microsoft.com/en-us/library/windows/desktop/aa370067(v=vs.85).aspx>`_
.. _view-objects:

2
Misc/NEWS.d/next/Windows/2017-10-26-23-02-57.bpo-20486.3IdsZ1.rst Normal file
View File

@ -0,0 +1,2 @@
Implement the ``Database.Close()`` method to help closing MSI database
objects.

21
PC/_msi.c
View File

@ -286,14 +286,6 @@ msiobj_dealloc(msiobj* msidb)
PyObject_Del(msidb);
}
static PyObject*
msiobj_close(msiobj* msidb, PyObject *args)
{
MsiCloseHandle(msidb->h);
msidb->h = 0;
Py_RETURN_NONE;
}
static PyObject*
msierror(int status)
{
@ -342,6 +334,17 @@ msierror(int status)
return NULL;
}
static PyObject*
msidb_close(msiobj* msidb, PyObject *args)
{
int status;
if ((status = MsiCloseHandle(msidb->h)) != ERROR_SUCCESS) {
return msierror(status);
}
msidb->h = 0;
Py_RETURN_NONE;
}
/*************************** Record objects **********************/
static PyObject*
@ -901,6 +904,8 @@ static PyMethodDef db_methods[] = {
PyDoc_STR("Commit() -> None\nWraps MsiDatabaseCommit")},
{ "GetSummaryInformation", (PyCFunction)msidb_getsummaryinformation, METH_VARARGS,
PyDoc_STR("GetSummaryInformation(updateCount) -> viewobj\nWraps MsiGetSummaryInformation")},
{ "Close", (PyCFunction)msidb_close, METH_NOARGS,
PyDoc_STR("Close() -> None\nWraps MsiCloseHandle")},
{ NULL, NULL }
};