[pywin32-checkins] pywin32/com/win32comext/shell/src PyIColumnProvider.cpp,1.1,1.2

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

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

Modified Files:
	PyIColumnProvider.cpp 
Log Message:
Fix SHCOLUMNDATA handling.


Index: PyIColumnProvider.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIColumnProvider.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyIColumnProvider.cpp	6 Nov 2003 06:15:03 -0000	1.1
--- PyIColumnProvider.cpp	12 Mar 2004 08:40:23 -0000	1.2
***************
*** 15,18 ****
--- 15,20 ----
  
  extern BOOL PyObject_AsSHCOLUMNDATA(PyObject *, SHCOLUMNDATA *);
+ void PyObject_FreeSHCOLUMNDATA(SHCOLUMNDATA *p);
+ 
  extern PyObject *PyObject_FromSHCOLUMNDATA(LPCSHCOLUMNDATA);
  
***************
*** 80,83 ****
--- 82,89 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pICP, IID_IColumnProvider );
+ 	if (hr==S_FALSE) {
+ 		Py_INCREF(Py_None);
+ 		return Py_None;
+ 	}
  	return PyObject_FromSHCOLUMNINFO(&psci);
  }
***************
*** 107,111 ****
  	hr = pICP->GetItemData( &pscid, &pscd, &varData );
  	PY_INTERFACE_POSTCALL;
! 
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pICP, IID_IColumnProvider );
--- 113,117 ----
  	hr = pICP->GetItemData( &pscid, &pscd, &varData );
  	PY_INTERFACE_POSTCALL;
! 	PyObject_FreeSHCOLUMNDATA(&pscd);
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pICP, IID_IColumnProvider );