[pywin32-checkins] pywin32/com/win32com/src/extensions PyIStorage.cpp, 1.5, 1.6

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src/extensions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1486/com/win32com/src/extensions

Modified Files:
	PyIStorage.cpp 
Log Message:
Rationalize pywin32 time api and use of it, including removal of support
for MS_WINCE, on the road to optionally using timezone-aware datetime 
objects.


Index: PyIStorage.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/extensions/PyIStorage.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyIStorage.cpp	13 Nov 2008 04:04:51 -0000	1.5
--- PyIStorage.cpp	8 Jan 2009 02:56:17 -0000	1.6
***************
*** 406,431 ****
  	FILETIME *pmtime=NULL, mtime;
  	if (obpctime!=Py_None) {
! 		pctime = &ctime;
! 		if (!PyTime_Check(obpctime)) {
! 			PyErr_SetString(PyExc_TypeError, "The argument must be a PyTime object");
  			return NULL;
! 		}
! 		if (!((PyTime *)obpctime)->GetTime(pctime)) return NULL;
  	}
  	if (obpatime != Py_None) {
! 		patime = &atime;
! 		if (!PyTime_Check(obpatime)) {
! 			PyErr_SetString(PyExc_TypeError, "The argument must be a PyTime object");
  			return NULL;
! 		}
! 		if (!((PyTime *)obpatime)->GetTime(patime)) return NULL;
  	}
  	if (obpmtime != Py_None) {
! 		pmtime = &mtime;
! 		if (!PyTime_Check(obpmtime)) {
! 			PyErr_SetString(PyExc_TypeError, "The argument must be a PyTime object");
  			return NULL;
! 		}
! 		if (!((PyTime *)obpmtime)->GetTime(pmtime)) return NULL;
  	}
  	BSTR bstrName;
--- 406,422 ----
  	FILETIME *pmtime=NULL, mtime;
  	if (obpctime!=Py_None) {
! 		if (!PyWinObject_AsFILETIME(obpctime, &ctime))
  			return NULL;
! 		pctime = &ctime;
  	}
  	if (obpatime != Py_None) {
! 		if (!PyWinObject_AsFILETIME(obpatime, &atime))
  			return NULL;
! 		patime = &atime;
  	}
  	if (obpmtime != Py_None) {
! 		if (!PyWinObject_AsFILETIME(obpmtime, &mtime))
  			return NULL;
! 		pmtime = &mtime;
  	}
  	BSTR bstrName;