Fix <rdar://5547784> ProgIDMacros.h should explicitly use wide strings

         Reviewed by Adele.

         * ProgIDMacros.h: Always use wide strings instead of relying on the
         TEXT macro.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26755 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ccd35950aa623e8b6b0232fdb84da484f0602cc7..27c59784c537bf2bd9b57d9cf2a7b77f86d3910a 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-18  Adam Roben  <aroben@apple.com>
+
+        Fix <rdar://5547784> ProgIDMacros.h should explicitly use wide strings
+
+        Reviewed by Adele.
+
+        * ProgIDMacros.h: Always use wide strings instead of relying on the
+        TEXT macro.
+
 2007-10-17  Adam Roben  <aroben@apple.com>
 
         Fix for clean builds needed after r26683

diff --git a/WebKit/win/ProgIDMacros.h b/WebKit/win/ProgIDMacros.h
index db42ba8dff5f2915c2d2f92af2c98877fc88f40b..48da34495cced752e2dd29d049d798bb1a87e234 100644 (file)
--- a/WebKit/win/ProgIDMacros.h
+++ b/WebKit/win/ProgIDMacros.h
@@ -27,11 +27,11 @@
 #define ProgIDMacros_h
 
 #define STRINGIFIED_VERSION(version) STRINGIFY(version)
-#define STRINGIFY(s) TEXT(#s)
+#define STRINGIFY(s) L###s
 
 #define CURRENT_PROGID_VERSION 523
-#define VERSION_INDEPENDENT_PRODUCTION_PROGID(className) TEXT("WebKit.") TEXT(#className)
-#define VERSION_INDEPENDENT_OPENSOURCE_PROGID(className) TEXT("OpenSource") VERSION_INDEPENDENT_PRODUCTION_PROGID(className)
-#define VERSIONED_PROGID(versionIndependentProgID, version) versionIndependentProgID TEXT(".") STRINGIFIED_VERSION(version)
+#define VERSION_INDEPENDENT_PRODUCTION_PROGID(className) L##"WebKit." L###className
+#define VERSION_INDEPENDENT_OPENSOURCE_PROGID(className) L##"OpenSource" VERSION_INDEPENDENT_PRODUCTION_PROGID(className)
+#define VERSIONED_PROGID(versionIndependentProgID, version) versionIndependentProgID L##"." STRINGIFIED_VERSION(version)
 
 #endif // !defined(ProgIDMacros_h)