pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/win32/test test_odbc.py,1.4,1.5

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

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

Modified Files:
	test_odbc.py 
Log Message:
add 0-byte unicode test and handle errors relating to truncation


Index: test_odbc.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_odbc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** test_odbc.py	24 May 2006 06:12:17 -0000	1.4
--- test_odbc.py	24 May 2006 08:39:40 -0000	1.5
***************
*** 84,88 ****
      def test_insert_select_large(self):
          # hard-coded 256 limit in ODBC to trigger large value support
!         self.test_insert_select(userid='Frank' * 200, username='Frank Millman' * 200)
  
      def test_insert_select_unicode(self, userid=u'Frank', username=u"Frank Millman"):
--- 84,92 ----
      def test_insert_select_large(self):
          # hard-coded 256 limit in ODBC to trigger large value support
!         # (but for now ignore a warning about the value being truncated)
!         try:
!             self.test_insert_select(userid='Frank' * 200, username='Frank Millman' * 200)
!         except dbi.noError:
!             pass
  
      def test_insert_select_unicode(self, userid=u'Frank', username=u"Frank Millman"):
***************
*** 95,99 ****
  
      def test_insert_select_unicode_ext(self):
!         userid = unicode("test-\xe0\xf2", "mbcs")
          username = unicode("test-\xe0\xf2 name", "mbcs")
          self.test_insert_select_unicode(userid, username)
--- 99,103 ----
  
      def test_insert_select_unicode_ext(self):
!         userid = unicode("t-\xe0\xf2", "mbcs")
          username = unicode("test-\xe0\xf2 name", "mbcs")
          self.test_insert_select_unicode(userid, username)
***************
*** 137,143 ****
      def test_set_zero_length(self):
          self.assertEqual(self.cur.execute("insert into pywin32test_users (userid,username) "
!             "values (?,?)",['Frank', 'Frank Millman']),1)
!         self.assertEqual(self.cur.execute("update pywin32test_users set username = ?",
!             ['']),1)
          self.assertEqual(self.cur.execute("select * from pywin32test_users"),0)
          self.assertEqual(len(self.cur.fetchone()[1]),0)
--- 141,151 ----
      def test_set_zero_length(self):
          self.assertEqual(self.cur.execute("insert into pywin32test_users (userid,username) "
!             "values (?,?)",['Frank', '']),1)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users"),0)
!         self.assertEqual(len(self.cur.fetchone()[1]),0)
! 
!     def test_set_zero_length_unicode(self):
!         self.assertEqual(self.cur.execute("insert into pywin32test_users (userid,username) "
!             "values (?,?)",[u'Frank', u'']),1)
          self.assertEqual(self.cur.execute("select * from pywin32test_users"),0)
          self.assertEqual(len(self.cur.fetchone()[1]),0)

[pywin32-checkins] pywin32/win32/test test_odbc.py,1.3,1.4

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

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

Modified Files:
	test_odbc.py 
Log Message:
Allow tests to be executed against any ODBC server by setting
TEST_ODBC_CONNECTION_STRING in the environment, and change the tablename
we use.


Index: test_odbc.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_odbc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_odbc.py	24 May 2006 01:10:13 -0000	1.3
--- test_odbc.py	24 May 2006 06:12:17 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  import unittest
  import odbc
+ import dbi
  import tempfile
  
***************
*** 12,45 ****
  class TestStuff(unittest.TestCase):
      def setUp(self):
          self.conn = self.cur = None
!         self.db_filename = os.path.join(tempfile.gettempdir(), "test_odbc.mdb")
!         if os.path.isfile(self.db_filename):
!             os.unlink(self.db_filename)
! 
!         # Create a brand-new database - what is the story with these?
!         for suffix in (".36", ".35", ".30"):
!             try:
!                 dbe = EnsureDispatch("DAO.DBEngine" + suffix)
!                 break
!             except pythoncom.com_error:
!                 pass
!         else:
!             raise RuntimeError, "Can't find a DB engine"
! 
!         workspace = dbe.Workspaces(0)
! 
!         newdb = workspace.CreateDatabase(self.db_filename, 
!                                          constants.dbLangGeneral,
!                                          constants.dbEncrypt)
! 
!         newdb.Close()
! 
!         conn_str = "Driver={Microsoft Access Driver (*.mdb)};dbq=%s;Uid=;Pwd=;" \
!                    % (self.db_filename,)
          self.conn = odbc.odbc(conn_str)
          # And we expect a 'users' table for these tests.
          self.cur = self.conn.cursor()
          self.assertEqual(self.cur.execute(
!             """create table users (
                      userid varchar(5),  username varchar(25),
                      bitfield bit,       intfield integer,
--- 13,57 ----
  class TestStuff(unittest.TestCase):
      def setUp(self):
+         self.db_filename = None
          self.conn = self.cur = None
!         try:
!             # Test any database if a connection string is supplied...
!             conn_str = os.environ['TEST_ODBC_CONNECTION_STRING']
!         except KeyError:
!             # Create a local MSAccess DB for testing.
!             self.db_filename = os.path.join(tempfile.gettempdir(), "test_odbc.mdb")
!             if os.path.isfile(self.db_filename):
!                 os.unlink(self.db_filename)
!     
!             # Create a brand-new database - what is the story with these?
!             for suffix in (".36", ".35", ".30"):
!                 try:
!                     dbe = EnsureDispatch("DAO.DBEngine" + suffix)
!                     break
!                 except pythoncom.com_error:
!                     pass
!             else:
!                 raise RuntimeError, "Can't find a DB engine"
!     
!             workspace = dbe.Workspaces(0)
!     
!             newdb = workspace.CreateDatabase(self.db_filename, 
!                                              constants.dbLangGeneral,
!                                              constants.dbEncrypt)
!     
!             newdb.Close()
!     
!             conn_str = "Driver={Microsoft Access Driver (*.mdb)};dbq=%s;Uid=;Pwd=;" \
!                        % (self.db_filename,)
          self.conn = odbc.odbc(conn_str)
          # And we expect a 'users' table for these tests.
          self.cur = self.conn.cursor()
+         try:
+             self.cur.execute("""drop table pywin32test_users""")
+         except (odbc.error, dbi.progError):
+             pass
+         
          self.assertEqual(self.cur.execute(
!             """create table pywin32test_users (
                      userid varchar(5),  username varchar(25),
                      bitfield bit,       intfield integer,
***************
*** 49,52 ****
--- 61,69 ----
      def tearDown(self):
          if self.cur is not None:
+             try:
+                 self.cur.execute("""drop table pywin32test_users""")
+             except (odbc.error, dbi.progError), why:
+                 print "Failed to delete test table:", why
+ 
              self.cur.close()
              self.cur = None
***************
*** 54,65 ****
              self.conn.close()
              self.conn = None
!         os.unlink(self.db_filename)
  
      def test_insert_select(self, userid='Frank', username='Frank Millman'):
!         self.assertEqual(self.cur.execute("insert into users (userid, username) \
              values (?,?)", [userid, username]),1)
!         self.assertEqual(self.cur.execute("select * from users \
              where userid = ?", [userid.lower()]),0)
!         self.assertEqual(self.cur.execute("select * from users \
              where username = ?", [username.lower()]),0)
  
--- 71,83 ----
              self.conn.close()
              self.conn = None
!         if self.db_filename is not None:
!             os.unlink(self.db_filename)
  
      def test_insert_select(self, userid='Frank', username='Frank Millman'):
!         self.assertEqual(self.cur.execute("insert into pywin32test_users (userid, username) \
              values (?,?)", [userid, username]),1)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users \
              where userid = ?", [userid.lower()]),0)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users \
              where username = ?", [username.lower()]),0)
  
***************
*** 69,77 ****
  
      def test_insert_select_unicode(self, userid=u'Frank', username=u"Frank Millman"):
!         self.assertEqual(self.cur.execute("insert into users  (userid, username)\
              values (?,?)", [userid, username]),1)
!         self.assertEqual(self.cur.execute("select * from users \
              where userid = ?", [userid.lower()]),0)
!         self.assertEqual(self.cur.execute("select * from users \
              where username = ?", [username.lower()]),0)
  
--- 87,95 ----
  
      def test_insert_select_unicode(self, userid=u'Frank', username=u"Frank Millman"):
!         self.assertEqual(self.cur.execute("insert into pywin32test_users (userid, username)\
              values (?,?)", [userid, username]),1)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users \
              where userid = ?", [userid.lower()]),0)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users \
              where username = ?", [username.lower()]),0)
  
***************
*** 82,90 ****
  
      def _test_val(self, fieldName, value):
!         self.cur.execute("delete from users where userid='Frank'")
          self.assertEqual(self.cur.execute(
!             "insert into users (userid, %s) values (?,?)" % fieldName,
              ["Frank", value]), 1)
!         self.cur.execute("select %s from users where userid = ?" % fieldName,
                           ["Frank"])
          rows = self.cur.fetchmany()
--- 100,108 ----
  
      def _test_val(self, fieldName, value):
!         self.cur.execute("delete from pywin32test_users where userid='Frank'")
          self.assertEqual(self.cur.execute(
!             "insert into pywin32test_users (userid, %s) values (?,?)" % fieldName,
              ["Frank", value]), 1)
!         self.cur.execute("select %s from pywin32test_users where userid = ?" % fieldName,
                           ["Frank"])
          rows = self.cur.fetchmany()
***************
*** 110,126 ****
  
      def test_set_nonzero_length(self):
!         self.assertEqual(self.cur.execute("insert into users (userid,username) "
              "values (?,?)",['Frank', 'Frank Millman']),1)
!         self.assertEqual(self.cur.execute("update users set username = ?",
              ['Frank']),1)
!         self.assertEqual(self.cur.execute("select * from users"),0)
          self.assertEqual(len(self.cur.fetchone()[1]),5)
  
      def test_set_zero_length(self):
!         self.assertEqual(self.cur.execute("insert into users (userid,username) "
              "values (?,?)",['Frank', 'Frank Millman']),1)
!         self.assertEqual(self.cur.execute("update users set username = ?",
              ['']),1)
!         self.assertEqual(self.cur.execute("select * from users"),0)
          self.assertEqual(len(self.cur.fetchone()[1]),0)
  
--- 128,144 ----
  
      def test_set_nonzero_length(self):
!         self.assertEqual(self.cur.execute("insert into pywin32test_users (userid,username) "
              "values (?,?)",['Frank', 'Frank Millman']),1)
!         self.assertEqual(self.cur.execute("update pywin32test_users set username = ?",
              ['Frank']),1)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users"),0)
          self.assertEqual(len(self.cur.fetchone()[1]),5)
  
      def test_set_zero_length(self):
!         self.assertEqual(self.cur.execute("insert into pywin32test_users (userid,username) "
              "values (?,?)",['Frank', 'Frank Millman']),1)
!         self.assertEqual(self.cur.execute("update pywin32test_users set username = ?",
              ['']),1)
!         self.assertEqual(self.cur.execute("select * from pywin32test_users"),0)
          self.assertEqual(len(self.cur.fetchone()[1]),0)
  

[pywin32-checkins] pywin32/win32/test test_odbc.py,1.2,1.3

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

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

Modified Files:
	test_odbc.py 
Log Message:
A couple of new tests from Frank Millman


Index: test_odbc.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_odbc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_odbc.py	27 Feb 2006 12:00:57 -0000	1.2
--- test_odbc.py	24 May 2006 01:10:13 -0000	1.3
***************
*** 109,112 ****
--- 109,128 ----
          self._test_val('username', 'foo')
  
+     def test_set_nonzero_length(self):
+         self.assertEqual(self.cur.execute("insert into users (userid,username) "
+             "values (?,?)",['Frank', 'Frank Millman']),1)
+         self.assertEqual(self.cur.execute("update users set username = ?",
+             ['Frank']),1)
+         self.assertEqual(self.cur.execute("select * from users"),0)
+         self.assertEqual(len(self.cur.fetchone()[1]),5)
+ 
+     def test_set_zero_length(self):
+         self.assertEqual(self.cur.execute("insert into users (userid,username) "
+             "values (?,?)",['Frank', 'Frank Millman']),1)
+         self.assertEqual(self.cur.execute("update users set username = ?",
+             ['']),1)
+         self.assertEqual(self.cur.execute("select * from users"),0)
+         self.assertEqual(len(self.cur.fetchone()[1]),0)
+ 
  if __name__ == '__main__':
      unittest.main()

[pywin32-checkins] pywin32/isapi install.py,1.8,1.9

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

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

Modified Files:
	install.py 
Log Message:
* Call the PreInstall hooks earlier so they can do more.
* Allow DefaultDocs to be set.


Index: install.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/isapi/install.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** install.py	27 Mar 2006 01:07:13 -0000	1.8
--- install.py	18 May 2006 08:32:35 -0000	1.9
***************
*** 70,77 ****
      EnableDirBrowsing = _DEFAULT_ENABLE_DIR_BROWSING
      EnableDefaultDoc  = _DEFAULT_ENABLE_DEFAULT_DOC
!     ScriptMaps       = []
      ScriptMapUpdate = "end" # can be 'start', 'end', 'replace'
      Server = None
!     
      def __init__(self, **kw):
          self.__dict__.update(kw)
--- 70,78 ----
      EnableDirBrowsing = _DEFAULT_ENABLE_DIR_BROWSING
      EnableDefaultDoc  = _DEFAULT_ENABLE_DEFAULT_DOC
!     DefaultDoc = None # Only set in IIS if not None
!     ScriptMaps = []
      ScriptMapUpdate = "end" # can be 'start', 'end', 'replace'
      Server = None
! 
      def __init__(self, **kw):
          self.__dict__.update(kw)
***************
*** 164,167 ****
--- 165,169 ----
  
  def CreateDirectory(params, options):
+     _CallHook(params, "PreInstall", options)
      if not params.Name:
          raise ConfigurationError, "No Name param"
***************
*** 180,184 ****
      else:
          keyType = _IIS_WEBVIRTUALDIR
-     _CallHook(params, "PreInstall", options)
      # We used to go to lengths to keep an existing virtual directory
      # in place.  However, in some cases the existing directories got
--- 182,185 ----
***************
*** 216,219 ****
--- 217,222 ----
      newDir.EnableDirBrowsing = params.EnableDirBrowsing
      newDir.EnableDefaultDoc  = params.EnableDefaultDoc
+     if params.DefaultDoc is not None:
+         newDir.DefaultDoc = params.DefaultDoc
      newDir.SetInfo()
      smp_items = []

[pywin32-checkins] pywin32/win32/src PyTime.cpp,1.15,1.16

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

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

Modified Files:
	PyTime.cpp 
Log Message:
add autoduck comments for time object properties.


Index: PyTime.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyTime.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PyTime.cpp	10 Jan 2006 03:43:21 -0000	1.15
--- PyTime.cpp	18 May 2006 08:31:45 -0000	1.16
***************
*** 585,616 ****
--- 585,624 ----
  		return NULL;
  	}
+ 	// @prop int|year|
  	if ( !strcmp(name, "year") )
  	{
  		return PyInt_FromLong(st.wYear);
  	}
+ 	// @prop int|month|
  	else if ( !strcmp(name, "month") )
  	{
  		return PyInt_FromLong(st.wMonth);
  	}
+ 	// @prop int|weekday|
  	else if ( !strcmp(name, "weekday") )
  	{
  		return PyInt_FromLong(st.wDayOfWeek);
  	}
+ 	// @prop int|day|
  	else if ( !strcmp(name, "day") )
  	{
  		return PyInt_FromLong(st.wDay);
  	}
+ 	// @prop int|hour|
  	else if ( !strcmp(name, "hour") )
  	{
  		return PyInt_FromLong(st.wHour);
  	}
+ 	// @prop int|minute|
  	else if ( !strcmp(name, "minute") )
  	{
  		return PyInt_FromLong(st.wMinute);
  	}
+ 	// @prop int|second|
  	else if ( !strcmp(name, "second") )
  	{
  		return PyInt_FromLong(st.wSecond);
  	}
+ 	// @prop int|msec|
  	else if ( !strcmp(name, "msec") )
  	{

[pywin32-checkins] pywin32/win32/src win32file.i,1.55,1.56

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

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

Modified Files:
	win32file.i 
Log Message:
autoduck corrections


Index: win32file.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32file.i,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** win32file.i	21 Mar 2006 01:10:00 -0000	1.55
--- win32file.i	18 May 2006 07:45:03 -0000	1.56
***************
*** 1689,1693 ****
  PyObject *PyFILE_NOTIFY_INFORMATION(PyObject *self, PyObject *args)
  {
! 	// @pyparam string|buffer||The buffer to decode.
  	// @pyparm int|size||The number of bytes to refer to.  Generally this
  	// will be smaller than the size of the buffer (and certainly never greater!)
--- 1689,1693 ----
  PyObject *PyFILE_NOTIFY_INFORMATION(PyObject *self, PyObject *args)
  {
! 	// @pyparm string|buffer||The buffer to decode.
  	// @pyparm int|size||The number of bytes to refer to.  Generally this
  	// will be smaller than the size of the buffer (and certainly never greater!)

[pywin32-checkins] pywin32/win32/src/win32net win32netuse.cpp,1.4,1.5 win32netuser.cpp,1.7,1.8

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

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

Modified Files:
	win32netuse.cpp win32netuser.cpp 
Log Message:
Remove the (unnecessary) atl headers and libraries from win32net


Index: win32netuser.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netuser.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** win32netuser.cpp	9 Mar 2006 05:46:17 -0000	1.7
--- win32netuser.cpp	18 May 2006 07:44:15 -0000	1.8
***************
*** 14,18 ****
  #include "win32net.h"
  #include "stddef.h"
- #include "atlbase.h"
  
  #define UI0_ENTRY(name, t, r) { _T(#name), t, offsetof(USER_INFO_0, usri0_##name), r }
--- 14,17 ----

Index: win32netuse.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netuse.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** win32netuse.cpp	6 Mar 2004 23:55:59 -0000	1.4
--- win32netuse.cpp	18 May 2006 07:44:15 -0000	1.5
***************
*** 12,17 ****
  #include "stddef.h"
  
- #include "atlbase.h"
- 
  #define UI0_ENTRY(name, t, r) { _T(#name), t, offsetof(USE_INFO_0, ui0_##name), r }
  // @object PyUSE_INFO_0|A dictionary holding the infomation in a Win32 USE_INFO_0 structure.
--- 12,15 ----

[pywin32-checkins] pywin32 setup.py,1.43,1.44

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

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

Modified Files:
	setup.py 
Log Message:
Remove the (unnecessary) atl headers and libraries from win32net


Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** setup.py	19 Apr 2006 02:51:49 -0000	1.43
--- setup.py	18 May 2006 07:44:15 -0000	1.44
***************
*** 1019,1023 ****
          ("win32job", "user32", False, 0x0500, 'win32/src/win32job.i win32/src/win32jobmodule.cpp'),
          ("win32lz", "lz32", False),
!         ("win32net", "netapi32", True, None, """
                win32/src/win32net/win32netfile.cpp    win32/src/win32net/win32netgroup.cpp
                win32/src/win32net/win32netmisc.cpp    win32/src/win32net/win32netmodule.cpp
--- 1019,1023 ----
          ("win32job", "user32", False, 0x0500, 'win32/src/win32job.i win32/src/win32jobmodule.cpp'),
          ("win32lz", "lz32", False),
!         ("win32net", "netapi32 advapi32", True, None, """
                win32/src/win32net/win32netfile.cpp    win32/src/win32net/win32netgroup.cpp
                win32/src/win32net/win32netmisc.cpp    win32/src/win32net/win32netmodule.cpp

[pywin32-checkins] pywin32/com/win32comext/mapi/src mapiutil.cpp,1.4,1.5

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

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

Modified Files:
	mapiutil.cpp 
Log Message:
remove atl includes.


Index: mapiutil.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapiutil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mapiutil.cpp	16 Mar 2006 08:13:42 -0000	1.4
--- mapiutil.cpp	18 Apr 2006 11:53:47 -0000	1.5
***************
*** 2,6 ****
  #include "windows.h"
  #include "Python.h"
- #include <atlbase.h>
  #include "pywintypes.h"
  #include "PythonCOM.h"
--- 2,5 ----

[pywin32-checkins] pywin32/com/win32com/src dllmain.cpp,1.14,1.15

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

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

Modified Files:
	dllmain.cpp 
Log Message:
Don't write a log entry for RPC_E_CHANGED_MODE CoInitializeEx failures


Index: dllmain.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/dllmain.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dllmain.cpp	14 Mar 2006 12:06:42 -0000	1.14
--- dllmain.cpp	23 Mar 2006 06:59:20 -0000	1.15
***************
*** 202,206 ****
  	if ( FAILED(hr) )
  	{
! 		PyCom_LoggerException(NULL, "OLE initialization failed! (0x%08lx)", hr);
  		return hr;
  	}
--- 202,207 ----
  	if ( FAILED(hr) )
  	{
! 		if (hr != RPC_E_CHANGED_MODE)
! 			PyCom_LoggerException(NULL, "CoInitializeEx failed (0x%08lx)", hr);
  		return hr;
  	}

[pywin32-checkins] pywin32/Pythonwin/pywin/framework winout.py,1.12,1.13

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

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

Modified Files:
	winout.py 
Log Message:
Fix [ 1444381 ] lines may be mistaken for exception lines


Index: winout.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/winout.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** winout.py	26 Apr 2004 04:44:48 -0000	1.12
--- winout.py	22 Mar 2006 10:50:44 -0000	1.13
***************
*** 79,83 ****
  class WindowOutputViewImpl:
  	def __init__(self):
! 		self.patErrorMessage=re.compile('.*File "(.*)", line ([0-9]+)')
  		self.template = self.GetDocument().GetDocTemplate()
  
--- 79,83 ----
  class WindowOutputViewImpl:
  	def __init__(self):
! 		self.patErrorMessage=re.compile('\W*File "(.*)", line ([0-9]+)')
  		self.template = self.GetDocument().GetDocTemplate()
  

[pywin32-checkins] pywin32/win32/Lib netbios.py,1.3,1.4

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

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

Modified Files:
	netbios.py 
Log Message:
Fix [ 1444675 ] Typo error in netbios.py


Index: netbios.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/netbios.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** netbios.py	8 Jan 2002 05:41:13 -0000	1.3
--- netbios.py	22 Mar 2006 10:41:05 -0000	1.4
***************
*** 167,171 ****
      (UCHAR,   "access_control"),
      (UCHAR,   "frame_control"),
!     ("6s"   "destination_addr"),
      ("6s", "source_addr"), 
      ("18s", "routing_info"),
--- 167,171 ----
      (UCHAR,   "access_control"),
      (UCHAR,   "frame_control"),
!     ("6s",   "destination_addr"),
      ("6s", "source_addr"), 
      ("18s", "routing_info"),

[pywin32-checkins] pywin32/com/win32comext/authorization/src PyGSecurityInformation.cpp,1.1,1.2

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

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

Modified Files:
	PyGSecurityInformation.cpp 
Log Message:
Build with Python 2.2


Index: PyGSecurityInformation.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/authorization/src/PyGSecurityInformation.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyGSecurityInformation.cpp	16 Mar 2006 22:53:08 -0000	1.1
--- PyGSecurityInformation.cpp	20 Mar 2006 03:11:19 -0000	1.2
***************
*** 283,287 ****
--- 283,291 ----
  		hr=InvokeViaPolicy("MapGeneric", &result, "OBk", obObjectType, *pAceFlags, *pMask);
  		if (!FAILED(hr)){
+ #if (PY_VERSION_HEX < 0x02030000)
+ 			*pMask=PyLong_AsUnsignedLong(result);
+ #else
  			*pMask=PyInt_AsUnsignedLongMask(result);
+ #endif
  			if ((*pMask==-1) && PyErr_Occurred())
  				hr=MAKE_PYCOM_GATEWAY_FAILURE_CODE("MapGeneric");	

[pywin32-checkins] pywin32/com/win32comext/authorization/src authorization.cpp,1.1,1.2

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

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

Modified Files:
	authorization.cpp 
Log Message:
autoduck


Index: authorization.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/authorization/src/authorization.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** authorization.cpp	16 Mar 2006 22:53:08 -0000	1.1
--- authorization.cpp	20 Mar 2006 03:10:57 -0000	1.2
***************
*** 40,46 ****
  };
  
  static struct PyMethodDef authorization_methods[]=
  {
! 	{ "EditSecurity", (PyCFunction)PyEditSecurity, METH_VARARGS|METH_KEYWORDS, "Creates a security descriptor editor dialog"}, //@pymeth EditSecurity|Creates a security descriptor editor dialog
  	{NULL}
  };
--- 40,47 ----
  };
  
+ // @module win32com.authorization.authorization|
  static struct PyMethodDef authorization_methods[]=
  {
! 	{ "EditSecurity", (PyCFunction)PyEditSecurity, METH_VARARGS|METH_KEYWORDS, "Creates a security descriptor editor dialog"}, // @pymeth EditSecurity|Creates a security descriptor editor dialog
  	{NULL}
  };

[pywin32-checkins] pywin32/win32/src win32gui.i,1.77,1.78

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

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

Modified Files:
	win32gui.i 
Log Message:
Add GetMenu


Index: win32gui.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32gui.i,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** win32gui.i	11 Jan 2006 00:25:51 -0000	1.77
--- win32gui.i	20 Mar 2006 03:10:38 -0000	1.78
***************
*** 2145,2152 ****
  
  #ifndef MS_WINCE
! // @pyswig |SetMenu|Sets the window for the specified window.
  BOOLAPI SetMenu( HWND hwnd, HMENU hmenu );
  #endif
  
  // @pyswig HCURSOR|LoadIcon|Loads an icon
  HICON LoadIcon(HINSTANCE hInst, RESOURCE_ID name);
--- 2145,2155 ----
  
  #ifndef MS_WINCE
! // @pyswig |SetMenu|Sets the menu for the specified window.
  BOOLAPI SetMenu( HWND hwnd, HMENU hmenu );
  #endif
  
+ // @pyswig |GetMenu|Gets the menu for the specified window.
+ HMENU GetMenu( HWND hwnd);
+ 
  // @pyswig HCURSOR|LoadIcon|Loads an icon
  HICON LoadIcon(HINSTANCE hInst, RESOURCE_ID name);

[pywin32-checkins] pywin32 CHANGES.txt,1.4,1.5 setup.py,1.39,1.40

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

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

Modified Files:
	CHANGES.txt setup.py 
Log Message:
Build 208


Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** setup.py	20 Mar 2006 01:17:24 -0000	1.39
--- setup.py	20 Mar 2006 03:08:35 -0000	1.40
***************
*** 1,3 ****
! build_id="207.9" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)
--- 1,3 ----
! build_id="208" # may optionally include a ".{patchno}" suffix.
  # Putting buildno at the top prevents automatic __doc__ assignment, and
  # I *want* the build number at the top :)

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/CHANGES.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CHANGES.txt	11 Jan 2006 01:31:41 -0000	1.4
--- CHANGES.txt	20 Mar 2006 03:08:34 -0000	1.5
***************
*** 6,9 ****
--- 6,39 ----
  However contributors are encouraged to add their own entries for their work.
  
+ Build 208
+ ---------
+ * pywintypes: fix reference leak in PyOVERLAPPED objects.
+ * isapi: fix memory leak; filter "load order" handling; error
+   rendering.
+ * pythonwin: Disable some old DDE hacks to prevent Data Execution Prevention 
+   (DEP) errors in Pythonwin.
+ * odbc: gets support for Unicode, corrects support for BIT, and 
+   SQLDataSources() method.
+ * win32job: New win32job module for access to the win32 "job" functions
+ * win32inet: Add WinHttpGetIEProxyConfigForCurrentUser()
+ * pythoncom.Empty now does what it implies - passes a variant with VT_EMPTY.
+   New pythoncom.ArgNotFound supports the old behaviour (of VT_ERROR with
+   DISP_E_PARAMNOTFOUND); CoInitializeEx change described in Build 206 was 
+   not implemented - now it is!
+ * win32com: large unsigned ints may previously have been returned as negative
+   Python integers; makepy no longer displays a GUI progress dialog by default.
+ * win32com.authorization: New package from Roger Upole.
+ * win32com.mapi: New IProviderAdmin support from John Nielsen; add
+   IMAPIStatus support
+ * win32com.shell: Allow SHFileOperation to accept a string containing 
+   multiple file names, prevent Windows handle leak in IQueryAssociations.
+ * win32com.adsi: Always return extended error info when available, and expose
+   ADsGetLastError explicitly.
+ * Leonard Ritter and Robert Förtsch contributed some IE extension samples
+   (see win32com\demos)
+ * .chm documentation now includes a link to search MSDN and google for many 
+   API functions
+ * Many other minor fixes and enhancements.
+ 
  Build 207
  --------

[pywin32-checkins] pywin32 MANIFEST.in,1.11,1.12

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

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

Modified Files:
	MANIFEST.in 
Log Message:
Pickup files from authorization dir for source releases.


Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/pywin32/pywin32/MANIFEST.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MANIFEST.in	15 Mar 2006 04:05:37 -0000	1.11
--- MANIFEST.in	20 Mar 2006 01:18:39 -0000	1.12
***************
*** 53,56 ****
--- 53,58 ----
  include com/win32comext/adsi/src/*.h
  include com/win32comext/adsi/demos/*.py
+ include com/win32comext/authorization/demos/*.py
+ include com/win32comext/authorization/src/*.h
  include com/win32comext/axcontrol/src/*.h
  include com/win32comext/internet/src/*.h

[pywin32-checkins] pywin32/win32/src PyOVERLAPPED.cpp,1.9,1.10

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

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

Modified Files:
	PyOVERLAPPED.cpp 
Log Message:
OVERLAPPED objects did not release the reference to overlapped.object
when it destroyed (ie, a reference leak)


Index: PyOVERLAPPED.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyOVERLAPPED.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PyOVERLAPPED.cpp	28 Jun 2005 12:35:54 -0000	1.9
--- PyOVERLAPPED.cpp	17 Mar 2006 01:53:22 -0000	1.10
***************
*** 116,119 ****
--- 116,122 ----
  	Py_XDECREF(m_obHandle);
  	Py_XDECREF(m_overlapped.obState);
+ 	// set our memory to zero, so our clunky check for an invalid
+ 	// object in win32file has more chance of success.
+ 	memset(this, 0, sizeof(PyOVERLAPPED));
  }
  
***************
*** 203,209 ****
  /*static*/ void PyOVERLAPPED::deallocFunc(PyObject *ob)
  {
- 	// set memory to zero, so our clunky check for an invalid object in
- 	// win32file has more chance of success.
- 	memset(ob, 0, sizeof(PyOVERLAPPED));
  	delete (PyOVERLAPPED *)ob;
  }
--- 206,209 ----

[pywin32-checkins] pywin32/win32/test test_win32timezone.py,1.1,1.2

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

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

Modified Files:
	test_win32timezone.py 
Log Message:
Run without verbosity


Index: test_win32timezone.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32timezone.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_win32timezone.py	18 Apr 2004 05:58:16 -0000	1.1
--- test_win32timezone.py	17 Mar 2006 01:52:29 -0000	1.2
***************
*** 5,9 ****
  class Win32TimeZoneTest(unittest.TestCase):
      def testWin32TZ(self):
!         failed, total = doctest.testmod( win32timezone, verbose = True )
          self.failIf( failed )
  
--- 5,9 ----
  class Win32TimeZoneTest(unittest.TestCase):
      def testWin32TZ(self):
!         failed, total = doctest.testmod( win32timezone, verbose = False )
          self.failIf( failed )
  

[pywin32-checkins] pywin32/com/win32comext/mapi/src mapi.i,1.6,1.7

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

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

Modified Files:
	mapi.i 
Log Message:
Add IMAPIStatus constants.


Index: mapi.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapi.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mapi.i	15 Mar 2006 04:26:30 -0000	1.6
--- mapi.i	16 Mar 2006 11:20:55 -0000	1.7
***************
*** 437,440 ****
--- 437,449 ----
  #define TBL_ALL_COLUMNS TBL_ALL_COLUMNS  // The table should return all available columns. 
  
+ // IMAPIStatus consts.
+ #define STATUS_FLUSH_QUEUES STATUS_FLUSH_QUEUES
+ #define STATUS_INBOUND_FLUSH STATUS_INBOUND_FLUSH
+ #define STATUS_OUTBOUND_FLUSH STATUS_OUTBOUND_FLUSH
+ #define FLUSH_UPLOAD FLUSH_UPLOAD
+ #define FLUSH_DOWNLOAD FLUSH_DOWNLOAD
+ #define FLUSH_FORCE FLUSH_FORCE
+ #define FLUSH_NO_UI FLUSH_NO_UI
+ #define FLUSH_ASYNC_OK FLUSH_ASYNC_OK
  
  // @object MAPIINIT_0|A MAPIINIT_0 is represented as a tuple of:

[pywin32-checkins] pywin32/com/win32comext/mapi/src mapiutil.cpp,1.3,1.4

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

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

Modified Files:
	mapiutil.cpp 
Log Message:
Ensure IMAPIStatus and IProfSect interfaces autoconverted on return.


Index: mapiutil.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapiutil.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mapiutil.cpp	27 Feb 2003 21:57:48 -0000	1.3
--- mapiutil.cpp	16 Mar 2006 08:13:42 -0000	1.4
***************
*** 37,43 ****
  			pIID = &IID_IABContainer;
  			break;
- 		case MAPI_STORE:
- 		case MAPI_PROFSECT:
  		case MAPI_STATUS:
  		case MAPI_FORMINFO:
  			pIID = &IID_IUnknown;
--- 37,48 ----
  			pIID = &IID_IABContainer;
  			break;
  		case MAPI_STATUS:
+ 			pIID = &IID_IMAPIStatus;
+ 			break;
+ 		case MAPI_PROFSECT:
+ 			pIID = &IID_IProfSect;
+ 			break;
+ 
+ 		case MAPI_STORE:
  		case MAPI_FORMINFO:
  			pIID = &IID_IUnknown;

[pywin32-checkins] pywin32/win32/src win32file.i,1.52,1.53

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

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

Modified Files:
	win32file.i 
Log Message:
expand autoduck GetFileAttributes(W) comments and link to 
win32api.GetFileAttributes


Index: win32file.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32file.i,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** win32file.i	27 Feb 2006 10:46:35 -0000	1.52
--- win32file.i	15 Mar 2006 04:30:17 -0000	1.53
***************
*** 663,670 ****
--- 663,679 ----
  
  // @pyswig int|GetFileAttributes|Determines a files attributes.
+ // @comm The win32file module exposes <om win32file.GetFileAttributes> and
+ // <om win32file.GetFileAttributesW> separately - both functions will accept
+ // either strings or Unicode objects but will always call the named function.
+ // This is different than <om win32api.GetFileAttributes>, which only exposes
+ // one Python function and automatically calls the appropriate win32 function
+ // based on the type of the filename param.
  DWORD GetFileAttributes(
      TCHAR *fileName); // @pyparm <o PyUnicode>|fileName||Name of the file to retrieve attributes for.
  
  // @pyswig int|GetFileAttributesW|Determines a files attributes (NT/2000 Unicode specific version).
+ // @comm Note that <om win32api.GetFileAttributes> will automatically call
+ // GetFileAttributesW when passed a unicode filename param.  See <om win32file.GetFileAttributes>
+ // and <om win32api.GetFileAttributes> for more.
  DWORD GetFileAttributesW(
      WCHAR *fileName); // @pyparm <o PyUnicode>|fileName||Name of the file to retrieve attributes for.
***************
*** 777,781 ****
  	return _DoGetFileAttributesEx(self, args, FALSE);
  }
! // @pyswig tuple|GetFileAttributesEx|Retrieves attributes for a specified file or directory using Unicode paths.
  // @comm See <om win32file.GetFileAttributesEx> for a description of the arguments and return type.
  static PyObject *PyGetFileAttributesExW(PyObject *self, PyObject *args)
--- 786,790 ----
  	return _DoGetFileAttributesEx(self, args, FALSE);
  }
! // @pyswig tuple|GetFileAttributesExW|Retrieves attributes for a specified file or directory using Unicode paths.
  // @comm See <om win32file.GetFileAttributesEx> for a description of the arguments and return type.
  static PyObject *PyGetFileAttributesExW(PyObject *self, PyObject *args)

[pywin32-checkins] pywin32/AutoDuck pywin32.mak,1.14,1.15

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

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

Modified Files:
	pywin32.mak 
Log Message:
Add win32job module and IMAPIStatus interface


Index: pywin32.mak
===================================================================
RCS file: /cvsroot/pywin32/pywin32/AutoDuck/pywin32.mak,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pywin32.mak	4 Jul 2005 05:40:27 -0000	1.14
--- pywin32.mak	15 Mar 2006 04:28:52 -0000	1.15
***************
*** 44,47 ****
--- 44,48 ----
  	  $(GENDIR)/win32process.d $(GENDIR)/wincerapi.d $(GENDIR)/win32gui.d \
  	  $(GENDIR)/win32inet.d $(GENDIR)/_winxptheme.d  $(GENDIR)/win32crypt.d \
+ 	  $(GENDIR)/win32job.d \
  	  winxpgui.d
  
***************
*** 69,72 ****
--- 70,74 ----
  	  $(GENDIR)\PyIMAPIProp.d \
  	  $(GENDIR)\PyIMAPISession.d \
+ 	  $(GENDIR)\PyIMAPIStatus.d \
  	  $(GENDIR)\PyIMAPITable.d \
  	  $(GENDIR)\PyIMessage.d \
***************
*** 164,167 ****
--- 166,172 ----
  	$(PYTHON) makedfromi.py -o$*.d $(WIN32_SOURCE_DIR)/$(*B).i
  
+ $(GENDIR)/win32job.d: $(WIN32_SOURCE_DIR)/$(*B).i
+ 	$(PYTHON) makedfromi.py -o$*.d $(WIN32_SOURCE_DIR)/$(*B).i
+ 
  ##
  ## win32com generated
***************
*** 197,200 ****
--- 202,208 ----
  	$(PYTHON) makedfromi.py -o$*.d -p PyIUnknown $(MAPI_DIR)/src/$(*B).i
  
+ $(GENDIR)\PyIMAPIStatus.d: $(MAPI_DIR)/src/$(*B).i
+ 	$(PYTHON) makedfromi.py -o$*.d -p PyIMAPIProp $(MAPI_DIR)/src/$(*B).i
+ 
  $(GENDIR)\PyIMAPITable.d: $(MAPI_DIR)/src/$(*B).i
  	$(PYTHON) makedfromi.py -o$*.d -p PyIUnknown $(MAPI_DIR)/src/$(*B).i

[pywin32-checkins] pywin32/AutoDuck pyhtml.fmt,1.10,1.11

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

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

Modified Files:
	pyhtml.fmt 
Log Message:
Have "@seeapi" include links to google/msdn searches for the relevant terms


Index: pyhtml.fmt
===================================================================
RCS file: /cvsroot/pywin32/pywin32/AutoDuck/pyhtml.fmt,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pyhtml.fmt	31 May 2005 12:40:05 -0000	1.10
--- pyhtml.fmt	15 Mar 2006 04:28:25 -0000	1.11
***************
*** 464,468 ****
  .tag=pyseeapi, html, 1, 1
  .pre=$(rmh)Win32 API References$(rmhe)$(par)
! .format=$(term1)$1$(par)
  
  .tag=pyundocmfc, html, 2, 1
--- 464,468 ----
  .tag=pyseeapi, html, 1, 1
  .pre=$(rmh)Win32 API References$(rmhe)$(par)
! .format=$(term1)Search for <i>$1</i> at <a href="http://search.msdn.microsoft.com/search/results.aspx?view=msdn&qu=$1" target="_blank">msdn</a>, <a href="http://www.google.com/search?q=$1" target="_blank">google</a> or <a href="http://groups.google.com/groups?q=$1" target="_blank">google groups</a>.$(par)
  
  .tag=pyundocmfc, html, 2, 1

[pywin32-checkins] pywin32/com/win32comext/mapi/src PyIMAPIStatus.i,NONE,1.1 mapi.i,1.5,1.6 mapiguids.cpp,1.2,1.3

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

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

Modified Files:
	mapi.i mapiguids.cpp 
Added Files:
	PyIMAPIStatus.i 
Log Message:
Add IMAPIStatus.


--- NEW FILE: PyIMAPIStatus.i ---
/* File : PyIMAPIStatus.i */

%module IMAPIStatus  // Provides status information about the MAPI
                     // subsystem, the integrated address book and the MAPI
                     // spooler.

%include "typemaps.i"
%include "pywin32.i"
%include "pythoncom.i"
%include "mapilib.i"

%{

#include "PyIMAPIProp.h"
#include "PyIMAPIStatus.h"

PyIMAPIStatus::PyIMAPIStatus(IUnknown *pDisp) :
    PyIMAPIProp(pDisp)
{
    ob_type = &type;
}

PyIMAPIStatus::~PyIMAPIStatus()
{
}

/*static*/ IMAPIStatus *PyIMAPIStatus::GetI(PyObject *self)
{
    return (IMAPIStatus *)PyIUnknown::GetI(self);
}

%}

// @pyswig |ChangePassword|
// @pyparm unicode|oldPassword||
// @pyparm unicode|newPassword||
// @pyparm int|ulFlags||
HRESULT ChangePassword(char *old, char *newPassword, ULONG ulFlags);

// @pyswig |SettingsDialog|
// @pyparm int|ulUIParam||
// @pyparm int|ulFlags||
HRESULT SettingsDialog(ULONG ulUIParam, ULONG ulFlags);

// @pyswig |ValidateState|
// @pyparm int|ulUIParam||
// @pyparm int|ulFlags||
HRESULT ValidateState(ULONG ulUIParam, ULONG ulFlags);

// @pyswig |FlushQueues|
// @pyparm int|ulUIParam||
// @pyparm string|transport||Blob of data
// @pyparm int|ulFlags||
%{
// @pyswig |FlushQueues|
PyObject *PyIMAPIStatus::FlushQueues(PyObject *self, PyObject *args) 
{
    IMAPIStatus *_swig_self;
    if ((_swig_self=GetI(self))==NULL) return NULL;
    HRESULT  _result;
    ULONG uiparam = 0, flags = 0;
    char *entryID;
    int cbEntryID;
    // @pyparm int|uiparam||
    // @pyparm string|entryID||A blob
    // @pyparm int|flags||
    if (!PyArg_ParseTuple(args, "lz#l:FlushQueues",
                          &uiparam,
                          &entryID,
                          &cbEntryID,
                          &flags))
        return NULL;
    Py_BEGIN_ALLOW_THREADS
    _result = (HRESULT )_swig_self->FlushQueues(uiparam, cbEntryID, (ENTRYID *)entryID, flags);
    Py_END_ALLOW_THREADS
    if (FAILED(_result)) {
        return OleSetOleError(_result);
    }
    Py_INCREF(Py_None);
    return Py_None;
}

%}
%native(FlushQueues) FlushQueues;

Index: mapi.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapi.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mapi.i	23 Dec 2003 05:55:11 -0000	1.5
--- mapi.i	15 Mar 2006 04:26:30 -0000	1.6
***************
*** 29,32 ****
--- 29,33 ----
  #include <mapiutil.h>
  #include "PyIMAPIProp.h"
+ #include "PyIMAPIStatus.h"
  #include "PyIMAPITable.h"
  #include "PyIMAPISession.h"
***************
*** 127,130 ****
--- 128,134 ----
  	ADD_IID(IID_IMAPISession);
  
+ 	if ( PyCom_RegisterClientType(&PyIMAPIStatus::type, &IID_IMAPIStatus) != 0 ) return;
+ 	ADD_IID(IID_IMAPIStatus);
+ 
  	if ( PyCom_RegisterClientType(&PyIMAPITable::type, &IID_IMAPITable) != 0 ) return;
  	ADD_IID(IID_IMAPITable);

Index: mapiguids.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/mapiguids.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mapiguids.cpp	11 Feb 2006 03:47:02 -0000	1.2
--- mapiguids.cpp	15 Mar 2006 04:26:30 -0000	1.3
***************
*** 2,5 ****
--- 2,6 ----
  
  #define USES_IID_IMAPISession
+ #define USES_IID_IMAPIStatus
  #define USES_IID_IMAPITable
  #define USES_IID_IMAPIProp