* include/afxres.h: Remove the \r from the line ending.

	* include/errorrep.h: Ditto.
	* include/shldisp.h: Ditto.
	* include/tschema.h: Ditto.
	* lib/dhcpcsvc.def: Ditto.
	* lib/uxtheme.def: Ditto.
	* lib/wldap32.def: Ditto.

7 files changed, 1060 insertions, 1048 deletions

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index f25c8f6a9..9dd122187 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,15 @@
+2005-01-02  Earnie Boyd  <earnie@users.sf.net>
+
+	* include/w32api.h: Increment version.
+	* Makefile.in: Ditto.
+	* include/afxres.h: Remove the \r from the line ending.
+	* include/errorrep.h: Ditto.
+	* include/shldisp.h: Ditto.
+	* include/tschema.h: Ditto.
+	* lib/dhcpcsvc.def: Ditto.
+	* lib/uxtheme.def: Ditto.
+	* lib/wldap32.def: Ditto.
+
 2005-01-01  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/winerror.h (ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY):
diff --git a/winsup/w32api/include/afxres.h b/winsup/w32api/include/afxres.h
index 8c3f01a9a..91e7f495a 100644
--- a/winsup/w32api/include/afxres.h
+++ b/winsup/w32api/include/afxres.h
@@ -1,23 +1,23 @@
 #ifndef _AFXRES_H
 #define _AFXRES_H
-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef _WINDOWS_H
-#include <windows.h>

+#include <windows.h>
 #endif
-

+
 /* IDC_STATIC is documented in winuser.h, but not defined. */
-#ifndef IDC_STATIC

-#define IDC_STATIC (-1)

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-#endif

+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/errorrep.h b/winsup/w32api/include/errorrep.h
index 75d8f80ee..1361855e3 100644
--- a/winsup/w32api/include/errorrep.h
+++ b/winsup/w32api/include/errorrep.h
@@ -1,40 +1,40 @@
-#ifndef _ERRORREP_H

-#define _ERRORREP_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#if (_WIN32_WINNT >= 0x0501)

-typedef enum {

-	frrvErr = 3,

-	frrvErrNoDW = 4,

-	frrvErrTimeout = 5,

-	frrvLaunchDebugger = 6,

-	frrvOk = 0,

-	frrvOkHeadless = 7,

-	frrvOkManifest = 1,

-	frrvOkQueued = 2

-} EFaultRepRetVal;

-BOOL WINAPI AddERExcludedApplicationA(LPCSTR);

-BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);

-EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);

-#endif

-

-#ifdef UNICODE

-#if (_WIN32_WINNT >= 0x0501)

-#define AddERExcludedApplication AddERExcludedApplicationW

-#endif

-#else

-#if (_WIN32_WINNT >= 0x0501)

-#define AddERExcludedApplication AddERExcludedApplicationA

-#endif

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-#endif

+#ifndef _ERRORREP_H
+#define _ERRORREP_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if (_WIN32_WINNT >= 0x0501)
+typedef enum {
+	frrvErr = 3,
+	frrvErrNoDW = 4,
+	frrvErrTimeout = 5,
+	frrvLaunchDebugger = 6,
+	frrvOk = 0,
+	frrvOkHeadless = 7,
+	frrvOkManifest = 1,
+	frrvOkQueued = 2
+} EFaultRepRetVal;
+BOOL WINAPI AddERExcludedApplicationA(LPCSTR);
+BOOL WINAPI AddERExcludedApplicationW(LPCWSTR);
+EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS,DWORD);
+#endif
+
+#ifdef UNICODE
+#if (_WIN32_WINNT >= 0x0501)
+#define AddERExcludedApplication AddERExcludedApplicationW
+#endif
+#else
+#if (_WIN32_WINNT >= 0x0501)
+#define AddERExcludedApplication AddERExcludedApplicationA
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/winsup/w32api/include/shldisp.h b/winsup/w32api/include/shldisp.h
index 913e2d28c..5bf489491 100755
--- a/winsup/w32api/include/shldisp.h
+++ b/winsup/w32api/include/shldisp.h
@@ -1,61 +1,61 @@
-#ifndef _SHLDISP_H

-#define _SHLDISP_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define ACO_AUTOSUGGEST 0x01

-

-#undef INTERFACE

-#define INTERFACE IAutoComplete

-DECLARE_INTERFACE_(IAutoComplete, IUnknown)

-{

-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;

-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;

-	STDMETHOD_(ULONG,Release)(THIS) PURE;

-	STDMETHOD(Init)(THIS_ HWND,IUnknown*,LPCOLESTR,LPCOLESTR) PURE;

-	STDMETHOD(Enable)(THIS_ BOOL) PURE;

-};

-typedef IAutoComplete *LPAUTOCOMPLETE;

-

-#ifdef COBJMACROS

-#define IAutoComplete_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)

-#define IAutoComplete_AddRef(T) (T)->lpVtbl->AddRef(T)

-#define IAutoComplete_Release(T) (T)->lpVtbl->Release(T)

-#define IAutoComplete_Init(T,a,b,c,d) (T)->lpVtbl->Init(T,a,b,c,d)

-#define IAutoComplete_Enable(T,a) (T)->lpVtbl->Enable(T,a)

-#endif

-

-#undef INTERFACE

-#define INTERFACE IAutoComplete2

-DECLARE_INTERFACE_(IAutoComplete2, IAutoComplete)

-{

-	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;

-	STDMETHOD_(ULONG,AddRef)(THIS) PURE;

-	STDMETHOD_(ULONG,Release)(THIS) PURE;

-	STDMETHOD(Init)(THIS_ HWND,IUnknown*,LPCOLESTR,LPCOLESTR) PURE;

-	STDMETHOD(Enable)(THIS_ BOOL) PURE;

-	STDMETHOD(SetOptions)(THIS_ DWORD) PURE;

-	STDMETHOD(GetOptions)(THIS_ DWORD*) PURE;

-};

-typedef IAutoComplete2 *LPAUTOCOMPLETE2;

-

-#ifdef COBJMACROS

-#define IAutoComplete2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)

-#define IAutoComplete2_AddRef(T) (T)->lpVtbl->AddRef(T)

-#define IAutoComplete2_Release(T) (T)->lpVtbl->Release(T)

-#define IAutoComplete2_Init(T,a,b,c,d) (T)->lpVtbl->Init(T,a,b,c,d)

-#define IAutoComplete2_Enable(T,a) (T)->lpVtbl->Enable(T,a)

-#define IAutoComplete2_SetOptions(T,a) (T)->lpVtbl->Enable(T,a)

-#define IAutoComplete2_GetOptions(T,a) (T)->lpVtbl->Enable(T,a)

-#endif

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _SHLDISP_H */

+#ifndef _SHLDISP_H
+#define _SHLDISP_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ACO_AUTOSUGGEST 0x01
+
+#undef INTERFACE
+#define INTERFACE IAutoComplete
+DECLARE_INTERFACE_(IAutoComplete, IUnknown)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(Init)(THIS_ HWND,IUnknown*,LPCOLESTR,LPCOLESTR) PURE;
+	STDMETHOD(Enable)(THIS_ BOOL) PURE;
+};
+typedef IAutoComplete *LPAUTOCOMPLETE;
+
+#ifdef COBJMACROS
+#define IAutoComplete_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
+#define IAutoComplete_AddRef(T) (T)->lpVtbl->AddRef(T)
+#define IAutoComplete_Release(T) (T)->lpVtbl->Release(T)
+#define IAutoComplete_Init(T,a,b,c,d) (T)->lpVtbl->Init(T,a,b,c,d)
+#define IAutoComplete_Enable(T,a) (T)->lpVtbl->Enable(T,a)
+#endif
+
+#undef INTERFACE
+#define INTERFACE IAutoComplete2
+DECLARE_INTERFACE_(IAutoComplete2, IAutoComplete)
+{
+	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
+	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
+	STDMETHOD_(ULONG,Release)(THIS) PURE;
+	STDMETHOD(Init)(THIS_ HWND,IUnknown*,LPCOLESTR,LPCOLESTR) PURE;
+	STDMETHOD(Enable)(THIS_ BOOL) PURE;
+	STDMETHOD(SetOptions)(THIS_ DWORD) PURE;
+	STDMETHOD(GetOptions)(THIS_ DWORD*) PURE;
+};
+typedef IAutoComplete2 *LPAUTOCOMPLETE2;
+
+#ifdef COBJMACROS
+#define IAutoComplete2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b)
+#define IAutoComplete2_AddRef(T) (T)->lpVtbl->AddRef(T)
+#define IAutoComplete2_Release(T) (T)->lpVtbl->Release(T)
+#define IAutoComplete2_Init(T,a,b,c,d) (T)->lpVtbl->Init(T,a,b,c,d)
+#define IAutoComplete2_Enable(T,a) (T)->lpVtbl->Enable(T,a)
+#define IAutoComplete2_SetOptions(T,a) (T)->lpVtbl->Enable(T,a)
+#define IAutoComplete2_GetOptions(T,a) (T)->lpVtbl->Enable(T,a)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SHLDISP_H */
diff --git a/winsup/w32api/include/tmschema.h b/winsup/w32api/include/tmschema.h
index 58cf8fa17..6ab03b431 100644
--- a/winsup/w32api/include/tmschema.h
+++ b/winsup/w32api/include/tmschema.h
@@ -1,664 +1,664 @@
-#ifndef _TMSCHEMA_H

-#define _TMSCHEMA_H

-#if __GNUC__ >= 3

-#pragma GCC system_header

-#endif

-

-/* BUTTON parts */

-enum {

-	BP_PUSHBUTTON = 1,

-	BP_RADIOBUTTON = 2,

-	BP_CHECKBOX = 3,

-	BP_GROUPBOX = 4,

-	BP_USERBUTTON = 5

-};

-enum {

-	CBS_UNCHECKEDNORMAL = 1,

-	CBS_UNCHECKEDHOT = 2,

-	CBS_UNCHECKEDPRESSED = 3,

-	CBS_UNCHECKEDDISABLED = 4,

-	CBS_CHECKEDNORMAL = 5,

-	CBS_CHECKEDHOT = 6,

-	CBS_CHECKEDPRESSED = 7,

-	CBS_CHECKEDDISABLED = 8,

-	CBS_MIXEDNORMAL = 9,

-	CBS_MIXEDHOT = 10,

-	CBS_MIXEDPRESSED = 11,

-	CBS_MIXEDDISABLED = 12

-};

-enum {

-	GBS_NORMAL = 1,

-	GBS_DISABLED = 2

-};

-enum {

-	PBS_NORMAL = 1,

-	PBS_HOT = 2,

-	PBS_PRESSED = 3,

-	PBS_DISABLED = 4,

-	PBS_DEFAULTED = 5

-};

-enum {

-	RBS_UNCHECKEDNORMAL = 1,

-	RBS_UNCHECKEDHOT = 2,

-	RBS_UNCHECKEDPRESSED = 3,

-	RBS_UNCHECKEDDISABLED = 4,

-	RBS_CHECKEDNORMAL = 5,

-	RBS_CHECKEDHOT = 6,

-	RBS_CHECKEDPRESSED = 7,

-	RBS_CHECKEDDISABLED = 8

-};

-/* CLOCK parts */

-enum {

-	CLP_TIME = 1

-};

-enum {

-	CLS_NORMAL = 1

-};

-/* COMBOBOX parts */

-enum {

-	CP_DROPDOWNBUTTON = 1

-};

-enum {

-	CBXS_NORMAL = 1,

-	CBXS_HOT = 2,

-	CBXS_PRESSED = 3,

-	CBXS_DISABLED = 4

-};

-/* EDIT parts */

-enum {

-	EP_EDITTEXT = 1,

-	EP_CARET = 2

-};

-enum {

-	ETS_NORMAL = 1,

-	ETS_HOT = 2,

-	ETS_SELECTED = 3,

-	ETS_DISABLED = 4,

-	ETS_FOCUSED = 5,

-	ETS_READONLY = 6,

-	ETS_ASSIST = 7

-};

-/* EXPLORERBAR parts */

-enum {

-	EBP_HEADERBACKGROUND = 1,

-	EBP_HEADERCLOSE = 2,

-	EBP_HEADERPIN = 3,

-	EBP_IEBARMENU = 4,

-	EBP_NORMALGROUPBACKGROUND = 5,

-	EBP_NORMALGROUPCOLLAPSE = 6,

-	EBP_NORMALGROUPEXPAND = 7,

-	EBP_NORMALGROUPHEAD = 8,

-	EBP_SPECIALGROUPBACKGROUND = 9,

-	EBP_SPECIALGROUPCOLLAPSE = 10,

-	EBP_SPECIALGROUPEXPAND = 11,

-	EBP_SPECIALGROUPHEAD = 12

-};

-enum {

-	EBHC_NORMAL = 1,

-	EBHC_HOT = 2,

-	EBHC_PRESSED = 3

-};

-enum {

-	EBHP_NORMAL = 1,

-	EBHP_HOT = 2,

-	EBHP_PRESSED = 3,

-	EBHP_SELECTEDNORMAL = 4,

-	EBHP_SELECTEDHOT = 5,

-	EBHP_SELECTEDPRESSED = 6

-};

-enum {

-	EBM_NORMAL = 1,

-	EBM_HOT = 2,

-	EBM_PRESSED = 3

-};

-enum {

-	EBNGC_NORMAL = 1,

-	EBNGC_HOT = 2,

-	EBNGC_PRESSED = 3

-};

-enum {

-	EBNGE_NORMAL = 1,

-	EBNGE_HOT = 2,

-	EBNGE_PRESSED = 3

-};

-enum {

-	EBSGC_NORMAL = 1,

-	EBSGC_HOT = 2,

-	EBSGC_PRESSED = 3

-};

-enum {

-	EBSGE_NORMAL = 1,

-	EBSGE_HOT = 2,

-	EBSGE_PRESSED = 3

-};

-/* HEADER parts */

-enum {

-	HP_HEADERITEM = 1,

-	HP_HEADERITEMLEFT = 2,

-	HP_HEADERITEMRIGHT = 3,

-	HP_HEADERSORTARROW = 4

-};

-enum {

-	HIS_NORMAL = 1,

-	HIS_HOT = 2,

-	HIS_PRESSED = 3

-};

-enum {

-	HILS_NORMAL = 1,

-	HILS_HOT = 2,

-	HILS_PRESSED = 3

-};

-enum {

-	HIRS_NORMAL = 1,

-	HIRS_HOT = 2,

-	HIRS_PRESSED = 3

-};

-enum {

-	HSAS_SORTEDUP = 1,

-	HSAS_SORTEDDOWN = 2

-};

-/* LISTVIEW parts */

-enum {

-	LVP_LISTITEM = 1,

-	LVP_LISTGROUP = 2,

-	LVP_LISTDETAIL = 3,

-	LVP_LISTSORTEDDETAIL = 4,

-	LVP_EMPTYTEXT = 5

-};

-enum {

-	LIS_NORMAL = 1,

-	LIS_HOT = 2,

-	LIS_SELECTED = 3,

-	LIS_DISABLED = 4,

-	LIS_SELECTEDNOTFOCUS = 5

-};

-/* MENU parts */

-enum {

-	MP_MENUITEM = 1,

-	MP_MENUDROPDOWN = 2,

-	MP_MENUBARITEM = 3,

-	MP_MENUBARDROPDOWN = 4,

-	MP_CHEVRON = 5,

-	MP_SEPARATOR = 6

-};

-enum {

-	MS_NORMAL = 1,

-	MS_SELECTED = 2,

-	MS_DEMOTED = 3

-};

-/* MENUBAND parts */

-enum {

-	MDP_NEWAPPBUTTON = 1,

-	MDP_SEPERATOR = 2

-};

-enum {

-	MDS_NORMAL = 1,

-	MDS_HOT = 2,

-	MDS_PRESSED = 3,

-	MDS_DISABLED = 4,

-	MDS_CHECKED = 5,

-	MDS_HOTCHECKED = 6

-};

-/* PAGE parts */

-enum {

-	PGRP_UP = 1,

-	PGRP_DOWN = 2,

-	PGRP_UPHORZ = 3,

-	PGRP_DOWNHORZ = 4

-};

-enum {

-	DNS_NORMAL = 1,

-	DNS_HOT = 2,

-	DNS_PRESSED = 3,

-	DNS_DISABLED = 4

-};

-enum {

-	DNHZS_NORMAL = 1,

-	DNHZS_HOT = 2,

-	DNHZS_PRESSED = 3,

-	DNHZS_DISABLED = 4

-};

-enum {

-	UPS_NORMAL = 1,

-	UPS_HOT = 2,

-	UPS_PRESSED = 3,

-	UPS_DISABLED = 4

-};

-enum {

-	UPHZS_NORMAL = 1,

-	UPHZS_HOT = 2,

-	UPHZS_PRESSED = 3,

-	UPHZS_DISABLED = 4

-};

-/* PROGRESS parts */

-enum {

-	PP_BAR = 1,

-	PP_BARVERT = 2,

-	PP_CHUNK = 3,

-	PP_CHUNKVERT = 4

-};

-/* REBAR parts */

-enum {

-	RP_GRIPPER = 1,

-	RP_GRIPPERVERT = 2,

-	RP_BAND = 3,

-	RP_CHEVRON = 4,

-	RP_CHEVRONVERT = 5

-};

-enum {

-	CHEVS_NORMAL = 1,

-	CHEVS_HOT = 2,

-	CHEVS_PRESSED = 3

-};

-/* SCROLLBAR parts */

-enum {

-	SBP_ARROWBTN = 1,

-	SBP_THUMBBTNHORZ = 2,

-	SBP_THUMBBTNVERT = 3,

-	SBP_LOWERTRACKHORZ = 4,

-	SBP_UPPERTRACKHORZ = 5,

-	SBP_LOWERTRACKVERT = 6,

-	SBP_UPPERTRACKVERT = 7,

-	SBP_GRIPPERHORZ = 8,

-	SBP_GRIPPERVERT = 9,

-	SBP_SIZEBOX = 10

-};

-enum {

-	ABS_UPNORMAL = 1,

-	ABS_UPHOT = 2,

-	ABS_UPPRESSED = 3,

-	ABS_UPDISABLED = 4,

-	ABS_DOWNNORMAL = 5,

-	ABS_DOWNHOT = 6,

-	ABS_DOWNPRESSED = 7,

-	ABS_DOWNDISABLED = 8,

-	ABS_LEFTNORMAL = 9,

-	ABS_LEFTHOT = 10,

-	ABS_LEFTPRESSED = 11,

-	ABS_LEFTDISABLED = 12,

-	ABS_RIGHTNORMAL = 13,

-	ABS_RIGHTHOT = 14,

-	ABS_RIGHTPRESSED = 15,

-	ABS_RIGHTDISABLED = 16

-};

-enum {

-	SCRBS_NORMAL = 1,

-	SCRBS_HOT = 2,

-	SCRBS_PRESSED = 3,

-	SCRBS_DISABLED = 4

-};

-enum {

-	SZB_RIGHTALIGN = 1,

-	SZB_LEFTALIGN = 2

-};

-/* SPIN parts */

-enum {

-	SPNP_UP = 1,

-	SPNP_DOWN = 2,

-	SPNP_UPHORZ = 3,

-	SPNP_DOWNHORZ = 4

-};

-/* STARTPANEL parts */

-enum {

-	SPP_USERPANE = 1,

-	SPP_MOREPROGRAMS = 2,

-	SPP_MOREPROGRAMSARROW = 3,

-	SPP_PROGLIST = 4,

-	SPP_PROGLISTSEPARATOR = 5,

-	SPP_PLACESLIST = 6,

-	SPP_PLACESLISTSEPARATOR = 7,

-	SPP_LOGOFF = 8,

-	SPP_LOGOFFBUTTONS = 9,

-	SPP_USERPICTURE = 10,

-	SPP_PREVIEW = 11

-};

-enum {

-	SPLS_NORMAL = 1,

-	SPLS_HOT = 2,

-	SPLS_PRESSED = 3

-};

-enum {

-	SPS_NORMAL = 1,

-	SPS_HOT = 2,

-	SPS_PRESSED = 3

-};

-/* STATUS parts */

-enum {

-	SP_PANE = 1,

-	SP_GRIPPERPANE = 2,

-	SP_GRIPPER = 3

-};

-/* TAB parts */

-enum {

-	TABP_TABITEM = 1,

-	TABP_TABITEMLEFTEDGE = 2,

-	TABP_TABITEMRIGHTEDGE = 3,

-	TABP_TABITEMBOTHEDGE = 4,

-	TABP_TOPTABITEM = 5,

-	TABP_TOPTABITEMLEFTEDGE = 6,

-	TABP_TOPTABITEMRIGHTEDGE = 7,

-	TABP_TOPTABITEMBOTHEDGE = 8,

-	TABP_PANE = 9,

-	TABP_BODY = 10

-};

-enum {

-	TIS_NORMAL = 1,

-	TIS_HOT = 2,

-	TIS_SELECTED = 3,

-	TIS_DISABLED = 4,

-	TIS_FOCUSED = 5

-};

-enum {

-	TIBES_NORMAL = 1,

-	TIBES_HOT = 2,

-	TIBES_SELECTED = 3,

-	TIBES_DISABLED = 4,

-	TIBES_FOCUSED = 5

-};

-enum {

-	TILES_NORMAL = 1,

-	TILES_HOT = 2,

-	TILES_SELECTED = 3,

-	TILES_DISABLED = 4,

-	TILES_FOCUSED = 5

-};

-enum {

-	TIRES_NORMAL = 1,

-	TIRES_HOT = 2,

-	TIRES_SELECTED = 3,

-	TIRES_DISABLED = 4,

-	TIRES_FOCUSED = 5

-};

-enum {

-	TTIS_NORMAL = 1,

-	TTIS_HOT = 2,

-	TTIS_SELECTED = 3,

-	TTIS_DISABLED = 4,

-	TTIS_FOCUSED = 5

-};

-enum {

-	TTIBES_NORMAL = 1,

-	TTIBES_HOT = 2,

-	TTIBES_SELECTED = 3,

-	TTIBES_DISABLED = 4,

-	TTIBES_FOCUSED = 5

-};

-enum {

-	TTILES_NORMAL = 1,

-	TTILES_HOT = 2,

-	TTILES_SELECTED = 3,

-	TTILES_DISABLED = 4,

-	TTILES_FOCUSED = 5

-};

-enum {

-	TTIRES_NORMAL = 1,

-	TTIRES_HOT = 2,

-	TTIRES_SELECTED = 3,

-	TTIRES_DISABLED = 4,

-	TTIRES_FOCUSED = 5

-};

-/* TASKBAND parts */

-enum {

-	TDP_GROUPCOUNT = 1,

-	TDP_FLASHBUTTON = 2,

-	TDP_FLASHBUTTONGROUPMENU = 3

-};

-/* TASKBAR parts */

-enum {

-	TBP_BACKGROUNDBOTTOM = 1,

-	TBP_BACKGROUNDRIGHT = 2,

-	TBP_BACKGROUNDTOP = 3,

-	TBP_BACKGROUNDLEFT = 4,

-	TBP_SIZINGBARBOTTOM = 5,

-	TBP_SIZINGBARRIGHT = 6,

-	TBP_SIZINGBARTOP = 7,

-	TBP_SIZINGBARLEFT = 8

-};

-/* TOOLBAR parts */

-enum {

-	TP_BUTTON = 1,

-	TP_DROPDOWNBUTTON = 2,

-	TP_SPLITBUTTON = 3,

-	TP_SPLITBUTTONDROPDOWN = 4,

-	TP_SEPARATOR = 5,

-	TP_SEPARATORVERT = 6

-};

-enum {

-	TS_NORMAL = 1,

-	TS_HOT = 2,

-	TS_PRESSED = 3,

-	TS_DISABLED = 4,

-	TS_CHECKED = 5,

-	TS_HOTCHECKED = 6

-};

-/* TOOLTIP parts */

-enum {

-	TTP_STANDARD = 1,

-	TTP_STANDARDTITLE = 2,

-	TTP_BALLOON = 3,

-	TTP_BALLOONTITLE = 4,

-	TTP_CLOSE = 5

-};

-enum {

-	TTBS_NORMAL = 1,

-	TTBS_LINK = 2

-};

-enum {

-	TTCS_NORMAL = 1,

-	TTCS_HOT = 2,

-	TTCS_PRESSED = 3

-};

-enum {

-	TTSS_NORMAL = 1,

-	TTSS_LINK = 2

-};

-/* TRACKBAR parts */

-enum {

-	TKP_TRACK = 1,

-	TKP_TRACKVERT = 2,

-	TKP_THUMB = 3,

-	TKP_THUMBBOTTOM = 4,

-	TKP_THUMBTOP = 5,

-	TKP_THUMBVERT = 6,

-	TKP_THUMBLEFT = 7,

-	TKP_THUMBRIGHT = 8,

-	TKP_TICS = 9,

-	TKP_TICSVERT = 10

-};

-enum {

-	TUS_NORMAL = 1,

-	TUS_HOT = 2,

-	TUS_PRESSED = 3,

-	TUS_FOCUSED = 4,

-	TUS_DISABLED = 5

-};

-enum {

-	TUBS_NORMAL = 1,

-	TUBS_HOT = 2,

-	TUBS_PRESSED = 3,

-	TUBS_FOCUSED = 4,

-	TUBS_DISABLED = 5

-};

-enum {

-	TUVLS_NORMAL = 1,

-	TUVLS_HOT = 2,

-	TUVLS_PRESSED = 3,

-	TUVLS_FOCUSED = 4,

-	TUVLS_DISABLED = 5

-};

-enum {

-	TUVRS_NORMAL = 1,

-	TUVRS_HOT = 2,

-	TUVRS_PRESSED = 3,

-	TUVRS_FOCUSED = 4,

-	TUVRS_DISABLED = 5

-};

-enum {

-	TUTS_NORMAL = 1,

-	TUTS_HOT = 2,

-	TUTS_PRESSED = 3,

-	TUTS_FOCUSED = 4,

-	TUTS_DISABLED = 5

-};

-enum {

-	TUVS_NORMAL = 1,

-	TUVS_HOT = 2,

-	TUVS_PRESSED = 3,

-	TUVS_FOCUSED = 4,

-	TUVS_DISABLED = 5

-};

-enum {

-	TSS_NORMAL = 1

-};

-enum {

-	TSVS_NORMAL = 1

-};

-enum {

-	TRS_NORMAL = 1

-};

-enum {

-	TRVS_NORMAL = 1

-};

-/* TRAYNOTIFY parts */

-enum {

-	TNP_BACKGROUND = 1,

-	TNP_ANIMBACKGROUND = 2

-};

-/* TREEVIEW parts */

-enum {

-	TVP_TREEITEM = 1,

-	TVP_GLYPH = 2,

-	TVP_BRANCH = 3

-};

-enum {

-	GLPS_CLOSED = 1,

-	GLPS_OPENED = 2

-};

-enum {

-	TREIS_NORMAL = 1,

-	TREIS_HOT = 2,

-	TREIS_SELECTED = 3,

-	TREIS_DISABLED = 4,

-	TREIS_SELECTEDNOTFOCUS = 5

-};

-/* WINDOW parts */

-enum {

-	WP_CAPTION = 1,

-	WP_SMALLCAPTION = 2,

-	WP_MINCAPTION = 3,

-	WP_SMALLMINCAPTION = 4,

-	WP_MAXCAPTION = 5,

-	WP_SMALLMAXCAPTION = 6,

-	WP_FRAMELEFT = 7,

-	WP_FRAMERIGHT = 8,

-	WP_FRAMEBOTTOM = 9,

-	WP_SMALLFRAMELEFT = 10,

-	WP_SMALLFRAMERIGHT = 11,

-	WP_SMALLFRAMEBOTTOM = 12,

-	WP_SYSBUTTON = 13,

-	WP_MDISYSBUTTON = 14,

-	WP_MINBUTTON = 15,

-	WP_MDIMINBUTTON = 16,

-	WP_MAXBUTTON = 17,

-	WP_CLOSEBUTTON = 18,

-	WP_SMALLCLOSEBUTTON = 19,

-	WP_MDICLOSEBUTTON = 20,

-	WP_RESTOREBUTTON = 21,

-	WP_MDIRESTOREBUTTON = 22,

-	WP_HELPBUTTON = 23,

-	WP_MDIHELPBUTTON = 24,

-	WP_HORZSCROLL = 25,

-	WP_HORZTHUMB = 26,

-	WP_VERTSCROLL = 27,

-	WP_VERTTHUMB = 28,

-	WP_DIALOG = 29,

-	WP_CAPTIONSIZINGTEMPLATE = 30,

-	WP_SMALLCAPTIONSIZINGTEMPLATE = 31,

-	WP_FRAMELEFTSIZINGTEMPLATE = 32,

-	WP_SMALLFRAMELEFTSIZINGTEMPLATE = 33,

-	WP_FRAMERIGHTSIZINGTEMPLATE = 34,

-	WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,

-	WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,

-	WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37

-};

-enum {

-	CS_ACTIVE = 1,

-	CS_INACTIVE = 2,

-	CS_DISABLED = 3

-};

-enum {

-	CBS_NORMAL = 1,

-	CBS_HOT = 2,

-	CBS_PUSHED = 3,

-	CBS_DISABLED = 4

-};

-enum {

-	FS_ACTIVE = 1,

-	FS_INACTIVE = 2

-};

-enum {

-	HBS_NORMAL = 1,

-	HBS_HOT = 2,

-	HBS_PUSHED = 3,

-	HBS_DISABLED = 4

-};

-enum {

-	HSS_NORMAL = 1,

-	HSS_HOT = 2,

-	HSS_PUSHED = 3,

-	HSS_DISABLED = 4

-};

-enum {

-	HTS_NORMAL = 1,

-	HTS_HOT = 2,

-	HTS_PUSHED = 3,

-	HTS_DISABLED = 4

-};

-enum {

-	MAXBS_NORMAL = 1,

-	MAXBS_HOT = 2,

-	MAXBS_PUSHED = 3,

-	MAXBS_DISABLED = 4

-};

-enum {

-	MXCS_ACTIVE = 1,

-	MXCS_INACTIVE = 2,

-	MXCS_DISABLED = 3

-};

-enum {

-	MINBS_NORMAL = 1,

-	MINBS_HOT = 2,

-	MINBS_PUSHED = 3,

-	MINBS_DISABLED = 4

-};

-enum {

-	RBS_NORMAL = 1,

-	RBS_HOT = 2,

-	RBS_PUSHED = 3,

-	RBS_DISABLED = 4

-};

-enum {

-	SBS_NORMAL = 1,

-	SBS_HOT = 2,

-	SBS_PUSHED = 3,

-	SBS_DISABLED = 4

-};

-enum {

-	MNCS_ACTIVE = 1,

-	MNCS_INACTIVE = 2,

-	MNCS_DISABLED = 3

-};

-enum {

-	VSS_NORMAL = 1,

-	VSS_HOT = 2,

-	VSS_PUSHED = 3,

-	VSS_DISABLED = 4

-};

-enum {

-	VTS_NORMAL = 1,

-	VTS_HOT = 2,

-	VTS_PUSHED = 3,

-	VTS_DISABLED = 4

-};

-

-#endif

+#ifndef _TMSCHEMA_H
+#define _TMSCHEMA_H
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+/* BUTTON parts */
+enum {
+	BP_PUSHBUTTON = 1,
+	BP_RADIOBUTTON = 2,
+	BP_CHECKBOX = 3,
+	BP_GROUPBOX = 4,
+	BP_USERBUTTON = 5
+};
+enum {
+	CBS_UNCHECKEDNORMAL = 1,
+	CBS_UNCHECKEDHOT = 2,
+	CBS_UNCHECKEDPRESSED = 3,
+	CBS_UNCHECKEDDISABLED = 4,
+	CBS_CHECKEDNORMAL = 5,
+	CBS_CHECKEDHOT = 6,
+	CBS_CHECKEDPRESSED = 7,
+	CBS_CHECKEDDISABLED = 8,
+	CBS_MIXEDNORMAL = 9,
+	CBS_MIXEDHOT = 10,
+	CBS_MIXEDPRESSED = 11,
+	CBS_MIXEDDISABLED = 12
+};
+enum {
+	GBS_NORMAL = 1,
+	GBS_DISABLED = 2
+};
+enum {
+	PBS_NORMAL = 1,
+	PBS_HOT = 2,
+	PBS_PRESSED = 3,
+	PBS_DISABLED = 4,
+	PBS_DEFAULTED = 5
+};
+enum {
+	RBS_UNCHECKEDNORMAL = 1,
+	RBS_UNCHECKEDHOT = 2,
+	RBS_UNCHECKEDPRESSED = 3,
+	RBS_UNCHECKEDDISABLED = 4,
+	RBS_CHECKEDNORMAL = 5,
+	RBS_CHECKEDHOT = 6,
+	RBS_CHECKEDPRESSED = 7,
+	RBS_CHECKEDDISABLED = 8
+};
+/* CLOCK parts */
+enum {
+	CLP_TIME = 1
+};
+enum {
+	CLS_NORMAL = 1
+};
+/* COMBOBOX parts */
+enum {
+	CP_DROPDOWNBUTTON = 1
+};
+enum {
+	CBXS_NORMAL = 1,
+	CBXS_HOT = 2,
+	CBXS_PRESSED = 3,
+	CBXS_DISABLED = 4
+};
+/* EDIT parts */
+enum {
+	EP_EDITTEXT = 1,
+	EP_CARET = 2
+};
+enum {
+	ETS_NORMAL = 1,
+	ETS_HOT = 2,
+	ETS_SELECTED = 3,
+	ETS_DISABLED = 4,
+	ETS_FOCUSED = 5,
+	ETS_READONLY = 6,
+	ETS_ASSIST = 7
+};
+/* EXPLORERBAR parts */
+enum {
+	EBP_HEADERBACKGROUND = 1,
+	EBP_HEADERCLOSE = 2,
+	EBP_HEADERPIN = 3,
+	EBP_IEBARMENU = 4,
+	EBP_NORMALGROUPBACKGROUND = 5,
+	EBP_NORMALGROUPCOLLAPSE = 6,
+	EBP_NORMALGROUPEXPAND = 7,
+	EBP_NORMALGROUPHEAD = 8,
+	EBP_SPECIALGROUPBACKGROUND = 9,
+	EBP_SPECIALGROUPCOLLAPSE = 10,
+	EBP_SPECIALGROUPEXPAND = 11,
+	EBP_SPECIALGROUPHEAD = 12
+};
+enum {
+	EBHC_NORMAL = 1,
+	EBHC_HOT = 2,
+	EBHC_PRESSED = 3
+};
+enum {
+	EBHP_NORMAL = 1,
+	EBHP_HOT = 2,
+	EBHP_PRESSED = 3,
+	EBHP_SELECTEDNORMAL = 4,
+	EBHP_SELECTEDHOT = 5,
+	EBHP_SELECTEDPRESSED = 6
+};
+enum {
+	EBM_NORMAL = 1,
+	EBM_HOT = 2,
+	EBM_PRESSED = 3
+};
+enum {
+	EBNGC_NORMAL = 1,
+	EBNGC_HOT = 2,
+	EBNGC_PRESSED = 3
+};
+enum {
+	EBNGE_NORMAL = 1,
+	EBNGE_HOT = 2,
+	EBNGE_PRESSED = 3
+};
+enum {
+	EBSGC_NORMAL = 1,
+	EBSGC_HOT = 2,
+	EBSGC_PRESSED = 3
+};
+enum {
+	EBSGE_NORMAL = 1,
+	EBSGE_HOT = 2,
+	EBSGE_PRESSED = 3
+};
+/* HEADER parts */
+enum {
+	HP_HEADERITEM = 1,
+	HP_HEADERITEMLEFT = 2,
+	HP_HEADERITEMRIGHT = 3,
+	HP_HEADERSORTARROW = 4
+};
+enum {
+	HIS_NORMAL = 1,
+	HIS_HOT = 2,
+	HIS_PRESSED = 3
+};
+enum {
+	HILS_NORMAL = 1,
+	HILS_HOT = 2,
+	HILS_PRESSED = 3
+};
+enum {
+	HIRS_NORMAL = 1,
+	HIRS_HOT = 2,
+	HIRS_PRESSED = 3
+};
+enum {
+	HSAS_SORTEDUP = 1,
+	HSAS_SORTEDDOWN = 2
+};
+/* LISTVIEW parts */
+enum {
+	LVP_LISTITEM = 1,
+	LVP_LISTGROUP = 2,
+	LVP_LISTDETAIL = 3,
+	LVP_LISTSORTEDDETAIL = 4,
+	LVP_EMPTYTEXT = 5
+};
+enum {
+	LIS_NORMAL = 1,
+	LIS_HOT = 2,
+	LIS_SELECTED = 3,
+	LIS_DISABLED = 4,
+	LIS_SELECTEDNOTFOCUS = 5
+};
+/* MENU parts */
+enum {
+	MP_MENUITEM = 1,
+	MP_MENUDROPDOWN = 2,
+	MP_MENUBARITEM = 3,
+	MP_MENUBARDROPDOWN = 4,
+	MP_CHEVRON = 5,
+	MP_SEPARATOR = 6
+};
+enum {
+	MS_NORMAL = 1,
+	MS_SELECTED = 2,
+	MS_DEMOTED = 3
+};
+/* MENUBAND parts */
+enum {
+	MDP_NEWAPPBUTTON = 1,
+	MDP_SEPERATOR = 2
+};
+enum {
+	MDS_NORMAL = 1,
+	MDS_HOT = 2,
+	MDS_PRESSED = 3,
+	MDS_DISABLED = 4,
+	MDS_CHECKED = 5,
+	MDS_HOTCHECKED = 6
+};
+/* PAGE parts */
+enum {
+	PGRP_UP = 1,
+	PGRP_DOWN = 2,
+	PGRP_UPHORZ = 3,
+	PGRP_DOWNHORZ = 4
+};
+enum {
+	DNS_NORMAL = 1,
+	DNS_HOT = 2,
+	DNS_PRESSED = 3,
+	DNS_DISABLED = 4
+};
+enum {
+	DNHZS_NORMAL = 1,
+	DNHZS_HOT = 2,
+	DNHZS_PRESSED = 3,
+	DNHZS_DISABLED = 4
+};
+enum {
+	UPS_NORMAL = 1,
+	UPS_HOT = 2,
+	UPS_PRESSED = 3,
+	UPS_DISABLED = 4
+};
+enum {
+	UPHZS_NORMAL = 1,
+	UPHZS_HOT = 2,
+	UPHZS_PRESSED = 3,
+	UPHZS_DISABLED = 4
+};
+/* PROGRESS parts */
+enum {
+	PP_BAR = 1,
+	PP_BARVERT = 2,
+	PP_CHUNK = 3,
+	PP_CHUNKVERT = 4
+};
+/* REBAR parts */
+enum {
+	RP_GRIPPER = 1,
+	RP_GRIPPERVERT = 2,
+	RP_BAND = 3,
+	RP_CHEVRON = 4,
+	RP_CHEVRONVERT = 5
+};
+enum {
+	CHEVS_NORMAL = 1,
+	CHEVS_HOT = 2,
+	CHEVS_PRESSED = 3
+};
+/* SCROLLBAR parts */
+enum {
+	SBP_ARROWBTN = 1,
+	SBP_THUMBBTNHORZ = 2,
+	SBP_THUMBBTNVERT = 3,
+	SBP_LOWERTRACKHORZ = 4,
+	SBP_UPPERTRACKHORZ = 5,
+	SBP_LOWERTRACKVERT = 6,
+	SBP_UPPERTRACKVERT = 7,
+	SBP_GRIPPERHORZ = 8,
+	SBP_GRIPPERVERT = 9,
+	SBP_SIZEBOX = 10
+};
+enum {
+	ABS_UPNORMAL = 1,
+	ABS_UPHOT = 2,
+	ABS_UPPRESSED = 3,
+	ABS_UPDISABLED = 4,
+	ABS_DOWNNORMAL = 5,
+	ABS_DOWNHOT = 6,
+	ABS_DOWNPRESSED = 7,
+	ABS_DOWNDISABLED = 8,
+	ABS_LEFTNORMAL = 9,
+	ABS_LEFTHOT = 10,
+	ABS_LEFTPRESSED = 11,
+	ABS_LEFTDISABLED = 12,
+	ABS_RIGHTNORMAL = 13,
+	ABS_RIGHTHOT = 14,
+	ABS_RIGHTPRESSED = 15,
+	ABS_RIGHTDISABLED = 16
+};
+enum {
+	SCRBS_NORMAL = 1,
+	SCRBS_HOT = 2,
+	SCRBS_PRESSED = 3,
+	SCRBS_DISABLED = 4
+};
+enum {
+	SZB_RIGHTALIGN = 1,
+	SZB_LEFTALIGN = 2
+};
+/* SPIN parts */
+enum {
+	SPNP_UP = 1,
+	SPNP_DOWN = 2,
+	SPNP_UPHORZ = 3,
+	SPNP_DOWNHORZ = 4
+};
+/* STARTPANEL parts */
+enum {
+	SPP_USERPANE = 1,
+	SPP_MOREPROGRAMS = 2,
+	SPP_MOREPROGRAMSARROW = 3,
+	SPP_PROGLIST = 4,
+	SPP_PROGLISTSEPARATOR = 5,
+	SPP_PLACESLIST = 6,
+	SPP_PLACESLISTSEPARATOR = 7,
+	SPP_LOGOFF = 8,
+	SPP_LOGOFFBUTTONS = 9,
+	SPP_USERPICTURE = 10,
+	SPP_PREVIEW = 11
+};
+enum {
+	SPLS_NORMAL = 1,
+	SPLS_HOT = 2,
+	SPLS_PRESSED = 3
+};
+enum {
+	SPS_NORMAL = 1,
+	SPS_HOT = 2,
+	SPS_PRESSED = 3
+};
+/* STATUS parts */
+enum {
+	SP_PANE = 1,
+	SP_GRIPPERPANE = 2,
+	SP_GRIPPER = 3
+};
+/* TAB parts */
+enum {
+	TABP_TABITEM = 1,
+	TABP_TABITEMLEFTEDGE = 2,
+	TABP_TABITEMRIGHTEDGE = 3,
+	TABP_TABITEMBOTHEDGE = 4,
+	TABP_TOPTABITEM = 5,
+	TABP_TOPTABITEMLEFTEDGE = 6,
+	TABP_TOPTABITEMRIGHTEDGE = 7,
+	TABP_TOPTABITEMBOTHEDGE = 8,
+	TABP_PANE = 9,
+	TABP_BODY = 10
+};
+enum {
+	TIS_NORMAL = 1,
+	TIS_HOT = 2,
+	TIS_SELECTED = 3,
+	TIS_DISABLED = 4,
+	TIS_FOCUSED = 5
+};
+enum {
+	TIBES_NORMAL = 1,
+	TIBES_HOT = 2,
+	TIBES_SELECTED = 3,
+	TIBES_DISABLED = 4,
+	TIBES_FOCUSED = 5
+};
+enum {
+	TILES_NORMAL = 1,
+	TILES_HOT = 2,
+	TILES_SELECTED = 3,
+	TILES_DISABLED = 4,
+	TILES_FOCUSED = 5
+};
+enum {
+	TIRES_NORMAL = 1,
+	TIRES_HOT = 2,
+	TIRES_SELECTED = 3,
+	TIRES_DISABLED = 4,
+	TIRES_FOCUSED = 5
+};
+enum {
+	TTIS_NORMAL = 1,
+	TTIS_HOT = 2,
+	TTIS_SELECTED = 3,
+	TTIS_DISABLED = 4,
+	TTIS_FOCUSED = 5
+};
+enum {
+	TTIBES_NORMAL = 1,
+	TTIBES_HOT = 2,
+	TTIBES_SELECTED = 3,
+	TTIBES_DISABLED = 4,
+	TTIBES_FOCUSED = 5
+};
+enum {
+	TTILES_NORMAL = 1,
+	TTILES_HOT = 2,
+	TTILES_SELECTED = 3,
+	TTILES_DISABLED = 4,
+	TTILES_FOCUSED = 5
+};
+enum {
+	TTIRES_NORMAL = 1,
+	TTIRES_HOT = 2,
+	TTIRES_SELECTED = 3,
+	TTIRES_DISABLED = 4,
+	TTIRES_FOCUSED = 5
+};
+/* TASKBAND parts */
+enum {
+	TDP_GROUPCOUNT = 1,
+	TDP_FLASHBUTTON = 2,
+	TDP_FLASHBUTTONGROUPMENU = 3
+};
+/* TASKBAR parts */
+enum {
+	TBP_BACKGROUNDBOTTOM = 1,
+	TBP_BACKGROUNDRIGHT = 2,
+	TBP_BACKGROUNDTOP = 3,
+	TBP_BACKGROUNDLEFT = 4,
+	TBP_SIZINGBARBOTTOM = 5,
+	TBP_SIZINGBARRIGHT = 6,
+	TBP_SIZINGBARTOP = 7,
+	TBP_SIZINGBARLEFT = 8
+};
+/* TOOLBAR parts */
+enum {
+	TP_BUTTON = 1,
+	TP_DROPDOWNBUTTON = 2,
+	TP_SPLITBUTTON = 3,
+	TP_SPLITBUTTONDROPDOWN = 4,
+	TP_SEPARATOR = 5,
+	TP_SEPARATORVERT = 6
+};
+enum {
+	TS_NORMAL = 1,
+	TS_HOT = 2,
+	TS_PRESSED = 3,
+	TS_DISABLED = 4,
+	TS_CHECKED = 5,
+	TS_HOTCHECKED = 6
+};
+/* TOOLTIP parts */
+enum {
+	TTP_STANDARD = 1,
+	TTP_STANDARDTITLE = 2,
+	TTP_BALLOON = 3,
+	TTP_BALLOONTITLE = 4,
+	TTP_CLOSE = 5
+};
+enum {
+	TTBS_NORMAL = 1,
+	TTBS_LINK = 2
+};
+enum {
+	TTCS_NORMAL = 1,
+	TTCS_HOT = 2,
+	TTCS_PRESSED = 3
+};
+enum {
+	TTSS_NORMAL = 1,
+	TTSS_LINK = 2
+};
+/* TRACKBAR parts */
+enum {
+	TKP_TRACK = 1,
+	TKP_TRACKVERT = 2,
+	TKP_THUMB = 3,
+	TKP_THUMBBOTTOM = 4,
+	TKP_THUMBTOP = 5,
+	TKP_THUMBVERT = 6,
+	TKP_THUMBLEFT = 7,
+	TKP_THUMBRIGHT = 8,
+	TKP_TICS = 9,
+	TKP_TICSVERT = 10
+};
+enum {
+	TUS_NORMAL = 1,
+	TUS_HOT = 2,
+	TUS_PRESSED = 3,
+	TUS_FOCUSED = 4,
+	TUS_DISABLED = 5
+};
+enum {
+	TUBS_NORMAL = 1,
+	TUBS_HOT = 2,
+	TUBS_PRESSED = 3,
+	TUBS_FOCUSED = 4,
+	TUBS_DISABLED = 5
+};
+enum {
+	TUVLS_NORMAL = 1,
+	TUVLS_HOT = 2,
+	TUVLS_PRESSED = 3,
+	TUVLS_FOCUSED = 4,
+	TUVLS_DISABLED = 5
+};
+enum {
+	TUVRS_NORMAL = 1,
+	TUVRS_HOT = 2,
+	TUVRS_PRESSED = 3,
+	TUVRS_FOCUSED = 4,
+	TUVRS_DISABLED = 5
+};
+enum {
+	TUTS_NORMAL = 1,
+	TUTS_HOT = 2,
+	TUTS_PRESSED = 3,
+	TUTS_FOCUSED = 4,
+	TUTS_DISABLED = 5
+};
+enum {
+	TUVS_NORMAL = 1,
+	TUVS_HOT = 2,
+	TUVS_PRESSED = 3,
+	TUVS_FOCUSED = 4,
+	TUVS_DISABLED = 5
+};
+enum {
+	TSS_NORMAL = 1
+};
+enum {
+	TSVS_NORMAL = 1
+};
+enum {
+	TRS_NORMAL = 1
+};
+enum {
+	TRVS_NORMAL = 1
+};
+/* TRAYNOTIFY parts */
+enum {
+	TNP_BACKGROUND = 1,
+	TNP_ANIMBACKGROUND = 2
+};
+/* TREEVIEW parts */
+enum {
+	TVP_TREEITEM = 1,
+	TVP_GLYPH = 2,
+	TVP_BRANCH = 3
+};
+enum {
+	GLPS_CLOSED = 1,
+	GLPS_OPENED = 2
+};
+enum {
+	TREIS_NORMAL = 1,
+	TREIS_HOT = 2,
+	TREIS_SELECTED = 3,
+	TREIS_DISABLED = 4,
+	TREIS_SELECTEDNOTFOCUS = 5
+};
+/* WINDOW parts */
+enum {
+	WP_CAPTION = 1,
+	WP_SMALLCAPTION = 2,
+	WP_MINCAPTION = 3,
+	WP_SMALLMINCAPTION = 4,
+	WP_MAXCAPTION = 5,
+	WP_SMALLMAXCAPTION = 6,
+	WP_FRAMELEFT = 7,
+	WP_FRAMERIGHT = 8,
+	WP_FRAMEBOTTOM = 9,
+	WP_SMALLFRAMELEFT = 10,
+	WP_SMALLFRAMERIGHT = 11,
+	WP_SMALLFRAMEBOTTOM = 12,
+	WP_SYSBUTTON = 13,
+	WP_MDISYSBUTTON = 14,
+	WP_MINBUTTON = 15,
+	WP_MDIMINBUTTON = 16,
+	WP_MAXBUTTON = 17,
+	WP_CLOSEBUTTON = 18,
+	WP_SMALLCLOSEBUTTON = 19,
+	WP_MDICLOSEBUTTON = 20,
+	WP_RESTOREBUTTON = 21,
+	WP_MDIRESTOREBUTTON = 22,
+	WP_HELPBUTTON = 23,
+	WP_MDIHELPBUTTON = 24,
+	WP_HORZSCROLL = 25,
+	WP_HORZTHUMB = 26,
+	WP_VERTSCROLL = 27,
+	WP_VERTTHUMB = 28,
+	WP_DIALOG = 29,
+	WP_CAPTIONSIZINGTEMPLATE = 30,
+	WP_SMALLCAPTIONSIZINGTEMPLATE = 31,
+	WP_FRAMELEFTSIZINGTEMPLATE = 32,
+	WP_SMALLFRAMELEFTSIZINGTEMPLATE = 33,
+	WP_FRAMERIGHTSIZINGTEMPLATE = 34,
+	WP_SMALLFRAMERIGHTSIZINGTEMPLATE = 35,
+	WP_FRAMEBOTTOMSIZINGTEMPLATE = 36,
+	WP_SMALLFRAMEBOTTOMSIZINGTEMPLATE = 37
+};
+enum {
+	CS_ACTIVE = 1,
+	CS_INACTIVE = 2,
+	CS_DISABLED = 3
+};
+enum {
+	CBS_NORMAL = 1,
+	CBS_HOT = 2,
+	CBS_PUSHED = 3,
+	CBS_DISABLED = 4
+};
+enum {
+	FS_ACTIVE = 1,
+	FS_INACTIVE = 2
+};
+enum {
+	HBS_NORMAL = 1,
+	HBS_HOT = 2,
+	HBS_PUSHED = 3,
+	HBS_DISABLED = 4
+};
+enum {
+	HSS_NORMAL = 1,
+	HSS_HOT = 2,
+	HSS_PUSHED = 3,
+	HSS_DISABLED = 4
+};
+enum {
+	HTS_NORMAL = 1,
+	HTS_HOT = 2,
+	HTS_PUSHED = 3,
+	HTS_DISABLED = 4
+};
+enum {
+	MAXBS_NORMAL = 1,
+	MAXBS_HOT = 2,
+	MAXBS_PUSHED = 3,
+	MAXBS_DISABLED = 4
+};
+enum {
+	MXCS_ACTIVE = 1,
+	MXCS_INACTIVE = 2,
+	MXCS_DISABLED = 3
+};
+enum {
+	MINBS_NORMAL = 1,
+	MINBS_HOT = 2,
+	MINBS_PUSHED = 3,
+	MINBS_DISABLED = 4
+};
+enum {
+	RBS_NORMAL = 1,
+	RBS_HOT = 2,
+	RBS_PUSHED = 3,
+	RBS_DISABLED = 4
+};
+enum {
+	SBS_NORMAL = 1,
+	SBS_HOT = 2,
+	SBS_PUSHED = 3,
+	SBS_DISABLED = 4
+};
+enum {
+	MNCS_ACTIVE = 1,
+	MNCS_INACTIVE = 2,
+	MNCS_DISABLED = 3
+};
+enum {
+	VSS_NORMAL = 1,
+	VSS_HOT = 2,
+	VSS_PUSHED = 3,
+	VSS_DISABLED = 4
+};
+enum {
+	VTS_NORMAL = 1,
+	VTS_HOT = 2,
+	VTS_PUSHED = 3,
+	VTS_DISABLED = 4
+};
+
+#endif
diff --git a/winsup/w32api/lib/dhcpcsvc.def b/winsup/w32api/lib/dhcpcsvc.def
index a1cd3b984..84023c7a0 100644
--- a/winsup/w32api/lib/dhcpcsvc.def
+++ b/winsup/w32api/lib/dhcpcsvc.def
@@ -1,8 +1,8 @@
-LIBRARY DHCPCSVC.DLL

-EXPORTS

-DhcpCApiCleanup@0

-DhcpCApiInitialize@4

-DhcpDeRegisterParamChange@12

-DhcpRegisterParamChange@28

-DhcpRemoveDNSRegistrations@0

-DhcpUndoRequestParams@16

+LIBRARY DHCPCSVC.DLL
+EXPORTS
+DhcpCApiCleanup@0
+DhcpCApiInitialize@4
+DhcpDeRegisterParamChange@12
+DhcpRegisterParamChange@28
+DhcpRemoveDNSRegistrations@0
+DhcpUndoRequestParams@16
diff --git a/winsup/w32api/lib/wldap32.def b/winsup/w32api/lib/wldap32.def
index 3c8889d54..8f3f90dc0 100644
--- a/winsup/w32api/lib/wldap32.def
+++ b/winsup/w32api/lib/wldap32.def
@@ -1,257 +1,257 @@
-;

-;	wldap32.def - Import definition file for the Windows LDAP API

-; 

-;	Written by Filip Navara <xnavara@volny.cz>

-;

-;	This library is distributed in the hope that it will be useful,

-;	but WITHOUT ANY WARRANTY; without even the implied warranty of

-;	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-;

-

-LIBRARY wldap32.dll

-EXPORTS

-  ldap_abandon

-  ldap_add

-  ldap_get_optionW

-  ldap_unbind

-  ldap_set_optionW

-  LdapGetLastError

-  cldap_open

-  LdapMapErrorToWin32

-  ldap_compare

-  ldap_delete

-  ldap_result2error

-  ldap_err2string

-  ldap_modify

-  ldap_modrdn

-  ldap_open

-  ldap_first_entry

-  ldap_next_entry

-  cldap_openW

-  LdapUTF8ToUnicode

-  ldap_get_dn

-  ldap_dn2ufn

-  ldap_first_attribute

-  ldap_next_attribute

-  ldap_get_values

-  ldap_get_values_len

-  ldap_count_entries

-  ldap_count_values

-  ldap_value_free

-  ldap_explode_dn

-  ldap_result

-  ldap_msgfree

-  ldap_addW

-  ldap_search

-  ldap_add_s

-  ldap_bind_s

-  ldap_unbind_s

-  ldap_delete_s

-  ldap_modify_s

-  ldap_modrdn_s

-  ldap_search_s

-  ldap_search_st

-  ldap_compare_s

-  LdapUnicodeToUTF8

-  ber_bvfree

-  cldap_openA

-  ldap_addA

-  ldap_add_ext

-  ldap_add_extA

-  ldap_simple_bind

-  ldap_simple_bind_s

-  ldap_bind

-  ldap_add_extW

-  ldap_add_ext_s

-  ldap_add_ext_sA

-  ldap_add_ext_sW

-  ldap_add_sA

-  ldap_modrdn2

-  ldap_modrdn2_s

-  ldap_add_sW

-  ldap_bindA

-  ldap_bindW

-  ldap_bind_sA

-  ldap_bind_sW

-  ldap_close_extended_op

-  ldap_compareA

-  ldap_compareW

-  ldap_count_values_len

-  ldap_compare_ext

-  ldap_value_free_len

-  ldap_compare_extA

-  ldap_compare_extW

-  ldap_perror

-  ldap_compare_ext_s

-  ldap_compare_ext_sA

-  ldap_compare_ext_sW

-  ldap_compare_sA

-  ldap_compare_sW

-  ldap_connect

-  ldap_control_free

-  ldap_control_freeA

-  ldap_control_freeW

-  ldap_controls_free

-  ldap_controls_freeA

-  ldap_controls_freeW

-  ldap_count_references

-  ldap_count_valuesA

-  ldap_count_valuesW

-  ldap_create_page_control

-  ldap_create_page_controlA

-  ldap_create_page_controlW

-  ldap_create_sort_control

-  ldap_create_sort_controlA

-  ldap_create_sort_controlW

-  ldap_deleteA

-  ldap_deleteW

-  ldap_delete_ext

-  ldap_delete_extA

-  ldap_delete_extW

-  ldap_delete_ext_s

-  ldap_delete_ext_sA

-  ldap_delete_ext_sW

-  ldap_delete_sA

-  ldap_delete_sW

-  ldap_dn2ufnW

-  ldap_encode_sort_controlA

-  ldap_encode_sort_controlW

-  ldap_err2stringA

-  ldap_err2stringW

-  ldap_escape_filter_elementA

-  ldap_escape_filter_elementW

-  ldap_explode_dnA

-  ldap_explode_dnW

-  ldap_extended_operation

-  ldap_extended_operationA

-  ldap_extended_operationW

-  ldap_first_attributeA

-  ldap_first_attributeW

-  ldap_first_reference

-  ldap_free_controls

-  ldap_free_controlsA

-  ldap_free_controlsW

-  ldap_get_dnA

-  ldap_get_dnW

-  ldap_get_next_page

-  ldap_get_next_page_s

-  ldap_get_option

-  ldap_get_optionA

-  ldap_get_paged_count

-  ldap_get_valuesA

-  ldap_get_valuesW

-  ldap_get_values_lenA

-  ldap_get_values_lenW

-  ldap_init

-  ldap_initA

-  ldap_initW

-  ldap_memfreeA

-  ldap_memfreeW

-  ldap_modifyA

-  ldap_modifyW

-  ldap_modify_ext

-  ldap_modify_extA

-  ldap_modify_extW

-  ldap_modify_ext_s

-  ldap_modify_ext_sA

-  ldap_modify_ext_sW

-  ldap_modify_sA

-  ldap_modify_sW

-  ldap_modrdn2A

-  ldap_modrdn2W

-  ldap_modrdn2_sA

-  ldap_modrdn2_sW

-  ldap_modrdnA

-  ldap_modrdnW

-  ldap_modrdn_sA

-  ldap_modrdn_sW

-  ldap_next_attributeA

-  ldap_next_attributeW

-  ldap_next_reference

-  ldap_openA

-  ldap_openW

-  ldap_parse_page_control

-  ldap_parse_page_controlA

-  ldap_parse_page_controlW

-  ldap_parse_reference

-  ldap_parse_referenceA

-  ldap_parse_referenceW

-  ldap_parse_result

-  ldap_parse_resultA

-  ldap_parse_resultW

-  ldap_parse_sort_control

-  ldap_parse_sort_controlA

-  ldap_parse_sort_controlW

-  ldap_rename_ext

-  ldap_rename_extA

-  ldap_rename_extW

-  ldap_rename_ext_s

-  ldap_rename_ext_sA

-  ldap_rename_ext_sW

-  ldap_searchA

-  ldap_searchW

-  ldap_search_abandon_page

-  ldap_search_ext

-  ldap_search_extA

-  ldap_search_extW

-  ldap_search_ext_s

-  ldap_search_ext_sA

-  ldap_escape_filter_element

-  ldap_set_dbg_flags

-  ldap_set_dbg_routine

-  ldap_memfree

-  ldap_startup

-  ldap_cleanup

-  ldap_search_ext_sW

-  ldap_search_init_page

-  ldap_search_init_pageA

-  ldap_search_init_pageW

-  ldap_search_sA

-  ldap_search_sW

-  ldap_search_stA

-  ldap_search_stW

-  ldap_set_option

-  ldap_set_optionA

-  ldap_simple_bindA

-  ldap_simple_bindW

-  ldap_simple_bind_sA

-  ldap_simple_bind_sW

-  ldap_sslinit

-  ldap_sslinitA

-  ldap_sslinitW

-  ldap_ufn2dn

-  ldap_ufn2dnA

-  ldap_ufn2dnW

-  ldap_value_freeA

-  ldap_value_freeW

-  ldap_check_filterA

-  ldap_check_filterW

-  ldap_dn2ufnA

-  ber_init

-  ber_free

-  ber_bvecfree

-  ber_bvdup

-  ber_alloc_t

-  ber_skip_tag

-  ber_peek_tag

-  ber_first_element

-  ber_next_element

-  ber_flatten

-  ber_printf

-  ber_scanf

-  ldap_conn_from_msg

-  ldap_sasl_bindW

-  ldap_sasl_bind_sW

-  ldap_sasl_bindA

-  ldap_sasl_bind_sA

-  ldap_parse_extended_resultW

-  ldap_parse_extended_resultA

-  ldap_create_vlv_controlW

-  ldap_create_vlv_controlA

-  ldap_parse_vlv_controlW

-  ldap_parse_vlv_controlA

-  ldap_start_tls_sW

-  ldap_start_tls_sA

-  ldap_stop_tls_s

-  ldap_extended_operation_sW

-  ldap_extended_operation_sA

+;
+;	wldap32.def - Import definition file for the Windows LDAP API
+; 
+;	Written by Filip Navara <xnavara@volny.cz>
+;
+;	This library is distributed in the hope that it will be useful,
+;	but WITHOUT ANY WARRANTY; without even the implied warranty of
+;	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+;
+
+LIBRARY wldap32.dll
+EXPORTS
+  ldap_abandon
+  ldap_add
+  ldap_get_optionW
+  ldap_unbind
+  ldap_set_optionW
+  LdapGetLastError
+  cldap_open
+  LdapMapErrorToWin32
+  ldap_compare
+  ldap_delete
+  ldap_result2error
+  ldap_err2string
+  ldap_modify
+  ldap_modrdn
+  ldap_open
+  ldap_first_entry
+  ldap_next_entry
+  cldap_openW
+  LdapUTF8ToUnicode
+  ldap_get_dn
+  ldap_dn2ufn
+  ldap_first_attribute
+  ldap_next_attribute
+  ldap_get_values
+  ldap_get_values_len
+  ldap_count_entries
+  ldap_count_values
+  ldap_value_free
+  ldap_explode_dn
+  ldap_result
+  ldap_msgfree
+  ldap_addW
+  ldap_search
+  ldap_add_s
+  ldap_bind_s
+  ldap_unbind_s
+  ldap_delete_s
+  ldap_modify_s
+  ldap_modrdn_s
+  ldap_search_s
+  ldap_search_st
+  ldap_compare_s
+  LdapUnicodeToUTF8
+  ber_bvfree
+  cldap_openA
+  ldap_addA
+  ldap_add_ext
+  ldap_add_extA
+  ldap_simple_bind
+  ldap_simple_bind_s
+  ldap_bind
+  ldap_add_extW
+  ldap_add_ext_s
+  ldap_add_ext_sA
+  ldap_add_ext_sW
+  ldap_add_sA
+  ldap_modrdn2
+  ldap_modrdn2_s
+  ldap_add_sW
+  ldap_bindA
+  ldap_bindW
+  ldap_bind_sA
+  ldap_bind_sW
+  ldap_close_extended_op
+  ldap_compareA
+  ldap_compareW
+  ldap_count_values_len
+  ldap_compare_ext
+  ldap_value_free_len
+  ldap_compare_extA
+  ldap_compare_extW
+  ldap_perror
+  ldap_compare_ext_s
+  ldap_compare_ext_sA
+  ldap_compare_ext_sW
+  ldap_compare_sA
+  ldap_compare_sW
+  ldap_connect
+  ldap_control_free
+  ldap_control_freeA
+  ldap_control_freeW
+  ldap_controls_free
+  ldap_controls_freeA
+  ldap_controls_freeW
+  ldap_count_references
+  ldap_count_valuesA
+  ldap_count_valuesW
+  ldap_create_page_control
+  ldap_create_page_controlA
+  ldap_create_page_controlW
+  ldap_create_sort_control
+  ldap_create_sort_controlA
+  ldap_create_sort_controlW
+  ldap_deleteA
+  ldap_deleteW
+  ldap_delete_ext
+  ldap_delete_extA
+  ldap_delete_extW
+  ldap_delete_ext_s
+  ldap_delete_ext_sA
+  ldap_delete_ext_sW
+  ldap_delete_sA
+  ldap_delete_sW
+  ldap_dn2ufnW
+  ldap_encode_sort_controlA
+  ldap_encode_sort_controlW
+  ldap_err2stringA
+  ldap_err2stringW
+  ldap_escape_filter_elementA
+  ldap_escape_filter_elementW
+  ldap_explode_dnA
+  ldap_explode_dnW
+  ldap_extended_operation
+  ldap_extended_operationA
+  ldap_extended_operationW
+  ldap_first_attributeA
+  ldap_first_attributeW
+  ldap_first_reference
+  ldap_free_controls
+  ldap_free_controlsA
+  ldap_free_controlsW
+  ldap_get_dnA
+  ldap_get_dnW
+  ldap_get_next_page
+  ldap_get_next_page_s
+  ldap_get_option
+  ldap_get_optionA
+  ldap_get_paged_count
+  ldap_get_valuesA
+  ldap_get_valuesW
+  ldap_get_values_lenA
+  ldap_get_values_lenW
+  ldap_init
+  ldap_initA
+  ldap_initW
+  ldap_memfreeA
+  ldap_memfreeW
+  ldap_modifyA
+  ldap_modifyW
+  ldap_modify_ext
+  ldap_modify_extA
+  ldap_modify_extW
+  ldap_modify_ext_s
+  ldap_modify_ext_sA
+  ldap_modify_ext_sW
+  ldap_modify_sA
+  ldap_modify_sW
+  ldap_modrdn2A
+  ldap_modrdn2W
+  ldap_modrdn2_sA
+  ldap_modrdn2_sW
+  ldap_modrdnA
+  ldap_modrdnW
+  ldap_modrdn_sA
+  ldap_modrdn_sW
+  ldap_next_attributeA
+  ldap_next_attributeW
+  ldap_next_reference
+  ldap_openA
+  ldap_openW
+  ldap_parse_page_control
+  ldap_parse_page_controlA
+  ldap_parse_page_controlW
+  ldap_parse_reference
+  ldap_parse_referenceA
+  ldap_parse_referenceW
+  ldap_parse_result
+  ldap_parse_resultA
+  ldap_parse_resultW
+  ldap_parse_sort_control
+  ldap_parse_sort_controlA
+  ldap_parse_sort_controlW
+  ldap_rename_ext
+  ldap_rename_extA
+  ldap_rename_extW
+  ldap_rename_ext_s
+  ldap_rename_ext_sA
+  ldap_rename_ext_sW
+  ldap_searchA
+  ldap_searchW
+  ldap_search_abandon_page
+  ldap_search_ext
+  ldap_search_extA
+  ldap_search_extW
+  ldap_search_ext_s
+  ldap_search_ext_sA
+  ldap_escape_filter_element
+  ldap_set_dbg_flags
+  ldap_set_dbg_routine
+  ldap_memfree
+  ldap_startup
+  ldap_cleanup
+  ldap_search_ext_sW
+  ldap_search_init_page
+  ldap_search_init_pageA
+  ldap_search_init_pageW
+  ldap_search_sA
+  ldap_search_sW
+  ldap_search_stA
+  ldap_search_stW
+  ldap_set_option
+  ldap_set_optionA
+  ldap_simple_bindA
+  ldap_simple_bindW
+  ldap_simple_bind_sA
+  ldap_simple_bind_sW
+  ldap_sslinit
+  ldap_sslinitA
+  ldap_sslinitW
+  ldap_ufn2dn
+  ldap_ufn2dnA
+  ldap_ufn2dnW
+  ldap_value_freeA
+  ldap_value_freeW
+  ldap_check_filterA
+  ldap_check_filterW
+  ldap_dn2ufnA
+  ber_init
+  ber_free
+  ber_bvecfree
+  ber_bvdup
+  ber_alloc_t
+  ber_skip_tag
+  ber_peek_tag
+  ber_first_element
+  ber_next_element
+  ber_flatten
+  ber_printf
+  ber_scanf
+  ldap_conn_from_msg
+  ldap_sasl_bindW
+  ldap_sasl_bind_sW
+  ldap_sasl_bindA
+  ldap_sasl_bind_sA
+  ldap_parse_extended_resultW
+  ldap_parse_extended_resultA
+  ldap_create_vlv_controlW
+  ldap_create_vlv_controlA
+  ldap_parse_vlv_controlW
+  ldap_parse_vlv_controlA
+  ldap_start_tls_sW
+  ldap_start_tls_sA
+  ldap_stop_tls_s
+  ldap_extended_operation_sW
+  ldap_extended_operation_sA