24.0524.05

1 files changed, 94 insertions, 10 deletions

diff --git a/CPP/Windows/PropVariantConv.cpp b/CPP/Windows/PropVariantConv.cpp
index 5fb96a7..21a7b4e 100644
--- a/CPP/Windows/PropVariantConv.cpp
+++ b/CPP/Windows/PropVariantConv.cpp
@@ -9,12 +9,45 @@
 
 #define UINT_TO_STR_2(c, val) { s[0] = (c); s[1] = (char)('0' + (val) / 10); s[2] = (char)('0' + (val) % 10); s += 3; }
 
-bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, int level) throw()
+static const unsigned k_TimeStringBufferSize = 64;
+
+bool g_Timestamp_Show_UTC;
+#if 0
+bool g_Timestamp_Show_DisableZ;
+bool g_Timestamp_Show_TDelimeter;
+bool g_Timestamp_Show_ZoneOffset;
+#endif
+
+Z7_NO_INLINE
+bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, int level, unsigned flags) throw()
 {
   *s = 0;
   FILETIME ft;
-  if (!FileTimeToLocalFileTime(&utc, &ft))
-    return false;
+
+#if 0
+  Int64 bias64 = 0;
+#endif
+
+  const bool show_utc =
+      (flags & kTimestampPrintFlags_Force_UTC) ? true :
+      (flags & kTimestampPrintFlags_Force_LOCAL) ? false :
+      g_Timestamp_Show_UTC;
+
+  if (show_utc)
+    ft = utc;
+  else
+  {
+    if (!FileTimeToLocalFileTime(&utc, &ft))
+      return false;
+#if 0
+    if (g_Timestamp_Show_ZoneOffset)
+    {
+      const UInt64 utc64 = (((UInt64)utc.dwHighDateTime) << 32) + utc.dwLowDateTime;
+      const UInt64 loc64 = (((UInt64) ft.dwHighDateTime) << 32) +  ft.dwLowDateTime;
+      bias64 = (Int64)utc64 - (Int64)loc64;
+    }
+#endif
+  }
 
   SYSTEMTIME st;
   if (!BOOLToBool(FileTimeToSystemTime(&ft, &st)))
@@ -41,7 +74,12 @@ bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, i
   
   if (level > kTimestampPrintLevel_DAY)
   {
-    UINT_TO_STR_2(' ', st.wHour)
+    const char setChar =
+#if 0
+      g_Timestamp_Show_TDelimeter ? 'T' : // ISO 8601
+#endif
+      ' ';
+    UINT_TO_STR_2(setChar, st.wHour)
     UINT_TO_STR_2(':', st.wMinute)
     
     if (level >= kTimestampPrintLevel_SEC)
@@ -84,6 +122,52 @@ bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, i
     }
   }
   
+  if (show_utc)
+  {
+    if ((flags & kTimestampPrintFlags_DisableZ) == 0
+#if 0
+      && !g_Timestamp_Show_DisableZ
+#endif
+      )
+      *s++ = 'Z';
+  }
+#if 0
+  else if (g_Timestamp_Show_ZoneOffset)
+  {
+#if 1
+    {
+      char c;
+      if (bias64 < 0)
+      {
+        bias64 = -bias64;
+        c = '+';
+      }
+      else
+        c = '-';
+      UInt32 bias = (UInt32)((UInt64)bias64 / (10000000 * 60));
+#else
+    TIME_ZONE_INFORMATION zi;
+    const DWORD dw = GetTimeZoneInformation(&zi);
+    if (dw <= TIME_ZONE_ID_DAYLIGHT) // == 2
+    {
+      // UTC = LOCAL + Bias
+      Int32 bias = zi.Bias;
+      char c;
+      if (bias < 0)
+      {
+        bias = -bias;
+        c = '+';
+      }
+      else
+        c = '-';
+#endif
+      const UInt32 hours = (UInt32)bias / 60;
+      const UInt32 mins = (UInt32)bias % 60;
+      UINT_TO_STR_2(c, hours)
+      UINT_TO_STR_2(':', mins)
+    }
+  }
+#endif
   *s = 0;
   return true;
 }
@@ -96,11 +180,11 @@ bool ConvertUtcFileTimeToString(const FILETIME &utc, char *s, int level) throw()
 
 bool ConvertUtcFileTimeToString2(const FILETIME &ft, unsigned ns100, wchar_t *dest, int level) throw()
 {
-  char s[32];
-  bool res = ConvertUtcFileTimeToString2(ft, ns100, s, level);
+  char s[k_TimeStringBufferSize];
+  const bool res = ConvertUtcFileTimeToString2(ft, ns100, s, level);
   for (unsigned i = 0;; i++)
   {
-    Byte c = (Byte)s[i];
+    const Byte c = (Byte)s[i];
     dest[i] = c;
     if (c == 0)
       break;
@@ -110,11 +194,11 @@ bool ConvertUtcFileTimeToString2(const FILETIME &ft, unsigned ns100, wchar_t *de
 
 bool ConvertUtcFileTimeToString(const FILETIME &ft, wchar_t *dest, int level) throw()
 {
-  char s[32];
-  bool res = ConvertUtcFileTimeToString(ft, s, level);
+  char s[k_TimeStringBufferSize];
+  const bool res = ConvertUtcFileTimeToString(ft, s, level);
   for (unsigned i = 0;; i++)
   {
-    Byte c = (Byte)s[i];
+    const Byte c = (Byte)s[i];
     dest[i] = c;
     if (c == 0)
       break;