|
From: Mark H. <mha...@us...> - 2007-05-24 06:01:06
|
Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23340/com/win32comext/axscript/src Modified Files: AXScript.h PyGActiveScriptParse.cpp PyIActiveScriptParseProcedure.cpp PyIActiveScriptParseProcedure.h 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: PyIActiveScriptParseProcedure.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/PyIActiveScriptParseProcedure.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyIActiveScriptParseProcedure.cpp 25 Jan 2005 13:34:07 -0000 1.3 --- PyIActiveScriptParseProcedure.cpp 24 May 2007 06:01:05 -0000 1.4 *************** *** 107,111 **** /* [in] */ IUnknown __RPC_FAR * punkContext, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, --- 107,111 ---- /* [in] */ IUnknown __RPC_FAR * punkContext, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD_PTR dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, *************** *** 126,131 **** obpunkContext = PyCom_PyObjectFromIUnknown(punkContext, IID_IUnknown, TRUE); obpstrDelimiter = PyWinObject_FromOLECHAR(pstrDelimiter); PyObject *result; ! HRESULT hr=InvokeViaPolicy("ParseProcedureText", &result, "OOOOOOiii", obpstrCode, obpstrFormalParams, obpstrProcedureName, obpstrItemName, obpunkContext, obpstrDelimiter, dwSourceContextCookie, ulStartingLineNumber, dwFlags); Py_XDECREF(obpstrCode); Py_XDECREF(obpstrFormalParams); --- 126,132 ---- obpunkContext = PyCom_PyObjectFromIUnknown(punkContext, IID_IUnknown, TRUE); obpstrDelimiter = PyWinObject_FromOLECHAR(pstrDelimiter); + PyObject *obContext = PyWinObject_FromDWORD_PTR(dwSourceContextCookie); PyObject *result; ! HRESULT hr=InvokeViaPolicy("ParseProcedureText", &result, "OOOOOOOii", obpstrCode, obpstrFormalParams, obpstrProcedureName, obpstrItemName, obpunkContext, obpstrDelimiter, obContext, ulStartingLineNumber, dwFlags); Py_XDECREF(obpstrCode); Py_XDECREF(obpstrFormalParams); *************** *** 134,137 **** --- 135,139 ---- Py_XDECREF(obpunkContext); Py_XDECREF(obpstrDelimiter); + Py_XDECREF(obContext); if (FAILED(hr)) return hr; // Process the Python results, and convert back to the real params Index: AXScript.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/AXScript.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AXScript.h 1 Sep 1999 23:12:45 -0000 1.1 --- AXScript.h 24 May 2007 06:01:05 -0000 1.2 *************** *** 197,201 **** /* [in] */ LPCOLESTR pstrEventName, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, --- 197,201 ---- /* [in] */ LPCOLESTR pstrEventName, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD_PTR dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, *************** *** 208,212 **** /* [in] */ IUnknown __RPC_FAR *punkContext, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, --- 208,212 ---- /* [in] */ IUnknown __RPC_FAR *punkContext, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD_PTR dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, Index: PyIActiveScriptParseProcedure.h =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/PyIActiveScriptParseProcedure.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PyIActiveScriptParseProcedure.h 1 Sep 1999 23:12:46 -0000 1.1 --- PyIActiveScriptParseProcedure.h 24 May 2007 06:01:05 -0000 1.2 *************** *** 37,41 **** IUnknown __RPC_FAR * punkContext, LPCOLESTR pstrDelimiter, ! DWORD dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, --- 37,41 ---- IUnknown __RPC_FAR * punkContext, LPCOLESTR pstrDelimiter, ! DWORD_PTR dwSourceContextCookie, ULONG ulStartingLineNumber, DWORD dwFlags, Index: PyGActiveScriptParse.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/PyGActiveScriptParse.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyGActiveScriptParse.cpp 5 Nov 2003 22:05:25 -0000 1.4 --- PyGActiveScriptParse.cpp 24 May 2007 06:01:05 -0000 1.5 *************** *** 25,29 **** /* [in] */ LPCOLESTR pstrEventName, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, --- 25,29 ---- /* [in] */ LPCOLESTR pstrEventName, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD_PTR dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, *************** *** 38,44 **** PyObject *obEventName = PyWinObject_FromOLECHAR(pstrEventName); PyObject *obDelimiter = PyWinObject_FromOLECHAR(pstrDelimiter); PyObject *result; HRESULT hr = InvokeGatewayViaPolicy(this, "AddScriptlet", pexcepinfo, &result, ! "NNNNNNii", obDefaultName, obCode, --- 38,45 ---- PyObject *obEventName = PyWinObject_FromOLECHAR(pstrEventName); PyObject *obDelimiter = PyWinObject_FromOLECHAR(pstrDelimiter); + PyObject *obContext = PyWinObject_FromDWORD_PTR(dwSourceContextCookie); PyObject *result; HRESULT hr = InvokeGatewayViaPolicy(this, "AddScriptlet", pexcepinfo, &result, ! "NNNNNNNi", obDefaultName, obCode, *************** *** 47,51 **** obEventName, obDelimiter, ! dwSourceContextCookie, ulStartingLineNumber); if (FAILED(hr)) return hr; --- 48,52 ---- obEventName, obDelimiter, ! obContext, ulStartingLineNumber); if (FAILED(hr)) return hr; *************** *** 60,64 **** /* [in] */ IUnknown __RPC_FAR *punkContext, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, --- 61,65 ---- /* [in] */ IUnknown __RPC_FAR *punkContext, /* [in] */ LPCOLESTR pstrDelimiter, ! /* [in] */ DWORD_PTR dwSourceContextCookie, /* [in] */ ULONG ulStartingLineNumber, /* [in] */ DWORD dwFlags, *************** *** 77,88 **** PyObject *obItemName = PyWinObject_FromOLECHAR(pstrItemName); PyObject *obDelimiter = PyWinObject_FromOLECHAR(pstrDelimiter); ! HRESULT hr = InvokeGatewayViaPolicy(this, "ParseScriptText", pexcepinfo, &result, ! "NNONiiii", obCode, obItemName, context, obDelimiter, ! dwSourceContextCookie, ulStartingLineNumber, dwFlags, --- 78,89 ---- PyObject *obItemName = PyWinObject_FromOLECHAR(pstrItemName); PyObject *obDelimiter = PyWinObject_FromOLECHAR(pstrDelimiter); ! PyObject *obContext = PyWinObject_FromDWORD_PTR(dwSourceContextCookie); HRESULT hr = InvokeGatewayViaPolicy(this, "ParseScriptText", pexcepinfo, &result, ! "NNONNiii", obCode, obItemName, context, obDelimiter, ! obContext, ulStartingLineNumber, dwFlags, |
