|
From: Roger U. <ru...@us...> - 2008-08-29 08:33:22
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11821 Modified Files: Tag: py3k PyIProvideTaskPage.cpp PyIScheduledWorkItem.cpp PyITask.cpp PyITaskTrigger.cpp PyITaskTrigger.h taskscheduler.cpp Log Message: Changes to build for Py3k Index: PyITaskTrigger.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyITaskTrigger.cpp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** PyITaskTrigger.cpp 28 Apr 2004 05:21:44 -0000 1.2 --- PyITaskTrigger.cpp 29 Aug 2008 08:33:26 -0000 1.2.4.1 *************** *** 143,150 **** // @object PyTASK_TRIGGER|Python object representing a TASK_TRIGGER structure via the structmember Api ! static PyTypeObject PyTASK_TRIGGERType = { ! PyObject_HEAD_INIT(&PyType_Type) ! 0, "PyTASK_TRIGGER", sizeof(PyTASK_TRIGGER), --- 143,149 ---- // @object PyTASK_TRIGGER|Python object representing a TASK_TRIGGER structure via the structmember Api ! PyTypeObject PyTASK_TRIGGERType = { ! PYWIN_OBJECT_HEAD "PyTASK_TRIGGER", sizeof(PyTASK_TRIGGER), *************** *** 165,169 **** PyObject_GenericSetAttr, // PyTASK_TRIGGER::setattro, 0, // tp_as_buffer; ! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, // tp_flags; 0, // tp_doc; /* Documentation string */ 0, // traverseproc tp_traverse; --- 164,168 ---- PyObject_GenericSetAttr, // PyTASK_TRIGGER::setattro, 0, // tp_as_buffer; ! Py_TPFLAGS_DEFAULT, // tp_flags; 0, // tp_doc; /* Documentation string */ 0, // traverseproc tp_traverse; Index: PyITask.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyITask.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** PyITask.cpp 4 May 2008 13:02:08 -0000 1.3 --- PyITask.cpp 29 Aug 2008 08:33:26 -0000 1.3.2.1 *************** *** 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; Index: PyIProvideTaskPage.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyIProvideTaskPage.cpp,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** PyIProvideTaskPage.cpp 18 Apr 2004 22:01:11 -0000 1.1 --- PyIProvideTaskPage.cpp 29 Aug 2008 08:33:26 -0000 1.1.4.1 *************** *** 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: taskscheduler.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/taskscheduler.cpp,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** taskscheduler.cpp 18 Apr 2004 22:01:11 -0000 1.2 --- taskscheduler.cpp 29 Aug 2008 08:33:26 -0000 1.2.4.1 *************** *** 25,37 **** }; ! extern "C" __declspec(dllexport) void inittaskscheduler() { ! PyObject *module; module = Py_InitModule("taskscheduler", taskscheduler_methods); ! if (module==NULL) return; ! PyObject *dict = PyModule_GetDict(module); ! if (dict==NULL) return; // Register all of our interfaces, gateways and IIDs. --- 25,63 ---- }; ! ! extern "C" __declspec(dllexport) ! #if (PY_VERSION_HEX < 0x03000000) ! void inittaskscheduler(void) ! #else ! PyObject *PyInit_taskscheduler(void) ! #endif { ! PyObject *dict, *module; ! PyWinGlobals_Ensure(); ! ! #if (PY_VERSION_HEX < 0x03000000) ! #define RETURN_ERROR return; module = Py_InitModule("taskscheduler", taskscheduler_methods); ! if (!module) return; ! dict = PyModule_GetDict(module); ! if (!dict) return; + #else + #define RETURN_ERROR return NULL; + static PyModuleDef taskscheduler_def = { + PyModuleDef_HEAD_INIT, + "taskscheduler", + "Supports the Scheduled Tasks COM interfaces", + -1, + taskscheduler_methods + }; + module = PyModule_Create(&taskscheduler_def); + if (!module) + return NULL; + dict = PyModule_GetDict(module); + if (!dict) + return NULL; + #endif // Register all of our interfaces, gateways and IIDs. *************** *** 133,135 **** --- 159,164 ---- PyModule_AddIntConstant(module,"TASKPAGE_SETTINGS", TASKPAGE_SETTINGS); + #if (PY_VERSION_HEX >= 0x03000000) + return module; + #endif } Index: PyIScheduledWorkItem.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyIScheduledWorkItem.cpp,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** PyIScheduledWorkItem.cpp 3 Jun 2007 14:53:07 -0000 1.5 --- PyIScheduledWorkItem.cpp 29 Aug 2008 08:33:26 -0000 1.5.2.1 *************** *** 389,399 **** if ( !PyArg_ParseTuple(args, "O:SetComment", &obpwszComment) ) return NULL; ! BOOL bPythonIsHappy = TRUE; ! if (bPythonIsHappy && !PyWinObject_AsBstr(obpwszComment, &pwszComment)) bPythonIsHappy = FALSE; ! if (!bPythonIsHappy) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; hr = pISWI->SetComment( pwszComment ); ! SysFreeString(pwszComment); PY_INTERFACE_POSTCALL; --- 389,399 ---- if ( !PyArg_ParseTuple(args, "O:SetComment", &obpwszComment) ) return NULL; ! ! if (!PyWinObject_AsWCHAR(obpwszComment, &pwszComment)) ! return NULL; HRESULT hr; PY_INTERFACE_PRECALL; hr = pISWI->SetComment( pwszComment ); ! PyWinObject_FreeWCHAR(pwszComment); PY_INTERFACE_POSTCALL; *************** *** 439,449 **** if ( !PyArg_ParseTuple(args, "O:SetCreator", &obpwszCreator) ) return NULL; ! BOOL bPythonIsHappy = TRUE; ! if (bPythonIsHappy && !PyWinObject_AsBstr(obpwszCreator, &pwszCreator)) bPythonIsHappy = FALSE; ! if (!bPythonIsHappy) return NULL; HRESULT hr; PY_INTERFACE_PRECALL; hr = pISWI->SetCreator( pwszCreator ); ! SysFreeString(pwszCreator); PY_INTERFACE_POSTCALL; --- 439,448 ---- if ( !PyArg_ParseTuple(args, "O:SetCreator", &obpwszCreator) ) return NULL; ! if (!PyWinObject_AsWCHAR(obpwszCreator, &pwszCreator)) ! return NULL; HRESULT hr; PY_INTERFACE_PRECALL; hr = pISWI->SetCreator( pwszCreator ); ! PyWinObject_FreeWCHAR(pwszCreator); PY_INTERFACE_POSTCALL; Index: PyITaskTrigger.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/taskscheduler/src/PyITaskTrigger.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** PyITaskTrigger.h 10 Apr 2004 05:18:41 -0000 1.1 --- PyITaskTrigger.h 29 Aug 2008 08:33:26 -0000 1.1.4.1 *************** *** 10,13 **** --- 10,15 ---- BOOL PyTASK_TRIGGER_check(PyObject *ob); + extern __declspec(dllexport) PyTypeObject PyTASK_TRIGGERType; + class PyITaskTrigger : public PyIUnknown { |
