Patch: Correct definition of CFSTR_FILENAME

2003-09-30  Martin Fuchs  <[email protected]>

	* include/shlobj.h (CFSTR_FILENAME, CFSTR_FILEDESCRIPTOR,
	CFSTR_FILENAMEMAP, CFSTR_SHELLURL):
	Correct UNICODE definitions

See Documentation at: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/shell_basics/shell_basics_programming/transferring/clipboard.asp

Index: include/shlobj.h
===================================================================
RCS file: /cvs/src/src/winsup/w32api/include/shlobj.h,v
retrieving revision 1.26
diff -u -p -d -r1.26 shlobj.h
--- include/shlobj.h	25 Aug 2003 02:02:37 -0000	1.26
+++ include/shlobj.h	29 Sep 2003 22:11:43 -0000
@@ -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


-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf