[pywin32-checkins] pywin32/com/win32comext/taskscheduler/src PyIScheduledWorkItem.cpp, 1.3, 1.4

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

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

Modified Files:
	PyIScheduledWorkItem.cpp 
Log Message:
Another pass at getting things working on x64.  This change incorporates 
most of Sidnei's work on the AMD64 branch, and updates most of the other 
win32 and win32com modules that haven't already had 64bit love from Roger 
(thanks guys!).  Note this is not complete - among the outstanding issues 
are fixing 's#' format strings (but most of the tests *do* pass on x64, 
and the ones which don't fail for 'vista environment' reasons rather
than x64 reasons)


Index: PyIScheduledWorkItem.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyIScheduledWorkItem.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyIScheduledWorkItem.cpp	17 Jan 2007 13:33:25 -0000	1.3
--- PyIScheduledWorkItem.cpp	24 May 2007 06:01:05 -0000	1.4
***************
*** 487,496 ****
  	// @pyparm string|Data||Character data, treated as uninterpreted bytes
  	BYTE *workitem_data=NULL;
! 	WORD data_len=0;
  	PyObject *obworkitem_data=NULL;
  	if ( !PyArg_ParseTuple(args, "O:PyIScheduledWorkItem::SetWorkItemData", &obworkitem_data))
  		return NULL;
  	if (obworkitem_data!=Py_None)
! 		if (PyString_AsStringAndSize(obworkitem_data, (CHAR **)&workitem_data, (int *)&data_len)==-1)
  			return NULL;
  		else
--- 487,496 ----
  	// @pyparm string|Data||Character data, treated as uninterpreted bytes
  	BYTE *workitem_data=NULL;
! 	Py_ssize_t data_len=0;
  	PyObject *obworkitem_data=NULL;
  	if ( !PyArg_ParseTuple(args, "O:PyIScheduledWorkItem::SetWorkItemData", &obworkitem_data))
  		return NULL;
  	if (obworkitem_data!=Py_None)
! 		if (PyString_AsStringAndSize(obworkitem_data, (CHAR **)&workitem_data, &data_len)==-1)
  			return NULL;
  		else
***************
*** 501,505 ****
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pISWI->SetWorkItemData(data_len, workitem_data);
  	PY_INTERFACE_POSTCALL;
  
--- 501,506 ----
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
! 	hr = pISWI->SetWorkItemData(PyWin_SAFE_DOWNCAST(data_len, Py_ssize_t, WORD),
! 	                            workitem_data);
  	PY_INTERFACE_POSTCALL;