[pywin32-checkins] pywin32/com/win32comext/taskscheduler/src PyIProvideTaskPage.cpp, 1.1, 1.2 PyITask.cpp, 1.3, 1.4

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

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

Modified Files:
	PyIProvideTaskPage.cpp PyITask.cpp 
Log Message:
Yet more TCHAR/64bit and other misc changes from py3k branch.


Index: PyIProvideTaskPage.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyIProvideTaskPage.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyIProvideTaskPage.cpp	18 Apr 2004 22:01:11 -0000	1.1
--- PyIProvideTaskPage.cpp	13 Nov 2008 11:11:58 -0000	1.2
***************
*** 36,40 ****
  	// @pyparm bool|PersistChanges||Indicates if changes should be saved automatically
  	HPROPSHEETPAGE phPage;
! 	BOOL bPersistChanges=FALSE;
  	if ( !PyArg_ParseTuple(args, "ii:GetPage", &tpType, &bPersistChanges))
  		return NULL;
--- 36,40 ----
  	// @pyparm bool|PersistChanges||Indicates if changes should be saved automatically
  	HPROPSHEETPAGE phPage;
! 	BOOL bPersistChanges;
  	if ( !PyArg_ParseTuple(args, "ii:GetPage", &tpType, &bPersistChanges))
  		return NULL;
***************
*** 47,51 ****
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIPTP, IID_IProvideTaskPage );
! 	return new PyHANDLE(phPage);
  }
  
--- 47,51 ----
  	if ( FAILED(hr) )
  		return PyCom_BuildPyException(hr, pIPTP, IID_IProvideTaskPage );
! 	return PyWinLong_FromHANDLE(phPage);
  }
  

Index: PyITask.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyITask.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyITask.cpp	4 May 2008 13:02:08 -0000	1.3
--- PyITask.cpp	13 Nov 2008 11:11:58 -0000	1.4
***************
*** 35,45 ****
  	if ( !PyArg_ParseTuple(args, "O:SetApplicationName", &obpwszApplicationName) )
  		return NULL;
! 	BOOL bPythonIsHappy = TRUE;
! 	if (bPythonIsHappy && !PyWinObject_AsBstr(obpwszApplicationName, &pwszApplicationName)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
  	hr = pIT->SetApplicationName( pwszApplicationName );
! 	SysFreeString(pwszApplicationName);
  
  	PY_INTERFACE_POSTCALL;
--- 35,44 ----
  	if ( !PyArg_ParseTuple(args, "O:SetApplicationName", &obpwszApplicationName) )
  		return NULL;
! 	if (!PyWinObject_AsWCHAR(obpwszApplicationName, &pwszApplicationName))
! 		return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
  	hr = pIT->SetApplicationName( pwszApplicationName );
! 	PyWinObject_FreeWCHAR(pwszApplicationName);
  
  	PY_INTERFACE_POSTCALL;
***************
*** 87,97 ****
  	if ( !PyArg_ParseTuple(args, "O:SetParameters", &obpwszParameters) )
  		return NULL;
! 	BOOL bPythonIsHappy = TRUE;
! 	if (bPythonIsHappy && !PyWinObject_AsBstr(obpwszParameters, &pwszParameters)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
  	hr = pIT->SetParameters( pwszParameters );
! 	SysFreeString(pwszParameters);
  
  	PY_INTERFACE_POSTCALL;
--- 86,95 ----
  	if ( !PyArg_ParseTuple(args, "O:SetParameters", &obpwszParameters) )
  		return NULL;
! 	if (!PyWinObject_AsWCHAR(obpwszParameters, &pwszParameters))
! 		return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
  	hr = pIT->SetParameters( pwszParameters );
! 	PyWinObject_FreeWCHAR(pwszParameters);
  
  	PY_INTERFACE_POSTCALL;
***************
*** 139,149 ****
  	if ( !PyArg_ParseTuple(args, "O:SetWorkingDirectory", &obpwszWorkingDirectory) )
  		return NULL;
! 	BOOL bPythonIsHappy = TRUE;
! 	if (bPythonIsHappy && !PyWinObject_AsBstr(obpwszWorkingDirectory, &pwszWorkingDirectory)) bPythonIsHappy = FALSE;
! 	if (!bPythonIsHappy) return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
  	hr = pIT->SetWorkingDirectory( pwszWorkingDirectory );
! 	SysFreeString(pwszWorkingDirectory);
  
  	PY_INTERFACE_POSTCALL;
--- 137,146 ----
  	if ( !PyArg_ParseTuple(args, "O:SetWorkingDirectory", &obpwszWorkingDirectory) )
  		return NULL;
! 	if (!PyWinObject_AsWCHAR(obpwszWorkingDirectory, &pwszWorkingDirectory))
! 		return NULL;
  	HRESULT hr;
  	PY_INTERFACE_PRECALL;
  	hr = pIT->SetWorkingDirectory( pwszWorkingDirectory );
! 	PyWinObject_FreeWCHAR(pwszWorkingDirectory);
  
  	PY_INTERFACE_POSTCALL;