diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index dd0a1f89a..7683a7927 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2009-20-10 Chris Sutcliffe + + * include/shlobj.h (SHARD): Add enum. + (SHARD_PATH): Define based on UNICODE. + + Thanks to Jacek Caban for the report. + 2009-14-09 Chris Sutcliffe * include/wingdi.h (_devicemodeW, _devicemodeA): Correct definition. diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 4ef065760..38a496172 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -48,8 +48,21 @@ extern "C" { #define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA #endif #define DVASPECT_SHORTNAME 2 -#define SHARD_PIDL 1 -#define SHARD_PATH 2 +typedef enum tagSHARD { + SHARD_PIDL = 0x00000001, + SHARD_PATHA = 0x00000002, + SHARD_PATHW = 0x00000003, + SHARD_APPIDINFO = 0x00000004, + SHARD_APPIDINFOIDLIST = 0x00000005, + SHARD_LINK = 0x00000006, + SHARD_APPIDINFOLINK = 0x00000007, + SHARD_SHELLITEM = 0x00000008 +} SHARD; +#ifdef UNICODE +#define SHARD_PATH SHARD_PATHW +#else +#define SHARD_PATH SHARD_PATHA +#endif #define SHCNE_RENAMEITEM 1 #define SHCNE_CREATE 2 #define SHCNE_DELETE 4