write_wim_part(): Distinguish between explicit GUID and retained GUID

[wimlib] / include / wimlib_tchar.h

diff --git a/include/wimlib_tchar.h b/include/wimlib_tchar.h
index 5b92310066b5781291430e25f716b16353349d33..8acaee1e5b6109fc19000a640979ec93a4e10560 100644 (file)
--- a/include/wimlib_tchar.h
+++ b/include/wimlib_tchar.h
@@ -15,12 +15,12 @@ typedef wchar_t tchar;
 #  define T(text) _T(text) /* Make a string literal into a wide string */
 #  define TS "ls" /* Format a string of "tchar" */
 #  define TC "lc" /* Format a "tchar" */
-#  define WS "ls" /* Format a UTF-16LE string (same as above) */
 
 /* For Windows builds, the following definitions replace the "tchar" functions
  * with the "wide-character" functions. */
 #  define tmemchr      wmemchr
 #  define tmemcpy      wmemcpy
+#  define tmemmove     wmemmove
 #  define tmempcpy     wmempcpy
 #  define tstrcpy      wcscpy
 #  define tprintf      wprintf
@@ -53,6 +53,8 @@ typedef wchar_t tchar;
 #  define taccess      _waccess
 #  define tstrdup      wcsdup
 #  define ttempnam      _wtempnam
+#  define tgetenv      _wgetenv
+#  define totlower(c)  towlower((wchar_t)(c))
 /* The following "tchar" functions do not have exact wide-character equivalents
  * on Windows so require parameter rearrangement or redirection to a replacement
  * function defined ourselves. */
@@ -73,15 +75,11 @@ typedef char tchar;
 #  define TS "s"       /* Similarly, a string of "tchar" is printed just as a
                          normal string. */
 #  define TC "c"       /* Print a single character */
-#  define WS "W"       /* UTF-16LE strings must be printed using a special
-                         extension implemented by wimlib itself.  Note that
-                         "ls" will not work here because a string of wide
-                         characters on non-Windows systems is typically not
-                         UTF-16LE. */
 /* For non-Windows builds, replace the "tchar" functions with the regular old
  * string functions. */
 #  define tmemchr      memchr
 #  define tmemcpy      memcpy
+#  define tmemmove     memmove
 #  define tmempcpy     mempcpy
 #  define tstrcpy      strcpy
 #  define tprintf      printf
@@ -114,6 +112,8 @@ typedef char tchar;
 #  define tmkdir       mkdir
 #  define tstrdup      strdup
 #  define ttempnam      tempnam
+#  define tgetenv      getenv
+#  define totlower(c)  tolower((unsigned char)(c))
 #  define TSTRDUP      STRDUP
 #  define tstrerror_r  strerror_r
 #  define trename      rename