[pywin32-checkins] pywin32/com/win32com/src/extensions PyGStream.cpp,1.2,1.3 PyIStorage.cpp,1.3,1.4

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src/extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14371/extensions

Modified Files:
	PyGStream.cpp PyIStorage.cpp 
Log Message:
Move towards clearer error handling using the logging module features.
Remove old deprecated methods, remove public declarations of private 
methods and add new  MAKE_PYCOM_GATEWAY_FAILURE_CODE which all gateways 
should use.


Index: PyGStream.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/extensions/PyGStream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyGStream.cpp	19 Nov 1999 04:03:23 -0000	1.2
--- PyGStream.cpp	25 Jan 2005 13:33:16 -0000	1.3
***************
*** 33,37 ****
  
  	Py_DECREF(result);
! 	return PyCom_SetCOMErrorFromPyException(GetIID());
  }
  
--- 33,37 ----
  
  	Py_DECREF(result);
! 	return MAKE_PYCOM_GATEWAY_FAILURE_CODE("Read");
  }
  
***************
*** 76,80 ****
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyWinObject_AsULARGE_INTEGER(obplibNewPosition, plibNewPosition)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 76,80 ----
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyWinObject_AsULARGE_INTEGER(obplibNewPosition, plibNewPosition)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("Seek");
  	Py_DECREF(result);
  	return hr;
***************
*** 112,116 ****
  	if (pcbRead && !PyWinObject_AsULARGE_INTEGER(obpcbRead, pcbRead)) bPythonIsHappy = FALSE;
  	if (pcbWritten && !PyWinObject_AsULARGE_INTEGER(obpcbWritten, pcbWritten)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 112,116 ----
  	if (pcbRead && !PyWinObject_AsULARGE_INTEGER(obpcbRead, pcbRead)) bPythonIsHappy = FALSE;
  	if (pcbWritten && !PyWinObject_AsULARGE_INTEGER(obpcbWritten, pcbWritten)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("CopyTo");
  	Py_DECREF(result);
  	return hr;
***************
*** 174,178 ****
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_PyObjectAsSTATSTG(obpstatstg, pstatstg, 0/*flags*/)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 174,178 ----
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_PyObjectAsSTATSTG(obpstatstg, pstatstg, 0/*flags*/)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("Stat");
  	Py_DECREF(result);
  	return hr;
***************
*** 193,197 ****
  	if (!PyCom_InterfaceFromPyObject(obppstm, IID_IStream, (void **)ppstm, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 193,197 ----
  	if (!PyCom_InterfaceFromPyObject(obppstm, IID_IStream, (void **)ppstm, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("Clone");
  	Py_DECREF(result);
  	return hr;

Index: PyIStorage.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/extensions/PyIStorage.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyIStorage.cpp	10 Dec 2000 00:55:31 -0000	1.3
--- PyIStorage.cpp	25 Jan 2005 13:33:16 -0000	1.4
***************
*** 557,565 ****
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstm;
! 	if (!PyArg_Parse(result, "O" , &obppstm)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstm, IID_IStream, (void **)ppstm, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 557,566 ----
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstm;
! 	if (!PyArg_Parse(result, "O" , &obppstm)) return
! 		MAKE_PYCOM_GATEWAY_FAILURE_CODE("CreateStream");
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstm, IID_IStream, (void **)ppstm, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("CreateStream");
  	Py_DECREF(result);
  	return hr;
***************
*** 582,590 ****
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstm;
! 	if (!PyArg_Parse(result, "O" , &obppstm)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstm, IID_IStream, (void **)ppstm, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 583,592 ----
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstm;
! 	if (!PyArg_Parse(result, "O" , &obppstm)) return
! 		MAKE_PYCOM_GATEWAY_FAILURE_CODE("OpenStream");
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstm, IID_IStream, (void **)ppstm, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("OpenStream");
  	Py_DECREF(result);
  	return hr;
***************
*** 607,615 ****
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstg;
! 	if (!PyArg_Parse(result, "O" , &obppstg)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstg, IID_IStorage, (void **)ppstg, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 609,618 ----
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstg;
! 	if (!PyArg_Parse(result, "O" , &obppstg))
! 		return MAKE_PYCOM_GATEWAY_FAILURE_CODE("CreateStorage");
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstg, IID_IStorage, (void **)ppstg, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("CreateStorage");
  	Py_DECREF(result);
  	return hr;
***************
*** 638,646 ****
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstg;
! 	if (!PyArg_Parse(result, "O" , &obppstg)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstg, IID_IStorage, (void **)ppstg, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 641,650 ----
  	// Process the Python results, and convert back to the real params
  	PyObject *obppstg;
! 	if (!PyArg_Parse(result, "O" , &obppstg))
! 		return MAKE_PYCOM_GATEWAY_FAILURE_CODE("OpenStorage");
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppstg, IID_IStorage, (void **)ppstg, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("OpenStorage");
  	Py_DECREF(result);
  	return hr;
***************
*** 711,719 ****
  	// Process the Python results, and convert back to the real params
  	PyObject *obppenum;
! 	if (!PyArg_Parse(result, "O" , &obppenum)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppenum, IID_IEnumSTATSTG, (void **)ppenum, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 715,724 ----
  	// Process the Python results, and convert back to the real params
  	PyObject *obppenum;
! 	if (!PyArg_Parse(result, "O" , &obppenum))
! 		return MAKE_PYCOM_GATEWAY_FAILURE_CODE("Revert");
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_InterfaceFromPyObject(obppenum, IID_IEnumSTATSTG, (void **)ppenum, FALSE /* bNoneOK */))
  		 bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("Revert");
  	Py_DECREF(result);
  	return hr;
***************
*** 791,798 ****
  	// Process the Python results, and convert back to the real params
  	PyObject *obpstatstg;
! 	if (!PyArg_Parse(result, "O" , &obpstatstg)) return PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_PyObjectAsSTATSTG(obpstatstg, pstatstg, 0/*flags*/)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = PyCom_HandlePythonFailureToCOM(/*pexcepinfo*/);
  	Py_DECREF(result);
  	return hr;
--- 796,804 ----
  	// Process the Python results, and convert back to the real params
  	PyObject *obpstatstg;
! 	if (!PyArg_Parse(result, "O" , &obpstatstg))
! 		return MAKE_PYCOM_GATEWAY_FAILURE_CODE("Stat");
  	BOOL bPythonIsHappy = TRUE;
  	if (!PyCom_PyObjectAsSTATSTG(obpstatstg, pstatstg, 0/*flags*/)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) hr = MAKE_PYCOM_GATEWAY_FAILURE_CODE("Stat");
  	Py_DECREF(result);
  	return hr;