Changeset 58177 in vbox

Timestamp:

Oct 12, 2015 11:19:10 AM (9 years ago)

Author:

vboxsync

Message:

iprt/cdefs.h,VBoxGuestR3LibAdditions.cpp: Added RT_LSTR for prefixing defined string constants with 'L'.

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp (modified) (2 diffs)

trunk/include/iprt/cdefs.h

@@ -1417 +1417 @@
 /** @def RT_XSTR
  * Returns the expanded argument as a string.
- * @param   str     Argument to expand and stringy. */
+ * @param   str     Argument to expand and stringify. */
 #define RT_XSTR(str)            RT_STR(str)
+
+/** @def RT_LSTR_2
+ * Helper for RT_WSTR that gets the expanded @a str.
+ * @param   str     String litteral to prefix with 'L'.  */
+#define RT_LSTR_2(str)          L##str
+/** @def RT_LSTR
+ * Returns the expanded argument with a L string prefix.
+ *
+ * Intended for converting ASCII string \#defines into wide char string
+ * litterals on Windows.
+ *
+ * @param   str     String litteral to . */
+#define RT_LSTR(str)            RT_LSTR_2(str)
 
 /** @def RT_CONCAT

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibAdditions.cpp

@@ -40 +40 @@
 #ifdef RT_OS_WINDOWS
 
-# define WIDE_STR_2(a) L##a
-# define WIDE_STR(a) WIDE_STR_2(a)
-
 /**
  * Opens the "VirtualBox Guest Additions" registry key.
@@ -58 +55 @@
     static PCRTUTF16 s_apwszKeys[] =
     {
-        L"SOFTWARE\\" WIDE_STR(VBOX_VENDOR_SHORT) L"\\VirtualBox Guest Additions",
+        L"SOFTWARE\\" RT_LSTR(VBOX_VENDOR_SHORT) L"\\VirtualBox Guest Additions",
 #ifdef RT_ARCH_AMD64
-        L"SOFTWARE\\Wow6432Node\\" WIDE_STR(VBOX_VENDOR_SHORT) L"\\VirtualBox Guest Additions",
+        L"SOFTWARE\\Wow6432Node\\" RT_LSTR(VBOX_VENDOR_SHORT) L"\\VirtualBox Guest Additions",
 #endif
         L"SOFTWARE\\Sun\\VirtualBox Guest Additions",