[pywin32-checkins] pywin32/com/win32comext/shell/src PyIShellExtInit.cpp,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27177

Modified Files:
	PyIShellExtInit.cpp 
Log Message:
Re-enable IDataObject support now we have it.


Index: PyIShellExtInit.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellExtInit.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIShellExtInit.cpp	8 Oct 2003 23:34:41 -0000	1.2
--- PyIShellExtInit.cpp	9 Oct 2003 12:09:17 -0000	1.3
***************
*** 45,49 ****
  	if (!PyObject_AsPIDL(obpFolder, &pFolder)) bPythonIsHappy = FALSE;
  	// XXX - no IDataObject support
! 	if (!PyCom_InterfaceFromPyInstanceOrObject(obpDataObject, IID_IUnknown, (void **)&pDataObject, TRUE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
  	if (!PyWinObject_AsHANDLE(obhkey, (HANDLE *)&hkey, FALSE)) bPythonIsHappy = FALSE;
--- 45,49 ----
  	if (!PyObject_AsPIDL(obpFolder, &pFolder)) bPythonIsHappy = FALSE;
  	// XXX - no IDataObject support
! 	if (!PyCom_InterfaceFromPyInstanceOrObject(obpDataObject, IID_IDataObject, (void **)&pDataObject, TRUE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
  	if (!PyWinObject_AsHANDLE(obhkey, (HANDLE *)&hkey, FALSE)) bPythonIsHappy = FALSE;
***************
*** 88,92 ****
  	obpFolder = PyObject_FromPIDL(pFolder, FALSE);
  	// XXX - no IDataObject support
! 	obpDataObject = PyCom_PyObjectFromIUnknown(pDataObject, IID_IUnknown, TRUE);
  	HRESULT hr=InvokeViaPolicy("Initialize", NULL, "OOi", obpFolder, obpDataObject, hkey);
  	Py_XDECREF(obpFolder);
--- 88,92 ----
  	obpFolder = PyObject_FromPIDL(pFolder, FALSE);
  	// XXX - no IDataObject support
! 	obpDataObject = PyCom_PyObjectFromIUnknown(pDataObject, IID_IDataObject, TRUE);
  	HRESULT hr=InvokeViaPolicy("Initialize", NULL, "OOi", obpFolder, obpDataObject, hkey);
  	Py_XDECREF(obpFolder);