[pywin32-checkins] pywin32/com/win32comext/adsi/src PyIADs.cpp,NONE,1.1 PyIADs.h,NONE,1.1 PyIADsDeleteOps.i,NONE,1.1 PyIADsUser.i,1.2,1.3 adsi.i,1.5,1.6

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/com/win32comext/adsi/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5722/com/win32comext/adsi/src

Modified Files:
	PyIADsUser.i adsi.i 
Added Files:
	PyIADs.cpp PyIADs.h PyIADsDeleteOps.i 
Log Message:
* Add IADs and IADsDeleteOps


Index: adsi.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/adsi/src/adsi.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** adsi.i	26 May 2005 11:39:30 -0000	1.5
--- adsi.i	27 May 2005 07:09:36 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  %{
  #include "objsel.h"
+ #include "PyIADs.h"
  #include "PyIEnumVARIANT.h"
  #include "PythonCOMServer.h"
***************
*** 32,39 ****
--- 33,43 ----
  #include "PyIADsContainer.h"
  #include "PyIADsUser.h"
+ #include "PyIADsDeleteOps.h"
  #include "PyIDsObjectPicker.h"
  #include "ADSIID.h"
  
  extern PyTypeObject PyDSOP_SCOPE_INIT_INFOsType;
+ extern PyObject* PyIADs_getattro(PyObject *ob, PyObject *obname);
+ extern PyObject* PyIADsUser_getattro(PyObject *ob, PyObject *obname);
  
  %}
***************
*** 243,247 ****
  	AddIID(d, "LIBID_ADs", LIBID_ADs);
  
- 	ADD_IID(IID_IADs);
  	ADD_IID(IID_IADsNamespaces);
  	ADD_IID(IID_IADsDomain);
--- 247,250 ----
***************
*** 286,289 ****
--- 289,299 ----
  	AddIID(d, "DBPROPSET_ADSISEARCH", DBPROPSET_ADSISEARCH);
  
+ 	if ( PyCom_RegisterClientType(&PyIADs::type, &IID_IADs) != 0 ) return;
+ 	ADD_IID(IID_IADs);
+ 	// Patch up getattro for all types deriving from IADs
+ 	PyIADs::type.tp_getattro = PyIADs_getattro;
+ 	PyIADsUser::type.tp_getattro = PyIADsUser_getattro;
+ 
+ 
  	if ( PyCom_RegisterClientType(&PyIDirectoryObject::type, &IID_IDirectoryObject) != 0 ) return;
  	ADD_IID(IID_IDirectoryObject);
***************
*** 300,302 ****
--- 310,315 ----
  	if ( PyCom_RegisterClientType(&PyIDsObjectPicker::type, &IID_IDsObjectPicker) != 0 ) return;
  	ADD_IID(IID_IDsObjectPicker);
+ 
+ 	if ( PyCom_RegisterClientType(&PyIADsDeleteOps::type, &IID_IADsDeleteOps) != 0 ) return;
+ 	ADD_IID(IID_IADsDeleteOps);
  %}

--- NEW FILE: PyIADsDeleteOps.i ---
%module IADsDeleteOps // A COM interface to ADSI's IADsDeleteOps interface.

%include "typemaps.i"
%include "pywin32.i"
%include "pythoncom.i"
%include "adsilib.i"

%{

#include "PyIADsDeleteOps.h"
#define SWIG_THIS_IID IID_IADsDeleteOps

PyIADsDeleteOps::PyIADsDeleteOps(IUnknown *pDisp) :
	PyIDispatch(pDisp)
{
	ob_type = &type;
}

PyIADsDeleteOps::~PyIADsDeleteOps()
{
}

IADsDeleteOps *PyIADsDeleteOps::GetI(PyObject *self)
{
	return (IADsDeleteOps *)PyIDispatch::GetI(self);
}

%}

// @pyswig |DeleteObject|
// @pyswig int|flags|0|
HRESULT DeleteObject(LONG flags = 0);

--- NEW FILE: PyIADs.h ---
// This file declares the IADs Interface and Gateway for Python.
// Generated by makegw.py
// ---------------------------------------------------
//
// Interface Declaration

class PyIADs : public PyIDispatch
{
public:
	MAKE_PYCOM_CTOR(PyIADs);
	static IADs *GetI(PyObject *self);
	static PyComTypeObject type;

	// The Python methods
	static PyObject *GetInfo(PyObject *self, PyObject *args);
	static PyObject *SetInfo(PyObject *self, PyObject *args);
	static PyObject *Get(PyObject *self, PyObject *args);
	static PyObject *Put(PyObject *self, PyObject *args);
	static PyObject *GetEx(PyObject *self, PyObject *args);
	static PyObject *PutEx(PyObject *self, PyObject *args);
	static PyObject *GetInfoEx(PyObject *self, PyObject *args);

protected:
	PyIADs(IUnknown *pdisp);
	~PyIADs();
};

--- NEW FILE: PyIADs.cpp ---
// This file implements the IADs Interface and Gateway for Python.
// Generated by makegw.py
// This interface does not use SWIG, mainly so we can implement a custom
// getattr for the type.
// All "get_" methods have been exposed as properties.

#include "pythoncom.h"
#include "PyADSIutil.h"
#include "PyIADs.h"

// @doc - This file contains autoduck documentation
// ---------------------------------------------------
//
// Interface Implementation

PyIADs::PyIADs(IUnknown *pdisp):
	PyIDispatch(pdisp)
{
	ob_type = &type;
}

PyIADs::~PyIADs()
{
}

/* static */ IADs *PyIADs::GetI(PyObject *self)
{
	return (IADs *)PyIDispatch::GetI(self);
}

// @pymethod |PyIADs|GetInfo|Description of GetInfo.
PyObject *PyIADs::GetInfo(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	if ( !PyArg_ParseTuple(args, ":GetInfo") )
		return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->GetInfo( );

	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
	Py_INCREF(Py_None);
	return Py_None;

}

// @pymethod |PyIADs|SetInfo|Description of SetInfo.
PyObject *PyIADs::SetInfo(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	if ( !PyArg_ParseTuple(args, ":SetInfo") )
		return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->SetInfo( );

	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
	Py_INCREF(Py_None);
	return Py_None;

}

// @pymethod object|PyIADs|Get|Description of Get.
// @rdesc The result is a Python object converted from a COM variant.  It
// may be an array, or any types supported by COM variant.
PyObject *PyIADs::Get(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	VARIANT val;
	VariantInit(&val);
	// @pyparm <o PyUnicode>|prop||The name of the property to fetch
	PyObject *obbstrName;
	BSTR bstrName;
	if ( !PyArg_ParseTuple(args, "O:Get", &obbstrName) )
		return NULL;
	BOOL bPythonIsHappy = TRUE;
	if (bPythonIsHappy && !PyWinObject_AsBstr(obbstrName, &bstrName)) bPythonIsHappy = FALSE;
	if (!bPythonIsHappy) return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->Get( bstrName, &val );
	SysFreeString(bstrName);
	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
	PyObject *ret = PyCom_PyObjectFromVariant(&val);
	{
	PY_INTERFACE_PRECALL;
	VariantClear(&val);
	PY_INTERFACE_POSTCALL;
	}
	return ret;
}

// @pymethod |PyIADs|Put|Description of Put.
PyObject *PyIADs::Put(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	// @pyparm <o PyUnicode>|property||The property name to set
	// @pyparm object|val||The value to set.
	PyObject *obbstrName;
	PyObject *obvProp;
	BSTR bstrName;
	VARIANT vProp;
	VariantInit(&vProp);
	if ( !PyArg_ParseTuple(args, "OO:Put", &obbstrName, &obvProp) )
		return NULL;
	BOOL bPythonIsHappy = TRUE;
	if (bPythonIsHappy && !PyWinObject_AsBstr(obbstrName, &bstrName)) bPythonIsHappy = FALSE;
	if ( !PyCom_VariantFromPyObject(obvProp, &vProp) )
		bPythonIsHappy = FALSE;
	if (!bPythonIsHappy) return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->Put( bstrName, vProp );
	SysFreeString(bstrName);
	VariantClear(&vProp);
	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
	Py_INCREF(Py_None);
	return Py_None;

}

/****
// @pymethod |PyIADs|GetEx|Description of GetEx.
PyObject *PyIADs::GetEx(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	// @pyparm <o unicode>|bstrName||Description for bstrName
// *** The input argument pvProp of type "VARIANT *" was not processed ***
//     Please check the conversion function is appropriate and exists!
	VARIANT * pvProp;
	PyObject *obpvProp;
	// @pyparm <o PyVARIANT *>|pvProp||Description for pvProp
	PyObject *obbstrName;
	BSTR bstrName;
	if ( !PyArg_ParseTuple(args, "OO:GetEx", &obbstrName, &obpvProp) )
		return NULL;
	BOOL bPythonIsHappy = TRUE;
	if (bPythonIsHappy && !PyWinObject_AsBstr(obbstrName, &bstrName)) bPythonIsHappy = FALSE;
	if (bPythonIsHappy && !PyObject_AsVARIANT *( obpvProp, &pvProp )) bPythonIsHappy = FALSE;
	if (!bPythonIsHappy) return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->GetEx( bstrName, pvProp );
	PyObject_FreeVARIANT *(pvProp);

	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
// *** The output argument pvProp of type "VARIANT *" was not processed ***
//     The type 'VARIANT *' (pvProp) is unknown.
	Py_INCREF(Py_None);
	return Py_None;

}

// @pymethod |PyIADs|PutEx|Description of PutEx.
PyObject *PyIADs::PutEx(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	// @pyparm int|lnControlCode||Description for lnControlCode
	// @pyparm <o unicode>|bstrName||Description for bstrName
	// @pyparm <o PyVARIANT>|vProp||Description for vProp
	PyObject *obbstrName;
	PyObject *obvProp;
	long lnControlCode;
	BSTR bstrName;
	VARIANT vProp;
	if ( !PyArg_ParseTuple(args, "lOO:PutEx", &lnControlCode, &obbstrName, &obvProp) )
		return NULL;
	BOOL bPythonIsHappy = TRUE;
	if (bPythonIsHappy && !PyWinObject_AsBstr(obbstrName, &bstrName)) bPythonIsHappy = FALSE;
	if ( !PyCom_VariantFromPyObject(obvProp, &vProp) )
		bPythonIsHappy = FALSE;
	if (!bPythonIsHappy) return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->PutEx( lnControlCode, bstrName, vProp );

	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
	Py_INCREF(Py_None);
	return Py_None;

}

// @pymethod |PyIADs|GetInfoEx|Description of GetInfoEx.
PyObject *PyIADs::GetInfoEx(PyObject *self, PyObject *args)
{
	IADs *pIAD = GetI(self);
	if ( pIAD == NULL )
		return NULL;
	// @pyparm <o PyVARIANT>|vProperties||Description for vProperties
	// @pyparm int|lnReserved||Description for lnReserved
	PyObject *obvProperties;
	VARIANT vProperties;
	long lnReserved;
	if ( !PyArg_ParseTuple(args, "Ol:GetInfoEx", &obvProperties, &lnReserved) )
		return NULL;
	BOOL bPythonIsHappy = TRUE;
	if ( !PyCom_VariantFromPyObject(obvProperties, &vProperties) )
		bPythonIsHappy = FALSE;
	if (!bPythonIsHappy) return NULL;
	HRESULT hr;
	PY_INTERFACE_PRECALL;
	hr = pIAD->GetInfoEx( vProperties, lnReserved );

	PY_INTERFACE_POSTCALL;

	if ( FAILED(hr) )
		return PyCom_BuildPyException(hr, pIAD, IID_IADs );
	Py_INCREF(Py_None);
	return Py_None;

}
***/
// @object PyIADs|An object representing the IADs interface.
// In most cases you can achieve the same result via IDispatch - however, this
// interface allows you get get and set properties without the IDispatch
// overhead.
static struct PyMethodDef PyIADs_methods[] =
{
	{ "GetInfo", PyIADs::GetInfo, 1 }, // @pymeth GetInfo|Description of GetInfo
	{ "SetInfo", PyIADs::SetInfo, 1 }, // @pymeth SetInfo|Description of SetInfo
	{ "Get", PyIADs::Get, 1 }, // @pymeth Get|Description of Get
	{ "Put", PyIADs::Put, 1 }, // @pymeth Put|Description of Put
	{ "get", PyIADs::Get, 1 }, // @pymeth get|Synonym for Get
	{ "put", PyIADs::Put, 1 }, // @pymeth put|Synonym for Put
	{ NULL }
};

PyObject* PyIADs_getattro(PyObject *ob, PyObject *obname)
{
	char *name = PyString_AsString(obname);
	if (!name) return NULL;

	IADs *p = PyIADs::GetI(ob);
	
	// These are all BSTR values
	BSTR ret = NULL;
	HRESULT hr;
	BOOL bad = FALSE;
	Py_BEGIN_ALLOW_THREADS
	// docs refer to 'property' as AdsPath, but function is ADsPath
	// allow both
	// @prop <o PyUnicode>|ADsPath|
	// @prop <o PyUnicode>|AdsPath|Synonym for ADsPath
	if (strcmp(name, "AdsPath")==0 || strcmp(name, "ADsPath")==0)
		hr = p->get_ADsPath(&ret);
	// @prop <o PyUnicode>|Class|
	else if (strcmp(name, "Class")==0)
		hr = p->get_Class(&ret);
	// @prop <o PyUnicode>|GUID|Like the IADs method, this returns a string rather than a GUID object.
	else if (strcmp(name, "GUID")==0)
		hr = p->get_GUID(&ret);
	// @prop <o PyUnicode>|Name|
	else if (strcmp(name, "Name")==0)
		hr = p->get_Name(&ret);
	// @prop <o PyUnicode>|Parent|
	else if (strcmp(name, "Parent")==0)
		hr = p->get_Parent(&ret);
	// @prop <o PyUnicode>|Schema|
	else if (strcmp(name, "Schema")==0)
		hr = p->get_Schema(&ret);
	else
		bad = TRUE;
	Py_END_ALLOW_THREADS
	if (bad)
		return PyIBase::getattro(ob, obname);
	if (FAILED(hr))
		return PyCom_BuildPyException(hr, p, IID_IADs );
	PyObject *rc = MakeBstrToObj(ret);
	SysFreeString(ret);
	return rc;
}

PyComTypeObject PyIADs::type("PyIADs",
		&PyIDispatch::type,
		sizeof(PyIADs),
		PyIADs_methods,
		GET_PYCOM_CTOR(PyIADs));

Index: PyIADsUser.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/adsi/src/PyIADsUser.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIADsUser.i	25 May 2005 01:26:04 -0000	1.2
--- PyIADsUser.i	27 May 2005 07:09:36 -0000	1.3
***************
*** 7,16 ****
  
  %{
! 
  #include "PyIADsUser.h"
  #define SWIG_THIS_IID IID_IADsUser
  
  PyIADsUser::PyIADsUser(IUnknown *pDisp) :
! 	PyIDispatch(pDisp)
  {
  	ob_type = &type;
--- 7,17 ----
  
  %{
! #include "PyIADs.h"
  #include "PyIADsUser.h"
+ 
  #define SWIG_THIS_IID IID_IADsUser
  
  PyIADsUser::PyIADsUser(IUnknown *pDisp) :
! 	PyIADs(pDisp)
  {
  	ob_type = &type;
***************
*** 23,27 ****
  IADsUser *PyIADsUser::GetI(PyObject *self)
  {
! 	return (IADsUser *)PyIDispatch::GetI(self);
  }
  
--- 24,38 ----
  IADsUser *PyIADsUser::GetI(PyObject *self)
  {
! 	return (IADsUser *)PyIADs::GetI(self);
! }
! 
! PyObject* PyIADsUser_getattro(PyObject *ob, PyObject *obname)
! {
! 	char *name = PyString_AsString(obname);
! 	if (!name) return NULL;
! 
! 	IADsUser *p = PyIADsUser::GetI(ob);
! 	// todo!
! 	return PyIADs::getattro(ob, obname);
  }