|
From: Mark H. <mha...@us...> - 2008-11-14 00:22:33
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv24802/win32/Lib Modified Files: mmsystem.py netbios.py ntsecuritycon.py pywintypes.py sspi.py sspicon.py win32pdhutil.py Log Message: Various modernizations to .py code via the py3k branch. Index: sspicon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/sspicon.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sspicon.py 12 Feb 2006 14:10:02 -0000 1.4 --- sspicon.py 14 Nov 2008 00:22:25 -0000 1.5 *************** *** 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: ntsecuritycon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/ntsecuritycon.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ntsecuritycon.py 20 Jan 2008 03:43:44 -0000 1.9 --- ntsecuritycon.py 14 Nov 2008 00:22:25 -0000 1.10 *************** *** 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: pywintypes.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/pywintypes.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pywintypes.py 11 Mar 2008 04:23:31 -0000 1.13 --- pywintypes.py 14 Nov 2008 00:22:25 -0000 1.14 *************** *** 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,102 **** 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, --- 95,99 ---- 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, Index: sspi.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/sspi.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** sspi.py 13 Feb 2006 14:47:20 -0000 1.3 --- sspi.py 14 Nov 2008 00:22:25 -0000 1.4 *************** *** 18,27 **** error = win32security.error - try: - True, False - except NameError: - False = 1==0 - True = not False - class _BaseAuth(object): def __init__(self): --- 18,21 ---- Index: netbios.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/netbios.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** netbios.py 22 Mar 2006 10:41:05 -0000 1.4 --- netbios.py 14 Nov 2008 00:22:25 -0000 1.5 *************** *** 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,270 **** 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() --- 265,269 ---- 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() *************** *** 272,276 **** 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 --- 271,275 ---- 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 Index: mmsystem.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/mmsystem.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mmsystem.py 10 Jan 2006 04:29:49 -0000 1.2 --- mmsystem.py 14 Nov 2008 00:22:25 -0000 1.3 *************** *** 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 = -1 # 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 = -2147483648 # 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 = -2147483648 # 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 = -2147483648 # 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 = -2147483648 # 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 = -2147483648 # 0x80000000 ! MIXERCONTROL_CT_CLASS_MASK = -268435456 # 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 = -2147483648 # 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 = 0x00000100L ! MCI_RECORD_OVERWRITE = 0x00000200L ! MCI_SAVE_FILE = 0x00000100L ! MCI_LOAD_FILE = 0x00000100L MCI_VD_MODE_PARK = (MCI_VD_OFFSET + 1) MCI_VD_MEDIA_CLV = (MCI_VD_OFFSET + 2) --- 667,730 ---- MCI_NOTIFY_ABORTED = 0x0004 MCI_NOTIFY_FAILURE = 0x0008 ! MCI_NOTIFY = 0x00000001 ! MCI_WAIT = 0x00000002 ! MCI_FROM = 0x00000004 ! MCI_TO = 0x00000008 ! MCI_TRACK = 0x00000010 ! MCI_OPEN_SHAREABLE = 0x00000100 ! MCI_OPEN_ELEMENT = 0x00000200 ! MCI_OPEN_ALIAS = 0x00000400 ! MCI_OPEN_ELEMENT_ID = 0x00000800 ! MCI_OPEN_TYPE_ID = 0x00001000 ! MCI_OPEN_TYPE = 0x00002000 ! MCI_SEEK_TO_START = 0x00000100 ! MCI_SEEK_TO_END = 0x00000200 ! MCI_STATUS_ITEM = 0x00000100 ! MCI_STATUS_START = 0x00000200 ! MCI_STATUS_LENGTH = 0x00000001 ! MCI_STATUS_POSITION = 0x00000002 ! MCI_STATUS_NUMBER_OF_TRACKS = 0x00000003 ! MCI_STATUS_MODE = 0x00000004 ! MCI_STATUS_MEDIA_PRESENT = 0x00000005 ! MCI_STATUS_TIME_FORMAT = 0x00000006 ! MCI_STATUS_READY = 0x00000007 ! MCI_STATUS_CURRENT_TRACK = 0x00000008 ! MCI_INFO_PRODUCT = 0x00000100 ! MCI_INFO_FILE = 0x00000200 ! MCI_INFO_MEDIA_UPC = 0x00000400 ! MCI_INFO_MEDIA_IDENTITY = 0x00000800 ! MCI_INFO_NAME = 0x00001000 ! MCI_INFO_COPYRIGHT = 0x00002000 ! MCI_GETDEVCAPS_ITEM = 0x00000100 ! MCI_GETDEVCAPS_CAN_RECORD = 0x00000001 ! MCI_GETDEVCAPS_HAS_AUDIO = 0x00000002 ! MCI_GETDEVCAPS_HAS_VIDEO = 0x00000003 ! MCI_GETDEVCAPS_DEVICE_TYPE = 0x00000004 ! MCI_GETDEVCAPS_USES_FILES = 0x00000005 ! MCI_GETDEVCAPS_COMPOUND_DEVICE = 0x00000006 ! MCI_GETDEVCAPS_CAN_EJECT = 0x00000007 ! MCI_GETDEVCAPS_CAN_PLAY = 0x00000008 ! MCI_GETDEVCAPS_CAN_SAVE = 0x00000009 ! MCI_SYSINFO_QUANTITY = 0x00000100 ! MCI_SYSINFO_OPEN = 0x00000200 ! MCI_SYSINFO_NAME = 0x00000400 ! MCI_SYSINFO_INSTALLNAME = 0x00000800 ! MCI_SET_DOOR_OPEN = 0x00000100 ! MCI_SET_DOOR_CLOSED = 0x00000200 ! MCI_SET_TIME_FORMAT = 0x00000400 ! MCI_SET_AUDIO = 0x00000800 ! MCI_SET_VIDEO = 0x00001000 ! MCI_SET_ON = 0x00002000 ! MCI_SET_OFF = 0x00004000 ! MCI_SET_AUDIO_ALL = 0x00000000 ! MCI_SET_AUDIO_LEFT = 0x00000001 ! MCI_SET_AUDIO_RIGHT = 0x00000002 ! MCI_BREAK_KEY = 0x00000100 ! MCI_BREAK_HWND = 0x00000200 ! MCI_BREAK_OFF = 0x00000400 ! MCI_RECORD_INSERT = 0x00000100 ! MCI_RECORD_OVERWRITE = 0x00000200 ! MCI_SAVE_FILE = 0x00000100 ! MCI_LOAD_FILE = 0x00000100 MCI_VD_MODE_PARK = (MCI_VD_OFFSET + 1) MCI_VD_MEDIA_CLV = (MCI_VD_OFFSET + 2) *************** *** 732,782 **** MCI_VD_MEDIA_OTHER = (MCI_VD_OFFSET + 4) MCI_VD_FORMAT_TRACK = 0x4001 ! MCI_VD_PLAY_REVERSE = 0x00010000L ! MCI_VD_PLAY_FAST = 0x00020000L ! MCI_VD_PLAY_SPEED = 0x00040000L ! MCI_VD_PLAY_SCAN = 0x00080000L ! MCI_VD_PLAY_SLOW = 0x00100000L ! MCI_VD_SEEK_REVERSE = 0x00010000L ! MCI_VD_STATUS_SPEED = 0x00004002L ! MCI_VD_STATUS_FORWARD = 0x00004003L ! MCI_VD_STATUS_MEDIA_TYPE = 0x00004004L ! MCI_VD_STATUS_SIDE = 0x00004005L ! MCI_VD_STATUS_DISC_SIZE = 0x00004006L ! MCI_VD_GETDEVCAPS_CLV = 0x00010000L ! MCI_VD_GETDEVCAPS_CAV = 0x00020000L ! MCI_VD_SPIN_UP = 0x00010000L ! MCI_VD_SPIN_DOWN = 0x00020000L ! MCI_VD_GETDEVCAPS_CAN_REVERSE = 0x00004002L ! MCI_VD_GETDEVCAPS_FAST_RATE = 0x00004003L ! MCI_VD_GETDEVCAPS_SLOW_RATE = 0x00004004L ! MCI_VD_GETDEVCAPS_NORMAL_RATE = 0x00004005L ! MCI_VD_STEP_FRAMES = 0x00010000L ! MCI_VD_STEP_REVERSE = 0x00020000L ! MCI_VD_ESCAPE_STRING = 0x00000100L ! MCI_CDA_STATUS_TYPE_TRACK = 0x00004001L MCI_CDA_TRACK_AUDIO = (MCI_CD_OFFSET + 0) MCI_CDA_TRACK_OTHER = (MCI_CD_OFFSET + 1) MCI_WAVE_PCM = (MCI_WAVE_OFFSET + 0) MCI_WAVE_MAPPER = (MCI_WAVE_OFFSET + 1) ! MCI_WAVE_OPEN_BUFFER = 0x00010000L ! MCI_WAVE_SET_FORMATTAG = 0x00010000L ! MCI_WAVE_SET_CHANNELS = 0x00020000L ! MCI_WAVE_SET_SAMPLESPERSEC = 0x00040000L ! MCI_WAVE_SET_AVGBYTESPERSEC = 0x00080000L ! MCI_WAVE_SET_BLOCKALIGN = 0x00100000L ! MCI_WAVE_SET_BITSPERSAMPLE = 0x00200000L ! MCI_WAVE_INPUT = 0x00400000L ! MCI_WAVE_OUTPUT = 0x00800000L ! MCI_WAVE_STATUS_FORMATTAG = 0x00004001L ! MCI_WAVE_STATUS_CHANNELS = 0x00004002L ! MCI_WAVE_STATUS_SAMPLESPERSEC = 0x00004003L ! MCI_WAVE_STATUS_AVGBYTESPERSEC = 0x00004004L ! MCI_WAVE_STATUS_BLOCKALIGN = 0x00004005L ! MCI_WAVE_STATUS_BITSPERSAMPLE = 0x00004006L ! MCI_WAVE_STATUS_LEVEL = 0x00004007L ! MCI_WAVE_SET_ANYINPUT = 0x04000000L ! MCI_WAVE_SET_ANYOUTPUT = 0x08000000L ! MCI_WAVE_GETDEVCAPS_INPUTS = 0x00004001L ! MCI_WAVE_GETDEVCAPS_OUTPUTS = 0x00004002L MCI_SEQ_DIV_PPQN = (0 + MCI_SEQ_OFFSET) MCI_SEQ_DIV_SMPTE_24 = (1 + MCI_SEQ_OFFSET) --- 732,782 ---- MCI_VD_MEDIA_OTHER = (MCI_VD_OFFSET + 4) MCI_VD_FORMAT_TRACK = 0x4001 ! MCI_VD_PLAY_REVERSE = 0x00010000 ! MCI_VD_PLAY_FAST = 0x00020000 ! MCI_VD_PLAY_SPEED = 0x00040000 ! MCI_VD_PLAY_SCAN = 0x00080000 ! MCI_VD_PLAY_SLOW = 0x00100000 ! MCI_VD_SEEK_REVERSE = 0x00010000 ! MCI_VD_STATUS_SPEED = 0x00004002 ! MCI_VD_STATUS_FORWARD = 0x00004003 ! MCI_VD_STATUS_MEDIA_TYPE = 0x00004004 ! MCI_VD_STATUS_SIDE = 0x00004005 ! MCI_VD_STATUS_DISC_SIZE = 0x00004006 ! MCI_VD_GETDEVCAPS_CLV = 0x00010000 ! MCI_VD_GETDEVCAPS_CAV = 0x00020000 ! MCI_VD_SPIN_UP = 0x00010000 ! MCI_VD_SPIN_DOWN = 0x00020000 ! MCI_VD_GETDEVCAPS_CAN_REVERSE = 0x00004002 ! MCI_VD_GETDEVCAPS_FAST_RATE = 0x00004003 ! MCI_VD_GETDEVCAPS_SLOW_RATE = 0x00004004 ! MCI_VD_GETDEVCAPS_NORMAL_RATE = 0x00004005 ! MCI_VD_STEP_FRAMES = 0x00010000 ! MCI_VD_STEP_REVERSE = 0x00020000 ! MCI_VD_ESCAPE_STRING = 0x00000100 ! MCI_CDA_STATUS_TYPE_TRACK = 0x00004001 MCI_CDA_TRACK_AUDIO = (MCI_CD_OFFSET + 0) MCI_CDA_TRACK_OTHER = (MCI_CD_OFFSET + 1) MCI_WAVE_PCM = (MCI_WAVE_OFFSET + 0) MCI_WAVE_MAPPER = (MCI_WAVE_OFFSET + 1) ! MCI_WAVE_OPEN_BUFFER = 0x00010000 ! MCI_WAVE_SET_FORMATTAG = 0x00010000 ! MCI_WAVE_SET_CHANNELS = 0x00020000 ! MCI_WAVE_SET_SAMPLESPERSEC = 0x00040000 ! MCI_WAVE_SET_AVGBYTESPERSEC = 0x00080000 ! MCI_WAVE_SET_BLOCKALIGN = 0x00100000 ! MCI_WAVE_SET_BITSPERSAMPLE = 0x00200000 ! MCI_WAVE_INPUT = 0x00400000 ! MCI_WAVE_OUTPUT = 0x00800000 ! MCI_WAVE_STATUS_FORMATTAG = 0x00004001 ! MCI_WAVE_STATUS_CHANNELS = 0x00004002 ! MCI_WAVE_STATUS_SAMPLESPERSEC = 0x00004003 ! MCI_WAVE_STATUS_AVGBYTESPERSEC = 0x00004004 ! MCI_WAVE_STATUS_BLOCKALIGN = 0x00004005 ! MCI_WAVE_STATUS_BITSPERSAMPLE = 0x00004006 ! MCI_WAVE_STATUS_LEVEL = 0x00004007 ! MCI_WAVE_SET_ANYINPUT = 0x04000000 ! MCI_WAVE_SET_ANYOUTPUT = 0x08000000 ! MCI_WAVE_GETDEVCAPS_INPUTS = 0x00004001 ! MCI_WAVE_GETDEVCAPS_OUTPUTS = 0x00004002 MCI_SEQ_DIV_PPQN = (0 + MCI_SEQ_OFFSET) MCI_SEQ_DIV_SMPTE_24 = (1 + MCI_SEQ_OFFSET) *************** *** 790,866 **** MCI_SEQ_NONE = 65533 MCI_SEQ_MAPPER = 65535 ! MCI_SEQ_STATUS_TEMPO = 0x00004002L ! MCI_SEQ_STATUS_PORT = 0x00004003L ! MCI_SEQ_STATUS_SLAVE = 0x00004007L ! MCI_SEQ_STATUS_MASTER = 0x00004008L ! MCI_SEQ_STATUS_OFFSET = 0x00004009L ! MCI_SEQ_STATUS_DIVTYPE = 0x0000400AL ! MCI_SEQ_STATUS_NAME = 0x0000400BL ! MCI_SEQ_STATUS_COPYRIGHT = 0x0000400CL ! MCI_SEQ_SET_TEMPO = 0x00010000L ! MCI_SEQ_SET_PORT = 0x00020000L ! MCI_SEQ_SET_SLAVE = 0x00040000L ! MCI_SEQ_SET_MASTER = 0x00080000L ! MCI_SEQ_SET_OFFSET = 0x01000000L ! MCI_ANIM_OPEN_WS = 0x00010000L ! MCI_ANIM_OPEN_PARENT = 0x00020000L ! MCI_ANIM_OPEN_NOSTATIC = 0x00040000L ! MCI_ANIM_PLAY_SPEED = 0x00010000L ! MCI_ANIM_PLAY_REVERSE = 0x00020000L ! MCI_ANIM_PLAY_FAST = 0x00040000L ! MCI_ANIM_PLAY_SLOW = 0x00080000L ! MCI_ANIM_PLAY_SCAN = 0x00100000L ! MCI_ANIM_STEP_REVERSE = 0x00010000L ! MCI_ANIM_STEP_FRAMES = 0x00020000L ! MCI_ANIM_STATUS_SPEED = 0x00004001L ! MCI_ANIM_STATUS_FORWARD = 0x00004002L ! MCI_ANIM_STATUS_HWND = 0x00004003L ! MCI_ANIM_STATUS_HPAL = 0x00004004L ! MCI_ANIM_STATUS_STRETCH = 0x00004005L ! MCI_ANIM_INFO_TEXT = 0x00010000L ! MCI_ANIM_GETDEVCAPS_CAN_REVERSE = 0x00004001L ! MCI_ANIM_GETDEVCAPS_FAST_RATE = 0x00004002L ! MCI_ANIM_GETDEVCAPS_SLOW_RATE = 0x00004003L ! MCI_ANIM_GETDEVCAPS_NORMAL_RATE = 0x00004004L ! MCI_ANIM_GETDEVCAPS_PALETTES = 0x00004006L ! MCI_ANIM_GETDEVCAPS_CAN_STRETCH = 0x00004007L ! MCI_ANIM_GETDEVCAPS_MAX_WINDOWS = 0x00004008L ! MCI_ANIM_REALIZE_NORM = 0x00010000L ! MCI_ANIM_REALIZE_BKGD = 0x00020000L ! MCI_ANIM_WINDOW_HWND = 0x00010000L ! MCI_ANIM_WINDOW_STATE = 0x00040000L ! MCI_ANIM_WINDOW_TEXT = 0x00080000L ! MCI_ANIM_WINDOW_ENABLE_STRETCH = 0x00100000L ! MCI_ANIM_WINDOW_DISABLE_STRETCH = 0x00200000L ! MCI_ANIM_WINDOW_DEFAULT = 0x00000000L ! MCI_ANIM_RECT = 0x00010000L ! MCI_ANIM_PUT_SOURCE = 0x00020000L ! MCI_ANIM_PUT_DESTINATION = 0x00040000L ! MCI_ANIM_WHERE_SOURCE = 0x00020000L ! MCI_ANIM_WHERE_DESTINATION = 0x00040000L ! MCI_ANIM_UPDATE_HDC = 0x00020000L ! MCI_OVLY_OPEN_WS = 0x00010000L ! MCI_OVLY_OPEN_PARENT = 0x00020000L ! MCI_OVLY_STATUS_HWND = 0x00004001L ! MCI_OVLY_STATUS_STRETCH = 0x00004002L ! MCI_OVLY_INFO_TEXT = 0x00010000L ! MCI_OVLY_GETDEVCAPS_CAN_STRETCH = 0x00004001L ! MCI_OVLY_GETDEVCAPS_CAN_FREEZE = 0x00004002L ! MCI_OVLY_GETDEVCAPS_MAX_WINDOWS = 0x00004003L ! MCI_OVLY_WINDOW_HWND = 0x00010000L ! MCI_OVLY_WINDOW_STATE = 0x00040000L ! MCI_OVLY_WINDOW_TEXT = 0x00080000L ! MCI_OVLY_WINDOW_ENABLE_STRETCH = 0x00100000L ! MCI_OVLY_WINDOW_DISABLE_STRETCH = 0x00200000L ! MCI_OVLY_WINDOW_DEFAULT = 0x00000000L ! MCI_OVLY_RECT = 0x00010000L ! MCI_OVLY_PUT_SOURCE = 0x00020000L ! MCI_OVLY_PUT_DESTINATION = 0x00040000L ! MCI_OVLY_PUT_FRAME = 0x00080000L ! MCI_OVLY_PUT_VIDEO = 0x00100000L ! MCI_OVLY_WHERE_SOURCE = 0x00020000L ! MCI_OVLY_WHERE_DESTINATION = 0x00040000L ! MCI_OVLY_WHERE_FRAME = 0x00080000L ! MCI_OVLY_WHERE_VIDEO = 0x00100000L SELECTDIB = 41 def DIBINDEX(n): return MAKELONG((n),0x10FF) --- 790,866 ---- MCI_SEQ_NONE = 65533 MCI_SEQ_MAPPER = 65535 ! MCI_SEQ_STATUS_TEMPO = 0x00004002 ! MCI_SEQ_STATUS_PORT = 0x00004003 ! MCI_SEQ_STATUS_SLAVE = 0x00004007 ! MCI_SEQ_STATUS_MASTER = 0x00004008 ! MCI_SEQ_STATUS_OFFSET = 0x00004009 ! MCI_SEQ_STATUS_DIVTYPE = 0x0000400A ! MCI_SEQ_STATUS_NAME = 0x0000400B ! MCI_SEQ_STATUS_COPYRIGHT = 0x0000400C ! MCI_SEQ_SET_TEMPO = 0x00010000 ! MCI_SEQ_SET_PORT = 0x00020000 ! MCI_SEQ_SET_SLAVE = 0x00040000 ! MCI_SEQ_SET_MASTER = 0x00080000 ! MCI_SEQ_SET_OFFSET = 0x01000000 ! MCI_ANIM_OPEN_WS = 0x00010000 ! MCI_ANIM_OPEN_PARENT = 0x00020000 ! MCI_ANIM_OPEN_NOSTATIC = 0x00040000 ! MCI_ANIM_PLAY_SPEED = 0x00010000 ! MCI_ANIM_PLAY_REVERSE = 0x00020000 ! MCI_ANIM_PLAY_FAST = 0x00040000 ! MCI_ANIM_PLAY_SLOW = 0x00080000 ! MCI_ANIM_PLAY_SCAN = 0x00100000 ! MCI_ANIM_STEP_REVERSE = 0x00010000 ! MCI_ANIM_STEP_FRAMES = 0x00020000 ! MCI_ANIM_STATUS_SPEED = 0x00004001 ! MCI_ANIM_STATUS_FORWARD = 0x00004002 ! MCI_ANIM_STATUS_HWND = 0x00004003 ! MCI_ANIM_STATUS_HPAL = 0x00004004 ! MCI_ANIM_STATUS_STRETCH = 0x00004005 ! MCI_ANIM_INFO_TEXT = 0x00010000 ! MCI_ANIM_GETDEVCAPS_CAN_REVERSE = 0x00004001 ! MCI_ANIM_GETDEVCAPS_FAST_RATE = 0x00004002 ! MCI_ANIM_GETDEVCAPS_SLOW_RATE = 0x00004003 ! MCI_ANIM_GETDEVCAPS_NORMAL_RATE = 0x00004004 ! MCI_ANIM_GETDEVCAPS_PALETTES = 0x00004006 ! MCI_ANIM_GETDEVCAPS_CAN_STRETCH = 0x00004007 ! MCI_ANIM_GETDEVCAPS_MAX_WINDOWS = 0x00004008 ! MCI_ANIM_REALIZE_NORM = 0x00010000 ! MCI_ANIM_REALIZE_BKGD = 0x00020000 ! MCI_ANIM_WINDOW_HWND = 0x00010000 ! MCI_ANIM_WINDOW_STATE = 0x00040000 ! MCI_ANIM_WINDOW_TEXT = 0x00080000 ! MCI_ANIM_WINDOW_ENABLE_STRETCH = 0x00100000 ! MCI_ANIM_WINDOW_DISABLE_STRETCH = 0x00200000 ! MCI_ANIM_WINDOW_DEFAULT = 0x00000000 ! MCI_ANIM_RECT = 0x00010000 ! MCI_ANIM_PUT_SOURCE = 0x00020000 ! MCI_ANIM_PUT_DESTINATION = 0x00040000 ! MCI_ANIM_WHERE_SOURCE = 0x00020000 ! MCI_ANIM_WHERE_DESTINATION = 0x00040000 ! MCI_ANIM_UPDATE_HDC = 0x00020000 ! MCI_OVLY_OPEN_WS = 0x00010000 ! MCI_OVLY_OPEN_PARENT = 0x00020000 ! MCI_OVLY_STATUS_HWND = 0x00004001 ! MCI_OVLY_STATUS_STRETCH = 0x00004002 ! MCI_OVLY_INFO_TEXT = 0x00010000 ! MCI_OVLY_GETDEVCAPS_CAN_STRETCH = 0x00004001 ! MCI_OVLY_GETDEVCAPS_CAN_FREEZE = 0x00004002 ! MCI_OVLY_GETDEVCAPS_MAX_WINDOWS = 0x00004003 ! MCI_OVLY_WINDOW_HWND = 0x00010000 ! MCI_OVLY_WINDOW_STATE = 0x00040000 ! MCI_OVLY_WINDOW_TEXT = 0x00080000 ! MCI_OVLY_WINDOW_ENABLE_STRETCH = 0x00100000 ! MCI_OVLY_WINDOW_DISABLE_STRETCH = 0x00200000 ! MCI_OVLY_WINDOW_DEFAULT = 0x00000000 ! MCI_OVLY_RECT = 0x00010000 ! MCI_OVLY_PUT_SOURCE = 0x00020000 ! MCI_OVLY_PUT_DESTINATION = 0x00040000 ! MCI_OVLY_PUT_FRAME = 0x00080000 ! MCI_OVLY_PUT_VIDEO = 0x00100000 ! MCI_OVLY_WHERE_SOURCE = 0x00020000 ! MCI_OVLY_WHERE_DESTINATION = 0x00040000 ! MCI_OVLY_WHERE_FRAME = 0x00080000 ! MCI_OVLY_WHERE_VIDEO = 0x00100000 SELECTDIB = 41 def DIBINDEX(n): return MAKELONG((n),0x10FF) Index: win32pdhutil.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32pdhutil.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** win32pdhutil.py 16 Jul 2006 09:38:57 -0000 1.12 --- win32pdhutil.py 14 Nov 2008 00:22:25 -0000 1.13 *************** *** 19,23 **** """ ! import win32pdh, string, time error = win32pdh.error --- 19,23 ---- """ ! import win32pdh, time error = win32pdh.error *************** *** 34,38 **** "Counter 009") counter_list = counter_reg_value[0] ! for i in range(0, len(counter_list) - 1, 2): try: counter_id = int(counter_list[i]) --- 34,38 ---- "Counter 009") counter_list = counter_reg_value[0] ! for i in xrange(0, len(counter_list) - 1, 2): try: counter_id = int(counter_list[i]) *************** *** 79,83 **** if bRefresh: # PDH docs say this is how you do a refresh. win32pdh.EnumObjects(None, machine, 0, 1) ! instanceName = string.lower(instanceName) items, instances = win32pdh.EnumObjectItems(None,None,object, -1) # Track multiple instances. --- 79,83 ---- if bRefresh: # PDH docs say this is how you do a refresh. win32pdh.EnumObjects(None, machine, 0, 1) ! instanceName = instanceName.lower() items, instances = win32pdh.EnumObjectItems(None,None,object, -1) # Track multiple instances. *************** *** 90,96 **** ret = [] ! for instance, max_instances in instance_dict.items(): for inum in xrange(max_instances+1): ! if string.lower(instance) == instanceName: ret.append(GetPerformanceAttributes(object, counter, instance, inum, format, --- 90,96 ---- ret = [] ! for instance, max_instances in instance_dict.iteritems(): for inum in xrange(max_instances+1): ! if instance.lower() == instanceName: ret.append(GetPerformanceAttributes(object, counter, instance, inum, format, *************** *** 112,117 **** # Bit of a hack to get useful info. items = [find_pdh_counter_localized_name("ID Process")] + items[:5] ! print "Process Name", string.join(items,",") ! for instance, max_instances in instance_dict.items(): for inum in xrange(max_instances+1): hq = win32pdh.OpenQuery() --- 112,117 ---- # Bit of a hack to get useful info. items = [find_pdh_counter_localized_name("ID Process")] + items[:5] ! print "Process Name", ",".join(items) ! for instance, max_instances in instance_dict.iteritems(): for inum in xrange(max_instances+1): hq = win32pdh.OpenQuery() *************** *** 134,137 **** --- 134,139 ---- win32pdh.CloseQuery(hq) + # NOTE: This BrowseCallback doesn't seem to work on Vista for markh. + # XXX - look at why!? def BrowseCallBackDemo(counter): machine, object, instance, parentInstance, index, counterName = \ |
