[pywin32-checkins] pywin32/com/win32comext/shell/src PyIShellFolder.cpp,1.10,1.11 shell.cpp,1.38,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	PyIShellFolder.cpp shell.cpp 
Log Message:
Replace deprecated SHGetMalloc operations with CoTaskMemAlloc/CoTaskMemFree
Fix memory leak in PyIShellFolder::CompareIDs
Autoduck fixes

Index: shell.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** shell.cpp	17 Oct 2005 00:15:51 -0000	1.38
--- shell.cpp	18 Oct 2005 00:36:05 -0000	1.39
***************
*** 80,99 ****
  void PyShell_FreeMem(void *p)
  {
! 	IMalloc *pMalloc;
! 	if (p && SHGetMalloc(&pMalloc)==S_OK) {
! 		pMalloc->Free(p);
! 		pMalloc->Release();
! 	}
  }
  
  void *PyShell_AllocMem(ULONG cb)
  {
! 	IMalloc *pMalloc;
! 	if (SHGetMalloc(&pMalloc)==S_OK) {
! 		void *rc = pMalloc->Alloc(cb);
! 		pMalloc->Release();
! 		return rc;
! 	}
! 	return NULL;
  }
  
--- 80,90 ----
  void PyShell_FreeMem(void *p)
  {
! 	if (p!=NULL)
! 		CoTaskMemFree(p);
  }
  
  void *PyShell_AllocMem(ULONG cb)
  {
! 	return CoTaskMemAlloc(cb);
  }
  
***************
*** 119,124 ****
  {
  	if (pidl==NULL) {
- 		if (bFreeSystemPIDL)
- 			PyShell_FreeMem( (void *)pidl);
  		Py_INCREF(Py_None);
  		return Py_None;
--- 110,113 ----

Index: PyIShellFolder.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/PyIShellFolder.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PyIShellFolder.cpp	15 Dec 2004 01:07:51 -0000	1.10
--- PyIShellFolder.cpp	18 Oct 2005 00:36:05 -0000	1.11
***************
*** 27,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)
  {
--- 27,35 ----
  }
  
! // @pymethod tuple|PyIShellFolder|ParseDisplayName|Returns the PIDL of an item in a shell folder
! // @rdesc The result is a tuple of cchEaten, pidl, attr
! // @tupleitem 0|int|cchEaten|the number of characters of the input name that were parsed
! // @tupleitem 1|<o PyIDL>|pidl|specifies the relative path from the parsing folder to the object
! // @tupleitem 2|int|Attributes|returns any requested attributes
  PyObject *PyIShellFolder::ParseDisplayName(PyObject *self, PyObject *args)
  {
***************
*** 36,42 ****
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm HWND|hwndOwner||Description for hwndOwner
! 	// @pyparm <o PyIBindCtx>|pbcReserved||Description for pbcReserved
! 	// @pyparm <o unicode>|lpszDisplayName||Description for lpszDisplayName
  	PyObject *obpbcReserved;
  	PyObject *oblpszDisplayName;
--- 37,46 ----
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm HWND|hwndOwner||Window in which to display any dialogs or message boxes, can be 0
! 	// @pyparm <o PyIBindCtx>|pbc||Bind context that affects how parsing is performed, can be None
! 	// @pyparm <o PyUNICODE>|DisplayName||Display name to parse, format is dependent on the shell folder.
! 	// Desktop folder will accept a file path, as well as guids of the form ::{guid}
! 	// Example: '::%s\\::%s' %(shell.CLSID_MyComputer,shell.CLSID_ControlPanel)
! 	// @pyparm int|Attributes|0|Combination of shellcon.SFGAO_* constants specifying which attributes should be returned
  	PyObject *obpbcReserved;
  	PyObject *oblpszDisplayName;
***************
*** 47,51 ****
  	ITEMIDLIST *ppidl;
  	ULONG pdwAttributes = 0;
! 	if ( !PyArg_ParseTuple(args, "lOO|l:ParseDisplayName", &hwndOwner, &obpbcReserved,
  						   &oblpszDisplayName, &pdwAttributes) )
  		return NULL;
--- 51,55 ----
  	ITEMIDLIST *ppidl;
  	ULONG pdwAttributes = 0;
! 	if ( !PyArg_ParseTuple(args, "lOO|k:ParseDisplayName", &hwndOwner, &obpbcReserved,
  						   &oblpszDisplayName, &pdwAttributes) )
  		return NULL;
***************
*** 74,78 ****
  }
  
! // @pymethod |PyIShellFolder|EnumObjects|Description of EnumObjects.
  PyObject *PyIShellFolder::EnumObjects(PyObject *self, PyObject *args)
  {
--- 78,82 ----
  }
  
! // @pymethod <o PyIEnumIDList>|PyIShellFolder|EnumObjects|Creates an enumerator to list the contents of the shell folder
  PyObject *PyIShellFolder::EnumObjects(PyObject *self, PyObject *args)
  {
***************
*** 80,85 ****
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm HWND|hwndOwner|0|Description for hwndOwner
! 	// @pyparm int|grfFlags|SHCONTF_FOLDERS\|SHCONTF_NONFOLDERS\|SHCONTF_INCLUDEHIDDEN|Description for grfFlags
  	HWND hwndOwner = 0;
  	DWORD grfFlags = SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN;
--- 84,89 ----
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm HWND|hwndOwner|0|Window to use if any user interaction is required
! 	// @pyparm int|grfFlags|SHCONTF_FOLDERS\|SHCONTF_NONFOLDERS\|SHCONTF_INCLUDEHIDDEN|Combination of shellcon.SHCONTF_* constants
  	HWND hwndOwner = 0;
  	DWORD grfFlags = SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN;
***************
*** 99,103 ****
  }
  
! // @pymethod |PyIShellFolder|BindToObject|Description of BindToObject.
  PyObject *PyIShellFolder::BindToObject(PyObject *self, PyObject *args)
  {
--- 103,107 ----
  }
  
! // @pymethod <o PyIShellFolder>|PyIShellFolder|BindToObject|Returns an IShellFolder interface for a subfolder
  PyObject *PyIShellFolder::BindToObject(PyObject *self, PyObject *args)
  {
***************
*** 105,111 ****
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm <o PyIDL>|pidl||Description for pidl
! 	// @pyparm <o PyIBindCtx>|pbcReserved||Description for pbcReserved
! 	// @pyparm <o PyIID>|riid||Description for riid
  	PyObject *obpidl;
  	PyObject *obpbcReserved;
--- 109,115 ----
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm <o PyIDL>|pidl||Relative item id list that identifies the subfolder, can be multi-level
! 	// @pyparm <o PyIBindCtx>|pbc||Bind context to be used, can be None
! 	// @pyparm <o PyIID>|riid||IID of the desired interface, usually IID_IShellFolder
  	PyObject *obpidl;
  	PyObject *obpbcReserved;
***************
*** 122,126 ****
  		 bPythonIsHappy = FALSE;
  	if (!PyWinObject_AsIID(obriid, &riid)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
--- 126,130 ----
  		 bPythonIsHappy = FALSE;
  	if (!PyWinObject_AsIID(obriid, &riid)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) return NULL;	// this could leak the pidl
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
***************
*** 137,141 ****
  }
  
! // @pymethod |PyIShellFolder|BindToStorage|Description of BindToStorage.
  PyObject *PyIShellFolder::BindToStorage(PyObject *self, PyObject *args)
  {
--- 141,146 ----
  }
  
! // @pymethod interface|PyIShellFolder|BindToStorage|Returns an interface to a storage object in a shell folder
! // @rdesc Returns <o PyIStream>, <o PyIStorage> or <o PyIPropertySetStorage> depending on the riid passed in
  PyObject *PyIShellFolder::BindToStorage(PyObject *self, PyObject *args)
  {
***************
*** 143,149 ****
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm <o PyIDL>|pidl||Description for pidl
! 	// @pyparm <o PyIBindCtx>|pbcReserved||Description for pbcReserved
! 	// @pyparm <o PyIID>|riid||Description for riid
  	PyObject *obpidl;
  	PyObject *obpbcReserved;
--- 148,154 ----
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm <o PyIDL>|pidl||Relative pidl for the folder item, must be a single item id
! 	// @pyparm <o PyIBindCtx>|pbc||Bind context that affects how binding is performed, can be None
! 	// @pyparm <o PyIID>|riid||IID of the desired interface, one of IID_IStream, IID_IStorage, IID_IPropertySetStorage 
  	PyObject *obpidl;
  	PyObject *obpbcReserved;
***************
*** 175,179 ****
  }
  
! // @pymethod int|PyIShellFolder|CompareIDs|Description of CompareIDs.
  PyObject *PyIShellFolder::CompareIDs(PyObject *self, PyObject *args)
  {
--- 180,185 ----
  }
  
! // @pymethod int|PyIShellFolder|CompareIDs|Determines the sorting order of 2 items in shell folder
! // @rdesc Returns 0 if items compare equal, -1 if the pidl1 comes first, or 1 if pidl2 comes first
  PyObject *PyIShellFolder::CompareIDs(PyObject *self, PyObject *args)
  {
***************
*** 181,219 ****
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm int|lparam||Description for lparam
! 	// @pyparm <o PyIDL>|pidl1||Description for pidl1
! 	// @pyparm <o PyIDL>|pidl2||Description for pidl2
  	PyObject *obpidl1;
  	PyObject *obpidl2;
  	long lparam;
! 	ITEMIDLIST *pidl1;
! 	ITEMIDLIST *pidl2;
! 	if ( !PyArg_ParseTuple(args, "lOO:CompareIDs", &lparam, &obpidl1, &obpidl2) )
  		return NULL;
! 	BOOL bPythonIsHappy = TRUE;
! 	if (bPythonIsHappy && !PyObject_AsPIDL(obpidl1, &pidl1)) bPythonIsHappy = FALSE;
! 	if (bPythonIsHappy && !PyObject_AsPIDL(obpidl2, &pidl2)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) return NULL;
! 	HRESULT hr;
! 	PY_INTERFACE_PRECALL;
! 	hr = pISF->CompareIDs( lparam, pidl1, pidl2 );
  	PyObject_FreePIDL(pidl1);
  	PyObject_FreePIDL(pidl2);
! 
! 	PY_INTERFACE_POSTCALL;
! 
! 	if ( FAILED(hr) )
! 		return PyCom_BuildPyException(hr, pISF, IID_IShellFolder );
! 
! 	// special handling of hresult
! 	if ((short)HRESULT_CODE(hr) < 0)
! 		/* pidl1 comes first */
! 		return PyInt_FromLong(-1);
! 	else if ((short)HRESULT_CODE(hr) > 0) 
! 		/* pidl2 comes first */
! 		return PyInt_FromLong(1);
! 	else 
! 	/* the two pidls are equal */
! 		return PyInt_FromLong(0);
  }
  
--- 187,226 ----
  	if ( pISF == NULL )
  		return NULL;
! 	// @pyparm int|lparam||Lower 16 bits specify folder-dependent sorting rules, 0 means to sort by display name.
! 	// System folder view uses these as a column number.<nl>
! 	// Upper sixteen bits is used for flags SHCIDS_ALLFIELDS or SHCIDS_CANONICALONLY 
! 	// @pyparm <o PyIDL>|pidl1||Item id list that idenfies an object relative to the folder
! 	// @pyparm <o PyIDL>|pidl2||Item id list that idenfies an object relative to the folder
  	PyObject *obpidl1;
  	PyObject *obpidl2;
+ 	PyObject *ret=NULL;
  	long lparam;
! 	ITEMIDLIST *pidl1=NULL;
! 	ITEMIDLIST *pidl2=NULL;
! 	if ( !PyArg_ParseTuple(args, "kOO:CompareIDs", &lparam, &obpidl1, &obpidl2) )
  		return NULL;
! 
! 	if (PyObject_AsPIDL(obpidl1, &pidl1) &&
! 		PyObject_AsPIDL(obpidl2, &pidl2)){
! 		HRESULT hr;
! 		PY_INTERFACE_PRECALL;
! 		hr = pISF->CompareIDs( lparam, pidl1, pidl2 );
! 		PY_INTERFACE_POSTCALL;
! 		if ( FAILED(hr) )
! 			PyCom_BuildPyException(hr, pISF, IID_IShellFolder );
! 		else // special handling of hresult
! 			if ((short)HRESULT_CODE(hr) < 0)
! 				/* pidl1 comes first */
! 				ret=PyInt_FromLong(-1);
! 			else if ((short)HRESULT_CODE(hr) > 0) 
! 				/* pidl2 comes first */
! 				ret=PyInt_FromLong(1);
! 			else 
! 			/* the two pidls are equal */
! 				ret=PyInt_FromLong(0);
! 		}
  	PyObject_FreePIDL(pidl1);
  	PyObject_FreePIDL(pidl2);
! 	return ret;
  }

[pywin32-checkins] pywin32/com/win32comext/shell/src PyIShellFolder.cpp,1.10,1.11 shell.cpp,1.38,1.3

OLD project page for the Python extensions for Windows

[pywin32-checkins] pywin32/com/win32comext/shell/src PyIShellFolder.cpp,1.10,1.11 shell.cpp,1.38,1.39