Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berkerpeksag merged 3 commits into from
Nov 7, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5b4876
bpo-20486: Implement Database.Close() method in msilib
berkerpeksag Oct 26, 2017
f067913
Fix build
berkerpeksag Oct 26, 2017
a0ebeac
Rename to msidb_close
berkerpeksag Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Doc/library/msilib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2017-10-26-23-02-57.bpo-20486.3IdsZ1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Implement the ``Database.Close()`` method to help closing MSI database
objects.
21 changes: 13 additions & 8 deletions PC/_msi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,6 @@ msiobj_dealloc(msiobj* msidb)
msidb->h = 0;
}

static PyObject*
msiobj_close(msiobj* msidb, PyObject *args)
{
MsiCloseHandle(msidb->h);
msidb->h = 0;
Py_RETURN_NONE;
}

static PyObject*
msierror(int status)
{
Expand Down Expand Up @@ -341,6 +333,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*
Expand Down Expand Up @@ -900,6 +903,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 }
};

Expand Down