* include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines.

	(BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 43ace8fe6f598c5934708d918db4d763abe2e44f..20c8f27c7abed668e362a25dd020ded2e42cc8ee 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines.
+       (BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them.
+
 2002-07-25  Mattia Barbon  <mbarbon@dsi.unive.it>
 
        * include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST.

diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h
index 70264ab297dc88d31d3e4f1505c94cce6f155a27..4793a9efa75f1370e2a36d7e69155ce5c4f198b6 100644 (file)
--- a/winsup/w32api/include/shlobj.h
+++ b/winsup/w32api/include/shlobj.h
@@ -29,9 +29,22 @@ extern "C" {
 #define BIF_SHAREABLE 0x8000
 #define BFFM_INITIALIZED 1
 #define BFFM_SELCHANGED 2
-#define BFFM_SETSTATUSTEXT (WM_USER + 100)
+#define BFFM_VALIDATEFAILEDA 3
+#define BFFM_VALIDATEFAILEDW 4
+#define BFFM_SETSTATUSTEXTA (WM_USER + 100)
+#define BFFM_SETSTATUSTEXTW (WM_USER + 104)
 #define BFFM_ENABLEOK (WM_USER + 101)
-#define BFFM_SETSELECTION (WM_USER + 102)
+#define BFFM_SETSELECTIONA (WM_USER + 102)
+#define BFFM_SETSELECTIONW (WM_USER + 103)
+#ifdef UNICODE
+#define BFFM_SETSTATUSTEXT  BFFM_SETSTATUSTEXTW
+#define BFFM_SETSELECTION   BFFM_SETSELECTIONW
+#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDW
+#else
+#define BFFM_SETSTATUSTEXT  BFFM_SETSTATUSTEXTA
+#define BFFM_SETSELECTION   BFFM_SETSELECTIONA
+#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA
+#endif
 #define DVASPECT_SHORTNAME 2
 #define SHARD_PIDL     1
 #define SHARD_PATH     2