diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-10-13 00:22:38 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-10-13 00:22:38 +0000 |
| commit | fad2aa1aad53afe6290f17613a5353369b175f08 (patch) | |
| tree | ab4cfb7a972e81969f4ab0e5df0e42046a28b562 | |
| parent | 0c7a57ebc00544d2f0e0aa2d21c96ce2b4277099 (diff) | |
| download | newlib-fad2aa1aad53afe6290f17613a5353369b175f08.zip newlib-fad2aa1aad53afe6290f17613a5353369b175f08.tar.gz newlib-fad2aa1aad53afe6290f17613a5353369b175f08.tar.bz2 | |
2003-10-13 Martin Fuchs <Martin-Fuchs@gmx.net>
* include/shlobj.h (CFSTR_FILENAME, CFSTR_FILEDESCRIPTOR,
CFSTR_FILENAMEMAP, CFSTR_SHELLURL): Correct UNICODE definitions.
| -rw-r--r-- | winsup/w32api/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/w32api/include/shlobj.h | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 728a252..a44f805 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2003-10-13 Martin Fuchs <Martin-Fuchs@gmx.net> + + * include/shlobj.h (CFSTR_FILENAME, CFSTR_FILEDESCRIPTOR, + CFSTR_FILENAMEMAP, CFSTR_SHELLURL): Correct UNICODE definitions. + 2003-10-13 Pierre Humblet <pierre.humblet@ieee.org> * include/winnt.h (SM_REMOTESESSION): Add define. diff --git a/winsup/w32api/include/shlobj.h b/winsup/w32api/include/shlobj.h index c990c47..b37525b 100644 --- a/winsup/w32api/include/shlobj.h +++ b/winsup/w32api/include/shlobj.h @@ -185,16 +185,23 @@ extern "C" { #define CFSTR_SHELLIDLIST TEXT("Shell IDList Array") #define CFSTR_SHELLIDLISTOFFSET TEXT("Shell Object Offsets") #define CFSTR_NETRESOURCES TEXT("Net Resource") -#define CFSTR_FILEDESCRIPTOR TEXT("FileGroupDescriptor") #define CFSTR_FILECONTENTS TEXT("FileContents") -#define CFSTR_FILENAME TEXT("FileName") +#ifdef UNICODE +#define CFSTR_FILENAME L"FileNameW" +#define CFSTR_FILENAMEMAP L"FileNameMapW" +#define CFSTR_FILEDESCRIPTOR L"FileGroupDescriptorW" +#define CFSTR_SHELLURL L"UniformResourceLocatorW" +#else +#define CFSTR_FILENAME "FileName" +#define CFSTR_FILENAMEMAP "FileNameMap" +#define CFSTR_FILEDESCRIPTOR "FileGroupDescriptor" +#define CFSTR_SHELLURL "UniformResourceLocator" +#endif #define CFSTR_PRINTERGROUP TEXT("PrinterFriendlyName") -#define CFSTR_FILENAMEMAP TEXT("FileNameMap") #define CFSTR_INDRAGLOOP TEXT("InShellDragLoop") #define CFSTR_PASTESUCCEEDED TEXT("Paste Succeeded") #define CFSTR_PERFORMEDDROPEFFECT TEXT("Performed DropEffect") #define CFSTR_PREFERREDDROPEFFECT TEXT("Preferred DropEffect") -#define CFSTR_SHELLURL TEXT("UniformResourceLocator") #define CMF_NORMAL 0 #define CMF_DEFAULTONLY 1 #define CMF_VERBSONLY 2 |