[pywin32-checkins] /hgroot/pywin32/pywin32: Fix PyIDispatch.GetMemberName, and some...

[<pyw...@li...>]

changeset e4c928c7150e in /hgroot/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgroot/pywin32/pywin32?cmd=changeset;node=e4c928c7150e
summary: Fix PyIDispatch.GetMemberName, and some autoduck improvements

diffstat:

 com/win32com/src/PyIDispatch.cpp |  37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diffs (111 lines):

diff -r a81ece0ec74d -r e4c928c7150e com/win32com/src/PyIDispatch.cpp
--- a/com/win32com/src/PyIDispatch.cpp	Mon Aug 06 01:40:54 2012 -0400
+++ b/com/win32com/src/PyIDispatch.cpp	Mon Aug 06 23:40:03 2012 -0400
@@ -571,7 +571,7 @@
 	return (IDispatchEx *)PyIDispatch::GetI(self);
 }
 
-// @method int|PyIDispatchEx|GetDispID|
+// @pymethod int|PyIDispatchEx|GetDispID|Returns the member id for a name
 PyObject *PyIDispatchEx::GetDispID(PyObject *self, PyObject *args)
 {
 	long fdex;
@@ -593,7 +593,7 @@
 	return PyInt_FromLong(dispid);
 }
 
-// @method object|PyIDispatchEx|InvokeEx|Provides access to properties and methods exposed by a <o PyIDispatchEx> object. 
+// @pymethod object|PyIDispatchEx|InvokeEx|Provides access to properties and methods exposed by a <o PyIDispatchEx> object. 
 PyObject *PyIDispatchEx::InvokeEx(PyObject *self, PyObject *args)
 {
 	long dispid;
@@ -673,7 +673,7 @@
 	}
 	return result;
 }
-// @method |PyIDispatchEx|DeleteMemberByName|
+// @pymethod |PyIDispatchEx|DeleteMemberByName|
 PyObject *PyIDispatchEx::DeleteMemberByName(PyObject *self, PyObject *args)
 {
 	long fdex;
@@ -694,7 +694,7 @@
 	Py_INCREF(Py_None);
 	return Py_None;
 }
-// @method |PyIDispatchEx|DeleteMemberByDispID|
+// @pymethod |PyIDispatchEx|DeleteMemberByDispID|
 PyObject *PyIDispatchEx::DeleteMemberByDispID(PyObject *self, PyObject *args)
 {
 	long dispid;
@@ -710,14 +710,14 @@
 	Py_INCREF(Py_None);
 	return Py_None;
 }
-// @method int|PyIDispatchEx|GetMemberProperties|
+// @pymethod int|PyIDispatchEx|GetMemberProperties|Returns mask of fdex* flags describing a member
 PyObject *PyIDispatchEx::GetMemberProperties(PyObject *self, PyObject *args)
 {
 	long fdex;
 	long dispid;
 	if (!PyArg_ParseTuple(args, "ll:GetMemberProperties",
-		&dispid, // @pyparm int|dispid||
-		&fdex)) // @pyparm int|fdex||Determines the options
+		&dispid, // @pyparm int|dispid||The member id
+		&fdex)) // @pyparm int|fdex||fdex* flags specifying which properties to return
 		return NULL;
 	IDispatchEx *pMyDispatchEx = GetI(self);
 	if (pMyDispatchEx==NULL) return NULL;
@@ -728,33 +728,32 @@
 	if (FAILED(hr)) return SetPythonCOMError(self, hr);
 	return PyInt_FromLong(props);
 }
-// @method int|PyIDispatchEx|GetMemberName|
+// @pymethod str|PyIDispatchEx|GetMemberName|Returns the name associated with a member id
 PyObject *PyIDispatchEx::GetMemberName(PyObject *self, PyObject *args)
 {
-	long fdex;
 	long dispid;
-	if (!PyArg_ParseTuple(args, "ll:GetMemberName",
-		&dispid, // @pyparm int|dispid||
-		&fdex)) // @pyparm int|fdex||Determines the options
+	BSTR name;
+	if (!PyArg_ParseTuple(args, "l:GetMemberName",
+		&dispid)) // @pyparm int|dispid||The member id
 		return NULL;
 	IDispatchEx *pMyDispatchEx = GetI(self);
 	if (pMyDispatchEx==NULL) return NULL;
-	DWORD props;
+
 	PY_INTERFACE_PRECALL;
-	HRESULT hr = pMyDispatchEx->GetMemberProperties((DISPID)dispid, (DWORD)fdex, &props);
+	HRESULT hr = pMyDispatchEx->GetMemberName(dispid, &name);
 	PY_INTERFACE_POSTCALL;
 	if (FAILED(hr)) return SetPythonCOMError(self, hr);
-	return PyInt_FromLong(props);
+	return PyWinObject_FromBstr(name, TRUE);
 }
 
-// @method int|PyIDispatchEx|GetNextDispID|
+// @pymethod int|PyIDispatchEx|GetNextDispID|Enumerates member ids.
 PyObject *PyIDispatchEx::GetNextDispID(PyObject *self, PyObject *args)
 {
 	long fdex;
 	long dispid;
 	if (!PyArg_ParseTuple(args, "ll:GetNextDispID",
 		&fdex, // @pyparm int|fdex||Determines the options
-		&dispid)) // @pyparm int|dispid||Identifies the current member. GetNextDispID will retrieve the item in the enumeration after this one. 
+		&dispid)) // @pyparm int|dispid||Current member, or DISPID_STARTENUM to begin enumeration. GetNextDispID will retrieve the item in the enumeration after this one. 
 		return NULL;
 	IDispatchEx *pMyDispatchEx = GetI(self);
 	if (pMyDispatchEx==NULL) return NULL;
@@ -774,8 +773,8 @@
 	{"DeleteMemberByName",  PyIDispatchEx::DeleteMemberByName, 1 }, // @pymeth DeleteMemberByName|
 	{"DeleteMemberByDispID",PyIDispatchEx::DeleteMemberByDispID, 1 }, // @pymeth DeleteMemberByDispID|
 	{"GetMemberProperties", PyIDispatchEx::GetMemberProperties, 1 }, // @pymeth GetMemberProperties|
-	{"GetMemberName",       PyIDispatchEx::GetMemberName, 1 }, // @pymeth GetMemberName|
-	{"GetNextDispID",       PyIDispatchEx::GetNextDispID, 1 }, // @pymeth GetNextDispID|
+	{"GetMemberName",       PyIDispatchEx::GetMemberName, 1 }, // @pymeth GetMemberName|Returns the name associated with a member id
+	{"GetNextDispID",       PyIDispatchEx::GetNextDispID, 1 }, // @pymeth GetNextDispID|Enumerates member ids.
 	{NULL,  NULL}        
 };