From 39d2e71d56837a7a4008f8bb6bea0690c04d789f Mon Sep 17 00:00:00 2001 From: dannysmith Date: Wed, 24 Jul 2002 21:57:00 +0000 Subject: [PATCH] * include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines. (BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/shlobj.h | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 43ace8fe6f..20c8f27c7a 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2002-07-25 Danny Smith + + * include/shlobj.h (BFFM_VALIDATEFAILED[AW]): Add defines. + (BFFM_SETSTATUSTEXT, BFFM_SETSELECTION): UNICODE them. + 2002-07-25 Mattia Barbon * include/commctrl.h: Avoid redefinition of CDN_FIRST/LAST. diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 70264ab297..4793a9efa7 100644 --- 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 -- 2.11.0