[pywin32-checkins] pywin32/com/win32comext/shell/src PyIShellFolder.cpp,1.6,1.7

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

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

Modified Files:
	PyIShellFolder.cpp 
Log Message:
Oops - it was this checkin with the ParseDisplayName change!


Index: PyIShellFolder.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellFolder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PyIShellFolder.cpp	9 Apr 2004 11:20:06 -0000	1.6
--- PyIShellFolder.cpp	26 May 2004 09:37:10 -0000	1.7
***************
*** 28,31 ****
--- 28,34 ----
  
  // @pymethod |PyIShellFolder|ParseDisplayName|Description of ParseDisplayName.
+ // @rdesc The result is a tuple of cchEaten, pidl, attr.
+ // cchEaten will have been initialized to -1, and may or may not be changed
+ // for the return value.
  PyObject *PyIShellFolder::ParseDisplayName(PyObject *self, PyObject *args)
  {
***************
*** 41,48 ****
  	IBindCtx * pbcReserved;
  	LPOLESTR lpszDisplayName;
! 	ULONG pchEaten;
  	ITEMIDLIST *ppidl;
! 	ULONG pdwAttributes;
! 	if ( !PyArg_ParseTuple(args, "lOO:ParseDisplayName", &hwndOwner, &obpbcReserved, &oblpszDisplayName) )
  		return NULL;
  	BOOL bPythonIsHappy = TRUE;
--- 44,52 ----
  	IBindCtx * pbcReserved;
  	LPOLESTR lpszDisplayName;
! 	ULONG pchEaten = (ULONG)-1;
  	ITEMIDLIST *ppidl;
! 	ULONG pdwAttributes = -1;
! 	if ( !PyArg_ParseTuple(args, "lOO|l:ParseDisplayName", &hwndOwner, &obpbcReserved,
! 						   &oblpszDisplayName, &pdwAttributes) )
  		return NULL;
  	BOOL bPythonIsHappy = TRUE;
***************
*** 53,57 ****
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pISF->ParseDisplayName( hwndOwner, pbcReserved, lpszDisplayName, &pchEaten, &ppidl, &pdwAttributes );
  	if (pbcReserved) pbcReserved->Release();
  	SysFreeString(lpszDisplayName);
--- 57,62 ----
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pISF->ParseDisplayName(hwndOwner, pbcReserved, lpszDisplayName, &pchEaten,
! 								&ppidl, &pdwAttributes );
  	if (pbcReserved) pbcReserved->Release();
  	SysFreeString(lpszDisplayName);
***************
*** 424,428 ****
  	oblpszDisplayName = MakeOLECHARToObj(lpszDisplayName);
  	PyObject *result;
! 	HRESULT hr=InvokeViaPolicy("ParseDisplayName", &result, "lOO", hwndOwner, obpbcReserved, oblpszDisplayName);
  	Py_XDECREF(obpbcReserved);
  	Py_XDECREF(oblpszDisplayName);
--- 429,435 ----
  	oblpszDisplayName = MakeOLECHARToObj(lpszDisplayName);
  	PyObject *result;
! 	HRESULT hr=InvokeViaPolicy("ParseDisplayName", &result, "lOOl", hwndOwner,
! 							   obpbcReserved,
! 							   oblpszDisplayName, pdwAttributes ? *pdwAttributes : 0);
  	Py_XDECREF(obpbcReserved);
  	Py_XDECREF(oblpszDisplayName);