pywin32-checkins

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

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

Modified Files:
      Tag: py3k
	PyIStorage.cpp 
Log Message:
merge various changes, particularly PyTime, from trunk

Index: PyIStorage.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/extensions/PyIStorage.cpp,v
retrieving revision 1.4.4.2
retrieving revision 1.4.4.3
diff -C2 -d -r1.4.4.2 -r1.4.4.3
*** PyIStorage.cpp	11 Oct 2008 18:45:50 -0000	1.4.4.2
--- PyIStorage.cpp	8 Jan 2009 03:45:50 -0000	1.4.4.3
***************
*** 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;