]> gitweb.factorcode.org Git - factor.git/blobdiff - basis/windows/ddk/setupapi/setupapi.factor
use radix literals
[factor.git] / basis / windows / ddk / setupapi / setupapi.factor
index 7af177b480b8051e923695d4618af43add61c6e6..ff9ceb4c1ead80fd30f8486c8c2f5552f32a3227 100755 (executable)
@@ -17,46 +17,46 @@ CONSTANT: LOGTOKEN_NO_LOG                 1
 CONSTANT: LOGTOKEN_SETUPAPI_APPLOG        2
 CONSTANT: LOGTOKEN_SETUPAPI_DEVLOG        3
 
-CONSTANT: TXTLOG_SETUPAPI_DEVLOG      HEX: 00000001
-CONSTANT: TXTLOG_SETUPAPI_CMDLINE     HEX: 00000002
-CONSTANT: TXTLOG_SETUPAPI_BITS        HEX: 00000003
-
-CONSTANT: TXTLOG_ERROR                    HEX: 1
-CONSTANT: TXTLOG_WARNING                  HEX: 2
-CONSTANT: TXTLOG_SYSTEM_STATE_CHANGE      HEX: 3
-CONSTANT: TXTLOG_SUMMARY                  HEX: 4
-CONSTANT: TXTLOG_DETAILS                  HEX: 5
-CONSTANT: TXTLOG_VERBOSE                  HEX: 6
-CONSTANT: TXTLOG_VERY_VERBOSE             HEX: 7
-
-CONSTANT: TXTLOG_RESERVED_FLAGS   HEX: 0000FFF0
-
-CONSTANT: TXTLOG_TIMESTAMP        HEX: 00010000
-CONSTANT: TXTLOG_DEPTH_INCR       HEX: 00020000
-CONSTANT: TXTLOG_DEPTH_DECR       HEX: 00040000
-CONSTANT: TXTLOG_TAB_1            HEX: 00080000
-CONSTANT: TXTLOG_FLUSH_FILE       HEX: 00100000
-
-: TXTLOG_LEVEL ( flags -- n ) HEX: f bitand ; inline
-
-CONSTANT: TXTLOG_DEVINST          HEX: 00000001
-CONSTANT: TXTLOG_INF              HEX: 00000002
-CONSTANT: TXTLOG_FILEQ            HEX: 00000004
-CONSTANT: TXTLOG_COPYFILES        HEX: 00000008
-CONSTANT: TXTLOG_SIGVERIF         HEX: 00000020
-CONSTANT: TXTLOG_BACKUP           HEX: 00000080
-CONSTANT: TXTLOG_UI               HEX: 00000100
-CONSTANT: TXTLOG_UTIL             HEX: 00000200
-CONSTANT: TXTLOG_INFDB            HEX: 00000400
-CONSTANT: TXTLOG_POLICY           HEX: 00800000
-CONSTANT: TXTLOG_NEWDEV           HEX: 01000000
-CONSTANT: TXTLOG_UMPNPMGR         HEX: 02000000
-CONSTANT: TXTLOG_DRIVER_STORE     HEX: 04000000
-CONSTANT: TXTLOG_SETUP            HEX: 08000000
-CONSTANT: TXTLOG_CMI              HEX: 10000000
-CONSTANT: TXTLOG_DEVMGR           HEX: 20000000
-CONSTANT: TXTLOG_INSTALLER        HEX: 40000000
-CONSTANT: TXTLOG_VENDOR           HEX: 80000000
+CONSTANT: TXTLOG_SETUPAPI_DEVLOG      0x00000001
+CONSTANT: TXTLOG_SETUPAPI_CMDLINE     0x00000002
+CONSTANT: TXTLOG_SETUPAPI_BITS        0x00000003
+
+CONSTANT: TXTLOG_ERROR                    0x1
+CONSTANT: TXTLOG_WARNING                  0x2
+CONSTANT: TXTLOG_SYSTEM_STATE_CHANGE      0x3
+CONSTANT: TXTLOG_SUMMARY                  0x4
+CONSTANT: TXTLOG_DETAILS                  0x5
+CONSTANT: TXTLOG_VERBOSE                  0x6
+CONSTANT: TXTLOG_VERY_VERBOSE             0x7
+
+CONSTANT: TXTLOG_RESERVED_FLAGS   0x0000FFF0
+
+CONSTANT: TXTLOG_TIMESTAMP        0x00010000
+CONSTANT: TXTLOG_DEPTH_INCR       0x00020000
+CONSTANT: TXTLOG_DEPTH_DECR       0x00040000
+CONSTANT: TXTLOG_TAB_1            0x00080000
+CONSTANT: TXTLOG_FLUSH_FILE       0x00100000
+
+: TXTLOG_LEVEL ( flags -- n ) 0xf bitand ; inline
+
+CONSTANT: TXTLOG_DEVINST          0x00000001
+CONSTANT: TXTLOG_INF              0x00000002
+CONSTANT: TXTLOG_FILEQ            0x00000004
+CONSTANT: TXTLOG_COPYFILES        0x00000008
+CONSTANT: TXTLOG_SIGVERIF         0x00000020
+CONSTANT: TXTLOG_BACKUP           0x00000080
+CONSTANT: TXTLOG_UI               0x00000100
+CONSTANT: TXTLOG_UTIL             0x00000200
+CONSTANT: TXTLOG_INFDB            0x00000400
+CONSTANT: TXTLOG_POLICY           0x00800000
+CONSTANT: TXTLOG_NEWDEV           0x01000000
+CONSTANT: TXTLOG_UMPNPMGR         0x02000000
+CONSTANT: TXTLOG_DRIVER_STORE     0x04000000
+CONSTANT: TXTLOG_SETUP            0x08000000
+CONSTANT: TXTLOG_CMI              0x10000000
+CONSTANT: TXTLOG_DEVMGR           0x20000000
+CONSTANT: TXTLOG_INSTALLER        0x40000000
+CONSTANT: TXTLOG_VENDOR           0x80000000
 
 TYPEDEF: void* HPROPSHEETPAGE
 TYPEDEF: void* HIMAGELIST
@@ -129,14 +129,14 @@ TYPEDEF: SP_ORIGINAL_FILE_INFO_W* PSP_ORIGINAL_FILE_INFO_W
 TYPEDEF: SP_ORIGINAL_FILE_INFO_W SP_ORIGINAL_FILE_INFO
 TYPEDEF: PSP_ORIGINAL_FILE_INFO_W PSP_ORIGINAL_FILE_INFO
 
-CONSTANT: INF_STYLE_NONE           HEX: 00000000
-CONSTANT: INF_STYLE_OLDNT          HEX: 00000001
-CONSTANT: INF_STYLE_WIN4           HEX: 00000002
-CONSTANT: INF_STYLE_CACHE_ENABLE   HEX: 00000010
-CONSTANT: INF_STYLE_CACHE_DISABLE  HEX: 00000020
-CONSTANT: INF_STYLE_CACHE_IGNORE   HEX: 00000040
+CONSTANT: INF_STYLE_NONE           0x00000000
+CONSTANT: INF_STYLE_OLDNT          0x00000001
+CONSTANT: INF_STYLE_WIN4           0x00000002
+CONSTANT: INF_STYLE_CACHE_ENABLE   0x00000010
+CONSTANT: INF_STYLE_CACHE_DISABLE  0x00000020
+CONSTANT: INF_STYLE_CACHE_IGNORE   0x00000040
 CONSTANT: DIRID_ABSOLUTE          -1
-CONSTANT: DIRID_ABSOLUTE_16BIT     HEX: ffff
+CONSTANT: DIRID_ABSOLUTE_16BIT     0xffff
 CONSTANT: DIRID_NULL               0
 CONSTANT: DIRID_SRCPATH            1
 CONSTANT: DIRID_WINDOWS           10
@@ -171,40 +171,40 @@ CONSTANT: DIRID_PROGRAM_FILES_COMMON    16427
 CONSTANT: DIRID_PROGRAM_FILES_COMMONX86 16428
 CONSTANT: DIRID_COMMON_TEMPLATES        16429
 CONSTANT: DIRID_COMMON_DOCUMENTS        16430
-CONSTANT: DIRID_USER              HEX: 8000
+CONSTANT: DIRID_USER              0x8000
 CALLBACK: UINT PSP_FILE_CALLBACK_A ( PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2 ) ;
 CALLBACK: UINT PSP_FILE_CALLBACK_W ( PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2 ) ;
 TYPEDEF: PSP_FILE_CALLBACK_W PSP_FILE_CALLBACK
-CONSTANT: SPFILENOTIFY_STARTQUEUE         HEX: 00000001
-CONSTANT: SPFILENOTIFY_ENDQUEUE           HEX: 00000002
-CONSTANT: SPFILENOTIFY_STARTSUBQUEUE      HEX: 00000003
-CONSTANT: SPFILENOTIFY_ENDSUBQUEUE        HEX: 00000004
-CONSTANT: SPFILENOTIFY_STARTDELETE        HEX: 00000005
-CONSTANT: SPFILENOTIFY_ENDDELETE          HEX: 00000006
-CONSTANT: SPFILENOTIFY_DELETEERROR        HEX: 00000007
-CONSTANT: SPFILENOTIFY_STARTRENAME        HEX: 00000008
-CONSTANT: SPFILENOTIFY_ENDRENAME          HEX: 00000009
-CONSTANT: SPFILENOTIFY_RENAMEERROR        HEX: 0000000a
-CONSTANT: SPFILENOTIFY_STARTCOPY          HEX: 0000000b
-CONSTANT: SPFILENOTIFY_ENDCOPY            HEX: 0000000c
-CONSTANT: SPFILENOTIFY_COPYERROR          HEX: 0000000d
-CONSTANT: SPFILENOTIFY_NEEDMEDIA          HEX: 0000000e
-CONSTANT: SPFILENOTIFY_QUEUESCAN          HEX: 0000000f
-CONSTANT: SPFILENOTIFY_CABINETINFO        HEX: 00000010
-CONSTANT: SPFILENOTIFY_FILEINCABINET      HEX: 00000011
-CONSTANT: SPFILENOTIFY_NEEDNEWCABINET     HEX: 00000012
-CONSTANT: SPFILENOTIFY_FILEEXTRACTED      HEX: 00000013
-CONSTANT: SPFILENOTIFY_FILEOPDELAYED      HEX: 00000014
-CONSTANT: SPFILENOTIFY_STARTBACKUP        HEX: 00000015
-CONSTANT: SPFILENOTIFY_BACKUPERROR        HEX: 00000016
-CONSTANT: SPFILENOTIFY_ENDBACKUP          HEX: 00000017
-CONSTANT: SPFILENOTIFY_QUEUESCAN_EX       HEX: 00000018
-CONSTANT: SPFILENOTIFY_STARTREGISTRATION  HEX: 00000019
-CONSTANT: SPFILENOTIFY_ENDREGISTRATION    HEX: 00000020
-CONSTANT: SPFILENOTIFY_QUEUESCAN_SIGNERINFO HEX: 00000040
-CONSTANT: SPFILENOTIFY_LANGMISMATCH       HEX: 00010000
-CONSTANT: SPFILENOTIFY_TARGETEXISTS       HEX: 00020000
-CONSTANT: SPFILENOTIFY_TARGETNEWER        HEX: 00040000
+CONSTANT: SPFILENOTIFY_STARTQUEUE         0x00000001
+CONSTANT: SPFILENOTIFY_ENDQUEUE           0x00000002
+CONSTANT: SPFILENOTIFY_STARTSUBQUEUE      0x00000003
+CONSTANT: SPFILENOTIFY_ENDSUBQUEUE        0x00000004
+CONSTANT: SPFILENOTIFY_STARTDELETE        0x00000005
+CONSTANT: SPFILENOTIFY_ENDDELETE          0x00000006
+CONSTANT: SPFILENOTIFY_DELETEERROR        0x00000007
+CONSTANT: SPFILENOTIFY_STARTRENAME        0x00000008
+CONSTANT: SPFILENOTIFY_ENDRENAME          0x00000009
+CONSTANT: SPFILENOTIFY_RENAMEERROR        0x0000000a
+CONSTANT: SPFILENOTIFY_STARTCOPY          0x0000000b
+CONSTANT: SPFILENOTIFY_ENDCOPY            0x0000000c
+CONSTANT: SPFILENOTIFY_COPYERROR          0x0000000d
+CONSTANT: SPFILENOTIFY_NEEDMEDIA          0x0000000e
+CONSTANT: SPFILENOTIFY_QUEUESCAN          0x0000000f
+CONSTANT: SPFILENOTIFY_CABINETINFO        0x00000010
+CONSTANT: SPFILENOTIFY_FILEINCABINET      0x00000011
+CONSTANT: SPFILENOTIFY_NEEDNEWCABINET     0x00000012
+CONSTANT: SPFILENOTIFY_FILEEXTRACTED      0x00000013
+CONSTANT: SPFILENOTIFY_FILEOPDELAYED      0x00000014
+CONSTANT: SPFILENOTIFY_STARTBACKUP        0x00000015
+CONSTANT: SPFILENOTIFY_BACKUPERROR        0x00000016
+CONSTANT: SPFILENOTIFY_ENDBACKUP          0x00000017
+CONSTANT: SPFILENOTIFY_QUEUESCAN_EX       0x00000018
+CONSTANT: SPFILENOTIFY_STARTREGISTRATION  0x00000019
+CONSTANT: SPFILENOTIFY_ENDREGISTRATION    0x00000020
+CONSTANT: SPFILENOTIFY_QUEUESCAN_SIGNERINFO 0x00000040
+CONSTANT: SPFILENOTIFY_LANGMISMATCH       0x00010000
+CONSTANT: SPFILENOTIFY_TARGETEXISTS       0x00020000
+CONSTANT: SPFILENOTIFY_TARGETNEWER        0x00040000
 CONSTANT: FILEOP_COPY                     0
 CONSTANT: FILEOP_RENAME                   1
 CONSTANT: FILEOP_DELETE                   2
@@ -214,21 +214,21 @@ CONSTANT: FILEOP_DOIT                     1
 CONSTANT: FILEOP_SKIP                     2
 CONSTANT: FILEOP_RETRY                    $ FILEOP_DOIT
 CONSTANT: FILEOP_NEWPATH                  4
-CONSTANT: COPYFLG_WARN_IF_SKIP            HEX: 00000001
-CONSTANT: COPYFLG_NOSKIP                  HEX: 00000002
-CONSTANT: COPYFLG_NOVERSIONCHECK          HEX: 00000004
-CONSTANT: COPYFLG_FORCE_FILE_IN_USE       HEX: 00000008
-CONSTANT: COPYFLG_NO_OVERWRITE            HEX: 00000010
-CONSTANT: COPYFLG_NO_VERSION_DIALOG       HEX: 00000020
-CONSTANT: COPYFLG_OVERWRITE_OLDER_ONLY    HEX: 00000040
-CONSTANT: COPYFLG_PROTECTED_WINDOWS_DRIVER_FILE HEX: 00000100
-CONSTANT: COPYFLG_REPLACEONLY             HEX: 00000400
-CONSTANT: COPYFLG_NODECOMP                HEX: 00000800
-CONSTANT: COPYFLG_REPLACE_BOOT_FILE       HEX: 00001000
-CONSTANT: COPYFLG_NOPRUNE                 HEX: 00002000
-CONSTANT: COPYFLG_IN_USE_TRY_RENAME       HEX: 00004000
-CONSTANT: DELFLG_IN_USE                   HEX: 00000001
-CONSTANT: DELFLG_IN_USE1                  HEX: 00010000
+CONSTANT: COPYFLG_WARN_IF_SKIP            0x00000001
+CONSTANT: COPYFLG_NOSKIP                  0x00000002
+CONSTANT: COPYFLG_NOVERSIONCHECK          0x00000004
+CONSTANT: COPYFLG_FORCE_FILE_IN_USE       0x00000008
+CONSTANT: COPYFLG_NO_OVERWRITE            0x00000010
+CONSTANT: COPYFLG_NO_VERSION_DIALOG       0x00000020
+CONSTANT: COPYFLG_OVERWRITE_OLDER_ONLY    0x00000040
+CONSTANT: COPYFLG_PROTECTED_WINDOWS_DRIVER_FILE 0x00000100
+CONSTANT: COPYFLG_REPLACEONLY             0x00000400
+CONSTANT: COPYFLG_NODECOMP                0x00000800
+CONSTANT: COPYFLG_REPLACE_BOOT_FILE       0x00001000
+CONSTANT: COPYFLG_NOPRUNE                 0x00002000
+CONSTANT: COPYFLG_IN_USE_TRY_RENAME       0x00004000
+CONSTANT: DELFLG_IN_USE                   0x00000001
+CONSTANT: DELFLG_IN_USE1                  0x00010000
 STRUCT: FILEPATHS_A
     { Target       PCSTR }
     { Source       PCSTR }
@@ -337,13 +337,13 @@ TYPEDEF: SP_REGISTER_CONTROL_STATUSW* PSP_REGISTER_CONTROL_STATUSW
 TYPEDEF: SP_REGISTER_CONTROL_STATUSW SP_REGISTER_CONTROL_STATUS
 TYPEDEF: PSP_REGISTER_CONTROL_STATUSW PSP_REGISTER_CONTROL_STATUS
 
-CONSTANT: SPREG_SUCCESS       HEX: 00000000
-CONSTANT: SPREG_LOADLIBRARY   HEX: 00000001
-CONSTANT: SPREG_GETPROCADDR   HEX: 00000002
-CONSTANT: SPREG_REGSVR        HEX: 00000003
-CONSTANT: SPREG_DLLINSTALL    HEX: 00000004
-CONSTANT: SPREG_TIMEOUT       HEX: 00000005
-CONSTANT: SPREG_UNKNOWN       HEX: FFFFFFFF
+CONSTANT: SPREG_SUCCESS       0x00000000
+CONSTANT: SPREG_LOADLIBRARY   0x00000001
+CONSTANT: SPREG_GETPROCADDR   0x00000002
+CONSTANT: SPREG_REGSVR        0x00000003
+CONSTANT: SPREG_DLLINSTALL    0x00000004
+CONSTANT: SPREG_TIMEOUT       0x00000005
+CONSTANT: SPREG_UNKNOWN       0xFFFFFFFF
 
 TYPEDEF: PVOID HSPFILEQ
 
@@ -395,9 +395,9 @@ STRUCT: SP_DEVICE_INTERFACE_DATA
     { Reserved            ULONG_PTR } ;
 TYPEDEF: SP_DEVICE_INTERFACE_DATA* PSP_DEVICE_INTERFACE_DATA
 
-CONSTANT: SPINT_ACTIVE  HEX: 00000001
-CONSTANT: SPINT_DEFAULT HEX: 00000002
-CONSTANT: SPINT_REMOVED HEX: 00000004
+CONSTANT: SPINT_ACTIVE  0x00000001
+CONSTANT: SPINT_DEFAULT 0x00000002
+CONSTANT: SPINT_REMOVED 0x00000004
 TYPEDEF: SP_DEVICE_INTERFACE_DATA  SP_INTERFACE_DEVICE_DATA
 TYPEDEF: PSP_DEVICE_INTERFACE_DATA PSP_INTERFACE_DEVICE_DAT
 CONSTANT: SPID_ACTIVE               $ SPINT_ACTIVE
@@ -438,49 +438,49 @@ TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_W* PSP_DEVINFO_LIST_DETAIL_DATA_W
 TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_W SP_DEVINFO_LIST_DETAIL_DATA
 TYPEDEF: PSP_DEVINFO_LIST_DETAIL_DATA_W PSP_DEVINFO_LIST_DETAIL_DATA
 
-CONSTANT: DIF_SELECTDEVICE                    HEX: 00000001
-CONSTANT: DIF_INSTALLDEVICE                   HEX: 00000002
-CONSTANT: DIF_ASSIGNRESOURCES                 HEX: 00000003
-CONSTANT: DIF_PROPERTIES                      HEX: 00000004
-CONSTANT: DIF_REMOVE                          HEX: 00000005
-CONSTANT: DIF_FIRSTTIMESETUP                  HEX: 00000006
-CONSTANT: DIF_FOUNDDEVICE                     HEX: 00000007
-CONSTANT: DIF_SELECTCLASSDRIVERS              HEX: 00000008
-CONSTANT: DIF_VALIDATECLASSDRIVERS            HEX: 00000009
-CONSTANT: DIF_INSTALLCLASSDRIVERS             HEX: 0000000A
-CONSTANT: DIF_CALCDISKSPACE                   HEX: 0000000B
-CONSTANT: DIF_DESTROYPRIVATEDATA              HEX: 0000000C
-CONSTANT: DIF_VALIDATEDRIVER                  HEX: 0000000D
-CONSTANT: DIF_DETECT                          HEX: 0000000F
-CONSTANT: DIF_INSTALLWIZARD                   HEX: 00000010
-CONSTANT: DIF_DESTROYWIZARDDATA               HEX: 00000011
-CONSTANT: DIF_PROPERTYCHANGE                  HEX: 00000012
-CONSTANT: DIF_ENABLECLASS                     HEX: 00000013
-CONSTANT: DIF_DETECTVERIFY                    HEX: 00000014
-CONSTANT: DIF_INSTALLDEVICEFILES              HEX: 00000015
-CONSTANT: DIF_UNREMOVE                        HEX: 00000016
-CONSTANT: DIF_SELECTBESTCOMPATDRV             HEX: 00000017
-CONSTANT: DIF_ALLOW_INSTALL                   HEX: 00000018
-CONSTANT: DIF_REGISTERDEVICE                  HEX: 00000019
-CONSTANT: DIF_NEWDEVICEWIZARD_PRESELECT       HEX: 0000001A
-CONSTANT: DIF_NEWDEVICEWIZARD_SELECT          HEX: 0000001B
-CONSTANT: DIF_NEWDEVICEWIZARD_PREANALYZE      HEX: 0000001C
-CONSTANT: DIF_NEWDEVICEWIZARD_POSTANALYZE     HEX: 0000001D
-CONSTANT: DIF_NEWDEVICEWIZARD_FINISHINSTALL   HEX: 0000001E
-CONSTANT: DIF_UNUSED1                         HEX: 0000001F
-CONSTANT: DIF_INSTALLINTERFACES               HEX: 00000020
-CONSTANT: DIF_DETECTCANCEL                    HEX: 00000021
-CONSTANT: DIF_REGISTER_COINSTALLERS           HEX: 00000022
-CONSTANT: DIF_ADDPROPERTYPAGE_ADVANCED        HEX: 00000023
-CONSTANT: DIF_ADDPROPERTYPAGE_BASIC           HEX: 00000024
-CONSTANT: DIF_RESERVED1                       HEX: 00000025
-CONSTANT: DIF_TROUBLESHOOTER                  HEX: 00000026
-CONSTANT: DIF_POWERMESSAGEWAKE                HEX: 00000027
-CONSTANT: DIF_ADDREMOTEPROPERTYPAGE_ADVANCED  HEX: 00000028
-CONSTANT: DIF_UPDATEDRIVER_UI                 HEX: 00000029
-CONSTANT: DIF_FINISHINSTALL_ACTION            HEX: 0000002A
-CONSTANT: DIF_RESERVED2                       HEX: 00000030
-CONSTANT: DIF_MOVEDEVICE                      HEX: 0000000E
+CONSTANT: DIF_SELECTDEVICE                    0x00000001
+CONSTANT: DIF_INSTALLDEVICE                   0x00000002
+CONSTANT: DIF_ASSIGNRESOURCES                 0x00000003
+CONSTANT: DIF_PROPERTIES                      0x00000004
+CONSTANT: DIF_REMOVE                          0x00000005
+CONSTANT: DIF_FIRSTTIMESETUP                  0x00000006
+CONSTANT: DIF_FOUNDDEVICE                     0x00000007
+CONSTANT: DIF_SELECTCLASSDRIVERS              0x00000008
+CONSTANT: DIF_VALIDATECLASSDRIVERS            0x00000009
+CONSTANT: DIF_INSTALLCLASSDRIVERS             0x0000000A
+CONSTANT: DIF_CALCDISKSPACE                   0x0000000B
+CONSTANT: DIF_DESTROYPRIVATEDATA              0x0000000C
+CONSTANT: DIF_VALIDATEDRIVER                  0x0000000D
+CONSTANT: DIF_DETECT                          0x0000000F
+CONSTANT: DIF_INSTALLWIZARD                   0x00000010
+CONSTANT: DIF_DESTROYWIZARDDATA               0x00000011
+CONSTANT: DIF_PROPERTYCHANGE                  0x00000012
+CONSTANT: DIF_ENABLECLASS                     0x00000013
+CONSTANT: DIF_DETECTVERIFY                    0x00000014
+CONSTANT: DIF_INSTALLDEVICEFILES              0x00000015
+CONSTANT: DIF_UNREMOVE                        0x00000016
+CONSTANT: DIF_SELECTBESTCOMPATDRV             0x00000017
+CONSTANT: DIF_ALLOW_INSTALL                   0x00000018
+CONSTANT: DIF_REGISTERDEVICE                  0x00000019
+CONSTANT: DIF_NEWDEVICEWIZARD_PRESELECT       0x0000001A
+CONSTANT: DIF_NEWDEVICEWIZARD_SELECT          0x0000001B
+CONSTANT: DIF_NEWDEVICEWIZARD_PREANALYZE      0x0000001C
+CONSTANT: DIF_NEWDEVICEWIZARD_POSTANALYZE     0x0000001D
+CONSTANT: DIF_NEWDEVICEWIZARD_FINISHINSTALL   0x0000001E
+CONSTANT: DIF_UNUSED1                         0x0000001F
+CONSTANT: DIF_INSTALLINTERFACES               0x00000020
+CONSTANT: DIF_DETECTCANCEL                    0x00000021
+CONSTANT: DIF_REGISTER_COINSTALLERS           0x00000022
+CONSTANT: DIF_ADDPROPERTYPAGE_ADVANCED        0x00000023
+CONSTANT: DIF_ADDPROPERTYPAGE_BASIC           0x00000024
+CONSTANT: DIF_RESERVED1                       0x00000025
+CONSTANT: DIF_TROUBLESHOOTER                  0x00000026
+CONSTANT: DIF_POWERMESSAGEWAKE                0x00000027
+CONSTANT: DIF_ADDREMOTEPROPERTYPAGE_ADVANCED  0x00000028
+CONSTANT: DIF_UPDATEDRIVER_UI                 0x00000029
+CONSTANT: DIF_FINISHINSTALL_ACTION            0x0000002A
+CONSTANT: DIF_RESERVED2                       0x00000030
+CONSTANT: DIF_MOVEDEVICE                      0x0000000E
 TYPEDEF: UINT DI_FUNCTION
 
 STRUCT: SP_DEVINSTALL_PARAMS_A
@@ -510,70 +510,70 @@ TYPEDEF: SP_DEVINSTALL_PARAMS_W* PSP_DEVINSTALL_PARAMS_W
 TYPEDEF: SP_DEVINSTALL_PARAMS_W SP_DEVINSTALL_PARAMS
 TYPEDEF: PSP_DEVINSTALL_PARAMS_W PSP_DEVINSTALL_PARAMS
 
-CONSTANT: DI_SHOWOEM                  HEX: 00000001
-CONSTANT: DI_SHOWCOMPAT               HEX: 00000002
-CONSTANT: DI_SHOWCLASS                HEX: 00000004
-CONSTANT: DI_SHOWALL                  HEX: 00000007
-CONSTANT: DI_NOVCP                    HEX: 00000008
-CONSTANT: DI_DIDCOMPAT                HEX: 00000010
-CONSTANT: DI_DIDCLASS                 HEX: 00000020
-CONSTANT: DI_AUTOASSIGNRES            HEX: 00000040
-CONSTANT: DI_NEEDRESTART              HEX: 00000080
-CONSTANT: DI_NEEDREBOOT               HEX: 00000100
-CONSTANT: DI_NOBROWSE                 HEX: 00000200
-CONSTANT: DI_MULTMFGS                 HEX: 00000400
-CONSTANT: DI_DISABLED                 HEX: 00000800
-CONSTANT: DI_GENERALPAGE_ADDED        HEX: 00001000
-CONSTANT: DI_RESOURCEPAGE_ADDED       HEX: 00002000
-CONSTANT: DI_PROPERTIES_CHANGE        HEX: 00004000
-CONSTANT: DI_INF_IS_SORTED            HEX: 00008000
-CONSTANT: DI_ENUMSINGLEINF            HEX: 00010000
-CONSTANT: DI_DONOTCALLCONFIGMG        HEX: 00020000
-CONSTANT: DI_INSTALLDISABLED          HEX: 00040000
-CONSTANT: DI_COMPAT_FROM_CLASS        HEX: 00080000
-CONSTANT: DI_CLASSINSTALLPARAMS       HEX: 00100000
-CONSTANT: DI_NODI_DEFAULTACTION       HEX: 00200000
-CONSTANT: DI_QUIETINSTALL             HEX: 00800000
-CONSTANT: DI_NOFILECOPY               HEX: 01000000
-CONSTANT: DI_FORCECOPY                HEX: 02000000
-CONSTANT: DI_DRIVERPAGE_ADDED         HEX: 04000000
-CONSTANT: DI_USECI_SELECTSTRINGS      HEX: 08000000
-CONSTANT: DI_OVERRIDE_INFFLAGS        HEX: 10000000
-CONSTANT: DI_PROPS_NOCHANGEUSAGE      HEX: 20000000
-CONSTANT: DI_NOSELECTICONS            HEX: 40000000
-CONSTANT: DI_NOWRITE_IDS              HEX: 80000000
-CONSTANT: DI_FLAGSEX_RESERVED2                HEX: 00000001
-CONSTANT: DI_FLAGSEX_RESERVED3                HEX: 00000002
-CONSTANT: DI_FLAGSEX_CI_FAILED                HEX: 00000004
-CONSTANT: DI_FLAGSEX_FINISHINSTALL_ACTION     HEX: 00000008
-CONSTANT: DI_FLAGSEX_DIDINFOLIST              HEX: 00000010
-CONSTANT: DI_FLAGSEX_DIDCOMPATINFO            HEX: 00000020
-CONSTANT: DI_FLAGSEX_FILTERCLASSES            HEX: 00000040
-CONSTANT: DI_FLAGSEX_SETFAILEDINSTALL         HEX: 00000080
-CONSTANT: DI_FLAGSEX_DEVICECHANGE             HEX: 00000100
-CONSTANT: DI_FLAGSEX_ALWAYSWRITEIDS           HEX: 00000200
-CONSTANT: DI_FLAGSEX_PROPCHANGE_PENDING       HEX: 00000400
-CONSTANT: DI_FLAGSEX_ALLOWEXCLUDEDDRVS        HEX: 00000800
-CONSTANT: DI_FLAGSEX_NOUIONQUERYREMOVE        HEX: 00001000
-CONSTANT: DI_FLAGSEX_USECLASSFORCOMPAT        HEX: 00002000
-CONSTANT: DI_FLAGSEX_RESERVED4                HEX: 00004000
-CONSTANT: DI_FLAGSEX_NO_DRVREG_MODIFY         HEX: 00008000
-CONSTANT: DI_FLAGSEX_IN_SYSTEM_SETUP          HEX: 00010000
-CONSTANT: DI_FLAGSEX_INET_DRIVER              HEX: 00020000
-CONSTANT: DI_FLAGSEX_APPENDDRIVERLIST         HEX: 00040000
-CONSTANT: DI_FLAGSEX_PREINSTALLBACKUP         HEX: 00080000
-CONSTANT: DI_FLAGSEX_BACKUPONREPLACE          HEX: 00100000
-CONSTANT: DI_FLAGSEX_DRIVERLIST_FROM_URL      HEX: 00200000
-CONSTANT: DI_FLAGSEX_RESERVED1                HEX: 00400000
-CONSTANT: DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS HEX: 00800000
-CONSTANT: DI_FLAGSEX_POWERPAGE_ADDED          HEX: 01000000
-CONSTANT: DI_FLAGSEX_FILTERSIMILARDRIVERS     HEX: 02000000
-CONSTANT: DI_FLAGSEX_INSTALLEDDRIVER          HEX: 04000000
-CONSTANT: DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE  HEX: 08000000
-CONSTANT: DI_FLAGSEX_ALTPLATFORM_DRVSEARCH    HEX: 10000000
-CONSTANT: DI_FLAGSEX_RESTART_DEVICE_ONLY      HEX: 20000000
-CONSTANT: DI_FLAGSEX_RECURSIVESEARCH          HEX: 40000000
-CONSTANT: DI_FLAGSEX_SEARCH_PUBLISHED_INFS    HEX: 80000000
+CONSTANT: DI_SHOWOEM                  0x00000001
+CONSTANT: DI_SHOWCOMPAT               0x00000002
+CONSTANT: DI_SHOWCLASS                0x00000004
+CONSTANT: DI_SHOWALL                  0x00000007
+CONSTANT: DI_NOVCP                    0x00000008
+CONSTANT: DI_DIDCOMPAT                0x00000010
+CONSTANT: DI_DIDCLASS                 0x00000020
+CONSTANT: DI_AUTOASSIGNRES            0x00000040
+CONSTANT: DI_NEEDRESTART              0x00000080
+CONSTANT: DI_NEEDREBOOT               0x00000100
+CONSTANT: DI_NOBROWSE                 0x00000200
+CONSTANT: DI_MULTMFGS                 0x00000400
+CONSTANT: DI_DISABLED                 0x00000800
+CONSTANT: DI_GENERALPAGE_ADDED        0x00001000
+CONSTANT: DI_RESOURCEPAGE_ADDED       0x00002000
+CONSTANT: DI_PROPERTIES_CHANGE        0x00004000
+CONSTANT: DI_INF_IS_SORTED            0x00008000
+CONSTANT: DI_ENUMSINGLEINF            0x00010000
+CONSTANT: DI_DONOTCALLCONFIGMG        0x00020000
+CONSTANT: DI_INSTALLDISABLED          0x00040000
+CONSTANT: DI_COMPAT_FROM_CLASS        0x00080000
+CONSTANT: DI_CLASSINSTALLPARAMS       0x00100000
+CONSTANT: DI_NODI_DEFAULTACTION       0x00200000
+CONSTANT: DI_QUIETINSTALL             0x00800000
+CONSTANT: DI_NOFILECOPY               0x01000000
+CONSTANT: DI_FORCECOPY                0x02000000
+CONSTANT: DI_DRIVERPAGE_ADDED         0x04000000
+CONSTANT: DI_USECI_SELECTSTRINGS      0x08000000
+CONSTANT: DI_OVERRIDE_INFFLAGS        0x10000000
+CONSTANT: DI_PROPS_NOCHANGEUSAGE      0x20000000
+CONSTANT: DI_NOSELECTICONS            0x40000000
+CONSTANT: DI_NOWRITE_IDS              0x80000000
+CONSTANT: DI_FLAGSEX_RESERVED2                0x00000001
+CONSTANT: DI_FLAGSEX_RESERVED3                0x00000002
+CONSTANT: DI_FLAGSEX_CI_FAILED                0x00000004
+CONSTANT: DI_FLAGSEX_FINISHINSTALL_ACTION     0x00000008
+CONSTANT: DI_FLAGSEX_DIDINFOLIST              0x00000010
+CONSTANT: DI_FLAGSEX_DIDCOMPATINFO            0x00000020
+CONSTANT: DI_FLAGSEX_FILTERCLASSES            0x00000040
+CONSTANT: DI_FLAGSEX_SETFAILEDINSTALL         0x00000080
+CONSTANT: DI_FLAGSEX_DEVICECHANGE             0x00000100
+CONSTANT: DI_FLAGSEX_ALWAYSWRITEIDS           0x00000200
+CONSTANT: DI_FLAGSEX_PROPCHANGE_PENDING       0x00000400
+CONSTANT: DI_FLAGSEX_ALLOWEXCLUDEDDRVS        0x00000800
+CONSTANT: DI_FLAGSEX_NOUIONQUERYREMOVE        0x00001000
+CONSTANT: DI_FLAGSEX_USECLASSFORCOMPAT        0x00002000
+CONSTANT: DI_FLAGSEX_RESERVED4                0x00004000
+CONSTANT: DI_FLAGSEX_NO_DRVREG_MODIFY         0x00008000
+CONSTANT: DI_FLAGSEX_IN_SYSTEM_SETUP          0x00010000
+CONSTANT: DI_FLAGSEX_INET_DRIVER              0x00020000
+CONSTANT: DI_FLAGSEX_APPENDDRIVERLIST         0x00040000
+CONSTANT: DI_FLAGSEX_PREINSTALLBACKUP         0x00080000
+CONSTANT: DI_FLAGSEX_BACKUPONREPLACE          0x00100000
+CONSTANT: DI_FLAGSEX_DRIVERLIST_FROM_URL      0x00200000
+CONSTANT: DI_FLAGSEX_RESERVED1                0x00400000
+CONSTANT: DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS 0x00800000
+CONSTANT: DI_FLAGSEX_POWERPAGE_ADDED          0x01000000
+CONSTANT: DI_FLAGSEX_FILTERSIMILARDRIVERS     0x02000000
+CONSTANT: DI_FLAGSEX_INSTALLEDDRIVER          0x04000000
+CONSTANT: DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE  0x08000000
+CONSTANT: DI_FLAGSEX_ALTPLATFORM_DRVSEARCH    0x10000000
+CONSTANT: DI_FLAGSEX_RESTART_DEVICE_ONLY      0x20000000
+CONSTANT: DI_FLAGSEX_RECURSIVESEARCH          0x40000000
+CONSTANT: DI_FLAGSEX_SEARCH_PUBLISHED_INFS    0x80000000
 
 STRUCT: SP_CLASSINSTALL_HEADER
     { cbSize          DWORD       }
@@ -589,14 +589,14 @@ TYPEDEF: SP_ENABLECLASS_PARAMS* PSP_ENABLECLASS_PARAMS
 CONSTANT: ENABLECLASS_QUERY   0
 CONSTANT: ENABLECLASS_SUCCESS 1
 CONSTANT: ENABLECLASS_FAILURE 2
-CONSTANT: DICS_ENABLE      HEX: 00000001
-CONSTANT: DICS_DISABLE     HEX: 00000002
-CONSTANT: DICS_PROPCHANGE  HEX: 00000003
-CONSTANT: DICS_START       HEX: 00000004
-CONSTANT: DICS_STOP        HEX: 00000005
-CONSTANT: DICS_FLAG_GLOBAL         HEX: 00000001
-CONSTANT: DICS_FLAG_CONFIGSPECIFIC HEX: 00000002
-CONSTANT: DICS_FLAG_CONFIGGENERAL  HEX: 00000004
+CONSTANT: DICS_ENABLE      0x00000001
+CONSTANT: DICS_DISABLE     0x00000002
+CONSTANT: DICS_PROPCHANGE  0x00000003
+CONSTANT: DICS_START       0x00000004
+CONSTANT: DICS_STOP        0x00000005
+CONSTANT: DICS_FLAG_GLOBAL         0x00000001
+CONSTANT: DICS_FLAG_CONFIGSPECIFIC 0x00000002
+CONSTANT: DICS_FLAG_CONFIGGENERAL  0x00000004
 
 STRUCT: SP_PROPCHANGE_PARAMS
     { ClassInstallHeader           SP_CLASSINSTALL_HEADER }
@@ -611,8 +611,8 @@ STRUCT: SP_REMOVEDEVICE_PARAMS
     { HwProfile          DWORD                  } ;
 TYPEDEF: SP_REMOVEDEVICE_PARAMS* PSP_REMOVEDEVICE_PARAMS
 
-CONSTANT: DI_REMOVEDEVICE_GLOBAL                  HEX: 00000001
-CONSTANT: DI_REMOVEDEVICE_CONFIGSPECIFIC          HEX: 00000002
+CONSTANT: DI_REMOVEDEVICE_GLOBAL                  0x00000001
+CONSTANT: DI_REMOVEDEVICE_CONFIGSPECIFIC          0x00000002
 
 STRUCT: SP_UNREMOVEDEVICE_PARAMS
     { ClassInstallHeader SP_CLASSINSTALL_HEADER }
@@ -620,7 +620,7 @@ STRUCT: SP_UNREMOVEDEVICE_PARAMS
     { HwProfile          DWORD                  } ;
 TYPEDEF: SP_UNREMOVEDEVICE_PARAMS* PSP_UNREMOVEDEVICE_PARAMS
 
-CONSTANT: DI_UNREMOVEDEVICE_CONFIGSPECIFIC        HEX: 00000002
+CONSTANT: DI_UNREMOVEDEVICE_CONFIGSPECIFIC        0x00000002
 
 STRUCT: SP_SELECTDEVICE_PARAMS_A
     { ClassInstallHeader             SP_CLASSINSTALL_HEADER    }
@@ -661,25 +661,25 @@ STRUCT: SP_INSTALLWIZARD_DATA
     { hwndWizardDlg                     HWND                                        } ;
 TYPEDEF: SP_INSTALLWIZARD_DATA* PSP_INSTALLWIZARD_DATA
 
-CONSTANT: NDW_INSTALLFLAG_DIDFACTDEFS         HEX: 00000001
-CONSTANT: NDW_INSTALLFLAG_HARDWAREALLREADYIN  HEX: 00000002
+CONSTANT: NDW_INSTALLFLAG_DIDFACTDEFS         0x00000001
+CONSTANT: NDW_INSTALLFLAG_HARDWAREALLREADYIN  0x00000002
 CONSTANT: NDW_INSTALLFLAG_NEEDRESTART         $ DI_NEEDRESTART
 CONSTANT: NDW_INSTALLFLAG_NEEDREBOOT          $ DI_NEEDREBOOT
-CONSTANT: NDW_INSTALLFLAG_NEEDSHUTDOWN        HEX: 00000200
-CONSTANT: NDW_INSTALLFLAG_EXPRESSINTRO        HEX: 00000400
-CONSTANT: NDW_INSTALLFLAG_SKIPISDEVINSTALLED  HEX: 00000800
-CONSTANT: NDW_INSTALLFLAG_NODETECTEDDEVS      HEX: 00001000
-CONSTANT: NDW_INSTALLFLAG_INSTALLSPECIFIC     HEX: 00002000
-CONSTANT: NDW_INSTALLFLAG_SKIPCLASSLIST       HEX: 00004000
-CONSTANT: NDW_INSTALLFLAG_CI_PICKED_OEM       HEX: 00008000
-CONSTANT: NDW_INSTALLFLAG_PCMCIAMODE          HEX: 00010000
-CONSTANT: NDW_INSTALLFLAG_PCMCIADEVICE        HEX: 00020000
-CONSTANT: NDW_INSTALLFLAG_USERCANCEL          HEX: 00040000
-CONSTANT: NDW_INSTALLFLAG_KNOWNCLASS          HEX: 00080000
-CONSTANT: DYNAWIZ_FLAG_PAGESADDED             HEX: 00000001
-CONSTANT: DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT HEX: 00000008
-CONSTANT: DYNAWIZ_FLAG_INSTALLDET_NEXT        HEX: 00000002
-CONSTANT: DYNAWIZ_FLAG_INSTALLDET_PREV        HEX: 00000004
+CONSTANT: NDW_INSTALLFLAG_NEEDSHUTDOWN        0x00000200
+CONSTANT: NDW_INSTALLFLAG_EXPRESSINTRO        0x00000400
+CONSTANT: NDW_INSTALLFLAG_SKIPISDEVINSTALLED  0x00000800
+CONSTANT: NDW_INSTALLFLAG_NODETECTEDDEVS      0x00001000
+CONSTANT: NDW_INSTALLFLAG_INSTALLSPECIFIC     0x00002000
+CONSTANT: NDW_INSTALLFLAG_SKIPCLASSLIST       0x00004000
+CONSTANT: NDW_INSTALLFLAG_CI_PICKED_OEM       0x00008000
+CONSTANT: NDW_INSTALLFLAG_PCMCIAMODE          0x00010000
+CONSTANT: NDW_INSTALLFLAG_PCMCIADEVICE        0x00020000
+CONSTANT: NDW_INSTALLFLAG_USERCANCEL          0x00040000
+CONSTANT: NDW_INSTALLFLAG_KNOWNCLASS          0x00080000
+CONSTANT: DYNAWIZ_FLAG_PAGESADDED             0x00000001
+CONSTANT: DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT 0x00000008
+CONSTANT: DYNAWIZ_FLAG_INSTALLDET_NEXT        0x00000002
+CONSTANT: DYNAWIZ_FLAG_INSTALLDET_PREV        0x00000004
 CONSTANT: MIN_IDD_DYNAWIZ_RESOURCE_ID             10000
 CONSTANT: MAX_IDD_DYNAWIZ_RESOURCE_ID             11000
 CONSTANT: IDD_DYNAWIZ_FIRSTPAGE                   10000
@@ -810,42 +810,42 @@ STRUCT: SP_DRVINSTALL_PARAMS
     { Reserved    DWORD     } ;
 TYPEDEF: SP_DRVINSTALL_PARAMS* PSP_DRVINSTALL_PARAMS
 
-CONSTANT: DNF_DUPDESC             HEX: 00000001
-CONSTANT: DNF_OLDDRIVER           HEX: 00000002
-CONSTANT: DNF_EXCLUDEFROMLIST     HEX: 00000004
-CONSTANT: DNF_NODRIVER            HEX: 00000008
-CONSTANT: DNF_LEGACYINF           HEX: 00000010
-CONSTANT: DNF_CLASS_DRIVER        HEX: 00000020
-CONSTANT: DNF_COMPATIBLE_DRIVER   HEX: 00000040
-CONSTANT: DNF_INET_DRIVER         HEX: 00000080
-CONSTANT: DNF_UNUSED1             HEX: 00000100
-CONSTANT: DNF_UNUSED2             HEX: 00000200
-CONSTANT: DNF_OLD_INET_DRIVER     HEX: 00000400
-CONSTANT: DNF_BAD_DRIVER          HEX: 00000800
-CONSTANT: DNF_DUPPROVIDER         HEX: 00001000
-CONSTANT: DNF_INF_IS_SIGNED         HEX: 00002000
-CONSTANT: DNF_OEM_F6_INF            HEX: 00004000
-CONSTANT: DNF_DUPDRIVERVER          HEX: 00008000
-CONSTANT: DNF_BASIC_DRIVER          HEX: 00010000
-CONSTANT: DNF_AUTHENTICODE_SIGNED   HEX: 00020000
-CONSTANT: DNF_INSTALLEDDRIVER       HEX: 00040000
-CONSTANT: DNF_ALWAYSEXCLUDEFROMLIST HEX: 00080000
-CONSTANT: DNF_INBOX_DRIVER          HEX: 00100000
-CONSTANT: DNF_REQUESTADDITIONALSOFTWARE   HEX: 00200000
-CONSTANT: DNF_UNUSED_22             HEX: 00400000
-CONSTANT: DNF_UNUSED_23             HEX: 00800000
-CONSTANT: DNF_UNUSED_24             HEX: 01000000
-CONSTANT: DNF_UNUSED_25             HEX: 02000000
-CONSTANT: DNF_UNUSED_26             HEX: 04000000
-CONSTANT: DNF_UNUSED_27             HEX: 08000000
-CONSTANT: DNF_UNUSED_28             HEX: 10000000
-CONSTANT: DNF_UNUSED_29             HEX: 20000000
-CONSTANT: DNF_UNUSED_30             HEX: 40000000
-CONSTANT: DNF_UNUSED_31             HEX: 80000000
-CONSTANT: DRIVER_HARDWAREID_RANK  HEX: 00000FFF
-CONSTANT: DRIVER_HARDWAREID_MASK  HEX: 80000FFF
-CONSTANT: DRIVER_UNTRUSTED_RANK   HEX: 80000000
-CONSTANT: DRIVER_W9X_SUSPECT_RANK HEX: C0000000
+CONSTANT: DNF_DUPDESC             0x00000001
+CONSTANT: DNF_OLDDRIVER           0x00000002
+CONSTANT: DNF_EXCLUDEFROMLIST     0x00000004
+CONSTANT: DNF_NODRIVER            0x00000008
+CONSTANT: DNF_LEGACYINF           0x00000010
+CONSTANT: DNF_CLASS_DRIVER        0x00000020
+CONSTANT: DNF_COMPATIBLE_DRIVER   0x00000040
+CONSTANT: DNF_INET_DRIVER         0x00000080
+CONSTANT: DNF_UNUSED1             0x00000100
+CONSTANT: DNF_UNUSED2             0x00000200
+CONSTANT: DNF_OLD_INET_DRIVER     0x00000400
+CONSTANT: DNF_BAD_DRIVER          0x00000800
+CONSTANT: DNF_DUPPROVIDER         0x00001000
+CONSTANT: DNF_INF_IS_SIGNED         0x00002000
+CONSTANT: DNF_OEM_F6_INF            0x00004000
+CONSTANT: DNF_DUPDRIVERVER          0x00008000
+CONSTANT: DNF_BASIC_DRIVER          0x00010000
+CONSTANT: DNF_AUTHENTICODE_SIGNED   0x00020000
+CONSTANT: DNF_INSTALLEDDRIVER       0x00040000
+CONSTANT: DNF_ALWAYSEXCLUDEFROMLIST 0x00080000
+CONSTANT: DNF_INBOX_DRIVER          0x00100000
+CONSTANT: DNF_REQUESTADDITIONALSOFTWARE   0x00200000
+CONSTANT: DNF_UNUSED_22             0x00400000
+CONSTANT: DNF_UNUSED_23             0x00800000
+CONSTANT: DNF_UNUSED_24             0x01000000
+CONSTANT: DNF_UNUSED_25             0x02000000
+CONSTANT: DNF_UNUSED_26             0x04000000
+CONSTANT: DNF_UNUSED_27             0x08000000
+CONSTANT: DNF_UNUSED_28             0x10000000
+CONSTANT: DNF_UNUSED_29             0x20000000
+CONSTANT: DNF_UNUSED_30             0x40000000
+CONSTANT: DNF_UNUSED_31             0x80000000
+CONSTANT: DRIVER_HARDWAREID_RANK  0x00000FFF
+CONSTANT: DRIVER_HARDWAREID_MASK  0x80000FFF
+CONSTANT: DRIVER_UNTRUSTED_RANK   0x80000000
+CONSTANT: DRIVER_W9X_SUSPECT_RANK 0xC0000000
 
 CALLBACK: DWORD PSP_DETSIG_CMPPROC ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA NewDeviceData, PSP_DEVINFO_DATA ExistingDeviceData, PVOID CompareContext ) ;
 
@@ -913,93 +913,93 @@ CONSTANT: ERROR_EXPECTED_SECTION_NAME  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_
 CONSTANT: ERROR_BAD_SECTION_NAME_LINE  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 1 bitor bitor ]
 CONSTANT: ERROR_SECTION_NAME_TOO_LONG  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 2 bitor bitor ]
 CONSTANT: ERROR_GENERAL_SYNTAX         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 3 bitor bitor ]
-CONSTANT: ERROR_WRONG_INF_STYLE        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 100 bitor bitor ]
-CONSTANT: ERROR_SECTION_NOT_FOUND      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 101 bitor bitor ]
-CONSTANT: ERROR_LINE_NOT_FOUND         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 102 bitor bitor ]
-CONSTANT: ERROR_NO_BACKUP              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 103 bitor bitor ]
-CONSTANT: ERROR_NO_ASSOCIATED_CLASS                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 200 bitor bitor ]
-CONSTANT: ERROR_CLASS_MISMATCH                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 201 bitor bitor ]
-CONSTANT: ERROR_DUPLICATE_FOUND                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 202 bitor bitor ]
-CONSTANT: ERROR_NO_DRIVER_SELECTED                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 203 bitor bitor ]
-CONSTANT: ERROR_KEY_DOES_NOT_EXIST                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 204 bitor bitor ]
-CONSTANT: ERROR_INVALID_DEVINST_NAME               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 205 bitor bitor ]
-CONSTANT: ERROR_INVALID_CLASS                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 206 bitor bitor ]
-CONSTANT: ERROR_DEVINST_ALREADY_EXISTS             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 207 bitor bitor ]
-CONSTANT: ERROR_DEVINFO_NOT_REGISTERED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 208 bitor bitor ]
-CONSTANT: ERROR_INVALID_REG_PROPERTY               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 209 bitor bitor ]
-CONSTANT: ERROR_NO_INF                             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20A bitor bitor ]
-CONSTANT: ERROR_NO_SUCH_DEVINST                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20B bitor bitor ]
-CONSTANT: ERROR_CANT_LOAD_CLASS_ICON               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20C bitor bitor ]
-CONSTANT: ERROR_INVALID_CLASS_INSTALLER            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20D bitor bitor ]
-CONSTANT: ERROR_DI_DO_DEFAULT                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20E bitor bitor ]
-CONSTANT: ERROR_DI_NOFILECOPY                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20F bitor bitor ]
-CONSTANT: ERROR_INVALID_HWPROFILE                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 210 bitor bitor ]
-CONSTANT: ERROR_NO_DEVICE_SELECTED                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 211 bitor bitor ]
-CONSTANT: ERROR_DEVINFO_LIST_LOCKED                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 212 bitor bitor ]
-CONSTANT: ERROR_DEVINFO_DATA_LOCKED                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 213 bitor bitor ]
-CONSTANT: ERROR_DI_BAD_PATH                        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 214 bitor bitor ]
-CONSTANT: ERROR_NO_CLASSINSTALL_PARAMS             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 215 bitor bitor ]
-CONSTANT: ERROR_FILEQUEUE_LOCKED                   $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 216 bitor bitor ]
-CONSTANT: ERROR_BAD_SERVICE_INSTALLSECT            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 217 bitor bitor ]
-CONSTANT: ERROR_NO_CLASS_DRIVER_LIST               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 218 bitor bitor ]
-CONSTANT: ERROR_NO_ASSOCIATED_SERVICE              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 219 bitor bitor ]
-CONSTANT: ERROR_NO_DEFAULT_DEVICE_INTERFACE        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21A bitor bitor ]
-CONSTANT: ERROR_DEVICE_INTERFACE_ACTIVE            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21B bitor bitor ]
-CONSTANT: ERROR_DEVICE_INTERFACE_REMOVED           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21C bitor bitor ]
-CONSTANT: ERROR_BAD_INTERFACE_INSTALLSECT          $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21D bitor bitor ]
-CONSTANT: ERROR_NO_SUCH_INTERFACE_CLASS            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21E bitor bitor ]
-CONSTANT: ERROR_INVALID_REFERENCE_STRING           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21F bitor bitor ]
-CONSTANT: ERROR_INVALID_MACHINENAME                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 220 bitor bitor ]
-CONSTANT: ERROR_REMOTE_COMM_FAILURE                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 221 bitor bitor ]
-CONSTANT: ERROR_MACHINE_UNAVAILABLE                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 222 bitor bitor ]
-CONSTANT: ERROR_NO_CONFIGMGR_SERVICES              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 223 bitor bitor ]
-CONSTANT: ERROR_INVALID_PROPPAGE_PROVIDER          $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 224 bitor bitor ]
-CONSTANT: ERROR_NO_SUCH_DEVICE_INTERFACE           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 225 bitor bitor ]
-CONSTANT: ERROR_DI_POSTPROCESSING_REQUIRED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 226 bitor bitor ]
-CONSTANT: ERROR_INVALID_COINSTALLER                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 227 bitor bitor ]
-CONSTANT: ERROR_NO_COMPAT_DRIVERS                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 228 bitor bitor ]
-CONSTANT: ERROR_NO_DEVICE_ICON                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 229 bitor bitor ]
-CONSTANT: ERROR_INVALID_INF_LOGCONFIG              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22A bitor bitor ]
-CONSTANT: ERROR_DI_DONT_INSTALL                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22B bitor bitor ]
-CONSTANT: ERROR_INVALID_FILTER_DRIVER              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22C bitor bitor ]
-CONSTANT: ERROR_NON_WINDOWS_NT_DRIVER              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22D bitor bitor ]
-CONSTANT: ERROR_NON_WINDOWS_DRIVER                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22E bitor bitor ]
-CONSTANT: ERROR_NO_CATALOG_FOR_OEM_INF             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22F bitor bitor ]
-CONSTANT: ERROR_DEVINSTALL_QUEUE_NONNATIVE         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 230 bitor bitor ]
-CONSTANT: ERROR_NOT_DISABLEABLE                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 231 bitor bitor ]
-CONSTANT: ERROR_CANT_REMOVE_DEVINST                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 232 bitor bitor ]
-CONSTANT: ERROR_INVALID_TARGET                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 233 bitor bitor ]
-CONSTANT: ERROR_DRIVER_NONNATIVE                   $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 234 bitor bitor ]
-CONSTANT: ERROR_IN_WOW64                           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 235 bitor bitor ]
-CONSTANT: ERROR_SET_SYSTEM_RESTORE_POINT           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 236 bitor bitor ]
-CONSTANT: ERROR_SCE_DISABLED                       $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 238 bitor bitor ]
-CONSTANT: ERROR_UNKNOWN_EXCEPTION                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 239 bitor bitor ]
-CONSTANT: ERROR_PNP_REGISTRY_ERROR                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23A bitor bitor ]
-CONSTANT: ERROR_REMOTE_REQUEST_UNSUPPORTED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23B bitor bitor ]
-CONSTANT: ERROR_NOT_AN_INSTALLED_OEM_INF           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23C bitor bitor ]
-CONSTANT: ERROR_INF_IN_USE_BY_DEVICES              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23D bitor bitor ]
-CONSTANT: ERROR_DI_FUNCTION_OBSOLETE               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23E bitor bitor ]
-CONSTANT: ERROR_NO_AUTHENTICODE_CATALOG            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23F bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_DISALLOWED            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 240 bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_TRUSTED_PUBLISHER     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 241 bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 242 bitor bitor ]
-CONSTANT: ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 243 bitor bitor ]
-CONSTANT: ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 244 bitor bitor ]
-CONSTANT: ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 245 bitor bitor ]
-CONSTANT: ERROR_DEVICE_INSTALLER_NOT_READY         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 246 bitor bitor ]
-CONSTANT: ERROR_DRIVER_STORE_ADD_FAILED            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 247 bitor bitor ]
-CONSTANT: ERROR_DEVICE_INSTALL_BLOCKED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 248 bitor bitor ]
-CONSTANT: ERROR_DRIVER_INSTALL_BLOCKED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 249 bitor bitor ]
-CONSTANT: ERROR_WRONG_INF_TYPE                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 24A bitor bitor ]
-CONSTANT: ERROR_FILE_HASH_NOT_IN_CATALOG           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 24B bitor bitor ]
-CONSTANT: ERROR_DRIVER_STORE_DELETE_FAILED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 24C bitor bitor ]
-CONSTANT: ERROR_UNRECOVERABLE_STACK_OVERFLOW $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 300 bitor bitor ]
+CONSTANT: ERROR_WRONG_INF_STYLE        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x100 bitor bitor ]
+CONSTANT: ERROR_SECTION_NOT_FOUND      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x101 bitor bitor ]
+CONSTANT: ERROR_LINE_NOT_FOUND         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x102 bitor bitor ]
+CONSTANT: ERROR_NO_BACKUP              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x103 bitor bitor ]
+CONSTANT: ERROR_NO_ASSOCIATED_CLASS                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x200 bitor bitor ]
+CONSTANT: ERROR_CLASS_MISMATCH                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x201 bitor bitor ]
+CONSTANT: ERROR_DUPLICATE_FOUND                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x202 bitor bitor ]
+CONSTANT: ERROR_NO_DRIVER_SELECTED                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x203 bitor bitor ]
+CONSTANT: ERROR_KEY_DOES_NOT_EXIST                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x204 bitor bitor ]
+CONSTANT: ERROR_INVALID_DEVINST_NAME               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x205 bitor bitor ]
+CONSTANT: ERROR_INVALID_CLASS                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x206 bitor bitor ]
+CONSTANT: ERROR_DEVINST_ALREADY_EXISTS             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x207 bitor bitor ]
+CONSTANT: ERROR_DEVINFO_NOT_REGISTERED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x208 bitor bitor ]
+CONSTANT: ERROR_INVALID_REG_PROPERTY               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x209 bitor bitor ]
+CONSTANT: ERROR_NO_INF                             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20A bitor bitor ]
+CONSTANT: ERROR_NO_SUCH_DEVINST                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20B bitor bitor ]
+CONSTANT: ERROR_CANT_LOAD_CLASS_ICON               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20C bitor bitor ]
+CONSTANT: ERROR_INVALID_CLASS_INSTALLER            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20D bitor bitor ]
+CONSTANT: ERROR_DI_DO_DEFAULT                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20E bitor bitor ]
+CONSTANT: ERROR_DI_NOFILECOPY                      $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20F bitor bitor ]
+CONSTANT: ERROR_INVALID_HWPROFILE                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x210 bitor bitor ]
+CONSTANT: ERROR_NO_DEVICE_SELECTED                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x211 bitor bitor ]
+CONSTANT: ERROR_DEVINFO_LIST_LOCKED                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x212 bitor bitor ]
+CONSTANT: ERROR_DEVINFO_DATA_LOCKED                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x213 bitor bitor ]
+CONSTANT: ERROR_DI_BAD_PATH                        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x214 bitor bitor ]
+CONSTANT: ERROR_NO_CLASSINSTALL_PARAMS             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x215 bitor bitor ]
+CONSTANT: ERROR_FILEQUEUE_LOCKED                   $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x216 bitor bitor ]
+CONSTANT: ERROR_BAD_SERVICE_INSTALLSECT            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x217 bitor bitor ]
+CONSTANT: ERROR_NO_CLASS_DRIVER_LIST               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x218 bitor bitor ]
+CONSTANT: ERROR_NO_ASSOCIATED_SERVICE              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x219 bitor bitor ]
+CONSTANT: ERROR_NO_DEFAULT_DEVICE_INTERFACE        $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21A bitor bitor ]
+CONSTANT: ERROR_DEVICE_INTERFACE_ACTIVE            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21B bitor bitor ]
+CONSTANT: ERROR_DEVICE_INTERFACE_REMOVED           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21C bitor bitor ]
+CONSTANT: ERROR_BAD_INTERFACE_INSTALLSECT          $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21D bitor bitor ]
+CONSTANT: ERROR_NO_SUCH_INTERFACE_CLASS            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21E bitor bitor ]
+CONSTANT: ERROR_INVALID_REFERENCE_STRING           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21F bitor bitor ]
+CONSTANT: ERROR_INVALID_MACHINENAME                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x220 bitor bitor ]
+CONSTANT: ERROR_REMOTE_COMM_FAILURE                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x221 bitor bitor ]
+CONSTANT: ERROR_MACHINE_UNAVAILABLE                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x222 bitor bitor ]
+CONSTANT: ERROR_NO_CONFIGMGR_SERVICES              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x223 bitor bitor ]
+CONSTANT: ERROR_INVALID_PROPPAGE_PROVIDER          $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x224 bitor bitor ]
+CONSTANT: ERROR_NO_SUCH_DEVICE_INTERFACE           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x225 bitor bitor ]
+CONSTANT: ERROR_DI_POSTPROCESSING_REQUIRED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x226 bitor bitor ]
+CONSTANT: ERROR_INVALID_COINSTALLER                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x227 bitor bitor ]
+CONSTANT: ERROR_NO_COMPAT_DRIVERS                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x228 bitor bitor ]
+CONSTANT: ERROR_NO_DEVICE_ICON                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x229 bitor bitor ]
+CONSTANT: ERROR_INVALID_INF_LOGCONFIG              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22A bitor bitor ]
+CONSTANT: ERROR_DI_DONT_INSTALL                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22B bitor bitor ]
+CONSTANT: ERROR_INVALID_FILTER_DRIVER              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22C bitor bitor ]
+CONSTANT: ERROR_NON_WINDOWS_NT_DRIVER              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22D bitor bitor ]
+CONSTANT: ERROR_NON_WINDOWS_DRIVER                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22E bitor bitor ]
+CONSTANT: ERROR_NO_CATALOG_FOR_OEM_INF             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22F bitor bitor ]
+CONSTANT: ERROR_DEVINSTALL_QUEUE_NONNATIVE         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x230 bitor bitor ]
+CONSTANT: ERROR_NOT_DISABLEABLE                    $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x231 bitor bitor ]
+CONSTANT: ERROR_CANT_REMOVE_DEVINST                $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x232 bitor bitor ]
+CONSTANT: ERROR_INVALID_TARGET                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x233 bitor bitor ]
+CONSTANT: ERROR_DRIVER_NONNATIVE                   $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x234 bitor bitor ]
+CONSTANT: ERROR_IN_WOW64                           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x235 bitor bitor ]
+CONSTANT: ERROR_SET_SYSTEM_RESTORE_POINT           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x236 bitor bitor ]
+CONSTANT: ERROR_SCE_DISABLED                       $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x238 bitor bitor ]
+CONSTANT: ERROR_UNKNOWN_EXCEPTION                  $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x239 bitor bitor ]
+CONSTANT: ERROR_PNP_REGISTRY_ERROR                 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23A bitor bitor ]
+CONSTANT: ERROR_REMOTE_REQUEST_UNSUPPORTED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23B bitor bitor ]
+CONSTANT: ERROR_NOT_AN_INSTALLED_OEM_INF           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23C bitor bitor ]
+CONSTANT: ERROR_INF_IN_USE_BY_DEVICES              $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23D bitor bitor ]
+CONSTANT: ERROR_DI_FUNCTION_OBSOLETE               $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23E bitor bitor ]
+CONSTANT: ERROR_NO_AUTHENTICODE_CATALOG            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23F bitor bitor ]
+CONSTANT: ERROR_AUTHENTICODE_DISALLOWED            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x240 bitor bitor ]
+CONSTANT: ERROR_AUTHENTICODE_TRUSTED_PUBLISHER     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x241 bitor bitor ]
+CONSTANT: ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x242 bitor bitor ]
+CONSTANT: ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x243 bitor bitor ]
+CONSTANT: ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x244 bitor bitor ]
+CONSTANT: ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x245 bitor bitor ]
+CONSTANT: ERROR_DEVICE_INSTALLER_NOT_READY         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x246 bitor bitor ]
+CONSTANT: ERROR_DRIVER_STORE_ADD_FAILED            $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x247 bitor bitor ]
+CONSTANT: ERROR_DEVICE_INSTALL_BLOCKED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x248 bitor bitor ]
+CONSTANT: ERROR_DRIVER_INSTALL_BLOCKED             $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x249 bitor bitor ]
+CONSTANT: ERROR_WRONG_INF_TYPE                     $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24A bitor bitor ]
+CONSTANT: ERROR_FILE_HASH_NOT_IN_CATALOG           $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24B bitor bitor ]
+CONSTANT: ERROR_DRIVER_STORE_DELETE_FAILED         $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24C bitor bitor ]
+CONSTANT: ERROR_UNRECOVERABLE_STACK_OVERFLOW $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x300 bitor bitor ]
 CONSTANT: EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW $ ERROR_UNRECOVERABLE_STACK_OVERFLOW
 CONSTANT: ERROR_NO_DEFAULT_INTERFACE_DEVICE $ ERROR_NO_DEFAULT_DEVICE_INTERFACE
 CONSTANT: ERROR_INTERFACE_DEVICE_ACTIVE     $ ERROR_DEVICE_INTERFACE_ACTIVE
 CONSTANT: ERROR_INTERFACE_DEVICE_REMOVED    $ ERROR_DEVICE_INTERFACE_REMOVED
 CONSTANT: ERROR_NO_SUCH_INTERFACE_DEVICE    $ ERROR_NO_SUCH_DEVICE_INTERFACE
-CONSTANT: ERROR_NOT_INSTALLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 1000 bitor bitor ]
+CONSTANT: ERROR_NOT_INSTALLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x1000 bitor bitor ]
 
 FUNCTION: BOOL SetupGetInfInformationA ( LPCVOID InfSpec, DWORD SearchControl, PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
 FUNCTION: BOOL SetupGetInfInformationW ( LPCVOID InfSpec, DWORD SearchControl, PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
@@ -1106,14 +1106,14 @@ FUNCTION: BOOL SetupGetTargetPathA ( HINF InfHandle, PINFCONTEXT InfContext, PCS
 FUNCTION: BOOL SetupGetTargetPathW ( HINF InfHandle, PINFCONTEXT InfContext, PCWSTR Section, PWSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
 ALIAS: SetupGetTargetPath SetupGetTargetPathW
 
-CONSTANT: SRCLIST_TEMPORARY       HEX: 00000001
-CONSTANT: SRCLIST_NOBROWSE        HEX: 00000002
-CONSTANT: SRCLIST_SYSTEM          HEX: 00000010
-CONSTANT: SRCLIST_USER            HEX: 00000020
-CONSTANT: SRCLIST_SYSIFADMIN      HEX: 00000040
-CONSTANT: SRCLIST_SUBDIRS         HEX: 00000100
-CONSTANT: SRCLIST_APPEND          HEX: 00000200
-CONSTANT: SRCLIST_NOSTRIPPLATFORM HEX: 00000400
+CONSTANT: SRCLIST_TEMPORARY       0x00000001
+CONSTANT: SRCLIST_NOBROWSE        0x00000002
+CONSTANT: SRCLIST_SYSTEM          0x00000010
+CONSTANT: SRCLIST_USER            0x00000020
+CONSTANT: SRCLIST_SYSIFADMIN      0x00000040
+CONSTANT: SRCLIST_SUBDIRS         0x00000100
+CONSTANT: SRCLIST_APPEND          0x00000200
+CONSTANT: SRCLIST_NOSTRIPPLATFORM 0x00000400
 
 FUNCTION: BOOL SetupSetSourceListA ( DWORD Flags, PCSTR* SourceList, UINT SourceCount ) ;
 FUNCTION: BOOL SetupSetSourceListW ( DWORD Flags, PCWSTR* SourceList, UINT SourceCount ) ;
@@ -1156,17 +1156,17 @@ FUNCTION: UINT SetupBackupErrorA ( HWND hwndParent, PCSTR DialogTitle, PCSTR Sou
 FUNCTION: UINT SetupBackupErrorW ( HWND hwndParent, PCWSTR DialogTitle, PCWSTR SourceFile, PCWSTR TargetFile, UINT Win32ErrorCode, DWORD Style ) ;
 ALIAS: SetupBackupError SetupBackupErrorW
 
-CONSTANT: IDF_NOBROWSE                    HEX: 00000001
-CONSTANT: IDF_NOSKIP                      HEX: 00000002
-CONSTANT: IDF_NODETAILS                   HEX: 00000004
-CONSTANT: IDF_NOCOMPRESSED                HEX: 00000008
-CONSTANT: IDF_CHECKFIRST                  HEX: 00000100
-CONSTANT: IDF_NOBEEP                      HEX: 00000200
-CONSTANT: IDF_NOFOREGROUND                HEX: 00000400
-CONSTANT: IDF_WARNIFSKIP                  HEX: 00000800
-CONSTANT: IDF_NOREMOVABLEMEDIAPROMPT      HEX: 00001000
-CONSTANT: IDF_USEDISKNAMEASPROMPT         HEX: 00002000
-CONSTANT: IDF_OEMDISK                     HEX: 80000000
+CONSTANT: IDF_NOBROWSE                    0x00000001
+CONSTANT: IDF_NOSKIP                      0x00000002
+CONSTANT: IDF_NODETAILS                   0x00000004
+CONSTANT: IDF_NOCOMPRESSED                0x00000008
+CONSTANT: IDF_CHECKFIRST                  0x00000100
+CONSTANT: IDF_NOBEEP                      0x00000200
+CONSTANT: IDF_NOFOREGROUND                0x00000400
+CONSTANT: IDF_WARNIFSKIP                  0x00000800
+CONSTANT: IDF_NOREMOVABLEMEDIAPROMPT      0x00001000
+CONSTANT: IDF_USEDISKNAMEASPROMPT         0x00002000
+CONSTANT: IDF_OEMDISK                     0x80000000
 
 CONSTANT: DPROMPT_SUCCESS         0
 CONSTANT: DPROMPT_CANCEL          1
@@ -1182,7 +1182,7 @@ FUNCTION: BOOL SetupSetDirectoryIdExA ( HINF InfHandle, DWORD Id, PCSTR Director
 FUNCTION: BOOL SetupSetDirectoryIdExW ( HINF InfHandle, DWORD Id, PCWSTR Directory, DWORD Flags, DWORD Reserved1, PVOID Reserved2 ) ;
 ALIAS: SetupSetDirectoryIdEx SetupSetDirectoryIdExW
 
-CONSTANT: SETDIRID_NOT_FULL_PATH      HEX: 00000001
+CONSTANT: SETDIRID_NOT_FULL_PATH      0x00000001
 
 FUNCTION: BOOL SetupGetSourceInfoA ( HINF InfHandle, UINT SourceId, UINT InfoDesired, PSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
 FUNCTION: BOOL SetupGetSourceInfoW ( HINF InfHandle, UINT SourceId, UINT InfoDesired, PWSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
@@ -1193,7 +1193,7 @@ CONSTANT: SRCINFO_TAGFILE         2
 CONSTANT: SRCINFO_DESCRIPTION     3
 CONSTANT: SRCINFO_FLAGS           4
 CONSTANT: SRCINFO_TAGFILE2        5
-CONSTANT: SRC_FLAGS_CABFILE       HEX: 0010
+CONSTANT: SRC_FLAGS_CABFILE       0x0010
 
 FUNCTION: BOOL SetupInstallFileA ( HINF InfHandle, PINFCONTEXT InfContext, PCSTR SourceFile, PCSTR SourcePathRoot, PCSTR DestinationName, DWORD CopyStyle, PSP_FILE_CALLBACK_A CopyMsgHandler, PVOID Context ) ;
 FUNCTION: BOOL SetupInstallFileW ( HINF InfHandle, PINFCONTEXT InfContext, PCWSTR SourceFile, PCWSTR SourcePathRoot, PCWSTR DestinationName, DWORD CopyStyle, PSP_FILE_CALLBACK_W CopyMsgHandler, PVOID Context ) ;
@@ -1203,40 +1203,40 @@ FUNCTION: BOOL SetupInstallFileExA ( HINF InfHandle, PINFCONTEXT InfContext, PCS
 FUNCTION: BOOL SetupInstallFileExW ( HINF InfHandle, PINFCONTEXT InfContext, PCWSTR SourceFile, PCWSTR SourcePathRoot, PCWSTR DestinationName, DWORD CopyStyle, PSP_FILE_CALLBACK_W CopyMsgHandler, PVOID Context, PBOOL FileWasInUse ) ;
 ALIAS: SetupInstallFileEx SetupInstallFileExW
 
-CONSTANT: SP_COPY_DELETESOURCE        HEX: 0000001
-CONSTANT: SP_COPY_REPLACEONLY         HEX: 0000002
-CONSTANT: SP_COPY_NEWER               HEX: 0000004
+CONSTANT: SP_COPY_DELETESOURCE        0x0000001
+CONSTANT: SP_COPY_REPLACEONLY         0x0000002
+CONSTANT: SP_COPY_NEWER               0x0000004
 CONSTANT: SP_COPY_NEWER_OR_SAME       $ SP_COPY_NEWER
-CONSTANT: SP_COPY_NOOVERWRITE         HEX: 0000008
-CONSTANT: SP_COPY_NODECOMP            HEX: 0000010
-CONSTANT: SP_COPY_LANGUAGEAWARE       HEX: 0000020
-CONSTANT: SP_COPY_SOURCE_ABSOLUTE     HEX: 0000040
-CONSTANT: SP_COPY_SOURCEPATH_ABSOLUTE HEX: 0000080
-CONSTANT: SP_COPY_IN_USE_NEEDS_REBOOT HEX: 0000100
-CONSTANT: SP_COPY_FORCE_IN_USE        HEX: 0000200
-CONSTANT: SP_COPY_NOSKIP              HEX: 0000400
-CONSTANT: SP_FLAG_CABINETCONTINUATION HEX: 0000800
-CONSTANT: SP_COPY_FORCE_NOOVERWRITE   HEX: 0001000
-CONSTANT: SP_COPY_FORCE_NEWER         HEX: 0002000
-CONSTANT: SP_COPY_WARNIFSKIP          HEX: 0004000
-CONSTANT: SP_COPY_NOBROWSE            HEX: 0008000
-CONSTANT: SP_COPY_NEWER_ONLY          HEX: 0010000
-CONSTANT: SP_COPY_RESERVED            HEX: 0020000
-CONSTANT: SP_COPY_OEMINF_CATALOG_ONLY HEX: 0040000
-CONSTANT: SP_COPY_REPLACE_BOOT_FILE   HEX: 0080000
-CONSTANT: SP_COPY_NOPRUNE             HEX: 0100000
-CONSTANT: SP_COPY_OEM_F6_INF          HEX: 0200000
-CONSTANT: SP_COPY_ALREADYDECOMP       HEX: 0400000
-CONSTANT: SP_COPY_WINDOWS_SIGNED      HEX: 1000000
-CONSTANT: SP_COPY_PNPLOCKED           HEX: 2000000
-CONSTANT: SP_COPY_IN_USE_TRY_RENAME   HEX: 4000000
-CONSTANT: SP_COPY_INBOX_INF           HEX: 8000000
-CONSTANT: SP_COPY_HARDLINK            HEX: 10000000
-
-CONSTANT: SP_BACKUP_BACKUPPASS        HEX: 00000001
-CONSTANT: SP_BACKUP_DEMANDPASS        HEX: 00000002
-CONSTANT: SP_BACKUP_SPECIAL           HEX: 00000004
-CONSTANT: SP_BACKUP_BOOTFILE          HEX: 00000008
+CONSTANT: SP_COPY_NOOVERWRITE         0x0000008
+CONSTANT: SP_COPY_NODECOMP            0x0000010
+CONSTANT: SP_COPY_LANGUAGEAWARE       0x0000020
+CONSTANT: SP_COPY_SOURCE_ABSOLUTE     0x0000040
+CONSTANT: SP_COPY_SOURCEPATH_ABSOLUTE 0x0000080
+CONSTANT: SP_COPY_IN_USE_NEEDS_REBOOT 0x0000100
+CONSTANT: SP_COPY_FORCE_IN_USE        0x0000200
+CONSTANT: SP_COPY_NOSKIP              0x0000400
+CONSTANT: SP_FLAG_CABINETCONTINUATION 0x0000800
+CONSTANT: SP_COPY_FORCE_NOOVERWRITE   0x0001000
+CONSTANT: SP_COPY_FORCE_NEWER         0x0002000
+CONSTANT: SP_COPY_WARNIFSKIP          0x0004000
+CONSTANT: SP_COPY_NOBROWSE            0x0008000
+CONSTANT: SP_COPY_NEWER_ONLY          0x0010000
+CONSTANT: SP_COPY_RESERVED            0x0020000
+CONSTANT: SP_COPY_OEMINF_CATALOG_ONLY 0x0040000
+CONSTANT: SP_COPY_REPLACE_BOOT_FILE   0x0080000
+CONSTANT: SP_COPY_NOPRUNE             0x0100000
+CONSTANT: SP_COPY_OEM_F6_INF          0x0200000
+CONSTANT: SP_COPY_ALREADYDECOMP       0x0400000
+CONSTANT: SP_COPY_WINDOWS_SIGNED      0x1000000
+CONSTANT: SP_COPY_PNPLOCKED           0x2000000
+CONSTANT: SP_COPY_IN_USE_TRY_RENAME   0x4000000
+CONSTANT: SP_COPY_INBOX_INF           0x8000000
+CONSTANT: SP_COPY_HARDLINK            0x10000000
+
+CONSTANT: SP_BACKUP_BACKUPPASS        0x00000001
+CONSTANT: SP_BACKUP_DEMANDPASS        0x00000002
+CONSTANT: SP_BACKUP_SPECIAL           0x00000004
+CONSTANT: SP_BACKUP_BOOTFILE          0x00000008
 
 FUNCTION: HSPFILEQ SetupOpenFileQueue ( ) ;
 FUNCTION: BOOL SetupCloseFileQueue ( HSPFILEQ QueueHandle ) ;
@@ -1288,28 +1288,28 @@ FUNCTION: BOOL SetupScanFileQueueA ( HSPFILEQ FileQueue, DWORD Flags, HWND Windo
 FUNCTION: BOOL SetupScanFileQueueW ( HSPFILEQ FileQueue, DWORD Flags, HWND Window, PSP_FILE_CALLBACK_W CallbackRoutine, PVOID CallbackContext, PDWORD Result ) ;
 ALIAS: SetupScanFileQueue SetupScanFileQueueW
 
-CONSTANT: SPQ_SCAN_FILE_PRESENCE                  HEX: 00000001
-CONSTANT: SPQ_SCAN_FILE_VALIDITY                  HEX: 00000002
-CONSTANT: SPQ_SCAN_USE_CALLBACK                   HEX: 00000004
-CONSTANT: SPQ_SCAN_USE_CALLBACKEX                 HEX: 00000008
-CONSTANT: SPQ_SCAN_INFORM_USER                    HEX: 00000010
-CONSTANT: SPQ_SCAN_PRUNE_COPY_QUEUE               HEX: 00000020
-CONSTANT: SPQ_SCAN_USE_CALLBACK_SIGNERINFO        HEX: 00000040
-CONSTANT: SPQ_SCAN_PRUNE_DELREN                   HEX: 00000080
-CONSTANT: SPQ_SCAN_FILE_PRESENCE_WITHOUT_SOURCE   HEX: 00000100
-CONSTANT: SPQ_SCAN_FILE_COMPARISON                HEX: 00000200
-CONSTANT: SPQ_SCAN_ACTIVATE_DRP                   HEX: 00000400
-CONSTANT: SPQ_DELAYED_COPY                        HEX: 00000001
+CONSTANT: SPQ_SCAN_FILE_PRESENCE                  0x00000001
+CONSTANT: SPQ_SCAN_FILE_VALIDITY                  0x00000002
+CONSTANT: SPQ_SCAN_USE_CALLBACK                   0x00000004
+CONSTANT: SPQ_SCAN_USE_CALLBACKEX                 0x00000008
+CONSTANT: SPQ_SCAN_INFORM_USER                    0x00000010
+CONSTANT: SPQ_SCAN_PRUNE_COPY_QUEUE               0x00000020
+CONSTANT: SPQ_SCAN_USE_CALLBACK_SIGNERINFO        0x00000040
+CONSTANT: SPQ_SCAN_PRUNE_DELREN                   0x00000080
+CONSTANT: SPQ_SCAN_FILE_PRESENCE_WITHOUT_SOURCE   0x00000100
+CONSTANT: SPQ_SCAN_FILE_COMPARISON                0x00000200
+CONSTANT: SPQ_SCAN_ACTIVATE_DRP                   0x00000400
+CONSTANT: SPQ_DELAYED_COPY                        0x00000001
 
 FUNCTION: BOOL SetupGetFileQueueCount ( HSPFILEQ FileQueue, UINT SubQueueFileOp, PUINT NumOperations ) ;
 FUNCTION: BOOL SetupGetFileQueueFlags ( HSPFILEQ FileQueue, PDWORD Flags ) ;
 FUNCTION: BOOL SetupSetFileQueueFlags ( HSPFILEQ FileQueue, DWORD FlagMask, DWORD Flags ) ;
 
-CONSTANT: SPQ_FLAG_BACKUP_AWARE      HEX: 00000001
-CONSTANT: SPQ_FLAG_ABORT_IF_UNSIGNED HEX: 00000002
-CONSTANT: SPQ_FLAG_FILES_MODIFIED    HEX: 00000004
-CONSTANT: SPQ_FLAG_DO_SHUFFLEMOVE    HEX: 00000008
-CONSTANT: SPQ_FLAG_VALID             HEX: 0000000F
+CONSTANT: SPQ_FLAG_BACKUP_AWARE      0x00000001
+CONSTANT: SPQ_FLAG_ABORT_IF_UNSIGNED 0x00000002
+CONSTANT: SPQ_FLAG_FILES_MODIFIED    0x00000004
+CONSTANT: SPQ_FLAG_DO_SHUFFLEMOVE    0x00000008
+CONSTANT: SPQ_FLAG_VALID             0x0000000F
 
 CONSTANT: SPOST_NONE  0
 CONSTANT: SPOST_PATH  1
@@ -1320,8 +1320,8 @@ FUNCTION: BOOL SetupCopyOEMInfA ( PCSTR SourceInfFileName, PCSTR OEMSourceMediaL
 FUNCTION: BOOL SetupCopyOEMInfW ( PCWSTR SourceInfFileName, PCWSTR OEMSourceMediaLocation, DWORD OEMSourceMediaType, DWORD CopyStyle, PWSTR DestinationInfFileName, DWORD DestinationInfFileNameSize, PDWORD RequiredSize, PWSTR* DestinationInfFileNameComponent ) ;
 ALIAS: SetupCopyOEMInf SetupCopyOEMInfW
 
-CONSTANT: SUOI_FORCEDELETE   HEX: 00000001
-CONSTANT: SUOI_INTERNAL1     HEX: 00000002
+CONSTANT: SUOI_FORCEDELETE   0x00000001
+CONSTANT: SUOI_INTERNAL1     0x00000002
 
 FUNCTION: BOOL SetupUninstallOEMInfA ( PCSTR InfFileName, DWORD Flags, PVOID Reserved ) ;
 FUNCTION: BOOL SetupUninstallOEMInfW ( PCWSTR InfFileName, DWORD Flags, PVOID Reserved ) ;
@@ -1333,8 +1333,8 @@ FUNCTION: HDSKSPC SetupCreateDiskSpaceListA ( PVOID Reserved1, DWORD Reserved2,
 FUNCTION: HDSKSPC SetupCreateDiskSpaceListW ( PVOID Reserved1, DWORD Reserved2, UINT Flags ) ;
 ALIAS: SetupCreateDiskSpaceList SetupCreateDiskSpaceListW
 
-CONSTANT: SPDSL_IGNORE_DISK              HEX: 00000001
-CONSTANT: SPDSL_DISALLOW_NEGATIVE_ADJUST HEX: 00000002
+CONSTANT: SPDSL_IGNORE_DISK              0x00000001
+CONSTANT: SPDSL_DISALLOW_NEGATIVE_ADJUST 0x00000002
 
 FUNCTION: HDSKSPC SetupDuplicateDiskSpaceListA ( HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags ) ;
 FUNCTION: HDSKSPC SetupDuplicateDiskSpaceListW ( HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags ) ;
@@ -1383,9 +1383,9 @@ ALIAS: SetupIterateCabinet SetupIterateCabinetW
 
 FUNCTION: INT SetupPromptReboot ( HSPFILEQ FileQueue, HWND Owner, BOOL ScanOnly ) ;
 
-CONSTANT: SPFILEQ_FILE_IN_USE         HEX: 00000001
-CONSTANT: SPFILEQ_REBOOT_RECOMMENDED  HEX: 00000002
-CONSTANT: SPFILEQ_REBOOT_IN_PROGRESS  HEX: 00000004
+CONSTANT: SPFILEQ_FILE_IN_USE         0x00000001
+CONSTANT: SPFILEQ_REBOOT_RECOMMENDED  0x00000002
+CONSTANT: SPFILEQ_REBOOT_IN_PROGRESS  0x00000004
 
 FUNCTION: PVOID SetupInitDefaultQueueCallback ( HWND OwnerWindow ) ;
 FUNCTION: PVOID SetupInitDefaultQueueCallbackEx ( HWND OwnerWindow, HWND AlternateProgressWindow, UINT ProgressMessage, DWORD Reserved1, PVOID Reserved2 ) ;
@@ -1395,24 +1395,24 @@ FUNCTION: UINT SetupDefaultQueueCallbackA ( PVOID Context, UINT Notification, UI
 FUNCTION: UINT SetupDefaultQueueCallbackW ( PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2 ) ;
 ALIAS: SetupDefaultQueueCallback SetupDefaultQueueCallbackW
 
-CONSTANT: FLG_ADDREG_DELREG_BIT       HEX: 00008000
-CONSTANT: FLG_ADDREG_BINVALUETYPE     HEX: 00000001
-CONSTANT: FLG_ADDREG_NOCLOBBER        HEX: 00000002
-CONSTANT: FLG_ADDREG_DELVAL           HEX: 00000004
-CONSTANT: FLG_ADDREG_APPEND           HEX: 00000008
-CONSTANT: FLG_ADDREG_KEYONLY          HEX: 00000010
-CONSTANT: FLG_ADDREG_OVERWRITEONLY    HEX: 00000020
-CONSTANT: FLG_ADDREG_64BITKEY         HEX: 00001000
-CONSTANT: FLG_ADDREG_KEYONLY_COMMON   HEX: 00002000
-CONSTANT: FLG_ADDREG_32BITKEY         HEX: 00004000
-CONSTANT: FLG_ADDREG_TYPE_MASK        HEX: FFFF0001
-CONSTANT: FLG_ADDREG_TYPE_SZ          HEX: 00000000
-CONSTANT: FLG_ADDREG_TYPE_MULTI_SZ    HEX: 00010000
-CONSTANT: FLG_ADDREG_TYPE_EXPAND_SZ   HEX: 00020000
-CONSTANT: FLG_ADDREG_TYPE_BINARY      HEX: 00000001
-CONSTANT: FLG_ADDREG_TYPE_DWORD       HEX: 00010001
-CONSTANT: FLG_ADDREG_TYPE_NONE        HEX: 00020001
-CONSTANT: FLG_DELREG_VALUE            HEX: 00000000
+CONSTANT: FLG_ADDREG_DELREG_BIT       0x00008000
+CONSTANT: FLG_ADDREG_BINVALUETYPE     0x00000001
+CONSTANT: FLG_ADDREG_NOCLOBBER        0x00000002
+CONSTANT: FLG_ADDREG_DELVAL           0x00000004
+CONSTANT: FLG_ADDREG_APPEND           0x00000008
+CONSTANT: FLG_ADDREG_KEYONLY          0x00000010
+CONSTANT: FLG_ADDREG_OVERWRITEONLY    0x00000020
+CONSTANT: FLG_ADDREG_64BITKEY         0x00001000
+CONSTANT: FLG_ADDREG_KEYONLY_COMMON   0x00002000
+CONSTANT: FLG_ADDREG_32BITKEY         0x00004000
+CONSTANT: FLG_ADDREG_TYPE_MASK        0xFFFF0001
+CONSTANT: FLG_ADDREG_TYPE_SZ          0x00000000
+CONSTANT: FLG_ADDREG_TYPE_MULTI_SZ    0x00010000
+CONSTANT: FLG_ADDREG_TYPE_EXPAND_SZ   0x00020000
+CONSTANT: FLG_ADDREG_TYPE_BINARY      0x00000001
+CONSTANT: FLG_ADDREG_TYPE_DWORD       0x00010001
+CONSTANT: FLG_ADDREG_TYPE_NONE        0x00020001
+CONSTANT: FLG_DELREG_VALUE            0x00000000
 CONSTANT: FLG_DELREG_TYPE_MASK        $ FLG_ADDREG_TYPE_MASK
 CONSTANT: FLG_DELREG_TYPE_SZ          $ FLG_ADDREG_TYPE_SZ
 CONSTANT: FLG_DELREG_TYPE_MULTI_SZ    $ FLG_ADDREG_TYPE_MULTI_SZ
@@ -1423,66 +1423,66 @@ CONSTANT: FLG_DELREG_TYPE_NONE        $ FLG_ADDREG_TYPE_NONE
 CONSTANT: FLG_DELREG_64BITKEY         $ FLG_ADDREG_64BITKEY
 CONSTANT: FLG_DELREG_KEYONLY_COMMON   $ FLG_ADDREG_KEYONLY_COMMON
 CONSTANT: FLG_DELREG_32BITKEY         $ FLG_ADDREG_32BITKEY
-CONSTANT: FLG_DELREG_OPERATION_MASK   HEX: 000000FE
-CONSTANT: FLG_DELREG_MULTI_SZ_DELSTRING HEX: 00018002
-CONSTANT: FLG_BITREG_CLEARBITS        HEX: 00000000
-CONSTANT: FLG_BITREG_SETBITS          HEX: 00000001
-CONSTANT: FLG_BITREG_64BITKEY         HEX: 00001000
-CONSTANT: FLG_BITREG_32BITKEY         HEX: 00004000
-CONSTANT: FLG_INI2REG_64BITKEY        HEX: 00001000
-CONSTANT: FLG_INI2REG_32BITKEY        HEX: 00004000
-CONSTANT: FLG_REGSVR_DLLREGISTER      HEX: 00000001
-CONSTANT: FLG_REGSVR_DLLINSTALL       HEX: 00000002
-CONSTANT: FLG_PROFITEM_CURRENTUSER    HEX: 00000001
-CONSTANT: FLG_PROFITEM_DELETE         HEX: 00000002
-CONSTANT: FLG_PROFITEM_GROUP          HEX: 00000004
-CONSTANT: FLG_PROFITEM_CSIDL          HEX: 00000008
-CONSTANT: FLG_ADDPROPERTY_NOCLOBBER       HEX: 00000001
-CONSTANT: FLG_ADDPROPERTY_OVERWRITEONLY   HEX: 00000002
-CONSTANT: FLG_ADDPROPERTY_APPEND          HEX: 00000004
-CONSTANT: FLG_ADDPROPERTY_OR              HEX: 00000008
-CONSTANT: FLG_ADDPROPERTY_AND             HEX: 00000010
-CONSTANT: FLG_DELPROPERTY_MULTI_SZ_DELSTRING  HEX: 00000001
+CONSTANT: FLG_DELREG_OPERATION_MASK   0x000000FE
+CONSTANT: FLG_DELREG_MULTI_SZ_DELSTRING 0x00018002
+CONSTANT: FLG_BITREG_CLEARBITS        0x00000000
+CONSTANT: FLG_BITREG_SETBITS          0x00000001
+CONSTANT: FLG_BITREG_64BITKEY         0x00001000
+CONSTANT: FLG_BITREG_32BITKEY         0x00004000
+CONSTANT: FLG_INI2REG_64BITKEY        0x00001000
+CONSTANT: FLG_INI2REG_32BITKEY        0x00004000
+CONSTANT: FLG_REGSVR_DLLREGISTER      0x00000001
+CONSTANT: FLG_REGSVR_DLLINSTALL       0x00000002
+CONSTANT: FLG_PROFITEM_CURRENTUSER    0x00000001
+CONSTANT: FLG_PROFITEM_DELETE         0x00000002
+CONSTANT: FLG_PROFITEM_GROUP          0x00000004
+CONSTANT: FLG_PROFITEM_CSIDL          0x00000008
+CONSTANT: FLG_ADDPROPERTY_NOCLOBBER       0x00000001
+CONSTANT: FLG_ADDPROPERTY_OVERWRITEONLY   0x00000002
+CONSTANT: FLG_ADDPROPERTY_APPEND          0x00000004
+CONSTANT: FLG_ADDPROPERTY_OR              0x00000008
+CONSTANT: FLG_ADDPROPERTY_AND             0x00000010
+CONSTANT: FLG_DELPROPERTY_MULTI_SZ_DELSTRING  0x00000001
 
 FUNCTION: BOOL SetupInstallFromInfSectionA ( HWND Owner, HINF InfHandle, PCSTR SectionName, UINT Flags, HKEY RelativeKeyRoot, PCSTR SourceRootPath, UINT CopyFlags, PSP_FILE_CALLBACK_A MsgHandler, PVOID Context, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData ) ;
 FUNCTION: BOOL SetupInstallFromInfSectionW ( HWND Owner, HINF InfHandle, PCWSTR SectionName, UINT Flags, HKEY RelativeKeyRoot, PCWSTR SourceRootPath, UINT CopyFlags, PSP_FILE_CALLBACK_W MsgHandler, PVOID Context, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData ) ;
 ALIAS: SetupInstallFromInfSection SetupInstallFromInfSectionW
 
-CONSTANT: SPINST_LOGCONFIG                HEX: 00000001
-CONSTANT: SPINST_INIFILES                 HEX: 00000002
-CONSTANT: SPINST_REGISTRY                 HEX: 00000004
-CONSTANT: SPINST_INI2REG                  HEX: 00000008
-CONSTANT: SPINST_FILES                    HEX: 00000010
-CONSTANT: SPINST_BITREG                   HEX: 00000020
-CONSTANT: SPINST_REGSVR                   HEX: 00000040
-CONSTANT: SPINST_UNREGSVR                 HEX: 00000080
-CONSTANT: SPINST_PROFILEITEMS             HEX: 00000100
-CONSTANT: SPINST_COPYINF                  HEX: 00000200
-CONSTANT: SPINST_PROPERTIES               HEX: 00000400
-CONSTANT: SPINST_ALL                      HEX: 000007ff
-CONSTANT: SPINST_SINGLESECTION            HEX: 00010000
-CONSTANT: SPINST_LOGCONFIG_IS_FORCED      HEX: 00020000
-CONSTANT: SPINST_LOGCONFIGS_ARE_OVERRIDES HEX: 00040000
-CONSTANT: SPINST_REGISTERCALLBACKAWARE    HEX: 00080000
-CONSTANT: SPINST_DEVICEINSTALL            HEX: 00100000
+CONSTANT: SPINST_LOGCONFIG                0x00000001
+CONSTANT: SPINST_INIFILES                 0x00000002
+CONSTANT: SPINST_REGISTRY                 0x00000004
+CONSTANT: SPINST_INI2REG                  0x00000008
+CONSTANT: SPINST_FILES                    0x00000010
+CONSTANT: SPINST_BITREG                   0x00000020
+CONSTANT: SPINST_REGSVR                   0x00000040
+CONSTANT: SPINST_UNREGSVR                 0x00000080
+CONSTANT: SPINST_PROFILEITEMS             0x00000100
+CONSTANT: SPINST_COPYINF                  0x00000200
+CONSTANT: SPINST_PROPERTIES               0x00000400
+CONSTANT: SPINST_ALL                      0x000007ff
+CONSTANT: SPINST_SINGLESECTION            0x00010000
+CONSTANT: SPINST_LOGCONFIG_IS_FORCED      0x00020000
+CONSTANT: SPINST_LOGCONFIGS_ARE_OVERRIDES 0x00040000
+CONSTANT: SPINST_REGISTERCALLBACKAWARE    0x00080000
+CONSTANT: SPINST_DEVICEINSTALL            0x00100000
 
 FUNCTION: BOOL SetupInstallFilesFromInfSectionA ( HINF InfHandle, HINF LayoutInfHandle, HSPFILEQ FileQueue, PCSTR SectionName, PCSTR SourceRootPath, UINT CopyFlags ) ;
 FUNCTION: BOOL SetupInstallFilesFromInfSectionW ( HINF InfHandle, HINF LayoutInfHandle, HSPFILEQ FileQueue, PCWSTR SectionName, PCWSTR SourceRootPath, UINT CopyFlags ) ;
 ALIAS: SetupInstallFilesFromInfSection SetupInstallFilesFromInfSectionW
 
-CONSTANT: SPSVCINST_TAGTOFRONT                   HEX: 00000001
-CONSTANT: SPSVCINST_ASSOCSERVICE                 HEX: 00000002
-CONSTANT: SPSVCINST_DELETEEVENTLOGENTRY          HEX: 00000004
-CONSTANT: SPSVCINST_NOCLOBBER_DISPLAYNAME        HEX: 00000008
-CONSTANT: SPSVCINST_NOCLOBBER_STARTTYPE          HEX: 00000010
-CONSTANT: SPSVCINST_NOCLOBBER_ERRORCONTROL       HEX: 00000020
-CONSTANT: SPSVCINST_NOCLOBBER_LOADORDERGROUP     HEX: 00000040
-CONSTANT: SPSVCINST_NOCLOBBER_DEPENDENCIES       HEX: 00000080
-CONSTANT: SPSVCINST_NOCLOBBER_DESCRIPTION        HEX: 00000100
-CONSTANT: SPSVCINST_STOPSERVICE                  HEX: 00000200
-CONSTANT: SPSVCINST_CLOBBER_SECURITY             HEX: 00000400
-CONSTANT: SPSVCINST_STARTSERVICE                 HEX: 00000800
-CONSTANT: SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES HEX: 00001000
+CONSTANT: SPSVCINST_TAGTOFRONT                   0x00000001
+CONSTANT: SPSVCINST_ASSOCSERVICE                 0x00000002
+CONSTANT: SPSVCINST_DELETEEVENTLOGENTRY          0x00000004
+CONSTANT: SPSVCINST_NOCLOBBER_DISPLAYNAME        0x00000008
+CONSTANT: SPSVCINST_NOCLOBBER_STARTTYPE          0x00000010
+CONSTANT: SPSVCINST_NOCLOBBER_ERRORCONTROL       0x00000020
+CONSTANT: SPSVCINST_NOCLOBBER_LOADORDERGROUP     0x00000040
+CONSTANT: SPSVCINST_NOCLOBBER_DEPENDENCIES       0x00000080
+CONSTANT: SPSVCINST_NOCLOBBER_DESCRIPTION        0x00000100
+CONSTANT: SPSVCINST_STOPSERVICE                  0x00000200
+CONSTANT: SPSVCINST_CLOBBER_SECURITY             0x00000400
+CONSTANT: SPSVCINST_STARTSERVICE                 0x00000800
+CONSTANT: SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES 0x00001000
 
 FUNCTION: BOOL SetupInstallServicesFromInfSectionA ( HINF InfHandle, PCSTR SectionName, DWORD Flags ) ;
 FUNCTION: BOOL SetupInstallServicesFromInfSectionW ( HINF InfHandle, PCWSTR SectionName, DWORD Flags ) ;
@@ -1502,16 +1502,16 @@ FUNCTION: HSPFILELOG SetupInitializeFileLogA ( PCSTR LogFileName, DWORD Flags )
 FUNCTION: HSPFILELOG SetupInitializeFileLogW ( PCWSTR LogFileName, DWORD Flags ) ;
 ALIAS: SetupInitializeFileLog SetupInitializeFileLogW
 
-CONSTANT: SPFILELOG_SYSTEMLOG     HEX: 00000001
-CONSTANT: SPFILELOG_FORCENEW      HEX: 00000002
-CONSTANT: SPFILELOG_QUERYONLY     HEX: 00000004
+CONSTANT: SPFILELOG_SYSTEMLOG     0x00000001
+CONSTANT: SPFILELOG_FORCENEW      0x00000002
+CONSTANT: SPFILELOG_QUERYONLY     0x00000004
 
 FUNCTION: BOOL SetupTerminateFileLog ( HSPFILELOG FileLogHandle ) ;
 FUNCTION: BOOL SetupLogFileA ( HSPFILELOG FileLogHandle, PCSTR LogSectionName, PCSTR SourceFilename, PCSTR TargetFilename, DWORD Checksum, PCSTR DiskTagfile, PCSTR DiskDescription, PCSTR OtherInfo, DWORD Flags ) ;
 FUNCTION: BOOL SetupLogFileW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR SourceFilename, PCWSTR TargetFilename, DWORD Checksum, PCWSTR DiskTagfile, PCWSTR DiskDescription, PCWSTR OtherInfo, DWORD Flags ) ;
 ALIAS: SetupLogFile SetupLogFileW
 
-CONSTANT: SPFILELOG_OEMFILE   HEX: 00000001
+CONSTANT: SPFILELOG_OEMFILE   0x00000001
 FUNCTION: BOOL SetupRemoveFileLogEntryA ( HSPFILELOG FileLogHandle, PCSTR LogSectionName, PCSTR TargetFilename ) ;
 FUNCTION: BOOL SetupRemoveFileLogEntryW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR TargetFilename ) ;
 ALIAS: SetupRemoveFileLogEntry SetupRemoveFileLogEntryW
@@ -1529,11 +1529,11 @@ FUNCTION: BOOL SetupQueryFileLogW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionN
 ALIAS: SetupQueryFileLog SetupQueryFileLogW
 
 TYPEDEF: DWORD LogSeverity
-CONSTANT: LogSevInformation           HEX: 00000000
-CONSTANT: LogSevWarning               HEX: 00000001
-CONSTANT: LogSevError                 HEX: 00000002
-CONSTANT: LogSevFatalError            HEX: 00000003
-CONSTANT: LogSevMaximum               HEX: 00000004
+CONSTANT: LogSevInformation           0x00000000
+CONSTANT: LogSevWarning               0x00000001
+CONSTANT: LogSevError                 0x00000002
+CONSTANT: LogSevFatalError            0x00000003
+CONSTANT: LogSevMaximum               0x00000004
 
 FUNCTION: BOOL SetupOpenLog ( BOOL Erase ) ;
 FUNCTION: BOOL SetupLogErrorA ( LPCSTR MessageString, LogSeverity Severity ) ;
@@ -1570,15 +1570,15 @@ FUNCTION: BOOL SetupDiGetDeviceInfoListDetailA ( HDEVINFO DeviceInfoSet, PSP_DEV
 FUNCTION: BOOL SetupDiGetDeviceInfoListDetailW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_LIST_DETAIL_DATA_W DeviceInfoSetDetailData ) ;
 ALIAS: SetupDiGetDeviceInfoListDetail SetupDiGetDeviceInfoListDetailW
 
-CONSTANT: DICD_GENERATE_ID        HEX: 00000001
-CONSTANT: DICD_INHERIT_CLASSDRVS  HEX: 00000002
+CONSTANT: DICD_GENERATE_ID        0x00000001
+CONSTANT: DICD_INHERIT_CLASSDRVS  0x00000002
 
 FUNCTION: BOOL SetupDiCreateDeviceInfoA ( HDEVINFO DeviceInfoSet, PCSTR DeviceName, GUID* ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData ) ;
 FUNCTION: BOOL SetupDiCreateDeviceInfoW ( HDEVINFO DeviceInfoSet, PCWSTR DeviceName, GUID* ClassGuid, PCWSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData ) ;
 ALIAS: SetupDiCreateDeviceInfo SetupDiCreateDeviceInfoW
 
-CONSTANT: DIOD_INHERIT_CLASSDRVS  HEX: 00000002
-CONSTANT: DIOD_CANCEL_REMOVE      HEX: 00000004
+CONSTANT: DIOD_INHERIT_CLASSDRVS  0x00000002
+CONSTANT: DIOD_CANCEL_REMOVE      0x00000004
 
 FUNCTION: BOOL SetupDiOpenDeviceInfoA ( HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData ) ;
 FUNCTION: BOOL SetupDiOpenDeviceInfoW ( HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData ) ;
@@ -1603,7 +1603,7 @@ ALIAS: SetupDiCreateInterfaceDeviceA SetupDiCreateDeviceInterfaceA
 
 ALIAS: SetupDiCreateInterfaceDevice SetupDiCreateDeviceInterfaceW
 
-CONSTANT: DIODI_NO_ADD    HEX: 00000001
+CONSTANT: DIODI_NO_ADD    0x00000001
 
 FUNCTION: BOOL SetupDiOpenDeviceInterfaceA ( HDEVINFO DeviceInfoSet, PCSTR DevicePath, DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData ) ;
 FUNCTION: BOOL SetupDiOpenDeviceInterfaceW ( HDEVINFO DeviceInfoSet, PCWSTR DevicePath, DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData ) ;
@@ -1637,13 +1637,13 @@ ALIAS: SetupDiInstallInterfaceDevices SetupDiInstallDeviceInterfaces
 
 FUNCTION: BOOL SetupDiSetDeviceInterfaceDefault ( HDEVINFO DeviceInfoSet, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, DWORD Flags, PVOID Reserved ) ;
 
-CONSTANT: SPRDI_FIND_DUPS        HEX: 00000001
+CONSTANT: SPRDI_FIND_DUPS        0x00000001
 
 FUNCTION: BOOL SetupDiRegisterDeviceInfo ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Flags, PSP_DETSIG_CMPPROC CompareProc, PVOID CompareContext, PSP_DEVINFO_DATA DupDeviceInfoData ) ;
 
-CONSTANT: SPDIT_NODRIVER           HEX: 00000000
-CONSTANT: SPDIT_CLASSDRIVER        HEX: 00000001
-CONSTANT: SPDIT_COMPATDRIVER       HEX: 00000002
+CONSTANT: SPDIT_NODRIVER           0x00000000
+CONSTANT: SPDIT_CLASSDRIVER        0x00000001
+CONSTANT: SPDIT_COMPATDRIVER       0x00000002
 
 FUNCTION: BOOL SetupDiBuildDriverInfoList ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType ) ;
 FUNCTION: BOOL SetupDiCancelDriverInfoSearch ( HDEVINFO DeviceInfoSet ) ;
@@ -1665,11 +1665,11 @@ ALIAS: SetupDiGetDriverInfoDetail SetupDiGetDriverInfoDetailW
 
 FUNCTION: BOOL SetupDiDestroyDriverInfoList ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType ) ;
 
-CONSTANT: DIGCF_DEFAULT           HEX: 00000001
-CONSTANT: DIGCF_PRESENT           HEX: 00000002
-CONSTANT: DIGCF_ALLCLASSES        HEX: 00000004
-CONSTANT: DIGCF_PROFILE           HEX: 00000008
-CONSTANT: DIGCF_DEVICEINTERFACE   HEX: 00000010
+CONSTANT: DIGCF_DEFAULT           0x00000001
+CONSTANT: DIGCF_PRESENT           0x00000002
+CONSTANT: DIGCF_ALLCLASSES        0x00000004
+CONSTANT: DIGCF_PROFILE           0x00000008
+CONSTANT: DIGCF_DEVICEINTERFACE   0x00000010
 CONSTANT: DIGCF_INTERFACEDEVICE   $ DIGCF_DEVICEINTERFACE
 
 FUNCTION: HDEVINFO SetupDiGetClassDevsA ( GUID* ClassGuid, PCSTR Enumerator, HWND hwndParent, DWORD Flags ) ;
@@ -1684,8 +1684,8 @@ FUNCTION: BOOL SetupDiGetINFClassA ( PCSTR InfName, LPGUID ClassGuid, PSTR Class
 FUNCTION: BOOL SetupDiGetINFClassW ( PCWSTR InfName, LPGUID ClassGuid, PWSTR ClassName, DWORD ClassNameSize, PDWORD RequiredSize ) ;
 ALIAS: SetupDiGetINFClass SetupDiGetINFClassW
 
-CONSTANT: DIBCI_NOINSTALLCLASS   HEX: 00000001
-CONSTANT: DIBCI_NODISPLAYCLASS   HEX: 00000002
+CONSTANT: DIBCI_NOINSTALLCLASS   0x00000001
+CONSTANT: DIBCI_NODISPLAYCLASS   0x00000002
 
 FUNCTION: BOOL SetupDiBuildClassInfoList ( DWORD Flags, LPGUID ClassGuidList, DWORD ClassGuidListSize, PDWORD RequiredSize ) ;
 FUNCTION: BOOL SetupDiBuildClassInfoListExA ( DWORD Flags, LPGUID ClassGuidList, DWORD ClassGuidListSize, PDWORD RequiredSize, PCSTR MachineName, PVOID Reserved ) ;
@@ -1722,8 +1722,8 @@ ALIAS: SetupDiInstallClassEx SetupDiInstallClassExW
 
 FUNCTION: HKEY SetupDiOpenClassRegKey ( GUID* ClassGuid, REGSAM samDesired ) ;
 
-CONSTANT: DIOCR_INSTALLER   HEX: 00000001
-CONSTANT: DIOCR_INTERFACE   HEX: 00000002
+CONSTANT: DIOCR_INSTALLER   0x00000001
+CONSTANT: DIOCR_INTERFACE   0x00000002
 
 FUNCTION: HKEY SetupDiOpenClassRegKeyExA ( GUID* ClassGuid, REGSAM samDesired, DWORD Flags, PCSTR MachineName, PVOID Reserved ) ;
 FUNCTION: HKEY SetupDiOpenClassRegKeyExW ( GUID* ClassGuid, REGSAM samDesired, DWORD Flags, PCWSTR MachineName, PVOID Reserved ) ;
@@ -1742,9 +1742,9 @@ ALIAS: SetupDiOpenInterfaceDeviceRegKey SetupDiOpenDeviceInterfaceRegKey
 FUNCTION: BOOL SetupDiDeleteDeviceInterfaceRegKey ( HDEVINFO DeviceInfoSet, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, DWORD Reserved ) ;
 ALIAS: SetupDiDeleteInterfaceDeviceRegKey SetupDiDeleteDeviceInterfaceRegKey
 
-CONSTANT: DIREG_DEV       HEX: 00000001
-CONSTANT: DIREG_DRV       HEX: 00000002
-CONSTANT: DIREG_BOTH      HEX: 00000004
+CONSTANT: DIREG_DEV       0x00000001
+CONSTANT: DIREG_DRV       0x00000002
+CONSTANT: DIREG_BOTH      0x00000004
 
 FUNCTION: HKEY SetupDiCreateDevRegKeyA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Scope, DWORD HwProfile, DWORD KeyType, HINF InfHandle, PCSTR InfSectionName ) ;
 FUNCTION: HKEY SetupDiCreateDevRegKeyW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Scope, DWORD HwProfile, DWORD KeyType, HINF InfHandle, PCWSTR InfSectionName ) ;
@@ -1771,8 +1771,8 @@ ALIAS: SetupDiGetDeviceInterfaceProperty SetupDiGetDeviceInterfacePropertyW
 FUNCTION: BOOL SetupDiSetDeviceInterfacePropertyW ( HDEVINFO DeviceInfoSet, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, DEVPROPKEY* PropertyKey, DEVPROPTYPE PropertyType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, DWORD Flags ) ;
 ALIAS: SetupDiSetDeviceInterfaceProperty SetupDiSetDeviceInterfacePropertyW
 
-CONSTANT: DICLASSPROP_INSTALLER   HEX: 00000001
-CONSTANT: DICLASSPROP_INTERFACE   HEX: 00000002
+CONSTANT: DICLASSPROP_INSTALLER   0x00000001
+CONSTANT: DICLASSPROP_INTERFACE   0x00000002
 
 FUNCTION: BOOL SetupDiGetClassPropertyKeys ( GUID* ClassGuid, DEVPROPKEY* PropertyKeyArray, DWORD PropertyKeyCount, PDWORD RequiredPropertyKeyCount, DWORD Flags ) ;
 FUNCTION: BOOL SetupDiGetClassPropertyKeysExW ( GUID* ClassGuid, DEVPROPKEY* PropertyKeyArray, DWORD PropertyKeyCount, PDWORD RequiredPropertyKeyCount, DWORD Flags, PCWSTR MachineName, PVOID Reserved ) ;
@@ -1790,52 +1790,52 @@ ALIAS: SetupDiSetClassProperty SetupDiSetClassPropertyW
 FUNCTION: BOOL SetupDiSetClassPropertyExW ( GUID* ClassGuid, DEVPROPKEY* PropertyKey, DEVPROPTYPE PropertyType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, DWORD Flags, PCWSTR MachineName, PVOID Reserved ) ;
 ALIAS: SetupDiSetClassPropertyEx SetupDiSetClassPropertyExW
 
-CONSTANT: SPDRP_DEVICEDESC                  HEX: 00000000
-CONSTANT: SPDRP_HARDWAREID                  HEX: 00000001
-CONSTANT: SPDRP_COMPATIBLEIDS               HEX: 00000002
-CONSTANT: SPDRP_UNUSED0                     HEX: 00000003
-CONSTANT: SPDRP_SERVICE                     HEX: 00000004
-CONSTANT: SPDRP_UNUSED1                     HEX: 00000005
-CONSTANT: SPDRP_UNUSED2                     HEX: 00000006
-CONSTANT: SPDRP_CLASS                       HEX: 00000007
-CONSTANT: SPDRP_CLASSGUID                   HEX: 00000008
-CONSTANT: SPDRP_DRIVER                      HEX: 00000009
-CONSTANT: SPDRP_CONFIGFLAGS                 HEX: 0000000A
-CONSTANT: SPDRP_MFG                         HEX: 0000000B
-CONSTANT: SPDRP_FRIENDLYNAME                HEX: 0000000C
-CONSTANT: SPDRP_LOCATION_INFORMATION        HEX: 0000000D
-CONSTANT: SPDRP_PHYSICAL_DEVICE_OBJECT_NAME HEX: 0000000E
-CONSTANT: SPDRP_CAPABILITIES                HEX: 0000000F
-CONSTANT: SPDRP_UI_NUMBER                   HEX: 00000010
-CONSTANT: SPDRP_UPPERFILTERS                HEX: 00000011
-CONSTANT: SPDRP_LOWERFILTERS                HEX: 00000012
-CONSTANT: SPDRP_BUSTYPEGUID                 HEX: 00000013
-CONSTANT: SPDRP_LEGACYBUSTYPE               HEX: 00000014
-CONSTANT: SPDRP_BUSNUMBER                   HEX: 00000015
-CONSTANT: SPDRP_ENUMERATOR_NAME             HEX: 00000016
-CONSTANT: SPDRP_SECURITY                    HEX: 00000017
-CONSTANT: SPDRP_SECURITY_SDS                HEX: 00000018
-CONSTANT: SPDRP_DEVTYPE                     HEX: 00000019
-CONSTANT: SPDRP_EXCLUSIVE                   HEX: 0000001A
-CONSTANT: SPDRP_CHARACTERISTICS             HEX: 0000001B
-CONSTANT: SPDRP_ADDRESS                     HEX: 0000001C
-CONSTANT: SPDRP_UI_NUMBER_DESC_FORMAT       HEX: 0000001D
-CONSTANT: SPDRP_DEVICE_POWER_DATA           HEX: 0000001E
-CONSTANT: SPDRP_REMOVAL_POLICY              HEX: 0000001F
-CONSTANT: SPDRP_REMOVAL_POLICY_HW_DEFAULT   HEX: 00000020
-CONSTANT: SPDRP_REMOVAL_POLICY_OVERRIDE     HEX: 00000021
-CONSTANT: SPDRP_INSTALL_STATE               HEX: 00000022
-CONSTANT: SPDRP_LOCATION_PATHS              HEX: 00000023
-CONSTANT: SPDRP_BASE_CONTAINERID            HEX: 00000024
-CONSTANT: SPDRP_MAXIMUM_PROPERTY            HEX: 00000025
-CONSTANT: SPCRP_UPPERFILTERS                HEX: 00000011
-CONSTANT: SPCRP_LOWERFILTERS                HEX: 00000012
-CONSTANT: SPCRP_SECURITY                    HEX: 00000017
-CONSTANT: SPCRP_SECURITY_SDS                HEX: 00000018
-CONSTANT: SPCRP_DEVTYPE                     HEX: 00000019
-CONSTANT: SPCRP_EXCLUSIVE                   HEX: 0000001A
-CONSTANT: SPCRP_CHARACTERISTICS             HEX: 0000001B
-CONSTANT: SPCRP_MAXIMUM_PROPERTY            HEX: 0000001C
+CONSTANT: SPDRP_DEVICEDESC                  0x00000000
+CONSTANT: SPDRP_HARDWAREID                  0x00000001
+CONSTANT: SPDRP_COMPATIBLEIDS               0x00000002
+CONSTANT: SPDRP_UNUSED0                     0x00000003
+CONSTANT: SPDRP_SERVICE                     0x00000004
+CONSTANT: SPDRP_UNUSED1                     0x00000005
+CONSTANT: SPDRP_UNUSED2                     0x00000006
+CONSTANT: SPDRP_CLASS                       0x00000007
+CONSTANT: SPDRP_CLASSGUID                   0x00000008
+CONSTANT: SPDRP_DRIVER                      0x00000009
+CONSTANT: SPDRP_CONFIGFLAGS                 0x0000000A
+CONSTANT: SPDRP_MFG                         0x0000000B
+CONSTANT: SPDRP_FRIENDLYNAME                0x0000000C
+CONSTANT: SPDRP_LOCATION_INFORMATION        0x0000000D
+CONSTANT: SPDRP_PHYSICAL_DEVICE_OBJECT_NAME 0x0000000E
+CONSTANT: SPDRP_CAPABILITIES                0x0000000F
+CONSTANT: SPDRP_UI_NUMBER                   0x00000010
+CONSTANT: SPDRP_UPPERFILTERS                0x00000011
+CONSTANT: SPDRP_LOWERFILTERS                0x00000012
+CONSTANT: SPDRP_BUSTYPEGUID                 0x00000013
+CONSTANT: SPDRP_LEGACYBUSTYPE               0x00000014
+CONSTANT: SPDRP_BUSNUMBER                   0x00000015
+CONSTANT: SPDRP_ENUMERATOR_NAME             0x00000016
+CONSTANT: SPDRP_SECURITY                    0x00000017
+CONSTANT: SPDRP_SECURITY_SDS                0x00000018
+CONSTANT: SPDRP_DEVTYPE                     0x00000019
+CONSTANT: SPDRP_EXCLUSIVE                   0x0000001A
+CONSTANT: SPDRP_CHARACTERISTICS             0x0000001B
+CONSTANT: SPDRP_ADDRESS                     0x0000001C
+CONSTANT: SPDRP_UI_NUMBER_DESC_FORMAT       0x0000001D
+CONSTANT: SPDRP_DEVICE_POWER_DATA           0x0000001E
+CONSTANT: SPDRP_REMOVAL_POLICY              0x0000001F
+CONSTANT: SPDRP_REMOVAL_POLICY_HW_DEFAULT   0x00000020
+CONSTANT: SPDRP_REMOVAL_POLICY_OVERRIDE     0x00000021
+CONSTANT: SPDRP_INSTALL_STATE               0x00000022
+CONSTANT: SPDRP_LOCATION_PATHS              0x00000023
+CONSTANT: SPDRP_BASE_CONTAINERID            0x00000024
+CONSTANT: SPDRP_MAXIMUM_PROPERTY            0x00000025
+CONSTANT: SPCRP_UPPERFILTERS                0x00000011
+CONSTANT: SPCRP_LOWERFILTERS                0x00000012
+CONSTANT: SPCRP_SECURITY                    0x00000017
+CONSTANT: SPCRP_SECURITY_SDS                0x00000018
+CONSTANT: SPCRP_DEVTYPE                     0x00000019
+CONSTANT: SPCRP_EXCLUSIVE                   0x0000001A
+CONSTANT: SPCRP_CHARACTERISTICS             0x0000001B
+CONSTANT: SPCRP_MAXIMUM_PROPERTY            0x0000001C
 
 FUNCTION: BOOL SetupDiGetDeviceRegistryPropertyA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ;
 FUNCTION: BOOL SetupDiGetDeviceRegistryPropertyW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ;
@@ -1880,9 +1880,9 @@ ALIAS: SetupDiSetDriverInstallParams SetupDiSetDriverInstallParamsW
 FUNCTION: BOOL SetupDiLoadClassIcon ( GUID* ClassGuid, HICON* LargeIcon, PINT MiniIconIndex ) ;
 FUNCTION: BOOL SetupDiLoadDeviceIcon ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, UINT cxIcon, UINT cyIcon, DWORD Flags, HICON* hIcon ) ;
 
-CONSTANT: DMI_MASK      HEX: 00000001
-CONSTANT: DMI_BKCOLOR   HEX: 00000002
-CONSTANT: DMI_USERECT   HEX: 00000004
+CONSTANT: DMI_MASK      0x00000001
+CONSTANT: DMI_BKCOLOR   0x00000002
+CONSTANT: DMI_USERECT   0x00000004
 
 FUNCTION: INT SetupDiDrawMiniIcon ( HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags ) ;
 FUNCTION: BOOL SetupDiGetClassBitmapIndex ( GUID* ClassGuid, PINT MiniIconIndex ) ;
@@ -1894,10 +1894,10 @@ ALIAS: SetupDiGetClassImageListEx SetupDiGetClassImageListExW
 FUNCTION: BOOL SetupDiGetClassImageIndex ( PSP_CLASSIMAGELIST_DATA ClassImageListData, GUID* ClassGuid, PINT ImageIndex ) ;
 FUNCTION: BOOL SetupDiDestroyClassImageList ( PSP_CLASSIMAGELIST_DATA ClassImageListData ) ;
 
-CONSTANT: DIGCDP_FLAG_BASIC           HEX: 00000001
-CONSTANT: DIGCDP_FLAG_ADVANCED        HEX: 00000002
-CONSTANT: DIGCDP_FLAG_REMOTE_BASIC    HEX: 00000003
-CONSTANT: DIGCDP_FLAG_REMOTE_ADVANCED HEX: 00000004
+CONSTANT: DIGCDP_FLAG_BASIC           0x00000001
+CONSTANT: DIGCDP_FLAG_ADVANCED        0x00000002
+CONSTANT: DIGCDP_FLAG_REMOTE_BASIC    0x00000003
+CONSTANT: DIGCDP_FLAG_REMOTE_ADVANCED 0x00000004
 
 FUNCTION: BOOL SetupDiGetClassDevPropertySheetsA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, LPPROPSHEETHEADERA PropertySheetHeader, DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, DWORD PropertySheetType ) ;
 FUNCTION: BOOL SetupDiGetClassDevPropertySheetsW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, LPPROPSHEETHEADERW PropertySheetHeader, DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, DWORD PropertySheetType ) ;
@@ -1941,8 +1941,8 @@ FUNCTION: BOOL SetupDiGetHwProfileFriendlyNameExA ( DWORD HwProfile, PSTR Friend
 FUNCTION: BOOL SetupDiGetHwProfileFriendlyNameExW ( DWORD HwProfile, PWSTR FriendlyName, DWORD FriendlyNameSize, PDWORD RequiredSize, PCWSTR MachineName, PVOID Reserved ) ;
 ALIAS: SetupDiGetHwProfileFriendlyNameEx SetupDiGetHwProfileFriendlyNameExW
 
-CONSTANT: SPWPT_SELECTDEVICE      HEX: 00000001
-CONSTANT: SPWP_USE_DEVINFO_DATA   HEX: 00000001
+CONSTANT: SPWPT_SELECTDEVICE      0x00000001
+CONSTANT: SPWP_USE_DEVINFO_DATA   0x00000001
 
 FUNCTION: HPROPSHEETPAGE SetupDiGetWizardPage ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PSP_INSTALLWIZARD_DATA InstallWizardData, DWORD PageType, DWORD Flags ) ;
 FUNCTION: BOOL SetupDiGetSelectedDevice ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData ) ;
@@ -1998,17 +1998,17 @@ TYPEDEF: SP_INF_SIGNER_INFO_V2_W* PSP_INF_SIGNER_INFO_V2_W
 TYPEDEF: SP_INF_SIGNER_INFO_V2_W SP_INF_SIGNER_INFO_V2
 TYPEDEF: PSP_INF_SIGNER_INFO_V2_W PSP_INF_SIGNER_INFO_V2
 
-CONSTANT: SIGNERSCORE_UNKNOWN         HEX: FF000000
-CONSTANT: SIGNERSCORE_W9X_SUSPECT     HEX: C0000000
-CONSTANT: SIGNERSCORE_UNSIGNED        HEX: 80000000
-CONSTANT: SIGNERSCORE_AUTHENTICODE    HEX: 0F000000
-CONSTANT: SIGNERSCORE_WHQL            HEX: 0D000005
-CONSTANT: SIGNERSCORE_UNCLASSIFIED    HEX: 0D000004
-CONSTANT: SIGNERSCORE_INBOX           HEX: 0D000003
-CONSTANT: SIGNERSCORE_LOGO_STANDARD   HEX: 0D000002
-CONSTANT: SIGNERSCORE_LOGO_PREMIUM    HEX: 0D000001
-CONSTANT: SIGNERSCORE_MASK            HEX: FF000000
-CONSTANT: SIGNERSCORE_SIGNED_MASK     HEX: F0000000
+CONSTANT: SIGNERSCORE_UNKNOWN         0xFF000000
+CONSTANT: SIGNERSCORE_W9X_SUSPECT     0xC0000000
+CONSTANT: SIGNERSCORE_UNSIGNED        0x80000000
+CONSTANT: SIGNERSCORE_AUTHENTICODE    0x0F000000
+CONSTANT: SIGNERSCORE_WHQL            0x0D000005
+CONSTANT: SIGNERSCORE_UNCLASSIFIED    0x0D000004
+CONSTANT: SIGNERSCORE_INBOX           0x0D000003
+CONSTANT: SIGNERSCORE_LOGO_STANDARD   0x0D000002
+CONSTANT: SIGNERSCORE_LOGO_PREMIUM    0x0D000001
+CONSTANT: SIGNERSCORE_MASK            0xFF000000
+CONSTANT: SIGNERSCORE_SIGNED_MASK     0xF0000000
 
 TYPEDEF: SP_INF_SIGNER_INFO_V2_A  SP_INF_SIGNER_INFO_A
 TYPEDEF: PSP_INF_SIGNER_INFO_V2_A PSP_INF_SIGNER_INFO_A
@@ -2021,12 +2021,12 @@ FUNCTION: BOOL SetupVerifyInfFileA ( PCSTR InfName, PSP_ALTPLATFORM_INFO AltPlat
 FUNCTION: BOOL SetupVerifyInfFileW ( PCWSTR InfName, PSP_ALTPLATFORM_INFO AltPlatformInfo, PSP_INF_SIGNER_INFO_W InfSignerInfo ) ;
 ALIAS: SetupVerifyInfFile SetupVerifyInfFileW
 
-CONSTANT: DICUSTOMDEVPROP_MERGE_MULTISZ    HEX: 00000001
+CONSTANT: DICUSTOMDEVPROP_MERGE_MULTISZ    0x00000001
 FUNCTION: BOOL SetupDiGetCustomDevicePropertyA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PCSTR CustomPropertyName, DWORD Flags, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ;
 FUNCTION: BOOL SetupDiGetCustomDevicePropertyW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PCWSTR CustomPropertyName, DWORD Flags, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ;
 ALIAS: SetupDiGetCustomDeviceProperty SetupDiGetCustomDevicePropertyW
 
-CONSTANT: SCWMI_CLOBBER_SECURITY  HEX: 00000001
+CONSTANT: SCWMI_CLOBBER_SECURITY  0x00000001
 FUNCTION: BOOL SetupConfigureWmiFromInfSectionA ( HINF InfHandle, PCSTR SectionName, DWORD Flags ) ;
 FUNCTION: BOOL SetupConfigureWmiFromInfSectionW ( HINF InfHandle, PCWSTR SectionName, DWORD Flags ) ;
 ALIAS: SetupConfigureWmiFromInfSection SetupConfigureWmiFromInfSectionW