|
From: Roger U. <ru...@us...> - 2008-08-29 04:59:47
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15490/Lib Modified Files: Tag: py3k afxres.py commctrl.py mmsystem.py netbios.py ntsecuritycon.py pywintypes.py rasutil.py regcheck.py regutil.py sspi.py sspicon.py win32con.py win32netcon.py win32traceutil.py Log Message: Changes to build for Python 3.0 Index: sspicon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/sspicon.py,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** sspicon.py 12 Feb 2006 14:10:02 -0000 1.4 --- sspicon.py 29 Aug 2008 04:59:25 -0000 1.4.4.1 *************** *** 280,391 **** SEC_E_NO_KERB_KEY = -2146892984 ! ERROR_IPSEC_QM_POLICY_EXISTS = 13000L ! ERROR_IPSEC_QM_POLICY_NOT_FOUND = 13001L ! ERROR_IPSEC_QM_POLICY_IN_USE = 13002L ! ERROR_IPSEC_MM_POLICY_EXISTS = 13003L ! ERROR_IPSEC_MM_POLICY_NOT_FOUND = 13004L ! ERROR_IPSEC_MM_POLICY_IN_USE = 13005L ! ERROR_IPSEC_MM_FILTER_EXISTS = 13006L ! ERROR_IPSEC_MM_FILTER_NOT_FOUND = 13007L ! ERROR_IPSEC_TRANSPORT_FILTER_EXISTS = 13008L ! ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND = 13009L ! ERROR_IPSEC_MM_AUTH_EXISTS = 13010L ! ERROR_IPSEC_MM_AUTH_NOT_FOUND = 13011L ! ERROR_IPSEC_MM_AUTH_IN_USE = 13012L ! ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND = 13013L ! ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND = 13014L ! ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND = 13015L ! ERROR_IPSEC_TUNNEL_FILTER_EXISTS = 13016L ! ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND = 13017L ! ERROR_IPSEC_MM_FILTER_PENDING_DELETION = 13018L ! ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION = 13019L ! ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION = 13020L ! ERROR_IPSEC_MM_POLICY_PENDING_DELETION = 13021L ! ERROR_IPSEC_MM_AUTH_PENDING_DELETION = 13022L ! ERROR_IPSEC_QM_POLICY_PENDING_DELETION = 13023L ! WARNING_IPSEC_MM_POLICY_PRUNED = 13024L ! WARNING_IPSEC_QM_POLICY_PRUNED = 13025L ! ERROR_IPSEC_IKE_NEG_STATUS_BEGIN = 13800L ! ERROR_IPSEC_IKE_AUTH_FAIL = 13801L ! ERROR_IPSEC_IKE_ATTRIB_FAIL = 13802L ! ERROR_IPSEC_IKE_NEGOTIATION_PENDING = 13803L ! ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR = 13804L ! ERROR_IPSEC_IKE_TIMED_OUT = 13805L ! ERROR_IPSEC_IKE_NO_CERT = 13806L ! ERROR_IPSEC_IKE_SA_DELETED = 13807L ! ERROR_IPSEC_IKE_SA_REAPED = 13808L ! ERROR_IPSEC_IKE_MM_ACQUIRE_DROP = 13809L ! ERROR_IPSEC_IKE_QM_ACQUIRE_DROP = 13810L ! ERROR_IPSEC_IKE_QUEUE_DROP_MM = 13811L ! ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM = 13812L ! ERROR_IPSEC_IKE_DROP_NO_RESPONSE = 13813L ! ERROR_IPSEC_IKE_MM_DELAY_DROP = 13814L ! ERROR_IPSEC_IKE_QM_DELAY_DROP = 13815L ! ERROR_IPSEC_IKE_ERROR = 13816L ! ERROR_IPSEC_IKE_CRL_FAILED = 13817L ! ERROR_IPSEC_IKE_INVALID_KEY_USAGE = 13818L ! ERROR_IPSEC_IKE_INVALID_CERT_TYPE = 13819L ! ERROR_IPSEC_IKE_NO_PRIVATE_KEY = 13820L ! ERROR_IPSEC_IKE_DH_FAIL = 13822L ! ERROR_IPSEC_IKE_INVALID_HEADER = 13824L ! ERROR_IPSEC_IKE_NO_POLICY = 13825L ! ERROR_IPSEC_IKE_INVALID_SIGNATURE = 13826L ! ERROR_IPSEC_IKE_KERBEROS_ERROR = 13827L ! ERROR_IPSEC_IKE_NO_PUBLIC_KEY = 13828L ! ERROR_IPSEC_IKE_PROCESS_ERR = 13829L ! ERROR_IPSEC_IKE_PROCESS_ERR_SA = 13830L ! ERROR_IPSEC_IKE_PROCESS_ERR_PROP = 13831L ! ERROR_IPSEC_IKE_PROCESS_ERR_TRANS = 13832L ! ERROR_IPSEC_IKE_PROCESS_ERR_KE = 13833L ! ERROR_IPSEC_IKE_PROCESS_ERR_ID = 13834L ! ERROR_IPSEC_IKE_PROCESS_ERR_CERT = 13835L ! ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ = 13836L ! ERROR_IPSEC_IKE_PROCESS_ERR_HASH = 13837L ! ERROR_IPSEC_IKE_PROCESS_ERR_SIG = 13838L ! ERROR_IPSEC_IKE_PROCESS_ERR_NONCE = 13839L ! ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY = 13840L ! ERROR_IPSEC_IKE_PROCESS_ERR_DELETE = 13841L ! ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR = 13842L ! ERROR_IPSEC_IKE_INVALID_PAYLOAD = 13843L ! ERROR_IPSEC_IKE_LOAD_SOFT_SA = 13844L ! ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN = 13845L ! ERROR_IPSEC_IKE_INVALID_COOKIE = 13846L ! ERROR_IPSEC_IKE_NO_PEER_CERT = 13847L ! ERROR_IPSEC_IKE_PEER_CRL_FAILED = 13848L ! ERROR_IPSEC_IKE_POLICY_CHANGE = 13849L ! ERROR_IPSEC_IKE_NO_MM_POLICY = 13850L ! ERROR_IPSEC_IKE_NOTCBPRIV = 13851L ! ERROR_IPSEC_IKE_SECLOADFAIL = 13852L ! ERROR_IPSEC_IKE_FAILSSPINIT = 13853L ! ERROR_IPSEC_IKE_FAILQUERYSSP = 13854L ! ERROR_IPSEC_IKE_SRVACQFAIL = 13855L ! ERROR_IPSEC_IKE_SRVQUERYCRED = 13856L ! ERROR_IPSEC_IKE_GETSPIFAIL = 13857L ! ERROR_IPSEC_IKE_INVALID_FILTER = 13858L ! ERROR_IPSEC_IKE_OUT_OF_MEMORY = 13859L ! ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED = 13860L ! ERROR_IPSEC_IKE_INVALID_POLICY = 13861L ! ERROR_IPSEC_IKE_UNKNOWN_DOI = 13862L ! ERROR_IPSEC_IKE_INVALID_SITUATION = 13863L ! ERROR_IPSEC_IKE_DH_FAILURE = 13864L ! ERROR_IPSEC_IKE_INVALID_GROUP = 13865L ! ERROR_IPSEC_IKE_ENCRYPT = 13866L ! ERROR_IPSEC_IKE_DECRYPT = 13867L ! ERROR_IPSEC_IKE_POLICY_MATCH = 13868L ! ERROR_IPSEC_IKE_UNSUPPORTED_ID = 13869L ! ERROR_IPSEC_IKE_INVALID_HASH = 13870L ! ERROR_IPSEC_IKE_INVALID_HASH_ALG = 13871L ! ERROR_IPSEC_IKE_INVALID_HASH_SIZE = 13872L ! ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG = 13873L ! ERROR_IPSEC_IKE_INVALID_AUTH_ALG = 13874L ! ERROR_IPSEC_IKE_INVALID_SIG = 13875L ! ERROR_IPSEC_IKE_LOAD_FAILED = 13876L ! ERROR_IPSEC_IKE_RPC_DELETE = 13877L ! ERROR_IPSEC_IKE_BENIGN_REINIT = 13878L ! ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY = 13879L ! ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN = 13881L ! ERROR_IPSEC_IKE_MM_LIMIT = 13882L ! ERROR_IPSEC_IKE_NEGOTIATION_DISABLED = 13883L ! ERROR_IPSEC_IKE_NEG_STATUS_END = 13884L CRYPT_E_MSG_ERROR = ((-2146889727)) CRYPT_E_UNKNOWN_ALGO = ((-2146889726)) --- 280,391 ---- SEC_E_NO_KERB_KEY = -2146892984 ! ERROR_IPSEC_QM_POLICY_EXISTS = 13000 ! ERROR_IPSEC_QM_POLICY_NOT_FOUND = 13001 ! ERROR_IPSEC_QM_POLICY_IN_USE = 13002 ! ERROR_IPSEC_MM_POLICY_EXISTS = 13003 ! ERROR_IPSEC_MM_POLICY_NOT_FOUND = 13004 ! ERROR_IPSEC_MM_POLICY_IN_USE = 13005 ! ERROR_IPSEC_MM_FILTER_EXISTS = 13006 ! ERROR_IPSEC_MM_FILTER_NOT_FOUND = 13007 ! ERROR_IPSEC_TRANSPORT_FILTER_EXISTS = 13008 ! ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND = 13009 ! ERROR_IPSEC_MM_AUTH_EXISTS = 13010 ! ERROR_IPSEC_MM_AUTH_NOT_FOUND = 13011 ! ERROR_IPSEC_MM_AUTH_IN_USE = 13012 ! ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND = 13013 ! ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND = 13014 ! ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND = 13015 ! ERROR_IPSEC_TUNNEL_FILTER_EXISTS = 13016 ! ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND = 13017 ! ERROR_IPSEC_MM_FILTER_PENDING_DELETION = 13018 ! ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION = 13019 ! ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION = 13020 ! ERROR_IPSEC_MM_POLICY_PENDING_DELETION = 13021 ! ERROR_IPSEC_MM_AUTH_PENDING_DELETION = 13022 ! ERROR_IPSEC_QM_POLICY_PENDING_DELETION = 13023 ! WARNING_IPSEC_MM_POLICY_PRUNED = 13024 ! WARNING_IPSEC_QM_POLICY_PRUNED = 13025 ! ERROR_IPSEC_IKE_NEG_STATUS_BEGIN = 13800 ! ERROR_IPSEC_IKE_AUTH_FAIL = 13801 ! ERROR_IPSEC_IKE_ATTRIB_FAIL = 13802 ! ERROR_IPSEC_IKE_NEGOTIATION_PENDING = 13803 ! ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR = 13804 ! ERROR_IPSEC_IKE_TIMED_OUT = 13805 ! ERROR_IPSEC_IKE_NO_CERT = 13806 ! ERROR_IPSEC_IKE_SA_DELETED = 13807 ! ERROR_IPSEC_IKE_SA_REAPED = 13808 ! ERROR_IPSEC_IKE_MM_ACQUIRE_DROP = 13809 ! ERROR_IPSEC_IKE_QM_ACQUIRE_DROP = 13810 ! ERROR_IPSEC_IKE_QUEUE_DROP_MM = 13811 ! ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM = 13812 ! ERROR_IPSEC_IKE_DROP_NO_RESPONSE = 13813 ! ERROR_IPSEC_IKE_MM_DELAY_DROP = 13814 ! ERROR_IPSEC_IKE_QM_DELAY_DROP = 13815 ! ERROR_IPSEC_IKE_ERROR = 13816 ! ERROR_IPSEC_IKE_CRL_FAILED = 13817 ! ERROR_IPSEC_IKE_INVALID_KEY_USAGE = 13818 ! ERROR_IPSEC_IKE_INVALID_CERT_TYPE = 13819 ! ERROR_IPSEC_IKE_NO_PRIVATE_KEY = 13820 ! ERROR_IPSEC_IKE_DH_FAIL = 13822 ! ERROR_IPSEC_IKE_INVALID_HEADER = 13824 ! ERROR_IPSEC_IKE_NO_POLICY = 13825 ! ERROR_IPSEC_IKE_INVALID_SIGNATURE = 13826 ! ERROR_IPSEC_IKE_KERBEROS_ERROR = 13827 ! ERROR_IPSEC_IKE_NO_PUBLIC_KEY = 13828 ! ERROR_IPSEC_IKE_PROCESS_ERR = 13829 ! ERROR_IPSEC_IKE_PROCESS_ERR_SA = 13830 ! ERROR_IPSEC_IKE_PROCESS_ERR_PROP = 13831 ! ERROR_IPSEC_IKE_PROCESS_ERR_TRANS = 13832 ! ERROR_IPSEC_IKE_PROCESS_ERR_KE = 13833 ! ERROR_IPSEC_IKE_PROCESS_ERR_ID = 13834 ! ERROR_IPSEC_IKE_PROCESS_ERR_CERT = 13835 ! ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ = 13836 ! ERROR_IPSEC_IKE_PROCESS_ERR_HASH = 13837 ! ERROR_IPSEC_IKE_PROCESS_ERR_SIG = 13838 ! ERROR_IPSEC_IKE_PROCESS_ERR_NONCE = 13839 ! ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY = 13840 ! ERROR_IPSEC_IKE_PROCESS_ERR_DELETE = 13841 ! ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR = 13842 ! ERROR_IPSEC_IKE_INVALID_PAYLOAD = 13843 ! ERROR_IPSEC_IKE_LOAD_SOFT_SA = 13844 ! ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN = 13845 ! ERROR_IPSEC_IKE_INVALID_COOKIE = 13846 ! ERROR_IPSEC_IKE_NO_PEER_CERT = 13847 ! ERROR_IPSEC_IKE_PEER_CRL_FAILED = 13848 ! ERROR_IPSEC_IKE_POLICY_CHANGE = 13849 ! ERROR_IPSEC_IKE_NO_MM_POLICY = 13850 ! ERROR_IPSEC_IKE_NOTCBPRIV = 13851 ! ERROR_IPSEC_IKE_SECLOADFAIL = 13852 ! ERROR_IPSEC_IKE_FAILSSPINIT = 13853 ! ERROR_IPSEC_IKE_FAILQUERYSSP = 13854 ! ERROR_IPSEC_IKE_SRVACQFAIL = 13855 ! ERROR_IPSEC_IKE_SRVQUERYCRED = 13856 ! ERROR_IPSEC_IKE_GETSPIFAIL = 13857 ! ERROR_IPSEC_IKE_INVALID_FILTER = 13858 ! ERROR_IPSEC_IKE_OUT_OF_MEMORY = 13859 ! ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED = 13860 ! ERROR_IPSEC_IKE_INVALID_POLICY = 13861 ! ERROR_IPSEC_IKE_UNKNOWN_DOI = 13862 ! ERROR_IPSEC_IKE_INVALID_SITUATION = 13863 ! ERROR_IPSEC_IKE_DH_FAILURE = 13864 ! ERROR_IPSEC_IKE_INVALID_GROUP = 13865 ! ERROR_IPSEC_IKE_ENCRYPT = 13866 ! ERROR_IPSEC_IKE_DECRYPT = 13867 ! ERROR_IPSEC_IKE_POLICY_MATCH = 13868 ! ERROR_IPSEC_IKE_UNSUPPORTED_ID = 13869 ! ERROR_IPSEC_IKE_INVALID_HASH = 13870 ! ERROR_IPSEC_IKE_INVALID_HASH_ALG = 13871 ! ERROR_IPSEC_IKE_INVALID_HASH_SIZE = 13872 ! ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG = 13873 ! ERROR_IPSEC_IKE_INVALID_AUTH_ALG = 13874 ! ERROR_IPSEC_IKE_INVALID_SIG = 13875 ! ERROR_IPSEC_IKE_LOAD_FAILED = 13876 ! ERROR_IPSEC_IKE_RPC_DELETE = 13877 ! ERROR_IPSEC_IKE_BENIGN_REINIT = 13878 ! ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY = 13879 ! ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN = 13881 ! ERROR_IPSEC_IKE_MM_LIMIT = 13882 ! ERROR_IPSEC_IKE_NEGOTIATION_DISABLED = 13883 ! ERROR_IPSEC_IKE_NEG_STATUS_END = 13884 CRYPT_E_MSG_ERROR = ((-2146889727)) CRYPT_E_UNKNOWN_ALGO = ((-2146889726)) Index: regcheck.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regcheck.py,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** regcheck.py 19 May 2008 13:30:38 -0000 1.6 --- regcheck.py 29 Aug 2008 04:59:25 -0000 1.6.2.1 *************** *** 5,11 **** warnings.warn("The regcheck module has been pending deprecation since build 210", category=PendingDeprecationWarning) ! ! import win32con ! import regutil import win32api import os --- 5,10 ---- warnings.warn("The regcheck module has been pending deprecation since build 210", category=PendingDeprecationWarning) ! from . import win32con ! from . import regutil import win32api import os *************** *** 18,22 **** # except SystemError: except (os.error,win32api.error): ! print "Registration of %s - Not registered correctly" % exename def CheckPathString(pathString): --- 17,21 ---- # except SystemError: except (os.error,win32api.error): ! print("Registration of %s - Not registered correctly" % exename) def CheckPathString(pathString): *************** *** 28,43 **** def CheckPythonPaths(verbose): ! if verbose: print "Python Paths:" # Check the core path ! if verbose: print "\tCore Path:", try: appPath = win32api.RegQueryValue(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath") ! except win32api.error, (code, fn, desc): ! print "** does not exist - ", desc problem = CheckPathString(appPath) if problem: ! print problem else: ! if verbose: print appPath key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath", 0, win32con.KEY_READ) --- 27,43 ---- def CheckPythonPaths(verbose): ! if verbose: print("Python Paths:") # Check the core path ! if verbose: print("\tCore Path:", end=' ') try: appPath = win32api.RegQueryValue(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath") ! except win32api.error as xxx_todo_changeme: ! (code, fn, desc) = xxx_todo_changeme.args ! print("** does not exist - ", desc) problem = CheckPathString(appPath) if problem: ! print(problem) else: ! if verbose: print(appPath) key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\PythonPath", 0, win32con.KEY_READ) *************** *** 48,60 **** appName = win32api.RegEnumKey(key, keyNo) appPath = win32api.RegQueryValue(key, appName) ! if verbose: print "\t"+appName+":", if appPath: problem = CheckPathString(appPath) if problem: ! print problem else: ! if verbose: print appPath else: ! if verbose: print "(empty)" keyNo = keyNo + 1 except win32api.error: --- 48,60 ---- appName = win32api.RegEnumKey(key, keyNo) appPath = win32api.RegQueryValue(key, appName) ! if verbose: print("\t"+appName+":", end=' ') if appPath: problem = CheckPathString(appPath) if problem: ! print(problem) else: ! if verbose: print(appPath) else: ! if verbose: print("(empty)") keyNo = keyNo + 1 except win32api.error: *************** *** 64,74 **** def CheckHelpFiles(verbose): ! if verbose: print "Help Files:" try: key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) ! except win32api.error, (code, fn, details): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, details) return --- 64,75 ---- def CheckHelpFiles(verbose): ! if verbose: print("Help Files:") try: key = win32api.RegOpenKey(regutil.GetRootKey(), regutil.BuildDefaultPythonKey() + "\\Help", 0, win32con.KEY_READ) ! except win32api.error as xxx_todo_changeme1: ! (code, fn, details) = xxx_todo_changeme1.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, details) return *************** *** 79,94 **** helpDesc = win32api.RegEnumKey(key, keyNo) helpFile = win32api.RegQueryValue(key, helpDesc) ! if verbose: print "\t"+helpDesc+":", # query the os section. try: os.stat(helpFile ) ! if verbose: print helpFile except os.error: ! print "** Help file %s does not exist" % helpFile keyNo = keyNo + 1 ! except win32api.error, (code, fn, desc): ! import winerror if code!=winerror.ERROR_NO_MORE_ITEMS: ! raise win32api.error, (code, fn, desc) break finally: --- 80,96 ---- helpDesc = win32api.RegEnumKey(key, keyNo) helpFile = win32api.RegQueryValue(key, helpDesc) ! if verbose: print("\t"+helpDesc+":", end=' ') # query the os section. try: os.stat(helpFile ) ! if verbose: print(helpFile) except os.error: ! print("** Help file %s does not exist" % helpFile) keyNo = keyNo + 1 ! except win32api.error as xxx_todo_changeme2: ! (code, fn, desc) = xxx_todo_changeme2.args ! from . import winerror if code!=winerror.ERROR_NO_MORE_ITEMS: ! raise win32api.error(code, fn, desc) break finally: *************** *** 100,114 **** try: keyhandle = win32api.RegOpenKey(regutil.GetRootKey(), k) ! print "WARNING: 'Modules' registry entry is deprectated and evil!" ! except win32api.error, (code, fn, details): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, details) return def CheckRegistry(verbose=0): # check the registered modules ! if verbose and os.environ.has_key('pythonpath'): ! print "Warning - PythonPath in environment - please check it!" # Check out all paths on sys.path --- 102,117 ---- try: keyhandle = win32api.RegOpenKey(regutil.GetRootKey(), k) ! print("WARNING: 'Modules' registry entry is deprectated and evil!") ! except win32api.error as xxx_todo_changeme3: ! (code, fn, details) = xxx_todo_changeme3.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, details) return def CheckRegistry(verbose=0): # check the registered modules ! if verbose and 'pythonpath' in os.environ: ! print("Warning - PythonPath in environment - please check it!") # Check out all paths on sys.path Index: ntsecuritycon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/ntsecuritycon.py,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** ntsecuritycon.py 20 Jan 2008 03:43:44 -0000 1.9 --- ntsecuritycon.py 29 Aug 2008 04:59:25 -0000 1.9.2.1 *************** *** 644,681 **** ## from aclui.h # SI_OBJECT_INFO.dwFlags ! SI_EDIT_PERMS = 0x00000000L ! SI_EDIT_OWNER = 0x00000001L ! SI_EDIT_AUDITS = 0x00000002L ! SI_CONTAINER = 0x00000004L ! SI_READONLY = 0x00000008L ! SI_ADVANCED = 0x00000010L ! SI_RESET = 0x00000020L ! SI_OWNER_READONLY = 0x00000040L ! SI_EDIT_PROPERTIES = 0x00000080L ! SI_OWNER_RECURSE = 0x00000100L ! SI_NO_ACL_PROTECT = 0x00000200L ! SI_NO_TREE_APPLY = 0x00000400L ! SI_PAGE_TITLE = 0x00000800L ! SI_SERVER_IS_DC = 0x00001000L ! SI_RESET_DACL_TREE = 0x00004000L ! SI_RESET_SACL_TREE = 0x00008000L ! SI_OBJECT_GUID = 0x00010000L ! SI_EDIT_EFFECTIVE = 0x00020000L ! SI_RESET_DACL = 0x00040000L ! SI_RESET_SACL = 0x00080000L ! SI_RESET_OWNER = 0x00100000L ! SI_NO_ADDITIONAL_PERMISSION = 0x00200000L ! SI_MAY_WRITE = 0x10000000L SI_EDIT_ALL = (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS) ! SI_AUDITS_ELEVATION_REQUIRED = 0x02000000L ! SI_VIEW_ONLY = 0x00400000L ! SI_OWNER_ELEVATION_REQUIRED = 0x04000000L ! SI_PERMS_ELEVATION_REQUIRED = 0x01000000L # SI_ACCESS.dwFlags ! SI_ACCESS_SPECIFIC = 0x00010000L ! SI_ACCESS_GENERAL = 0x00020000L ! SI_ACCESS_CONTAINER = 0x00040000L ! SI_ACCESS_PROPERTY = 0x00080000L # SI_PAGE_TYPE enum --- 644,681 ---- ## from aclui.h # SI_OBJECT_INFO.dwFlags ! SI_EDIT_PERMS = 0x00000000 ! SI_EDIT_OWNER = 0x00000001 ! SI_EDIT_AUDITS = 0x00000002 ! SI_CONTAINER = 0x00000004 ! SI_READONLY = 0x00000008 ! SI_ADVANCED = 0x00000010 ! SI_RESET = 0x00000020 ! SI_OWNER_READONLY = 0x00000040 ! SI_EDIT_PROPERTIES = 0x00000080 ! SI_OWNER_RECURSE = 0x00000100 ! SI_NO_ACL_PROTECT = 0x00000200 ! SI_NO_TREE_APPLY = 0x00000400 ! SI_PAGE_TITLE = 0x00000800 ! SI_SERVER_IS_DC = 0x00001000 ! SI_RESET_DACL_TREE = 0x00004000 ! SI_RESET_SACL_TREE = 0x00008000 ! SI_OBJECT_GUID = 0x00010000 ! SI_EDIT_EFFECTIVE = 0x00020000 ! SI_RESET_DACL = 0x00040000 ! SI_RESET_SACL = 0x00080000 ! SI_RESET_OWNER = 0x00100000 ! SI_NO_ADDITIONAL_PERMISSION = 0x00200000 ! SI_MAY_WRITE = 0x10000000 SI_EDIT_ALL = (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS) ! SI_AUDITS_ELEVATION_REQUIRED = 0x02000000 ! SI_VIEW_ONLY = 0x00400000 ! SI_OWNER_ELEVATION_REQUIRED = 0x04000000 ! SI_PERMS_ELEVATION_REQUIRED = 0x01000000 # SI_ACCESS.dwFlags ! SI_ACCESS_SPECIFIC = 0x00010000 ! SI_ACCESS_GENERAL = 0x00020000 ! SI_ACCESS_CONTAINER = 0x00040000 ! SI_ACCESS_PROPERTY = 0x00080000 # SI_PAGE_TYPE enum *************** *** 686,689 **** SI_PAGE_EFFECTIVE =4 ! CFSTR_ACLUI_SID_INFO_LIST = u"CFSTR_ACLUI_SID_INFO_LIST" PSPCB_SI_INITDIALOG = 1025 ## WM_USER+1 --- 686,689 ---- SI_PAGE_EFFECTIVE =4 ! CFSTR_ACLUI_SID_INFO_LIST = "CFSTR_ACLUI_SID_INFO_LIST" PSPCB_SI_INITDIALOG = 1025 ## WM_USER+1 Index: win32con.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32con.py,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -d -r1.23 -r1.23.2.1 *** win32con.py 4 May 2008 10:43:37 -0000 1.23 --- win32con.py 29 Aug 2008 04:59:25 -0000 1.23.2.1 *************** *** 456,460 **** MB_SETFOREGROUND = 65536 MB_DEFAULT_DESKTOP_ONLY = 131072 ! MB_TOPMOST = 262144L MB_RIGHT = 524288 MB_RTLREADING = 1048576 --- 456,460 ---- MB_SETFOREGROUND = 65536 MB_DEFAULT_DESKTOP_ONLY = 131072 ! MB_TOPMOST = 262144 MB_RIGHT = 524288 MB_RTLREADING = 1048576 *************** *** 566,570 **** MFS_UNHILITE = MF_UNHILITE MFS_DEFAULT = MF_DEFAULT ! MFS_MASK = 4235L MFS_HOTTRACKDRAWN = 268435456 MFS_CACHEDBMP = 536870912 --- 566,570 ---- MFS_UNHILITE = MF_UNHILITE MFS_DEFAULT = MF_DEFAULT ! MFS_MASK = 4235 MFS_HOTTRACKDRAWN = 268435456 MFS_CACHEDBMP = 536870912 *************** *** 794,798 **** BS_USERBUTTON = 8 BS_AUTORADIOBUTTON = 9 ! BS_OWNERDRAW = 11L BS_LEFTTEXT = 32 BS_TEXT = 0 --- 794,798 ---- BS_USERBUTTON = 8 BS_AUTORADIOBUTTON = 9 ! BS_OWNERDRAW = 11 BS_LEFTTEXT = 32 BS_TEXT = 0 *************** *** 2415,2422 **** IMAGE_SYM_CLASS_SECTION = 104 IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105 ! N_BTMASK = 017 ! N_TMASK = 060 ! N_TMASK1 = 0300 ! N_TMASK2 = 0360 N_BTSHFT = 4 N_TSHIFT = 2 --- 2415,2422 ---- IMAGE_SYM_CLASS_SECTION = 104 IMAGE_SYM_CLASS_WEAK_EXTERNAL = 105 ! N_BTMASK = 15 ! N_TMASK = 48 ! N_TMASK1 = 192 ! N_TMASK2 = 240 N_BTSHFT = 4 N_TSHIFT = 2 *************** *** 2431,2447 **** IMAGE_WEAK_EXTERN_SEARCH_ALIAS = 3 IMAGE_SIZEOF_RELOCATION = 10 ! IMAGE_REL_I386_SECTION = 012 ! IMAGE_REL_I386_SECREL = 013 ! IMAGE_REL_MIPS_REFHALF = 01 ! IMAGE_REL_MIPS_REFWORD = 02 ! IMAGE_REL_MIPS_JMPADDR = 03 ! IMAGE_REL_MIPS_REFHI = 04 ! IMAGE_REL_MIPS_REFLO = 05 ! IMAGE_REL_MIPS_GPREL = 06 ! IMAGE_REL_MIPS_LITERAL = 07 ! IMAGE_REL_MIPS_SECTION = 012 ! IMAGE_REL_MIPS_SECREL = 013 ! IMAGE_REL_MIPS_REFWORDNB = 042 ! IMAGE_REL_MIPS_PAIR = 045 IMAGE_REL_ALPHA_ABSOLUTE = 0 IMAGE_REL_ALPHA_REFLONG = 1 --- 2431,2447 ---- IMAGE_WEAK_EXTERN_SEARCH_ALIAS = 3 IMAGE_SIZEOF_RELOCATION = 10 ! IMAGE_REL_I386_SECTION = 10 ! IMAGE_REL_I386_SECREL = 11 ! IMAGE_REL_MIPS_REFHALF = 1 ! IMAGE_REL_MIPS_REFWORD = 2 ! IMAGE_REL_MIPS_JMPADDR = 3 ! IMAGE_REL_MIPS_REFHI = 4 ! IMAGE_REL_MIPS_REFLO = 5 ! IMAGE_REL_MIPS_GPREL = 6 ! IMAGE_REL_MIPS_LITERAL = 7 ! IMAGE_REL_MIPS_SECTION = 10 ! IMAGE_REL_MIPS_SECREL = 11 ! IMAGE_REL_MIPS_REFWORDNB = 34 ! IMAGE_REL_MIPS_PAIR = 37 IMAGE_REL_ALPHA_ABSOLUTE = 0 IMAGE_REL_ALPHA_REFLONG = 1 Index: pywintypes.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/pywintypes.py,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** pywintypes.py 11 Mar 2008 04:23:31 -0000 1.13 --- pywintypes.py 29 Aug 2008 04:59:25 -0000 1.13.2.1 *************** *** 1,4 **** # Magic utility that "redirects" to pywintypesxx.dll ! def __import_pywin32_system_module__(modname, globs): # This has been through a number of iterations. The problem: how to --- 1,5 ---- # Magic utility that "redirects" to pywintypesxx.dll ! import imp, sys, os ! sys.modules['pywintypes_loader']=sys.modules['pywintypes'] def __import_pywin32_system_module__(modname, globs): # This has been through a number of iterations. The problem: how to *************** *** 18,22 **** # on pywintypesXX.dll. It then can check if the DLL we are looking for # lib is already loaded. - import imp, sys, os if not sys.platform.startswith("win32"): # These extensions can be built on Linux via the 'mainwin' toolkit. --- 19,22 ---- *************** *** 34,38 **** globs.update(mod.__dict__) return ! raise ImportError, "No dynamic module " + modname # See if this is a debug build. for suffix_item in imp.get_suffixes(): --- 34,38 ---- globs.update(mod.__dict__) return ! raise ImportError("No dynamic module " + modname) # See if this is a debug build. for suffix_item in imp.get_suffixes(): *************** *** 58,63 **** break else: ! raise ImportError, \ ! "Module '%s' isn't in frozen sys.path %s" % (modname, sys.path) else: # First see if it already in our process - if so, we must use that. --- 58,62 ---- break else: ! raise ImportError("Module '%s' isn't in frozen sys.path %s" % (modname, sys.path)) else: # First see if it already in our process - if so, we must use that. *************** *** 96,107 **** if found is None: # give up in disgust. ! raise ImportError, \ ! "No system module '%s' (%s)" % (modname, filename) ! # Python can load the module ! mod = imp.load_module(modname, None, found, ! ('.dll', 'rb', imp.C_EXTENSION)) # and fill our namespace with it. ! globs.update(mod.__dict__) ! __import_pywin32_system_module__("pywintypes", globals()) --- 95,109 ---- if found is None: # give up in disgust. ! raise ImportError("No system module '%s' (%s)" % (modname, filename)) # Python can load the module ! ## print ('__import_pywin32_system_module__ (before):', __import_pywin32_system_module__) ! mod = imp.load_dynamic(modname, found) ! ## print ('mod:', mod) ! ## print ('__import_pywin32_system_module__ (after):', __import_pywin32_system_module__) # and fill our namespace with it. ! # This doesn't work in py3k, where pywintypes actually ends up as the compiled pyd ! # which is loaded, rather than this script ! ## globs.update(mod.__dict__) ! mod.__import_pywin32_system_module__ = __import_pywin32_system_module__ ! __import_pywin32_system_module__("pywintypes", {}) Index: rasutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/rasutil.py,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** rasutil.py 2 Sep 1999 00:19:28 -0000 1.1 --- rasutil.py 29 Aug 2008 04:59:25 -0000 1.1.4.1 *************** *** 33,37 **** def TestCallback( hras, msg, state, error, exterror): ! print "Callback called with ", hras, msg, stateStrings[state], error, exterror def test(rasName = "_ Divert Off"): --- 33,37 ---- def TestCallback( hras, msg, state, error, exterror): ! print("Callback called with ", hras, msg, stateStrings[state], error, exterror) def test(rasName = "_ Divert Off"): Index: commctrl.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/commctrl.py,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** commctrl.py 12 Apr 2005 03:03:53 -0000 1.6 --- commctrl.py 29 Aug 2008 04:59:25 -0000 1.6.4.1 *************** *** 110,115 **** CDIS_MARKED = 128 CDIS_INDETERMINATE = 256 ! CLR_NONE = 0xFFFFFFFFL ! CLR_DEFAULT = 0xFF000000L ILC_MASK = 1 ILC_COLOR = 0 --- 110,115 ---- CDIS_MARKED = 128 CDIS_INDETERMINATE = 256 ! CLR_NONE = 0xFFFFFFFF ! CLR_DEFAULT = 0xFF000000 ILC_MASK = 1 ILC_COLOR = 0 *************** *** 789,800 **** HOTKEY_CLASSA = "msctls_hotkey32" HOTKEY_CLASS = HOTKEY_CLASSA ! CCS_TOP = 0x00000001L ! CCS_NOMOVEY = 0x00000002L ! CCS_BOTTOM = 0x00000003L ! CCS_NORESIZE = 0x00000004L ! CCS_NOPARENTALIGN = 0x00000008L ! CCS_ADJUSTABLE = 0x00000020L ! CCS_NODIVIDER = 0x00000040L ! CCS_VERT = 0x00000080L CCS_LEFT = (CCS_VERT | CCS_TOP) CCS_RIGHT = (CCS_VERT | CCS_BOTTOM) --- 789,800 ---- HOTKEY_CLASSA = "msctls_hotkey32" HOTKEY_CLASS = HOTKEY_CLASSA ! CCS_TOP = 0x00000001 ! CCS_NOMOVEY = 0x00000002 ! CCS_BOTTOM = 0x00000003 ! CCS_NORESIZE = 0x00000004 ! CCS_NOPARENTALIGN = 0x00000008 ! CCS_ADJUSTABLE = 0x00000020 ! CCS_NODIVIDER = 0x00000040 ! CCS_VERT = 0x00000080 CCS_LEFT = (CCS_VERT | CCS_TOP) CCS_RIGHT = (CCS_VERT | CCS_BOTTOM) *************** *** 1526,1542 **** TME_CANCEL = -2147483648 HOVER_DEFAULT = -1 ! WSB_PROP_CYVSCROLL = 0x00000001L ! WSB_PROP_CXHSCROLL = 0x00000002L ! WSB_PROP_CYHSCROLL = 0x00000004L ! WSB_PROP_CXVSCROLL = 0x00000008L ! WSB_PROP_CXHTHUMB = 0x00000010L ! WSB_PROP_CYVTHUMB = 0x00000020L ! WSB_PROP_VBKGCOLOR = 0x00000040L ! WSB_PROP_HBKGCOLOR = 0x00000080L ! WSB_PROP_VSTYLE = 0x00000100L ! WSB_PROP_HSTYLE = 0x00000200L ! WSB_PROP_WINSTYLE = 0x00000400L ! WSB_PROP_PALETTE = 0x00000800L ! WSB_PROP_MASK = 0x00000FFFL FSB_FLAT_MODE = 2 FSB_ENCARTA_MODE = 1 --- 1526,1542 ---- TME_CANCEL = -2147483648 HOVER_DEFAULT = -1 ! WSB_PROP_CYVSCROLL = 0x00000001 ! WSB_PROP_CXHSCROLL = 0x00000002 ! WSB_PROP_CYHSCROLL = 0x00000004 ! WSB_PROP_CXVSCROLL = 0x00000008 ! WSB_PROP_CXHTHUMB = 0x00000010 ! WSB_PROP_CYVTHUMB = 0x00000020 ! WSB_PROP_VBKGCOLOR = 0x00000040 ! WSB_PROP_HBKGCOLOR = 0x00000080 ! WSB_PROP_VSTYLE = 0x00000100 ! WSB_PROP_HSTYLE = 0x00000200 ! WSB_PROP_WINSTYLE = 0x00000400 ! WSB_PROP_PALETTE = 0x00000800 ! WSB_PROP_MASK = 0x00000FFF FSB_FLAT_MODE = 2 FSB_ENCARTA_MODE = 1 Index: afxres.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/afxres.py,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** afxres.py 13 Jul 2004 07:46:20 -0000 1.2 --- afxres.py 29 Aug 2008 04:59:25 -0000 1.2.4.1 *************** *** 54,58 **** AFX_IDW_DOCKBAR_BOTTOM = 0xE81E AFX_IDW_DOCKBAR_FLOAT = 0xE81F ! def AFX_CONTROLBAR_MASK(nIDC): return (1L << (nIDC - AFX_IDW_CONTROLBAR_FIRST)) AFX_IDW_PANE_FIRST = 0xE900 --- 54,58 ---- AFX_IDW_DOCKBAR_BOTTOM = 0xE81E AFX_IDW_DOCKBAR_FLOAT = 0xE81F ! def AFX_CONTROLBAR_MASK(nIDC): return (1 << (nIDC - AFX_IDW_CONTROLBAR_FIRST)) AFX_IDW_PANE_FIRST = 0xE900 Index: sspi.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/sspi.py,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** sspi.py 13 Feb 2006 14:47:20 -0000 1.3 --- sspi.py 29 Aug 2008 04:59:25 -0000 1.3.4.1 *************** *** 229,231 **** data, key = sspiclient.encrypt("hello") assert sspiserver.decrypt(data, key) == "hello" ! print "cool!" --- 229,231 ---- data, key = sspiclient.encrypt("hello") assert sspiserver.decrypt(data, key) == "hello" ! print("cool!") Index: regutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/regutil.py,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** regutil.py 8 Jan 2002 05:41:13 -0000 1.3 --- regutil.py 29 Aug 2008 04:59:25 -0000 1.3.4.1 *************** *** 33,42 **** import types if rootkey is None: rootkey = GetRootKey() ! if type(value)==types.StringType: typeId = win32con.REG_SZ ! elif type(value)==types.IntType: typeId = win32con.REG_DWORD else: ! raise TypeError, "Value must be string or integer - was passed " + str(value) win32api.RegSetValue(rootkey, subKey, typeId ,value) --- 33,44 ---- import types if rootkey is None: rootkey = GetRootKey() ! if isinstance(value, str): typeId = win32con.REG_SZ ! elif isinstance(value, bytes): ! typeId = win32con.REG_BINARY ! elif isinstance(value, int): typeId = win32con.REG_DWORD else: ! raise TypeError("Value must be string or integer - was passed " + str(value)) win32api.RegSetValue(rootkey, subKey, typeId ,value) *************** *** 73,77 **** # Note - Dont work on win32s (but we dont care anymore!) if exeAppPath: ! raise error, "Do not support exeAppPath argument currently" if exeAlias is None: exeAlias = os.path.basename(exeFullPath) --- 75,79 ---- # Note - Dont work on win32s (but we dont care anymore!) if exeAppPath: ! raise error("Do not support exeAppPath argument currently") if exeAlias is None: exeAlias = os.path.basename(exeFullPath) *************** *** 88,95 **** try: win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias) ! except win32api.error, (code, fn, details): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, desc) return --- 90,98 ---- try: win32api.RegDeleteKey(GetRootKey(), GetAppPathsKey() + "\\" + exeAlias) ! except win32api.error as xxx_todo_changeme: ! (code, fn, details) = xxx_todo_changeme.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, desc) return *************** *** 107,114 **** try: win32api.RegDeleteKey(GetRootKey(), keyStr) ! except win32api.error, (code, fn, details): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, desc) return --- 110,118 ---- try: win32api.RegDeleteKey(GetRootKey(), keyStr) ! except win32api.error as xxx_todo_changeme1: ! (code, fn, details) = xxx_todo_changeme1.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, desc) return *************** *** 120,127 **** try: return win32api.RegQueryValue(GetRootKey(), keyStr) ! except win32api.error, (code, fn, details): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, details) return None --- 124,132 ---- try: return win32api.RegQueryValue(GetRootKey(), keyStr) ! except win32api.error as xxx_todo_changeme2: ! (code, fn, details) = xxx_todo_changeme2.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, details) return None *************** *** 139,143 **** os.stat(modPath) except os.error: ! print "Warning: Registering non-existant module %s" % modPath win32api.RegSetValue(GetRootKey(), BuildDefaultPythonKey() + "\\Modules\\%s" % modName, --- 144,148 ---- os.stat(modPath) except os.error: ! print("Warning: Registering non-existant module %s" % modPath) win32api.RegSetValue(GetRootKey(), BuildDefaultPythonKey() + "\\Modules\\%s" % modName, *************** *** 152,159 **** win32api.RegDeleteKey(GetRootKey(), BuildDefaultPythonKey() + "\\Modules\\%s" % modName) ! except win32api.error, (code, fn, desc): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, desc) def GetRegisteredHelpFile(helpDesc): --- 157,165 ---- win32api.RegDeleteKey(GetRootKey(), BuildDefaultPythonKey() + "\\Modules\\%s" % modName) ! except win32api.error as xxx_todo_changeme3: ! (code, fn, desc) = xxx_todo_changeme3.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, desc) def GetRegisteredHelpFile(helpDesc): *************** *** 185,189 **** if bCheckFile: os.stat(fullHelpFile) except os.error: ! raise ValueError, "Help file does not exist" # Now register with Python itself. win32api.RegSetValue(GetRootKey(), --- 191,195 ---- if bCheckFile: os.stat(fullHelpFile) except os.error: ! raise ValueError("Help file does not exist") # Now register with Python itself. win32api.RegSetValue(GetRootKey(), *************** *** 200,207 **** try: win32api.RegDeleteValue(key, helpFile) ! except win32api.error, (code, fn, desc): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, desc) finally: win32api.RegCloseKey(key) --- 206,214 ---- try: win32api.RegDeleteValue(key, helpFile) ! except win32api.error as xxx_todo_changeme4: ! (code, fn, desc) = xxx_todo_changeme4.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, desc) finally: win32api.RegCloseKey(key) *************** *** 212,219 **** win32api.RegDeleteKey(GetRootKey(), BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc) ! except win32api.error, (code, fn, desc): ! import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error, (code, fn, desc) def RegisterCoreDLL(coredllName = None): --- 219,227 ---- win32api.RegDeleteKey(GetRootKey(), BuildDefaultPythonKey() + "\\Help\\%s" % helpDesc) ! except win32api.error as xxx_todo_changeme5: ! (code, fn, desc) = xxx_todo_changeme5.args ! from . import winerror if code!=winerror.ERROR_FILE_NOT_FOUND: ! raise win32api.error(code, fn, desc) def RegisterCoreDLL(coredllName = None): *************** *** 230,234 **** os.stat(coredllName) except os.error: ! print "Warning: Registering non-existant core DLL %s" % coredllName hKey = win32api.RegCreateKey(GetRootKey() , BuildDefaultPythonKey()) --- 238,242 ---- os.stat(coredllName) except os.error: ! print("Warning: Registering non-existant core DLL %s" % coredllName) hKey = win32api.RegCreateKey(GetRootKey() , BuildDefaultPythonKey()) Index: netbios.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/netbios.py,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** netbios.py 22 Mar 2006 10:41:05 -0000 1.4 --- netbios.py 29 Aug 2008 04:59:25 -0000 1.4.4.1 *************** *** 1,5 **** import win32wnet import struct - import string # Constants generated by h2py from nb30.h --- 1,4 ---- *************** *** 194,198 **** class NCBStruct: def __init__(self, items): ! self._format = string.join(map(lambda item: item[0], items), "") self._items = items self._buffer_ = win32wnet.NCBBuffer(struct.calcsize(self._format)) --- 193,197 ---- class NCBStruct: def __init__(self, items): ! self._format = "".join([item[0] for item in items]) self._items = items self._buffer_ = win32wnet.NCBBuffer(struct.calcsize(self._format)) *************** *** 217,235 **** vals.append(None) ! self._buffer_[:] = apply( struct.pack, (self._format,) + tuple(vals) ) def _unpack(self): items = struct.unpack(self._format, self._buffer_) assert len(items)==len(self._items), "unexpected number of items to unpack!" ! for (format, name), val in map(None, self._items, items): self.__dict__[name] = val def __setattr__(self, attr, val): ! if not self.__dict__.has_key(attr) and attr[0]!='_': for format, attr_name in self._items: if attr==attr_name: break else: ! raise AttributeError, attr self.__dict__[attr] = val --- 216,234 ---- vals.append(None) ! self._buffer_[:] = struct.pack(*(self._format,) + tuple(vals)) def _unpack(self): items = struct.unpack(self._format, self._buffer_) assert len(items)==len(self._items), "unexpected number of items to unpack!" ! for (format, name), val in zip(self._items, items): self.__dict__[name] = val def __setattr__(self, attr, val): ! if attr not in self.__dict__ and attr[0]!='_': for format, attr_name in self._items: if attr==attr_name: break else: ! raise AttributeError(attr) self.__dict__[attr] = val *************** *** 266,286 **** ncb.Buffer = la_enum rc = Netbios(ncb) ! if rc != 0: raise RuntimeError, "Unexpected result %d" % (rc,) for i in range(la_enum.length): ncb.Reset() ncb.Command = NCBRESET ! ncb.Lana_num = ord(la_enum.lana[i]) rc = Netbios(ncb) ! if rc != 0: raise RuntimeError, "Unexpected result %d" % (rc,) ncb.Reset() ncb.Command = NCBASTAT ! ncb.Lana_num = ord(la_enum.lana[i]) ! ncb.Callname = "* " adapter = ADAPTER_STATUS() ncb.Buffer = adapter Netbios(ncb) ! print "Adapter address:", for ch in adapter.adapter_address: ! print "%02x" % (ord(ch),) , ! print \ No newline at end of file --- 265,285 ---- ncb.Buffer = la_enum rc = Netbios(ncb) ! if rc != 0: raise RuntimeError("Unexpected result %d" % (rc,)) for i in range(la_enum.length): ncb.Reset() ncb.Command = NCBRESET ! ncb.Lana_num = la_enum.lana[i] rc = Netbios(ncb) ! if rc != 0: raise RuntimeError("Unexpected result %d" % (rc,)) ncb.Reset() ncb.Command = NCBASTAT ! ncb.Lana_num = la_enum.lana[i] ! ncb.Callname = b"* " adapter = ADAPTER_STATUS() ncb.Buffer = adapter Netbios(ncb) ! print("Adapter address:", end=' ') for ch in adapter.adapter_address: ! print("%02x" % (ch,), end=' ') ! print() \ No newline at end of file Index: win32traceutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32traceutil.py,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** win32traceutil.py 30 Jun 2008 12:59:11 -0000 1.3 --- win32traceutil.py 29 Aug 2008 04:59:25 -0000 1.3.2.1 *************** *** 33,37 **** pass # Oh well! win32trace.InitRead() ! print "Collecting Python Trace Output..." try: while 1: --- 33,37 ---- pass # Oh well! win32trace.InitRead() ! print ("Collecting Python Trace Output...") try: while 1: *************** *** 39,43 **** sys.stdout.write(win32trace.blockingread(500)) except KeyboardInterrupt: ! print "Ctrl+C" --- 39,43 ---- sys.stdout.write(win32trace.blockingread(500)) except KeyboardInterrupt: ! print ("Ctrl+C") *************** *** 45,49 **** win32trace.InitWrite() try: # Under certain servers, sys.stdout may be invalid. ! print "Redirecting output to win32trace remote collector" except: pass --- 45,49 ---- win32trace.InitWrite() try: # Under certain servers, sys.stdout may be invalid. ! print ("Redirecting output to win32trace remote collector") except: pass Index: win32netcon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32netcon.py,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** win32netcon.py 4 Jun 2008 08:18:55 -0000 1.6 --- win32netcon.py 29 Aug 2008 04:59:25 -0000 1.6.2.1 *************** *** 311,315 **** DEF_MIN_PWAGE = 0 DEF_FORCE_LOGOFF = -1 ! ONE_DAY = 01*24*3600 GROUP_SPECIALGRP_USERS = "USERS" GROUP_SPECIALGRP_ADMINS = "ADMINS" --- 311,315 ---- DEF_MIN_PWAGE = 0 DEF_FORCE_LOGOFF = -1 ! ONE_DAY = 1*24*3600 GROUP_SPECIALGRP_USERS = "USERS" GROUP_SPECIALGRP_ADMINS = "ADMINS" *************** *** 353,357 **** SV_TYPE_DOMAIN_ENUM = -2147483648 SV_TYPE_ALL = -1 ! SV_NODISC = (-1L) SV_USERSECURITY = 1 SV_SHARESECURITY = 0 --- 353,357 ---- SV_TYPE_DOMAIN_ENUM = -2147483648 SV_TYPE_ALL = -1 ! SV_NODISC = -1 SV_USERSECURITY = 1 SV_SHARESECURITY = 0 *************** *** 651,655 **** NetSetupDomainName = 3 - NetValidateAuthentication = 1 - NetValidatePasswordChange = 2 - NetValidatePasswordReset = 3 --- 651,652 ---- Index: mmsystem.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/mmsystem.py,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** mmsystem.py 10 Jan 2006 04:29:49 -0000 1.2 --- mmsystem.py 29 Aug 2008 04:59:25 -0000 1.2.4.1 *************** *** 109,119 **** DRV_MCI_FIRST = DRV_RESERVED DRV_MCI_LAST = (DRV_RESERVED + 0xFFF) ! CALLBACK_TYPEMASK = 0x00070000l ! CALLBACK_NULL = 0x00000000l ! CALLBACK_WINDOW = 0x00010000l ! CALLBACK_TASK = 0x00020000l ! CALLBACK_FUNCTION = 0x00030000l CALLBACK_THREAD = (CALLBACK_TASK) ! CALLBACK_EVENT = 0x00050000l SND_SYNC = 0x0000 SND_ASYNC = 0x0001 --- 109,119 ---- DRV_MCI_FIRST = DRV_RESERVED DRV_MCI_LAST = (DRV_RESERVED + 0xFFF) ! CALLBACK_TYPEMASK = 0x00070000 ! CALLBACK_NULL = 0x00000000 ! CALLBACK_WINDOW = 0x00010000 ! CALLBACK_TASK = 0x00020000 ! CALLBACK_FUNCTION = 0x00030000 CALLBACK_THREAD = (CALLBACK_TASK) ! CALLBACK_EVENT = 0x00050000 SND_SYNC = 0x0000 SND_ASYNC = 0x0001 *************** *** 122,130 **** SND_LOOP = 0x0008 SND_NOSTOP = 0x0010 ! SND_NOWAIT = 0x00002000L ! SND_ALIAS = 0x00010000L ! SND_ALIAS_ID = 0x00110000L ! SND_FILENAME = 0x00020000L ! SND_RESOURCE = 0x00040004L SND_PURGE = 0x0040 SND_APPLICATION = 0x0080 --- 122,130 ---- SND_LOOP = 0x0008 SND_NOSTOP = 0x0010 ! SND_NOWAIT = 0x00002000 ! SND_ALIAS = 0x00010000 ! SND_ALIAS_ID = 0x00110000 ! SND_FILENAME = 0x00020000 ! SND_RESOURCE = 0x00040004 SND_PURGE = 0x0040 SND_APPLICATION = 0x0080 *************** *** 141,145 **** WIM_CLOSE = MM_WIM_CLOSE WIM_DATA = MM_WIM_DATA ! WAVE_MAPPER = 0xFFFFFFFFL WAVE_FORMAT_QUERY = 0x0001 WAVE_ALLOWSYNC = 0x0002 --- 141,145 ---- WIM_CLOSE = MM_WIM_CLOSE WIM_DATA = MM_WIM_DATA ! WAVE_MAPPER = 0xFFFFFFFF WAVE_FORMAT_QUERY = 0x0001 WAVE_ALLOWSYNC = 0x0002 *************** *** 195,199 **** MIM_MOREDATA = MM_MIM_MOREDATA MOM_POSITIONCB = MM_MOM_POSITIONCB ! MIDI_IO_STATUS = 0x00000020L MIDI_CACHE_ALL = 1 MIDI_CACHE_BESTFIT = 2 --- 195,199 ---- MIM_MOREDATA = MM_MIM_MOREDATA MOM_POSITIONCB = MM_MOM_POSITIONCB ! MIDI_IO_STATUS = 0x00000020 MIDI_CACHE_ALL = 1 MIDI_CACHE_BESTFIT = 2 *************** *** 213,228 **** MHDR_INQUEUE = 0x00000004 MHDR_ISSTRM = 0x00000008 ! MEVT_F_SHORT = 0x00000000L ! MEVT_F_LONG = 0x80000000L ! MEVT_F_CALLBACK = 0x40000000L def MEVT_EVENTTYPE(x): return ((BYTE)(((x)>>24)&0xFF)) ! def MEVT_EVENTPARM(x): return ((DWORD)((x)&0x00FFFFFFL)) MIDISTRM_ERROR = (-2) ! MIDIPROP_SET = 0x80000000L ! MIDIPROP_GET = 0x40000000L ! MIDIPROP_TIMEDIV = 0x00000001L ! MIDIPROP_TEMPO = 0x00000002L AUXCAPS_CDAUDIO = 1 AUXCAPS_AUXIN = 2 --- 213,228 ---- MHDR_INQUEUE = 0x00000004 MHDR_ISSTRM = 0x00000008 ! MEVT_F_SHORT = 0x00000000 ! MEVT_F_LONG = 0x80000000 ! MEVT_F_CALLBACK = 0x40000000 def MEVT_EVENTTYPE(x): return ((BYTE)(((x)>>24)&0xFF)) ! def MEVT_EVENTPARM(x): return ((DWORD)((x)&0x00FFFFFF)) MIDISTRM_ERROR = (-2) ! MIDIPROP_SET = 0x80000000 ! MIDIPROP_GET = 0x40000000 ! MIDIPROP_TIMEDIV = 0x00000001 ! MIDIPROP_TEMPO = 0x00000002 AUXCAPS_CDAUDIO = 1 AUXCAPS_AUXIN = 2 *************** *** 235,254 **** MIXERR_INVALVALUE = (MIXERR_BASE + 2) MIXERR_LASTERROR = (MIXERR_BASE + 2) ! MIXER_OBJECTF_HANDLE = 0x80000000L ! MIXER_OBJECTF_MIXER = 0x00000000L MIXER_OBJECTF_HMIXER = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER) ! MIXER_OBJECTF_WAVEOUT = 0x10000000L MIXER_OBJECTF_HWAVEOUT = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEOUT) ! MIXER_OBJECTF_WAVEIN = 0x20000000L MIXER_OBJECTF_HWAVEIN = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEIN) ! MIXER_OBJECTF_MIDIOUT = 0x30000000L MIXER_OBJECTF_HMIDIOUT = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIOUT) ! MIXER_OBJECTF_MIDIIN = 0x40000000L MIXER_OBJECTF_HMIDIIN = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIIN) ! MIXER_OBJECTF_AUX = 0x50000000L ! MIXERLINE_LINEF_ACTIVE = 0x00000001L ! MIXERLINE_LINEF_DISCONNECTED = 0x00008000L ! MIXERLINE_LINEF_SOURCE = 0x80000000L ! MIXERLINE_COMPONENTTYPE_DST_FIRST = 0x00000000L MIXERLINE_COMPONENTTYPE_DST_UNDEFINED = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 0) MIXERLINE_COMPONENTTYPE_DST_DIGITAL = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 1) --- 235,254 ---- MIXERR_INVALVALUE = (MIXERR_BASE + 2) MIXERR_LASTERROR = (MIXERR_BASE + 2) ! MIXER_OBJECTF_HANDLE = 0x80000000 ! MIXER_OBJECTF_MIXER = 0x00000000 MIXER_OBJECTF_HMIXER = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIXER) ! MIXER_OBJECTF_WAVEOUT = 0x10000000 MIXER_OBJECTF_HWAVEOUT = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEOUT) ! MIXER_OBJECTF_WAVEIN = 0x20000000 MIXER_OBJECTF_HWAVEIN = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_WAVEIN) ! MIXER_OBJECTF_MIDIOUT = 0x30000000 MIXER_OBJECTF_HMIDIOUT = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIOUT) ! MIXER_OBJECTF_MIDIIN = 0x40000000 MIXER_OBJECTF_HMIDIIN = (MIXER_OBJECTF_HANDLE|MIXER_OBJECTF_MIDIIN) ! MIXER_OBJECTF_AUX = 0x50000000 ! MIXERLINE_LINEF_ACTIVE = 0x00000001 ! MIXERLINE_LINEF_DISCONNECTED = 0x00008000 ! MIXERLINE_LINEF_SOURCE = 0x80000000 ! MIXERLINE_COMPONENTTYPE_DST_FIRST = 0x00000000 MIXERLINE_COMPONENTTYPE_DST_UNDEFINED = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 0) MIXERLINE_COMPONENTTYPE_DST_DIGITAL = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 1) *************** *** 261,265 **** MIXERLINE_COMPONENTTYPE_DST_VOICEIN = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 8) MIXERLINE_COMPONENTTYPE_DST_LAST = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 8) ! MIXERLINE_COMPONENTTYPE_SRC_FIRST = 0x00001000L MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED = (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 0) MIXERLINE_COMPONENTTYPE_SRC_DIGITAL = (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 1) --- 261,265 ---- MIXERLINE_COMPONENTTYPE_DST_VOICEIN = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 8) MIXERLINE_COMPONENTTYPE_DST_LAST = (MIXERLINE_COMPONENTTYPE_DST_FIRST + 8) ! MIXERLINE_COMPONENTTYPE_SRC_FIRST = 0x00001000 MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED = (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 0) MIXERLINE_COMPONENTTYPE_SRC_DIGITAL = (MIXERLINE_COMPONENTTYPE_SRC_FIRST + 1) *************** *** 280,316 **** MIXERLINE_TARGETTYPE_MIDIIN = 4 MIXERLINE_TARGETTYPE_AUX = 5 ! MIXER_GETLINEINFOF_DESTINATION = 0x00000000L ! MIXER_GETLINEINFOF_SOURCE = 0x00000001L ! MIXER_GETLINEINFOF_LINEID = 0x00000002L ! MIXER_GETLINEINFOF_COMPONENTTYPE = 0x00000003L ! MIXER_GETLINEINFOF_TARGETTYPE = 0x00000004L ! MIXER_GETLINEINFOF_QUERYMASK = 0x0000000FL ! MIXERCONTROL_CONTROLF_UNIFORM = 0x00000001L ! MIXERCONTROL_CONTROLF_MULTIPLE = 0x00000002L ! MIXERCONTROL_CONTROLF_DISABLED = 0x80000000L ! MIXERCONTROL_CT_CLASS_MASK = 0xF0000000L ! MIXERCONTROL_CT_CLASS_CUSTOM = 0x00000000L ! MIXERCONTROL_CT_CLASS_METER = 0x10000000L ! MIXERCONTROL_CT_CLASS_SWITCH = 0x20000000L ! MIXERCONTROL_CT_CLASS_NUMBER = 0x30000000L ! MIXERCONTROL_CT_CLASS_SLIDER = 0x40000000L ! MIXERCONTROL_CT_CLASS_FADER = 0x50000000L ! MIXERCONTROL_CT_CLASS_TIME = 0x60000000L ! MIXERCONTROL_CT_CLASS_LIST = 0x70000000L ! MIXERCONTROL_CT_SUBCLASS_MASK = 0x0F000000L ! MIXERCONTROL_CT_SC_SWITCH_BOOLEAN = 0x00000000L ! MIXERCONTROL_CT_SC_SWITCH_BUTTON = 0x01000000L ! MIXERCONTROL_CT_SC_METER_POLLED = 0x00000000L ! MIXERCONTROL_CT_SC_TIME_MICROSECS = 0x00000000L ! MIXERCONTROL_CT_SC_TIME_MILLISECS = 0x01000000L ! MIXERCONTROL_CT_SC_LIST_SINGLE = 0x00000000L ! MIXERCONTROL_CT_SC_LIST_MULTIPLE = 0x01000000L ! MIXERCONTROL_CT_UNITS_MASK = 0x00FF0000L ! MIXERCONTROL_CT_UNITS_CUSTOM = 0x00000000L ! MIXERCONTROL_CT_UNITS_BOOLEAN = 0x00010000L ! MIXERCONTROL_CT_UNITS_SIGNED = 0x00020000L ! MIXERCONTROL_CT_UNITS_UNSIGNED = 0x00030000L ! MIXERCONTROL_CT_UNITS_DECIBELS = 0x00040000L ! MIXERCONTROL_CT_UNITS_PERCENT = 0x00050000L MIXERCONTROL_CONTROLTYPE_CUSTOM = (MIXERCONTROL_CT_CLASS_CUSTOM | MIXERCONTROL_CT_UNITS_CUSTOM) MIXERCONTROL_CONTROLTYPE_BOOLEANMETER = (MIXERCONTROL_CT_CLASS_METER | MIXERCONTROL_CT_SC_METER_POLLED | MIXERCONTROL_CT_UNITS_BOOLEAN) --- 280,316 ---- MIXERLINE_TARGETTYPE_MIDIIN = 4 MIXERLINE_TARGETTYPE_AUX = 5 ! MIXER_GETLINEINFOF_DESTINATION = 0x00000000 ! MIXER_GETLINEINFOF_SOURCE = 0x00000001 ! MIXER_GETLINEINFOF_LINEID = 0x00000002 ! MIXER_GETLINEINFOF_COMPONENTTYPE = 0x00000003 ! MIXER_GETLINEINFOF_TARGETTYPE = 0x00000004 ! MIXER_GETLINEINFOF_QUERYMASK = 0x0000000F ! MIXERCONTROL_CONTROLF_UNIFORM = 0x00000001 ! MIXERCONTROL_CONTROLF_MULTIPLE = 0x00000002 ! MIXERCONTROL_CONTROLF_DISABLED = 0x80000000 ! MIXERCONTROL_CT_CLASS_MASK = 0xF0000000 ! MIXERCONTROL_CT_CLASS_CUSTOM = 0x00000000 ! MIXERCONTROL_CT_CLASS_METER = 0x10000000 ! MIXERCONTROL_CT_CLASS_SWITCH = 0x20000000 ! MIXERCONTROL_CT_CLASS_NUMBER = 0x30000000 ! MIXERCONTROL_CT_CLASS_SLIDER = 0x40000000 ! MIXERCONTROL_CT_CLASS_FADER = 0x50000000 ! MIXERCONTROL_CT_CLASS_TIME = 0x60000000 ! MIXERCONTROL_CT_CLASS_LIST = 0x70000000 ! MIXERCONTROL_CT_SUBCLASS_MASK = 0x0F000000 ! MIXERCONTROL_CT_SC_SWITCH_BOOLEAN = 0x00000000 ! MIXERCONTROL_CT_SC_SWITCH_BUTTON = 0x01000000 ! MIXERCONTROL_CT_SC_METER_POLLED = 0x00000000 ! MIXERCONTROL_CT_SC_TIME_MICROSECS = 0x00000000 ! MIXERCONTROL_CT_SC_TIME_MILLISECS = 0x01000000 ! MIXERCONTROL_CT_SC_LIST_SINGLE = 0x00000000 ! MIXERCONTROL_CT_SC_LIST_MULTIPLE = 0x01000000 ! MIXERCONTROL_CT_UNITS_MASK = 0x00FF0000 ! MIXERCONTROL_CT_UNITS_CUSTOM = 0x00000000 ! MIXERCONTROL_CT_UNITS_BOOLEAN = 0x00010000 ! MIXERCONTROL_CT_UNITS_SIGNED = 0x00020000 ! MIXERCONTROL_CT_UNITS_UNSIGNED = 0x00030000 ! MIXERCONTROL_CT_UNITS_DECIBELS = 0x00040000 ! MIXERCONTROL_CT_UNITS_PERCENT = 0x00050000 MIXERCONTROL_CONTROLTYPE_CUSTOM = (MIXERCONTROL_CT_CLASS_CUSTOM | MIXERCONTROL_CT_UNITS_CUSTOM) MIXERCONTROL_CONTROLTYPE_BOOLEANMETER = (MIXERCONTROL_CT_CLASS_METER | MIXERCONTROL_CT_SC_METER_POLLED | MIXERCONTROL_CT_UNITS_BOOLEAN) *************** *** 343,356 **** MIXERCONTROL_CONTROLTYPE_MICROTIME = (MIXERCONTROL_CT_CLASS_TIME | MIXERCONTROL_CT_SC_TIME_MICROSECS | MIXERCONTROL_CT_UNITS_UNSIGNED) MIXERCONTROL_CONTROLTYPE_MILLITIME = (MIXERCONTROL_CT_CLASS_TIME | MIXERCONTROL_CT_SC_TIME_MILLISECS | MIXERCONTROL_CT_UNITS_UNSIGNED) ! MIXER_GETLINECONTROLSF_ALL = 0x00000000L ! MIXER_GETLINECONTROLSF_ONEBYID = 0x00000001L ! MIXER_GETLINECONTROLSF_ONEBYTYPE = 0x00000002L ! MIXER_GETLINECONTROLSF_QUERYMASK = 0x0000000FL ! MIXER_GETCONTROLDETAILSF_VALUE = 0x00000000L ! MIXER_GETCONTROLDETAILSF_LISTTEXT = 0x00000001L ! MIXER_GETCONTROLDETAILSF_QUERYMASK = 0x0000000FL ! MIXER_SETCONTROLDETAILSF_VALUE = 0x00000000L ! MIXER_SETCONTROLDETAILSF_CUSTOM = 0x00000001L ! MIXER_SETCONTROLDETAILSF_QUERYMASK = 0x0000000FL TIMERR_NOERROR = (0) TIMERR_NOCANDO = (TIMERR_BASE+1) --- 343,356 ---- MIXERCONTROL_CONTROLTYPE_MICROTIME = (MIXERCONTROL_CT_CLASS_TIME | MIXERCONTROL_CT_SC_TIME_MICROSECS | MIXERCONTROL_CT_UNITS_UNSIGNED) MIXERCONTROL_CONTROLTYPE_MILLITIME = (MIXERCONTROL_CT_CLASS_TIME | MIXERCONTROL_CT_SC_TIME_MILLISECS | MIXERCONTROL_CT_UNITS_UNSIGNED) ! MIXER_GETLINECONTROLSF_ALL = 0x00000000 ! MIXER_GETLINECONTROLSF_ONEBYID = 0x00000001 ! MIXER_GETLINECONTROLSF_ONEBYTYPE = 0x00000002 ! MIXER_GETLINECONTROLSF_QUERYMASK = 0x0000000F ! MIXER_GETCONTROLDETAILSF_VALUE = 0x00000000 ! MIXER_GETCONTROLDETAILSF_LISTTEXT = 0x00000001 ! MIXER_GETCONTROLDETAILSF_QUERYMASK = 0x0000000F ! MIXER_SETCONTROLDETAILSF_VALUE = 0x00000000 ! MIXER_SETCONTROLDETAILSF_CUSTOM = 0x00000001 ! MIXER_SETCONTROLDETAILSF_QUERYMASK = 0x0000000F TIMERR_NOERROR = (0) TIMERR_NOCANDO = (TIMERR_BASE+1) *************** *** 373,435 **** JOY_BUTTON3CHG = 0x0400 JOY_BUTTON4CHG = 0x0800 ! JOY_BUTTON5 = 0x00000010l ! JOY_BUTTON6 = 0x00000020l ! JOY_BUTTON7 = 0x00000040l ! JOY_BUTTON8 = 0x00000080l ! JOY_BUTTON9 = 0x00000100l ! JOY_BUTTON10 = 0x00000200l ! JOY_BUTTON11 = 0x00000400l ! JOY_BUTTON12 = 0x00000800l ! JOY_BUTTON13 = 0x00001000l ! JOY_BUTTON14 = 0x00002000l ! JOY_BUTTON15 = 0x00004000l ! JOY_BUTTON16 = 0x00008000l ! JOY_BUTTON17 = 0x00010000l ! JOY_BUTTON18 = 0x00020000l ! JOY_BUTTON19 = 0x00040000l ! JOY_BUTTON20 = 0x00080000l ! JOY_BUTTON21 = 0x00100000l ! JOY_BUTTON22 = 0x00200000l ! JOY_BUTTON23 = 0x00400000l ! JOY_BUTTON24 = 0x00800000l ! JOY_BUTTON25 = 0x01000000l ! JOY_BUTTON26 = 0x02000000l ! JOY_BUTTON27 = 0x04000000l ! JOY_BUTTON28 = 0x08000000l ! JOY_BUTTON29 = 0x10000000l ! JOY_BUTTON30 = 0x20000000l ! JOY_BUTTON31 = 0x40000000l ! JOY_BUTTON32 = 0x80000000l JOY_POVFORWARD = 0 JOY_POVRIGHT = 9000 JOY_POVBACKWARD = 18000 JOY_POVLEFT = 27000 ! JOY_RETURNX = 0x00000001l ! JOY_RETURNY = 0x00000002l ! JOY_RETURNZ = 0x00000004l ! JOY_RETURNR = 0x00000008l ! JOY_RETURNU = 0x00000010l ! JOY_RETURNV = 0x00000020l ! JOY_RETURNPOV = 0x00000040l ! JOY_RETURNBUTTONS = 0x00000080l ! JOY_RETURNRAWDATA = 0x00000100l ! JOY_RETURNPOVCTS = 0x00000200l ! JOY_RETURNCENTERED = 0x00000400l ! JOY_USEDEADZONE = 0x00000800l JOY_RETURNALL = (JOY_RETURNX | JOY_RETURNY | JOY_RETURNZ | \ JOY_RETURNR | JOY_RETURNU | JOY_RETURNV | \ JOY_RETURNPOV | JOY_RETURNBUTTONS) ! JOY_CAL_READALWAYS = 0x00010000l ! JOY_CAL_READXYONLY = 0x00020000l ! JOY_CAL_READ3 = 0x00040000l ! JOY_CAL_READ4 = 0x00080000l ! JOY_CAL_READXONLY = 0x00100000l ! JOY_CAL_READYONLY = 0x00200000l ! JOY_CAL_READ5 = 0x00400000l ! JOY_CAL_READ6 = 0x00800000l ! JOY_CAL_READZONLY = 0x01000000l ! JOY_CAL_READRONLY = 0x02000000l ! JOY_CAL_READUONLY = 0x04000000l ! JOY_CAL_READVONLY = 0x08000000l JOYSTICKID1 = 0 JOYSTICKID2 = 1 --- 373,435 ---- JOY_BUTTON3CHG = 0x0400 JOY_BUTTON4CHG = 0x0800 ! JOY_BUTTON5 = 0x00000010 ! JOY_BUTTON6 = 0x00000020 ! JOY_BUTTON7 = 0x00000040 ! JOY_BUTTON8 = 0x00000080 ! JOY_BUTTON9 = 0x00000100 ! JOY_BUTTON10 = 0x00000200 ! JOY_BUTTON11 = 0x00000400 ! JOY_BUTTON12 = 0x00000800 ! JOY_BUTTON13 = 0x00001000 ! JOY_BUTTON14 = 0x00002000 ! JOY_BUTTON15 = 0x00004000 ! JOY_BUTTON16 = 0x00008000 ! JOY_BUTTON17 = 0x00010000 ! JOY_BUTTON18 = 0x00020000 ! JOY_BUTTON19 = 0x00040000 ! JOY_BUTTON20 = 0x00080000 ! JOY_BUTTON21 = 0x00100000 ! JOY_BUTTON22 = 0x00200000 ! JOY_BUTTON23 = 0x00400000 ! JOY_BUTTON24 = 0x00800000 ! JOY_BUTTON25 = 0x01000000 ! JOY_BUTTON26 = 0x02000000 ! JOY_BUTTON27 = 0x04000000 ! JOY_BUTTON28 = 0x08000000 ! JOY_BUTTON29 = 0x10000000 ! JOY_BUTTON30 = 0x20000000 ! JOY_BUTTON31 = 0x40000000 ! JOY_BUTTON32 = 0x80000000 JOY_POVFORWARD = 0 JOY_POVRIGHT = 9000 JOY_POVBACKWARD = 18000 JOY_POVLEFT = 27000 ! JOY_RETURNX = 0x00000001 ! JOY_RETURNY = 0x00000002 ! JOY_RETURNZ = 0x00000004 ! JOY_RETURNR = 0x00000008 ! JOY_RETURNU = 0x00000010 ! JOY_RETURNV = 0x00000020 ! JOY_RETURNPOV = 0x00000040 ! JOY_RETURNBUTTONS = 0x00000080 ! JOY_RETURNRAWDATA = 0x00000100 ! JOY_RETURNPOVCTS = 0x00000200 ! JOY_RETURNCENTERED = 0x00000400 ! JOY_USEDEADZONE = 0x00000800 JOY_RETURNALL = (JOY_RETURNX | JOY_RETURNY | JOY_RETURNZ | \ JOY_RETURNR | JOY_RETURNU | JOY_RETURNV | \ JOY_RETURNPOV | JOY_RETURNBUTTONS) ! JOY_CAL_READALWAYS = 0x00010000 ! JOY_CAL_READXYONLY = 0x00020000 ! JOY_CAL_READ3 = 0x00040000 ! JOY_CAL_READ4 = 0x00080000 ! JOY_CAL_READXONLY = 0x00100000 ! JOY_CAL_READYONLY = 0x00200000 ! JOY_CAL_READ5 = 0x00400000 ! JOY_CAL_READ6 = 0x00800000 ! JOY_CAL_READZONLY = 0x01000000 ! JOY_CAL_READRONLY = 0x02000000 ! JOY_CAL_READUONLY = 0x04000000 ! JOY_CAL_READVONLY = 0x08000000 JOYSTICKID1 = 0 JOYSTICKID2 = 1 *************** *** 667,730 **** MCI_NOTIFY_ABORTED = 0x0004 MCI_NOTIFY_FAILURE = 0x0008 ! MCI_NOTIFY = 0x00000001L ! MCI_WAIT = 0x00000002L ! MCI_FROM = 0x00000004L ! MCI_TO = 0x00000008L ! MCI_TRACK = 0x00000010L ! MCI_OPEN_SHAREABLE = 0x00000100L ! MCI_OPEN_ELEMENT = 0x00000200L ! MCI_OPEN_ALIAS = 0x00000400L ! MCI_OPEN_ELEMENT_ID = 0x00000800L ! MCI_OPEN_TYPE_ID = 0x00001000L ! MCI_OPEN_TYPE = 0x00002000L ! MCI_SEEK_TO_START = 0x00000100L ! MCI_SEEK_TO_END = 0x00000200L ! MCI_STATUS_ITEM = 0x00000100L ! MCI_STATUS_START = 0x00000200L ! MCI_STATUS_LENGTH = 0x00000001L ! MCI_STATUS_POSITION = 0x00000002L ! MCI_STATUS_NUMBER_OF_TRACKS = 0x00000003L ! MCI_STATUS_MODE = 0x00000004L ! MCI_STATUS_MEDIA_PRESENT = 0x00000005L ! MCI_STATUS_TIME_FORMAT = 0x00000006L ! MCI_STATUS_READY = 0x00000007L ! MCI_STATUS_CURRENT_TRACK = 0x00000008L ! MCI_INFO_PRODUCT = 0x00000100L ! MCI_INFO_FILE = 0x00000200L ! MCI_INFO_MEDIA_UPC = 0x00000400L ! MCI_INFO_MEDIA_IDENTITY = 0x00000800L ! MCI_INFO_NAME = 0x00001000L ! MCI_INFO_COPYRIGHT = 0x00002000L ! MCI_GETDEVCAPS_ITEM = 0x00000100L ! MCI_GETDEVCAPS_CAN_RECORD = 0x00000001L ! MCI_GETDEVCAPS_HAS_AUDIO = 0x00000002L ! MCI_GETDEVCAPS_HAS_VIDEO = 0x00000003L ! MCI_GETDEVCAPS_DEVICE_TYPE = 0x00000004L ! MCI_GETDEVCAPS_USES_FILES = 0x00000005L ! MCI_GETDEVCAPS_COMPOUND_DEVICE = 0x00000006L ! MCI_GETDEVCAPS_CAN_EJECT = 0x00000007L ! MCI_GETDEVCAPS_CAN_PLAY = 0x00000008L ! MCI_GETDEVCAPS_CAN_SAVE = 0x00000009L ! MCI_SYSINFO_QUANTITY = 0x00000100L ! MCI_SYSINFO_OPEN = 0x00000200L ! MCI_SYSINFO_NAME = 0x00000400L ! MCI_SYSINFO_INSTALLNAME = 0x00000800L ! MCI_SET_DOOR_OPEN = 0x00000100L ! MCI_SET_DOOR_CLOSED = 0x00000200L ! MCI_SET_TIME_FORMAT = 0x00000400L ! MCI_SET_AUDIO = 0x00000800L ! MCI_SET_VIDEO = 0x00001000L ! MCI_SET_ON = 0x00002000L ! MCI_SET_OFF = 0x00004000L ! MCI_SET_AUDIO_ALL = 0x00000000L ! MCI_SET_AUDIO_LEFT = 0x00000001L ! MCI_SET_AUDIO_RIGHT = 0x00000002L ! MCI_BREAK_KEY = 0x00000100L ! MCI_BREAK_HWND = 0x00000200L ! MCI_BREAK_OFF = 0x00000400L ! MCI_RECORD_INSERT =... [truncated message content] |
