mirror of
https://github.com/samba-team/samba.git
synced 2025-11-12 04:23:49 +03:00
r2986: Add correct value to dict when generating wrapper for functions that
return WERROR values. Clean up WERROR vs NTSTATUS handling a bit.
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
0b53ab85aa
commit
e6756e3ee0
@@ -352,6 +352,7 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
|
||||
|
||||
%exception {
|
||||
$action
|
||||
|
||||
if (NT_STATUS_IS_ERR(result)) {
|
||||
set_ntstatus_exception(NT_STATUS_V(result));
|
||||
return NULL;
|
||||
@@ -365,10 +366,14 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
|
||||
|
||||
%exception {
|
||||
$action
|
||||
|
||||
if (NT_STATUS_IS_ERR(result)) {
|
||||
set_ntstatus_exception(NT_STATUS_V(result));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Emulate NT_STATUS_IS_ERR() */
|
||||
|
||||
if (!W_ERROR_IS_OK(arg3->out.result) &&
|
||||
!(W_ERROR_EQUAL(arg3->out.result, WERR_INSUFFICIENT_BUFFER))) {
|
||||
set_werror_exception(W_ERROR_V(arg3->out.result));
|
||||
@@ -379,4 +384,7 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **OUT,
|
||||
%include "librpc/gen_ndr/winreg.i"
|
||||
%include "librpc/gen_ndr/spoolss.i"
|
||||
|
||||
/* The status codes must be included last otherwise the automatically
|
||||
generated .i files get confused. This is kind of yucky. */
|
||||
|
||||
%include "status_codes.i"
|
||||
|
||||
@@ -32,10 +32,6 @@
|
||||
$1 = (uint32_t)PyInt_AsLong($input);
|
||||
}
|
||||
|
||||
/* For the moment treat NTSTATUS as an integer */
|
||||
|
||||
#define WERROR NTSTATUS
|
||||
|
||||
%typemap(out) NTSTATUS {
|
||||
$result = PyInt_FromLong(NT_STATUS_V($1));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user