diff options
| -rw-r--r-- | winsup/w32api/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/w32api/include/regstr.h | 2 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 1931fc4a4..62b384ca3 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,10 @@ +2001-06-11 Danny Smith <dannysmith@users.sourceforge.net> + + * include/shlobj.h (REGSTR_PATH_EXPLORER): Unicode it. + (REGSTR_PATH_SPECIAL_FOLDERS): Ditto. + * include/regstr.h (REGSTR_PATH_EXPLORER): Add #ifndef guard. + 2001-06-11 Mattia Barbon <mbarbon@dsi.unive.it> * include/shlobj.h (struct _browseinfo): UNICODE it. diff --git a/winsup/w32api/include/regstr.h b/winsup/w32api/include/regstr.h index bec0a97a1..6a34ffb62 100644 --- a/winsup/w32api/include/regstr.h +++ b/winsup/w32api/include/regstr.h @@ -28,7 +28,9 @@ extern "C" { #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") +#ifndef REGSTR_PATH_EXPLORER /* also in shlobj.h */ #define REGSTR_PATH_EXPLORER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer") +#endif #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") diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index 165883df6..a6a62ba85 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -106,9 +106,9 @@ extern "C" { #define SHDID_NET_RESTOFNET 16 #define SHDID_NET_OTHER 17 #ifndef REGSTR_PATH_EXPLORER -#define REGSTR_PATH_EXPLORER "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" +#define REGSTR_PATH_EXPLORER TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer") #endif -#define REGSTR_PATH_SPECIAL_FOLDERS REGSTR_PATH_EXPLORER "\\Shell Folders" +#define REGSTR_PATH_SPECIAL_FOLDERS REGSTR_PATH_EXPLORER TEXT("\\Shell Folders") #define CSIDL_DESKTOP 0 #define CSIDL_PROGRAMS 2 #define CSIDL_CONTROLS 3 |