Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31943/win32/src
Modified Files:
PythonService.cpp
Log Message:
Fix a couple of 64-bit issues
Index: PythonService.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PythonService.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** PythonService.cpp 10 Jan 2006 00:02:57 -0000 1.20
--- PythonService.cpp 24 Aug 2007 04:05:41 -0000 1.21
***************
*** 200,204 ****
LPCTSTR *pStrings = NULL;
PyObject *rc = NULL;
! int numStrings = 0;
BOOL ok = FALSE;
--- 200,204 ----
LPCTSTR *pStrings = NULL;
PyObject *rc = NULL;
! Py_ssize_t numStrings = 0;
BOOL ok = FALSE;
***************
*** 219,223 ****
}
memset(pStrings, 0, sizeof(TCHAR *)*(numStrings+1)); // this also terminates array!
! for (int i=0;i<numStrings;i++) {
PyObject *obString = PySequence_GetItem(obStrings, i);
if (obString==NULL) {
--- 219,223 ----
}
memset(pStrings, 0, sizeof(TCHAR *)*(numStrings+1)); // this also terminates array!
! for (Py_ssize_t i=0;i<numStrings;i++) {
PyObject *obString = PySequence_GetItem(obStrings, i);
if (obString==NULL) {
***************
*** 355,359 ****
rc = PyWin_SetAPIError("RegisterServiceCtrlHandlerEx");
} else {
! rc = PyInt_FromLong((long)pe->sshStatusHandle);
}
return rc;
--- 355,359 ----
rc = PyWin_SetAPIError("RegisterServiceCtrlHandlerEx");
} else {
! rc = PyWinLong_FromHANDLE(pe->sshStatusHandle);
}
return rc;
|