[pywin32-checkins] pywin32/com/win32comext/internet/src PyIInternetProtocol.cpp, 1.1, 1.2 PyIInternetProtocol.h, 1.1, 1.2 PyIInternetProtocolRoot.cpp, 1.2, 1.3 PyIInternetProtocolRoot.h, 1.1, 1.2

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/internet/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23340/com/win32comext/internet/src

Modified Files:
	PyIInternetProtocol.cpp PyIInternetProtocol.h 
	PyIInternetProtocolRoot.cpp PyIInternetProtocolRoot.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: PyIInternetProtocolRoot.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/internet/src/PyIInternetProtocolRoot.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyIInternetProtocolRoot.h	1 Sep 1999 23:15:28 -0000	1.1
--- PyIInternetProtocolRoot.h	24 May 2007 06:01:05 -0000	1.2
***************
*** 40,44 ****
  		IInternetBindInfo __RPC_FAR * pOIBindInfo,
  		DWORD grfPI,
! 		DWORD dwReserved);
  
  	STDMETHOD(Continue)(
--- 40,44 ----
  		IInternetBindInfo __RPC_FAR * pOIBindInfo,
  		DWORD grfPI,
! 		HANDLE_PTR dwReserved);
  
  	STDMETHOD(Continue)(

Index: PyIInternetProtocolRoot.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/internet/src/PyIInternetProtocolRoot.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIInternetProtocolRoot.cpp	26 Nov 1999 14:15:31 -0000	1.2
--- PyIInternetProtocolRoot.cpp	24 May 2007 06:01:05 -0000	1.3
***************
*** 206,210 ****
  		/* [in] */ IInternetBindInfo __RPC_FAR * pOIBindInfo,
  		/* [in] */ DWORD grfPI,
! 		/* [in] */ DWORD dwReserved)
  {
  	PY_GATEWAY_METHOD;
--- 206,210 ----
  		/* [in] */ IInternetBindInfo __RPC_FAR * pOIBindInfo,
  		/* [in] */ DWORD grfPI,
! 		/* [in] */ HANDLE_PTR dwReserved)
  {
  	PY_GATEWAY_METHOD;
***************
*** 215,219 ****
  	obpOIProtSink = PyCom_PyObjectFromIUnknown(pOIProtSink, IID_IInternetProtocolSink, TRUE);
  	obpOIBindInfo = PyCom_PyObjectFromIUnknown(pOIBindInfo, IID_IInternetBindInfo, TRUE);
! 	HRESULT hr=InvokeViaPolicy("Start", NULL, "OOOii", obszUrl, obpOIProtSink, obpOIBindInfo, grfPI, dwReserved);
  	Py_XDECREF(obszUrl);
  	Py_XDECREF(obpOIProtSink);
--- 215,219 ----
  	obpOIProtSink = PyCom_PyObjectFromIUnknown(pOIProtSink, IID_IInternetProtocolSink, TRUE);
  	obpOIBindInfo = PyCom_PyObjectFromIUnknown(pOIBindInfo, IID_IInternetBindInfo, TRUE);
! 	HRESULT hr=InvokeViaPolicy("Start", NULL, "OOOiN", obszUrl, obpOIProtSink, obpOIBindInfo, grfPI, PyLong_FromVoidPtr((void *)dwReserved));
  	Py_XDECREF(obszUrl);
  	Py_XDECREF(obpOIProtSink);

Index: PyIInternetProtocol.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/internet/src/PyIInternetProtocol.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyIInternetProtocol.h	1 Sep 1999 23:15:28 -0000	1.1
--- PyIInternetProtocol.h	24 May 2007 06:01:05 -0000	1.2
***************
*** 38,42 ****
  		IInternetBindInfo __RPC_FAR * pOIBindInfo,
  		DWORD grfPI,
! 		DWORD dwReserved);
  
  	STDMETHOD(Continue)(
--- 38,42 ----
  		IInternetBindInfo __RPC_FAR * pOIBindInfo,
  		DWORD grfPI,
! 		HANDLE_PTR dwReserved);
  
  	STDMETHOD(Continue)(

Index: PyIInternetProtocol.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/internet/src/PyIInternetProtocol.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyIInternetProtocol.cpp	1 Sep 1999 23:15:28 -0000	1.1
--- PyIInternetProtocol.cpp	24 May 2007 06:01:05 -0000	1.2
***************
*** 147,151 ****
  
  // Std delegation
! STDMETHODIMP PyGInternetProtocol::Start(LPCWSTR szUrl,	IInternetProtocolSink __RPC_FAR * pOIProtSink, IInternetBindInfo __RPC_FAR * pOIBindInfo, DWORD grfPI, DWORD dwReserved)
  	{ return PyGInternetProtocolRoot::Start(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved);}
  
--- 147,151 ----
  
  // Std delegation
! STDMETHODIMP PyGInternetProtocol::Start(LPCWSTR szUrl,	IInternetProtocolSink __RPC_FAR * pOIProtSink, IInternetBindInfo __RPC_FAR * pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved)
  	{ return PyGInternetProtocolRoot::Start(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved);}