pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/win32/src win32inet.i, 1.9, 1.10 win32inet_winhttp.cpp, 1.1, 1.2

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12569

Modified Files:
	win32inet.i win32inet_winhttp.cpp 
Log Message:
Add win32inet.WinHttpOpen and WinHttpGetProxyForUrl


Index: win32inet.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** win32inet.i	7 Apr 2008 22:10:35 -0000	1.9
--- win32inet.i	9 Apr 2008 04:31:07 -0000	1.10
***************
*** 1924,1930 ****
--- 1924,1934 ----
  extern void init_win32inetstuff();
  extern PyObject *PyWinHttpGetIEProxyConfigForCurrentUser(PyObject *, PyObject *);
+ extern PyObject *PyWinHttpGetProxyForUrl(PyObject *, PyObject *);
+ extern PyObject *PyWinHttpOpen(PyObject *, PyObject *);
  %}
  
  %native(WinHttpGetIEProxyConfigForCurrentUser) PyWinHttpGetIEProxyConfigForCurrentUser;
+ %native(WinHttpGetProxyForUrl) PyWinHttpGetProxyForUrl;
+ %native(WinHttpOpen) PyWinHttpOpen;
  
  %init %{

Index: win32inet_winhttp.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet_winhttp.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** win32inet_winhttp.cpp	19 Feb 2006 12:56:46 -0000	1.1
--- win32inet_winhttp.cpp	9 Apr 2008 04:31:07 -0000	1.2
***************
*** 11,18 ****
--- 11,26 ----
  #include "pywintypes.h"
  
+ extern PyObject *PyObject_FromHINTERNET(HINTERNET hi);
+ 
  // @doc
  typedef BOOL (WINAPI *funcWinHttpGetIEProxyConfigForCurrentUser)(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *);
  static funcWinHttpGetIEProxyConfigForCurrentUser pfnWinHttpGetIEProxyConfigForCurrentUser=NULL;
  
+ typedef BOOL (WINAPI *funcWinHttpGetProxyForUrl)(HINTERNET, LPCWSTR, WINHTTP_AUTOPROXY_OPTIONS*, WINHTTP_PROXY_INFO *);
+ static funcWinHttpGetProxyForUrl pfnWinHttpGetProxyForUrl=NULL;
+ 
+ typedef HINTERNET (WINAPI *funcWinHttpOpen)(LPCWSTR, DWORD, LPCWSTR, LPCWSTR, DWORD);
+ static funcWinHttpOpen pfnWinHttpOpen=NULL;
+ 
  #define CHECK_PFN(fname) \
    if (pfn##fname==NULL) \
***************
*** 36,39 ****
--- 44,49 ----
          return; // nothing else to do!
      LOAD_PFN(WinHttpGetIEProxyConfigForCurrentUser);
+     LOAD_PFN(WinHttpGetProxyForUrl);
+     LOAD_PFN(WinHttpOpen);
  }
  
***************
*** 64,65 ****
--- 74,209 ----
      return ret;
  }
+ 
+ // @object WINHTTP_AUTOPROXY_OPTIONS|Used by <om win32inet.WinHTTPGetProxyForUrl>
+ BOOL PyObject_AsWINHTTP_AUTOPROXY_OPTIONS(PyObject *ob, WINHTTP_AUTOPROXY_OPTIONS *out)
+ {
+     int autoLogin = 1;
+     PyObject *obAutoConfig;
+     PyObject *obReserved = Py_None;
+     if (!PyArg_ParseTuple(ob, "kkO|Oii",
+                   &out->dwFlags, // @pyparm int|dwFlags||
+                   &out->dwAutoDetectFlags, // @pyparm int|dwAutoDetectFlags||
+                   &obAutoConfig, // @pyparm string|obAutoConfig||
+                   &obReserved, // @pyparm object|obReserved|None|Must be None
+                   &out->dwReserved, // @pyparm int|dwReserved|0|Must be zero
+                   &autoLogin)) // @pyparm bool|autoLogin|1|
+         return FALSE;
+     out->fAutoLogonIfChallenged = autoLogin;
+     if (obReserved != Py_None) {
+         PyErr_SetString(PyExc_TypeError, "reserved param must be None");
+         return FALSE;
+     }
+     if (!PyWinObject_AsWCHAR(obAutoConfig, (WCHAR **)&out->lpszAutoConfigUrl, TRUE))
+         return FALSE;
+     return TRUE;
+ }
+ 
+ void PyObject_CleanupWINHTTP_AUTOPROXY_OPTIONS(WINHTTP_AUTOPROXY_OPTIONS *out)
+ {
+     if (out->lpszAutoConfigUrl)
+         PyWinObject_FreeWCHAR((WCHAR *)out->lpszAutoConfigUrl);
+ }
+ 
+ // @pymethod tuple|win32inet|WinHttpGetIEProxyConfigForCurrentUser|Obtains
+ // the Internet Explorer proxy configuration for the current user.
+ PyObject *PyWinHttpGetProxyForUrl(PyObject *self, PyObject *args)
+ {
+     CHECK_PFN(WinHttpGetProxyForUrl);
+     PyObject *obHandle, *obURL, *obOptions;
+     if (!PyArg_ParseTuple(args, "OOO:WinHttpGetProxyForUrl",
+               &obHandle, // @pyparm <o HANDLE>/int|handle||
+               &obURL, // @pyparm unicode/string|url||
+               &obOptions // @pyparm tuple|options||
+               ))
+         return NULL;
+ 
+     BOOL ok;
+     HINTERNET hi;
+     WCHAR *url = NULL;
+     WINHTTP_AUTOPROXY_OPTIONS opts;
+     WINHTTP_PROXY_INFO info;
+     PyObject *ret = NULL;
+     memset(&opts, 0, sizeof(opts));
+     memset(&info, 0, sizeof(info));
+ 
+     if (!PyWinObject_AsHANDLE(obHandle, (HANDLE *)&hi))
+         goto done;
+ 
+     if (!PyWinObject_AsWCHAR(obURL, &url, TRUE))
+         goto done;
+ 
+     if (!PyObject_AsWINHTTP_AUTOPROXY_OPTIONS(obOptions, &opts))
+         goto done;
+ 
+     Py_BEGIN_ALLOW_THREADS
+     ok = (*pfnWinHttpGetProxyForUrl)(hi, url, &opts, &info);
+     Py_END_ALLOW_THREADS
+     if (!ok) {
+         PyWin_SetAPIError("WinHttpGetProxyForUrl");
+         goto done;
+     }
+     // @rdesc The result is a windows WINHTTP_PROXY_INFO
+     // structure; a tuple of an int (bool) and 2 unicode strings
+     // (dwAccessType, lpszProxy, lpszProxyBypass).
+     // @pyseeapi WinHttpGetProxyForUrl
+     // @pyseeapi WINHTTP_PROXY_INFO
+     ret = Py_BuildValue("kuu",
+                         info.dwAccessType,
+                         info.lpszProxy,
+                         info.lpszProxyBypass);
+     if (info.lpszProxy) GlobalFree(info.lpszProxy);
+     if (info.lpszProxyBypass) GlobalFree(info.lpszProxyBypass);
+ done:
+     if (url)
+         PyWinObject_FreeWCHAR(url);
+     PyObject_CleanupWINHTTP_AUTOPROXY_OPTIONS(&opts);
+     return ret;
+ }
+ 
+ // @pymethod <o PyHINTERNET>|win32inet|WinHttpOpen|Opens a winhttp session.
+ PyObject *PyWinHttpOpen(PyObject *self, PyObject *args)
+ {
+     PyObject *obUA, *obProxyName, *obProxyBypass;
+     DWORD dwAccessType, dwFlags;
+     CHECK_PFN(WinHttpOpen);
+     if (!PyArg_ParseTuple(args, "OkOOk:WinHttpOpen",
+               &obUA, // @pyparm string|lpszUserAgent||
+               &dwAccessType, // @pyparm int|dwAccessType||
+               &obProxyName, // @pyparm string|lpszProxyName||
+               &obProxyBypass, // @pyparm string|lpszProxyBypass||
+               &dwFlags)) // @pyparm int|dwFlags||
+         return NULL;
+ 
+     HINTERNET hi;
+     WCHAR *ua = NULL;
+     WCHAR *proxy = NULL;
+     WCHAR *proxy_bypass = NULL;
+     PyObject *ret = NULL;
+ 
+     if (!PyWinObject_AsWCHAR(obUA, &ua, TRUE))
+         goto done;
+ 
+     if (!PyWinObject_AsWCHAR(obProxyName, &proxy, TRUE))
+         goto done;
+ 
+     if (!PyWinObject_AsWCHAR(obProxyBypass, &proxy_bypass, TRUE))
+         goto done;
+ 
+     Py_BEGIN_ALLOW_THREADS
+     hi = (*pfnWinHttpOpen)(ua, dwAccessType, proxy, proxy_bypass, dwFlags);
+     Py_END_ALLOW_THREADS
+     if (!hi) {
+         PyWin_SetAPIError("WinHttpOpen");
+         goto done;
+     }
+     // @pyseeapi WinHttpOpen
+     ret = PyObject_FromHINTERNET(hi);
+ done:
+     if (ua)
+         PyWinObject_FreeWCHAR(ua);
+     if (proxy)
+         PyWinObject_FreeWCHAR(proxy);
+     if (proxy_bypass)
+         PyWinObject_FreeWCHAR(proxy_bypass);
+     return ret;
+ }

[pywin32-checkins] pywin32/com/win32com/src/include PythonCOM.h, 1.26, 1.27

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20576/win32com/src/include

Modified Files:
	PythonCOM.h 
Log Message:
Fix and test some limitations passing around currency objects.
Should fix [ 1935488 ] gencache and Delphi Currency


Index: PythonCOM.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/include/PythonCOM.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** PythonCOM.h	4 Sep 2007 10:32:05 -0000	1.26
--- PythonCOM.h	8 Apr 2008 11:51:26 -0000	1.27
***************
*** 710,713 ****
--- 710,714 ----
  		VARIANT *m_varBuf;
  		DATE m_dateBuf;
+ 		CY m_cyBuf;
  	};
  };

[pywin32-checkins] pywin32/com/win32com/src oleargs.cpp,1.40,1.41

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20576/win32com/src

Modified Files:
	oleargs.cpp 
Log Message:
Fix and test some limitations passing around currency objects.
Should fix [ 1935488 ] gencache and Delphi Currency


Index: oleargs.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/oleargs.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** oleargs.cpp	11 Sep 2007 08:55:20 -0000	1.40
--- oleargs.cpp	8 Apr 2008 11:51:26 -0000	1.41
***************
*** 1329,1337 ****
  		rc = PyObject_AsVARIANTRecordInfo(obj, var);
  		break;
  	default:
  		// could try default, but this error indicates we need to
  		// beef up the VARIANT support, rather than default.
  		TCHAR buf[200];
! 		wsprintf(buf, _T("The VARIANT type is unknown (%08lx)"), m_reqdType);
  		OleSetTypeErrorT(buf);
  		rc = FALSE;
--- 1329,1349 ----
  		rc = PyObject_AsVARIANTRecordInfo(obj, var);
  		break;
+ 	case VT_CY:
+ 		rc = PyObject_AsCurrency(obj, &V_CY(var));
+ 		break;
+ 	case VT_CY | VT_BYREF:
+ 		if (bCreateBuffers)
+ 			V_CYREF(var) = &m_cyBuf;
+ 		if (!VALID_BYREF_MISSING(obj)) {
+ 			if (!PyObject_AsCurrency(obj, V_CYREF(var)))
+ 				BREAK_FALSE;
+ 		} else
+ 			V_CYREF(var)->int64 = 0;
+ 		break;
  	default:
  		// could try default, but this error indicates we need to
  		// beef up the VARIANT support, rather than default.
  		TCHAR buf[200];
! 		wsprintf(buf, _T("The VARIANT type is unknown (0x%08lx)"), m_reqdType);
  		OleSetTypeErrorT(buf);
  		rc = FALSE;

[pywin32-checkins] pywin32/com/TestSources/PyCOMTest PyCOMImpl.cpp, 1.17, 1.18 PyCOMImpl.h, 1.15, 1.16 PyCOMTest.idl, 1.16, 1.17

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

Update of /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20576/TestSources/PyCOMTest

Modified Files:
	PyCOMImpl.cpp PyCOMImpl.h PyCOMTest.idl 
Log Message:
Fix and test some limitations passing around currency objects.
Should fix [ 1935488 ] gencache and Delphi Currency


Index: PyCOMTest.idl
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest/PyCOMTest.idl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PyCOMTest.idl	4 Sep 2007 10:53:29 -0000	1.16
--- PyCOMTest.idl	8 Apr 2008 11:51:26 -0000	1.17
***************
*** 239,242 ****
--- 239,249 ----
  
  		HRESULT TestQueryInterface();
+ 		HRESULT AddCurrencies(
+ 						[in] CY v1,
+ 						[in] CY v2,
+ 						[out, retval] CY* pResult);
+ 		HRESULT DoubleCurrency([in] CY v,
+ 		                       [out, retval] CY *ret );
+ 		HRESULT DoubleCurrencyByVal([in, out] CY *v);
  		// Some test properties
  		[propget] HRESULT LongProp([out, retval] long* retval);

Index: PyCOMImpl.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest/PyCOMImpl.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PyCOMImpl.h	4 Sep 2007 10:53:29 -0000	1.15
--- PyCOMImpl.h	8 Apr 2008 11:51:26 -0000	1.16
***************
*** 82,85 ****
--- 82,88 ----
  	STDMETHOD(SetVarArgs)(SAFEARRAY *);
  	STDMETHOD(GetLastVarArgs)(SAFEARRAY **);
+ 	STDMETHOD(DoubleCurrency)(CY, CY *);
+ 	STDMETHOD(DoubleCurrencyByVal)(CY *);
+ 	STDMETHOD(AddCurrencies)(CY v1, CY v2, CY *);
  
  	// method to broadcast a call on the current connections

Index: PyCOMImpl.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest/PyCOMImpl.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** PyCOMImpl.cpp	3 Apr 2008 07:21:41 -0000	1.17
--- PyCOMImpl.cpp	8 Apr 2008 11:51:26 -0000	1.18
***************
*** 742,745 ****
--- 742,763 ----
  
  
+ HRESULT CPyCOMTest::DoubleCurrencyByVal(CY *v)
+ {
+ 	v->int64 *= 2;
+ 	return S_OK;
+ }
+ 
+ HRESULT CPyCOMTest::DoubleCurrency(CY v, CY *ret)
+ {
+ 	ret->int64 = v.int64 * 2;
+ 	return S_OK;
+ }
+ 
+ HRESULT CPyCOMTest::AddCurrencies(CY v1, CY v2, CY *pret)
+ {
+ 	pret->int64 = v1.int64 + v2.int64;
+ 	return S_OK;
+ }
+ 
  HRESULT CPyCOMTest::NotScriptable(int *val)
  {

[pywin32-checkins] pywin32/com/win32com/test testPyComTest.py, 1.29, 1.30

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20576/win32com/test

Modified Files:
	testPyComTest.py 
Log Message:
Fix and test some limitations passing around currency objects.
Should fix [ 1935488 ] gencache and Delphi Currency


Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** testPyComTest.py	20 Oct 2007 05:24:52 -0000	1.29
--- testPyComTest.py	8 Apr 2008 11:51:26 -0000	1.30
***************
*** 12,16 ****
  importMsg = "**** PyCOMTest is not installed ***\n  PyCOMTest is a Python test specific COM client and server.\n  It is likely this server is not installed on this machine\n  To install the server, you must get the win32com sources\n  and build it using MS Visual C++"
  
! error = "testPyCOMTest error"
  
  # This test uses a Python implemented COM server - ensure correctly registered.
--- 12,16 ----
  importMsg = "**** PyCOMTest is not installed ***\n  PyCOMTest is a Python test specific COM client and server.\n  It is likely this server is not installed on this machine\n  To install the server, you must get the win32com sources\n  and build it using MS Visual C++"
  
! error = Exception
  
  # This test uses a Python implemented COM server - ensure correctly registered.
***************
*** 150,153 ****
--- 150,158 ----
      if o.CurrencyProp != decimal.Decimal("1234.5678"):
          raise error, "got %r" % (o.CurrencyProp,)
+     v1 = decimal.Decimal("1234.5678")
+     # can't do "DoubleCurrencyByVal" in dynamic files.
+     TestApplyResult(o.DoubleCurrency, (v1,), v1*2)
+     v2 = decimal.Decimal("9012.3456")
+     TestApplyResult(o.AddCurrencies, (v1, v2), v1+v2)
  
      # damn - props with params don't work for dynamic objects :(
***************
*** 312,315 ****
--- 317,325 ----
          if o.CurrencyProp != decimal.Decimal(val):
              raise error, "%s got %r" % (val, o.CurrencyProp)
+     v1 = decimal.Decimal("1234.5678")
+     TestApplyResult(o.DoubleCurrency, (v1,), v1*2)
+     TestApplyResult(o.DoubleCurrencyByVal, (v1,), v1*2)
+     v2 = decimal.Decimal("9012.3456")
+     TestApplyResult(o.AddCurrencies, (v1, v2), v1+v2)
  
      o.SetParamProp(0, 1)

[pywin32-checkins] pywin32/com/win32comext/axdebug adb.py,1.5,1.6

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/axdebug
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6757/win32comext/axdebug

Modified Files:
	adb.py 
Log Message:
py2.6 seems to warn about asserts with a constant false expression!


Index: adb.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/axdebug/adb.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** adb.py	18 Jun 2006 13:18:26 -0000	1.5
--- adb.py	8 Apr 2008 11:14:00 -0000	1.6
***************
*** 238,242 ****
              self.set_return(frame)
          else:
!             assert(0, "unknown resume action flags")
          self.breakReason = None
  
--- 238,242 ----
              self.set_return(frame)
          else:
!             raise ValueError("unknown resume action flags")
          self.breakReason = None
  

[pywin32-checkins] pywin32/win32/src win32inet.i,1.8,1.9

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3070

Modified Files:
	win32inet.i 
Log Message:
Trim trailing NULL from data returned by InternetGetCookie

Index: win32inet.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet.i,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** win32inet.i	7 Apr 2008 20:02:29 -0000	1.8
--- win32inet.i	7 Apr 2008 22:10:35 -0000	1.9
***************
*** 394,398 ****
          PyWin_SetAPIError("InternetGetCookie");
      else
! 		ret=PyWinObject_FromTCHAR(buf, cb);
  done:
  	if (buf) free(buf);
--- 394,398 ----
          PyWin_SetAPIError("InternetGetCookie");
      else
! 		ret=PyWinObject_FromTCHAR(buf, cb-1);
  done:
  	if (buf) free(buf);

[pywin32-checkins] pywin32/win32/src win32inet.i,1.7,1.8

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19463

Modified Files:
	win32inet.i 
Log Message:
Fix memory leak in CommitUrlCacheEntry

Index: win32inet.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet.i,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** win32inet.i	7 Apr 2008 00:08:39 -0000	1.7
--- win32inet.i	7 Apr 2008 20:02:29 -0000	1.8
***************
*** 1748,1751 ****
--- 1748,1752 ----
  	PyWinObject_FreeTCHAR(LocalFileName);
  	PyWinObject_FreeTCHAR(OriginalUrl);
+ 	PyWinObject_FreeTCHAR((TCHAR *)HeaderInfo);
  	return ret;
  };

[pywin32-checkins] pywin32/win32/src win32inet.i,1.6,1.7

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18433

Modified Files:
	win32inet.i 
Log Message:
64-bit fixes
Allow to build with UNICODE defined
Add support for status callback function
Add URL cache functions

Index: win32inet.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32inet.i	3 Jun 2007 14:53:07 -0000	1.6
--- win32inet.i	7 Apr 2008 00:08:39 -0000	1.7
***************
*** 1,8 ****
  /* File : win32inet.i */
  // @doc
- 
  %module win32inet // An interface to the Windows internet (wininet) API
- 
  %{
  #include "Windows.h"
  #include "WinInet.h"
--- 1,8 ----
  /* File : win32inet.i */
[...1947 lines suppressed...]
! 			||(strcmp(pmd->ml_name, "FindFirstUrlCacheEntry")==0)
! 			||(strcmp(pmd->ml_name, "FindNextUrlCacheEntry")==0)
! 			||(strcmp(pmd->ml_name, "FindFirstUrlCacheEntryEx")==0)
! 			||(strcmp(pmd->ml_name, "FindNextUrlCacheEntryEx")==0)
! 			||(strcmp(pmd->ml_name, "FindCloseUrlCache")==0)
! 			||(strcmp(pmd->ml_name, "FindFirstUrlCacheGroup")==0)
! 			||(strcmp(pmd->ml_name, "FindNextUrlCacheGroup")==0)
! 			||(strcmp(pmd->ml_name, "GetUrlCacheGroupAttribute")==0)
! 			||(strcmp(pmd->ml_name, "GetUrlCacheEntryInfo")==0)
! 			||(strcmp(pmd->ml_name, "DeleteUrlCacheGroup")==0)
! 			||(strcmp(pmd->ml_name, "CreateUrlCacheGroup")==0)
! 			||(strcmp(pmd->ml_name, "CreateUrlCacheEntry")==0)
! 			||(strcmp(pmd->ml_name, "CommitUrlCacheEntry")==0)
! 			||(strcmp(pmd->ml_name, "SetUrlCacheEntryGroup")==0)
! 			||(strcmp(pmd->ml_name, "SetUrlCacheGroupAttribute")==0)
! 			){
! 			pmd->ml_flags =	METH_VARARGS | METH_KEYWORDS;
! 			}
! 	init_win32inetstuff();
  %}

[pywin32-checkins] pywin32/Pythonwin/Scintilla/win32 scintilla_vc6.mak, 1.4, 1.5

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27587/Scintilla/win32

Modified Files:
	scintilla_vc6.mak 
Log Message:
link debug builds of scintilla with /DEBUG


Index: scintilla_vc6.mak
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/Scintilla/win32/scintilla_vc6.mak,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scintilla_vc6.mak	10 Feb 2008 11:01:48 -0000	1.4
--- scintilla_vc6.mak	4 Apr 2008 04:57:33 -0000	1.5
***************
*** 44,48 ****
  # If you have problems with lexers being linked, try removing -OPT:REF and replacing with -OPT:NOREF
  LDFLAGS=-OPT:NOWIN98 -OPT:REF
! LDDEBUG=
  LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB
  NOLOGO=-nologo
--- 44,48 ----
  # If you have problems with lexers being linked, try removing -OPT:REF and replacing with -OPT:NOREF
  LDFLAGS=-OPT:NOWIN98 -OPT:REF
! LDDEBUG= /DEBUG
  LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB
  NOLOGO=-nologo

[pywin32-checkins] pywin32/Pythonwin/pywin/framework interact.py, 1.14, 1.15

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25354/pywin/framework

Modified Files:
	interact.py 
Log Message:
remove some old unused string exceptions


Index: interact.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/interact.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** interact.py	1 Dec 2003 11:06:42 -0000	1.14
--- interact.py	4 Apr 2008 04:51:39 -0000	1.15
***************
*** 54,62 ****
  formatOutputError = (-402653169, 0, 200, 0, 255, 0, 49, 'Courier New')
  
- # couple of exceptions defined for this module
- excNoValidCommand = 'No Valid Command'
- excEmptyCommand = 'Empty Command'
- excContinueCommand = 'Continue Command'
- 
  try:
  	sys.ps1
--- 54,57 ----

[pywin32-checkins] pywin32/Pythonwin win32uiExt.h,1.13,1.14

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

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24604

Modified Files:
	win32uiExt.h 
Log Message:
More build headaches for ON_WM_NCHITTEST on vs2008


Index: win32uiExt.h
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32uiExt.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** win32uiExt.h	22 Jan 2008 12:29:50 -0000	1.13
--- win32uiExt.h	4 Apr 2008 04:50:44 -0000	1.14
***************
*** 395,400 ****
  };
  
! // ack - compile error in MFC9, and only for ON_WM_NCHITTEST!
! #if _MFC_VER >= 0x0900
  #undef ON_WM_NCHITTEST
  // from afxmsg_.h - the UINT was originally LRESULT
--- 395,400 ----
  };
  
! // ack - compile error in MFC9 (and not x64), and only for ON_WM_NCHITTEST!
! #if _MFC_VER >= 0x0900 && !defined( _WIN64)
  #undef ON_WM_NCHITTEST
  // from afxmsg_.h - the UINT was originally LRESULT

[pywin32-checkins] pywin32/com/TestSources/PyCOMTest PyCOMImpl.cpp, 1.16, 1.17

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

Update of /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17823

Modified Files:
	PyCOMImpl.cpp 
Log Message:
Avoid shadowing the 'hr' var, so we terminate the loop correctly on error.


Index: PyCOMImpl.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/TestSources/PyCOMTest/PyCOMImpl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** PyCOMImpl.cpp	4 Sep 2007 10:53:29 -0000	1.16
--- PyCOMImpl.cpp	3 Apr 2008 07:21:41 -0000	1.17
***************
*** 357,361 ****
  			DISPID dispid;
  			OLECHAR *names[] = { L"OnFire" };
! 			HRESULT hr = pEvent->GetIDsOfNames(IID_NULL, names, 1, 0, &dispid);
  			if (SUCCEEDED(hr)) {
  				CComVariant v(nID);
--- 357,361 ----
  			DISPID dispid;
  			OLECHAR *names[] = { L"OnFire" };
! 			hr = pEvent->GetIDsOfNames(IID_NULL, names, 1, 0, &dispid);
  			if (SUCCEEDED(hr)) {
  				CComVariant v(nID);

[pywin32-checkins] pywin32/Pythonwin win32ui.rc,1.13,1.14

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3960

Modified Files:
	win32ui.rc 
Log Message:
Fix debug assertion in File->Open dialog

Index: win32ui.rc
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32ui.rc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** win32ui.rc	24 Nov 2007 09:11:58 -0000	1.13
--- win32ui.rc	16 Mar 2008 19:13:10 -0000	1.14
***************
*** 1118,1123 ****
  BEGIN
      IDR_MAINFRAME           "Pythonwin"
!     IDR_PYTHONTYPE          "\nScript\nPython Script\nPython scripts (*.py, *.pyw, *.pys)\n.py;*.pyw;*.pys\nPythonScript\nPython Script"
!     IDR_TEXTTYPE            "\nScript\nPython Script\nPython Scripts (*.py, *.pyw, *.pys)\n.py;*.pyw;*.pys\nTEXT Document\nText Files (*.txt)\n.txt\nTextFileType\nTEXT File Type"
      IDR_DEBUGGER            "Pythonwin Debugger"
  END
--- 1118,1123 ----
  BEGIN
      IDR_MAINFRAME           "Pythonwin"
!     IDR_PYTHONTYPE          "\nScript\nPython Script\nPython scripts (*.py, *.pyw, *.pys)\n.py;.pyw;.pys\nPythonScript\nPython Script"
!     IDR_TEXTTYPE            "\nScript\nPython Script\nPython Scripts (*.py, *.pyw, *.pys)\n.py;.pyw;.pys\nTEXT Document\nText Files (*.txt)\n.txt\nTextFileType\nTEXT File Type"
      IDR_DEBUGGER            "Pythonwin Debugger"
  END

[pywin32-checkins] pywin32/win32/Lib pywintypes.py,1.12,1.13

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23892

Modified Files:
	pywintypes.py 
Log Message:
Patch from PJE so pywin32 can be installed as a .egg (with some limitations)


Index: pywintypes.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/pywintypes.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** pywintypes.py	21 Oct 2005 02:25:49 -0000	1.12
--- pywintypes.py	11 Mar 2008 04:23:31 -0000	1.13
***************
*** 90,93 ****
--- 90,98 ----
                  found = os.path.join(sys.prefix, filename)
          if found is None:
+             # Not in the Python directory?  Maybe we were installed via
+             # easy_install...
+             if os.path.isfile(os.path.join(os.path.dirname(__file__), filename)):
+                 found = os.path.join(os.path.dirname(__file__), filename)
+         if found is None:
              # give up in disgust.
              raise ImportError, \

[pywin32-checkins] pywin32/Pythonwin win32notify.cpp,1.6,1.7

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24128

Modified Files:
	win32notify.cpp 
Log Message:
Use Warning subclass in PyErr_Warn

Index: win32notify.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32notify.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32notify.cpp	17 Feb 2008 01:39:35 -0000	1.6
--- win32notify.cpp	5 Mar 2008 16:00:42 -0000	1.7
***************
*** 349,353 ****
  	PyObject *result = Python_do_callback(method, args);
  	if (result==NULL) {
! 		PyErr_Warn(ui_module_error, "Exception in OnNotify() handler");
  		gui_print_error();
  		}
--- 349,353 ----
  	PyObject *result = Python_do_callback(method, args);
  	if (result==NULL) {
! 		PyErr_Warn(PyExc_Warning, "Exception in OnNotify() handler");
  		gui_print_error();
  		}

[pywin32-checkins] pywin32/Pythonwin stddde.cpp,1.4,1.5

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22939

Modified Files:
	stddde.cpp 
Log Message:
Exclude inline assembly code when _CALLHACK_ is not defined

Index: stddde.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/stddde.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** stddde.cpp	5 Feb 2006 07:32:58 -0000	1.4
--- stddde.cpp	5 Mar 2008 15:57:11 -0000	1.5
***************
*** 957,960 ****
--- 957,961 ----
  // Gaah - it took me two days to realize that I need "offset" here
  //
+ #ifdef _CALLHACK_
  __declspec ( naked ) void _template() {
  	__asm {
***************
*** 1026,1030 ****
  //
  //////////////////////////////////////////////////////////////////////
! 
  
  BOOL CDDEServer::Create(const char* pszServiceName,
--- 1027,1031 ----
  //
  //////////////////////////////////////////////////////////////////////
! #endif // _CALLHACK_
  
  BOOL CDDEServer::Create(const char* pszServiceName,

[pywin32-checkins] pywin32/win32/src win32apimodule.cpp,1.83,1.84

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

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24693

Modified Files:
	win32apimodule.cpp 
Log Message:
autoduck: s/string.split/s.split/


Index: win32apimodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32apimodule.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** win32apimodule.cpp	7 Feb 2008 05:42:06 -0000	1.83
--- win32apimodule.cpp	27 Feb 2008 10:48:08 -0000	1.84
***************
*** 1514,1518 ****
  	// @rdesc The return value is a single string, with each drive
  	// letter NULL terminated.
! 	// <nl>Use "string.splitfields (s, '\\000')" to split into components.
  }
  
--- 1514,1518 ----
  	// @rdesc The return value is a single string, with each drive
  	// letter NULL terminated.
! 	// <nl>Use "s.split('\0')" to split into components.
  }
  

[pywin32-checkins] pywin32/Pythonwin/pywin/docking DockingBar.py, 1.5, 1.6

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15419

Modified Files:
	DockingBar.py 
Log Message:
Initialize rectUndock

Index: DockingBar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking/DockingBar.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DockingBar.py	26 Feb 2008 03:27:42 -0000	1.5
--- DockingBar.py	26 Feb 2008 13:11:32 -0000	1.6
***************
*** 52,55 ****
--- 52,56 ----
  		self.cMinWidth = win32api.GetSystemMetrics(win32con.SM_CXMIN)
  		self.cMinHeight = win32api.GetSystemMetrics(win32con.SM_CYMIN)
+ 		self.rectUndock = (0,0,0,0)
  
  	def OnUpdateCmdUI(self, target, bDisableIfNoHndler):

[pywin32-checkins] pywin32/Pythonwin win32win.cpp,1.20,1.21

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

Update of /cvsroot/pywin32/pywin32/Pythonwin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28936

Modified Files:
	win32win.cpp 
Log Message:
Fix 1815499: SetWindowPos can't work with activex control
(SetWindowPos was calling ::SetWindowPos instead of CWnd::SetWindowPos)


Index: win32win.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/win32win.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** win32win.cpp	24 Feb 2008 15:47:20 -0000	1.20
--- win32win.cpp	26 Feb 2008 09:36:22 -0000	1.21
***************
*** 2159,2169 ****
  		        &obAfter, &x, &y, &cx, &cy, &flags ))
  		return NULL;
  	HWND insertAfter;
  	if (!PyWinObject_AsHANDLE(obAfter, (HANDLE *)&insertAfter))
  		return NULL;
  	GUI_BGN_SAVE;
  	// @pyseemfc CWnd|SetWindowPos
! 	BOOL ok = ::SetWindowPos( pWnd->GetSafeHwnd(), insertAfter, x, y, cx, cy, flags);
  	GUI_END_SAVE;
  	if (!ok)
  		RETURN_ERR("SetWindowPos failed");
--- 2159,2176 ----
  		        &obAfter, &x, &y, &cx, &cy, &flags ))
  		return NULL;
+ 	// It appears we took the easy way above, and assume a handle rather
+ 	// than either int or PyWnd object.  So we jump hoops to convert back
+ 	// to a CWnd, so we can call CWnd::SetWindowPos rather than
+ 	// ::SetWindowPos
  	HWND insertAfter;
  	if (!PyWinObject_AsHANDLE(obAfter, (HANDLE *)&insertAfter))
  		return NULL;
+ 	CWnd wndInsertAfter;
+ 	wndInsertAfter.Attach(insertAfter);
  	GUI_BGN_SAVE;
  	// @pyseemfc CWnd|SetWindowPos
! 	BOOL ok = pWnd->SetWindowPos( &wndInsertAfter, x, y, cx, cy, flags);
  	GUI_END_SAVE;
+ 	wndInsertAfter.Detach();
  	if (!ok)
  		RETURN_ERR("SetWindowPos failed");

[pywin32-checkins] pywin32/Pythonwin/pywin/framework scriptutils.py, 1.15, 1.16

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30172

Modified Files:
	scriptutils.py 
Log Message:
Ensure that module browser view isn't returned from GetActiveEditorDocument

Index: scriptutils.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/scriptutils.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** scriptutils.py	25 Feb 2008 21:56:41 -0000	1.15
--- scriptutils.py	26 Feb 2008 06:40:23 -0000	1.16
***************
*** 9,12 ****
--- 9,13 ----
  import __main__
  from pywin.mfc import dialog
+ from pywin.mfc.docview import TreeView
  import os
  import string
***************
*** 138,142 ****
  	"""
  	view = GetActiveView()
! 	if view is None: return (None, None)
  	doc = view.GetDocument()
  	if hasattr(doc, "MarkerAdd"): # Is it an Editor document?
--- 139,144 ----
  	"""
  	view = GetActiveView()
! 	if view is None or isinstance(view, TreeView):
! 		return (None, None)
  	doc = view.GetDocument()
  	if hasattr(doc, "MarkerAdd"): # Is it an Editor document?

[pywin32-checkins] pywin32/Pythonwin/pywin/docking DockingBar.py, 1.4, 1.5

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25039

Modified Files:
	DockingBar.py 
Log Message:
Add a control ID so test function works again

Index: DockingBar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking/DockingBar.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DockingBar.py	6 Sep 2007 06:47:36 -0000	1.4
--- DockingBar.py	26 Feb 2008 03:27:42 -0000	1.5
***************
*** 527,531 ****
  	bar = DockingBar()
  	creator = EditCreator
! 	bar.CreateWindow(win32ui.GetMainFrame(), creator, "Coolbar Demo")
  #	win32ui.GetMainFrame().ShowControlBar(bar, 1, 0)
  	bar.SetBarStyle( bar.GetBarStyle()|afxres.CBRS_TOOLTIPS|afxres.CBRS_FLYBY|afxres.CBRS_SIZE_DYNAMIC)
--- 527,531 ----
  	bar = DockingBar()
  	creator = EditCreator
! 	bar.CreateWindow(win32ui.GetMainFrame(), creator, "Coolbar Demo",0xfffff)
  #	win32ui.GetMainFrame().ShowControlBar(bar, 1, 0)
  	bar.SetBarStyle( bar.GetBarStyle()|afxres.CBRS_TOOLTIPS|afxres.CBRS_FLYBY|afxres.CBRS_SIZE_DYNAMIC)

[pywin32-checkins] pywin32/Pythonwin/pywin/tools browser.py, 1.8, 1.9

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1981

Modified Files:
	browser.py 
Log Message:
Add int, float, and long to TypeMap

Index: browser.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/tools/browser.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** browser.py	12 Jul 2007 07:54:34 -0000	1.8
--- browser.py	26 Feb 2008 02:22:49 -0000	1.9
***************
*** 268,271 ****
--- 268,274 ----
              TracebackType : HLITraceback,
              StringType : HLIString,
+             IntType: HLIPythonObject,
+             LongType: HLIPythonObject,
+             FloatType: HLIPythonObject,
             }
  try:

[pywin32-checkins] pywin32/Pythonwin/pywin/framework dbgcommands.py, 1.1, 1.2 scriptutils.py, 1.14, 1.15

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2560

Modified Files:
	dbgcommands.py scriptutils.py 
Log Message:
Use active view when setting a breakpoint in a split editor window

Index: dbgcommands.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/dbgcommands.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dbgcommands.py	1 Sep 1999 23:33:45 -0000	1.1
--- dbgcommands.py	25 Feb 2008 21:56:41 -0000	1.2
***************
*** 6,10 ****
  import win32ui, win32con
  import scriptutils
! 
  IdToBarNames = {
  	win32ui.IDC_DBG_STACK : ("Stack",0),
--- 6,11 ----
  import win32ui, win32con
  import scriptutils
! import warnings
! 			
  IdToBarNames = {
  	win32ui.IDC_DBG_STACK : ("Stack",0),
***************
*** 89,97 ****
  
  	def OnAdd(self, msg, code):
! 		doc = scriptutils.GetActiveEditorDocument()
  		if doc is None:
! 			win32ui.MessageBox('There is no active window - no breakpoint can be added')
  		pathName = doc.GetPathName()
- 		view = doc.GetFirstView()
  		lineNo = view.LineFromChar(view.GetSel()[0])+1
  		# If I have a debugger, then tell it, otherwise just add a marker
--- 90,104 ----
  
  	def OnAdd(self, msg, code):
! 		doc, view = scriptutils.GetActiveEditorDocument()
  		if doc is None:
! 			## Don't do a messagebox, as this could be triggered from the app's
! 			## idle loop whenever the debug toolbar is visible, giving a never-ending
! 			## series of dialogs.  This can happen when the OnUpdate handler
! 			## for the toolbar button IDC_DBG_ADD fails, since MFC falls back to
! 			## sending a normal command if the UI update command fails.
! 			## win32ui.MessageBox('There is no active window - no breakpoint can be added')
! 			warnings.warn('There is no active window - no breakpoint can be added')
! 			return None
  		pathName = doc.GetPathName()
  		lineNo = view.LineFromChar(view.GetSel()[0])+1
  		# If I have a debugger, then tell it, otherwise just add a marker
***************
*** 130,139 ****
  
  	def OnUpdateAddBreakpoints(self, cmdui):
! 		doc = scriptutils.GetActiveEditorDocument()
  		if doc is None:
  			enabled = 0
  		else:
  			enabled = 1
- 			view = doc.GetFirstView()
  			lineNo = view.LineFromChar(view.GetSel()[0])+1
  			import pywin.framework.editor.color.coloreditor
--- 137,145 ----
  
  	def OnUpdateAddBreakpoints(self, cmdui):
! 		doc, view = scriptutils.GetActiveEditorDocument()
  		if doc is None:
  			enabled = 0
  		else:
  			enabled = 1
  			lineNo = view.LineFromChar(view.GetSel()[0])+1
  			import pywin.framework.editor.color.coloreditor

Index: scriptutils.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/scriptutils.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** scriptutils.py	19 Feb 2008 01:19:30 -0000	1.14
--- scriptutils.py	25 Feb 2008 21:56:41 -0000	1.15
***************
*** 134,146 ****
  
  def GetActiveEditorDocument():
! 	"""Returns the active editor document, or None if no
  	active document or its not an editor document.
  	"""
  	view = GetActiveView()
! 	if view is None: return None
  	doc = view.GetDocument()
  	if hasattr(doc, "MarkerAdd"): # Is it an Editor document?
! 		return doc
! 	return None
  
  def GetActiveFileName(bAutoSave = 1):
--- 134,146 ----
  
  def GetActiveEditorDocument():
! 	"""Returns the active editor document and view, or (None,None) if no
  	active document or its not an editor document.
  	"""
  	view = GetActiveView()
! 	if view is None: return (None, None)
  	doc = view.GetDocument()
  	if hasattr(doc, "MarkerAdd"): # Is it an Editor document?
! 		return doc, view
! 	return (None, None)
  
  def GetActiveFileName(bAutoSave = 1):

[pywin32-checkins] pywin32/Pythonwin/pywin/framework sgrepmdi.py, 1.5, 1.6

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21099

Modified Files:
	sgrepmdi.py 
Log Message:
Use SaveTextFile in place of SaveFile so "save results" option works again

Index: sgrepmdi.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/sgrepmdi.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sgrepmdi.py	24 May 2007 13:48:37 -0000	1.5
--- sgrepmdi.py	25 Feb 2008 12:27:35 -0000	1.6
***************
*** 390,394 ****
  		if dlg.DoModal() == win32con.IDOK:
  			pn = dlg.GetPathName()
! 			self._obj_.SaveFile(pn)
  		return 0
  		
--- 390,394 ----
  		if dlg.DoModal() == win32con.IDOK:
  			pn = dlg.GetPathName()
! 			self._obj_.SaveTextFile(pn)
  		return 0