pywin32-checkins — CVS checkin notices

[pywin32-checkins] pywin32/com win32com.dsp,1.17,1.17.2.1

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

Update of /cvsroot/pywin32/pywin32/com
In directory sc8-pr-cvs1:/tmp/cvs-serv29727

Modified Files:
      Tag: Python21
	win32com.dsp 
Log Message:
USER32 not linked for some reason on the Python 2.1 branch


Index: win32com.dsp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com.dsp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** win32com.dsp	14 Feb 2001 11:05:28 -0000	1.17
--- win32com.dsp	3 Jul 2003 03:54:31 -0000	1.17.2.1
***************
*** 62,66 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e2a0000" /subsystem:windows /dll /pdb:"Build\System\pythoncom21.pdb" /debug /machine:I386 /def:".\win32com\src\PythonCOM.def" /out:"Build\System\pythoncom21.dll" /implib:"Build\pythoncom.lib" /libpath:"..\win32\build"
  # SUBTRACT LINK32 /pdb:none
  # Begin Custom Build - copy to system32
--- 62,66 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
! # ADD LINK32 ole32.lib oleaut32.lib uuid.lib user32.lib /nologo /base:"0x1e2a0000" /subsystem:windows /dll /pdb:"Build\System\pythoncom21.pdb" /debug /machine:I386 /def:".\win32com\src\PythonCOM.def" /out:"Build\System\pythoncom21.dll" /implib:"Build\pythoncom.lib" /libpath:"..\win32\build"
  # SUBTRACT LINK32 /pdb:none
  # Begin Custom Build - copy to system32
***************
*** 104,108 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e2a0000" /subsystem:windows /dll /pdb:"Build\System\pythoncom21_d.pdb" /debug /machine:I386 /def:".\win32com\src\PythonCOM.def" /out:"Build\System\pythoncom21_d.dll" /implib:"Build\pythoncom_d.lib" /pdbtype:sept /libpath:"..\win32\build"
  # SUBTRACT LINK32 /pdb:none
  # Begin Custom Build - copy to system32
--- 104,108 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 ole32.lib oleaut32.lib uuid.lib user32.lib /nologo /base:"0x1e2a0000" /subsystem:windows /dll /pdb:"Build\System\pythoncom21_d.pdb" /debug /machine:I386 /def:".\win32com\src\PythonCOM.def" /out:"Build\System\pythoncom21_d.dll" /implib:"Build\pythoncom_d.lib" /pdbtype:sept /libpath:"..\win32\build"
  # SUBTRACT LINK32 /pdb:none
  # Begin Custom Build - copy to system32

[pywin32-checkins] pywin32/Pythonwin/pywin/framework help.py,1.6,1.7

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework
In directory sc8-pr-cvs1:/tmp/cvs-serv29048

Modified Files:
	help.py 
Log Message:
Fix warning about badly placed 'global' statement.


Index: help.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/framework/help.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** help.py	18 Aug 2000 06:24:02 -0000	1.6
--- help.py	3 Jul 2003 03:49:38 -0000	1.7
***************
*** 17,23 ****
  
  def FinalizeHelp():
  	if htmlhelp_handle is not None:
  			import win32help
- 			global htmlhelp_handle
  			try:
  				#frame = win32ui.GetMainFrame().GetSafeHwnd()
--- 17,23 ----
  
  def FinalizeHelp():
+ 	global htmlhelp_handle
  	if htmlhelp_handle is not None:
  			import win32help
  			try:
  				#frame = win32ui.GetMainFrame().GetSafeHwnd()
***************
*** 107,112 ****
  
  	# Load all help files from the registry.
  	if helpIDMap is None:
- 		global helpIDMap
  		helpIDMap = {}
  		cmdID = win32ui.ID_HELP_OTHER
--- 107,112 ----
  
  	# Load all help files from the registry.
+ 	global helpIDMap
  	if helpIDMap is None:
  		helpIDMap = {}
  		cmdID = win32ui.ID_HELP_OTHER

[pywin32-checkins] pywin32/com/win32com/src PythonCOM.cpp,1.18,1.19

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28596

Modified Files:
	PythonCOM.cpp 
Log Message:
Fix MkPArseDisplayName error I introduced in r1.16


Index: PythonCOM.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/PythonCOM.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PythonCOM.cpp	10 Mar 2003 01:26:42 -0000	1.18
--- PythonCOM.cpp	3 Jul 2003 03:47:53 -0000	1.19
***************
*** 762,766 ****
  static PyObject *pythoncom_MkParseDisplayName(PyObject *self, PyObject *args)
  {
! 	WCHAR *displayName;
  	PyObject *obBindCtx = NULL;
  
--- 762,767 ----
  static PyObject *pythoncom_MkParseDisplayName(PyObject *self, PyObject *args)
  {
! 	WCHAR *displayName = NULL;
! 	PyObject *obDisplayName;
  	PyObject *obBindCtx = NULL;
  
***************
*** 770,778 ****
  	// Any binding context created or passed in will be returned to the
  	// caller.
! 	if ( !PyArg_ParseTuple(args, "et|O:MkParseDisplayName", 
! 			Py_FileSystemDefaultEncoding, &displayName, 
  			&obBindCtx) )
  		return NULL;
  
  	HRESULT hr;
  	IBindCtx *pBC;
--- 771,782 ----
  	// Any binding context created or passed in will be returned to the
  	// caller.
! 	if ( !PyArg_ParseTuple(args, "O|O:MkParseDisplayName", 
! 			&obDisplayName, 
  			&obBindCtx) )
  		return NULL;
  
+ 	if (!PyWinObject_AsWCHAR(obDisplayName, &displayName, FALSE))
+ 		return NULL;
+ 
  	HRESULT hr;
  	IBindCtx *pBC;
***************
*** 781,785 ****
  		hr = CreateBindCtx(0, &pBC);
  		if ( FAILED(hr) ) {
! 			PyMem_Free(displayName);
  			return PyCom_BuildPyException(hr);
  		}
--- 785,789 ----
  		hr = CreateBindCtx(0, &pBC);
  		if ( FAILED(hr) ) {
! 			PyWinObject_FreeWCHAR(displayName);
  			return PyCom_BuildPyException(hr);
  		}
***************
*** 791,795 ****
  	{
  		if ( !PyCom_InterfaceFromPyObject(obBindCtx, IID_IBindCtx, (LPVOID*)&pBC, FALSE) ) {
! 			PyMem_Free(displayName);
  			return NULL;
  		}
--- 795,799 ----
  	{
  		if ( !PyCom_InterfaceFromPyObject(obBindCtx, IID_IBindCtx, (LPVOID*)&pBC, FALSE) ) {
! 			PyWinObject_FreeWCHAR(displayName);
  			return NULL;
  		}
***************
*** 805,809 ****
  	hr = MkParseDisplayName(pBC, displayName, &chEaten, &pmk);
  	PY_INTERFACE_POSTCALL;
! 	PyMem_Free(displayName);
  	if ( FAILED(hr) )
  	{
--- 809,813 ----
  	hr = MkParseDisplayName(pBC, displayName, &chEaten, &pmk);
  	PY_INTERFACE_POSTCALL;
! 	PyWinObject_FreeWCHAR(displayName);
  	if ( FAILED(hr) )
  	{

[pywin32-checkins] pywin32/com/win32com/test testall.py,1.13,1.14

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28470

Modified Files:
	testall.py 
Log Message:
Add WMI tests, and generalize test runner code.


Index: testall.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testall.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** testall.py	18 Nov 2002 11:20:07 -0000	1.13
--- testall.py	3 Jul 2003 03:45:48 -0000	1.14
***************
*** 3,6 ****
--- 3,7 ----
  import win32com.client
  from util import CheckClean
+ import traceback
  
  def GenerateAndRunOldStyle():
***************
*** 20,23 ****
--- 21,40 ----
      win32com.client.gencache.__init__() # Reset
  
+ def _test_with_import(capture, module_name, fn_name, desc):
+     try:
+         mod = __import__(module_name)
+     except (ImportError, pythoncom.com_error):
+         print "The '%s' test can not be run - failed to import test module" % desc
+         return
+     capture.capture()
+     try:
+         func = getattr(mod, fn_name)
+         func()
+         capture.release()
+         print "%s generated %d lines of output" % (desc, capture.get_num_lines_captured())
+     except:
+         traceback.print_exc()
+         capture.release()
+         print "***** %s test FAILED after %d lines of output" % (desc, capture.get_num_lines_captured())
  
  if __name__=='__main__':
***************
*** 44,79 ****
          testMSOfficeEvents.test()
  
!         capture.capture()
!         try:
!             import testAccess
!             testAccess.test()
!             capture.release()
!             print "MSAccess test generated %d lines of output" % capture.get_num_lines_captured()
!         finally:
!             capture.release()
! 
!     try:
!         import testExchange
!     except (ImportError, pythoncom.com_error):
!         print "The Exchange Server tests can not be run..."
!         testExchange = None
!     if testExchange is not None:
!         capture.capture()
!         testExchange.test()
!         capture.release()
!         print "testExchange test generated %d lines of output" % capture.get_num_lines_captured()
  
!     import testExplorer
!     testExplorer.TestAll()
  
  
!     capture.capture()
!     try:
!         import testStreams
!         testStreams.test()
!         capture.release()
!         print "testStreams test generated %d lines of output" % capture.get_num_lines_captured()
!     finally:
!         capture.release()
  
      # Execute testPyComTest in its own process so it can play
--- 61,73 ----
          testMSOfficeEvents.test()
  
!         _test_with_import(capture, "testAccess", "test", "MS Access")
  
!         import testExplorer
!         testExplorer.TestAll()
  
+         _test_with_import(capture, "testExchange", "test", "MS Exchange")
  
!     _test_with_import(capture, "testStreams", "test", "Streams")
!     _test_with_import(capture, "testWMI", "test", "WMI")
  
      # Execute testPyComTest in its own process so it can play

[pywin32-checkins] pywin32/com/win32com/test testWMI.py,NONE,1.1

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28424

Added Files:
	testWMI.py 
Log Message:
Add WMI tests (which shows failing MkParseDisplayName)


--- NEW FILE: testWMI.py ---
from win32com.client import GetObject

def test():
    cses = GetObject("WinMgMts:").InstancesOf("Win32_Process")
    for cs in cses:
        print cs.Properties_("Caption").Value

if __name__=='__main__':
    test()

[pywin32-checkins] pywin32/com/win32com/test testPyComTest.py,1.13,1.14

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

Update of /cvsroot/pywin32/pywin32/com/win32com/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28341

Modified Files:
	testPyComTest.py 
Log Message:
Make "quiet" really mean "quiet"


Index: testPyComTest.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/test/testPyComTest.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** testPyComTest.py	18 Dec 2002 03:57:28 -0000	1.13
--- testPyComTest.py	3 Jul 2003 03:44:39 -0000	1.14
***************
*** 24,27 ****
--- 24,33 ----
  verbose = 0
  
+ def progress(*args):
+     if verbose:
+         for arg in args:
+             print arg,
+         print
+ 
  def TestApplyResult(fn, args, result):
      try:
***************
*** 30,35 ****
      except:
          fnName = str(fn)
!     if verbose:
!         print "Testing ", fnName,
      pref = "function " + fnName
      try:
--- 36,40 ----
      except:
          fnName = str(fn)
!     progress("Testing ", fnName)
      pref = "function " + fnName
      try:
***************
*** 42,48 ****
          raise error, "%s caused exception %s,%s" % (pref, t, v)
  
-     if verbose: print
- 
- 
  # Simple handler class.  This demo only fires one event.
  class RandomEventHandler:
--- 47,50 ----
***************
*** 58,74 ****
              print "ERROR: Nothing was recieved!"
          for firedId, no in self.fireds.items():
!             if verbose:
!                 print "ID %d fired %d times" % (firedId, no)
  
  def TestDynamic():
!     if verbose: print "Testing Dynamic"
      import win32com.client.dynamic
      o = win32com.client.dynamic.DumbDispatch("PyCOMTest.PyCOMTest")
  
!     if verbose: print "Getting counter"
      counter = o.GetSimpleCounter()
      TestCounter(counter, 0)
  
!     if verbose: print "Checking default args"
      rc = o.TestOptionals()
      if  rc[:-1] != ("def", 0, 1) or abs(rc[-1]-3.14)>.01:
--- 60,75 ----
              print "ERROR: Nothing was recieved!"
          for firedId, no in self.fireds.items():
!             progress("ID %d fired %d times" % (firedId, no))
  
  def TestDynamic():
!     progress("Testing Dynamic")
      import win32com.client.dynamic
      o = win32com.client.dynamic.DumbDispatch("PyCOMTest.PyCOMTest")
  
!     progress("Getting counter")
      counter = o.GetSimpleCounter()
      TestCounter(counter, 0)
  
!     progress("Checking default args")
      rc = o.TestOptionals()
      if  rc[:-1] != ("def", 0, 1) or abs(rc[-1]-3.14)>.01:
***************
*** 90,94 ****
  #       if verbose: print "Testing structs"
      r = o.GetStruct()
-     print str(r.str_value)
      assert r.int_value == 99 and str(r.str_value)=="Hello from C++"
      counter = win32com.client.dynamic.DumbDispatch("PyCOMTest.SimpleCounter")
--- 91,94 ----
***************
*** 123,127 ****
      del i2
  
!     if verbose: print "Checking default args"
      rc = o.TestOptionals()
      if  rc[:-1] != ("def", 0, 1) or abs(rc[-1]-3.14)>.01:
--- 123,127 ----
      del i2
  
!     progress("Checking default args")
      rc = o.TestOptionals()
      if  rc[:-1] != ("def", 0, 1) or abs(rc[-1]-3.14)>.01:
***************
*** 141,155 ****
          raise error, "Did not get the specified optional2 values correctly"
  
!     if verbose: print "Checking var args"
      o.SetVarArgs("Hi", "There", "From", "Python", 1)
      if o.GetLastVarArgs() != ("Hi", "There", "From", "Python", 1):
          raise error, "VarArgs failed -" + str(o.GetLastVarArgs())
!     if verbose: print "Checking getting/passing IUnknown"
      if o.GetSetUnknown(o) != o:
          raise error, "GetSetUnknown failed"
!     if verbose: print "Checking getting/passing IDispatch"
      if type(o.GetSetDispatch(o)) !=types.InstanceType:
          raise error, "GetSetDispatch failed"
!     if verbose: print "Checking getting/passing IDispatch of known type"
      if o.GetSetInterface(o).__class__ != o.__class__:
          raise error, "GetSetDispatch failed"
--- 141,155 ----
          raise error, "Did not get the specified optional2 values correctly"
  
!     progress("Checking var args")
      o.SetVarArgs("Hi", "There", "From", "Python", 1)
      if o.GetLastVarArgs() != ("Hi", "There", "From", "Python", 1):
          raise error, "VarArgs failed -" + str(o.GetLastVarArgs())
!     progress("Checking getting/passing IUnknown")
      if o.GetSetUnknown(o) != o:
          raise error, "GetSetUnknown failed"
!     progress("Checking getting/passing IDispatch")
      if type(o.GetSetDispatch(o)) !=types.InstanceType:
          raise error, "GetSetDispatch failed"
!     progress("Checking getting/passing IDispatch of known type")
      if o.GetSetInterface(o).__class__ != o.__class__:
          raise error, "GetSetDispatch failed"
***************
*** 190,194 ****
      # Do the connection point thing...
      # Create a connection object.
!     if verbose: print "Testing connection points"
      sessions = []
      o = win32com.client.DispatchWithEvents( o, RandomEventHandler)
--- 190,194 ----
      # Do the connection point thing...
      # Create a connection object.
!     progress("Testing connection points")
      sessions = []
      o = win32com.client.DispatchWithEvents( o, RandomEventHandler)
***************
*** 205,213 ****
              o.Stop(session)
          o._DumpFireds()
!     if verbose: print "Finished generated .py test."
  
  def TestCounter(counter, bIsGenerated):
      # Test random access into container
!     if verbose: print "Testing counter", `counter`
      import random
      for i in xrange(50):
--- 205,213 ----
              o.Stop(session)
          o._DumpFireds()
!     progress("Finished generated .py test.")
  
  def TestCounter(counter, bIsGenerated):
      # Test random access into container
!     progress("Testing counter", `counter`)
      import random
      for i in xrange(50):
***************
*** 258,262 ****
      if num <> 10:
          raise error, "*** Unexpected number of loop iterations - got %d ***" % num
!     if verbose: print "Finished testing counter"
  
  def TestLocalVTable(ob):
--- 258,262 ----
      if num <> 10:
          raise error, "*** Unexpected number of loop iterations - got %d ***" % num
!     progress("Finished testing counter")
  
  def TestLocalVTable(ob):
***************
*** 305,309 ****
  
      for i in range(iterations):
!         print prompt[long_lived_server!=0] % (i+1, iterations)
          tester.TestQueryInterface()
  
--- 305,309 ----
  
      for i in range(iterations):
!         progress(prompt[long_lived_server!=0] % (i+1, iterations))
          tester.TestQueryInterface()
  
***************
*** 314,322 ****
      # to 1 to pass this test, i.e. for i in range(1)
      for i in range(2):
!         print "Testing VTables in-process #%d..." % (i+1)
          TestVTable(pythoncom.CLSCTX_INPROC_SERVER)
  
      for i in range(2):
!         print "Testing VTables out-of-process #%d..." % (i+1)
          TestVTable(pythoncom.CLSCTX_LOCAL_SERVER)
  
--- 314,322 ----
      # to 1 to pass this test, i.e. for i in range(1)
      for i in range(2):
!         progress("Testing VTables in-process #%d..." % (i+1))
          TestVTable(pythoncom.CLSCTX_INPROC_SERVER)
  
      for i in range(2):
!         progress("Testing VTables out-of-process #%d..." % (i+1))
          TestVTable(pythoncom.CLSCTX_LOCAL_SERVER)
  
***************
*** 342,350 ****
          return
  
!     print "Testing Universal Gateway..."
      TestMultiVTable()
      TestMultiQueryInterface()
  
!     print "Testing Python COM Test Horse..."
      TestDynamic()
      TestGenerated()
--- 342,350 ----
          return
  
!     progress("Testing Universal Gateway...")
      TestMultiVTable()
      TestMultiQueryInterface()
  
!     progress("Testing Python COM Test Horse...")
      TestDynamic()
      TestGenerated()

[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla scintillacon.py,1.14,1.15

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla
In directory sc8-pr-cvs1:/tmp/cvs-serv21391

Modified Files:
	scintillacon.py 
Log Message:
Couple of new functions generated by h2py


Index: scintillacon.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/scintillacon.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** scintillacon.py	27 Feb 2003 23:21:21 -0000	1.14
--- scintillacon.py	2 Jul 2003 04:10:18 -0000	1.15
***************
*** 2,5 ****
--- 2,9 ----
  
  # Included from BaseTsd.h
+ def HandleToUlong(h): return HandleToULong(h)
+ 
+ def UlongToHandle(ul): return ULongToHandle(ul)
+ 
  def UlongToPtr(ul): return ULongToPtr(ul)
  

[pywin32-checkins] pywin32/Pythonwin/pywin/scintilla IDLEenvironment.py,1.8,1.9

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla
In directory sc8-pr-cvs1:/tmp/cvs-serv21324

Modified Files:
	IDLEenvironment.py 
Log Message:
Fix problem with -ve indexes


Index: IDLEenvironment.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/scintilla/IDLEenvironment.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** IDLEenvironment.py	18 Apr 2002 02:15:51 -0000	1.8
--- IDLEenvironment.py	2 Jul 2003 04:09:55 -0000	1.9
***************
*** 271,276 ****
  		else:
  			raise ValueError, "Unsupported relative offset '%s'" % word
! 	return pos
! #	return max(pos, 0) # Tkinter is tollerant of -ve indexes.
  
  # A class that resembles an IDLE (ie, a Tk) text widget.
--- 271,275 ----
  		else:
  			raise ValueError, "Unsupported relative offset '%s'" % word
! 	return max(pos, 0) # Tkinter is tollerant of -ve indexes - we aren't
  
  # A class that resembles an IDLE (ie, a Tk) text widget.

[pywin32-checkins] pywin32/Pythonwin/pywin/Demos/ocx flash.py,NONE,1.1

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/Demos/ocx
In directory sc8-pr-cvs1:/tmp/cvs-serv21285

Added Files:
	flash.py 
Log Message:
New contributed OCX demo


--- NEW FILE: flash.py ---
# By Bradley Schatz
# simple flash/python application demonstrating bidirectional
# communicaion between flash and python. Click the sphere to see
# behavior. Uses Bounce.swf from FlashBounce.zip, available from
# http://pages.cpsc.ucalgary.ca/~saul/vb_examples/tutorial12/

# Update to the path of the .swf file (note it could be a true URL)
flash_url = "c:\\bounce.swf"

import win32ui, win32con, win32api, regutil
from pywin.mfc import window, activex
from win32com.client import gencache
import sys

FlashModule = gencache.EnsureModule("{D27CDB6B-AE6D-11CF-96B8-444553540000}", 0, 1, 0)

if FlashModule is None:
 raise ImportError, "Flash does not appear to be installed."

class MyFlashComponent(activex.Control, FlashModule.ShockwaveFlash):
 def __init__(self):
  activex.Control.__init__(self)
  FlashModule.ShockwaveFlash.__init__(self)
  self.x = 50
  self.y = 50
  self.angle = 30
  self.started = 0

 def OnFSCommand(self, command, args):
  print "FSCommend" , command, args
  self.x = self.x + 20
  self.y = self.y + 20
  self.angle = self.angle + 20
  if self.x > 200 or self.y > 200:
      self.x = 0
      self.y = 0
  if self.angle > 360:
      self.angle = 0
  self.SetVariable("xVal", self.x)
  self.SetVariable("yVal", self.y)
  self.SetVariable("angle", self.angle)
  self.TPlay("_root.mikeBall")

 def OnProgress(self, percentDone):
  print "PercentDone", percentDone
 def OnReadyStateChange(self, newState):
  # 0=Loading, 1=Uninitialized, 2=Loaded, 3=Interactive, 4=Complete
  print "State", newState


class BrowserFrame(window.MDIChildWnd):
 def __init__(self, url = None):
  if url is None:
   self.url = regutil.GetRegisteredHelpFile("Main Python Documentation")
  else:
   self.url = url
  pass # Dont call base class doc/view version...
 def Create(self, title, rect = None, parent = None):
  style = win32con.WS_CHILD | win32con.WS_VISIBLE | win32con.WS_OVERLAPPEDWINDOW
  self._obj_ = win32ui.CreateMDIChild()
  self._obj_.AttachObject(self)
  self._obj_.CreateWindow(None, title, style, rect, parent)
  rect = self.GetClientRect()
  rect = (0,0,rect[2]-rect[0], rect[3]-rect[1])
  self.ocx = MyFlashComponent()
  self.ocx.CreateControl("Flash Player", win32con.WS_VISIBLE | win32con.WS_CHILD, rect, self, 1000)
  self.ocx.LoadMovie(0,flash_url)
  self.ocx.Play()
  self.HookMessage (self.OnSize, win32con.WM_SIZE)

 def OnSize (self, params):
  rect = self.GetClientRect()
  rect = (0,0,rect[2]-rect[0], rect[3]-rect[1])
  self.ocx.SetWindowPos(0, rect, 0)

def Demo():
 url = None
 if len(sys.argv)>1:
  url = win32api.GetFullPathName(sys.argv[1])
 f = BrowserFrame(url)
 f.Create("Flash Player")

if __name__=='__main__':
 Demo()

[pywin32-checkins] pywin32/Pythonwin/pywin/docking DockingBar.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking
In directory sc8-pr-cvs1:/tmp/cvs-serv21231

Modified Files:
	DockingBar.py 
Log Message:
Hex constants -> dec


Index: DockingBar.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Pythonwin/pywin/docking/DockingBar.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DockingBar.py	30 Mar 2000 02:18:59 -0000	1.2
--- DockingBar.py	2 Jul 2003 04:08:49 -0000	1.3
***************
*** 260,266 ****
  		# Convert unsigned 16 bit to signed 32 bit.
  		x=win32api.LOWORD(lparam)
! 		if x & 0x8000: x = x | 0xFFFF0000
  		y = win32api.HIWORD(lparam)
! 		if y & 0x8000: y = y | 0xFFFF0000
  		pt = x, y
  		cpt = CenterPoint(self.rectTracker)
--- 260,266 ----
  		# Convert unsigned 16 bit to signed 32 bit.
  		x=win32api.LOWORD(lparam)
! 		if x & 32768: x = x | -65536
  		y = win32api.HIWORD(lparam)
! 		if y & 32768: y = y | -65536
  		pt = x, y
  		cpt = CenterPoint(self.rectTracker)

[pywin32-checkins] pywin32/win32/test test_win32wnet.py,NONE,1.1

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

Update of /cvsroot/pywin32/pywin32/win32/test
In directory sc8-pr-cvs1:/tmp/cvs-serv21140

Added Files:
	test_win32wnet.py 
Log Message:
win32wnet tests


--- NEW FILE: test_win32wnet.py ---
import unittest
import win32wnet, win32api

class TestCase(unittest.TestCase):
    def testGetUser(self):
        self.assertEquals(win32api.GetUserName(), win32wnet.WNetGetUser())


if __name__ == '__main__':
    unittest.main()

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

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

Update of /cvsroot/pywin32/pywin32/win32/test
In directory sc8-pr-cvs1:/tmp/cvs-serv21077

Modified Files:
	test_win32api.py 
Log Message:
Don't leave test case failing.


Index: test_win32api.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/test/test_win32api.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_win32api.py	2 May 2003 00:06:06 -0000	1.2
--- test_win32api.py	2 Jul 2003 04:06:57 -0000	1.3
***************
*** 33,41 ****
          try:
              try:
!                 reg_operation()
!             except:
!                 1/0 # Force exception
!         finally:
!             win32api.RegDeleteKey(win32con.HKEY_CURRENT_USER, key_name)
  
  if __name__ == '__main__':
--- 33,44 ----
          try:
              try:
!                 try:
!                     reg_operation()
!                 except:
!                     1/0 # Force exception
!             finally:
!                 win32api.RegDeleteKey(win32con.HKEY_CURRENT_USER, key_name)
!         except ZeroDivisionError:
!             pass
  
  if __name__ == '__main__':

[pywin32-checkins] pywin32/win32/test test_win32pipe.py,NONE,1.1

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

Update of /cvsroot/pywin32/pywin32/win32/test
In directory sc8-pr-cvs1:/tmp/cvs-serv20429

Added Files:
	test_win32pipe.py 
Log Message:
Tests for win32pipe.


--- NEW FILE: test_win32pipe.py ---
import unittest


import win32pipe
import win32file
import pywintypes
import winerror
import threading

class CurrentUserTestCase(unittest.TestCase):
    pipename = "\\\\.\\pipe\\python_test_pipe"
    def _workerThread(self, e):
        data = win32pipe.CallNamedPipe(self.pipename,"foo\0bar", 1024, win32pipe.NMPWAIT_WAIT_FOREVER)
        e.set()
        self.failUnless(data == "bar\0foo")

    def testCallNamedPipe(self):
        openMode = win32pipe.PIPE_ACCESS_DUPLEX
        pipeMode = win32pipe.PIPE_TYPE_MESSAGE  | win32pipe.PIPE_WAIT
    
        sa = pywintypes.SECURITY_ATTRIBUTES()
        sa.SetSecurityDescriptorDacl ( 1, None, 0 )
    
        pipeHandle = win32pipe.CreateNamedPipe(self.pipename,
                                                openMode,
                                                pipeMode,
                                                win32pipe.PIPE_UNLIMITED_INSTANCES,
                                                0,
                                                0,
                                                2000,
                                                sa)
    
        event = threading.Event()
        threading.Thread(target=self._workerThread, args=(event,)).start()
    
        hr = win32pipe.ConnectNamedPipe(pipeHandle)
        win32file.WriteFile(pipeHandle, "bar\0foo")
        hr, got = win32file.ReadFile(pipeHandle, 100)
        self.failUnless(got == "foo\0bar")
        event.wait(5)
        if not event.isSet():
            self.fail("Failed to wait for event!")

if __name__ == '__main__':
    unittest.main()

[pywin32-checkins] pywin32/com/win32com/server exception.py,1.4,1.5

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

Update of /cvsroot/pywin32/pywin32/com/win32com/server
In directory sc8-pr-cvs1:/tmp/cvs-serv18674/server

Modified Files:
	exception.py 
Log Message:
hex constants -> decimal


Index: exception.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/server/exception.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** exception.py	24 Nov 1999 22:08:16 -0000	1.4
--- exception.py	2 Jul 2003 03:43:42 -0000	1.5
***************
*** 51,55 ****
  			if scode >= -32768 and scode < 32768:
  				# this is HRESULT_FROM_WIN32()
! 				scode = 0x80070000 | (scode & 0x0000FFFF)
  		self.scode = scode
  
--- 51,55 ----
  			if scode >= -32768 and scode < 32768:
  				# this is HRESULT_FROM_WIN32()
! 				scode = -2147024896 | (scode & 0x0000FFFF)
  		self.scode = scode
  

[pywin32-checkins] pywin32/com/win32com __init__.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32com
In directory sc8-pr-cvs1:/tmp/cvs-serv18674

Modified Files:
	__init__.py 
Log Message:
hex constants -> decimal


Index: __init__.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	1 Mar 2003 00:22:06 -0000	1.2
--- __init__.py	2 Jul 2003 03:43:42 -0000	1.3
***************
*** 18,22 ****
  
  def SetupEnvironment():
! 	HKEY_LOCAL_MACHINE = 0x80000002 # Avoid pulling in win32con for just these...
  	KEY_QUERY_VALUE = 0x1
  	# Open the root key once, as this is quite slow on NT.
--- 18,22 ----
  
  def SetupEnvironment():
! 	HKEY_LOCAL_MACHINE = -2147483646 # Avoid pulling in win32con for just these...
  	KEY_QUERY_VALUE = 0x1
  	# Open the root key once, as this is quite slow on NT.

[pywin32-checkins] pywin32/com/win32com/client dynamic.py,1.17,1.18

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

Update of /cvsroot/pywin32/pywin32/com/win32com/client
In directory sc8-pr-cvs1:/tmp/cvs-serv18639

Modified Files:
	dynamic.py 
Log Message:
Remove use of apply()


Index: dynamic.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/client/dynamic.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dynamic.py	19 Nov 2002 11:43:02 -0000	1.17
--- dynamic.py	2 Jul 2003 03:43:13 -0000	1.18
***************
*** 152,156 ****
  		if invkind is not None:
  			allArgs = (dispid,LCID,invkind,1) + args
! 			return self._get_good_object_(apply(self._oleobj_.Invoke,allArgs),self._olerepr_.defaultDispatchName,None)
  		raise TypeError, "This dispatch object does not define a default method"
  
--- 152,156 ----
  		if invkind is not None:
  			allArgs = (dispid,LCID,invkind,1) + args
! 			return self._get_good_object_(self._oleobj_.Invoke(*allArgs),self._olerepr_.defaultDispatchName,None)
  		raise TypeError, "This dispatch object does not define a default method"
  
***************
*** 219,223 ****
  		if invkind is not None:
  			allArgs = (dispid,LCID,invkind,0,index) + args
! 			return self._get_good_object_(apply(self._oleobj_.Invoke,allArgs),self._olerepr_.defaultDispatchName,None)
  		raise TypeError, "This dispatch object does not define a default method"
  
--- 219,223 ----
  		if invkind is not None:
  			allArgs = (dispid,LCID,invkind,0,index) + args
! 			return self._get_good_object_(self._oleobj_.Invoke(*allArgs),self._olerepr_.defaultDispatchName,None)
  		raise TypeError, "This dispatch object does not define a default method"
  
***************
*** 238,242 ****
  
  	def _ApplyTypes_(self, dispid, wFlags, retType, argTypes, user, resultCLSID, *args):
! 		result = apply(self._oleobj_.InvokeTypes, (dispid, LCID, wFlags, retType, argTypes) + args)
  		return self._get_good_object_(result, user, resultCLSID)
  
--- 238,242 ----
  
  	def _ApplyTypes_(self, dispid, wFlags, retType, argTypes, user, resultCLSID, *args):
! 		result = self._oleobj_.InvokeTypes(*(dispid, LCID, wFlags, retType, argTypes) + args)
  		return self._get_good_object_(result, user, resultCLSID)
  
***************
*** 316,320 ****
  			item = self._olerepr_.mapFuncs[name]
  			dispId = item.dispid
! 			return self._get_good_object_(apply( self._oleobj_.Invoke, (dispId, LCID, item.desc[4], 0 ) + (args) ))
  		except KeyError:
  			raise AttributeError, name
--- 316,320 ----
  			item = self._olerepr_.mapFuncs[name]
  			dispId = item.dispid
! 			return self._get_good_object_(self._oleobj_.Invoke(*(dispId, LCID, item.desc[4], 0) + (args) ))
  		except KeyError:
  			raise AttributeError, name

[pywin32-checkins] pywin32/com/win32com/src oleargs.cpp,1.20,1.21

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

Update of /cvsroot/pywin32/pywin32/com/win32com/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18560

Modified Files:
	oleargs.cpp 
Log Message:
Correctly clear the variant, to prevent byref strings leaking.


Index: oleargs.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/oleargs.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** oleargs.cpp	10 Jan 2003 02:37:34 -0000	1.20
--- oleargs.cpp	2 Jul 2003 03:42:27 -0000	1.21
***************
*** 915,919 ****
  			V_VARIANTREF(var) = m_varBuf;
  		} else
! 			VariantClear(var);
  		if (!VALID_BYREF_MISSING(obj)) {
  			PyCom_VariantFromPyObject(obj, V_VARIANTREF(var));
--- 915,919 ----
  			V_VARIANTREF(var) = m_varBuf;
  		} else
! 			VariantClear(V_VARIANTREF(var));
  		if (!VALID_BYREF_MISSING(obj)) {
  			PyCom_VariantFromPyObject(obj, V_VARIANTREF(var));

[pywin32-checkins] pywin32/com/win32comext/shell shellcon.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/shell
In directory sc8-pr-cvs1:/tmp/cvs-serv18496

Modified Files:
	shellcon.py 
Log Message:
hex constants -> decimal


Index: shellcon.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/shellcon.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** shellcon.py	13 Dec 2001 06:52:44 -0000	1.2
--- shellcon.py	2 Jul 2003 03:41:42 -0000	1.3
***************
*** 5,30 ****
  DROPEFFECT_MOVE = 2
  DROPEFFECT_LINK = 4
! DROPEFFECT_SCROLL = 0x80000000
  
! FO_MOVE = 0x0001
! FO_COPY = 0x0002
! FO_DELETE = 0x0003
! FO_RENAME = 0x0004
! FOF_MULTIDESTFILES = 0x0001
! FOF_CONFIRMMOUSE = 0x0002
! FOF_SILENT = 0x0004
! FOF_RENAMEONCOLLISION = 0x0008
! FOF_NOCONFIRMATION = 0x0010
! FOF_WANTMAPPINGHANDLE = 0x0020
! FOF_ALLOWUNDO = 0x0040
! FOF_FILESONLY = 0x0080
! FOF_SIMPLEPROGRESS = 0x0100
! FOF_NOCONFIRMMKDIR = 0x0200
! FOF_NOERRORUI = 0x0400
! FOF_NOCOPYSECURITYATTRIBS = 0x0800
! PO_DELETE = 0x0013
! PO_RENAME = 0x0014
! PO_PORTCHANGE = 0x0020
! PO_REN_PORT = 0x0034
  SE_ERR_FNF = 2
  SE_ERR_PNF = 3
--- 5,30 ----
  DROPEFFECT_MOVE = 2
  DROPEFFECT_LINK = 4
! DROPEFFECT_SCROLL = -2147483648
  
! FO_MOVE = 1
! FO_COPY = 2
! FO_DELETE = 3
! FO_RENAME = 4
! FOF_MULTIDESTFILES = 1
! FOF_CONFIRMMOUSE = 2
! FOF_SILENT = 4
! FOF_RENAMEONCOLLISION = 8
! FOF_NOCONFIRMATION = 16
! FOF_WANTMAPPINGHANDLE = 32
! FOF_ALLOWUNDO = 64
! FOF_FILESONLY = 128
! FOF_SIMPLEPROGRESS = 256
! FOF_NOCONFIRMMKDIR = 512
! FOF_NOERRORUI = 1024
! FOF_NOCOPYSECURITYATTRIBS = 2048
! PO_DELETE = 19
! PO_RENAME = 20
! PO_PORTCHANGE = 32
! PO_REN_PORT = 52
  SE_ERR_FNF = 2
  SE_ERR_PNF = 3
***************
*** 38,99 ****
  SE_ERR_DDEBUSY = 30
  SE_ERR_NOASSOC = 31
! SEE_MASK_CLASSNAME = 0x00000001
! SEE_MASK_CLASSKEY = 0x00000003
! SEE_MASK_IDLIST = 0x00000004
! SEE_MASK_INVOKEIDLIST = 0x0000000c
! SEE_MASK_ICON = 0x00000010
! SEE_MASK_HOTKEY = 0x00000020
! SEE_MASK_NOCLOSEPROCESS = 0x00000040
! SEE_MASK_CONNECTNETDRV = 0x00000080
! SEE_MASK_FLAG_DDEWAIT = 0x00000100
! SEE_MASK_DOENVSUBST = 0x00000200
! SEE_MASK_FLAG_NO_UI = 0x00000400
! SEE_MASK_UNICODE = 0x00004000
! SEE_MASK_NO_CONSOLE = 0x00008000
! SEE_MASK_ASYNCOK = 0x00100000
! SEE_MASK_HMONITOR = 0x00200000
! SEE_MASK_CLASSNAME = 0x00000001
! SEE_MASK_CLASSKEY = 0x00000003
! SEE_MASK_IDLIST = 0x00000004
! SEE_MASK_INVOKEIDLIST = 0x0000000c
! SEE_MASK_ICON = 0x00000010
! SEE_MASK_HOTKEY = 0x00000020
! SEE_MASK_NOCLOSEPROCESS = 0x00000040
! SEE_MASK_CONNECTNETDRV = 0x00000080
! SEE_MASK_FLAG_DDEWAIT = 0x00000100
! SEE_MASK_DOENVSUBST = 0x00000200
! SEE_MASK_FLAG_NO_UI = 0x00000400
! SEE_MASK_UNICODE = 0x00004000
! SEE_MASK_NO_CONSOLE = 0x00008000
! SEE_MASK_ASYNCOK = 0x00100000
! SEE_MASK_HMONITOR = 0x00200000
! SHERB_NOCONFIRMATION = 0x00000001
! SHERB_NOPROGRESSUI = 0x00000002
! SHERB_NOSOUND = 0x00000004
! NIM_ADD = 0x00000000
! NIM_MODIFY = 0x00000001
! NIM_DELETE = 0x00000002
! NIF_MESSAGE = 0x00000001
! NIF_ICON = 0x00000002
! NIF_TIP = 0x00000004
! SHGFI_ICON = 0x000000100
! SHGFI_DISPLAYNAME = 0x000000200
! SHGFI_TYPENAME = 0x000000400
! SHGFI_ATTRIBUTES = 0x000000800
! SHGFI_ICONLOCATION = 0x000001000
! SHGFI_EXETYPE = 0x000002000
! SHGFI_SYSICONINDEX = 0x000004000
! SHGFI_LINKOVERLAY = 0x000008000
! SHGFI_SELECTED = 0x000010000
! SHGFI_ATTR_SPECIFIED = 0x000020000
! SHGFI_LARGEICON = 0x000000000
! SHGFI_SMALLICON = 0x000000001
! SHGFI_OPENICON = 0x000000002
! SHGFI_SHELLICONSIZE = 0x000000004
! SHGFI_PIDL = 0x000000008
! SHGFI_USEFILEATTRIBUTES = 0x000000010
! SHGNLI_PIDL = 0x000000001
! SHGNLI_PREFIXNAME = 0x000000002
! SHGNLI_NOUNIQUE = 0x000000004
  PRINTACTION_OPEN = 0
  PRINTACTION_PROPERTIES = 1
--- 38,99 ----
  SE_ERR_DDEBUSY = 30
  SE_ERR_NOASSOC = 31
! SEE_MASK_CLASSNAME = 1
! SEE_MASK_CLASSKEY = 3
! SEE_MASK_IDLIST = 4
! SEE_MASK_INVOKEIDLIST = 12
! SEE_MASK_ICON = 16
! SEE_MASK_HOTKEY = 32
! SEE_MASK_NOCLOSEPROCESS = 64
! SEE_MASK_CONNECTNETDRV = 128
! SEE_MASK_FLAG_DDEWAIT = 256
! SEE_MASK_DOENVSUBST = 512
! SEE_MASK_FLAG_NO_UI = 1024
! SEE_MASK_UNICODE = 16384
! SEE_MASK_NO_CONSOLE = 32768
! SEE_MASK_ASYNCOK = 1048576
! SEE_MASK_HMONITOR = 2097152
! SEE_MASK_CLASSNAME = 1
! SEE_MASK_CLASSKEY = 3
! SEE_MASK_IDLIST = 4
! SEE_MASK_INVOKEIDLIST = 12
! SEE_MASK_ICON = 16
! SEE_MASK_HOTKEY = 32
! SEE_MASK_NOCLOSEPROCESS = 64
! SEE_MASK_CONNECTNETDRV = 128
! SEE_MASK_FLAG_DDEWAIT = 256
! SEE_MASK_DOENVSUBST = 512
! SEE_MASK_FLAG_NO_UI = 1024
! SEE_MASK_UNICODE = 16384
! SEE_MASK_NO_CONSOLE = 32768
! SEE_MASK_ASYNCOK = 1048576
! SEE_MASK_HMONITOR = 2097152
! SHERB_NOCONFIRMATION = 1
! SHERB_NOPROGRESSUI = 2
! SHERB_NOSOUND = 4
! NIM_ADD = 0
! NIM_MODIFY = 1
! NIM_DELETE = 2
! NIF_MESSAGE = 1
! NIF_ICON = 2
! NIF_TIP = 4
! SHGFI_ICON = 256
! SHGFI_DISPLAYNAME = 512
! SHGFI_TYPENAME = 1024
! SHGFI_ATTRIBUTES = 2048
! SHGFI_ICONLOCATION = 4096
! SHGFI_EXETYPE = 8192
! SHGFI_SYSICONINDEX = 16384
! SHGFI_LINKOVERLAY = 32768
! SHGFI_SELECTED = 65536
! SHGFI_ATTR_SPECIFIED = 131072
! SHGFI_LARGEICON = 0
! SHGFI_SMALLICON = 1
! SHGFI_OPENICON = 2
! SHGFI_SHELLICONSIZE = 4
! SHGFI_PIDL = 8
! SHGFI_USEFILEATTRIBUTES = 16
! SHGNLI_PIDL = 1
! SHGNLI_PREFIXNAME = 2
! SHGNLI_NOUNIQUE = 4
  PRINTACTION_OPEN = 0
  PRINTACTION_PROPERTIES = 1
***************
*** 106,125 ****
  
  
! CMF_NORMAL = 0x00000000
! CMF_DEFAULTONLY = 0x00000001
! CMF_VERBSONLY = 0x00000002
! CMF_EXPLORE = 0x00000004
! CMF_NOVERBS = 0x00000008
! CMF_CANRENAME = 0x00000010
! CMF_NODEFAULT = 0x00000020
! CMF_INCLUDESTATIC = 0x00000040
! CMF_RESERVED = 0xffff0000
! GCS_VERBA = 0x00000000
! GCS_HELPTEXTA = 0x00000001
! GCS_VALIDATEA = 0x00000002
! GCS_VERBW = 0x00000004
! GCS_HELPTEXTW = 0x00000005
! GCS_VALIDATEW = 0x00000006
! GCS_UNICODE = 0x00000004
  GCS_VERB = GCS_VERBW
  GCS_HELPTEXT = GCS_HELPTEXTW
--- 106,125 ----
  
  
! CMF_NORMAL = 0
! CMF_DEFAULTONLY = 1
! CMF_VERBSONLY = 2
! CMF_EXPLORE = 4
! CMF_NOVERBS = 8
! CMF_CANRENAME = 16
! CMF_NODEFAULT = 32
! CMF_INCLUDESTATIC = 64
! CMF_RESERVED = -65536
! GCS_VERBA = 0
! GCS_HELPTEXTA = 1
! GCS_VALIDATEA = 2
! GCS_VERBW = 4
! GCS_HELPTEXTW = 5
! GCS_VALIDATEW = 6
! GCS_UNICODE = 4
  GCS_VERB = GCS_VERBW
  GCS_HELPTEXT = GCS_HELPTEXTW
***************
*** 140,279 ****
  CMIC_MASK_NO_CONSOLE = SEE_MASK_NO_CONSOLE
  CMIC_MASK_ASYNCOK = SEE_MASK_ASYNCOK
! CMIC_MASK_PTINVOKE = 0x20000000
! GIL_OPENICON = 0x0001
! GIL_FORSHELL = 0x0002
! GIL_ASYNC = 0x0020
! GIL_SIMULATEDOC = 0x0001
! GIL_PERINSTANCE = 0x0002
! GIL_PERCLASS = 0x0004
! GIL_NOTFILENAME = 0x0008
! GIL_DONTCACHE = 0x0010
! ISIOI_ICONFILE = 0x00000001
! ISIOI_ICONINDEX = 0x00000002
! ISIOI_SYSIMAGELISTINDEX = 0x00000004
! FO_MOVE = 0x0001
! FO_COPY = 0x0002
! FO_DELETE = 0x0003
! FO_RENAME = 0x0004
! FOF_MULTIDESTFILES = 0x0001
! FOF_CONFIRMMOUSE = 0x0002
! FOF_SILENT = 0x0004
! FOF_RENAMEONCOLLISION = 0x0008
! FOF_NOCONFIRMATION = 0x0010
! FOF_WANTMAPPINGHANDLE = 0x0020
! FOF_ALLOWUNDO = 0x0040
! FOF_FILESONLY = 0x0080
! FOF_SIMPLEPROGRESS = 0x0100
! FOF_NOCONFIRMMKDIR = 0x0200
! FOF_NOERRORUI = 0x0400
! FOF_NOCOPYSECURITYATTRIBS = 0x0800
! PO_DELETE = 0x0013
! PO_RENAME = 0x0014
! PO_PORTCHANGE = 0x0020
! PO_REN_PORT = 0x0034
! FVSIF_RECT = 0x00000001
! FVSIF_PINNED = 0x00000002
! FVSIF_NEWFAILED = 0x08000000
! FVSIF_NEWFILE = 0x80000000
! FVSIF_CANVIEWIT = 0x40000000
! FCIDM_SHVIEWFIRST = 0x0000
! FCIDM_SHVIEWLAST = 0x7fff
! FCIDM_BROWSERFIRST = 0xa000
! FCIDM_BROWSERLAST = 0xbf00
! FCIDM_GLOBALFIRST = 0x8000
! FCIDM_GLOBALLAST = 0x9fff
! FCIDM_MENU_FILE = (FCIDM_GLOBALFIRST+0x0000)
! FCIDM_MENU_EDIT = (FCIDM_GLOBALFIRST+0x0040)
! FCIDM_MENU_VIEW = (FCIDM_GLOBALFIRST+0x0080)
! FCIDM_MENU_VIEW_SEP_OPTIONS = (FCIDM_GLOBALFIRST+0x0081)
! FCIDM_MENU_TOOLS = (FCIDM_GLOBALFIRST+0x00c0)
! FCIDM_MENU_TOOLS_SEP_GOTO = (FCIDM_GLOBALFIRST+0x00c1)
! FCIDM_MENU_HELP = (FCIDM_GLOBALFIRST+0x0100)
! FCIDM_MENU_FIND = (FCIDM_GLOBALFIRST+0x0140)
! FCIDM_MENU_EXPLORE = (FCIDM_GLOBALFIRST+0x0150)
! FCIDM_MENU_FAVORITES = (FCIDM_GLOBALFIRST+0x0170)
  FCIDM_TOOLBAR = (FCIDM_BROWSERFIRST + 0)
  FCIDM_STATUS = (FCIDM_BROWSERFIRST + 1)
  IDC_OFFLINE_HAND = 103
! SBSP_DEFBROWSER = 0x0000
! SBSP_SAMEBROWSER = 0x0001
! SBSP_NEWBROWSER = 0x0002
! SBSP_DEFMODE = 0x0000
! SBSP_OPENMODE = 0x0010
! SBSP_EXPLOREMODE = 0x0020
! SBSP_ABSOLUTE = 0x0000
! SBSP_RELATIVE = 0x1000
! SBSP_PARENT = 0x2000
! SBSP_NAVIGATEBACK = 0x4000
! SBSP_NAVIGATEFORWARD = 0x8000
! SBSP_ALLOW_AUTONAVIGATE = 0x10000
! SBSP_INITIATEDBYHLINKFRAME = 0x80000000
! SBSP_REDIRECT = 0x40000000
! SBSP_WRITENOHISTORY = 0x08000000
! SBSP_NOAUTOSELECT = 0x04000000
! FCW_STATUS = 0x0001
! FCW_TOOLBAR = 0x0002
! FCW_TREE = 0x0003
! FCW_INTERNETBAR = 0x0006
! FCW_PROGRESS = 0x0008
! FCT_MERGE = 0x0001
! FCT_CONFIGABLE = 0x0002
! FCT_ADDTOEND = 0x0004
! CDBOSC_SETFOCUS = 0x00000000
! CDBOSC_KILLFOCUS = 0x00000001
! CDBOSC_SELCHANGE = 0x00000002
! CDBOSC_RENAME = 0x00000003
! SVSI_DESELECT = 0x0000
! SVSI_SELECT = 0x0001
! SVSI_EDIT = 0x0003
! SVSI_DESELECTOTHERS = 0x0004
! SVSI_ENSUREVISIBLE = 0x0008
! SVSI_FOCUSED = 0x0010
! SVSI_TRANSLATEPT = 0x0020
! SVGIO_BACKGROUND = 0x00000000
! SVGIO_SELECTION = 0x00000001
! SVGIO_ALLVIEW = 0x00000002
! STRRET_WSTR = 0x0000
! STRRET_OFFSET = 0x0001
! STRRET_CSTR = 0x0002
! CSIDL_DESKTOP = 0x0000
! CSIDL_INTERNET = 0x0001
! CSIDL_PROGRAMS = 0x0002
! CSIDL_CONTROLS = 0x0003
! CSIDL_PRINTERS = 0x0004
! CSIDL_PERSONAL = 0x0005
! CSIDL_FAVORITES = 0x0006
! CSIDL_STARTUP = 0x0007
! CSIDL_RECENT = 0x0008
! CSIDL_SENDTO = 0x0009
! CSIDL_BITBUCKET = 0x000a
! CSIDL_STARTMENU = 0x000b
! CSIDL_DESKTOPDIRECTORY = 0x0010
! CSIDL_DRIVES = 0x0011
! CSIDL_NETWORK = 0x0012
! CSIDL_NETHOOD = 0x0013
! CSIDL_FONTS = 0x0014
! CSIDL_TEMPLATES = 0x0015
! CSIDL_COMMON_STARTMENU = 0x0016
  CSIDL_COMMON_PROGRAMS = 0X0017
! CSIDL_COMMON_STARTUP = 0x0018
! CSIDL_COMMON_DESKTOPDIRECTORY = 0x0019
! CSIDL_APPDATA = 0x001a
! CSIDL_PRINTHOOD = 0x001b
! CSIDL_ALTSTARTUP = 0x001d
! CSIDL_COMMON_ALTSTARTUP = 0x001e
! CSIDL_COMMON_FAVORITES = 0x001f
! CSIDL_INTERNET_CACHE = 0x0020
! CSIDL_COOKIES = 0x0021
! CSIDL_HISTORY = 0x0022
! BIF_RETURNONLYFSDIRS = 0x0001
! BIF_DONTGOBELOWDOMAIN = 0x0002
! BIF_STATUSTEXT = 0x0004
! BIF_RETURNFSANCESTORS = 0x0008
! BIF_EDITBOX = 0x0010
! BIF_VALIDATE = 0x0020
! BIF_BROWSEFORCOMPUTER = 0x1000
! BIF_BROWSEFORPRINTER = 0x2000
! BIF_BROWSEINCLUDEFILES = 0x4000
  BFFM_INITIALIZED = 1
  BFFM_SELCHANGED = 2
--- 140,279 ----
  CMIC_MASK_NO_CONSOLE = SEE_MASK_NO_CONSOLE
  CMIC_MASK_ASYNCOK = SEE_MASK_ASYNCOK
! CMIC_MASK_PTINVOKE = 536870912
! GIL_OPENICON = 1
! GIL_FORSHELL = 2
! GIL_ASYNC = 32
! GIL_SIMULATEDOC = 1
! GIL_PERINSTANCE = 2
! GIL_PERCLASS = 4
! GIL_NOTFILENAME = 8
! GIL_DONTCACHE = 16
! ISIOI_ICONFILE = 1
! ISIOI_ICONINDEX = 2
! ISIOI_SYSIMAGELISTINDEX = 4
! FO_MOVE = 1
! FO_COPY = 2
! FO_DELETE = 3
! FO_RENAME = 4
! FOF_MULTIDESTFILES = 1
! FOF_CONFIRMMOUSE = 2
! FOF_SILENT = 4
! FOF_RENAMEONCOLLISION = 8
! FOF_NOCONFIRMATION = 16
! FOF_WANTMAPPINGHANDLE = 32
! FOF_ALLOWUNDO = 64
! FOF_FILESONLY = 128
! FOF_SIMPLEPROGRESS = 256
! FOF_NOCONFIRMMKDIR = 512
! FOF_NOERRORUI = 1024
! FOF_NOCOPYSECURITYATTRIBS = 2048
! PO_DELETE = 19
! PO_RENAME = 20
! PO_PORTCHANGE = 32
! PO_REN_PORT = 52
! FVSIF_RECT = 1
! FVSIF_PINNED = 2
! FVSIF_NEWFAILED = 134217728
! FVSIF_NEWFILE = -2147483648
! FVSIF_CANVIEWIT = 1073741824
! FCIDM_SHVIEWFIRST = 0
! FCIDM_SHVIEWLAST = 32767
! FCIDM_BROWSERFIRST = 40960
! FCIDM_BROWSERLAST = 48896
! FCIDM_GLOBALFIRST = 32768
! FCIDM_GLOBALLAST = 40959
! FCIDM_MENU_FILE = (FCIDM_GLOBALFIRST+0)
! FCIDM_MENU_EDIT = (FCIDM_GLOBALFIRST+64)
! FCIDM_MENU_VIEW = (FCIDM_GLOBALFIRST+128)
! FCIDM_MENU_VIEW_SEP_OPTIONS = (FCIDM_GLOBALFIRST+129)
! FCIDM_MENU_TOOLS = (FCIDM_GLOBALFIRST+192)
! FCIDM_MENU_TOOLS_SEP_GOTO = (FCIDM_GLOBALFIRST+193)
! FCIDM_MENU_HELP = (FCIDM_GLOBALFIRST+256)
! FCIDM_MENU_FIND = (FCIDM_GLOBALFIRST+320)
! FCIDM_MENU_EXPLORE = (FCIDM_GLOBALFIRST+336)
! FCIDM_MENU_FAVORITES = (FCIDM_GLOBALFIRST+368)
  FCIDM_TOOLBAR = (FCIDM_BROWSERFIRST + 0)
  FCIDM_STATUS = (FCIDM_BROWSERFIRST + 1)
  IDC_OFFLINE_HAND = 103
! SBSP_DEFBROWSER = 0
! SBSP_SAMEBROWSER = 1
! SBSP_NEWBROWSER = 2
! SBSP_DEFMODE = 0
! SBSP_OPENMODE = 16
! SBSP_EXPLOREMODE = 32
! SBSP_ABSOLUTE = 0
! SBSP_RELATIVE = 4096
! SBSP_PARENT = 8192
! SBSP_NAVIGATEBACK = 16384
! SBSP_NAVIGATEFORWARD = 32768
! SBSP_ALLOW_AUTONAVIGATE = 65536
! SBSP_INITIATEDBYHLINKFRAME = -2147483648
! SBSP_REDIRECT = 1073741824
! SBSP_WRITENOHISTORY = 134217728
! SBSP_NOAUTOSELECT = 67108864
! FCW_STATUS = 1
! FCW_TOOLBAR = 2
! FCW_TREE = 3
! FCW_INTERNETBAR = 6
! FCW_PROGRESS = 8
! FCT_MERGE = 1
! FCT_CONFIGABLE = 2
! FCT_ADDTOEND = 4
! CDBOSC_SETFOCUS = 0
! CDBOSC_KILLFOCUS = 1
! CDBOSC_SELCHANGE = 2
! CDBOSC_RENAME = 3
! SVSI_DESELECT = 0
! SVSI_SELECT = 1
! SVSI_EDIT = 3
! SVSI_DESELECTOTHERS = 4
! SVSI_ENSUREVISIBLE = 8
! SVSI_FOCUSED = 16
! SVSI_TRANSLATEPT = 32
! SVGIO_BACKGROUND = 0
! SVGIO_SELECTION = 1
! SVGIO_ALLVIEW = 2
! STRRET_WSTR = 0
! STRRET_OFFSET = 1
! STRRET_CSTR = 2
! CSIDL_DESKTOP = 0
! CSIDL_INTERNET = 1
! CSIDL_PROGRAMS = 2
! CSIDL_CONTROLS = 3
! CSIDL_PRINTERS = 4
! CSIDL_PERSONAL = 5
! CSIDL_FAVORITES = 6
! CSIDL_STARTUP = 7
! CSIDL_RECENT = 8
! CSIDL_SENDTO = 9
! CSIDL_BITBUCKET = 10
! CSIDL_STARTMENU = 11
! CSIDL_DESKTOPDIRECTORY = 16
! CSIDL_DRIVES = 17
! CSIDL_NETWORK = 18
! CSIDL_NETHOOD = 19
! CSIDL_FONTS = 20
! CSIDL_TEMPLATES = 21
! CSIDL_COMMON_STARTMENU = 22
  CSIDL_COMMON_PROGRAMS = 0X0017
! CSIDL_COMMON_STARTUP = 24
! CSIDL_COMMON_DESKTOPDIRECTORY = 25
! CSIDL_APPDATA = 26
! CSIDL_PRINTHOOD = 27
! CSIDL_ALTSTARTUP = 29
! CSIDL_COMMON_ALTSTARTUP = 30
! CSIDL_COMMON_FAVORITES = 31
! CSIDL_INTERNET_CACHE = 32
! CSIDL_COOKIES = 33
! CSIDL_HISTORY = 34
! BIF_RETURNONLYFSDIRS = 1
! BIF_DONTGOBELOWDOMAIN = 2
! BIF_STATUSTEXT = 4
! BIF_RETURNFSANCESTORS = 8
! BIF_EDITBOX = 16
! BIF_VALIDATE = 32
! BIF_BROWSEFORCOMPUTER = 4096
! BIF_BROWSEFORPRINTER = 8192
! BIF_BROWSEINCLUDEFILES = 16384
  BFFM_INITIALIZED = 1
  BFFM_SELCHANGED = 2
***************
*** 316,338 ****
  SFGAO_NONENUMERATED = 0x00100000L
  SFGAO_NEWCONTENT = 0x00200000L
! DWFRF_NORMAL = 0x0000
! DWFRF_DELETECONFIGDATA = 0x0001
! DWFAF_HIDDEN = 0x0001
! DBIM_MINSIZE = 0x0001
! DBIM_MAXSIZE = 0x0002
! DBIM_INTEGRAL = 0x0004
! DBIM_ACTUAL = 0x0008
! DBIM_TITLE = 0x0010
! DBIM_MODEFLAGS = 0x0020
! DBIM_BKCOLOR = 0x0040
! DBIMF_NORMAL = 0x0000
! DBIMF_VARIABLEHEIGHT = 0x0008
! DBIMF_DEBOSSED = 0x0020
! DBIMF_BKCOLOR = 0x0040
! DBIF_VIEWMODE_NORMAL = 0x0000
! DBIF_VIEWMODE_VERTICAL = 0x0001
! DBIF_VIEWMODE_FLOATING = 0x0002
! DBIF_VIEWMODE_TRANSPARENT = 0x0004
! COMPONENT_TOP = (0x7fffffff)
  COMP_TYPE_HTMLDOC = 0
  COMP_TYPE_PICTURE = 1
--- 316,338 ----
  SFGAO_NONENUMERATED = 0x00100000L
  SFGAO_NEWCONTENT = 0x00200000L
! DWFRF_NORMAL = 0
! DWFRF_DELETECONFIGDATA = 1
! DWFAF_HIDDEN = 1
! DBIM_MINSIZE = 1
! DBIM_MAXSIZE = 2
! DBIM_INTEGRAL = 4
! DBIM_ACTUAL = 8
! DBIM_TITLE = 16
! DBIM_MODEFLAGS = 32
! DBIM_BKCOLOR = 64
! DBIMF_NORMAL = 0
! DBIMF_VARIABLEHEIGHT = 8
! DBIMF_DEBOSSED = 32
! DBIMF_BKCOLOR = 64
! DBIF_VIEWMODE_NORMAL = 0
! DBIF_VIEWMODE_VERTICAL = 1
! DBIF_VIEWMODE_FLOATING = 2
! DBIF_VIEWMODE_TRANSPARENT = 4
! COMPONENT_TOP = (2147483647)
  COMP_TYPE_HTMLDOC = 0
  COMP_TYPE_PICTURE = 1
***************
*** 341,366 ****
  COMP_TYPE_CFHTML = 4
  COMP_TYPE_MAX = 4
! AD_APPLY_SAVE = 0x00000001
! AD_APPLY_HTMLGEN = 0x00000002
! AD_APPLY_REFRESH = 0x00000004
  AD_APPLY_ALL = (AD_APPLY_SAVE | AD_APPLY_HTMLGEN | AD_APPLY_REFRESH)
! AD_APPLY_FORCE = 0x00000008
! AD_APPLY_BUFFERED_REFRESH = 0x00000010
  WPSTYLE_CENTER = 0
  WPSTYLE_TILE = 1
  WPSTYLE_STRETCH = 2
  WPSTYLE_MAX = 3
! COMP_ELEM_TYPE = 0x00000001
! COMP_ELEM_CHECKED = 0x00000002
! COMP_ELEM_DIRTY = 0x00000004
! COMP_ELEM_NOSCROLL = 0x00000008
! COMP_ELEM_POS_LEFT = 0x00000010
! COMP_ELEM_POS_TOP = 0x00000020
! COMP_ELEM_SIZE_WIDTH = 0x00000040
! COMP_ELEM_SIZE_HEIGHT = 0x00000080
! COMP_ELEM_POS_ZINDEX = 0x00000100
! COMP_ELEM_SOURCE = 0x00000200
! COMP_ELEM_FRIENDLYNAME = 0x00000400
! COMP_ELEM_SUBSCRIBEDURL = 0x00000800
  ADDURL_SILENT = 0X0001
  CFSTR_SHELLIDLIST = "Shell IDList Array"
--- 341,366 ----
  COMP_TYPE_CFHTML = 4
  COMP_TYPE_MAX = 4
! AD_APPLY_SAVE = 1
! AD_APPLY_HTMLGEN = 2
! AD_APPLY_REFRESH = 4
  AD_APPLY_ALL = (AD_APPLY_SAVE | AD_APPLY_HTMLGEN | AD_APPLY_REFRESH)
! AD_APPLY_FORCE = 8
! AD_APPLY_BUFFERED_REFRESH = 16
  WPSTYLE_CENTER = 0
  WPSTYLE_TILE = 1
  WPSTYLE_STRETCH = 2
  WPSTYLE_MAX = 3
! COMP_ELEM_TYPE = 1
! COMP_ELEM_CHECKED = 2
! COMP_ELEM_DIRTY = 4
! COMP_ELEM_NOSCROLL = 8
! COMP_ELEM_POS_LEFT = 16
! COMP_ELEM_POS_TOP = 32
! COMP_ELEM_SIZE_WIDTH = 64
! COMP_ELEM_SIZE_HEIGHT = 128
! COMP_ELEM_POS_ZINDEX = 256
! COMP_ELEM_SOURCE = 512
! COMP_ELEM_FRIENDLYNAME = 1024
! COMP_ELEM_SUBSCRIBEDURL = 2048
  ADDURL_SILENT = 0X0001
  CFSTR_SHELLIDLIST = "Shell IDList Array"
***************
*** 412,430 ****
  SHCNE_INTERRUPT = 0x80000000L
  SHCNEE_ORDERCHANGED = 0x00000002L
! SHCNF_IDLIST = 0x0000
! SHCNF_PATHA = 0x0001
! SHCNF_PRINTERA = 0x0002
! SHCNF_DWORD = 0x0003
! SHCNF_PATHW = 0x0005
! SHCNF_PRINTERW = 0x0006
! SHCNF_TYPE = 0x00FF
! SHCNF_FLUSH = 0x1000
! SHCNF_FLUSHNOWAIT = 0x2000
  SHCNF_PATH = SHCNF_PATHW
  SHCNF_PRINTER = SHCNF_PRINTERW
  SHCNF_PATH = SHCNF_PATHA
  SHCNF_PRINTER = SHCNF_PRINTERA
! QIF_CACHED = 0x00000001
! QIF_DONTEXPANDFOLDER = 0x00000002
  SHARD_PIDL = 0x00000001L
  SHARD_PATHA = 0x00000002L
--- 412,430 ----
  SHCNE_INTERRUPT = 0x80000000L
  SHCNEE_ORDERCHANGED = 0x00000002L
! SHCNF_IDLIST = 0
! SHCNF_PATHA = 1
! SHCNF_PRINTERA = 2
! SHCNF_DWORD = 3
! SHCNF_PATHW = 5
! SHCNF_PRINTERW = 6
! SHCNF_TYPE = 255
! SHCNF_FLUSH = 4096
! SHCNF_FLUSHNOWAIT = 8192
  SHCNF_PATH = SHCNF_PATHW
  SHCNF_PRINTER = SHCNF_PRINTERW
  SHCNF_PATH = SHCNF_PATHA
  SHCNF_PRINTER = SHCNF_PRINTERA
! QIF_CACHED = 1
! QIF_DONTEXPANDFOLDER = 2
  SHARD_PIDL = 0x00000001L
  SHARD_PATHA = 0x00000002L
***************
*** 480,520 ****
  PID_INTSITE_CODEPAGE = 18
  PID_INTSITE_TRACKING = 19
! PIDISF_RECENTLYCHANGED = 0x00000001
! PIDISF_CACHEDSTICKY = 0x00000002
! PIDISF_CACHEIMAGES = 0x00000010
! PIDISF_FOLLOWALLLINKS = 0x00000020
  PIDISM_GLOBAL = 0
  PIDISM_WATCH = 1
  PIDISM_DONTWATCH = 2
! SSF_SHOWALLOBJECTS = 0x0001
! SSF_SHOWEXTENSIONS = 0x0002
! SSF_SHOWCOMPCOLOR = 0x0008
! SSF_SHOWSYSFILES = 0x0020
! SSF_DOUBLECLICKINWEBVIEW = 0x0080
! SSF_SHOWATTRIBCOL = 0x0100
! SSF_DESKTOPHTML = 0x0200
! SSF_WIN95CLASSIC = 0x0400
! SSF_DONTPRETTYPATH = 0x0800
! SSF_SHOWINFOTIP = 0x2000
! SSF_MAPNETDRVBUTTON = 0x1000
! SSF_NOCONFIRMRECYCLE = 0x8000
! SSF_HIDEICONS = 0x4000
  
! ABM_NEW = 0x00000000
! ABM_REMOVE = 0x00000001
! ABM_QUERYPOS = 0x00000002
! ABM_SETPOS = 0x00000003
! ABM_GETSTATE = 0x00000004
! ABM_GETTASKBARPOS = 0x00000005
! ABM_ACTIVATE = 0x00000006
! ABM_GETAUTOHIDEBAR = 0x00000007
! ABM_SETAUTOHIDEBAR = 0x00000008
! ABM_WINDOWPOSCHANGED = 0x0000009
! ABN_STATECHANGE = 0x0000000
! ABN_POSCHANGED = 0x0000001
! ABN_FULLSCREENAPP = 0x0000002
! ABN_WINDOWARRANGE = 0x0000003
! ABS_AUTOHIDE = 0x0000001
! ABS_ALWAYSONTOP = 0x0000002
  ABE_LEFT = 0
  ABE_TOP = 1
--- 480,520 ----
  PID_INTSITE_CODEPAGE = 18
  PID_INTSITE_TRACKING = 19
! PIDISF_RECENTLYCHANGED = 1
! PIDISF_CACHEDSTICKY = 2
! PIDISF_CACHEIMAGES = 16
! PIDISF_FOLLOWALLLINKS = 32
  PIDISM_GLOBAL = 0
  PIDISM_WATCH = 1
  PIDISM_DONTWATCH = 2
! SSF_SHOWALLOBJECTS = 1
! SSF_SHOWEXTENSIONS = 2
! SSF_SHOWCOMPCOLOR = 8
! SSF_SHOWSYSFILES = 32
! SSF_DOUBLECLICKINWEBVIEW = 128
! SSF_SHOWATTRIBCOL = 256
! SSF_DESKTOPHTML = 512
! SSF_WIN95CLASSIC = 1024
! SSF_DONTPRETTYPATH = 2048
! SSF_SHOWINFOTIP = 8192
! SSF_MAPNETDRVBUTTON = 4096
! SSF_NOCONFIRMRECYCLE = 32768
! SSF_HIDEICONS = 16384
  
! ABM_NEW = 0
! ABM_REMOVE = 1
! ABM_QUERYPOS = 2
! ABM_SETPOS = 3
! ABM_GETSTATE = 4
! ABM_GETTASKBARPOS = 5
! ABM_ACTIVATE = 6
! ABM_GETAUTOHIDEBAR = 7
! ABM_SETAUTOHIDEBAR = 8
! ABM_WINDOWPOSCHANGED = 9
! ABN_STATECHANGE = 0
! ABN_POSCHANGED = 1
! ABN_FULLSCREENAPP = 2
! ABN_WINDOWARRANGE = 3
! ABS_AUTOHIDE = 1
! ABS_ALWAYSONTOP = 2
  ABE_LEFT = 0
  ABE_TOP = 1
***************
*** 524,527 ****
  
  # Some manually added ones
! CSIDL_COMMON_APPDATA = 0x23
! CSIDL_LOCAL_APPDATA = 0x1c
--- 524,527 ----
  
  # Some manually added ones
! CSIDL_COMMON_APPDATA = 35
! CSIDL_LOCAL_APPDATA = 28

[pywin32-checkins] pywin32/com/win32comext/mapi/src PyIMAPIFolder.i,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18454

Modified Files:
	PyIMAPIFolder.i 
Log Message:
autoduck corrections.


Index: PyIMAPIFolder.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/PyIMAPIFolder.i,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyIMAPIFolder.i	25 Nov 2002 03:10:39 -0000	1.2
--- PyIMAPIFolder.i	2 Jul 2003 03:41:11 -0000	1.3
***************
*** 54,58 ****
  // @pyswig |CopyMessages|Copies the specified messages
  HRESULT CopyMessages(
! 	SBinaryArray *INPUT, // @pyparm <o SBinaryArray>|msgs||
  	IID *INPUT_NULLOK,    // @pyparm <o PyIID>|iid||IID representing the interface to be used to access the destination folder.  Should usually be None.
  	IMAPIFolder *INPUT, // @pyparm <o PyIMAPIFolder>|folder||The destination folder
--- 54,58 ----
  // @pyswig |CopyMessages|Copies the specified messages
  HRESULT CopyMessages(
! 	SBinaryArray *INPUT, // @pyparm <o PySBinaryArray>|msgs||
  	IID *INPUT_NULLOK,    // @pyparm <o PyIID>|iid||IID representing the interface to be used to access the destination folder.  Should usually be None.
  	IMAPIFolder *INPUT, // @pyparm <o PyIMAPIFolder>|folder||The destination folder
***************
*** 68,72 ****
  // @pyswig |DeleteMessages|Deletes the specified messages.
  HRESULT DeleteMessages(
! 	SBinaryArray *INPUT, // @pyparm <o SBinaryArray>|msgs||
  	unsigned long ulUIParam, // @pyparm int|uiParam||A HWND for the progress
  	IMAPIProgress *INPUT_NULLOK,// @pyparm <o PyIMAPIProgress>|progress||A progress object, or None
--- 68,72 ----
  // @pyswig |DeleteMessages|Deletes the specified messages.
  HRESULT DeleteMessages(
! 	SBinaryArray *INPUT, // @pyparm <o PySBinaryArray>|msgs||
  	unsigned long ulUIParam, // @pyparm int|uiParam||A HWND for the progress
  	IMAPIProgress *INPUT_NULLOK,// @pyparm <o PyIMAPIProgress>|progress||A progress object, or None

[pywin32-checkins] pywin32/com/win32comext/mapi emsabtags.py,1.1,1.2 mapitags.py,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi
In directory sc8-pr-cvs1:/tmp/cvs-serv18394

Modified Files:
	emsabtags.py mapitags.py 
Log Message:
Hex constants -> decimal


Index: emsabtags.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/emsabtags.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** emsabtags.py	1 Sep 1999 23:17:15 -0000	1.1
--- emsabtags.py	2 Jul 2003 03:40:37 -0000	1.2
***************
*** 17,845 ****
  
  # Flags for ulFlag on ResolveNames
! EMS_AB_ADDRESS_LOOKUP                 = 0x01
  
  
  # Constructed, but externally visible.
! PR_EMS_AB_SERVER                     = PROP_TAG( PT_TSTRING, 0xFFFE)
! PR_EMS_AB_SERVER_A                   = PROP_TAG( PT_STRING8, 0xFFFE)
! PR_EMS_AB_SERVER_W                   = PROP_TAG( PT_UNICODE, 0xFFFE)
! PR_EMS_AB_CONTAINERID                = PROP_TAG( PT_LONG,    0xFFFD)
[...1629 lines suppressed...]
! PR_EMS_AB_X121_ADDRESS               = PROP_TAG( PT_MV_TSTRING,    33112)
! PR_EMS_AB_X121_ADDRESS_A             = PROP_TAG( PT_MV_STRING8,    33112)
! PR_EMS_AB_X121_ADDRESS_W             = PROP_TAG( PT_MV_UNICODE,    33112)
! PR_EMS_AB_X25_CALL_USER_DATA_INCOMING = PROP_TAG( PT_BINARY,        33113)
! PR_EMS_AB_X25_CALL_USER_DATA_OUTGOING = PROP_TAG( PT_BINARY,        33114)
! PR_EMS_AB_X25_FACILITIES_DATA_INCOMING = PROP_TAG( PT_BINARY,        33115)
! PR_EMS_AB_X25_FACILITIES_DATA_OUTGOING = PROP_TAG( PT_BINARY,        33116)
! PR_EMS_AB_X25_LEASED_LINE_PORT       = PROP_TAG( PT_BINARY,        33117)
! PR_EMS_AB_X25_LEASED_OR_SWITCHED     = PROP_TAG( PT_BOOLEAN,       33118)
! PR_EMS_AB_X25_REMOTE_MTA_PHONE       = PROP_TAG( PT_TSTRING,       33119)
! PR_EMS_AB_X25_REMOTE_MTA_PHONE_A     = PROP_TAG( PT_STRING8,       33119)
! PR_EMS_AB_X25_REMOTE_MTA_PHONE_W     = PROP_TAG( PT_UNICODE,       33119)
! PR_EMS_AB_X400_ATTACHMENT_TYPE       = PROP_TAG( PT_BINARY,        33120)
! PR_EMS_AB_X400_SELECTOR_SYNTAX       = PROP_TAG( PT_LONG,          33121)
! PR_EMS_AB_X500_ACCESS_CONTROL_LIST   = PROP_TAG( PT_BINARY,        33122)
! PR_EMS_AB_XMIT_TIMEOUT_NON_URGENT    = PROP_TAG( PT_LONG,          33123)
! PR_EMS_AB_XMIT_TIMEOUT_NORMAL        = PROP_TAG( PT_LONG,          33124)
! PR_EMS_AB_XMIT_TIMEOUT_URGENT        = PROP_TAG( PT_LONG,          33125)
  
  

Index: mapitags.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/mapitags.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mapitags.py	10 Mar 2003 01:02:49 -0000	1.2
--- mapitags.py	2 Jul 2003 03:40:37 -0000	1.3
***************
*** 1,3 ****
! MV_FLAG         = 0x1000          # Multi-value flag 
  
  PT_UNSPECIFIED  = 0
--- 1,3 ----
! MV_FLAG         = 4096          # Multi-value flag 
  
  PT_UNSPECIFIED  = 0
***************
*** 48,52 ****
  
[...1876 lines suppressed...]
! PR_FOLDER_FLAGS                         = PROP_TAG( PT_LONG, pidAdminMin+24 )
! PR_LAST_ACCESS_TIME		=				PROP_TAG( PT_SYSTIME, pidAdminMin+25 )
! PR_RESTRICTION_COUNT                    = PROP_TAG( PT_LONG, pidAdminMin+26 )
! PR_CATEG_COUNT                          = PROP_TAG( PT_LONG, pidAdminMin+27 )
! PR_CACHED_COLUMN_COUNT                  = PROP_TAG( PT_LONG, pidAdminMin+28 )
! PR_NORMAL_MSG_W_ATTACH_COUNT    		= PROP_TAG( PT_LONG, pidAdminMin+29 )
! PR_ASSOC_MSG_W_ATTACH_COUNT             = PROP_TAG( PT_LONG, pidAdminMin+30 )
! PR_RECIPIENT_ON_NORMAL_MSG_COUNT        = PROP_TAG( PT_LONG, pidAdminMin+31 )
! PR_RECIPIENT_ON_ASSOC_MSG_COUNT 		= PROP_TAG( PT_LONG, pidAdminMin+32 )
! PR_ATTACH_ON_NORMAL_MSG_COUNT   		= PROP_TAG( PT_LONG, pidAdminMin+33 )
! PR_ATTACH_ON_ASSOC_MSG_COUNT    		= PROP_TAG( PT_LONG, pidAdminMin+34 )
! PR_NORMAL_MESSAGE_SIZE                  = PROP_TAG( PT_LONG, pidAdminMin+35 )
! PR_NORMAL_MESSAGE_SIZE_EXTENDED         = PROP_TAG( PT_I8, pidAdminMin+35 )
! PR_ASSOC_MESSAGE_SIZE                   = PROP_TAG( PT_LONG, pidAdminMin+36 )
! PR_ASSOC_MESSAGE_SIZE_EXTENDED          = PROP_TAG( PT_I8, pidAdminMin+36 )
! PR_FOLDER_PATHNAME                      = PROP_TAG(PT_TSTRING, pidAdminMin+37 )
! PR_OWNER_COUNT							= PROP_TAG( PT_LONG, pidAdminMin+38 )
! PR_CONTACT_COUNT						= PROP_TAG( PT_LONG, pidAdminMin+39 )
  
  PR_MESSAGE_SIZE_EXTENDED			= PROP_TAG(PT_I8, PROP_ID(PR_MESSAGE_SIZE))

[pywin32-checkins] pywin32/win32/Lib commctrl.py,1.1,1.2 ntsecuritycon.py,1.2,1.3 win32con.py,1.3,1.4 winerror.py,1.1,1.2 winnt.py,1.1,1.2

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv18222

Modified Files:
	commctrl.py ntsecuritycon.py win32con.py winerror.py winnt.py 
Log Message:
Hex constants -> decimal, to prevent new warnings and be ready to
support the new world order.


Index: commctrl.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/commctrl.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commctrl.py	2 Sep 1999 00:19:28 -0000	1.1
--- commctrl.py	2 Jul 2003 03:39:12 -0000	1.2
***************
*** 1,23 ****
  # Generated by h2py from COMMCTRL.H
! WM_USER = 0x0400
! ICC_LISTVIEW_CLASSES = 0x00000001		# listview, header
! ICC_TREEVIEW_CLASSES = 0x00000002		# treeview, tooltips
! ICC_BAR_CLASSES = 0x00000004			# toolbar, statusbar, trackbar, tooltips
! ICC_TAB_CLASSES = 0x00000008			# tab, tooltips
! ICC_UPDOWN_CLASS = 0x00000010			# updown
! ICC_PROGRESS_CLASS = 0x00000020		# progress
! ICC_HOTKEY_CLASS = 0x00000040			# hotkey
! ICC_ANIMATE_CLASS = 0x00000080		# animate
[...1573 lines suppressed...]
! HOVER_DEFAULT = 0xFFFFFFFF
  WSB_PROP_CYVSCROLL = 0x00000001L
  WSB_PROP_CXHSCROLL = 0x00000002L
--- 1501,1516 ----
  WC_NATIVEFONTCTLA = "NativeFontCtl"
  WC_NATIVEFONTCTL = WC_NATIVEFONTCTLA
! NFS_EDIT = 1
! NFS_STATIC = 2
! NFS_LISTCOMBO = 4
! NFS_BUTTON = 8
! NFS_ALL = 16
! WM_MOUSEHOVER = 673
! WM_MOUSELEAVE = 675
! TME_HOVER = 1
! TME_LEAVE = 2
! TME_QUERY = 1073741824
! TME_CANCEL = -2147483648
! HOVER_DEFAULT = -1
  WSB_PROP_CYVSCROLL = 0x00000001L
  WSB_PROP_CXHSCROLL = 0x00000002L

Index: ntsecuritycon.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/ntsecuritycon.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ntsecuritycon.py	9 Jul 2001 04:08:41 -0000	1.2
--- ntsecuritycon.py	2 Jul 2003 03:39:12 -0000	1.3
***************
*** 1,38 ****
  # Hacked from winnt.h
  
! DELETE = (0x00010000)
! READ_CONTROL = (0x00020000)
! WRITE_DAC = (0x00040000)
! WRITE_OWNER = (0x00080000)
! SYNCHRONIZE = (0x00100000)
! STANDARD_RIGHTS_REQUIRED = (0x000F0000)
  STANDARD_RIGHTS_READ = (READ_CONTROL)
  STANDARD_RIGHTS_WRITE = (READ_CONTROL)
  STANDARD_RIGHTS_EXECUTE = (READ_CONTROL)
! STANDARD_RIGHTS_ALL = (0x001F0000)
! SPECIFIC_RIGHTS_ALL = (0x0000FFFF)
! ACCESS_SYSTEM_SECURITY = (0x01000000)
! MAXIMUM_ALLOWED = (0x02000000)
! GENERIC_READ = (0x80000000)
! GENERIC_WRITE = (0x40000000)
! GENERIC_EXECUTE = (0x20000000)
! GENERIC_ALL = (0x10000000)
  
  # file security permissions
! FILE_READ_DATA=            ( 0x0001 )
! FILE_LIST_DIRECTORY=       ( 0x0001 )
! FILE_WRITE_DATA=           ( 0x0002 )
! FILE_ADD_FILE=             ( 0x0002 )
! FILE_APPEND_DATA=          ( 0x0004 )
! FILE_ADD_SUBDIRECTORY=     ( 0x0004 )
! FILE_CREATE_PIPE_INSTANCE= ( 0x0004 )
! FILE_READ_EA=              ( 0x0008 )
! FILE_WRITE_EA=             ( 0x0010 )
! FILE_EXECUTE=              ( 0x0020 )
! FILE_TRAVERSE=             ( 0x0020 )
! FILE_DELETE_CHILD=         ( 0x0040 )
! FILE_READ_ATTRIBUTES=      ( 0x0080 )
! FILE_WRITE_ATTRIBUTES=     ( 0x0100 )
! FILE_ALL_ACCESS=           (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3FF)
  FILE_GENERIC_READ=         (STANDARD_RIGHTS_READ | FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE)
  FILE_GENERIC_WRITE=        (STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE)
--- 1,38 ----
  # Hacked from winnt.h
  
! DELETE = (65536)
! READ_CONTROL = (131072)
! WRITE_DAC = (262144)
! WRITE_OWNER = (524288)
! SYNCHRONIZE = (1048576)
! STANDARD_RIGHTS_REQUIRED = (983040)
  STANDARD_RIGHTS_READ = (READ_CONTROL)
  STANDARD_RIGHTS_WRITE = (READ_CONTROL)
  STANDARD_RIGHTS_EXECUTE = (READ_CONTROL)
! STANDARD_RIGHTS_ALL = (2031616)
! SPECIFIC_RIGHTS_ALL = (65535)
! ACCESS_SYSTEM_SECURITY = (16777216)
! MAXIMUM_ALLOWED = (33554432)
! GENERIC_READ = (-2147483648)
! GENERIC_WRITE = (1073741824)
! GENERIC_EXECUTE = (536870912)
! GENERIC_ALL = (268435456)
  
  # file security permissions
! FILE_READ_DATA=            ( 1 )
! FILE_LIST_DIRECTORY=       ( 1 )
! FILE_WRITE_DATA=           ( 2 )
! FILE_ADD_FILE=             ( 2 )
! FILE_APPEND_DATA=          ( 4 )
! FILE_ADD_SUBDIRECTORY=     ( 4 )
! FILE_CREATE_PIPE_INSTANCE= ( 4 )
! FILE_READ_EA=              ( 8 )
! FILE_WRITE_EA=             ( 16 )
! FILE_EXECUTE=              ( 32 )
! FILE_TRAVERSE=             ( 32 )
! FILE_DELETE_CHILD=         ( 64 )
! FILE_READ_ATTRIBUTES=      ( 128 )
! FILE_WRITE_ATTRIBUTES=     ( 256 )
! FILE_ALL_ACCESS=           (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 1023)
  FILE_GENERIC_READ=         (STANDARD_RIGHTS_READ | FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE)
  FILE_GENERIC_WRITE=        (STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE)
***************
*** 46,58 ****
  SECURITY_NON_UNIQUE_AUTHORITY = (0,0,0,0,0,4)
  
! SECURITY_NULL_RID                 = 0x00000000
! SECURITY_WORLD_RID                = 0x00000000
  SECURITY_LOCAL_RID                = 0X00000000
  
! SECURITY_CREATOR_OWNER_RID        = 0x00000000
! SECURITY_CREATOR_GROUP_RID        = 0x00000001
  
! SECURITY_CREATOR_OWNER_SERVER_RID = 0x00000002
! SECURITY_CREATOR_GROUP_SERVER_RID = 0x00000003
  
  
--- 46,58 ----
  SECURITY_NON_UNIQUE_AUTHORITY = (0,0,0,0,0,4)
  
! SECURITY_NULL_RID                 = 0
! SECURITY_WORLD_RID                = 0
  SECURITY_LOCAL_RID                = 0X00000000
  
! SECURITY_CREATOR_OWNER_RID        = 0
! SECURITY_CREATOR_GROUP_RID        = 1
  
! SECURITY_CREATOR_OWNER_SERVER_RID = 2
! SECURITY_CREATOR_GROUP_SERVER_RID = 3
  
  
***************
*** 60,84 ****
  SECURITY_NT_AUTHORITY = (0,0,0,0,0,5)
  
! SECURITY_DIALUP_RID             = 0x00000001
! SECURITY_NETWORK_RID            = 0x00000002
! SECURITY_BATCH_RID              = 0x00000003
! SECURITY_INTERACTIVE_RID        = 0x00000004
! SECURITY_SERVICE_RID            = 0x00000006
! SECURITY_ANONYMOUS_LOGON_RID    = 0x00000007
! SECURITY_PROXY_RID              = 0x00000008
! SECURITY_SERVER_LOGON_RID       = 0x00000009
  
! SECURITY_LOGON_IDS_RID          = 0x00000005
  SECURITY_LOGON_IDS_RID_COUNT    = 3
  
! SECURITY_LOCAL_SYSTEM_RID       = 0x00000012
  
! SECURITY_NT_NON_UNIQUE          = 0x00000015
  
! SECURITY_BUILTIN_DOMAIN_RID     = 0x00000020
  
  # well-known domain relative sub-authority values (RIDs)...
! DOMAIN_USER_RID_ADMIN          = 0x000001F4
! DOMAIN_USER_RID_GUEST          = 0x000001F5
  
  
--- 60,84 ----
  SECURITY_NT_AUTHORITY = (0,0,0,0,0,5)
  
! SECURITY_DIALUP_RID             = 1
! SECURITY_NETWORK_RID            = 2
! SECURITY_BATCH_RID              = 3
! SECURITY_INTERACTIVE_RID        = 4
! SECURITY_SERVICE_RID            = 6
! SECURITY_ANONYMOUS_LOGON_RID    = 7
! SECURITY_PROXY_RID              = 8
! SECURITY_SERVER_LOGON_RID       = 9
  
! SECURITY_LOGON_IDS_RID          = 5
  SECURITY_LOGON_IDS_RID_COUNT    = 3
  
! SECURITY_LOCAL_SYSTEM_RID       = 18
  
! SECURITY_NT_NON_UNIQUE          = 21
  
! SECURITY_BUILTIN_DOMAIN_RID     = 32
  
  # well-known domain relative sub-authority values (RIDs)...
! DOMAIN_USER_RID_ADMIN          = 500
! DOMAIN_USER_RID_GUEST          = 501
  
  
***************
*** 86,92 ****
  # well-known groups ...
  
! DOMAIN_GROUP_RID_ADMINS        = 0x00000200
! DOMAIN_GROUP_RID_USERS         = 0x00000201
! DOMAIN_GROUP_RID_GUESTS        = 0x00000202
  
  
--- 86,92 ----
  # well-known groups ...
  
! DOMAIN_GROUP_RID_ADMINS        = 512
! DOMAIN_GROUP_RID_USERS         = 513
! DOMAIN_GROUP_RID_GUESTS        = 514
  
  
***************
*** 95,119 ****
  # well-known aliases ...
  
! DOMAIN_ALIAS_RID_ADMINS        = 0x00000220
! DOMAIN_ALIAS_RID_USERS         = 0x00000221
! DOMAIN_ALIAS_RID_GUESTS        = 0x00000222
! DOMAIN_ALIAS_RID_POWER_USERS   = 0x00000223
  
! DOMAIN_ALIAS_RID_ACCOUNT_OPS   = 0x00000224
! DOMAIN_ALIAS_RID_SYSTEM_OPS    = 0x00000225
! DOMAIN_ALIAS_RID_PRINT_OPS     = 0x00000226
! DOMAIN_ALIAS_RID_BACKUP_OPS    = 0x00000227
  
! DOMAIN_ALIAS_RID_REPLICATOR    = 0x00000228
  
! SYSTEM_LUID                    = (0x3E7, 0x0)
  
  # Group attributes
  
! SE_GROUP_MANDATORY              = 0x00000001
! SE_GROUP_ENABLED_BY_DEFAULT     = 0x00000002
! SE_GROUP_ENABLED                = 0x00000004
! SE_GROUP_OWNER                  = 0x00000008
! SE_GROUP_LOGON_ID               = 0xC0000000
  
  
--- 95,119 ----
  # well-known aliases ...
  
! DOMAIN_ALIAS_RID_ADMINS        = 544
! DOMAIN_ALIAS_RID_USERS         = 545
! DOMAIN_ALIAS_RID_GUESTS        = 546
! DOMAIN_ALIAS_RID_POWER_USERS   = 547
  
! DOMAIN_ALIAS_RID_ACCOUNT_OPS   = 548
! DOMAIN_ALIAS_RID_SYSTEM_OPS    = 549
! DOMAIN_ALIAS_RID_PRINT_OPS     = 550
! DOMAIN_ALIAS_RID_BACKUP_OPS    = 551
  
! DOMAIN_ALIAS_RID_REPLICATOR    = 552
  
! SYSTEM_LUID                    = (999, 0)
  
  # Group attributes
  
! SE_GROUP_MANDATORY              = 1
! SE_GROUP_ENABLED_BY_DEFAULT     = 2
! SE_GROUP_ENABLED                = 4
! SE_GROUP_OWNER                  = 8
! SE_GROUP_LOGON_ID               = -1073741824
  
  
***************
*** 121,128 ****
  # (None yet defined.)
  
! ACCESS_ALLOWED_ACE_TYPE          = 0x0
! ACCESS_DENIED_ACE_TYPE           = 0x1
! SYSTEM_AUDIT_ACE_TYPE            = 0x2
! SYSTEM_ALARM_ACE_TYPE            = 0x3
  
  
--- 121,128 ----
  # (None yet defined.)
  
! ACCESS_ALLOWED_ACE_TYPE          = 0
! ACCESS_DENIED_ACE_TYPE           = 1
! SYSTEM_AUDIT_ACE_TYPE            = 2
! SYSTEM_ALARM_ACE_TYPE            = 3
  
  
***************
*** 130,155 ****
  #  of an Ace header.
  
! OBJECT_INHERIT_ACE               = 0x1
! CONTAINER_INHERIT_ACE            = 0x2
! NO_PROPAGATE_INHERIT_ACE         = 0x4
! INHERIT_ONLY_ACE                 = 0x8
! VALID_INHERIT_FLAGS              = 0xF
  
  
! SUCCESSFUL_ACCESS_ACE_FLAG       = 0x40
! FAILED_ACCESS_ACE_FLAG           = 0x80
  
! SE_OWNER_DEFAULTED               = 0x0001
! SE_GROUP_DEFAULTED               = 0x0002
! SE_DACL_PRESENT                  = 0x0004
! SE_DACL_DEFAULTED                = 0x0008
! SE_SACL_PRESENT                  = 0x0010
! SE_SACL_DEFAULTED                = 0x0020
! SE_SELF_RELATIVE                 = 0x8000
  
  
! SE_PRIVILEGE_ENABLED_BY_DEFAULT = 0x00000001
! SE_PRIVILEGE_ENABLED            = 0x00000002
! SE_PRIVILEGE_USED_FOR_ACCESS    = 0x80000000
  
  PRIVILEGE_SET_ALL_NECESSARY    = 1
--- 130,155 ----
  #  of an Ace header.
  
! OBJECT_INHERIT_ACE               = 1
! CONTAINER_INHERIT_ACE            = 2
! NO_PROPAGATE_INHERIT_ACE         = 4
! INHERIT_ONLY_ACE                 = 8
! VALID_INHERIT_FLAGS              = 15
  
  
! SUCCESSFUL_ACCESS_ACE_FLAG       = 64
! FAILED_ACCESS_ACE_FLAG           = 128
  
! SE_OWNER_DEFAULTED               = 1
! SE_GROUP_DEFAULTED               = 2
! SE_DACL_PRESENT                  = 4
! SE_DACL_DEFAULTED                = 8
! SE_SACL_PRESENT                  = 16
! SE_SACL_DEFAULTED                = 32
! SE_SELF_RELATIVE                 = 32768
  
  
! SE_PRIVILEGE_ENABLED_BY_DEFAULT = 1
! SE_PRIVILEGE_ENABLED            = 2
! SE_PRIVILEGE_USED_FOR_ACCESS    = -2147483648
  
  PRIVILEGE_SET_ALL_NECESSARY    = 1
***************
*** 193,204 ****
  DEFAULT_IMPERSONATION_LEVEL = SecurityImpersonation
  
! TOKEN_ASSIGN_PRIMARY    = 0x0001
! TOKEN_DUPLICATE         = 0x0002
! TOKEN_IMPERSONATE       = 0x0004
! TOKEN_QUERY             = 0x0008
! TOKEN_QUERY_SOURCE      = 0x0010
! TOKEN_ADJUST_PRIVILEGES = 0x0020
! TOKEN_ADJUST_GROUPS     = 0x0040
! TOKEN_ADJUST_DEFAULT    = 0x0080
  
  TOKEN_ALL_ACCESS = (STANDARD_RIGHTS_REQUIRED  |\
--- 193,204 ----
  DEFAULT_IMPERSONATION_LEVEL = SecurityImpersonation
  
! TOKEN_ASSIGN_PRIMARY    = 1
! TOKEN_DUPLICATE         = 2
! TOKEN_IMPERSONATE       = 4
! TOKEN_QUERY             = 8
! TOKEN_QUERY_SOURCE      = 16
! TOKEN_ADJUST_PRIVILEGES = 32
! TOKEN_ADJUST_GROUPS     = 64
! TOKEN_ADJUST_DEFAULT    = 128
  
  TOKEN_ALL_ACCESS = (STANDARD_RIGHTS_REQUIRED  |\

Index: win32con.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32con.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** win32con.py	7 Jun 2003 02:04:28 -0000	1.3
--- win32con.py	2 Jul 2003 03:39:12 -0000	1.4
***************
*** 1,30 ****
  # Generated by h2py from commdlg.h (plus modifications 4jan98)
! WINVER = 0x0500
! WM_USER = 0x0400
! PY_0U = 0x4f0000
! OFN_READONLY = 0x00000001
! OFN_OVERWRITEPROMPT = 0x00000002
! OFN_HIDEREADONLY = 0x00000004
! OFN_NOCHANGEDIR = 0x00000008
! OFN_SHOWHELP = 0x00000010
! OFN_ENABLEHOOK = 0x00000020
[...5911 lines suppressed...]
! FROM_LEFT_1ST_BUTTON_PRESSED    = 1
! RIGHTMOST_BUTTON_PRESSED        = 2
! FROM_LEFT_2ND_BUTTON_PRESSED    = 4
! FROM_LEFT_3RD_BUTTON_PRESSED    = 8
! FROM_LEFT_4TH_BUTTON_PRESSED    = 16
  
  CTRL_C_EVENT        = 0
***************
*** 4480,4484 ****
  CTRL_SHUTDOWN_EVENT = 6
  
! MOUSE_MOVED   = 0x0001
! DOUBLE_CLICK  = 0x0002
! MOUSE_WHEELED = 0x0004
--- 4480,4484 ----
  CTRL_SHUTDOWN_EVENT = 6
  
! MOUSE_MOVED   = 1
! DOUBLE_CLICK  = 2
! MOUSE_WHEELED = 4

Index: winerror.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/winerror.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** winerror.py	2 Sep 1999 00:19:29 -0000	1.1
--- winerror.py	2 Jul 2003 03:39:12 -0000	1.2
***************
*** 4,11 ****
  """
  # Few extras added manually...
! TRUST_E_PROVIDER_UNKNOWN = 0x800B0001
! TRUST_E_ACTION_UNKNOWN = 0x800B0002
! TRUST_E_SUBJECT_FORM_UNKNOWN = 0x800B0003
! TRUST_E_SUBJECT_NOT_TRUSTED = 0x800B0004
  # up to here...
  
--- 4,11 ----
  """
[...1253 lines suppressed...]
! SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE = -2146500070
! SPAPI_E_DEVICE_INTERFACE_ACTIVE = -2146500069
! SPAPI_E_DEVICE_INTERFACE_REMOVED = -2146500068
! SPAPI_E_BAD_INTERFACE_INSTALLSECT = -2146500067
! SPAPI_E_NO_SUCH_INTERFACE_CLASS = -2146500066
! SPAPI_E_INVALID_REFERENCE_STRING = -2146500065
! SPAPI_E_INVALID_MACHINENAME = -2146500064
! SPAPI_E_REMOTE_COMM_FAILURE = -2146500063
! SPAPI_E_MACHINE_UNAVAILABLE = -2146500062
! SPAPI_E_NO_CONFIGMGR_SERVICES = -2146500061
! SPAPI_E_INVALID_PROPPAGE_PROVIDER = -2146500060
! SPAPI_E_NO_SUCH_DEVICE_INTERFACE = -2146500059
! SPAPI_E_DI_POSTPROCESSING_REQUIRED = -2146500058
! SPAPI_E_INVALID_COINSTALLER = -2146500057
! SPAPI_E_NO_COMPAT_DRIVERS = -2146500056
! SPAPI_E_NO_DEVICE_ICON = -2146500055
! SPAPI_E_INVALID_INF_LOGCONFIG = -2146500054
! SPAPI_E_DI_DONT_INSTALL = -2146500053
! SPAPI_E_INVALID_FILTER_DRIVER = -2146500052
! SPAPI_E_ERROR_NOT_INSTALLED = -2146496512

Index: winnt.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/winnt.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** winnt.py	2 Sep 1999 00:19:29 -0000	1.1
--- winnt.py	2 Jul 2003 03:39:12 -0000	1.2
***************
*** 1,167 ****
  # Generated by h2py from \mssdk\include\winnt.h
  
! APPLICATION_ERROR_MASK = 0x20000000
! ERROR_SEVERITY_SUCCESS = 0x00000000
! ERROR_SEVERITY_INFORMATIONAL = 0x40000000
! ERROR_SEVERITY_WARNING = 0x80000000
! ERROR_SEVERITY_ERROR = 0xC0000000
! MINCHAR = 0x80
! MAXCHAR = 0x7f
! MINSHORT = 0x8000
[...1744 lines suppressed...]
! TAPE_DRIVE_LOGICAL_BLK = -2147467264
! TAPE_DRIVE_LOG_BLK_IMMED = -2147450880
! TAPE_DRIVE_END_OF_DATA = -2147418112
! TAPE_DRIVE_RELATIVE_BLKS = -2147352576
! TAPE_DRIVE_FILEMARKS = -2147221504
! TAPE_DRIVE_SEQUENTIAL_FMKS = -2146959360
! TAPE_DRIVE_SETMARKS = -2146435072
! TAPE_DRIVE_SEQUENTIAL_SMKS = -2145386496
! TAPE_DRIVE_REVERSE_POSITION = -2143289344
! TAPE_DRIVE_SPACE_IMMEDIATE = -2139095040
! TAPE_DRIVE_WRITE_SETMARKS = -2130706432
! TAPE_DRIVE_WRITE_FILEMARKS = -2113929216
! TAPE_DRIVE_WRITE_SHORT_FMKS = -2080374784
! TAPE_DRIVE_WRITE_LONG_FMKS = -2013265920
! TAPE_DRIVE_WRITE_MARK_IMMED = -1879048192
! TAPE_DRIVE_FORMAT = -1610612736
! TAPE_DRIVE_FORMAT_IMMEDIATE = -1073741824
! TAPE_DRIVE_HIGH_FEATURES = -2147483648
  TAPE_FIXED_PARTITIONS = 0
  TAPE_SELECT_PARTITIONS = 1

[pywin32-checkins] pywin32/com/win32comext/mapi/src PyIMAPISession.i,1.1,1.2

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

Update of /cvsroot/pywin32/pywin32/com/win32comext/mapi/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19178

Modified Files:
	PyIMAPISession.i 
Log Message:
Add IMAPISession.GetStatusTable

Index: PyIMAPISession.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/mapi/src/PyIMAPISession.i,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyIMAPISession.i	1 Sep 1999 23:17:16 -0000	1.1
--- PyIMAPISession.i	16 Jun 2003 05:01:11 -0000	1.2
***************
*** 199,202 ****
--- 199,208 ----
  );
  
+ // @pyswig <o PyIMAPITable>|GetStatusTable|Provides access to the status table - a table with information about all of the MAPI resources in the session.
+ HRESULT GetStatusTable(
+     unsigned long ulFlags, // @pyparm int|flags||Flags that control the opening.
+     IMAPITable **OUTPUT 
+ );
+ 
  // @pyswig |Logoff|Ends a MAPI session.
  HRESULT Logoff( 

[pywin32-checkins] pywin32/win32/Lib win32evtlogutil.py,1.6,1.7

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

Update of /cvsroot/pywin32/pywin32/win32/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv15767

Modified Files:
	win32evtlogutil.py 
Log Message:
SafeFormatMessage always returns Unicode (so encoding exceptions happen
in the caller!:)


Index: win32evtlogutil.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32evtlogutil.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** win32evtlogutil.py	9 May 2002 05:55:48 -0000	1.6
--- win32evtlogutil.py	7 Jun 2003 02:06:16 -0000	1.7
***************
*** 120,124 ****
  	finally:
  		win32api.RegCloseKey(handle)
! 	return data or '' # Don't want "None" ever being returned.
  
  def SafeFormatMessage( eventLogRecord, logType=None ):
--- 120,124 ----
  	finally:
  		win32api.RegCloseKey(handle)
! 	return data or u'' # Don't want "None" ever being returned.
  
  def SafeFormatMessage( eventLogRecord, logType=None ):
***************
*** 133,138 ****
  			desc = ""
  		else:
! 			desc = string.join(map(lambda x:str(x), eventLogRecord.StringInserts), ", ")
! 		return "<The description for Event ID ( %d ) in Source ( %s ) could not be found. It contains the following insertion string(s):%s.>" % (winerror.HRESULT_CODE(eventLogRecord.EventID), eventLogRecord.SourceName, desc)
  
  def FeedEventLogRecords(feeder, machineName = None, logName = "Application", readFlags = None):
--- 133,138 ----
  			desc = ""
  		else:
! 			desc = u", ".join(eventLogRecord.StringInserts)
! 		return u"<The description for Event ID ( %d ) in Source ( %r ) could not be found. It contains the following insertion string(s):%r.>" % (winerror.HRESULT_CODE(eventLogRecord.EventID), eventLogRecord.SourceName, desc)
  
  def FeedEventLogRecords(feeder, machineName = None, logName = "Application", readFlags = None):

[pywin32-checkins] pywin32/win32/Demos eventLogDemo.py,1.4,1.5

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

Update of /cvsroot/pywin32/pywin32/win32/Demos
In directory sc8-pr-cvs1:/tmp/cvs-serv16177

Modified Files:
	eventLogDemo.py 
Log Message:
Handle unicode in the log.


Index: eventLogDemo.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/Demos/eventLogDemo.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eventLogDemo.py	3 Feb 2003 00:30:29 -0000	1.4
--- eventLogDemo.py	7 Jun 2003 02:08:45 -0000	1.5
***************
*** 18,22 ****
          for object in objects:
              # get it for testing purposes, but dont print it.
!             msg = str(SafeFormatMessage(object, logType))
              if object.Sid is not None:
                  try:
--- 18,22 ----
          for object in objects:
              # get it for testing purposes, but dont print it.
!             msg = SafeFormatMessage(object, logType).encode("mbcs")
              if object.Sid is not None:
                  try:
***************
*** 35,39 ****
  
      if numRecords == num:
!         print "Successfully read all records"
      else:
          print "Couldn't get all records - reported %d, but found %d" % (numRecords, num)
--- 35,39 ----
  
      if numRecords == num:
!         print "Successfully read all", numRecords, "records"
      else:
          print "Couldn't get all records - reported %d, but found %d" % (numRecords, num)

[pywin32-checkins] pywin32/win32/src/win32net win32netuse.cpp,1.2,1.3

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

Update of /cvsroot/pywin32/pywin32/win32/src/win32net
In directory sc8-pr-cvs1:/tmp/cvs-serv15648

Modified Files:
	win32netuse.cpp 
Log Message:
Autoduck corrections.


Index: win32netuse.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32net/win32netuse.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** win32netuse.cpp	29 Jan 2001 05:23:36 -0000	1.2
--- win32netuse.cpp	7 Jun 2003 02:05:08 -0000	1.3
***************
*** 65,69 ****
  };
  
! // @object PyUSE_INFO*|The following USE_INFO levels are supported.
  static struct PyNET_STRUCT use_infos[] = { // @flagh Level|Data
  	{ 0, ui0, sizeof(USE_INFO_0) },        // @flag 0|<o PyUSE_INFO_0>
--- 65,69 ----
  };
  
! // @object PyUSE_INFO_*|The following USE_INFO levels are supported.
  static struct PyNET_STRUCT use_infos[] = { // @flagh Level|Data
  	{ 0, ui0, sizeof(USE_INFO_0) },        // @flag 0|<o PyUSE_INFO_0>
***************
*** 87,91 ****
  	// @pyparm string/<o PyUnicode>|server||The name of the server, or None.
  	// @pyparm int|level||The information level contained in the data
! 	// @pyparm mapping|data||A dictionary holding the share data.
  	if (!PyArg_ParseTuple(args, "OiO", &obServer, &level, &obData))
  		return NULL;
--- 87,91 ----
  	// @pyparm string/<o PyUnicode>|server||The name of the server, or None.
  	// @pyparm int|level||The information level contained in the data
! 	// @pyparm mapping|data||A dictionary holding the share data in the format of <o PyUSE_INFO_*>.
  	if (!PyArg_ParseTuple(args, "OiO", &obServer, &level, &obData))
  		return NULL;
***************
*** 251,255 ****
  	return ret;
  	// @pyseeapi NetUseGetInfo
! 	// @rdesc The result will be a dictionary in one of the <o PyWKSTA_INFO_*>
  	// formats, depending on the level parameter.
  }
--- 251,255 ----
  	return ret;
  	// @pyseeapi NetUseGetInfo
! 	// @rdesc The result will be a dictionary in one of the <o PyUSE_INFO_*>
  	// formats, depending on the level parameter.
  }