From e737171f6ef172de559b41d54989eca0d7663b4e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 1 Nov 2016 16:03:09 +1300 Subject: [PATCH] pyerrors: Add PyErr_Set{WERROR,HRESULT,NTSTATUS}_and_string() This varient allows control of the text explaination string Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam BUG: https://bugzilla.samba.org/show_bug.cgi?id=12398 --- source4/libcli/util/pyerrors.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/source4/libcli/util/pyerrors.h b/source4/libcli/util/pyerrors.h index 9228c340ea7..c3b307646ba 100644 --- a/source4/libcli/util/pyerrors.h +++ b/source4/libcli/util/pyerrors.h @@ -43,6 +43,21 @@ "NTSTATUSError"), \ PyErr_FromNTSTATUS(status)) +#define PyErr_SetWERROR_and_string(werr, string) \ + PyErr_SetObject(PyObject_GetAttrString(PyImport_ImportModule("samba"),\ + "WERRORError"), \ + Py_BuildValue("(i,s)", W_ERROR_V(werr), string)) + +#define PyErr_SetHRESULT_and_string(hresult, string) \ + PyErr_SetObject(PyObject_GetAttrString(PyImport_ImportModule("samba"),\ + "HRESULTError"), \ + Py_BuildValue("(i,s)", HRES_ERROR_V(hresult), string)) + +#define PyErr_SetNTSTATUS_and_string(status, string) \ + PyErr_SetObject(PyObject_GetAttrString(PyImport_ImportModule("samba"),\ + "NTSTATUSError"), \ + Py_BuildValue("(i,s)", NT_STATUS_V(status), string)) + #define PyErr_NTSTATUS_IS_ERR_RAISE(status) \ if (NT_STATUS_IS_ERR(status)) { \ PyErr_SetNTSTATUS(status); \ -- 2.34.1