Update of /cvsroot/pywin32/pywin32/com/win32comext/axscript/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19745/com/win32comext/axscript/src
Modified Files:
Tag: AMD64
AXScript.h PyGActiveScriptParse.cpp
PyIActiveScriptParseProcedure.cpp
PyIActiveScriptParseProcedure.h
Log Message:
- Initial work on AMD64 support
Index: PyIActiveScriptParseProcedure.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/PyIActiveScriptParseProcedure.cpp,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** PyIActiveScriptParseProcedure.cpp 25 Jan 2005 13:34:07 -0000 1.3
--- PyIActiveScriptParseProcedure.cpp 21 Dec 2006 23:17:16 -0000 1.3.2.1
***************
*** 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_EX dwSourceContextCookie,
/* [in] */ ULONG ulStartingLineNumber,
/* [in] */ DWORD dwFlags,
Index: AXScript.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axscript/src/AXScript.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** AXScript.h 1 Sep 1999 23:12:45 -0000 1.1
--- AXScript.h 21 Dec 2006 23:17:16 -0000 1.1.2.1
***************
*** 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_EX 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_EX 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.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** PyIActiveScriptParseProcedure.h 1 Sep 1999 23:12:46 -0000 1.1
--- PyIActiveScriptParseProcedure.h 21 Dec 2006 23:17:16 -0000 1.1.2.1
***************
*** 37,41 ****
IUnknown __RPC_FAR * punkContext,
LPCOLESTR pstrDelimiter,
! DWORD dwSourceContextCookie,
ULONG ulStartingLineNumber,
DWORD dwFlags,
--- 37,41 ----
IUnknown __RPC_FAR * punkContext,
LPCOLESTR pstrDelimiter,
! DWORD_EX 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.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** PyGActiveScriptParse.cpp 5 Nov 2003 22:05:25 -0000 1.4
--- PyGActiveScriptParse.cpp 21 Dec 2006 23:17:16 -0000 1.4.2.1
***************
*** 25,29 ****
--- 25,35 ----
/* [in] */ LPCOLESTR pstrEventName,
/* [in] */ LPCOLESTR pstrDelimiter,
+ #ifdef _M_AMD64
+ /* [in] */ DWORDLONG dwSourceContextCookie,
+ #elif defined (_M_IX86)
/* [in] */ DWORD dwSourceContextCookie,
+ #else
+ #error !!! Need to write code for this architecture
+ #endif
/* [in] */ ULONG ulStartingLineNumber,
/* [in] */ DWORD dwFlags,
***************
*** 60,64 ****
--- 66,76 ----
/* [in] */ IUnknown __RPC_FAR *punkContext,
/* [in] */ LPCOLESTR pstrDelimiter,
+ #ifdef _M_AMD64
+ /* [in] */ DWORDLONG dwSourceContextCookie,
+ #elif defined (_M_IX86)
/* [in] */ DWORD dwSourceContextCookie,
+ #else
+ #error !!! Need to write code for this architecture
+ #endif
/* [in] */ ULONG ulStartingLineNumber,
/* [in] */ DWORD dwFlags,
|