* include/commctrl.h: Revert TEXT change.

	* include/lmalert.h: Ditto.
	* include/lmcons.h: Ditto.
	* include/lmsname.h: Ditto.
	* include/lmsvc.h: Ditto.
	* include/ntsecapi.h: Ditto.
	* include/oledlg.h: Ditto.
	* include/ras.h: Ditto.
	* include/regstr.h: Ditto.
	* include/richedit.h: Ditto.
	* include/wininet.h: Ditto.
	* include/winnt.h: Ditto.

13 files changed, 780 insertions, 764 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4609fdb99..58152d2db 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,4 +1,19 @@
 
+2001-02-21  Danny Smith <dannysmith@users.sourceforge.net>
+
+	* include/commctrl.h: Revert TEXT change.
+	* include/lmalert.h: Ditto.
+	* include/lmcons.h: Ditto.
+	* include/lmsname.h: Ditto.
+	* include/lmsvc.h: Ditto.
+	* include/ntsecapi.h: Ditto.
+	* include/oledlg.h: Ditto.
+	* include/ras.h: Ditto.
+	* include/regstr.h: Ditto.
+	* include/richedit.h: Ditto.
+	* include/wininet.h: Ditto.
+	* include/winnt.h: Ditto.
+
 2001-02-15  Earnie Boyd  <earnie@users.sourceforge.net>
 
 	* include/commctrl.h: Use _TEXT() instead of TEXT() throughout.
diff --git a/winsup/w32api/include/commctrl.h b/winsup/w32api/include/commctrl.h
index 959f47d70..a87ad69bf 100644
--- a/winsup/w32api/include/commctrl.h
+++ b/winsup/w32api/include/commctrl.h
@@ -11,7 +11,7 @@ extern "C" {
 #endif
 #endif
 
-#define DRAGLISTMSGSTRING _TEXT("commctrl_DragListMsg")
+#define DRAGLISTMSGSTRING TEXT("commctrl_DragListMsg")
 #define ANIMATE_CLASSW	L"SysAnimate32"
 #define ANIMATE_CLASSA	"SysAnimate32"
 #define HOTKEY_CLASSA	"msctls_hotkey32"
diff --git a/winsup/w32api/include/lmalert.h b/winsup/w32api/include/lmalert.h
index dce23e4b4..d4899bc30 100644
--- a/winsup/w32api/include/lmalert.h
+++ b/winsup/w32api/include/lmalert.h
@@ -1,11 +1,11 @@
 #ifndef _LMALERT_H
 #define _LMALERT_H
-#define ALERTER_MAILSLOT _TEXT("\\\\.\\MAILSLOT\\Alerter")
-#define ALERT_PRINT_EVENT _TEXT("PRINTING")
-#define ALERT_MESSAGE_EVENT _TEXT("MESSAGE")
-#define ALERT_ERRORLOG_EVENT _TEXT("ERRORLOG")
-#define ALERT_ADMIN_EVENT _TEXT("ADMIN")
-#define ALERT_USER_EVENT _TEXT("USER")
+#define ALERTER_MAILSLOT TEXT("\\\\.\\MAILSLOT\\Alerter")
+#define ALERT_PRINT_EVENT TEXT("PRINTING")
+#define ALERT_MESSAGE_EVENT TEXT("MESSAGE")
+#define ALERT_ERRORLOG_EVENT TEXT("ERRORLOG")
+#define ALERT_ADMIN_EVENT TEXT("ADMIN")
+#define ALERT_USER_EVENT TEXT("USER")
 #define ALERT_OTHER_INFO(x) ((PBYTE)(x)+sizeof(STD_ALERT))
 #define ALERT_VAR_DATA(p) ((PBYTE)(p)+sizeof(*p))
 #define PRJOB_QSTATUS 3
diff --git a/winsup/w32api/include/lmcons.h b/winsup/w32api/include/lmcons.h
index 6748f5138..1adde204b 100644
--- a/winsup/w32api/include/lmcons.h
+++ b/winsup/w32api/include/lmcons.h
@@ -1,8 +1,8 @@
 #ifndef _LMCONS_H
 #define _LMCONS_H
-#define MESSAGE_FILENAME _TEXT("NETMSG")
-#define OS2MSG_FILENAME _TEXT("BASE")
-#define HELP_MSG_FILENAME _TEXT("NETH")
+#define MESSAGE_FILENAME TEXT("NETMSG")
+#define OS2MSG_FILENAME TEXT("BASE")
+#define HELP_MSG_FILENAME TEXT("NETH")
 #define NET_API_FUNCTION __stdcall
 #define NET_API_STATUS DWORD
 #define API_RET_TYPE NET_API_STATUS
diff --git a/winsup/w32api/include/lmsname.h b/winsup/w32api/include/lmsname.h
index a01874fa8..2a0f42bcd 100644
--- a/winsup/w32api/include/lmsname.h
+++ b/winsup/w32api/include/lmsname.h
@@ -1,54 +1,54 @@
 #ifndef _LMSNAME_H
 #define _LMSNAME_H
-#define SERVICE_WORKSTATION _TEXT("LanmanWorkstation")
-#define SERVICE_LM20_WORKSTATION _TEXT("WORKSTATION")
-#define WORKSTATION_DISPLAY_NAME _TEXT("Workstation")
-#define SERVICE_SERVER _TEXT("LanmanServer")
-#define SERVICE_LM20_SERVER _TEXT("SERVER")
-#define SERVER_DISPLAY_NAME _TEXT("Server")
-#define SERVICE_BROWSER _TEXT("BROWSER")
+#define SERVICE_WORKSTATION TEXT("LanmanWorkstation")
+#define SERVICE_LM20_WORKSTATION TEXT("WORKSTATION")
+#define WORKSTATION_DISPLAY_NAME TEXT("Workstation")
+#define SERVICE_SERVER TEXT("LanmanServer")
+#define SERVICE_LM20_SERVER TEXT("SERVER")
+#define SERVER_DISPLAY_NAME TEXT("Server")
+#define SERVICE_BROWSER TEXT("BROWSER")
 #define SERVICE_LM20_BROWSER SERVICE_BROWSER
-#define SERVICE_MESSENGER _TEXT("MESSENGER")
+#define SERVICE_MESSENGER TEXT("MESSENGER")
 #define SERVICE_LM20_MESSENGER SERVICE_MESSENGER
-#define SERVICE_NETRUN _TEXT("NETRUN")
+#define SERVICE_NETRUN TEXT("NETRUN")
 #define SERVICE_LM20_NETRUN SERVICE_NETRUN
-#define SERVICE_SPOOLER _TEXT("SPOOLER")
+#define SERVICE_SPOOLER TEXT("SPOOLER")
 #define SERVICE_LM20_SPOOLER SERVICE_SPOOLER
-#define SERVICE_ALERTER _TEXT("ALERTER")
+#define SERVICE_ALERTER TEXT("ALERTER")
 #define SERVICE_LM20_ALERTER SERVICE_ALERTER
-#define SERVICE_NETLOGON _TEXT("NETLOGON")
+#define SERVICE_NETLOGON TEXT("NETLOGON")
 #define SERVICE_LM20_NETLOGON SERVICE_NETLOGON
-#define SERVICE_NETPOPUP _TEXT("NETPOPUP")
+#define SERVICE_NETPOPUP TEXT("NETPOPUP")
 #define SERVICE_LM20_NETPOPUP SERVICE_NETPOPUP
-#define SERVICE_SQLSERVER _TEXT("SQLSERVER")
+#define SERVICE_SQLSERVER TEXT("SQLSERVER")
 #define SERVICE_LM20_SQLSERVER SERVICE_SQLSERVER
-#define SERVICE_REPL _TEXT("REPLICATOR")
+#define SERVICE_REPL TEXT("REPLICATOR")
 #define SERVICE_LM20_REPL SERVICE_REPL
-#define SERVICE_RIPL _TEXT("REMOTEBOOT")
+#define SERVICE_RIPL TEXT("REMOTEBOOT")
 #define SERVICE_LM20_RIPL SERVICE_RIPL
-#define SERVICE_TIMESOURCE _TEXT("TIMESOURCE")
+#define SERVICE_TIMESOURCE TEXT("TIMESOURCE")
 #define SERVICE_LM20_TIMESOURCE SERVICE_TIMESOURCE
-#define SERVICE_AFP _TEXT("AFP")
+#define SERVICE_AFP TEXT("AFP")
 #define SERVICE_LM20_AFP SERVICE_AFP
-#define SERVICE_UPS _TEXT("UPS")
+#define SERVICE_UPS TEXT("UPS")
 #define SERVICE_LM20_UPS SERVICE_UPS
-#define SERVICE_XACTSRV _TEXT("XACTSRV")
+#define SERVICE_XACTSRV TEXT("XACTSRV")
 #define SERVICE_LM20_XACTSRV SERVICE_XACTSRV
-#define SERVICE_TCPIP _TEXT("TCPIP")
+#define SERVICE_TCPIP TEXT("TCPIP")
 #define SERVICE_LM20_TCPIP SERVICE_TCPIP
-#define SERVICE_NBT _TEXT("NBT")
+#define SERVICE_NBT TEXT("NBT")
 #define SERVICE_LM20_NBT SERVICE_NBT
-#define SERVICE_LMHOSTS _TEXT("LMHOSTS")
+#define SERVICE_LMHOSTS TEXT("LMHOSTS")
 #define SERVICE_LM20_LMHOSTS SERVICE_LMHOSTS
-#define SERVICE_TELNET _TEXT("Telnet")
+#define SERVICE_TELNET TEXT("Telnet")
 #define SERVICE_LM20_TELNET SERVICE_TELNET
-#define SERVICE_SCHEDULE _TEXT("Schedule")
+#define SERVICE_SCHEDULE TEXT("Schedule")
 #define SERVICE_LM20_SCHEDULE SERVICE_SCHEDULE
-#define SERVICE_NTLMSSP _TEXT("NtLmSsp")
-#define SERVICE_DHCP _TEXT("DHCP")
+#define SERVICE_NTLMSSP TEXT("NtLmSsp")
+#define SERVICE_DHCP TEXT("DHCP")
 #define SERVICE_LM20_DHCP SERVICE_DHCP
-#define SERVICE_NWSAP _TEXT("NwSapAgent")
+#define SERVICE_NWSAP TEXT("NwSapAgent")
 #define SERVICE_LM20_NWSAP SERVICE_NWSAP
-#define NWSAP_DISPLAY_NAME _TEXT("NW Sap Agent")
-#define SERVICE_NWCS _TEXT("NWCWorkstation")
+#define NWSAP_DISPLAY_NAME TEXT("NW Sap Agent")
+#define SERVICE_NWCS TEXT("NWCWorkstation")
 #endif
diff --git a/winsup/w32api/include/lmsvc.h b/winsup/w32api/include/lmsvc.h
index 038276a31..a129bb0b4 100644
--- a/winsup/w32api/include/lmsvc.h
+++ b/winsup/w32api/include/lmsvc.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 #include <lmsname.h>
-#define SERVICE_DOS_ENCRYPTION _TEXT("ENCRYPT")
+#define SERVICE_DOS_ENCRYPTION TEXT("ENCRYPT")
 #define SERVICE_UNINSTALLED 0
 #define SERVICE_INSTALL_PENDING 1
 #define SERVICE_UNINSTALL_PENDING 2
diff --git a/winsup/w32api/include/ntsecapi.h b/winsup/w32api/include/ntsecapi.h
index 8ce4345fa..0531f47c8 100644
--- a/winsup/w32api/include/ntsecapi.h
+++ b/winsup/w32api/include/ntsecapi.h
@@ -96,10 +96,10 @@ extern "C" {
 #define SAM_PASSWORD_CHANGE_NOTIFY_ROUTINE "PasswordChangeNotify"
 #define SAM_INIT_NOTIFICATION_ROUTINE "InitializeChangeNotify"
 #define SAM_PASSWORD_FILTER_ROUTINE "PasswordFilter"
-#define SE_INTERACTIVE_LOGON_NAME _TEXT("SeInteractiveLogonRight")
-#define SE_NETWORK_LOGON_NAME _TEXT("SeNetworkLogonRight")
-#define SE_BATCH_LOGON_NAME _TEXT("SeBatchLogonRight")
-#define SE_SERVICE_LOGON_NAME _TEXT("SeServiceLogonRight")
+#define SE_INTERACTIVE_LOGON_NAME TEXT("SeInteractiveLogonRight")
+#define SE_NETWORK_LOGON_NAME TEXT("SeNetworkLogonRight")
+#define SE_BATCH_LOGON_NAME TEXT("SeBatchLogonRight")
+#define SE_SERVICE_LOGON_NAME TEXT("SeServiceLogonRight")
 #define TRUST_ATTRIBUTE_NON_TRANSITIVE 1
 #define TRUST_ATTRIBUTE_UPLEVEL_ONLY 2
 #define TRUST_ATTRIBUTE_TREE_PARENT 4194304
diff --git a/winsup/w32api/include/oledlg.h b/winsup/w32api/include/oledlg.h
index a7a7ba063..24cfd4bc2 100644
--- a/winsup/w32api/include/oledlg.h
+++ b/winsup/w32api/include/oledlg.h
@@ -12,17 +12,17 @@ extern "C" {
 #include <dlgs.h>
 #include <prsht.h>
 #define PS_MAXLINKTYPES 8
-#define OLESTDDELIM _TEXT("\\")
-#define SZOLEUI_MSG_HELP _TEXT("OLEUI_MSG_HELP")
-#define SZOLEUI_MSG_ENDDIALOG _TEXT("OLEUI_MSG_ENDDIALOG")
-#define SZOLEUI_MSG_BROWSE _TEXT("OLEUI_MSG_BROWSE")
-#define SZOLEUI_MSG_CHANGEICON _TEXT("OLEUI_MSG_CHANGEICON")
-#define SZOLEUI_MSG_CLOSEBUSYDIALOG _TEXT("OLEUI_MSG_CLOSEBUSYDIALOG")
-#define SZOLEUI_MSG_CONVERT _TEXT("OLEUI_MSG_CONVERT")
-#define SZOLEUI_MSG_CHANGESOURCE _TEXT("OLEUI_MSG_CHANGESOURCE")
-#define SZOLEUI_MSG_ADDCONTROL _TEXT("OLEUI_MSG_ADDCONTROL")
-#define SZOLEUI_MSG_BROWSE_OFN _TEXT("OLEUI_MSG_BROWSE_OFN")
-#define PROP_HWND_CHGICONDLG _TEXT("HWND_CIDLG")
+#define OLESTDDELIM TEXT("\\")
+#define SZOLEUI_MSG_HELP TEXT("OLEUI_MSG_HELP")
+#define SZOLEUI_MSG_ENDDIALOG TEXT("OLEUI_MSG_ENDDIALOG")
+#define SZOLEUI_MSG_BROWSE TEXT("OLEUI_MSG_BROWSE")
+#define SZOLEUI_MSG_CHANGEICON TEXT("OLEUI_MSG_CHANGEICON")
+#define SZOLEUI_MSG_CLOSEBUSYDIALOG TEXT("OLEUI_MSG_CLOSEBUSYDIALOG")
+#define SZOLEUI_MSG_CONVERT TEXT("OLEUI_MSG_CONVERT")
+#define SZOLEUI_MSG_CHANGESOURCE TEXT("OLEUI_MSG_CHANGESOURCE")
+#define SZOLEUI_MSG_ADDCONTROL TEXT("OLEUI_MSG_ADDCONTROL")
+#define SZOLEUI_MSG_BROWSE_OFN TEXT("OLEUI_MSG_BROWSE_OFN")
+#define PROP_HWND_CHGICONDLG TEXT("HWND_CIDLG")
 #define IDC_OLEUIHELP 99
 #define IDC_IO_CREATENEW 2100
 #define IDC_IO_CREATEFROMFILE 2101
diff --git a/winsup/w32api/include/ras.h b/winsup/w32api/include/ras.h
index c06b9d91f..7e8603965 100644
--- a/winsup/w32api/include/ras.h
+++ b/winsup/w32api/include/ras.h
@@ -75,19 +75,19 @@ typedef unsigned long ULONG_PTR, *PULONG_PTR;
 #define RASFP_Ppp                       0x00000001
 #define RASFP_Slip                      0x00000002
 #define RASFP_Ras                       0x00000004
-#define RASDT_Modem                     _TEXT("modem")
-#define RASDT_Isdn                      _TEXT("isdn")
-#define RASDT_X25                       _TEXT("x25")
-#define RASDT_Vpn                       _TEXT("vpn")
-#define RASDT_Pad                       _TEXT("pad")
-#define RASDT_Generic                   _TEXT("GENERIC")
-#define RASDT_Serial        		_TEXT("SERIAL")
-#define RASDT_FrameRelay                _TEXT("FRAMERELAY")
-#define RASDT_Atm                       _TEXT("ATM")
-#define RASDT_Sonet                     _TEXT("SONET")
-#define RASDT_SW56                      _TEXT("SW56")
-#define RASDT_Irda                      _TEXT("IRDA")
-#define RASDT_Parallel                  _TEXT("PARALLEL")
+#define RASDT_Modem                     TEXT("modem")
+#define RASDT_Isdn                      TEXT("isdn")
+#define RASDT_X25                       TEXT("x25")
+#define RASDT_Vpn                       TEXT("vpn")
+#define RASDT_Pad                       TEXT("pad")
+#define RASDT_Generic                   TEXT("GENERIC")
+#define RASDT_Serial        		TEXT("SERIAL")
+#define RASDT_FrameRelay                TEXT("FRAMERELAY")
+#define RASDT_Atm                       TEXT("ATM")
+#define RASDT_Sonet                     TEXT("SONET")
+#define RASDT_SW56                      TEXT("SW56")
+#define RASDT_Irda                      TEXT("IRDA")
+#define RASDT_Parallel                  TEXT("PARALLEL")
 #define RASET_Phone     1
 #define RASET_Vpn       2
 #define RASET_Direct    3
diff --git a/winsup/w32api/include/regstr.h b/winsup/w32api/include/regstr.h
index 8146a5e5c..bec0a97a1 100644
--- a/winsup/w32api/include/regstr.h
+++ b/winsup/w32api/include/regstr.h
@@ -3,124 +3,124 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#define REGSTR_KEY_CLASS _TEXT("Class")
-#define REGSTR_KEY_CONFIG _TEXT("Config")
-#define REGSTR_KEY_ENUM _TEXT("Enum")
-#define REGSTR_KEY_ROOTENUM _TEXT("Root")
-#define REGSTR_KEY_BIOSENUM _TEXT("BIOS")
-#define REGSTR_KEY_PCMCIAENUM _TEXT("PCMCIA")
-#define REGSTR_KEY_PCIENUM _TEXT("PCI")
-#define REGSTR_KEY_LOGCONFIG	_TEXT("LogConfig")
-#define REGSTR_KEY_SYSTEMBOARD	_TEXT("*PNP0C01")
-#define REGSTR_KEY_APM	_TEXT("*PNP0C05")
-#define REGSTR_KEY_INIUPDATE	_TEXT("IniUpdate")
-#define REG_KEY_INSTDEV _TEXT("Installed")
-#define REGSTR_KEY_DOSOPTCDROM	_TEXT("CD-ROM")
-#define REGSTR_KEY_DOSOPTMOUSE	_TEXT("MOUSE")
-#define REGSTR_DEFAULT_INSTANCE _TEXT("0000")
-#define REGSTR_PATH_MOTHERBOARD REGSTR_KEY_SYSTEMBOARD _TEXT("\\" REGSTR_DEFAULT_INSTANCE
-#define REGSTR_PATH_SETUP	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion")
-#define REGSTR_PATH_PIFCONVERT _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\PIFConvert")
-#define REGSTR_PATH_MSDOSOPTS	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOSOptions")
-#define REGSTR_PATH_MSDOSEMU	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOS Emulation")
-#define REGSTR_PATH_NEWDOSBOX	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOS Emulation\\AppCompat")
-#define REGSTR_PATH_RUNONCE	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce")
-#define REGSTR_PATH_RUN	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Run")
-#define REGSTR_PATH_RUNSERVICESONCE	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServicesOnce")
-#define REGSTR_PATH_RUNSERVICES	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServices")
-#define REGSTR_PATH_EXPLORER	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
-#define REGSTR_PATH_DETECT	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Detect")
-#define REGSTR_PATH_APPPATHS	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths")
-#define REGSTR_PATH_UNINSTALL _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall")
-#define REGSTR_PATH_REALMODENET _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\Real Mode Net")
-#define REGSTR_PATH_NETEQUIV _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\Equivalent")
-#define REGSTR_PATH_CVNETWORK _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network")
-#define REGSTR_PATH_IDCONFIGDB	_TEXT("System\\CurrentControlSet\\Control\\IDConfigDB")
-#define REGSTR_PATH_CLASS	_TEXT("System\\CurrentControlSet\\Services\\Class")
-#define REGSTR_PATH_DISPLAYSETTINGS _TEXT("Display\\Settings")
-#define REGSTR_PATH_FONTS	_TEXT("Display\\Fonts")
-#define REGSTR_PATH_ENUM	_TEXT("Enum")
-#define REGSTR_PATH_ROOT	_TEXT("Enum\\Root")
-#define REGSTR_PATH_SERVICES	_TEXT("System\\CurrentControlSet\\Services")
-#define REGSTR_PATH_VXD _TEXT("System\\CurrentControlSet\\Services\\VxD")
-#define REGSTR_PATH_IOS _TEXT("System\\CurrentControlSet\\Services\\VxD\\IOS")
-#define REGSTR_PATH_VMM _TEXT("System\\CurrentControlSet\\Services\\VxD\\VMM")
-#define REGSTR_PATH_VPOWERD _TEXT("System\\CurrentControlSet\\Services\\VxD\\VPOWERD")
-#define REGSTR_PATH_VNETSUP _TEXT("System\\CurrentControlSet\\Services\\VxD\\VNETSUP")
-#define REGSTR_PATH_NWREDIR _TEXT("System\\CurrentControlSet\\Services\\VxD\\NWREDIR")
-#define REGSTR_PATH_NCPSERVER _TEXT("System\\CurrentControlSet\\Services\\NcpServer\\Parameters")
-#define REGSTR_PATH_IOARB	_TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\IOArb")
-#define REGSTR_PATH_ADDRARB	_TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\AddrArb")
-#define REGSTR_PATH_DMAARB	_TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\DMAArb")
-#define REGSTR_PATH_IRQARB	_TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\IRQArb")
-#define REGSTR_PATH_CODEPAGE	_TEXT("System\\CurrentControlSet\\Control\\Nls\\Codepage")
-#define REGSTR_PATH_FILESYSTEM	_TEXT("System\\CurrentControlSet\\Control\\FileSystem")
-#define REGSTR_PATH_FILESYSTEM_NOVOLTRACK	_TEXT("System\\CurrentControlSet\\Control\\FileSystem\\NoVolTrack")
-#define REGSTR_PATH_CDFS	_TEXT("System\\CurrentControlSet\\Control\\FileSystem\\CDFS")
-#define REGSTR_PATH_WINBOOT	_TEXT("System\\CurrentControlSet\\Control\\WinBoot")
-#define REGSTR_PATH_INSTALLEDFILES	_TEXT("System\\CurrentControlSet\\Control\\InstalledFiles")
-#define REGSTR_PATH_VMM32FILES	_TEXT("System\\CurrentControlSet\\Control\\VMM32Files")
+#define REGSTR_KEY_CLASS TEXT("Class")
+#define REGSTR_KEY_CONFIG TEXT("Config")
+#define REGSTR_KEY_ENUM TEXT("Enum")
+#define REGSTR_KEY_ROOTENUM TEXT("Root")
+#define REGSTR_KEY_BIOSENUM TEXT("BIOS")
+#define REGSTR_KEY_PCMCIAENUM TEXT("PCMCIA")
+#define REGSTR_KEY_PCIENUM TEXT("PCI")
+#define REGSTR_KEY_LOGCONFIG	TEXT("LogConfig")
+#define REGSTR_KEY_SYSTEMBOARD	TEXT("*PNP0C01")
+#define REGSTR_KEY_APM	TEXT("*PNP0C05")
+#define REGSTR_KEY_INIUPDATE	TEXT("IniUpdate")
+#define REG_KEY_INSTDEV TEXT("Installed")
+#define REGSTR_KEY_DOSOPTCDROM	TEXT("CD-ROM")
+#define REGSTR_KEY_DOSOPTMOUSE	TEXT("MOUSE")
+#define REGSTR_DEFAULT_INSTANCE TEXT("0000")
+#define REGSTR_PATH_MOTHERBOARD REGSTR_KEY_SYSTEMBOARD TEXT("\\" REGSTR_DEFAULT_INSTANCE
+#define REGSTR_PATH_SETUP	TEXT("Software\\Microsoft\\Windows\\CurrentVersion")
+#define REGSTR_PATH_PIFCONVERT TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\PIFConvert")
+#define REGSTR_PATH_MSDOSOPTS	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOSOptions")
+#define REGSTR_PATH_MSDOSEMU	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOS Emulation")
+#define REGSTR_PATH_NEWDOSBOX	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\MS-DOS Emulation\\AppCompat")
+#define REGSTR_PATH_RUNONCE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce")
+#define REGSTR_PATH_RUN	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Run")
+#define REGSTR_PATH_RUNSERVICESONCE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServicesOnce")
+#define REGSTR_PATH_RUNSERVICES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\RunServices")
+#define REGSTR_PATH_EXPLORER	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer")
+#define REGSTR_PATH_DETECT	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Detect")
+#define REGSTR_PATH_APPPATHS	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths")
+#define REGSTR_PATH_UNINSTALL TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall")
+#define REGSTR_PATH_REALMODENET TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\Real Mode Net")
+#define REGSTR_PATH_NETEQUIV TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\Equivalent")
+#define REGSTR_PATH_CVNETWORK TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network")
+#define REGSTR_PATH_IDCONFIGDB	TEXT("System\\CurrentControlSet\\Control\\IDConfigDB")
+#define REGSTR_PATH_CLASS	TEXT("System\\CurrentControlSet\\Services\\Class")
+#define REGSTR_PATH_DISPLAYSETTINGS TEXT("Display\\Settings")
+#define REGSTR_PATH_FONTS	TEXT("Display\\Fonts")
+#define REGSTR_PATH_ENUM	TEXT("Enum")
+#define REGSTR_PATH_ROOT	TEXT("Enum\\Root")
+#define REGSTR_PATH_SERVICES	TEXT("System\\CurrentControlSet\\Services")
+#define REGSTR_PATH_VXD TEXT("System\\CurrentControlSet\\Services\\VxD")
+#define REGSTR_PATH_IOS TEXT("System\\CurrentControlSet\\Services\\VxD\\IOS")
+#define REGSTR_PATH_VMM TEXT("System\\CurrentControlSet\\Services\\VxD\\VMM")
+#define REGSTR_PATH_VPOWERD TEXT("System\\CurrentControlSet\\Services\\VxD\\VPOWERD")
+#define REGSTR_PATH_VNETSUP TEXT("System\\CurrentControlSet\\Services\\VxD\\VNETSUP")
+#define REGSTR_PATH_NWREDIR TEXT("System\\CurrentControlSet\\Services\\VxD\\NWREDIR")
+#define REGSTR_PATH_NCPSERVER TEXT("System\\CurrentControlSet\\Services\\NcpServer\\Parameters")
+#define REGSTR_PATH_IOARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\IOArb")
+#define REGSTR_PATH_ADDRARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\AddrArb")
+#define REGSTR_PATH_DMAARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\DMAArb")
+#define REGSTR_PATH_IRQARB	TEXT("System\\CurrentControlSet\\Services\\Arbitrators\\IRQArb")
+#define REGSTR_PATH_CODEPAGE	TEXT("System\\CurrentControlSet\\Control\\Nls\\Codepage")
+#define REGSTR_PATH_FILESYSTEM	TEXT("System\\CurrentControlSet\\Control\\FileSystem")
+#define REGSTR_PATH_FILESYSTEM_NOVOLTRACK	TEXT("System\\CurrentControlSet\\Control\\FileSystem\\NoVolTrack")
+#define REGSTR_PATH_CDFS	TEXT("System\\CurrentControlSet\\Control\\FileSystem\\CDFS")
+#define REGSTR_PATH_WINBOOT	TEXT("System\\CurrentControlSet\\Control\\WinBoot")
+#define REGSTR_PATH_INSTALLEDFILES	TEXT("System\\CurrentControlSet\\Control\\InstalledFiles")
+#define REGSTR_PATH_VMM32FILES	TEXT("System\\CurrentControlSet\\Control\\VMM32Files")
 #define REGSTR_MAX_VALUE_LENGTH 256
-#define REGSTR_VAL_BITSPERPIXEL	_TEXT("BitsPerPixel")
-#define REGSTR_VAL_RESOLUTION _TEXT("Resolution")
-#define REGSTR_VAL_DPILOGICALX	_TEXT("DPILogicalX")
-#define REGSTR_VAL_DPILOGICALY	_TEXT("DPILogicalY")
-#define REGSTR_VAL_DPIPHYSICALX	_TEXT("DPIPhysicalX")
-#define REGSTR_VAL_DPIPHYSICALY _TEXT("DPIPhysicalY")
-#define REGSTR_VAL_REFRESHRATE _TEXT("RefreshRate")
-#define REGSTR_VAL_DISPLAYFLAGS _TEXT("DisplayFlags")
-#define REGSTR_PATH_CONTROLPANEL _TEXT("Control Panel")
-#define REGSTR_PATH_CONTROLSFOLDER _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder")
-#define REGSTR_VAL_DOSCP	_TEXT("OEMCP")
-#define REGSTR_VAL_WINCP	_TEXT("ACP")
-#define REGSTR_PATH_DYNA_ENUM	_TEXT("Config Manager\\Enum")
-#define	REGSTR_VAL_HARDWARE_KEY	_TEXT("HardWareKey")
-#define	REGSTR_VAL_ALLOCATION	_TEXT("Allocation")
-#define	REGSTR_VAL_PROBLEM	_TEXT("Problem")
-#define	REGSTR_VAL_STATUS	_TEXT("Status")
-#define REGSTR_VAL_DONTUSEMEM	_TEXT("DontAllocLastMem")
-#define REGSTR_VAL_SYSTEMROOT _TEXT("SystemRoot")
-#define REGSTR_VAL_BOOTCOUNT	_TEXT("BootCount")
-#define REGSTR_VAL_REALNETSTART	_TEXT("RealNetStart")
-#define	REGSTR_VAL_MEDIA	_TEXT("MediaPath")
-#define	REGSTR_VAL_CONFIG	_TEXT("ConfigPath")
-#define REGSTR_VAL_DEVICEPATH	_TEXT("DevicePath")
-#define REGSTR_VAL_SRCPATH	_TEXT("SourcePath")
-#define REGSTR_VAL_OLDWINDIR	_TEXT("OldWinDir")
-#define REGSTR_VAL_SETUPFLAGS	_TEXT("SetupFlags")
-#define REGSTR_VAL_REGOWNER _TEXT("RegisteredOwner")
-#define REGSTR_VAL_REGORGANIZATION _TEXT("RegisteredOrganization")
-#define REGSTR_VAL_LICENSINGINFO _TEXT("LicensingInfo")
-#define REGSTR_VAL_OLDMSDOSVER _TEXT("OldMSDOSVer")
-#define REGSTR_VAL_FIRSTINSTALLDATETIME _TEXT("FirstInstallDateTime")
-#define REGSTR_VAL_INSTALLTYPE	_TEXT("InstallType")
-#define REGSTR_VAL_WRAPPER	_TEXT("Wrapper")
+#define REGSTR_VAL_BITSPERPIXEL	TEXT("BitsPerPixel")
+#define REGSTR_VAL_RESOLUTION TEXT("Resolution")
+#define REGSTR_VAL_DPILOGICALX	TEXT("DPILogicalX")
+#define REGSTR_VAL_DPILOGICALY	TEXT("DPILogicalY")
+#define REGSTR_VAL_DPIPHYSICALX	TEXT("DPIPhysicalX")
+#define REGSTR_VAL_DPIPHYSICALY TEXT("DPIPhysicalY")
+#define REGSTR_VAL_REFRESHRATE TEXT("RefreshRate")
+#define REGSTR_VAL_DISPLAYFLAGS TEXT("DisplayFlags")
+#define REGSTR_PATH_CONTROLPANEL TEXT("Control Panel")
+#define REGSTR_PATH_CONTROLSFOLDER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder")
+#define REGSTR_VAL_DOSCP	TEXT("OEMCP")
+#define REGSTR_VAL_WINCP	TEXT("ACP")
+#define REGSTR_PATH_DYNA_ENUM	TEXT("Config Manager\\Enum")
+#define	REGSTR_VAL_HARDWARE_KEY	TEXT("HardWareKey")
+#define	REGSTR_VAL_ALLOCATION	TEXT("Allocation")
+#define	REGSTR_VAL_PROBLEM	TEXT("Problem")
+#define	REGSTR_VAL_STATUS	TEXT("Status")
+#define REGSTR_VAL_DONTUSEMEM	TEXT("DontAllocLastMem")
+#define REGSTR_VAL_SYSTEMROOT TEXT("SystemRoot")
+#define REGSTR_VAL_BOOTCOUNT	TEXT("BootCount")
+#define REGSTR_VAL_REALNETSTART	TEXT("RealNetStart")
+#define	REGSTR_VAL_MEDIA	TEXT("MediaPath")
+#define	REGSTR_VAL_CONFIG	TEXT("ConfigPath")
+#define REGSTR_VAL_DEVICEPATH	TEXT("DevicePath")
+#define REGSTR_VAL_SRCPATH	TEXT("SourcePath")
+#define REGSTR_VAL_OLDWINDIR	TEXT("OldWinDir")
+#define REGSTR_VAL_SETUPFLAGS	TEXT("SetupFlags")
+#define REGSTR_VAL_REGOWNER TEXT("RegisteredOwner")
+#define REGSTR_VAL_REGORGANIZATION TEXT("RegisteredOrganization")
+#define REGSTR_VAL_LICENSINGINFO TEXT("LicensingInfo")
+#define REGSTR_VAL_OLDMSDOSVER TEXT("OldMSDOSVer")
+#define REGSTR_VAL_FIRSTINSTALLDATETIME TEXT("FirstInstallDateTime")
+#define REGSTR_VAL_INSTALLTYPE	TEXT("InstallType")
+#define REGSTR_VAL_WRAPPER	TEXT("Wrapper")
 #define IT_COMPACT 0
 #define IT_TYPICAL 1
 #define IT_PORTABLE 2
 #define IT_CUSTOM 3
-#define REGSTR_KEY_SETUP	_TEXT("\\Setup")
-#define REGSTR_VAL_BOOTDIR _TEXT("BootDir")
-#define REGSTR_VAL_WINBOOTDIR _TEXT("WinbootDir")
-#define REGSTR_VAL_WINDIR	_TEXT("WinDir")
-#define REGSTR_VAL_APPINSTPATH	_TEXT("AppInstallPath")
-#define REGSTR_PATH_EBD REGSTR_PATH_SETUP REGSTR_KEY_SETUP _TEXT("\\EBD")
-#define REGSTR_KEY_EBDFILESLOCAL _TEXT("EBDFilesLocale")
-#define REGSTR_KEY_EBDFILESKEYBOARD _TEXT("EBDFilesKeyboard")
-#define REGSTR_KEY_EBDAUTOEXECBATLOCAL _TEXT("EBDAutoexecBatLocale")
-#define REGSTR_KEY_EBDAUTOEXECBATKEYBOARD _TEXT("EBDAutoexecBatKeyboard")
-#define REGSTR_KEY_EBDCONFIGSYSLOCAL _TEXT("EBDConfigSysLocale")
-#define REGSTR_KEY_EBDCONFIGSYSKEYBOARD _TEXT("EBDConfigSysKeyboard")
-#define REGSTR_VAL_MSDOSMODE _TEXT("MSDOSMode")
-#define REGSTR_VAL_MSDOSMODEDISCARD _TEXT("Discard")
-#define REGSTR_VAL_DOSOPTGLOBALFLAGS	_TEXT("GlobalFlags")
+#define REGSTR_KEY_SETUP	TEXT("\\Setup")
+#define REGSTR_VAL_BOOTDIR TEXT("BootDir")
+#define REGSTR_VAL_WINBOOTDIR TEXT("WinbootDir")
+#define REGSTR_VAL_WINDIR	TEXT("WinDir")
+#define REGSTR_VAL_APPINSTPATH	TEXT("AppInstallPath")
+#define REGSTR_PATH_EBD REGSTR_PATH_SETUP REGSTR_KEY_SETUP TEXT("\\EBD")
+#define REGSTR_KEY_EBDFILESLOCAL TEXT("EBDFilesLocale")
+#define REGSTR_KEY_EBDFILESKEYBOARD TEXT("EBDFilesKeyboard")
+#define REGSTR_KEY_EBDAUTOEXECBATLOCAL TEXT("EBDAutoexecBatLocale")
+#define REGSTR_KEY_EBDAUTOEXECBATKEYBOARD TEXT("EBDAutoexecBatKeyboard")
+#define REGSTR_KEY_EBDCONFIGSYSLOCAL TEXT("EBDConfigSysLocale")
+#define REGSTR_KEY_EBDCONFIGSYSKEYBOARD TEXT("EBDConfigSysKeyboard")
+#define REGSTR_VAL_MSDOSMODE TEXT("MSDOSMode")
+#define REGSTR_VAL_MSDOSMODEDISCARD TEXT("Discard")
+#define REGSTR_VAL_DOSOPTGLOBALFLAGS	TEXT("GlobalFlags")
 #define DOSOPTGF_DEFCLEAN 1
-#define REGSTR_VAL_DOSOPTFLAGS	_TEXT("Flags")
-#define REGSTR_VAL_OPTORDER	_TEXT("Order")
-#define REGSTR_VAL_CONFIGSYS	_TEXT("Config.Sys")
-#define REGSTR_VAL_AUTOEXEC	_TEXT("Autoexec.Bat")
-#define REGSTR_VAL_STDDOSOPTION _TEXT("StdOption")
-#define REGSTR_VAL_DOSOPTTIP	_TEXT("TipText")
+#define REGSTR_VAL_DOSOPTFLAGS	TEXT("Flags")
+#define REGSTR_VAL_OPTORDER	TEXT("Order")
+#define REGSTR_VAL_CONFIGSYS	TEXT("Config.Sys")
+#define REGSTR_VAL_AUTOEXEC	TEXT("Autoexec.Bat")
+#define REGSTR_VAL_STDDOSOPTION TEXT("StdOption")
+#define REGSTR_VAL_DOSOPTTIP	TEXT("TipText")
 #define DOSOPTF_DEFAULT 1
 #define DOSOPTF_SUPPORTED 2
 #define DOSOPTF_ALWAYSUSE 4
@@ -138,133 +138,133 @@ extern "C" {
 #define SUF_NETHDBOOT 64
 #define SUF_NETRPLBOOT 128
 #define SUF_SBSCOPYOK 256
-#define REGSTR_VAL_DOSPAGER	_TEXT("DOSPager")
-#define REGSTR_VAL_VXDGROUPS	_TEXT("VXDGroups")
-#define REGSTR_VAL_VPOWERDFLAGS _TEXT("Flags")
+#define REGSTR_VAL_DOSPAGER	TEXT("DOSPager")
+#define REGSTR_VAL_VXDGROUPS	TEXT("VXDGroups")
+#define REGSTR_VAL_VPOWERDFLAGS TEXT("Flags")
 #define VPDF_DISABLEPWRMGMT 1
 #define VPDF_FORCEAPM10MODE 2
 #define VPDF_SKIPINTELSLCHECK 4
 #define VPDF_DISABLEPWRSTATUSPOLL 8
-#define REGSTR_VAL_WORKGROUP _TEXT("Workgroup")
-#define REGSTR_VAL_DIRECTHOST _TEXT("DirectHost")
-#define REGSTR_VAL_FILESHARING _TEXT("FileSharing")
-#define REGSTR_VAL_PRINTSHARING	_TEXT("PrintSharing")
-#define REGSTR_VAL_FIRSTNETDRIVE _TEXT("FirstNetworkDrive")
-#define REGSTR_VAL_MAXCONNECTIONS	_TEXT("MaxConnections")
-#define REGSTR_VAL_APISUPPORT	_TEXT("APISupport")
-#define REGSTR_VAL_MAXRETRY	_TEXT("MaxRetry")
-#define REGSTR_VAL_MINRETRY	_TEXT("MinRetry")
-#define REGSTR_VAL_SUPPORTLFN	_TEXT("SupportLFN")
-#define REGSTR_VAL_SUPPORTBURST	_TEXT("SupportBurst")
-#define REGSTR_VAL_SUPPORTTUNNELLING	_TEXT("SupportTunnelling")
-#define REGSTR_VAL_FULLTRACE	_TEXT("FullTrace")
-#define REGSTR_VAL_READCACHING	_TEXT("ReadCaching")
-#define REGSTR_VAL_SHOWDOTS	_TEXT("ShowDots")
-#define REGSTR_VAL_GAPTIME	_TEXT("GapTime")
-#define REGSTR_VAL_SEARCHMODE	_TEXT("SearchMode")
-#define REGSTR_VAL_SHELLVERSION _TEXT("ShellVersion")
-#define REGSTR_VAL_MAXLIP _TEXT("MaxLIP")
-#define REGSTR_VAL_PRESERVECASE _TEXT("PreserveCase")
-#define REGSTR_VAL_OPTIMIZESFN _TEXT("OptimizeSFN")
-#define REGSTR_VAL_NCP_BROWSEMASTER _TEXT("BrowseMaster")
-#define	REGSTR_VAL_NCP_USEPEERBROWSING	_TEXT("Use_PeerBrowsing")
-#define REGSTR_VAL_NCP_USESAP _TEXT("Use_Sap")
-#define	REGSTR_VAL_WIN31FILESYSTEM	_TEXT("Win31FileSystem")
-#define REGSTR_VAL_PRESERVELONGNAMES	_TEXT("PreserveLongNames")
-#define REGSTR_VAL_DRIVEWRITEBEHIND	_TEXT("DriveWriteBehind")
-#define REGSTR_VAL_ASYNCFILECOMMIT	_TEXT("AsyncFileCommit")
-#define REGSTR_VAL_PATHCACHECOUNT	_TEXT("PathCache")
-#define REGSTR_VAL_NAMECACHECOUNT	_TEXT("NameCache")
-#define REGSTR_VAL_CONTIGFILEALLOC	_TEXT("ContigFileAllocSize")
-#define REGSTR_VAL_VOLIDLETIMEOUT	_TEXT("VolumeIdleTimeout")
-#define REGSTR_VAL_BUFFIDLETIMEOUT	_TEXT("BufferIdleTimeout")
-#define REGSTR_VAL_BUFFAGETIMEOUT	_TEXT("BufferAgeTimeout")
-#define	REGSTR_VAL_NAMENUMERICTAIL _TEXT("NameNumericTail")
-#define	REGSTR_VAL_READAHEADTHRESHOLD	_TEXT("ReadAheadThreshold")
-#define	REGSTR_VAL_DOUBLEBUFFER _TEXT("DoubleBuffer")
-#define	REGSTR_VAL_SOFTCOMPATMODE _TEXT("SoftCompatMode")
-#define REGSTR_VAL_DRIVESPINDOWN	_TEXT("DriveSpinDown")
-#define	REGSTR_VAL_FORCEPMIO	_TEXT("ForcePMIO")
-#define REGSTR_VAL_FORCERMIO	_TEXT("ForceRMIO")
-#define REGSTR_VAL_LASTBOOTPMDRVS	_TEXT("LastBootPMDrvs")
-#define REGSTR_VAL_VIRTUALHDIRQ	_TEXT("VirtualHDIRQ")
-#define REGSTR_VAL_SRVNAMECACHECOUNT	_TEXT("ServerNameCacheMax")
-#define REGSTR_VAL_SRVNAMECACHE	_TEXT("ServerNameCache")
-#define REGSTR_VAL_SRVNAMECACHENETPROV	_TEXT("ServerNameCacheNumNets")
-#define	REGSTR_VAL_AUTOMOUNT	_TEXT("AutoMountDrives")
-#define	REGSTR_VAL_COMPRESSIONMETHOD	_TEXT("CompressionAlgorithm")
-#define	REGSTR_VAL_COMPRESSIONTHRESHOLD	_TEXT("CompressionThreshold")
-#define REGSTR_VAL_CDCACHESIZE	_TEXT("CacheSize")
-#define REGSTR_VAL_CDPREFETCH	_TEXT("Prefetch")
-#define REGSTR_VAL_CDPREFETCHTAIL _TEXT("PrefetchTail")
-#define REGSTR_VAL_CDRAWCACHE	_TEXT("RawCache")
-#define REGSTR_VAL_CDEXTERRORS	_TEXT("ExtendedErrors")
-#define REGSTR_VAL_CDSVDSENSE	_TEXT("SVDSense")
-#define REGSTR_VAL_CDSHOWVERSIONS _TEXT("ShowVersions")
-#define REGSTR_VAL_CDCOMPATNAMES _TEXT("MSCDEXCompatNames")
-#define REGSTR_VAL_CDNOREADAHEAD _TEXT("NoReadAhead")
-#define REGSTR_VAL_SCSI	_TEXT("SCSI\\")
-#define REGSTR_VAL_ESDI	_TEXT("ESDI\\")
-#define REGSTR_VAL_FLOP _TEXT("FLOP\\")
-#define	REGSTR_VAL_DISK	_TEXT("GenDisk")
-#define	REGSTR_VAL_CDROM	_TEXT("GenCD")
-#define	REGSTR_VAL_TAPE	_TEXT("TAPE")
-#define	REGSTR_VAL_SCANNER _TEXT("SCANNER")
-#define	REGSTR_VAL_FLOPPY	_TEXT("FLOPPY")
-#define	REGSTR_VAL_SCSITID _TEXT("SCSITargetID")
-#define	REGSTR_VAL_SCSILUN _TEXT("SCSILUN")
-#define	REGSTR_VAL_REVLEVEL _TEXT("RevisionLevel")
-#define	REGSTR_VAL_PRODUCTID _TEXT("ProductId")
-#define	REGSTR_VAL_PRODUCTTYPE _TEXT("ProductType")
-#define	REGSTR_VAL_DEVTYPE _TEXT("DeviceType")
-#define	REGSTR_VAL_REMOVABLE _TEXT("Removable")
-#define REGSTR_VAL_CURDRVLET _TEXT("CurrentDriveLetterAssignment")
-#define	REGSTR_VAL_USRDRVLET _TEXT("UserDriveLetterAssignment")
-#define	REGSTR_VAL_SYNCDATAXFER _TEXT("SyncDataXfer")
-#define	REGSTR_VAL_AUTOINSNOTE	_TEXT("AutoInsertNotification")
-#define	REGSTR_VAL_DISCONNECT _TEXT("Disconnect")
-#define	REGSTR_VAL_INT13 _TEXT("Int13")
-#define	REGSTR_VAL_PMODE_INT13 _TEXT("PModeInt13")
-#define	REGSTR_VAL_USERSETTINGS _TEXT("AdapterSettings")
-#define	REGSTR_VAL_NOIDE _TEXT("NoIDE")
-#define	REGSTR_VAL_DISKCLASSNAME	_TEXT("DiskDrive")
-#define	REGSTR_VAL_CDROMCLASSNAME	_TEXT("CDROM")
-#define	REGSTR_VAL_FORCELOAD	_TEXT("ForceLoadPD")
-#define	REGSTR_VAL_FORCEFIFO _TEXT("ForceFIFO")
-#define	REGSTR_VAL_FORCECL _TEXT("ForceChangeLine")
-#define REGSTR_VAL_NOUSECLASS _TEXT("NoUseClass")
-#define REGSTR_VAL_NOINSTALLCLASS _TEXT("NoInstallClass")
-#define REGSTR_VAL_NODISPLAYCLASS _TEXT("NoDisplayClass")
-#define REGSTR_VAL_SILENTINSTALL _TEXT("SilentInstall")
-#define REGSTR_KEY_PCMCIA_CLASS _TEXT("PCMCIA")
-#define REGSTR_KEY_SCSI_CLASS _TEXT("SCSIAdapter")
-#define REGSTR_KEY_PORTS_CLASS _TEXT("ports")
-#define REGSTR_KEY_MEDIA_CLASS _TEXT("MEDIA")
-#define REGSTR_KEY_DISPLAY_CLASS _TEXT("Display")
-#define REGSTR_KEY_KEYBOARD_CLASS _TEXT("Keyboard")
-#define REGSTR_KEY_MOUSE_CLASS _TEXT("Mouse")
-#define REGSTR_KEY_MONITOR_CLASS _TEXT("Monitor")
-#define REGSTR_VAL_PCMCIA_OPT	_TEXT("Options")
+#define REGSTR_VAL_WORKGROUP TEXT("Workgroup")
+#define REGSTR_VAL_DIRECTHOST TEXT("DirectHost")
+#define REGSTR_VAL_FILESHARING TEXT("FileSharing")
+#define REGSTR_VAL_PRINTSHARING	TEXT("PrintSharing")
+#define REGSTR_VAL_FIRSTNETDRIVE TEXT("FirstNetworkDrive")
+#define REGSTR_VAL_MAXCONNECTIONS	TEXT("MaxConnections")
+#define REGSTR_VAL_APISUPPORT	TEXT("APISupport")
+#define REGSTR_VAL_MAXRETRY	TEXT("MaxRetry")
+#define REGSTR_VAL_MINRETRY	TEXT("MinRetry")
+#define REGSTR_VAL_SUPPORTLFN	TEXT("SupportLFN")
+#define REGSTR_VAL_SUPPORTBURST	TEXT("SupportBurst")
+#define REGSTR_VAL_SUPPORTTUNNELLING	TEXT("SupportTunnelling")
+#define REGSTR_VAL_FULLTRACE	TEXT("FullTrace")
+#define REGSTR_VAL_READCACHING	TEXT("ReadCaching")
+#define REGSTR_VAL_SHOWDOTS	TEXT("ShowDots")
+#define REGSTR_VAL_GAPTIME	TEXT("GapTime")
+#define REGSTR_VAL_SEARCHMODE	TEXT("SearchMode")
+#define REGSTR_VAL_SHELLVERSION TEXT("ShellVersion")
+#define REGSTR_VAL_MAXLIP TEXT("MaxLIP")
+#define REGSTR_VAL_PRESERVECASE TEXT("PreserveCase")
+#define REGSTR_VAL_OPTIMIZESFN TEXT("OptimizeSFN")
+#define REGSTR_VAL_NCP_BROWSEMASTER TEXT("BrowseMaster")
+#define	REGSTR_VAL_NCP_USEPEERBROWSING	TEXT("Use_PeerBrowsing")
+#define REGSTR_VAL_NCP_USESAP TEXT("Use_Sap")
+#define	REGSTR_VAL_WIN31FILESYSTEM	TEXT("Win31FileSystem")
+#define REGSTR_VAL_PRESERVELONGNAMES	TEXT("PreserveLongNames")
+#define REGSTR_VAL_DRIVEWRITEBEHIND	TEXT("DriveWriteBehind")
+#define REGSTR_VAL_ASYNCFILECOMMIT	TEXT("AsyncFileCommit")
+#define REGSTR_VAL_PATHCACHECOUNT	TEXT("PathCache")
+#define REGSTR_VAL_NAMECACHECOUNT	TEXT("NameCache")
+#define REGSTR_VAL_CONTIGFILEALLOC	TEXT("ContigFileAllocSize")
+#define REGSTR_VAL_VOLIDLETIMEOUT	TEXT("VolumeIdleTimeout")
+#define REGSTR_VAL_BUFFIDLETIMEOUT	TEXT("BufferIdleTimeout")
+#define REGSTR_VAL_BUFFAGETIMEOUT	TEXT("BufferAgeTimeout")
+#define	REGSTR_VAL_NAMENUMERICTAIL TEXT("NameNumericTail")
+#define	REGSTR_VAL_READAHEADTHRESHOLD	TEXT("ReadAheadThreshold")
+#define	REGSTR_VAL_DOUBLEBUFFER TEXT("DoubleBuffer")
+#define	REGSTR_VAL_SOFTCOMPATMODE TEXT("SoftCompatMode")
+#define REGSTR_VAL_DRIVESPINDOWN	TEXT("DriveSpinDown")
+#define	REGSTR_VAL_FORCEPMIO	TEXT("ForcePMIO")
+#define REGSTR_VAL_FORCERMIO	TEXT("ForceRMIO")
+#define REGSTR_VAL_LASTBOOTPMDRVS	TEXT("LastBootPMDrvs")
+#define REGSTR_VAL_VIRTUALHDIRQ	TEXT("VirtualHDIRQ")
+#define REGSTR_VAL_SRVNAMECACHECOUNT	TEXT("ServerNameCacheMax")
+#define REGSTR_VAL_SRVNAMECACHE	TEXT("ServerNameCache")
+#define REGSTR_VAL_SRVNAMECACHENETPROV	TEXT("ServerNameCacheNumNets")
+#define	REGSTR_VAL_AUTOMOUNT	TEXT("AutoMountDrives")
+#define	REGSTR_VAL_COMPRESSIONMETHOD	TEXT("CompressionAlgorithm")
+#define	REGSTR_VAL_COMPRESSIONTHRESHOLD	TEXT("CompressionThreshold")
+#define REGSTR_VAL_CDCACHESIZE	TEXT("CacheSize")
+#define REGSTR_VAL_CDPREFETCH	TEXT("Prefetch")
+#define REGSTR_VAL_CDPREFETCHTAIL TEXT("PrefetchTail")
+#define REGSTR_VAL_CDRAWCACHE	TEXT("RawCache")
+#define REGSTR_VAL_CDEXTERRORS	TEXT("ExtendedErrors")
+#define REGSTR_VAL_CDSVDSENSE	TEXT("SVDSense")
+#define REGSTR_VAL_CDSHOWVERSIONS TEXT("ShowVersions")
+#define REGSTR_VAL_CDCOMPATNAMES TEXT("MSCDEXCompatNames")
+#define REGSTR_VAL_CDNOREADAHEAD TEXT("NoReadAhead")
+#define REGSTR_VAL_SCSI	TEXT("SCSI\\")
+#define REGSTR_VAL_ESDI	TEXT("ESDI\\")
+#define REGSTR_VAL_FLOP TEXT("FLOP\\")
+#define	REGSTR_VAL_DISK	TEXT("GenDisk")
+#define	REGSTR_VAL_CDROM	TEXT("GenCD")
+#define	REGSTR_VAL_TAPE	TEXT("TAPE")
+#define	REGSTR_VAL_SCANNER TEXT("SCANNER")
+#define	REGSTR_VAL_FLOPPY	TEXT("FLOPPY")
+#define	REGSTR_VAL_SCSITID TEXT("SCSITargetID")
+#define	REGSTR_VAL_SCSILUN TEXT("SCSILUN")
+#define	REGSTR_VAL_REVLEVEL TEXT("RevisionLevel")
+#define	REGSTR_VAL_PRODUCTID TEXT("ProductId")
+#define	REGSTR_VAL_PRODUCTTYPE TEXT("ProductType")
+#define	REGSTR_VAL_DEVTYPE TEXT("DeviceType")
+#define	REGSTR_VAL_REMOVABLE TEXT("Removable")
+#define REGSTR_VAL_CURDRVLET TEXT("CurrentDriveLetterAssignment")
+#define	REGSTR_VAL_USRDRVLET TEXT("UserDriveLetterAssignment")
+#define	REGSTR_VAL_SYNCDATAXFER TEXT("SyncDataXfer")
+#define	REGSTR_VAL_AUTOINSNOTE	TEXT("AutoInsertNotification")
+#define	REGSTR_VAL_DISCONNECT TEXT("Disconnect")
+#define	REGSTR_VAL_INT13 TEXT("Int13")
+#define	REGSTR_VAL_PMODE_INT13 TEXT("PModeInt13")
+#define	REGSTR_VAL_USERSETTINGS TEXT("AdapterSettings")
+#define	REGSTR_VAL_NOIDE TEXT("NoIDE")
+#define	REGSTR_VAL_DISKCLASSNAME	TEXT("DiskDrive")
+#define	REGSTR_VAL_CDROMCLASSNAME	TEXT("CDROM")
+#define	REGSTR_VAL_FORCELOAD	TEXT("ForceLoadPD")
+#define	REGSTR_VAL_FORCEFIFO TEXT("ForceFIFO")
+#define	REGSTR_VAL_FORCECL TEXT("ForceChangeLine")
+#define REGSTR_VAL_NOUSECLASS TEXT("NoUseClass")
+#define REGSTR_VAL_NOINSTALLCLASS TEXT("NoInstallClass")
+#define REGSTR_VAL_NODISPLAYCLASS TEXT("NoDisplayClass")
+#define REGSTR_VAL_SILENTINSTALL TEXT("SilentInstall")
+#define REGSTR_KEY_PCMCIA_CLASS TEXT("PCMCIA")
+#define REGSTR_KEY_SCSI_CLASS TEXT("SCSIAdapter")
+#define REGSTR_KEY_PORTS_CLASS TEXT("ports")
+#define REGSTR_KEY_MEDIA_CLASS TEXT("MEDIA")
+#define REGSTR_KEY_DISPLAY_CLASS TEXT("Display")
+#define REGSTR_KEY_KEYBOARD_CLASS TEXT("Keyboard")
+#define REGSTR_KEY_MOUSE_CLASS TEXT("Mouse")
+#define REGSTR_KEY_MONITOR_CLASS TEXT("Monitor")
+#define REGSTR_VAL_PCMCIA_OPT	TEXT("Options")
 #define PCMCIA_OPT_HAVE_SOCKET	1
 #define PCMCIA_OPT_AUTOMEM	4
 #define PCMCIA_OPT_NO_SOUND	8
 #define PCMCIA_OPT_NO_AUDIO	16
 #define PCMCIA_OPT_NO_APMREMOVE 32
-#define REGSTR_VAL_PCMCIA_MEM	_TEXT("Memory")
+#define REGSTR_VAL_PCMCIA_MEM	TEXT("Memory")
 #define PCMCIA_DEF_MEMBEGIN	0xC0000
 #define PCMCIA_DEF_MEMEND	0xFFFFFF
 #define PCMCIA_DEF_MEMLEN	0x1000
-#define REGSTR_VAL_PCMCIA_ALLOC _TEXT("AllocMemWin")
-#define REGSTR_VAL_PCMCIA_ATAD	_TEXT("ATADelay")
-#define REGSTR_VAL_PCMCIA_SIZ	_TEXT("MinRegionSize")
+#define REGSTR_VAL_PCMCIA_ALLOC TEXT("AllocMemWin")
+#define REGSTR_VAL_PCMCIA_ATAD	TEXT("ATADelay")
+#define REGSTR_VAL_PCMCIA_SIZ	TEXT("MinRegionSize")
 #define PCMCIA_DEF_MIN_REGION	0x10000
-#define REGSTR_VAL_P1284MDL _TEXT("Model")
-#define REGSTR_VAL_P1284MFG _TEXT("Manufacturer")
-#define	REGSTR_VAL_ISAPNP	_TEXT("ISAPNP")
-#define	REGSTR_VAL_ISAPNP_RDP_OVERRIDE	_TEXT("RDPOverRide")
-#define	REGSTR_VAL_PCI	_TEXT("PCI")
-#define	REGSTR_PCI_OPTIONS	_TEXT("Options")
-#define	REGSTR_PCI_DUAL_IDE	_TEXT("PCIDualIDE")
+#define REGSTR_VAL_P1284MDL TEXT("Model")
+#define REGSTR_VAL_P1284MFG TEXT("Manufacturer")
+#define	REGSTR_VAL_ISAPNP	TEXT("ISAPNP")
+#define	REGSTR_VAL_ISAPNP_RDP_OVERRIDE	TEXT("RDPOverRide")
+#define	REGSTR_VAL_PCI	TEXT("PCI")
+#define	REGSTR_PCI_OPTIONS	TEXT("Options")
+#define	REGSTR_PCI_DUAL_IDE	TEXT("PCIDualIDE")
 #define	PCI_OPTIONS_USE_BIOS	1
 #define	PCI_OPTIONS_USE_IRQ_STEERING	2
 #define	PCI_FLAG_NO_VIDEO_IRQ	1
@@ -278,36 +278,36 @@ extern "C" {
 #define	PCI_FLAG_IS_IDE	256
 #define	PCI_FLAG_IS_VIDEO	512
 #define	PCI_FLAG_FAIL_START	1024
-#define REGSTR_KEY_CRASHES	_TEXT("Crashes")
-#define REGSTR_KEY_DANGERS	_TEXT("Dangers")
-#define REGSTR_KEY_DETMODVARS	_TEXT("DetModVars")
-#define REGSTR_KEY_NDISINFO	_TEXT("NDISInfo")
-#define REGSTR_VAL_PROTINIPATH	_TEXT("ProtIniPath")
-#define REGSTR_VAL_RESOURCES	_TEXT("Resources")
-#define REGSTR_VAL_CRASHFUNCS	_TEXT("CrashFuncs")
-#define REGSTR_VAL_CLASS	_TEXT("Class")
-#define REGSTR_VAL_DEVDESC	_TEXT("DeviceDesc")
-#define REGSTR_VAL_BOOTCONFIG	_TEXT("BootConfig")
-#define REGSTR_VAL_DETFUNC	_TEXT("DetFunc")
-#define REGSTR_VAL_DETFLAGS	_TEXT("DetFlags")
-#define REGSTR_VAL_COMPATIBLEIDS _TEXT("CompatibleIDs")
-#define REGSTR_VAL_DETCONFIG	_TEXT("DetConfig")
-#define REGSTR_VAL_VERIFYKEY	_TEXT("VerifyKey")
-#define REGSTR_VAL_COMINFO	_TEXT("ComInfo")
-#define REGSTR_VAL_INFNAME	_TEXT("InfName")
-#define REGSTR_VAL_CARDSPECIFIC	_TEXT("CardSpecific")
-#define REGSTR_VAL_NETOSTYPE	_TEXT("NetOSType")
-#define REGSTR_DATA_NETOS_NDIS	_TEXT("NDIS")
-#define REGSTR_DATA_NETOS_ODI	_TEXT("ODI")
-#define REGSTR_DATA_NETOS_IPX	_TEXT("IPX")
-#define REGSTR_VAL_MFG _TEXT("Mfg")
-#define REGSTR_VAL_SCAN_ONLY_FIRST	_TEXT("ScanOnlyFirstDrive")
-#define REGSTR_VAL_SHARE_IRQ	_TEXT("ForceIRQSharing")
-#define REGSTR_VAL_NONSTANDARD_ATAPI	_TEXT("NonStandardATAPI")
-#define REGSTR_VAL_IDE_FORCE_SERIALIZE	_TEXT("ForceSerialization")
+#define REGSTR_KEY_CRASHES	TEXT("Crashes")
+#define REGSTR_KEY_DANGERS	TEXT("Dangers")
+#define REGSTR_KEY_DETMODVARS	TEXT("DetModVars")
+#define REGSTR_KEY_NDISINFO	TEXT("NDISInfo")
+#define REGSTR_VAL_PROTINIPATH	TEXT("ProtIniPath")
+#define REGSTR_VAL_RESOURCES	TEXT("Resources")
+#define REGSTR_VAL_CRASHFUNCS	TEXT("CrashFuncs")
+#define REGSTR_VAL_CLASS	TEXT("Class")
+#define REGSTR_VAL_DEVDESC	TEXT("DeviceDesc")
+#define REGSTR_VAL_BOOTCONFIG	TEXT("BootConfig")
+#define REGSTR_VAL_DETFUNC	TEXT("DetFunc")
+#define REGSTR_VAL_DETFLAGS	TEXT("DetFlags")
+#define REGSTR_VAL_COMPATIBLEIDS TEXT("CompatibleIDs")
+#define REGSTR_VAL_DETCONFIG	TEXT("DetConfig")
+#define REGSTR_VAL_VERIFYKEY	TEXT("VerifyKey")
+#define REGSTR_VAL_COMINFO	TEXT("ComInfo")
+#define REGSTR_VAL_INFNAME	TEXT("InfName")
+#define REGSTR_VAL_CARDSPECIFIC	TEXT("CardSpecific")
+#define REGSTR_VAL_NETOSTYPE	TEXT("NetOSType")
+#define REGSTR_DATA_NETOS_NDIS	TEXT("NDIS")
+#define REGSTR_DATA_NETOS_ODI	TEXT("ODI")
+#define REGSTR_DATA_NETOS_IPX	TEXT("IPX")
+#define REGSTR_VAL_MFG TEXT("Mfg")
+#define REGSTR_VAL_SCAN_ONLY_FIRST	TEXT("ScanOnlyFirstDrive")
+#define REGSTR_VAL_SHARE_IRQ	TEXT("ForceIRQSharing")
+#define REGSTR_VAL_NONSTANDARD_ATAPI	TEXT("NonStandardATAPI")
+#define REGSTR_VAL_IDE_FORCE_SERIALIZE	TEXT("ForceSerialization")
 #define	REGSTR_VAL_MAX_HCID_LEN	1024
-#define REGSTR_VAL_HWREV _TEXT("HWRevision")
-#define REGSTR_VAL_ENABLEINTS _TEXT("EnableInts")
+#define REGSTR_VAL_HWREV TEXT("HWRevision")
+#define REGSTR_VAL_ENABLEINTS TEXT("EnableInts")
 #define REGDF_NOTDETIO	1
 #define REGDF_NOTDETMEM 2
 #define REGDF_NOTDETIRQ 4
@@ -323,67 +323,67 @@ extern "C" {
 #define	REGDF_CONFLICTALL	(REGDF_CONFLICTIO | REGDF_CONFLICTMEM | REGDF_CONFLICTIRQ | REGDF_CONFLICTDMA)
 #define REGDF_MAPIRQ2TO9	0x100000
 #define REGDF_NOTVERIFIED	0x80000000
-#define REGSTR_VAL_APMBIOSVER	_TEXT("APMBiosVer")
-#define REGSTR_VAL_APMFLAGS	_TEXT("APMFlags")
-#define REGSTR_VAL_SLSUPPORT	_TEXT("SLSupport")
-#define REGSTR_VAL_MACHINETYPE	_TEXT("MachineType")
-#define REGSTR_VAL_SETUPMACHINETYPE _TEXT("SetupMachineType")
-#define REGSTR_MACHTYPE_UNKNOWN _TEXT("Unknown")
-#define REGSTR_MACHTYPE_IBMPC	_TEXT("IBM PC")
-#define REGSTR_MACHTYPE_IBMPCJR _TEXT("IBM PCjr")
-#define REGSTR_MACHTYPE_IBMPCCONV	_TEXT("IBM PC Convertible")
-#define REGSTR_MACHTYPE_IBMPCXT _TEXT("IBM PC/XT")
-#define REGSTR_MACHTYPE_IBMPCXT_286	_TEXT("IBM PC/XT 286")
-#define REGSTR_MACHTYPE_IBMPCAT _TEXT("IBM PC/AT")
-#define REGSTR_MACHTYPE_IBMPS2_25	_TEXT("IBM PS/2-25")
-#define REGSTR_MACHTYPE_IBMPS2_30_286	_TEXT("IBM PS/2-30 286")
-#define REGSTR_MACHTYPE_IBMPS2_30	_TEXT("IBM PS/2-30")
-#define REGSTR_MACHTYPE_IBMPS2_50	_TEXT("IBM PS/2-50")
-#define REGSTR_MACHTYPE_IBMPS2_50Z	_TEXT("IBM PS/2-50Z")
-#define REGSTR_MACHTYPE_IBMPS2_55SX	_TEXT("IBM PS/2-55SX")
-#define REGSTR_MACHTYPE_IBMPS2_60	_TEXT("IBM PS/2-60")
-#define REGSTR_MACHTYPE_IBMPS2_65SX	_TEXT("IBM PS/2-65SX")
-#define REGSTR_MACHTYPE_IBMPS2_70	_TEXT("IBM PS/2-70")
-#define REGSTR_MACHTYPE_IBMPS2_P70	_TEXT("IBM PS/2-P70")
-#define REGSTR_MACHTYPE_IBMPS2_70_80	_TEXT("IBM PS/2-70/80")
-#define REGSTR_MACHTYPE_IBMPS2_80	_TEXT("IBM PS/2-80")
-#define REGSTR_MACHTYPE_IBMPS2_90	_TEXT("IBM PS/2-90")
-#define REGSTR_MACHTYPE_IBMPS1	_TEXT("IBM PS/1")
-#define REGSTR_MACHTYPE_PHOENIX_PCAT	_TEXT("Phoenix PC/AT Compatible")
-#define REGSTR_MACHTYPE_HP_VECTRA	_TEXT("HP Vectra")
-#define REGSTR_MACHTYPE_ATT_PC	_TEXT("AT&T PC")
-#define REGSTR_MACHTYPE_ZENITH_PC	_TEXT("Zenith PC")
-#define REGSTR_VAL_APMMENUSUSPEND	_TEXT("APMMenuSuspend")
+#define REGSTR_VAL_APMBIOSVER	TEXT("APMBiosVer")
+#define REGSTR_VAL_APMFLAGS	TEXT("APMFlags")
+#define REGSTR_VAL_SLSUPPORT	TEXT("SLSupport")
+#define REGSTR_VAL_MACHINETYPE	TEXT("MachineType")
+#define REGSTR_VAL_SETUPMACHINETYPE TEXT("SetupMachineType")
+#define REGSTR_MACHTYPE_UNKNOWN TEXT("Unknown")
+#define REGSTR_MACHTYPE_IBMPC	TEXT("IBM PC")
+#define REGSTR_MACHTYPE_IBMPCJR TEXT("IBM PCjr")
+#define REGSTR_MACHTYPE_IBMPCCONV	TEXT("IBM PC Convertible")
+#define REGSTR_MACHTYPE_IBMPCXT TEXT("IBM PC/XT")
+#define REGSTR_MACHTYPE_IBMPCXT_286	TEXT("IBM PC/XT 286")
+#define REGSTR_MACHTYPE_IBMPCAT TEXT("IBM PC/AT")
+#define REGSTR_MACHTYPE_IBMPS2_25	TEXT("IBM PS/2-25")
+#define REGSTR_MACHTYPE_IBMPS2_30_286	TEXT("IBM PS/2-30 286")
+#define REGSTR_MACHTYPE_IBMPS2_30	TEXT("IBM PS/2-30")
+#define REGSTR_MACHTYPE_IBMPS2_50	TEXT("IBM PS/2-50")
+#define REGSTR_MACHTYPE_IBMPS2_50Z	TEXT("IBM PS/2-50Z")
+#define REGSTR_MACHTYPE_IBMPS2_55SX	TEXT("IBM PS/2-55SX")
+#define REGSTR_MACHTYPE_IBMPS2_60	TEXT("IBM PS/2-60")
+#define REGSTR_MACHTYPE_IBMPS2_65SX	TEXT("IBM PS/2-65SX")
+#define REGSTR_MACHTYPE_IBMPS2_70	TEXT("IBM PS/2-70")
+#define REGSTR_MACHTYPE_IBMPS2_P70	TEXT("IBM PS/2-P70")
+#define REGSTR_MACHTYPE_IBMPS2_70_80	TEXT("IBM PS/2-70/80")
+#define REGSTR_MACHTYPE_IBMPS2_80	TEXT("IBM PS/2-80")
+#define REGSTR_MACHTYPE_IBMPS2_90	TEXT("IBM PS/2-90")
+#define REGSTR_MACHTYPE_IBMPS1	TEXT("IBM PS/1")
+#define REGSTR_MACHTYPE_PHOENIX_PCAT	TEXT("Phoenix PC/AT Compatible")
+#define REGSTR_MACHTYPE_HP_VECTRA	TEXT("HP Vectra")
+#define REGSTR_MACHTYPE_ATT_PC	TEXT("AT&T PC")
+#define REGSTR_MACHTYPE_ZENITH_PC	TEXT("Zenith PC")
+#define REGSTR_VAL_APMMENUSUSPEND	TEXT("APMMenuSuspend")
 #define APMMENUSUSPEND_DISABLED 0
 #define APMMENUSUSPEND_ENABLED	1
 #define APMMENUSUSPEND_UNDOCKED 2
 #define APMMENUSUSPEND_NOCHANGE 128
-#define REGSTR_VAL_BUSTYPE _TEXT("BusType")
-#define REGSTR_VAL_CPU _TEXT("CPU")
-#define REGSTR_VAL_NDP _TEXT("NDP")
-#define REGSTR_VAL_PNPBIOSVER _TEXT("PnPBIOSVer")
-#define REGSTR_VAL_PNPSTRUCOFFSET _TEXT("PnPStrucOffset")
-#define REGSTR_VAL_PCIBIOSVER _TEXT("PCIBIOSVer")
-#define REGSTR_VAL_HWMECHANISM _TEXT("HWMechanism")
-#define REGSTR_VAL_LASTPCIBUSNUM _TEXT("LastPCIBusNum")
-#define REGSTR_VAL_CONVMEM _TEXT("ConvMem")
-#define REGSTR_VAL_EXTMEM _TEXT("ExtMem")
-#define REGSTR_VAL_COMPUTERNAME _TEXT("ComputerName")
-#define REGSTR_VAL_BIOSNAME _TEXT("BIOSName")
-#define REGSTR_VAL_BIOSVERSION _TEXT("BIOSVersion")
-#define REGSTR_VAL_BIOSDATE _TEXT("BIOSDate")
-#define REGSTR_VAL_MODEL _TEXT("Model")
-#define REGSTR_VAL_SUBMODEL _TEXT("Submodel")
-#define REGSTR_VAL_REVISION _TEXT("Revision")
-#define REGSTR_VAL_FIFODEPTH	_TEXT("FIFODepth")
-#define REGSTR_VAL_RDINTTHRESHOLD	_TEXT("RDIntThreshold")
-#define REGSTR_VAL_WRINTTHRESHOLD	_TEXT("WRIntThreshold")
-#define REGSTR_VAL_PRIORITY	_TEXT("Priority")
-#define REGSTR_VAL_DRIVER	_TEXT("Driver")
-#define REGSTR_VAL_FUNCDESC	_TEXT("FunctionDesc")
-#define REGSTR_VAL_FORCEDCONFIG _TEXT("ForcedConfig")
-#define REGSTR_VAL_CONFIGFLAGS	_TEXT("ConfigFlags")
-#define REGSTR_VAL_CSCONFIGFLAGS _TEXT("CSConfigFlags")
+#define REGSTR_VAL_BUSTYPE TEXT("BusType")
+#define REGSTR_VAL_CPU TEXT("CPU")
+#define REGSTR_VAL_NDP TEXT("NDP")
+#define REGSTR_VAL_PNPBIOSVER TEXT("PnPBIOSVer")
+#define REGSTR_VAL_PNPSTRUCOFFSET TEXT("PnPStrucOffset")
+#define REGSTR_VAL_PCIBIOSVER TEXT("PCIBIOSVer")
+#define REGSTR_VAL_HWMECHANISM TEXT("HWMechanism")
+#define REGSTR_VAL_LASTPCIBUSNUM TEXT("LastPCIBusNum")
+#define REGSTR_VAL_CONVMEM TEXT("ConvMem")
+#define REGSTR_VAL_EXTMEM TEXT("ExtMem")
+#define REGSTR_VAL_COMPUTERNAME TEXT("ComputerName")
+#define REGSTR_VAL_BIOSNAME TEXT("BIOSName")
+#define REGSTR_VAL_BIOSVERSION TEXT("BIOSVersion")
+#define REGSTR_VAL_BIOSDATE TEXT("BIOSDate")
+#define REGSTR_VAL_MODEL TEXT("Model")
+#define REGSTR_VAL_SUBMODEL TEXT("Submodel")
+#define REGSTR_VAL_REVISION TEXT("Revision")
+#define REGSTR_VAL_FIFODEPTH	TEXT("FIFODepth")
+#define REGSTR_VAL_RDINTTHRESHOLD	TEXT("RDIntThreshold")
+#define REGSTR_VAL_WRINTTHRESHOLD	TEXT("WRIntThreshold")
+#define REGSTR_VAL_PRIORITY	TEXT("Priority")
+#define REGSTR_VAL_DRIVER	TEXT("Driver")
+#define REGSTR_VAL_FUNCDESC	TEXT("FunctionDesc")
+#define REGSTR_VAL_FORCEDCONFIG TEXT("ForcedConfig")
+#define REGSTR_VAL_CONFIGFLAGS	TEXT("ConfigFlags")
+#define REGSTR_VAL_CSCONFIGFLAGS TEXT("CSConfigFlags")
 #define CONFIGFLAG_DISABLED	1
 #define CONFIGFLAG_REMOVED	2
 #define CONFIGFLAG_MANUAL_INSTALL 4
@@ -399,14 +399,14 @@ extern "C" {
 #define CSCONFIGFLAG_DO_NOT_CREATE	2
 #define CSCONFIGFLAG_DO_NOT_START	4
 #define DMSTATEFLAG_APPLYTOALL 1
-#define	REGSTR_VAL_ROOT_DEVNODE	_TEXT("HTREE\\ROOT\\0")
-#define	REGSTR_VAL_RESERVED_DEVNODE	_TEXT("HTREE\\RESERVED\\0")
-#define	REGSTR_PATH_READDATAPORT	REGSTR_KEY_ISAENUM _TEXT("\\ReadDataPort\\0")
-#define	REGSTR_PATH_MULTI_FUNCTION	_TEXT("MF")
-#define	REGSTR_VAL_RESOURCE_MAP	_TEXT("ResourceMap")
-#define	REGSTR_PATH_CHILD_PREFIX	_TEXT("Child")
+#define	REGSTR_VAL_ROOT_DEVNODE	TEXT("HTREE\\ROOT\\0")
+#define	REGSTR_VAL_RESERVED_DEVNODE	TEXT("HTREE\\RESERVED\\0")
+#define	REGSTR_PATH_READDATAPORT	REGSTR_KEY_ISAENUM TEXT("\\ReadDataPort\\0")
+#define	REGSTR_PATH_MULTI_FUNCTION	TEXT("MF")
+#define	REGSTR_VAL_RESOURCE_MAP	TEXT("ResourceMap")
+#define	REGSTR_PATH_CHILD_PREFIX	TEXT("Child")
 #define	NUM_RESOURCE_MAP	256
-#define	REGSTR_VAL_MF_FLAGS	_TEXT("MFFlags")
+#define	REGSTR_VAL_MF_FLAGS	TEXT("MFFlags")
 #define	MF_FLAGS_EVEN_IF_NO_RESOURCE	1
 #define	MF_FLAGS_NO_CREATE_IF_NO_RESOURCE	2
 #define	MF_FLAGS_FILL_IN_UNKNOWN_RESOURCE	4
@@ -415,336 +415,336 @@ extern "C" {
 #define	EISAFLAG_SLOT_IO_FIRST	2
 #define	EISA_NO_MAX_FUNCTION	0xFF
 #define	NUM_EISA_RANGES	4
-#define REGSTR_VAL_DRVDESC	_TEXT("DriverDesc")
-#define REGSTR_VAL_DEVLOADER	_TEXT("DevLoader")
-#define REGSTR_VAL_STATICVXD	_TEXT("StaticVxD")
-#define REGSTR_VAL_PROPERTIES	_TEXT("Properties")
-#define REGSTR_VAL_MANUFACTURER _TEXT("Manufacturer")
-#define REGSTR_VAL_EXISTS	_TEXT("Exists")
-#define REGSTR_VAL_CMENUMFLAGS	_TEXT("CMEnumFlags")
-#define REGSTR_VAL_CMDRIVFLAGS	_TEXT("CMDrivFlags")
-#define	REGSTR_VAL_ENUMERATOR	_TEXT("Enumerator")
-#define	REGSTR_VAL_DEVICEDRIVER	_TEXT("DeviceDriver")
-#define REGSTR_VAL_PORTNAME	_TEXT("PortName")
-#define REGSTR_VAL_INFPATH _TEXT("InfPath")
-#define REGSTR_VAL_INFSECTION	_TEXT("InfSection")
-#define REGSTR_VAL_POLLING	_TEXT("Polling")
-#define REGSTR_VAL_DONTLOADIFCONFLICT _TEXT("DontLoadIfConflict")
-#define REGSTR_VAL_PORTSUBCLASS _TEXT("PortSubClass")
-#define REGSTR_VAL_NETCLEAN _TEXT("NetClean")
-#define REGSTR_VAL_IDE_NO_SERIALIZE _TEXT("IDENoSerialize")
-#define REGSTR_VAL_NOCMOSORFDPT _TEXT("NoCMOSorFDPT")
-#define REGSTR_VAL_COMVERIFYBASE _TEXT("COMVerifyBase")
-#define REGSTR_KEY_OVERRIDE	_TEXT("Override")
-#define	REGSTR_VAL_CONFIGMG	_TEXT("CONFIGMG")
-#define REGSTR_VAL_SYSDM	_TEXT("SysDM")
-#define REGSTR_VAL_SYSDMFUNC	_TEXT("SysDMFunc")
-#define	REGSTR_VAL_PRIVATE	_TEXT("Private")
-#define	REGSTR_VAL_PRIVATEFUNC	_TEXT("PrivateFunc")
-#define	REGSTR_VAL_DETECT	_TEXT("Detect")
-#define	REGSTR_VAL_DETECTFUNC	_TEXT("DetectFunc")
-#define	REGSTR_VAL_ASKFORCONFIG	_TEXT("AskForConfig")
-#define	REGSTR_VAL_ASKFORCONFIGFUNC _TEXT("AskForConfigFunc")
-#define	REGSTR_VAL_WAITFORUNDOCK _TEXT("WaitForUndock")
-#define	REGSTR_VAL_WAITFORUNDOCKFUNC _TEXT("WaitForUndockFunc")
-#define	REGSTR_VAL_REMOVEROMOKAY _TEXT("RemoveRomOkay")
-#define	REGSTR_VAL_REMOVEROMOKAYFUNC _TEXT("RemoveRomOkayFunc")
-#define REGSTR_VAL_CURCONFIG	_TEXT("CurrentConfig")
-#define REGSTR_VAL_FRIENDLYNAME _TEXT("FriendlyName")
-#define REGSTR_VAL_CURRENTCONFIG _TEXT("CurrentConfig")
-#define REGSTR_VAL_MAP	_TEXT("Map")
-#define REGSTR_VAL_ID	_TEXT("CurrentID")
-#define REGSTR_VAL_DOCKED	_TEXT("CurrentDockedState")
-#define REGSTR_VAL_CHECKSUM	_TEXT("CurrentChecksum")
-#define REGSTR_VAL_HWDETECT	_TEXT("HardwareDetect")
-#define REGSTR_VAL_INHIBITRESULTS _TEXT("InhibitResults")
-#define REGSTR_VAL_PROFILEFLAGS _TEXT("ProfileFlags")
-#define REGSTR_KEY_PCMCIA	_TEXT("PCMCIA\\")
-#define REGSTR_KEY_PCUNKNOWN	_TEXT("UNKNOWN_MANUFACTURER")
-#define REGSTR_VAL_PCSSDRIVER	_TEXT("Driver")
-#define REGSTR_KEY_PCMTD	_TEXT("MTD-")
-#define REGSTR_VAL_PCMTDRIVER	_TEXT("MTD")
-#define REGSTR_VAL_HARDWAREID	_TEXT("HardwareID")
-#define REGSTR_VAL_INSTALLER	_TEXT("Installer")
-#define REGSTR_VAL_INSICON	_TEXT("Icon")
-#define REGSTR_VAL_ENUMPROPPAGES _TEXT("EnumPropPages")
-#define REGSTR_VAL_BASICPROPERTIES _TEXT("BasicProperties")
-#define REGSTR_VAL_PRIVATEPROBLEM _TEXT("PrivateProblem")
-#define REGSTR_KEY_CURRENT	_TEXT("Current")
-#define REGSTR_KEY_DEFAULT	_TEXT("Default")
-#define REGSTR_KEY_MODES	_TEXT("Modes")
-#define REGSTR_VAL_MODE _TEXT("Mode")
-#define REGSTR_VAL_BPP	_TEXT("BPP")
-#define REGSTR_VAL_HRES _TEXT("HRes")
-#define REGSTR_VAL_VRES _TEXT("VRes")
-#define REGSTR_VAL_FONTSIZE	_TEXT("FontSize")
-#define REGSTR_VAL_DRV	_TEXT("drv")
-#define REGSTR_VAL_GRB	_TEXT("grb")
-#define REGSTR_VAL_VDD	_TEXT("vdd")
-#define REGSTR_VAL_VER	_TEXT("Ver")
-#define REGSTR_VAL_MAXRES	_TEXT("MaxResolution")
-#define REGSTR_VAL_DPMS _TEXT("DPMS")
-#define REGSTR_VAL_RESUMERESET _TEXT("ResumeReset")
-#define REGSTR_VAL_DESCRIPTION _TEXT("Description")
-#define REGSTR_KEY_SYSTEM	_TEXT("System")
-#define REGSTR_KEY_USER _TEXT("User")
-#define REGSTR_VAL_DPI	_TEXT("dpi")
-#define REGSTR_VAL_PCICOPTIONS	_TEXT("PCICOptions")
+#define REGSTR_VAL_DRVDESC	TEXT("DriverDesc")
+#define REGSTR_VAL_DEVLOADER	TEXT("DevLoader")
+#define REGSTR_VAL_STATICVXD	TEXT("StaticVxD")
+#define REGSTR_VAL_PROPERTIES	TEXT("Properties")
+#define REGSTR_VAL_MANUFACTURER TEXT("Manufacturer")
+#define REGSTR_VAL_EXISTS	TEXT("Exists")
+#define REGSTR_VAL_CMENUMFLAGS	TEXT("CMEnumFlags")
+#define REGSTR_VAL_CMDRIVFLAGS	TEXT("CMDrivFlags")
+#define	REGSTR_VAL_ENUMERATOR	TEXT("Enumerator")
+#define	REGSTR_VAL_DEVICEDRIVER	TEXT("DeviceDriver")
+#define REGSTR_VAL_PORTNAME	TEXT("PortName")
+#define REGSTR_VAL_INFPATH TEXT("InfPath")
+#define REGSTR_VAL_INFSECTION	TEXT("InfSection")
+#define REGSTR_VAL_POLLING	TEXT("Polling")
+#define REGSTR_VAL_DONTLOADIFCONFLICT TEXT("DontLoadIfConflict")
+#define REGSTR_VAL_PORTSUBCLASS TEXT("PortSubClass")
+#define REGSTR_VAL_NETCLEAN TEXT("NetClean")
+#define REGSTR_VAL_IDE_NO_SERIALIZE TEXT("IDENoSerialize")
+#define REGSTR_VAL_NOCMOSORFDPT TEXT("NoCMOSorFDPT")
+#define REGSTR_VAL_COMVERIFYBASE TEXT("COMVerifyBase")
+#define REGSTR_KEY_OVERRIDE	TEXT("Override")
+#define	REGSTR_VAL_CONFIGMG	TEXT("CONFIGMG")
+#define REGSTR_VAL_SYSDM	TEXT("SysDM")
+#define REGSTR_VAL_SYSDMFUNC	TEXT("SysDMFunc")
+#define	REGSTR_VAL_PRIVATE	TEXT("Private")
+#define	REGSTR_VAL_PRIVATEFUNC	TEXT("PrivateFunc")
+#define	REGSTR_VAL_DETECT	TEXT("Detect")
+#define	REGSTR_VAL_DETECTFUNC	TEXT("DetectFunc")
+#define	REGSTR_VAL_ASKFORCONFIG	TEXT("AskForConfig")
+#define	REGSTR_VAL_ASKFORCONFIGFUNC TEXT("AskForConfigFunc")
+#define	REGSTR_VAL_WAITFORUNDOCK TEXT("WaitForUndock")
+#define	REGSTR_VAL_WAITFORUNDOCKFUNC TEXT("WaitForUndockFunc")
+#define	REGSTR_VAL_REMOVEROMOKAY TEXT("RemoveRomOkay")
+#define	REGSTR_VAL_REMOVEROMOKAYFUNC TEXT("RemoveRomOkayFunc")
+#define REGSTR_VAL_CURCONFIG	TEXT("CurrentConfig")
+#define REGSTR_VAL_FRIENDLYNAME TEXT("FriendlyName")
+#define REGSTR_VAL_CURRENTCONFIG TEXT("CurrentConfig")
+#define REGSTR_VAL_MAP	TEXT("Map")
+#define REGSTR_VAL_ID	TEXT("CurrentID")
+#define REGSTR_VAL_DOCKED	TEXT("CurrentDockedState")
+#define REGSTR_VAL_CHECKSUM	TEXT("CurrentChecksum")
+#define REGSTR_VAL_HWDETECT	TEXT("HardwareDetect")
+#define REGSTR_VAL_INHIBITRESULTS TEXT("InhibitResults")
+#define REGSTR_VAL_PROFILEFLAGS TEXT("ProfileFlags")
+#define REGSTR_KEY_PCMCIA	TEXT("PCMCIA\\")
+#define REGSTR_KEY_PCUNKNOWN	TEXT("UNKNOWN_MANUFACTURER")
+#define REGSTR_VAL_PCSSDRIVER	TEXT("Driver")
+#define REGSTR_KEY_PCMTD	TEXT("MTD-")
+#define REGSTR_VAL_PCMTDRIVER	TEXT("MTD")
+#define REGSTR_VAL_HARDWAREID	TEXT("HardwareID")
+#define REGSTR_VAL_INSTALLER	TEXT("Installer")
+#define REGSTR_VAL_INSICON	TEXT("Icon")
+#define REGSTR_VAL_ENUMPROPPAGES TEXT("EnumPropPages")
+#define REGSTR_VAL_BASICPROPERTIES TEXT("BasicProperties")
+#define REGSTR_VAL_PRIVATEPROBLEM TEXT("PrivateProblem")
+#define REGSTR_KEY_CURRENT	TEXT("Current")
+#define REGSTR_KEY_DEFAULT	TEXT("Default")
+#define REGSTR_KEY_MODES	TEXT("Modes")
+#define REGSTR_VAL_MODE TEXT("Mode")
+#define REGSTR_VAL_BPP	TEXT("BPP")
+#define REGSTR_VAL_HRES TEXT("HRes")
+#define REGSTR_VAL_VRES TEXT("VRes")
+#define REGSTR_VAL_FONTSIZE	TEXT("FontSize")
+#define REGSTR_VAL_DRV	TEXT("drv")
+#define REGSTR_VAL_GRB	TEXT("grb")
+#define REGSTR_VAL_VDD	TEXT("vdd")
+#define REGSTR_VAL_VER	TEXT("Ver")
+#define REGSTR_VAL_MAXRES	TEXT("MaxResolution")
+#define REGSTR_VAL_DPMS TEXT("DPMS")
+#define REGSTR_VAL_RESUMERESET TEXT("ResumeReset")
+#define REGSTR_VAL_DESCRIPTION TEXT("Description")
+#define REGSTR_KEY_SYSTEM	TEXT("System")
+#define REGSTR_KEY_USER TEXT("User")
+#define REGSTR_VAL_DPI	TEXT("dpi")
+#define REGSTR_VAL_PCICOPTIONS	TEXT("PCICOptions")
 #ifndef NEC_98
 #define PCIC_DEFAULT_IRQMASK	0x4EB8
 #else
 #define PCIC_DEFAULT_IRQMASK	0x1468
 #endif
 #define PCIC_DEFAULT_NUMSOCKETS 0
-#define REGSTR_VAL_PCICIRQMAP	_TEXT("PCICIRQMap")
-#define REGSTR_PATH_APPEARANCE	_TEXT("Control Panel\\Appearance")
-#define REGSTR_PATH_LOOKSCHEMES _TEXT("Control Panel\\Appearance\\Schemes")
-#define REGSTR_VAL_CUSTOMCOLORS _TEXT("CustomColors")
-#define REGSTR_PATH_SCREENSAVE _TEXT("Control Panel\\Desktop")
-#define REGSTR_VALUE_USESCRPASSWORD _TEXT("ScreenSaveUsePassword")
-#define REGSTR_VALUE_SCRPASSWORD _TEXT("ScreenSave_Data")
-#define REGSTR_VALUE_LOWPOWERTIMEOUT	_TEXT("ScreenSaveLowPowerTimeout")
-#define REGSTR_VALUE_POWEROFFTIMEOUT	_TEXT("ScreenSavePowerOffTimeout")
-#define REGSTR_VALUE_LOWPOWERACTIVE	_TEXT("ScreenSaveLowPowerActive")
-#define REGSTR_VALUE_POWEROFFACTIVE	_TEXT("ScreenSavePowerOffActive")
-#define REGSTR_PATH_WINDOWSAPPLETS _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets")
-#define REGSTR_PATH_SYSTRAY _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray")
-#define REGSTR_VAL_SYSTRAYSVCS _TEXT("Services")
-#define REGSTR_VAL_SYSTRAYBATFLAGS _TEXT("PowerFlags")
-#define REGSTR_VAL_SYSTRAYPCCARDFLAGS _TEXT("PCMCIAFlags")
-#define REGSTR_PATH_NETWORK_USERSETTINGS	_TEXT("Network")
-#define REGSTR_KEY_NETWORK_PERSISTENT	_TEXT("\\Persistent")
-#define REGSTR_KEY_NETWORK_RECENT	_TEXT("\\Recent")
-#define REGSTR_VAL_REMOTE_PATH	_TEXT("RemotePath")
-#define REGSTR_VAL_USER_NAME	_TEXT("UserName")
-#define REGSTR_VAL_PROVIDER_NAME	_TEXT("ProviderName")
-#define REGSTR_VAL_CONNECTION_TYPE	_TEXT("ConnectionType")
-#define REGSTR_VAL_UPGRADE	_TEXT("Upgrade")
-#define REGSTR_KEY_LOGON _TEXT("\\Logon")
-#define REGSTR_VAL_MUSTBEVALIDATED _TEXT("MustBeValidated")
-#define REGSTR_VAL_RUNLOGINSCRIPT	_TEXT("ProcessLoginScript")
-#define REGSTR_KEY_NETWORKPROVIDER _TEXT("\\NetworkProvider")
-#define REGSTR_PATH_NW32NETPROVIDER REGSTR_PATH_SERVICES _TEXT("\\NWNP32" REGSTR_KEY_NETWORKPROVIDER
-#define REGSTR_PATH_MS32NETPROVIDER REGSTR_PATH_SERVICES _TEXT("\\MSNP32" REGSTR_KEY_NETWORKPROVIDER
-#define REGSTR_VAL_AUTHENT_AGENT _TEXT("AuthenticatingAgent")
-#define REGSTR_VAL_PREFREDIR _TEXT("PreferredRedir")
-#define REGSTR_VAL_AUTOSTART _TEXT("AutoStart")
-#define REGSTR_VAL_AUTOLOGON _TEXT("AutoLogon")
-#define REGSTR_VAL_NETCARD _TEXT("Netcard")
-#define REGSTR_VAL_TRANSPORT _TEXT("Transport")
-#define REGSTR_VAL_DYNAMIC _TEXT("Dynamic")
-#define REGSTR_VAL_TRANSITION _TEXT("Transition")
-#define REGSTR_VAL_STATICDRIVE _TEXT("StaticDrive")
-#define REGSTR_VAL_LOADHI _TEXT("LoadHi")
-#define REGSTR_VAL_LOADRMDRIVERS _TEXT("LoadRMDrivers")
-#define REGSTR_VAL_SETUPN _TEXT("SetupN")
-#define REGSTR_VAL_SETUPNPATH _TEXT("SetupNPath")
-#define REGSTR_VAL_WRKGRP_FORCEMAPPING _TEXT("WrkgrpForceMapping")
-#define REGSTR_VAL_WRKGRP_REQUIRED _TEXT("WrkgrpRequired")
-#define REGSTR_PATH_CURRENT_CONTROL_SET	_TEXT("System\\CurrentControlSet\\Control")
-#define REGSTR_VAL_CURRENT_USER	_TEXT("Current User")
-#define REGSTR_PATH_PWDPROVIDER	_TEXT("System\\CurrentControlSet\\Control\\PwdProvider")
-#define REGSTR_VAL_PWDPROVIDER_PATH _TEXT("ProviderPath")
-#define REGSTR_VAL_PWDPROVIDER_DESC _TEXT("Description")
-#define REGSTR_VAL_PWDPROVIDER_CHANGEPWD _TEXT("ChangePassword")
-#define REGSTR_VAL_PWDPROVIDER_CHANGEPWDHWND _TEXT("ChangePasswordHwnd")
-#define REGSTR_VAL_PWDPROVIDER_GETPWDSTATUS _TEXT("GetPasswordStatus")
-#define REGSTR_VAL_PWDPROVIDER_ISNP _TEXT("NetworkProvider")
-#define REGSTR_VAL_PWDPROVIDER_CHANGEORDER _TEXT("ChangeOrder")
-#define REGSTR_PATH_POLICIES	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Policies")
-#define REGSTR_PATH_UPDATE	_TEXT("System\\CurrentControlSet\\Control\\Update")
-#define REGSTR_VALUE_ENABLE	_TEXT("Enable")
-#define REGSTR_VALUE_VERBOSE	_TEXT("Verbose")
-#define REGSTR_VALUE_NETPATH	_TEXT("NetworkPath")
-#define REGSTR_VALUE_DEFAULTLOC	_TEXT("UseDefaultNetLocation")
-#define REGSTR_KEY_NETWORK	_TEXT("Network")
-#define REGSTR_KEY_SYSTEM	_TEXT("System")
-#define REGSTR_KEY_PRINTERS	_TEXT("Printers")
-#define REGSTR_KEY_WINOLDAPP	_TEXT("WinOldApp")
-#define REGSTR_VAL_NOFILESHARING	_TEXT("NoFileSharing")
-#define REGSTR_VAL_NOPRINTSHARING	_TEXT("NoPrintSharing")
-#define REGSTR_VAL_NOFILESHARINGCTRL	_TEXT("NoFileSharingControl")
-#define REGSTR_VAL_NOPRINTSHARINGCTRL	_TEXT("NoPrintSharingControl")
-#define REGSTR_VAL_HIDESHAREPWDS	_TEXT("HideSharePwds")
-#define REGSTR_VAL_DISABLEPWDCACHING	_TEXT("DisablePwdCaching")
-#define REGSTR_VAL_ALPHANUMPWDS	_TEXT("AlphanumPwds")
-#define REGSTR_VAL_NETSETUP_DISABLE	_TEXT("NoNetSetup")
-#define REGSTR_VAL_NETSETUP_NOCONFIGPAGE	_TEXT("NoNetSetupConfigPage")
-#define REGSTR_VAL_NETSETUP_NOIDPAGE	_TEXT("NoNetSetupIDPage")
-#define REGSTR_VAL_NETSETUP_NOSECURITYPAGE	_TEXT("NoNetSetupSecurityPage")
-#define REGSTR_VAL_SYSTEMCPL_NOVIRTMEMPAGE _TEXT("NoVirtMemPage")
-#define REGSTR_VAL_SYSTEMCPL_NODEVMGRPAGE _TEXT("NoDevMgrPage")
-#define REGSTR_VAL_SYSTEMCPL_NOCONFIGPAGE	_TEXT("NoConfigPage")
-#define REGSTR_VAL_SYSTEMCPL_NOFILESYSPAGE	_TEXT("NoFileSysPage")
-#define REGSTR_VAL_DISPCPL_NODISPCPL	_TEXT("NoDispCPL")
-#define REGSTR_VAL_DISPCPL_NOBACKGROUNDPAGE _TEXT("NoDispBackgroundPage")
-#define REGSTR_VAL_DISPCPL_NOSCRSAVPAGE _TEXT("NoDispScrSavPage")
-#define REGSTR_VAL_DISPCPL_NOAPPEARANCEPAGE _TEXT("NoDispAppearancePage")
-#define REGSTR_VAL_DISPCPL_NOSETTINGSPAGE _TEXT("NoDispSettingsPage")
-#define REGSTR_VAL_SECCPL_NOSECCPL	_TEXT("NoSecCPL")
-#define REGSTR_VAL_SECCPL_NOPWDPAGE	_TEXT("NoPwdPage")
-#define REGSTR_VAL_SECCPL_NOADMINPAGE	_TEXT("NoAdminPage")
-#define REGSTR_VAL_SECCPL_NOPROFILEPAGE	_TEXT("NoProfilePage")
-#define REGSTR_VAL_PRINTERS_HIDETABS	_TEXT("NoPrinterTabs")
-#define REGSTR_VAL_PRINTERS_NODELETE	_TEXT("NoDeletePrinter")
-#define REGSTR_VAL_PRINTERS_NOADD	_TEXT("NoAddPrinter")
-#define REGSTR_VAL_WINOLDAPP_DISABLED	_TEXT("Disabled")
-#define REGSTR_VAL_WINOLDAPP_NOREALMODE	_TEXT("NoRealMode")
-#define REGSTR_VAL_NOENTIRENETWORK	_TEXT("NoEntireNetwork")
-#define REGSTR_VAL_NOWORKGROUPCONTENTS	_TEXT("NoWorkgroupContents")
-#define REGSTR_VAL_MINPWDLEN	_TEXT("MinPwdLen")
-#define REGSTR_VAL_PWDEXPIRATION	_TEXT("PwdExpiration")
-#define REGSTR_VAL_WIN31PROVIDER	_TEXT("Win31Provider")
-#define REGSTR_VAL_DISABLEREGTOOLS	_TEXT("DisableRegistryTools")
-#define REGSTR_PATH_WINLOGON	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon")
-#define REGSTR_VAL_LEGALNOTICECAPTION	_TEXT("LegalNoticeCaption")
-#define REGSTR_VAL_LEGALNOTICETEXT	_TEXT("LegalNoticeText")
-#define REGSTR_VAL_RESTRICTRUN	_TEXT("RestrictRun")
-#define REGSTR_KEY_POL_USERS	_TEXT("Users")
-#define REGSTR_KEY_POL_COMPUTERS	_TEXT("Computers")
-#define REGSTR_KEY_POL_USERGROUPS	_TEXT("UserGroups")
-#define REGSTR_KEY_POL_DEFAULT	_TEXT(".default")
-#define REGSTR_KEY_POL_USERGROUPDATA _TEXT("GroupData\\UserGroups\\Priority")
-#define REGSTR_PATH_TIMEZONE	_TEXT("System\\CurrentControlSet\\Control\\TimeZoneInformation")
-#define REGSTR_VAL_TZBIAS	_TEXT("Bias")
-#define REGSTR_VAL_TZDLTBIAS	_TEXT("DaylightBias")
-#define REGSTR_VAL_TZSTDBIAS	_TEXT("StandardBias")
-#define REGSTR_VAL_TZACTBIAS	_TEXT("ActiveTimeBias")
-#define REGSTR_VAL_TZDLTFLAG	_TEXT("DaylightFlag")
-#define REGSTR_VAL_TZSTDSTART	_TEXT("StandardStart")
-#define REGSTR_VAL_TZDLTSTART	_TEXT("DaylightStart")
-#define REGSTR_VAL_TZDLTNAME	_TEXT("DaylightName")
-#define REGSTR_VAL_TZSTDNAME	_TEXT("StandardName")
-#define REGSTR_VAL_TZNOCHANGESTART _TEXT("NoChangeStart")
-#define REGSTR_VAL_TZNOCHANGEEND _TEXT("NoChangeEnd")
-#define REGSTR_VAL_TZNOAUTOTIME _TEXT("DisableAutoDaylightTimeSet")
-#define REGSTR_PATH_FLOATINGPOINTPROCESSOR _TEXT("HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor")
-#define REGSTR_PATH_FLOATINGPOINTPROCESSOR0 _TEXT("HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor\\0")
-#define REGSTR_PATH_COMPUTRNAME _TEXT("System\\CurrentControlSet\\Control\\ComputerName\\ComputerName")
-#define REGSTR_VAL_COMPUTRNAME _TEXT("ComputerName")
-#define REGSTR_PATH_SHUTDOWN _TEXT("System\\CurrentControlSet\\Control\\Shutdown")
-#define REGSTR_VAL_FORCEREBOOT _TEXT("ForceReboot")
-#define REGSTR_VAL_SETUPPROGRAMRAN _TEXT("SetupProgramRan")
-#define REGSTR_VAL_DOES_POLLING _TEXT("PollingSupportNeeded")
-#define REGSTR_PATH_KNOWNDLLS	_TEXT("System\\CurrentControlSet\\Control\\SessionManager\\KnownDLLs")
-#define REGSTR_PATH_KNOWN16DLLS	_TEXT("System\\CurrentControlSet\\Control\\SessionManager\\Known16DLLs")
-#define REGSTR_PATH_CHECKVERDLLS _TEXT("System\\CurrentControlSet\\Control\\SessionManager\\CheckVerDLLs")
-#define REGSTR_PATH_WARNVERDLLS _TEXT("System\\CurrentControlSet\\Control\\SessionManager\\WarnVerDLLs")
-#define REGSTR_PATH_HACKINIFILE _TEXT("System\\CurrentControlSet\\Control\\SessionManager\\HackIniFiles")
-#define REGSTR_PATH_CHECKBADAPPS _TEXT("System\\CurrentControlSet\\Control\\SessionManager\\CheckBadApps")
-#define REGSTR_PATH_APPPATCH _TEXT("System\\CurrentControlSet\\Control\\SessionManager\\AppPatches")
-#define REGSTR_PATH_KNOWNVXDS	_TEXT("System\\CurrentControlSet\\Control\\SessionManager\\KnownVxDs")
-#define REGSTR_VAL_UNINSTALLER_DISPLAYNAME _TEXT("DisplayName")
-#define REGSTR_VAL_UNINSTALLER_COMMANDLINE _TEXT("UninstallString")
+#define REGSTR_VAL_PCICIRQMAP	TEXT("PCICIRQMap")
+#define REGSTR_PATH_APPEARANCE	TEXT("Control Panel\\Appearance")
+#define REGSTR_PATH_LOOKSCHEMES TEXT("Control Panel\\Appearance\\Schemes")
+#define REGSTR_VAL_CUSTOMCOLORS TEXT("CustomColors")
+#define REGSTR_PATH_SCREENSAVE TEXT("Control Panel\\Desktop")
+#define REGSTR_VALUE_USESCRPASSWORD TEXT("ScreenSaveUsePassword")
+#define REGSTR_VALUE_SCRPASSWORD TEXT("ScreenSave_Data")
+#define REGSTR_VALUE_LOWPOWERTIMEOUT	TEXT("ScreenSaveLowPowerTimeout")
+#define REGSTR_VALUE_POWEROFFTIMEOUT	TEXT("ScreenSavePowerOffTimeout")
+#define REGSTR_VALUE_LOWPOWERACTIVE	TEXT("ScreenSaveLowPowerActive")
+#define REGSTR_VALUE_POWEROFFACTIVE	TEXT("ScreenSavePowerOffActive")
+#define REGSTR_PATH_WINDOWSAPPLETS TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets")
+#define REGSTR_PATH_SYSTRAY TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\SysTray")
+#define REGSTR_VAL_SYSTRAYSVCS TEXT("Services")
+#define REGSTR_VAL_SYSTRAYBATFLAGS TEXT("PowerFlags")
+#define REGSTR_VAL_SYSTRAYPCCARDFLAGS TEXT("PCMCIAFlags")
+#define REGSTR_PATH_NETWORK_USERSETTINGS	TEXT("Network")
+#define REGSTR_KEY_NETWORK_PERSISTENT	TEXT("\\Persistent")
+#define REGSTR_KEY_NETWORK_RECENT	TEXT("\\Recent")
+#define REGSTR_VAL_REMOTE_PATH	TEXT("RemotePath")
+#define REGSTR_VAL_USER_NAME	TEXT("UserName")
+#define REGSTR_VAL_PROVIDER_NAME	TEXT("ProviderName")
+#define REGSTR_VAL_CONNECTION_TYPE	TEXT("ConnectionType")
+#define REGSTR_VAL_UPGRADE	TEXT("Upgrade")
+#define REGSTR_KEY_LOGON TEXT("\\Logon")
+#define REGSTR_VAL_MUSTBEVALIDATED TEXT("MustBeValidated")
+#define REGSTR_VAL_RUNLOGINSCRIPT	TEXT("ProcessLoginScript")
+#define REGSTR_KEY_NETWORKPROVIDER TEXT("\\NetworkProvider")
+#define REGSTR_PATH_NW32NETPROVIDER REGSTR_PATH_SERVICES TEXT("\\NWNP32" REGSTR_KEY_NETWORKPROVIDER
+#define REGSTR_PATH_MS32NETPROVIDER REGSTR_PATH_SERVICES TEXT("\\MSNP32" REGSTR_KEY_NETWORKPROVIDER
+#define REGSTR_VAL_AUTHENT_AGENT TEXT("AuthenticatingAgent")
+#define REGSTR_VAL_PREFREDIR TEXT("PreferredRedir")
+#define REGSTR_VAL_AUTOSTART TEXT("AutoStart")
+#define REGSTR_VAL_AUTOLOGON TEXT("AutoLogon")
+#define REGSTR_VAL_NETCARD TEXT("Netcard")
+#define REGSTR_VAL_TRANSPORT TEXT("Transport")
+#define REGSTR_VAL_DYNAMIC TEXT("Dynamic")
+#define REGSTR_VAL_TRANSITION TEXT("Transition")
+#define REGSTR_VAL_STATICDRIVE TEXT("StaticDrive")
+#define REGSTR_VAL_LOADHI TEXT("LoadHi")
+#define REGSTR_VAL_LOADRMDRIVERS TEXT("LoadRMDrivers")
+#define REGSTR_VAL_SETUPN TEXT("SetupN")
+#define REGSTR_VAL_SETUPNPATH TEXT("SetupNPath")
+#define REGSTR_VAL_WRKGRP_FORCEMAPPING TEXT("WrkgrpForceMapping")
+#define REGSTR_VAL_WRKGRP_REQUIRED TEXT("WrkgrpRequired")
+#define REGSTR_PATH_CURRENT_CONTROL_SET	TEXT("System\\CurrentControlSet\\Control")
+#define REGSTR_VAL_CURRENT_USER	TEXT("Current User")
+#define REGSTR_PATH_PWDPROVIDER	TEXT("System\\CurrentControlSet\\Control\\PwdProvider")
+#define REGSTR_VAL_PWDPROVIDER_PATH TEXT("ProviderPath")
+#define REGSTR_VAL_PWDPROVIDER_DESC TEXT("Description")
+#define REGSTR_VAL_PWDPROVIDER_CHANGEPWD TEXT("ChangePassword")
+#define REGSTR_VAL_PWDPROVIDER_CHANGEPWDHWND TEXT("ChangePasswordHwnd")
+#define REGSTR_VAL_PWDPROVIDER_GETPWDSTATUS TEXT("GetPasswordStatus")
+#define REGSTR_VAL_PWDPROVIDER_ISNP TEXT("NetworkProvider")
+#define REGSTR_VAL_PWDPROVIDER_CHANGEORDER TEXT("ChangeOrder")
+#define REGSTR_PATH_POLICIES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Policies")
+#define REGSTR_PATH_UPDATE	TEXT("System\\CurrentControlSet\\Control\\Update")
+#define REGSTR_VALUE_ENABLE	TEXT("Enable")
+#define REGSTR_VALUE_VERBOSE	TEXT("Verbose")
+#define REGSTR_VALUE_NETPATH	TEXT("NetworkPath")
+#define REGSTR_VALUE_DEFAULTLOC	TEXT("UseDefaultNetLocation")
+#define REGSTR_KEY_NETWORK	TEXT("Network")
+#define REGSTR_KEY_SYSTEM	TEXT("System")
+#define REGSTR_KEY_PRINTERS	TEXT("Printers")
+#define REGSTR_KEY_WINOLDAPP	TEXT("WinOldApp")
+#define REGSTR_VAL_NOFILESHARING	TEXT("NoFileSharing")
+#define REGSTR_VAL_NOPRINTSHARING	TEXT("NoPrintSharing")
+#define REGSTR_VAL_NOFILESHARINGCTRL	TEXT("NoFileSharingControl")
+#define REGSTR_VAL_NOPRINTSHARINGCTRL	TEXT("NoPrintSharingControl")
+#define REGSTR_VAL_HIDESHAREPWDS	TEXT("HideSharePwds")
+#define REGSTR_VAL_DISABLEPWDCACHING	TEXT("DisablePwdCaching")
+#define REGSTR_VAL_ALPHANUMPWDS	TEXT("AlphanumPwds")
+#define REGSTR_VAL_NETSETUP_DISABLE	TEXT("NoNetSetup")
+#define REGSTR_VAL_NETSETUP_NOCONFIGPAGE	TEXT("NoNetSetupConfigPage")
+#define REGSTR_VAL_NETSETUP_NOIDPAGE	TEXT("NoNetSetupIDPage")
+#define REGSTR_VAL_NETSETUP_NOSECURITYPAGE	TEXT("NoNetSetupSecurityPage")
+#define REGSTR_VAL_SYSTEMCPL_NOVIRTMEMPAGE TEXT("NoVirtMemPage")
+#define REGSTR_VAL_SYSTEMCPL_NODEVMGRPAGE TEXT("NoDevMgrPage")
+#define REGSTR_VAL_SYSTEMCPL_NOCONFIGPAGE	TEXT("NoConfigPage")
+#define REGSTR_VAL_SYSTEMCPL_NOFILESYSPAGE	TEXT("NoFileSysPage")
+#define REGSTR_VAL_DISPCPL_NODISPCPL	TEXT("NoDispCPL")
+#define REGSTR_VAL_DISPCPL_NOBACKGROUNDPAGE TEXT("NoDispBackgroundPage")
+#define REGSTR_VAL_DISPCPL_NOSCRSAVPAGE TEXT("NoDispScrSavPage")
+#define REGSTR_VAL_DISPCPL_NOAPPEARANCEPAGE TEXT("NoDispAppearancePage")
+#define REGSTR_VAL_DISPCPL_NOSETTINGSPAGE TEXT("NoDispSettingsPage")
+#define REGSTR_VAL_SECCPL_NOSECCPL	TEXT("NoSecCPL")
+#define REGSTR_VAL_SECCPL_NOPWDPAGE	TEXT("NoPwdPage")
+#define REGSTR_VAL_SECCPL_NOADMINPAGE	TEXT("NoAdminPage")
+#define REGSTR_VAL_SECCPL_NOPROFILEPAGE	TEXT("NoProfilePage")
+#define REGSTR_VAL_PRINTERS_HIDETABS	TEXT("NoPrinterTabs")
+#define REGSTR_VAL_PRINTERS_NODELETE	TEXT("NoDeletePrinter")
+#define REGSTR_VAL_PRINTERS_NOADD	TEXT("NoAddPrinter")
+#define REGSTR_VAL_WINOLDAPP_DISABLED	TEXT("Disabled")
+#define REGSTR_VAL_WINOLDAPP_NOREALMODE	TEXT("NoRealMode")
+#define REGSTR_VAL_NOENTIRENETWORK	TEXT("NoEntireNetwork")
+#define REGSTR_VAL_NOWORKGROUPCONTENTS	TEXT("NoWorkgroupContents")
+#define REGSTR_VAL_MINPWDLEN	TEXT("MinPwdLen")
+#define REGSTR_VAL_PWDEXPIRATION	TEXT("PwdExpiration")
+#define REGSTR_VAL_WIN31PROVIDER	TEXT("Win31Provider")
+#define REGSTR_VAL_DISABLEREGTOOLS	TEXT("DisableRegistryTools")
+#define REGSTR_PATH_WINLOGON	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Winlogon")
+#define REGSTR_VAL_LEGALNOTICECAPTION	TEXT("LegalNoticeCaption")
+#define REGSTR_VAL_LEGALNOTICETEXT	TEXT("LegalNoticeText")
+#define REGSTR_VAL_RESTRICTRUN	TEXT("RestrictRun")
+#define REGSTR_KEY_POL_USERS	TEXT("Users")
+#define REGSTR_KEY_POL_COMPUTERS	TEXT("Computers")
+#define REGSTR_KEY_POL_USERGROUPS	TEXT("UserGroups")
+#define REGSTR_KEY_POL_DEFAULT	TEXT(".default")
+#define REGSTR_KEY_POL_USERGROUPDATA TEXT("GroupData\\UserGroups\\Priority")
+#define REGSTR_PATH_TIMEZONE	TEXT("System\\CurrentControlSet\\Control\\TimeZoneInformation")
+#define REGSTR_VAL_TZBIAS	TEXT("Bias")
+#define REGSTR_VAL_TZDLTBIAS	TEXT("DaylightBias")
+#define REGSTR_VAL_TZSTDBIAS	TEXT("StandardBias")
+#define REGSTR_VAL_TZACTBIAS	TEXT("ActiveTimeBias")
+#define REGSTR_VAL_TZDLTFLAG	TEXT("DaylightFlag")
+#define REGSTR_VAL_TZSTDSTART	TEXT("StandardStart")
+#define REGSTR_VAL_TZDLTSTART	TEXT("DaylightStart")
+#define REGSTR_VAL_TZDLTNAME	TEXT("DaylightName")
+#define REGSTR_VAL_TZSTDNAME	TEXT("StandardName")
+#define REGSTR_VAL_TZNOCHANGESTART TEXT("NoChangeStart")
+#define REGSTR_VAL_TZNOCHANGEEND TEXT("NoChangeEnd")
+#define REGSTR_VAL_TZNOAUTOTIME TEXT("DisableAutoDaylightTimeSet")
+#define REGSTR_PATH_FLOATINGPOINTPROCESSOR TEXT("HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor")
+#define REGSTR_PATH_FLOATINGPOINTPROCESSOR0 TEXT("HARDWARE\\DESCRIPTION\\System\\FloatingPointProcessor\\0")
+#define REGSTR_PATH_COMPUTRNAME TEXT("System\\CurrentControlSet\\Control\\ComputerName\\ComputerName")
+#define REGSTR_VAL_COMPUTRNAME TEXT("ComputerName")
+#define REGSTR_PATH_SHUTDOWN TEXT("System\\CurrentControlSet\\Control\\Shutdown")
+#define REGSTR_VAL_FORCEREBOOT TEXT("ForceReboot")
+#define REGSTR_VAL_SETUPPROGRAMRAN TEXT("SetupProgramRan")
+#define REGSTR_VAL_DOES_POLLING TEXT("PollingSupportNeeded")
+#define REGSTR_PATH_KNOWNDLLS	TEXT("System\\CurrentControlSet\\Control\\SessionManager\\KnownDLLs")
+#define REGSTR_PATH_KNOWN16DLLS	TEXT("System\\CurrentControlSet\\Control\\SessionManager\\Known16DLLs")
+#define REGSTR_PATH_CHECKVERDLLS TEXT("System\\CurrentControlSet\\Control\\SessionManager\\CheckVerDLLs")
+#define REGSTR_PATH_WARNVERDLLS TEXT("System\\CurrentControlSet\\Control\\SessionManager\\WarnVerDLLs")
+#define REGSTR_PATH_HACKINIFILE TEXT("System\\CurrentControlSet\\Control\\SessionManager\\HackIniFiles")
+#define REGSTR_PATH_CHECKBADAPPS TEXT("System\\CurrentControlSet\\Control\\SessionManager\\CheckBadApps")
+#define REGSTR_PATH_APPPATCH TEXT("System\\CurrentControlSet\\Control\\SessionManager\\AppPatches")
+#define REGSTR_PATH_KNOWNVXDS	TEXT("System\\CurrentControlSet\\Control\\SessionManager\\KnownVxDs")
+#define REGSTR_VAL_UNINSTALLER_DISPLAYNAME TEXT("DisplayName")
+#define REGSTR_VAL_UNINSTALLER_COMMANDLINE TEXT("UninstallString")
 #define REGSTR_PATH_DESKTOP	REGSTR_PATH_SCREENSAVE
-#define REGSTR_PATH_MOUSE	_TEXT("Control Panel\\Mouse")
-#define REGSTR_PATH_KEYBOARD _TEXT("Control Panel\\Keyboard")
-#define REGSTR_PATH_COLORS	_TEXT("Control Panel\\Colors")
-#define REGSTR_PATH_SOUND	_TEXT("Control Panel\\Sound")
-#define REGSTR_PATH_METRICS	_TEXT("Control Panel\\Desktop\\WindowMetrics")
-#define REGSTR_PATH_ICONS _TEXT("Control Panel\\Icons")
-#define REGSTR_PATH_CURSORS _TEXT("Control Panel\\Cursors")
-#define REGSTR_PATH_CHECKDISK	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive")
-#define REGSTR_PATH_CHECKDISKSET _TEXT("Settings")
-#define REGSTR_PATH_CHECKDISKUDRVS _TEXT("NoUnknownDDErrDrvs")
-#define REGSTR_PATH_FAULT	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Fault")
-#define REGSTR_VAL_FAULT_LOGFILE	_TEXT("LogFile")
-#define	REGSTR_PATH_AEDEBUG	_TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug")
-#define REGSTR_VAL_AEDEBUG_DEBUGGER	_TEXT("Debugger")
-#define REGSTR_VAL_AEDEBUG_AUTO	_TEXT("Auto")
-#define REGSTR_PATH_GRPCONV	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\GrpConv")
-#define REGSTR_VAL_REGITEMDELETEMESSAGE _TEXT("Removal Message")
-#define REGSTR_PATH_LASTCHECK	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastCheck")
-#define REGSTR_PATH_LASTOPTIMIZE	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastOptimize")
-#define REGSTR_PATH_LASTBACKUP	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastBackup")
-#define REGSTR_PATH_CHKLASTCHECK	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive\\LastCheck")
-#define REGSTR_PATH_CHKLASTSURFAN	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive\\LastSurfaceAnalysis")
+#define REGSTR_PATH_MOUSE	TEXT("Control Panel\\Mouse")
+#define REGSTR_PATH_KEYBOARD TEXT("Control Panel\\Keyboard")
+#define REGSTR_PATH_COLORS	TEXT("Control Panel\\Colors")
+#define REGSTR_PATH_SOUND	TEXT("Control Panel\\Sound")
+#define REGSTR_PATH_METRICS	TEXT("Control Panel\\Desktop\\WindowMetrics")
+#define REGSTR_PATH_ICONS TEXT("Control Panel\\Icons")
+#define REGSTR_PATH_CURSORS TEXT("Control Panel\\Cursors")
+#define REGSTR_PATH_CHECKDISK	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive")
+#define REGSTR_PATH_CHECKDISKSET TEXT("Settings")
+#define REGSTR_PATH_CHECKDISKUDRVS TEXT("NoUnknownDDErrDrvs")
+#define REGSTR_PATH_FAULT	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Fault")
+#define REGSTR_VAL_FAULT_LOGFILE	TEXT("LogFile")
+#define	REGSTR_PATH_AEDEBUG	TEXT("Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug")
+#define REGSTR_VAL_AEDEBUG_DEBUGGER	TEXT("Debugger")
+#define REGSTR_VAL_AEDEBUG_AUTO	TEXT("Auto")
+#define REGSTR_PATH_GRPCONV	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\GrpConv")
+#define REGSTR_VAL_REGITEMDELETEMESSAGE TEXT("Removal Message")
+#define REGSTR_PATH_LASTCHECK	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastCheck")
+#define REGSTR_PATH_LASTOPTIMIZE	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastOptimize")
+#define REGSTR_PATH_LASTBACKUP	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\LastBackup")
+#define REGSTR_PATH_CHKLASTCHECK	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive\\LastCheck")
+#define REGSTR_PATH_CHKLASTSURFAN	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Check Drive\\LastSurfaceAnalysis")
 #define DTRESULTOK	0
 #define DTRESULTFIX	1
 #define DTRESULTPROB	2
 #define DTRESULTPART	3
-#define REGSTR_KEY_SHARES	_TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\LanMan")
-#define REGSTR_VAL_SHARES_FLAGS _TEXT("Flags")
-#define REGSTR_VAL_SHARES_TYPE _TEXT("Type")
-#define REGSTR_VAL_SHARES_PATH _TEXT("Path")
-#define REGSTR_VAL_SHARES_REMARK _TEXT("Remark")
-#define REGSTR_VAL_SHARES_RW_PASS _TEXT("Parm1")
-#define REGSTR_VAL_SHARES_RO_PASS _TEXT("Parm2")
-#define REGSTR_PATH_PRINT _TEXT("System\\CurrentControlSet\\Control\\Print")
-#define REGSTR_PATH_PRINTERS _TEXT("System\\CurrentControlSet\\Control\\Print\\Printers")
-#define REGSTR_PATH_PROVIDERS _TEXT("System\\CurrentControlSet\\Control\\Print\\Providers")
-#define REGSTR_PATH_MONITORS _TEXT("System\\CurrentControlSet\\Control\\Print\\Monitors")
-#define REGSTR_PATH_ENVIRONMENTS _TEXT("System\\CurrentControlSet\\Control\\Print\\Environments")
-#define REGSTR_VAL_START_ON_BOOT _TEXT("StartOnBoot")
-#define REGSTR_VAL_PRINTERS_MASK _TEXT("PrintersMask")
-#define REGSTR_VAL_DOS_SPOOL_MASK _TEXT("DOSSpoolMask")
-#define REGSTR_KEY_CURRENT_ENV _TEXT("\\Windows 4.0")
-#define REGSTR_KEY_DRIVERS _TEXT("\\Drivers")
-#define REGSTR_KEY_PRINT_PROC _TEXT("\\Print Processors")
-#define REGSTR_PATH_EVENTLABELS _TEXT("AppEvents\\EventLabels")
-#define REGSTR_PATH_SCHEMES _TEXT("AppEvents\\Schemes")
-#define REGSTR_PATH_APPS REGSTR_PATH_SCHEMES _TEXT("\\Apps")
-#define REGSTR_PATH_APPS_DEFAULT REGSTR_PATH_SCHEMES _TEXT("\\Apps\\.Default")
-#define REGSTR_PATH_NAMES REGSTR_PATH_SCHEMES _TEXT("\\Names")
-#define REGSTR_PATH_MULTIMEDIA REGSTR_PATH_SETUP _TEXT("\\Multimedia")
-#define REGSTR_PATH_MULTIMEDIA_AUDIO _TEXT("Software\\Microsoft\\Multimedia\\Audio")
-#define REGSTR_PATH_MEDIARESOURCES REGSTR_PATH_CURRENT_CONTROL_SET _TEXT("\\MediaResources")
-#define REGSTR_PATH_MEDIAPROPERTIES REGSTR_PATH_CURRENT_CONTROL_SET _TEXT("\\MediaProperties")
-#define REGSTR_PATH_PRIVATEPROPERTIES REGSTR_PATH_MEDIAPROPERTIES _TEXT("\\PrivateProperties")
-#define REGSTR_PATH_PUBLICPROPERTIES REGSTR_PATH_MEDIAPROPERTIES _TEXT("\\PublicProperties")
-#define REGSTR_PATH_JOYOEM REGSTR_PATH_PRIVATEPROPERTIES _TEXT("\\Joystick\\OEM")
-#define REGSTR_PATH_JOYCONFIG REGSTR_PATH_MEDIARESOURCES _TEXT("\\Joystick")
-#define REGSTR_KEY_JOYCURR _TEXT("CurrentJoystickSettings")
-#define REGSTR_KEY_JOYSETTINGS _TEXT("JoystickSettings")
-#define REGSTR_VAL_JOYUSERVALUES _TEXT("JoystickUserValues")
-#define REGSTR_VAL_JOYCALLOUT	_TEXT("JoystickCallout")
-#define REGSTR_VAL_JOYNCONFIG	_TEXT("Joystick%dConfiguration")
-#define REGSTR_VAL_JOYNOEMNAME	_TEXT("Joystick%dOEMName")
-#define REGSTR_VAL_JOYNOEMCALLOUT _TEXT("Joystick%dOEMCallout")
-#define REGSTR_VAL_JOYOEMCALLOUT	_TEXT("OEMCallout")
-#define REGSTR_VAL_JOYOEMNAME	_TEXT("OEMName")
-#define REGSTR_VAL_JOYOEMDATA	_TEXT("OEMData")
-#define REGSTR_VAL_JOYOEMXYLABEL	_TEXT("OEMXYLabel")
-#define REGSTR_VAL_JOYOEMZLABEL	_TEXT("OEMZLabel")
-#define REGSTR_VAL_JOYOEMRLABEL	_TEXT("OEMRLabel")
-#define REGSTR_VAL_JOYOEMPOVLABEL	_TEXT("OEMPOVLabel")
-#define REGSTR_VAL_JOYOEMULABEL	_TEXT("OEMULabel")
-#define REGSTR_VAL_JOYOEMVLABEL	_TEXT("OEMVLabel")
-#define REGSTR_VAL_JOYOEMTESTMOVEDESC	_TEXT("OEMTestMoveDesc")
-#define REGSTR_VAL_JOYOEMTESTBUTTONDESC	_TEXT("OEMTestButtonDesc")
-#define REGSTR_VAL_JOYOEMTESTMOVECAP	_TEXT("OEMTestMoveCap")
-#define REGSTR_VAL_JOYOEMTESTBUTTONCAP	_TEXT("OEMTestButtonCap")
-#define REGSTR_VAL_JOYOEMTESTWINCAP	_TEXT("OEMTestWinCap")
-#define REGSTR_VAL_JOYOEMCALCAP	_TEXT("OEMCalCap")
-#define REGSTR_VAL_JOYOEMCALWINCAP	_TEXT("OEMCalWinCap")
-#define REGSTR_VAL_JOYOEMCAL1	_TEXT("OEMCal1")
-#define REGSTR_VAL_JOYOEMCAL2	_TEXT("OEMCal2")
-#define REGSTR_VAL_JOYOEMCAL3	_TEXT("OEMCal3")
-#define REGSTR_VAL_JOYOEMCAL4	_TEXT("OEMCal4")
-#define REGSTR_VAL_JOYOEMCAL5	_TEXT("OEMCal5")
-#define REGSTR_VAL_JOYOEMCAL6	_TEXT("OEMCal6")
-#define REGSTR_VAL_JOYOEMCAL7	_TEXT("OEMCal7")
-#define REGSTR_VAL_JOYOEMCAL8	_TEXT("OEMCal8")
-#define REGSTR_VAL_JOYOEMCAL9	_TEXT("OEMCal9")
-#define REGSTR_VAL_JOYOEMCAL10	_TEXT("OEMCal10")
-#define REGSTR_VAL_JOYOEMCAL11	_TEXT("OEMCal11")
-#define REGSTR_VAL_JOYOEMCAL12	_TEXT("OEMCal12")
+#define REGSTR_KEY_SHARES	TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Network\\LanMan")
+#define REGSTR_VAL_SHARES_FLAGS TEXT("Flags")
+#define REGSTR_VAL_SHARES_TYPE TEXT("Type")
+#define REGSTR_VAL_SHARES_PATH TEXT("Path")
+#define REGSTR_VAL_SHARES_REMARK TEXT("Remark")
+#define REGSTR_VAL_SHARES_RW_PASS TEXT("Parm1")
+#define REGSTR_VAL_SHARES_RO_PASS TEXT("Parm2")
+#define REGSTR_PATH_PRINT TEXT("System\\CurrentControlSet\\Control\\Print")
+#define REGSTR_PATH_PRINTERS TEXT("System\\CurrentControlSet\\Control\\Print\\Printers")
+#define REGSTR_PATH_PROVIDERS TEXT("System\\CurrentControlSet\\Control\\Print\\Providers")
+#define REGSTR_PATH_MONITORS TEXT("System\\CurrentControlSet\\Control\\Print\\Monitors")
+#define REGSTR_PATH_ENVIRONMENTS TEXT("System\\CurrentControlSet\\Control\\Print\\Environments")
+#define REGSTR_VAL_START_ON_BOOT TEXT("StartOnBoot")
+#define REGSTR_VAL_PRINTERS_MASK TEXT("PrintersMask")
+#define REGSTR_VAL_DOS_SPOOL_MASK TEXT("DOSSpoolMask")
+#define REGSTR_KEY_CURRENT_ENV TEXT("\\Windows 4.0")
+#define REGSTR_KEY_DRIVERS TEXT("\\Drivers")
+#define REGSTR_KEY_PRINT_PROC TEXT("\\Print Processors")
+#define REGSTR_PATH_EVENTLABELS TEXT("AppEvents\\EventLabels")
+#define REGSTR_PATH_SCHEMES TEXT("AppEvents\\Schemes")
+#define REGSTR_PATH_APPS REGSTR_PATH_SCHEMES TEXT("\\Apps")
+#define REGSTR_PATH_APPS_DEFAULT REGSTR_PATH_SCHEMES TEXT("\\Apps\\.Default")
+#define REGSTR_PATH_NAMES REGSTR_PATH_SCHEMES TEXT("\\Names")
+#define REGSTR_PATH_MULTIMEDIA REGSTR_PATH_SETUP TEXT("\\Multimedia")
+#define REGSTR_PATH_MULTIMEDIA_AUDIO TEXT("Software\\Microsoft\\Multimedia\\Audio")
+#define REGSTR_PATH_MEDIARESOURCES REGSTR_PATH_CURRENT_CONTROL_SET TEXT("\\MediaResources")
+#define REGSTR_PATH_MEDIAPROPERTIES REGSTR_PATH_CURRENT_CONTROL_SET TEXT("\\MediaProperties")
+#define REGSTR_PATH_PRIVATEPROPERTIES REGSTR_PATH_MEDIAPROPERTIES TEXT("\\PrivateProperties")
+#define REGSTR_PATH_PUBLICPROPERTIES REGSTR_PATH_MEDIAPROPERTIES TEXT("\\PublicProperties")
+#define REGSTR_PATH_JOYOEM REGSTR_PATH_PRIVATEPROPERTIES TEXT("\\Joystick\\OEM")
+#define REGSTR_PATH_JOYCONFIG REGSTR_PATH_MEDIARESOURCES TEXT("\\Joystick")
+#define REGSTR_KEY_JOYCURR TEXT("CurrentJoystickSettings")
+#define REGSTR_KEY_JOYSETTINGS TEXT("JoystickSettings")
+#define REGSTR_VAL_JOYUSERVALUES TEXT("JoystickUserValues")
+#define REGSTR_VAL_JOYCALLOUT	TEXT("JoystickCallout")
+#define REGSTR_VAL_JOYNCONFIG	TEXT("Joystick%dConfiguration")
+#define REGSTR_VAL_JOYNOEMNAME	TEXT("Joystick%dOEMName")
+#define REGSTR_VAL_JOYNOEMCALLOUT TEXT("Joystick%dOEMCallout")
+#define REGSTR_VAL_JOYOEMCALLOUT	TEXT("OEMCallout")
+#define REGSTR_VAL_JOYOEMNAME	TEXT("OEMName")
+#define REGSTR_VAL_JOYOEMDATA	TEXT("OEMData")
+#define REGSTR_VAL_JOYOEMXYLABEL	TEXT("OEMXYLabel")
+#define REGSTR_VAL_JOYOEMZLABEL	TEXT("OEMZLabel")
+#define REGSTR_VAL_JOYOEMRLABEL	TEXT("OEMRLabel")
+#define REGSTR_VAL_JOYOEMPOVLABEL	TEXT("OEMPOVLabel")
+#define REGSTR_VAL_JOYOEMULABEL	TEXT("OEMULabel")
+#define REGSTR_VAL_JOYOEMVLABEL	TEXT("OEMVLabel")
+#define REGSTR_VAL_JOYOEMTESTMOVEDESC	TEXT("OEMTestMoveDesc")
+#define REGSTR_VAL_JOYOEMTESTBUTTONDESC	TEXT("OEMTestButtonDesc")
+#define REGSTR_VAL_JOYOEMTESTMOVECAP	TEXT("OEMTestMoveCap")
+#define REGSTR_VAL_JOYOEMTESTBUTTONCAP	TEXT("OEMTestButtonCap")
+#define REGSTR_VAL_JOYOEMTESTWINCAP	TEXT("OEMTestWinCap")
+#define REGSTR_VAL_JOYOEMCALCAP	TEXT("OEMCalCap")
+#define REGSTR_VAL_JOYOEMCALWINCAP	TEXT("OEMCalWinCap")
+#define REGSTR_VAL_JOYOEMCAL1	TEXT("OEMCal1")
+#define REGSTR_VAL_JOYOEMCAL2	TEXT("OEMCal2")
+#define REGSTR_VAL_JOYOEMCAL3	TEXT("OEMCal3")
+#define REGSTR_VAL_JOYOEMCAL4	TEXT("OEMCal4")
+#define REGSTR_VAL_JOYOEMCAL5	TEXT("OEMCal5")
+#define REGSTR_VAL_JOYOEMCAL6	TEXT("OEMCal6")
+#define REGSTR_VAL_JOYOEMCAL7	TEXT("OEMCal7")
+#define REGSTR_VAL_JOYOEMCAL8	TEXT("OEMCal8")
+#define REGSTR_VAL_JOYOEMCAL9	TEXT("OEMCal9")
+#define REGSTR_VAL_JOYOEMCAL10	TEXT("OEMCal10")
+#define REGSTR_VAL_JOYOEMCAL11	TEXT("OEMCal11")
+#define REGSTR_VAL_JOYOEMCAL12	TEXT("OEMCal12")
 #ifndef NEC_98
-#define REGSTR_KEY_ISAENUM	_TEXT("ISAPnP")
-#define REGSTR_KEY_EISAENUM	_TEXT("EISA")
-#define	REGSTR_VAL_EISA_RANGES	_TEXT("EISARanges")
-#define	REGSTR_VAL_EISA_FUNCTIONS	_TEXT("EISAFunctions")
-#define	REGSTR_VAL_EISA_FUNCTIONS_MASK	_TEXT("EISAFunctionsMask")
-#define	REGSTR_VAL_EISA_FLAGS	_TEXT("EISAFlags")
-#define	REGSTR_VAL_EISA_SIMULATE_INT15	_TEXT("EISASimulateInt15")
+#define REGSTR_KEY_ISAENUM	TEXT("ISAPnP")
+#define REGSTR_KEY_EISAENUM	TEXT("EISA")
+#define	REGSTR_VAL_EISA_RANGES	TEXT("EISARanges")
+#define	REGSTR_VAL_EISA_FUNCTIONS	TEXT("EISAFunctions")
+#define	REGSTR_VAL_EISA_FUNCTIONS_MASK	TEXT("EISAFunctionsMask")
+#define	REGSTR_VAL_EISA_FLAGS	TEXT("EISAFlags")
+#define	REGSTR_VAL_EISA_SIMULATE_INT15	TEXT("EISASimulateInt15")
 #else
-#define REGSTR_KEY_ISAENUM	_TEXT("C98PnP")
-#define REGSTR_KEY_EISAENUM	_TEXT("NESA")
-#define	REGSTR_VAL_EISA_RANGES	_TEXT("NESARanges")
-#define	REGSTR_VAL_EISA_FUNCTIONS	_TEXT("NESAFunctions")
-#define	REGSTR_VAL_EISA_FUNCTIONS_MASK	_TEXT("NESAFunctionsMask")
-#define	REGSTR_VAL_EISA_FLAGS	_TEXT("NESAFlags")
-#define	REGSTR_VAL_EISA_SIMULATE_INT15	_TEXT("NESASimulateInt15")
+#define REGSTR_KEY_ISAENUM	TEXT("C98PnP")
+#define REGSTR_KEY_EISAENUM	TEXT("NESA")
+#define	REGSTR_VAL_EISA_RANGES	TEXT("NESARanges")
+#define	REGSTR_VAL_EISA_FUNCTIONS	TEXT("NESAFunctions")
+#define	REGSTR_VAL_EISA_FUNCTIONS_MASK	TEXT("NESAFunctionsMask")
+#define	REGSTR_VAL_EISA_FLAGS	TEXT("NESAFlags")
+#define	REGSTR_VAL_EISA_SIMULATE_INT15	TEXT("NESASimulateInt15")
 #endif
 typedef struct _DSKTLSYSTEMTIME {
 	WORD wYear;
diff --git a/winsup/w32api/include/richedit.h b/winsup/w32api/include/richedit.h
index 775fad4e4..1bbac22e7 100644
--- a/winsup/w32api/include/richedit.h
+++ b/winsup/w32api/include/richedit.h
@@ -6,9 +6,9 @@ extern "C" {
 #pragma pack(push,4)
 
 #define RICHEDIT_CLASS "RichEdit20A"
-#define CF_RTF _TEXT("Rich Text Format")
-#define CF_RTFNOOBJS _TEXT("Rich Text Format Without Objects")
-#define CF_RETEXTOBJ _TEXT("RichEdit Text and Objects")
+#define CF_RTF TEXT("Rich Text Format")
+#define CF_RTFNOOBJS TEXT("Rich Text Format Without Objects")
+#define CF_RETEXTOBJ TEXT("RichEdit Text and Objects")
 #define CFM_BOLD	1
 #define CFM_ITALIC	2
 #define CFM_UNDERLINE	4
diff --git a/winsup/w32api/include/wininet.h b/winsup/w32api/include/wininet.h
index 0ccd066b9..ec1e69574 100644
--- a/winsup/w32api/include/wininet.h
+++ b/winsup/w32api/include/wininet.h
@@ -218,26 +218,26 @@ GOPHER_TYPE_UNIX_UUENCODED|GOPHER_TYPE_BINARY|GOPHER_TYPE_GIF|GOPHER_TYPE_IMAGE|
 #define MAX_GOPHER_CATEGORY_NAME 128
 #define MAX_GOPHER_ATTRIBUTE_NAME 128
 #define MIN_GOPHER_ATTRIBUTE_LENGTH 256
-#define GOPHER_INFO_CATEGORY _TEXT("+INFO")
-#define GOPHER_ADMIN_CATEGORY _TEXT("+ADMIN")
-#define GOPHER_VIEWS_CATEGORY _TEXT("+VIEWS")
-#define GOPHER_ABSTRACT_CATEGORY _TEXT("+ABSTRACT")
-#define GOPHER_VERONICA_CATEGORY _TEXT("+VERONICA")
-#define GOPHER_ADMIN_ATTRIBUTE _TEXT("Admin")
-#define GOPHER_MOD_DATE_ATTRIBUTE _TEXT("Mod-Date")
-#define GOPHER_TTL_ATTRIBUTE _TEXT("TTL")
-#define GOPHER_SCORE_ATTRIBUTE _TEXT("Score")
-#define GOPHER_RANGE_ATTRIBUTE _TEXT("Score-range")
-#define GOPHER_SITE_ATTRIBUTE _TEXT("Site")
-#define GOPHER_ORG_ATTRIBUTE _TEXT("Org")
-#define GOPHER_LOCATION_ATTRIBUTE _TEXT("Loc")
-#define GOPHER_GEOG_ATTRIBUTE _TEXT("Geog")
-#define GOPHER_TIMEZONE_ATTRIBUTE _TEXT("TZ")
-#define GOPHER_PROVIDER_ATTRIBUTE _TEXT("Provider")
-#define GOPHER_VERSION_ATTRIBUTE _TEXT("Version")
-#define GOPHER_ABSTRACT_ATTRIBUTE _TEXT("Abstract")
-#define GOPHER_VIEW_ATTRIBUTE _TEXT("View")
-#define GOPHER_TREEWALK_ATTRIBUTE _TEXT("treewalk")
+#define GOPHER_INFO_CATEGORY TEXT("+INFO")
+#define GOPHER_ADMIN_CATEGORY TEXT("+ADMIN")
+#define GOPHER_VIEWS_CATEGORY TEXT("+VIEWS")
+#define GOPHER_ABSTRACT_CATEGORY TEXT("+ABSTRACT")
+#define GOPHER_VERONICA_CATEGORY TEXT("+VERONICA")
+#define GOPHER_ADMIN_ATTRIBUTE TEXT("Admin")
+#define GOPHER_MOD_DATE_ATTRIBUTE TEXT("Mod-Date")
+#define GOPHER_TTL_ATTRIBUTE TEXT("TTL")
+#define GOPHER_SCORE_ATTRIBUTE TEXT("Score")
+#define GOPHER_RANGE_ATTRIBUTE TEXT("Score-range")
+#define GOPHER_SITE_ATTRIBUTE TEXT("Site")
+#define GOPHER_ORG_ATTRIBUTE TEXT("Org")
+#define GOPHER_LOCATION_ATTRIBUTE TEXT("Loc")
+#define GOPHER_GEOG_ATTRIBUTE TEXT("Geog")
+#define GOPHER_TIMEZONE_ATTRIBUTE TEXT("TZ")
+#define GOPHER_PROVIDER_ATTRIBUTE TEXT("Provider")
+#define GOPHER_VERSION_ATTRIBUTE TEXT("Version")
+#define GOPHER_ABSTRACT_ATTRIBUTE TEXT("Abstract")
+#define GOPHER_VIEW_ATTRIBUTE TEXT("View")
+#define GOPHER_TREEWALK_ATTRIBUTE TEXT("treewalk")
 #define GOPHER_ATTRIBUTE_ID_BASE 0xabcccc00
 #define GOPHER_CATEGORY_ID_ALL (GOPHER_ATTRIBUTE_ID_BASE+1)
 #define GOPHER_CATEGORY_ID_INFO (GOPHER_ATTRIBUTE_ID_BASE+2)
@@ -266,7 +266,7 @@ GOPHER_TYPE_UNIX_UUENCODED|GOPHER_TYPE_BINARY|GOPHER_TYPE_GIF|GOPHER_TYPE_IMAGE|
 #define GOPHER_ATTRIBUTE_ID_UNKNOWN (GOPHER_ATTRIBUTE_ID_BASE+25)
 #define HTTP_MAJOR_VERSION 1
 #define HTTP_MINOR_VERSION 0
-#define HTTP_VERSION _TEXT("HTTP/1.0")
+#define HTTP_VERSION TEXT("HTTP/1.0")
 #define HTTP_QUERY_MIME_VERSION 0
 #define HTTP_QUERY_CONTENT_TYPE 1
 #define HTTP_QUERY_CONTENT_TRANSFER_ENCODING 2
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 7393d69dc..5960046c7 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -69,7 +69,11 @@ typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR;
 typedef CONST CHAR *LPCCH,*PCSTR,*LPCSTR;
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
-#ifdef _UNICODE
+#ifdef UNICODE
+/*
+ * NOTE: This tests UNICODE, which is different from the _UNICODE define
+ *       used to differentiate standard C runtime calls.
+ */
 typedef WCHAR TCHAR;
 #else
 typedef CHAR TCHAR;
@@ -78,27 +82,24 @@ typedef CHAR TCHAR;
 typedef TCHAR TBYTE,*PTCH,*PTBYTE;
 typedef TCHAR *LPTCH,*PTSTR,*LPTSTR,*LP,*PTCHAR;
 typedef const TCHAR *LPCTSTR;
-#ifdef _UNICODE
+#ifdef UNICODE
 /*
  * __TEXT is a private macro whose specific use is to force the expansion of a
- * macro passed as an argument to the macros _T or _TEXT.  DO NOT use this
+ * macro passed as an argument to the macro TEXT.  DO NOT use this
  * macro within your programs.  It's name and function could change without
  * notice.
  */
-#undef __TEXT
 #define __TEXT(q) L##q
 #else
-#undef __TEXT
 #define __TEXT(q) q
 #endif
 /*
- * UNICODE a constant string when _UNICODE is defined else returns the string
- * unmodified.  Also defined in mingw/tchar.h.
+ * UNICODE a constant string when UNICODE is defined, else returns the string
+ * unmodified.
+ * The corresponding macros  _TEXT() and _T() for mapping _UNICODE strings
+ * passed to C runtime functions are defined in mingw/tchar.h
  */
-#undef _TEXT
-#define _TEXT(q) __TEXT(q)
-#undef _T
-#define _T(q) __TEXT(q)
+#define TEXT(q) __TEXT(q)    
 typedef SHORT *PSHORT;
 typedef LONG *PLONG;
 typedef void *HANDLE;
@@ -300,30 +301,30 @@ typedef BYTE BOOLEAN,*PBOOLEAN;
 #define DOMAIN_ALIAS_RID_PRINT_OPS	0x226L
 #define DOMAIN_ALIAS_RID_BACKUP_OPS	0x227L
 #define DOMAIN_ALIAS_RID_REPLICATOR	0x228L
-#define SE_CREATE_TOKEN_NAME	_TEXT("SeCreateTokenPrivilege")
-#define SE_ASSIGNPRIMARYTOKEN_NAME	_TEXT("SeAssignPrimaryTokenPrivilege")
-#define SE_LOCK_MEMORY_NAME	_TEXT("SeLockMemoryPrivilege")
-#define SE_INCREASE_QUOTA_NAME	_TEXT("SeIncreaseQuotaPrivilege")
-#define SE_UNSOLICITED_INPUT_NAME	_TEXT("SeUnsolicitedInputPrivilege")
-#define SE_MACHINE_ACCOUNT_NAME _TEXT("SeMachineAccountPrivilege")
-#define SE_TCB_NAME	_TEXT("SeTcbPrivilege")
-#define SE_SECURITY_NAME	_TEXT("SeSecurityPrivilege")
-#define SE_TAKE_OWNERSHIP_NAME	_TEXT("SeTakeOwnershipPrivilege")
-#define SE_LOAD_DRIVER_NAME	_TEXT("SeLoadDriverPrivilege")
-#define SE_SYSTEM_PROFILE_NAME	_TEXT("SeSystemProfilePrivilege")
-#define SE_SYSTEMTIME_NAME	_TEXT("SeSystemtimePrivilege")
-#define SE_PROF_SINGLE_PROCESS_NAME	_TEXT("SeProfileSingleProcessPrivilege")
-#define SE_INC_BASE_PRIORITY_NAME	_TEXT("SeIncreaseBasePriorityPrivilege")
-#define SE_CREATE_PAGEFILE_NAME _TEXT("SeCreatePagefilePrivilege")
-#define SE_CREATE_PERMANENT_NAME	_TEXT("SeCreatePermanentPrivilege")
-#define SE_BACKUP_NAME _TEXT("SeBackupPrivilege")
-#define SE_RESTORE_NAME	_TEXT("SeRestorePrivilege")
-#define SE_SHUTDOWN_NAME	_TEXT("SeShutdownPrivilege")
-#define SE_DEBUG_NAME	_TEXT("SeDebugPrivilege")
-#define SE_AUDIT_NAME	_TEXT("SeAuditPrivilege")
-#define SE_SYSTEM_ENVIRONMENT_NAME	_TEXT("SeSystemEnvironmentPrivilege")
-#define SE_CHANGE_NOTIFY_NAME	_TEXT("SeChangeNotifyPrivilege")
-#define SE_REMOTE_SHUTDOWN_NAME	_TEXT("SeRemoteShutdownPrivilege")
+#define SE_CREATE_TOKEN_NAME	TEXT("SeCreateTokenPrivilege")
+#define SE_ASSIGNPRIMARYTOKEN_NAME	TEXT("SeAssignPrimaryTokenPrivilege")
+#define SE_LOCK_MEMORY_NAME	TEXT("SeLockMemoryPrivilege")
+#define SE_INCREASE_QUOTA_NAME	TEXT("SeIncreaseQuotaPrivilege")
+#define SE_UNSOLICITED_INPUT_NAME	TEXT("SeUnsolicitedInputPrivilege")
+#define SE_MACHINE_ACCOUNT_NAME TEXT("SeMachineAccountPrivilege")
+#define SE_TCB_NAME	TEXT("SeTcbPrivilege")
+#define SE_SECURITY_NAME	TEXT("SeSecurityPrivilege")
+#define SE_TAKE_OWNERSHIP_NAME	TEXT("SeTakeOwnershipPrivilege")
+#define SE_LOAD_DRIVER_NAME	TEXT("SeLoadDriverPrivilege")
+#define SE_SYSTEM_PROFILE_NAME	TEXT("SeSystemProfilePrivilege")
+#define SE_SYSTEMTIME_NAME	TEXT("SeSystemtimePrivilege")
+#define SE_PROF_SINGLE_PROCESS_NAME	TEXT("SeProfileSingleProcessPrivilege")
+#define SE_INC_BASE_PRIORITY_NAME	TEXT("SeIncreaseBasePriorityPrivilege")
+#define SE_CREATE_PAGEFILE_NAME TEXT("SeCreatePagefilePrivilege")
+#define SE_CREATE_PERMANENT_NAME	TEXT("SeCreatePermanentPrivilege")
+#define SE_BACKUP_NAME TEXT("SeBackupPrivilege")
+#define SE_RESTORE_NAME	TEXT("SeRestorePrivilege")
+#define SE_SHUTDOWN_NAME	TEXT("SeShutdownPrivilege")
+#define SE_DEBUG_NAME	TEXT("SeDebugPrivilege")
+#define SE_AUDIT_NAME	TEXT("SeAuditPrivilege")
+#define SE_SYSTEM_ENVIRONMENT_NAME	TEXT("SeSystemEnvironmentPrivilege")
+#define SE_CHANGE_NOTIFY_NAME	TEXT("SeChangeNotifyPrivilege")
+#define SE_REMOTE_SHUTDOWN_NAME	TEXT("SeRemoteShutdownPrivilege")
 #define LANG_NEUTRAL	0x00
 #define LANG_ARABIC 	0x01
 #define LANG_BULGARIAN 	0x02