Changeset 21508 for trunk/include

Timestamp:

Dec 3, 2010, 6:31:43 PM (15 years ago)

Author:

dmik

Message:

Fixed CFSTR_ definitions in UNICODE mode.

File:

• trunk/include/win/shlobj.h (modified) (8 diffs)

trunk/include/win/shlobj.h

@@ -40 +40 @@
 
 /* DATAOBJECT_InitShellIDList*/
-#define CFSTR_SHELLIDLIST       "Shell IDList Array"      /* CF_IDLIST */
+#define CFSTR_SHELLIDLIST       TEXT("Shell IDList Array")     /* CF_IDLIST */
 
 extern UINT cfShellIDList;
@@ -49 +49 @@
 } CIDA, *LPCIDA,*LPIDA;
 
-#define CFSTR_SHELLIDLISTOFFSET "Shell Object Offsets"    /* CF_OBJECTPOSITIONS */
-#define CFSTR_NETRESOURCES      "Net Resource"            /* CF_NETRESOURCE */
+#define CFSTR_SHELLIDLISTOFFSET TEXT("Shell Object Offsets")   /* CF_OBJECTPOSITIONS */
+#define CFSTR_NETRESOURCES      TEXT("Net Resource")           /* CF_NETRESOURCE */
 
 /* DATAOBJECT_InitFileGroupDesc */
-#define CFSTR_FILEDESCRIPTORA   "FileGroupDescriptor"     /* CF_FILEGROUPDESCRIPTORA */
+#define CFSTR_FILEDESCRIPTORA   TEXT("FileGroupDescriptor")    /* CF_FILEGROUPDESCRIPTORA */
 extern UINT cfFileGroupDesc;
 
-#define CFSTR_FILEDESCRIPTORW   "FileGroupDescriptorW"    /* CF_FILEGROUPDESCRIPTORW */
+#define CFSTR_FILEDESCRIPTORW   TEXT("FileGroupDescriptorW")   /* CF_FILEGROUPDESCRIPTORW */
 
 /* DATAOBJECT_InitFileContents*/
-#define CFSTR_FILECONTENTS      "FileContents"            /* CF_FILECONTENTS */
+#define CFSTR_FILECONTENTS      TEXT("FileContents")           /* CF_FILECONTENTS */
 extern UINT cfFileContents;
 
-#define CFSTR_FILENAMEA         "FileName"                /* CF_FILENAMEA */
-#define CFSTR_FILENAMEW         "FileNameW"               /* CF_FILENAMEW */
-#define CFSTR_PRINTERGROUP      "PrinterFriendlyName"     /* CF_PRINTERS */
-#define CFSTR_FILENAMEMAPA      "FileNameMap"             /* CF_FILENAMEMAPA */
-#define CFSTR_FILENAMEMAPW      "FileNameMapW"            /* CF_FILENAMEMAPW */
-#define CFSTR_SHELLURL          "UniformResourceLocator"
-#define CFSTR_PREFERREDDROPEFFECT "Preferred DropEffect"
-#define CFSTR_PERFORMEDDROPEFFECT "Performed DropEffect"
-#define CFSTR_PASTESUCCEEDED    "Paste Succeeded"
-#define CFSTR_INDRAGLOOP        "InShellDragLoop"
+#define CFSTR_FILENAMEA         TEXT("FileName")               /* CF_FILENAMEA */
+#define CFSTR_FILENAMEW         TEXT("FileNameW")              /* CF_FILENAMEW */
+#define CFSTR_PRINTERGROUP      TEXT("PrinterFriendlyName")    /* CF_PRINTERS */
+#define CFSTR_FILENAMEMAPA      TEXT("FileNameMap")            /* CF_FILENAMEMAPA */
+#define CFSTR_FILENAMEMAPW      TEXT("FileNameMapW"            /* CF_FILENAMEMAPW */
+#define CFSTR_SHELLURL          TEXT("UniformResourceLocator")
+#define CFSTR_PREFERREDDROPEFFECT TEXT("Preferred DropEffect")
+#define CFSTR_PERFORMEDDROPEFFECT TEXT("Performed DropEffect")
+#define CFSTR_PASTESUCCEEDED    TEXT("Paste Succeeded")
+#define CFSTR_INDRAGLOOP        TEXT("InShellDragLoop")
 
 
@@ -159 +159 @@
         HKEY hkeyClass;
         DWORD dwHotKey;
-        union 
+        union
         { HANDLE hIcon;
           HANDLE hMonitor;
@@ -226 +226 @@
     LPARAM        lParam;
         INT         iImage;
-} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW; 
+} BROWSEINFOW, *PBROWSEINFOW, *LPBROWSEINFOW;
 
 #define BROWSEINFO   WINELIB_NAME_AW(BROWSEINFO)
@@ -239 +239 @@
 #define BIF_EDITBOX            0x0010
 #define BIF_VALIDATE           0x0020
- 
+
 #define BIF_BROWSEFORCOMPUTER  0x1000
 #define BIF_BROWSEFORPRINTER   0x2000
@@ -269 +269 @@
 #define BFFM_SETSELECTION   BFFM_SETSELECTIONA
 
-#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA 
-#endif 
+#define BFFM_VALIDATEFAILED BFFM_VALIDATEFAILEDA
+#endif
 */
 
@@ -303 +303 @@
 #define SHDID_NET_OTHER             17
 
-typedef struct _SHDESCRIPTIONID 
+typedef struct _SHDESCRIPTIONID
 {   DWORD   dwDescriptionId;
     CLSID   clsid;
@@ -331 +331 @@
 *  are happening to the shellview (and ask for things too).
 *
-*  You don't have to support anything here - anything you don't want to 
+*  You don't have to support anything here - anything you don't want to
 *  handle, the shell will do itself if you just return E_NOTIMPL. This parameters
 *  that the shell passes to this function are entirely undocumented.