|
From: <mha...@us...> - 2003-07-02 03:39:16
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv18222 Modified Files: commctrl.py ntsecuritycon.py win32con.py winerror.py winnt.py Log Message: Hex constants -> decimal, to prevent new warnings and be ready to support the new world order. Index: commctrl.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/commctrl.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** commctrl.py 2 Sep 1999 00:19:28 -0000 1.1 --- commctrl.py 2 Jul 2003 03:39:12 -0000 1.2 *************** *** 1,23 **** # Generated by h2py from COMMCTRL.H ! WM_USER = 0x0400 ! ICC_LISTVIEW_CLASSES = 0x00000001 # listview, header ! ICC_TREEVIEW_CLASSES = 0x00000002 # treeview, tooltips ! ICC_BAR_CLASSES = 0x00000004 # toolbar, statusbar, trackbar, tooltips ! ICC_TAB_CLASSES = 0x00000008 # tab, tooltips ! ICC_UPDOWN_CLASS = 0x00000010 # updown ! ICC_PROGRESS_CLASS = 0x00000020 # progress ! ICC_HOTKEY_CLASS = 0x00000040 # hotkey ! ICC_ANIMATE_CLASS = 0x00000080 # animate [...1573 lines suppressed...] ! HOVER_DEFAULT = 0xFFFFFFFF WSB_PROP_CYVSCROLL = 0x00000001L WSB_PROP_CXHSCROLL = 0x00000002L --- 1501,1516 ---- WC_NATIVEFONTCTLA = "NativeFontCtl" WC_NATIVEFONTCTL = WC_NATIVEFONTCTLA ! NFS_EDIT = 1 ! NFS_STATIC = 2 ! NFS_LISTCOMBO = 4 ! NFS_BUTTON = 8 ! NFS_ALL = 16 ! WM_MOUSEHOVER = 673 ! WM_MOUSELEAVE = 675 ! TME_HOVER = 1 ! TME_LEAVE = 2 ! TME_QUERY = 1073741824 ! TME_CANCEL = -2147483648 ! HOVER_DEFAULT = -1 WSB_PROP_CYVSCROLL = 0x00000001L WSB_PROP_CXHSCROLL = 0x00000002L Index: ntsecuritycon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/ntsecuritycon.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ntsecuritycon.py 9 Jul 2001 04:08:41 -0000 1.2 --- ntsecuritycon.py 2 Jul 2003 03:39:12 -0000 1.3 *************** *** 1,38 **** # Hacked from winnt.h ! DELETE = (0x00010000) ! READ_CONTROL = (0x00020000) ! WRITE_DAC = (0x00040000) ! WRITE_OWNER = (0x00080000) ! SYNCHRONIZE = (0x00100000) ! STANDARD_RIGHTS_REQUIRED = (0x000F0000) STANDARD_RIGHTS_READ = (READ_CONTROL) STANDARD_RIGHTS_WRITE = (READ_CONTROL) STANDARD_RIGHTS_EXECUTE = (READ_CONTROL) ! STANDARD_RIGHTS_ALL = (0x001F0000) ! SPECIFIC_RIGHTS_ALL = (0x0000FFFF) ! ACCESS_SYSTEM_SECURITY = (0x01000000) ! MAXIMUM_ALLOWED = (0x02000000) ! GENERIC_READ = (0x80000000) ! GENERIC_WRITE = (0x40000000) ! GENERIC_EXECUTE = (0x20000000) ! GENERIC_ALL = (0x10000000) # file security permissions ! FILE_READ_DATA= ( 0x0001 ) ! FILE_LIST_DIRECTORY= ( 0x0001 ) ! FILE_WRITE_DATA= ( 0x0002 ) ! FILE_ADD_FILE= ( 0x0002 ) ! FILE_APPEND_DATA= ( 0x0004 ) ! FILE_ADD_SUBDIRECTORY= ( 0x0004 ) ! FILE_CREATE_PIPE_INSTANCE= ( 0x0004 ) ! FILE_READ_EA= ( 0x0008 ) ! FILE_WRITE_EA= ( 0x0010 ) ! FILE_EXECUTE= ( 0x0020 ) ! FILE_TRAVERSE= ( 0x0020 ) ! FILE_DELETE_CHILD= ( 0x0040 ) ! FILE_READ_ATTRIBUTES= ( 0x0080 ) ! FILE_WRITE_ATTRIBUTES= ( 0x0100 ) ! FILE_ALL_ACCESS= (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3FF) FILE_GENERIC_READ= (STANDARD_RIGHTS_READ | FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE) FILE_GENERIC_WRITE= (STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE) --- 1,38 ---- # Hacked from winnt.h ! DELETE = (65536) ! READ_CONTROL = (131072) ! WRITE_DAC = (262144) ! WRITE_OWNER = (524288) ! SYNCHRONIZE = (1048576) ! STANDARD_RIGHTS_REQUIRED = (983040) STANDARD_RIGHTS_READ = (READ_CONTROL) STANDARD_RIGHTS_WRITE = (READ_CONTROL) STANDARD_RIGHTS_EXECUTE = (READ_CONTROL) ! STANDARD_RIGHTS_ALL = (2031616) ! SPECIFIC_RIGHTS_ALL = (65535) ! ACCESS_SYSTEM_SECURITY = (16777216) ! MAXIMUM_ALLOWED = (33554432) ! GENERIC_READ = (-2147483648) ! GENERIC_WRITE = (1073741824) ! GENERIC_EXECUTE = (536870912) ! GENERIC_ALL = (268435456) # file security permissions ! FILE_READ_DATA= ( 1 ) ! FILE_LIST_DIRECTORY= ( 1 ) ! FILE_WRITE_DATA= ( 2 ) ! FILE_ADD_FILE= ( 2 ) ! FILE_APPEND_DATA= ( 4 ) ! FILE_ADD_SUBDIRECTORY= ( 4 ) ! FILE_CREATE_PIPE_INSTANCE= ( 4 ) ! FILE_READ_EA= ( 8 ) ! FILE_WRITE_EA= ( 16 ) ! FILE_EXECUTE= ( 32 ) ! FILE_TRAVERSE= ( 32 ) ! FILE_DELETE_CHILD= ( 64 ) ! FILE_READ_ATTRIBUTES= ( 128 ) ! FILE_WRITE_ATTRIBUTES= ( 256 ) ! FILE_ALL_ACCESS= (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 1023) FILE_GENERIC_READ= (STANDARD_RIGHTS_READ | FILE_READ_DATA | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE) FILE_GENERIC_WRITE= (STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE) *************** *** 46,58 **** SECURITY_NON_UNIQUE_AUTHORITY = (0,0,0,0,0,4) ! SECURITY_NULL_RID = 0x00000000 ! SECURITY_WORLD_RID = 0x00000000 SECURITY_LOCAL_RID = 0X00000000 ! SECURITY_CREATOR_OWNER_RID = 0x00000000 ! SECURITY_CREATOR_GROUP_RID = 0x00000001 ! SECURITY_CREATOR_OWNER_SERVER_RID = 0x00000002 ! SECURITY_CREATOR_GROUP_SERVER_RID = 0x00000003 --- 46,58 ---- SECURITY_NON_UNIQUE_AUTHORITY = (0,0,0,0,0,4) ! SECURITY_NULL_RID = 0 ! SECURITY_WORLD_RID = 0 SECURITY_LOCAL_RID = 0X00000000 ! SECURITY_CREATOR_OWNER_RID = 0 ! SECURITY_CREATOR_GROUP_RID = 1 ! SECURITY_CREATOR_OWNER_SERVER_RID = 2 ! SECURITY_CREATOR_GROUP_SERVER_RID = 3 *************** *** 60,84 **** SECURITY_NT_AUTHORITY = (0,0,0,0,0,5) ! SECURITY_DIALUP_RID = 0x00000001 ! SECURITY_NETWORK_RID = 0x00000002 ! SECURITY_BATCH_RID = 0x00000003 ! SECURITY_INTERACTIVE_RID = 0x00000004 ! SECURITY_SERVICE_RID = 0x00000006 ! SECURITY_ANONYMOUS_LOGON_RID = 0x00000007 ! SECURITY_PROXY_RID = 0x00000008 ! SECURITY_SERVER_LOGON_RID = 0x00000009 ! SECURITY_LOGON_IDS_RID = 0x00000005 SECURITY_LOGON_IDS_RID_COUNT = 3 ! SECURITY_LOCAL_SYSTEM_RID = 0x00000012 ! SECURITY_NT_NON_UNIQUE = 0x00000015 ! SECURITY_BUILTIN_DOMAIN_RID = 0x00000020 # well-known domain relative sub-authority values (RIDs)... ! DOMAIN_USER_RID_ADMIN = 0x000001F4 ! DOMAIN_USER_RID_GUEST = 0x000001F5 --- 60,84 ---- SECURITY_NT_AUTHORITY = (0,0,0,0,0,5) ! SECURITY_DIALUP_RID = 1 ! SECURITY_NETWORK_RID = 2 ! SECURITY_BATCH_RID = 3 ! SECURITY_INTERACTIVE_RID = 4 ! SECURITY_SERVICE_RID = 6 ! SECURITY_ANONYMOUS_LOGON_RID = 7 ! SECURITY_PROXY_RID = 8 ! SECURITY_SERVER_LOGON_RID = 9 ! SECURITY_LOGON_IDS_RID = 5 SECURITY_LOGON_IDS_RID_COUNT = 3 ! SECURITY_LOCAL_SYSTEM_RID = 18 ! SECURITY_NT_NON_UNIQUE = 21 ! SECURITY_BUILTIN_DOMAIN_RID = 32 # well-known domain relative sub-authority values (RIDs)... ! DOMAIN_USER_RID_ADMIN = 500 ! DOMAIN_USER_RID_GUEST = 501 *************** *** 86,92 **** # well-known groups ... ! DOMAIN_GROUP_RID_ADMINS = 0x00000200 ! DOMAIN_GROUP_RID_USERS = 0x00000201 ! DOMAIN_GROUP_RID_GUESTS = 0x00000202 --- 86,92 ---- # well-known groups ... ! DOMAIN_GROUP_RID_ADMINS = 512 ! DOMAIN_GROUP_RID_USERS = 513 ! DOMAIN_GROUP_RID_GUESTS = 514 *************** *** 95,119 **** # well-known aliases ... ! DOMAIN_ALIAS_RID_ADMINS = 0x00000220 ! DOMAIN_ALIAS_RID_USERS = 0x00000221 ! DOMAIN_ALIAS_RID_GUESTS = 0x00000222 ! DOMAIN_ALIAS_RID_POWER_USERS = 0x00000223 ! DOMAIN_ALIAS_RID_ACCOUNT_OPS = 0x00000224 ! DOMAIN_ALIAS_RID_SYSTEM_OPS = 0x00000225 ! DOMAIN_ALIAS_RID_PRINT_OPS = 0x00000226 ! DOMAIN_ALIAS_RID_BACKUP_OPS = 0x00000227 ! DOMAIN_ALIAS_RID_REPLICATOR = 0x00000228 ! SYSTEM_LUID = (0x3E7, 0x0) # Group attributes ! SE_GROUP_MANDATORY = 0x00000001 ! SE_GROUP_ENABLED_BY_DEFAULT = 0x00000002 ! SE_GROUP_ENABLED = 0x00000004 ! SE_GROUP_OWNER = 0x00000008 ! SE_GROUP_LOGON_ID = 0xC0000000 --- 95,119 ---- # well-known aliases ... ! DOMAIN_ALIAS_RID_ADMINS = 544 ! DOMAIN_ALIAS_RID_USERS = 545 ! DOMAIN_ALIAS_RID_GUESTS = 546 ! DOMAIN_ALIAS_RID_POWER_USERS = 547 ! DOMAIN_ALIAS_RID_ACCOUNT_OPS = 548 ! DOMAIN_ALIAS_RID_SYSTEM_OPS = 549 ! DOMAIN_ALIAS_RID_PRINT_OPS = 550 ! DOMAIN_ALIAS_RID_BACKUP_OPS = 551 ! DOMAIN_ALIAS_RID_REPLICATOR = 552 ! SYSTEM_LUID = (999, 0) # Group attributes ! SE_GROUP_MANDATORY = 1 ! SE_GROUP_ENABLED_BY_DEFAULT = 2 ! SE_GROUP_ENABLED = 4 ! SE_GROUP_OWNER = 8 ! SE_GROUP_LOGON_ID = -1073741824 *************** *** 121,128 **** # (None yet defined.) ! ACCESS_ALLOWED_ACE_TYPE = 0x0 ! ACCESS_DENIED_ACE_TYPE = 0x1 ! SYSTEM_AUDIT_ACE_TYPE = 0x2 ! SYSTEM_ALARM_ACE_TYPE = 0x3 --- 121,128 ---- # (None yet defined.) ! ACCESS_ALLOWED_ACE_TYPE = 0 ! ACCESS_DENIED_ACE_TYPE = 1 ! SYSTEM_AUDIT_ACE_TYPE = 2 ! SYSTEM_ALARM_ACE_TYPE = 3 *************** *** 130,155 **** # of an Ace header. ! OBJECT_INHERIT_ACE = 0x1 ! CONTAINER_INHERIT_ACE = 0x2 ! NO_PROPAGATE_INHERIT_ACE = 0x4 ! INHERIT_ONLY_ACE = 0x8 ! VALID_INHERIT_FLAGS = 0xF ! SUCCESSFUL_ACCESS_ACE_FLAG = 0x40 ! FAILED_ACCESS_ACE_FLAG = 0x80 ! SE_OWNER_DEFAULTED = 0x0001 ! SE_GROUP_DEFAULTED = 0x0002 ! SE_DACL_PRESENT = 0x0004 ! SE_DACL_DEFAULTED = 0x0008 ! SE_SACL_PRESENT = 0x0010 ! SE_SACL_DEFAULTED = 0x0020 ! SE_SELF_RELATIVE = 0x8000 ! SE_PRIVILEGE_ENABLED_BY_DEFAULT = 0x00000001 ! SE_PRIVILEGE_ENABLED = 0x00000002 ! SE_PRIVILEGE_USED_FOR_ACCESS = 0x80000000 PRIVILEGE_SET_ALL_NECESSARY = 1 --- 130,155 ---- # of an Ace header. ! OBJECT_INHERIT_ACE = 1 ! CONTAINER_INHERIT_ACE = 2 ! NO_PROPAGATE_INHERIT_ACE = 4 ! INHERIT_ONLY_ACE = 8 ! VALID_INHERIT_FLAGS = 15 ! SUCCESSFUL_ACCESS_ACE_FLAG = 64 ! FAILED_ACCESS_ACE_FLAG = 128 ! SE_OWNER_DEFAULTED = 1 ! SE_GROUP_DEFAULTED = 2 ! SE_DACL_PRESENT = 4 ! SE_DACL_DEFAULTED = 8 ! SE_SACL_PRESENT = 16 ! SE_SACL_DEFAULTED = 32 ! SE_SELF_RELATIVE = 32768 ! SE_PRIVILEGE_ENABLED_BY_DEFAULT = 1 ! SE_PRIVILEGE_ENABLED = 2 ! SE_PRIVILEGE_USED_FOR_ACCESS = -2147483648 PRIVILEGE_SET_ALL_NECESSARY = 1 *************** *** 193,204 **** DEFAULT_IMPERSONATION_LEVEL = SecurityImpersonation ! TOKEN_ASSIGN_PRIMARY = 0x0001 ! TOKEN_DUPLICATE = 0x0002 ! TOKEN_IMPERSONATE = 0x0004 ! TOKEN_QUERY = 0x0008 ! TOKEN_QUERY_SOURCE = 0x0010 ! TOKEN_ADJUST_PRIVILEGES = 0x0020 ! TOKEN_ADJUST_GROUPS = 0x0040 ! TOKEN_ADJUST_DEFAULT = 0x0080 TOKEN_ALL_ACCESS = (STANDARD_RIGHTS_REQUIRED |\ --- 193,204 ---- DEFAULT_IMPERSONATION_LEVEL = SecurityImpersonation ! TOKEN_ASSIGN_PRIMARY = 1 ! TOKEN_DUPLICATE = 2 ! TOKEN_IMPERSONATE = 4 ! TOKEN_QUERY = 8 ! TOKEN_QUERY_SOURCE = 16 ! TOKEN_ADJUST_PRIVILEGES = 32 ! TOKEN_ADJUST_GROUPS = 64 ! TOKEN_ADJUST_DEFAULT = 128 TOKEN_ALL_ACCESS = (STANDARD_RIGHTS_REQUIRED |\ Index: win32con.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32con.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** win32con.py 7 Jun 2003 02:04:28 -0000 1.3 --- win32con.py 2 Jul 2003 03:39:12 -0000 1.4 *************** *** 1,30 **** # Generated by h2py from commdlg.h (plus modifications 4jan98) ! WINVER = 0x0500 ! WM_USER = 0x0400 ! PY_0U = 0x4f0000 ! OFN_READONLY = 0x00000001 ! OFN_OVERWRITEPROMPT = 0x00000002 ! OFN_HIDEREADONLY = 0x00000004 ! OFN_NOCHANGEDIR = 0x00000008 ! OFN_SHOWHELP = 0x00000010 ! OFN_ENABLEHOOK = 0x00000020 [...5911 lines suppressed...] ! FROM_LEFT_1ST_BUTTON_PRESSED = 1 ! RIGHTMOST_BUTTON_PRESSED = 2 ! FROM_LEFT_2ND_BUTTON_PRESSED = 4 ! FROM_LEFT_3RD_BUTTON_PRESSED = 8 ! FROM_LEFT_4TH_BUTTON_PRESSED = 16 CTRL_C_EVENT = 0 *************** *** 4480,4484 **** CTRL_SHUTDOWN_EVENT = 6 ! MOUSE_MOVED = 0x0001 ! DOUBLE_CLICK = 0x0002 ! MOUSE_WHEELED = 0x0004 --- 4480,4484 ---- CTRL_SHUTDOWN_EVENT = 6 ! MOUSE_MOVED = 1 ! DOUBLE_CLICK = 2 ! MOUSE_WHEELED = 4 Index: winerror.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/winerror.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** winerror.py 2 Sep 1999 00:19:29 -0000 1.1 --- winerror.py 2 Jul 2003 03:39:12 -0000 1.2 *************** *** 4,11 **** """ # Few extras added manually... ! TRUST_E_PROVIDER_UNKNOWN = 0x800B0001 ! TRUST_E_ACTION_UNKNOWN = 0x800B0002 ! TRUST_E_SUBJECT_FORM_UNKNOWN = 0x800B0003 ! TRUST_E_SUBJECT_NOT_TRUSTED = 0x800B0004 # up to here... --- 4,11 ---- """ [...1253 lines suppressed...] ! SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE = -2146500070 ! SPAPI_E_DEVICE_INTERFACE_ACTIVE = -2146500069 ! SPAPI_E_DEVICE_INTERFACE_REMOVED = -2146500068 ! SPAPI_E_BAD_INTERFACE_INSTALLSECT = -2146500067 ! SPAPI_E_NO_SUCH_INTERFACE_CLASS = -2146500066 ! SPAPI_E_INVALID_REFERENCE_STRING = -2146500065 ! SPAPI_E_INVALID_MACHINENAME = -2146500064 ! SPAPI_E_REMOTE_COMM_FAILURE = -2146500063 ! SPAPI_E_MACHINE_UNAVAILABLE = -2146500062 ! SPAPI_E_NO_CONFIGMGR_SERVICES = -2146500061 ! SPAPI_E_INVALID_PROPPAGE_PROVIDER = -2146500060 ! SPAPI_E_NO_SUCH_DEVICE_INTERFACE = -2146500059 ! SPAPI_E_DI_POSTPROCESSING_REQUIRED = -2146500058 ! SPAPI_E_INVALID_COINSTALLER = -2146500057 ! SPAPI_E_NO_COMPAT_DRIVERS = -2146500056 ! SPAPI_E_NO_DEVICE_ICON = -2146500055 ! SPAPI_E_INVALID_INF_LOGCONFIG = -2146500054 ! SPAPI_E_DI_DONT_INSTALL = -2146500053 ! SPAPI_E_INVALID_FILTER_DRIVER = -2146500052 ! SPAPI_E_ERROR_NOT_INSTALLED = -2146496512 Index: winnt.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/winnt.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** winnt.py 2 Sep 1999 00:19:29 -0000 1.1 --- winnt.py 2 Jul 2003 03:39:12 -0000 1.2 *************** *** 1,167 **** # Generated by h2py from \mssdk\include\winnt.h ! APPLICATION_ERROR_MASK = 0x20000000 ! ERROR_SEVERITY_SUCCESS = 0x00000000 ! ERROR_SEVERITY_INFORMATIONAL = 0x40000000 ! ERROR_SEVERITY_WARNING = 0x80000000 ! ERROR_SEVERITY_ERROR = 0xC0000000 ! MINCHAR = 0x80 ! MAXCHAR = 0x7f ! MINSHORT = 0x8000 [...1744 lines suppressed...] ! TAPE_DRIVE_LOGICAL_BLK = -2147467264 ! TAPE_DRIVE_LOG_BLK_IMMED = -2147450880 ! TAPE_DRIVE_END_OF_DATA = -2147418112 ! TAPE_DRIVE_RELATIVE_BLKS = -2147352576 ! TAPE_DRIVE_FILEMARKS = -2147221504 ! TAPE_DRIVE_SEQUENTIAL_FMKS = -2146959360 ! TAPE_DRIVE_SETMARKS = -2146435072 ! TAPE_DRIVE_SEQUENTIAL_SMKS = -2145386496 ! TAPE_DRIVE_REVERSE_POSITION = -2143289344 ! TAPE_DRIVE_SPACE_IMMEDIATE = -2139095040 ! TAPE_DRIVE_WRITE_SETMARKS = -2130706432 ! TAPE_DRIVE_WRITE_FILEMARKS = -2113929216 ! TAPE_DRIVE_WRITE_SHORT_FMKS = -2080374784 ! TAPE_DRIVE_WRITE_LONG_FMKS = -2013265920 ! TAPE_DRIVE_WRITE_MARK_IMMED = -1879048192 ! TAPE_DRIVE_FORMAT = -1610612736 ! TAPE_DRIVE_FORMAT_IMMEDIATE = -1073741824 ! TAPE_DRIVE_HIGH_FEATURES = -2147483648 TAPE_FIXED_PARTITIONS = 0 TAPE_SELECT_PARTITIONS = 1 |
