[pywin32-checkins] pywin32/com/win32comext/mapi/src PyIMAPIAdviseSink.cpp, 1.1, 1.1.2.1

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4261/com/win32comext/mapi/src

Modified Files:
      Tag: py3k
	PyIMAPIAdviseSink.cpp 
Log Message:
merge lots of changes (most via 2to3) from the trunk

Index: PyIMAPIAdviseSink.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/PyIMAPIAdviseSink.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** PyIMAPIAdviseSink.cpp	9 Aug 2008 01:51:39 -0000	1.1
--- PyIMAPIAdviseSink.cpp	5 Jan 2009 12:51:27 -0000	1.1.2.1
***************
*** 17,21 ****
  	switch (n->ulEventType) {
  		case fnevCriticalError: {
! 			ERROR_NOTIFICATION &err(n->info.err);
  			ret = Py_BuildValue("k(s#iiN)",
  					    n->ulEventType,
--- 17,21 ----
  	switch (n->ulEventType) {
  		case fnevCriticalError: {
! 			ERROR_NOTIFICATION &err = n->info.err;
  			ret = Py_BuildValue("k(s#iiN)",
  					    n->ulEventType,
***************
*** 27,31 ****
  		}
  		case fnevExtended: {
! 			EXTENDED_NOTIFICATION &ext(n->info.ext);
  			ret = Py_BuildValue("k(ks#)", n->ulEventType, ext.ulEvent,
  					    ext.pbEventParameters, ext.cb);
--- 27,31 ----
  		}
  		case fnevExtended: {
! 			EXTENDED_NOTIFICATION &ext = n->info.ext;
  			ret = Py_BuildValue("k(ks#)", n->ulEventType, ext.ulEvent,
  					    ext.pbEventParameters, ext.cb);
***************
*** 33,37 ****
  		}
  		case fnevNewMail: {
! 			NEWMAIL_NOTIFICATION &newmail(n->info.newmail);
  			PyObject *msg_class = newmail.ulFlags&MAPI_UNICODE?
  					PyWinObject_FromWCHAR((const WCHAR *)newmail.lpszMessageClass) :
--- 33,37 ----
  		}
  		case fnevNewMail: {
! 			NEWMAIL_NOTIFICATION &newmail = n->info.newmail;
  			PyObject *msg_class = newmail.ulFlags&MAPI_UNICODE?
  					PyWinObject_FromWCHAR((const WCHAR *)newmail.lpszMessageClass) :
***************
*** 54,58 ****
  		case fnevObjectMoved:
  		case fnevSearchComplete: {
! 			OBJECT_NOTIFICATION &obj(n->info.obj);
  			PyObject *obArray = PyMAPIObject_FromSPropTagArray(obj.lpPropTagArray);
  			if (!obArray)
--- 54,58 ----
  		case fnevObjectMoved:
  		case fnevSearchComplete: {
! 			OBJECT_NOTIFICATION &obj = n->info.obj;
  			PyObject *obArray = PyMAPIObject_FromSPropTagArray(obj.lpPropTagArray);
  			if (!obArray)
***************
*** 69,73 ****
  		}
  		case fnevTableModified: {
! 			TABLE_NOTIFICATION &tab(n->info.tab);
  			ret = Py_BuildValue("k(kiNNN)",
  					    n->ulEventType,
--- 69,73 ----
  		}
  		case fnevTableModified: {
! 			TABLE_NOTIFICATION &tab = n->info.tab;
  			ret = Py_BuildValue("k(kiNNN)",
  					    n->ulEventType,
***************
*** 80,84 ****
  		}
  		case fnevStatusObjectModified: {
! 			STATUS_OBJECT_NOTIFICATION &statobj(n->info.statobj);
  			ret = Py_BuildValue("k(s#N)",
  					    n->ulEventType,
--- 80,84 ----
  		}
  		case fnevStatusObjectModified: {
! 			STATUS_OBJECT_NOTIFICATION &statobj = n->info.statobj;
  			ret = Py_BuildValue("k(s#N)",
  					    n->ulEventType,