[pywin32-checkins] pywin32/com/win32comext/shell shellcon.py,1.6,1.7

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

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

Modified Files:
	shellcon.py 
Log Message:
Avoid longs and hex constants.


Index: shellcon.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/shellcon.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shellcon.py	6 Nov 2003 06:14:12 -0000	1.6
--- shellcon.py	24 Nov 2003 09:26:38 -0000	1.7
***************
*** 294,320 ****
  SFGAO_CANMOVE = DROPEFFECT_MOVE
  SFGAO_CANLINK = DROPEFFECT_LINK
! SFGAO_CANRENAME = 0x00000010L
! SFGAO_CANDELETE = 0x00000020L
! SFGAO_HASPROPSHEET = 0x00000040L
! SFGAO_DROPTARGET = 0x00000100L
! SFGAO_CAPABILITYMASK = 0x00000177L
! SFGAO_LINK = 0x00010000L
! SFGAO_SHARE = 0x00020000L
! SFGAO_READONLY = 0x00040000L
! SFGAO_GHOSTED = 0x00080000L
! SFGAO_HIDDEN = 0x00080000L
! SFGAO_DISPLAYATTRMASK = 0x000F0000L
! SFGAO_FILESYSANCESTOR = 0x10000000L
! SFGAO_FOLDER = 0x20000000L
! SFGAO_FILESYSTEM = 0x40000000L
  SFGAO_HASSUBFOLDER = (-2147483648)
  SFGAO_CONTENTSMASK = (-2147483648)
! SFGAO_VALIDATE = 0x01000000L
! SFGAO_REMOVABLE = 0x02000000L
! SFGAO_COMPRESSED = 0x04000000L
! SFGAO_BROWSABLE = 0x08000000L
! SFGAO_NONENUMERATED = 0x00100000L
! SFGAO_NEWCONTENT = 0x00200000L
! SFGAO_STORAGE = 0x00000008L
  DWFRF_NORMAL = 0
  DWFRF_DELETECONFIGDATA = 1
--- 294,320 ----
  SFGAO_CANMOVE = DROPEFFECT_MOVE
  SFGAO_CANLINK = DROPEFFECT_LINK
! SFGAO_CANRENAME = 16
! SFGAO_CANDELETE = 32
! SFGAO_HASPROPSHEET = 64
! SFGAO_DROPTARGET = 256
! SFGAO_CAPABILITYMASK = 375
! SFGAO_LINK = 65536
! SFGAO_SHARE = 131072
! SFGAO_READONLY = 262144
! SFGAO_GHOSTED = 524288
! SFGAO_HIDDEN = 524288
! SFGAO_DISPLAYATTRMASK = 983040
! SFGAO_FILESYSANCESTOR = 268435456
! SFGAO_FOLDER = 536870912
! SFGAO_FILESYSTEM = 1073741824
  SFGAO_HASSUBFOLDER = (-2147483648)
  SFGAO_CONTENTSMASK = (-2147483648)
! SFGAO_VALIDATE = 16777216
! SFGAO_REMOVABLE = 33554432
! SFGAO_COMPRESSED = 67108864
! SFGAO_BROWSABLE = 134217728
! SFGAO_NONENUMERATED = 1048576
! SFGAO_NEWCONTENT = 2097152
! SFGAO_STORAGE = 8
  DWFRF_NORMAL = 0
  DWFRF_DELETECONFIGDATA = 1
***************
*** 387,416 ****
  CFSTR_FILENAMEMAP = CFSTR_FILENAMEMAPA
  DVASPECT_SHORTNAME = 2
! SHCNE_RENAMEITEM = 0x00000001L
! SHCNE_CREATE = 0x00000002L
! SHCNE_DELETE = 0x00000004L
! SHCNE_MKDIR = 0x00000008L
! SHCNE_RMDIR = 0x00000010L
! SHCNE_MEDIAINSERTED = 0x00000020L
! SHCNE_MEDIAREMOVED = 0x00000040L
! SHCNE_DRIVEREMOVED = 0x00000080L
! SHCNE_DRIVEADD = 0x00000100L
! SHCNE_NETSHARE = 0x00000200L
! SHCNE_NETUNSHARE = 0x00000400L
! SHCNE_ATTRIBUTES = 0x00000800L
! SHCNE_UPDATEDIR = 0x00001000L
! SHCNE_UPDATEITEM = 0x00002000L
! SHCNE_SERVERDISCONNECT = 0x00004000L
! SHCNE_UPDATEIMAGE = 0x00008000L
! SHCNE_DRIVEADDGUI = 0x00010000L
! SHCNE_RENAMEFOLDER = 0x00020000L
! SHCNE_FREESPACE = 0x00040000L
! SHCNE_EXTENDED_EVENT = 0x04000000L
! SHCNE_ASSOCCHANGED = 0x08000000L
! SHCNE_DISKEVENTS = 0x0002381FL
! SHCNE_GLOBALEVENTS = 0x0C0581E0L
! SHCNE_ALLEVENTS = 0x7FFFFFFFL
! SHCNE_INTERRUPT = 0x80000000L
! SHCNEE_ORDERCHANGED = 0x00000002L
  SHCNF_IDLIST = 0
  SHCNF_PATHA = 1
--- 387,416 ----
  CFSTR_FILENAMEMAP = CFSTR_FILENAMEMAPA
  DVASPECT_SHORTNAME = 2
! SHCNE_RENAMEITEM = 1
! SHCNE_CREATE = 2
! SHCNE_DELETE = 4
! SHCNE_MKDIR = 8
! SHCNE_RMDIR = 16
! SHCNE_MEDIAINSERTED = 32
! SHCNE_MEDIAREMOVED = 64
! SHCNE_DRIVEREMOVED = 128
! SHCNE_DRIVEADD = 256
! SHCNE_NETSHARE = 512
! SHCNE_NETUNSHARE = 1024
! SHCNE_ATTRIBUTES = 2048
! SHCNE_UPDATEDIR = 4096
! SHCNE_UPDATEITEM = 8192
! SHCNE_SERVERDISCONNECT = 16384
! SHCNE_UPDATEIMAGE = 32768
! SHCNE_DRIVEADDGUI = 65536
! SHCNE_RENAMEFOLDER = 131072
! SHCNE_FREESPACE = 262144
! SHCNE_EXTENDED_EVENT = 67108864
! SHCNE_ASSOCCHANGED = 134217728
! SHCNE_DISKEVENTS = 145439
! SHCNE_GLOBALEVENTS = 201687520
! SHCNE_ALLEVENTS = 2147483647
! SHCNE_INTERRUPT = -2147483648
! SHCNEE_ORDERCHANGED = 2
  SHCNF_IDLIST = 0
  SHCNF_PATHA = 1
***************
*** 428,434 ****
  QIF_CACHED = 1
  QIF_DONTEXPANDFOLDER = 2
! SHARD_PIDL = 0x00000001L
! SHARD_PATHA = 0x00000002L
! SHARD_PATHW = 0x00000003L
  SHARD_PATH = SHARD_PATHW
  SHARD_PATH = SHARD_PATHA
--- 428,434 ----
  QIF_CACHED = 1
  QIF_DONTEXPANDFOLDER = 2
! SHARD_PIDL = 1
! SHARD_PATHA = 2
! SHARD_PATHW = 3
  SHARD_PATH = SHARD_PATHW
  SHARD_PATH = SHARD_PATHA
***************
*** 534,540 ****
  SHGDN_NORMAL            = 0        # default (display purpose)
  SHGDN_INFOLDER          = 1        # displayed under a folder (relative)
! SHGDN_INCLUDE_NONFILESYS = 0x2000   # if not set, display names for shell name space items that are not in the file system will fail.
! SHGDN_FORADDRESSBAR     = 0x4000   # for displaying in the address (drives dropdown) bar
! SHGDN_FORPARSING        = 0x8000   # for ParseDisplayName or path
  
  SHCONTF_FOLDERS         = 32       # for shell browser
--- 534,540 ----
  SHGDN_NORMAL            = 0        # default (display purpose)
  SHGDN_INFOLDER          = 1        # displayed under a folder (relative)
! SHGDN_INCLUDE_NONFILESYS = 8192   # if not set, display names for shell name space items that are not in the file system will fail.
! SHGDN_FORADDRESSBAR     = 16384   # for displaying in the address (drives dropdown) bar
! SHGDN_FORPARSING        = 32768   # for ParseDisplayName or path
  
  SHCONTF_FOLDERS         = 32       # for shell browser
***************
*** 543,563 ****
  
  BFO_NONE	= 0
! BFO_BROWSER_PERSIST_SETTINGS	= 0x1
! BFO_RENAME_FOLDER_OPTIONS_TOINTERNET	= 0x2
! BFO_BOTH_OPTIONS	= 0x4
! BIF_PREFER_INTERNET_SHORTCUT	= 0x8
! BFO_BROWSE_NO_IN_NEW_PROCESS	= 0x10
! BFO_ENABLE_HYPERLINK_TRACKING	= 0x20
! BFO_USE_IE_OFFLINE_SUPPORT	= 0x40
! BFO_SUBSTITUE_INTERNET_START_PAGE	= 0x80
! BFO_USE_IE_LOGOBANDING	= 0x100
! BFO_ADD_IE_TOCAPTIONBAR	= 0x200
! BFO_USE_DIALUP_REF	= 0x400
! BFO_USE_IE_TOOLBAR	= 0x800
! BFO_NO_PARENT_FOLDER_SUPPORT	= 0x1000
! BFO_NO_REOPEN_NEXT_RESTART	= 0x2000
! BFO_GO_HOME_PAGE	= 0x4000
! BFO_PREFER_IEPROCESS	= 0x8000
! BFO_SHOW_NAVIGATION_CANCELLED	= 0x10000
  BFO_QUERY_ALL	= -1
  # From ShlGuid.h
--- 543,563 ----
  
  BFO_NONE	= 0
! BFO_BROWSER_PERSIST_SETTINGS	= 1
! BFO_RENAME_FOLDER_OPTIONS_TOINTERNET	= 2
! BFO_BOTH_OPTIONS	= 4
! BIF_PREFER_INTERNET_SHORTCUT	= 8
! BFO_BROWSE_NO_IN_NEW_PROCESS	= 16
! BFO_ENABLE_HYPERLINK_TRACKING	= 32
! BFO_USE_IE_OFFLINE_SUPPORT	= 64
! BFO_SUBSTITUE_INTERNET_START_PAGE	= 128
! BFO_USE_IE_LOGOBANDING	= 256
! BFO_ADD_IE_TOCAPTIONBAR	= 512
! BFO_USE_DIALUP_REF	= 1024
! BFO_USE_IE_TOOLBAR	= 2048
! BFO_NO_PARENT_FOLDER_SUPPORT	= 4096
! BFO_NO_REOPEN_NEXT_RESTART	= 8192
! BFO_GO_HOME_PAGE	= 16384
! BFO_PREFER_IEPROCESS	= 32768
! BFO_SHOW_NAVIGATION_CANCELLED	= 65536
  BFO_QUERY_ALL	= -1
  # From ShlGuid.h
***************
*** 591,613 ****
  PIDDRSI_PLAYSTARTS = 5
  PIDDRSI_PLAYEXPIRES = 6
! PIDVSI_STREAM_NAME = 0x00000002
! PIDVSI_FRAME_WIDTH = 0x00000003
! PIDVSI_FRAME_HEIGHT = 0x00000004
! PIDVSI_TIMELENGTH = 0x00000007
! PIDVSI_FRAME_COUNT = 0x00000005
! PIDVSI_FRAME_RATE = 0x00000006
! PIDVSI_DATA_RATE = 0x00000008
! PIDVSI_SAMPLE_SIZE = 0x00000009
! PIDVSI_COMPRESSION = 0x0000000A
! PIDVSI_STREAM_NUMBER = 0x0000000B
! PIDASI_FORMAT = 0x00000002
! PIDASI_TIMELENGTH = 0x00000003
! PIDASI_AVG_DATA_RATE = 0x00000004
! PIDASI_SAMPLE_RATE = 0x00000005
! PIDASI_SAMPLE_SIZE = 0x00000006
! PIDASI_CHANNEL_COUNT = 0x00000007
! PIDASI_STREAM_NUMBER = 0x00000008
! PIDASI_STREAM_NAME = 0x00000009
! PIDASI_COMPRESSION = 0x0000000A
  PID_CONTROLPANEL_CATEGORY = 2
  PID_VOLUME_FREE = 2
--- 591,613 ----
  PIDDRSI_PLAYSTARTS = 5
  PIDDRSI_PLAYEXPIRES = 6
! PIDVSI_STREAM_NAME = 2
! PIDVSI_FRAME_WIDTH = 3
! PIDVSI_FRAME_HEIGHT = 4
! PIDVSI_TIMELENGTH = 7
! PIDVSI_FRAME_COUNT = 5
! PIDVSI_FRAME_RATE = 6
! PIDVSI_DATA_RATE = 8
! PIDVSI_SAMPLE_SIZE = 9
! PIDVSI_COMPRESSION = 10
! PIDVSI_STREAM_NUMBER = 11
! PIDASI_FORMAT = 2
! PIDASI_TIMELENGTH = 3
! PIDASI_AVG_DATA_RATE = 4
! PIDASI_SAMPLE_RATE = 5
! PIDASI_SAMPLE_SIZE = 6
! PIDASI_CHANNEL_COUNT = 7
! PIDASI_STREAM_NUMBER = 8
! PIDASI_STREAM_NAME = 9
! PIDASI_COMPRESSION = 10
  PID_CONTROLPANEL_CATEGORY = 2
  PID_VOLUME_FREE = 2
***************
*** 625,631 ****
  PROPSET_BEHAVIOR_CASE_SENSITIVE = ( 1 )
  PID_DICTIONARY = ( 0 )
! PID_CODEPAGE = ( 0x1 )
! PID_FIRST_USABLE = ( 0x2 )
! PID_FIRST_NAME_DEFAULT = ( 0xfff )
  PID_LOCALE = ( (-2147483648) )
  PID_MODIFY_TIME = ( (-2147483647) )
--- 625,631 ----
  PROPSET_BEHAVIOR_CASE_SENSITIVE = ( 1 )
  PID_DICTIONARY = ( 0 )
! PID_CODEPAGE = ( 1 )
! PID_FIRST_USABLE = ( 2 )
! PID_FIRST_NAME_DEFAULT = ( 4095 )
  PID_LOCALE = ( (-2147483648) )
  PID_MODIFY_TIME = ( (-2147483647) )
***************
*** 635,682 ****
  PID_MIN_READONLY = ( (-2147483648) )
  PID_MAX_READONLY = ( (-1073741825) )
! PIDDI_THUMBNAIL = 0x00000002L
! PIDSI_TITLE = 0x00000002L
! PIDSI_SUBJECT = 0x00000003L
! PIDSI_AUTHOR = 0x00000004L
! PIDSI_KEYWORDS = 0x00000005L
! PIDSI_COMMENTS = 0x00000006L
! PIDSI_TEMPLATE = 0x00000007L
! PIDSI_LASTAUTHOR = 0x00000008L
! PIDSI_REVNUMBER = 0x00000009L
! PIDSI_EDITTIME = 0x0000000aL
! PIDSI_LASTPRINTED = 0x0000000bL
! PIDSI_CREATE_DTM = 0x0000000cL
! PIDSI_LASTSAVE_DTM = 0x0000000dL
! PIDSI_PAGECOUNT = 0x0000000eL
! PIDSI_WORDCOUNT = 0x0000000fL
! PIDSI_CHARCOUNT = 0x00000010L
! PIDSI_THUMBNAIL = 0x00000011L
! PIDSI_APPNAME = 0x00000012L
! PIDSI_DOC_SECURITY = 0x00000013L
! PIDDSI_CATEGORY = 0x00000002
! PIDDSI_PRESFORMAT = 0x00000003
! PIDDSI_BYTECOUNT = 0x00000004
! PIDDSI_LINECOUNT = 0x00000005
! PIDDSI_PARCOUNT = 0x00000006
! PIDDSI_SLIDECOUNT = 0x00000007
! PIDDSI_NOTECOUNT = 0x00000008
! PIDDSI_HIDDENCOUNT = 0x00000009
! PIDDSI_MMCLIPCOUNT = 0x0000000A
! PIDDSI_SCALE = 0x0000000B
! PIDDSI_HEADINGPAIR = 0x0000000C
! PIDDSI_DOCPARTS = 0x0000000D
! PIDDSI_MANAGER = 0x0000000E
! PIDDSI_COMPANY = 0x0000000F
! PIDDSI_LINKSDIRTY = 0x00000010
! PIDMSI_EDITOR = 0x00000002L
! PIDMSI_SUPPLIER = 0x00000003L
! PIDMSI_SOURCE = 0x00000004L
! PIDMSI_SEQUENCE_NO = 0x00000005L
! PIDMSI_PROJECT = 0x00000006L
! PIDMSI_STATUS = 0x00000007L
! PIDMSI_OWNER = 0x00000008L
! PIDMSI_RATING = 0x00000009L
! PIDMSI_PRODUCTION = 0x0000000AL
! PIDMSI_COPYRIGHT = 0x0000000BL
  PRSPEC_INVALID = ( (-1) )
  PRSPEC_LPWSTR = ( 0 )
--- 635,682 ----
  PID_MIN_READONLY = ( (-2147483648) )
  PID_MAX_READONLY = ( (-1073741825) )
! PIDDI_THUMBNAIL = 2
! PIDSI_TITLE = 2
! PIDSI_SUBJECT = 3
! PIDSI_AUTHOR = 4
! PIDSI_KEYWORDS = 5
! PIDSI_COMMENTS = 6
! PIDSI_TEMPLATE = 7
! PIDSI_LASTAUTHOR = 8
! PIDSI_REVNUMBER = 9
! PIDSI_EDITTIME = 10
! PIDSI_LASTPRINTED = 11
! PIDSI_CREATE_DTM = 12
! PIDSI_LASTSAVE_DTM = 13
! PIDSI_PAGECOUNT = 14
! PIDSI_WORDCOUNT = 15
! PIDSI_CHARCOUNT = 16
! PIDSI_THUMBNAIL = 17
! PIDSI_APPNAME = 18
! PIDSI_DOC_SECURITY = 19
! PIDDSI_CATEGORY = 2
! PIDDSI_PRESFORMAT = 3
! PIDDSI_BYTECOUNT = 4
! PIDDSI_LINECOUNT = 5
! PIDDSI_PARCOUNT = 6
! PIDDSI_SLIDECOUNT = 7
! PIDDSI_NOTECOUNT = 8
! PIDDSI_HIDDENCOUNT = 9
! PIDDSI_MMCLIPCOUNT = 10
! PIDDSI_SCALE = 11
! PIDDSI_HEADINGPAIR = 12
! PIDDSI_DOCPARTS = 13
! PIDDSI_MANAGER = 14
! PIDDSI_COMPANY = 15
! PIDDSI_LINKSDIRTY = 16
! PIDMSI_EDITOR = 2
! PIDMSI_SUPPLIER = 3
! PIDMSI_SOURCE = 4
! PIDMSI_SEQUENCE_NO = 5
! PIDMSI_PROJECT = 6
! PIDMSI_STATUS = 7
! PIDMSI_OWNER = 8
! PIDMSI_RATING = 9
! PIDMSI_PRODUCTION = 10
! PIDMSI_COPYRIGHT = 11
  PRSPEC_INVALID = ( (-1) )
  PRSPEC_LPWSTR = ( 0 )
***************
*** 684,740 ****
  # From ShObjIdl.h
  SHCIDS_ALLFIELDS = (-2147483648)
! SHCIDS_CANONICALONLY = 0x10000000L
  SHCIDS_BITMASK = (-65536)
! SHCIDS_COLUMNMASK = 0x0000FFFFL
! SFGAO_CANMONIKER = 0x00400000L
! SFGAO_HASSTORAGE = 0x00400000L
! SFGAO_STREAM = 0x00400000L
! SFGAO_STORAGEANCESTOR = 0x00800000L
! SFGAO_STORAGECAPMASK = 0x70C50008L
  
  MAXPROPPAGES = 100
! PSP_DEFAULT = 0x00000000
! PSP_DLGINDIRECT = 0x00000001
! PSP_USEHICON = 0x00000002
! PSP_USEICONID = 0x00000004
! PSP_USETITLE = 0x00000008
! PSP_RTLREADING = 0x00000010
! PSP_HASHELP = 0x00000020
! PSP_USEREFPARENT = 0x00000040
! PSP_USECALLBACK = 0x00000080
! PSP_PREMATURE = 0x00000400
! PSP_HIDEHEADER = 0x00000800
! PSP_USEHEADERTITLE = 0x00001000
! PSP_USEHEADERSUBTITLE = 0x00002000
! PSP_USEFUSIONCONTEXT = 0x00004000
  PSPCB_ADDREF = 0
  PSPCB_RELEASE = 1
  PSPCB_CREATE = 2
  
! PSH_DEFAULT = 0x00000000
! PSH_PROPTITLE = 0x00000001
! PSH_USEHICON = 0x00000002
! PSH_USEICONID = 0x00000004
! PSH_PROPSHEETPAGE = 0x00000008
! PSH_WIZARDHASFINISH = 0x00000010
! PSH_WIZARD = 0x00000020
! PSH_USEPSTARTPAGE = 0x00000040
! PSH_NOAPPLYNOW = 0x00000080
! PSH_USECALLBACK = 0x00000100
! PSH_HASHELP = 0x00000200
! PSH_MODELESS = 0x00000400
! PSH_RTLREADING = 0x00000800
! PSH_WIZARDCONTEXTHELP = 0x00001000
! PSH_WIZARD97 = 0x00002000
! PSH_WIZARD97 = 0x01000000
! PSH_WATERMARK = 0x00008000
! PSH_USEHBMWATERMARK = 0x00010000
! PSH_USEHPLWATERMARK = 0x00020000
! PSH_STRETCHWATERMARK = 0x00040000
! PSH_HEADER = 0x00080000
! PSH_USEHBMHEADER = 0x00100000
! PSH_USEPAGELANG = 0x00200000
! PSH_WIZARD_LITE = 0x00400000
! PSH_NOCONTEXTHELP = 0x02000000
  
  PSCB_INITIALIZED = 1
--- 684,740 ----
  # From ShObjIdl.h
  SHCIDS_ALLFIELDS = (-2147483648)
! SHCIDS_CANONICALONLY = 268435456
  SHCIDS_BITMASK = (-65536)
! SHCIDS_COLUMNMASK = 65535
! SFGAO_CANMONIKER = 4194304
! SFGAO_HASSTORAGE = 4194304
! SFGAO_STREAM = 4194304
! SFGAO_STORAGEANCESTOR = 8388608
! SFGAO_STORAGECAPMASK = 1891958792
  
  MAXPROPPAGES = 100
! PSP_DEFAULT = 0
! PSP_DLGINDIRECT = 1
! PSP_USEHICON = 2
! PSP_USEICONID = 4
! PSP_USETITLE = 8
! PSP_RTLREADING = 16
! PSP_HASHELP = 32
! PSP_USEREFPARENT = 64
! PSP_USECALLBACK = 128
! PSP_PREMATURE = 1024
! PSP_HIDEHEADER = 2048
! PSP_USEHEADERTITLE = 4096
! PSP_USEHEADERSUBTITLE = 8192
! PSP_USEFUSIONCONTEXT = 16384
  PSPCB_ADDREF = 0
  PSPCB_RELEASE = 1
  PSPCB_CREATE = 2
  
! PSH_DEFAULT = 0
! PSH_PROPTITLE = 1
! PSH_USEHICON = 2
! PSH_USEICONID = 4
! PSH_PROPSHEETPAGE = 8
! PSH_WIZARDHASFINISH = 16
! PSH_WIZARD = 32
! PSH_USEPSTARTPAGE = 64
! PSH_NOAPPLYNOW = 128
! PSH_USECALLBACK = 256
! PSH_HASHELP = 512
! PSH_MODELESS = 1024
! PSH_RTLREADING = 2048
! PSH_WIZARDCONTEXTHELP = 4096
! PSH_WIZARD97 = 8192
! PSH_WIZARD97 = 16777216
! PSH_WATERMARK = 32768
! PSH_USEHBMWATERMARK = 65536
! PSH_USEHPLWATERMARK = 131072
! PSH_STRETCHWATERMARK = 262144
! PSH_HEADER = 524288
! PSH_USEHBMHEADER = 1048576
! PSH_USEPAGELANG = 2097152
! PSH_WIZARD_LITE = 4194304
! PSH_NOCONTEXTHELP = 33554432
  
  PSCB_INITIALIZED = 1
***************
*** 746,753 ****
  PSNRET_MESSAGEHANDLED = 3
  
! PSWIZB_BACK = 0x00000001
! PSWIZB_NEXT = 0x00000002
! PSWIZB_FINISH = 0x00000004
! PSWIZB_DISABLEDFINISH = 0x00000008
  PSBTN_BACK = 0
  PSBTN_NEXT = 1
--- 746,753 ----
  PSNRET_MESSAGEHANDLED = 3
  
! PSWIZB_BACK = 1
! PSWIZB_NEXT = 2
! PSWIZB_FINISH = 4
! PSWIZB_DISABLEDFINISH = 8
  PSBTN_BACK = 0
  PSBTN_NEXT = 1
***************
*** 759,764 ****
  PSBTN_MAX = 6
  
! ID_PSRESTARTWINDOWS = 0x2
! ID_PSREBOOTSYSTEM = (ID_PSRESTARTWINDOWS | 0x1)
  WIZ_CXDLG = 276
  WIZ_CYDLG = 140
--- 759,764 ----
  PSBTN_MAX = 6
  
! ID_PSRESTARTWINDOWS = 2
! ID_PSREBOOTSYSTEM = (ID_PSRESTARTWINDOWS | 1)
  WIZ_CXDLG = 276
  WIZ_CYDLG = 140
***************
*** 775,808 ****
  ISOLATION_AWARE_BUILD_STATIC_LIBRARY = 0
  
! SHCOLSTATE_TYPE_STR	= 0x1
! SHCOLSTATE_TYPE_INT	= 0x2
! SHCOLSTATE_TYPE_DATE	= 0x3
! SHCOLSTATE_TYPEMASK	= 0xf
! SHCOLSTATE_ONBYDEFAULT	= 0x10
! SHCOLSTATE_SLOW	= 0x20
! SHCOLSTATE_EXTENDED	= 0x40
! SHCOLSTATE_SECONDARYUI	= 0x80
! SHCOLSTATE_HIDDEN	= 0x100
! SHCOLSTATE_PREFER_VARCMP	= 0x200
  
! FWF_AUTOARRANGE	= 0x1
! FWF_ABBREVIATEDNAMES	= 0x2
! FWF_SNAPTOGRID	= 0x4
! FWF_OWNERDATA	= 0x8
! FWF_BESTFITWINDOW	= 0x10
! FWF_DESKTOP	= 0x20
! FWF_SINGLESEL	= 0x40
! FWF_NOSUBFOLDERS	= 0x80
! FWF_TRANSPARENT	= 0x100
! FWF_NOCLIENTEDGE	= 0x200
! FWF_NOSCROLL	= 0x400
! FWF_ALIGNLEFT	= 0x800
! FWF_NOICONS	= 0x1000
! FWF_SHOWSELALWAYS	= 0x2000
! FWF_NOVISIBLE	= 0x4000
! FWF_SINGLECLICKACTIVATE	= 0x8000
! FWF_NOWEBVIEW	= 0x10000
! FWF_HIDEFILENAMES	= 0x20000
! FWF_CHECKSELECT	= 0x40000
  
  FVM_FIRST	= 1
--- 775,808 ----
  ISOLATION_AWARE_BUILD_STATIC_LIBRARY = 0
  
! SHCOLSTATE_TYPE_STR	= 1
! SHCOLSTATE_TYPE_INT	= 2
! SHCOLSTATE_TYPE_DATE	= 3
! SHCOLSTATE_TYPEMASK	= 15
! SHCOLSTATE_ONBYDEFAULT	= 16
! SHCOLSTATE_SLOW	= 32
! SHCOLSTATE_EXTENDED	= 64
! SHCOLSTATE_SECONDARYUI	= 128
! SHCOLSTATE_HIDDEN	= 256
! SHCOLSTATE_PREFER_VARCMP	= 512
  
! FWF_AUTOARRANGE	= 1
! FWF_ABBREVIATEDNAMES	= 2
! FWF_SNAPTOGRID	= 4
! FWF_OWNERDATA	= 8
! FWF_BESTFITWINDOW	= 16
! FWF_DESKTOP	= 32
! FWF_SINGLESEL	= 64
! FWF_NOSUBFOLDERS	= 128
! FWF_TRANSPARENT	= 256
! FWF_NOCLIENTEDGE	= 512
! FWF_NOSCROLL	= 1024
! FWF_ALIGNLEFT	= 2048
! FWF_NOICONS	= 4096
! FWF_SHOWSELALWAYS	= 8192
! FWF_NOVISIBLE	= 16384
! FWF_SINGLECLICKACTIVATE	= 32768
! FWF_NOWEBVIEW	= 65536
! FWF_HIDEFILENAMES	= 131072
! FWF_CHECKSELECT	= 262144
  
  FVM_FIRST	= 1