From ce141a7f26bb47f60b984ffac55f7af3064b7edc Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Sat, 11 Jul 2015 22:37:43 -0700
Subject: [PATCH] Some fixes for Visual C++

---
 Sources/Plasma/CoreLib/HeadSpin.cpp       | 13 ++++----
 Sources/Tests/CoreTests/test_plFormat.cpp | 36 +++++++++++++++--------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/Sources/Plasma/CoreLib/HeadSpin.cpp b/Sources/Plasma/CoreLib/HeadSpin.cpp
index bbb46fb6..4fe5c943 100644
--- a/Sources/Plasma/CoreLib/HeadSpin.cpp
+++ b/Sources/Plasma/CoreLib/HeadSpin.cpp
@@ -139,8 +139,10 @@ void ErrorAssert(int line, const char* file, const char* fmt, ...)
     } else
 #endif // _MSC_VER
     {
-        char str[] = "-------\nASSERTION FAILED:\nFile: %s   Line: %i\nMessage: %s\n-------";
-        DebugMsg(str, file, line, msg);
+        DebugMsg("-------\nASSERTION FAILED:\nFile: %s   Line: %i\nMessage: %s\n-------",
+                 file, line, msg);
+        fflush(stderr);
+
         DebugBreakAlways();
     }
 #endif // HS_DEBUGGING
@@ -214,17 +216,16 @@ void DebugMsg(const char* fmt, ...)
     va_list args;
     va_start(args, fmt);
     vsnprintf(msg, arrsize(msg), fmt, args);
+    fprintf(stderr, "%s\n", msg);
 
 #ifdef _MSC_VER
     if (DebugIsDebuggerPresent())
     {
+        // Also print to the MSVC Output window
         OutputDebugStringA(msg);
         OutputDebugStringA("\n");
-    } else
-#endif
-    {
-        fprintf(stderr, "%s\n", msg);
     }
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/Sources/Tests/CoreTests/test_plFormat.cpp b/Sources/Tests/CoreTests/test_plFormat.cpp
index 8d6830a9..d0d5af1d 100644
--- a/Sources/Tests/CoreTests/test_plFormat.cpp
+++ b/Sources/Tests/CoreTests/test_plFormat.cpp
@@ -15,6 +15,9 @@ TEST(plFormat, Escapes)
 
 TEST(plFormat, Errors)
 {
+    // Ensure these get printed to the console
+    ErrorEnableGui(false);
+
     EXPECT_DEATH(plFormat("{}", 1, 2),
         "Message: Too many actual parameters for format string");
     EXPECT_DEATH(plFormat("{} {}", 1),
@@ -56,10 +59,10 @@ TEST(plFormat, StringClasses)
 {
     // These should be handled just like normal const char* string params
     // (see above), so just need to test that the wrappers are working
-    EXPECT_EQ(plString("xxтəßtxx"), plFormat("xx{}xx", L"тəßt"));
-    EXPECT_EQ(plString("xxтəßtxx"), plFormat("xx{}xx", plString("тəßt")));
+    EXPECT_EQ(plString("xxTESTxx"), plFormat("xx{}xx", L"TEST"));
+    EXPECT_EQ(plString("xxTESTxx"), plFormat("xx{}xx", plString("TEST")));
     EXPECT_EQ(plString("xxTESTxx"), plFormat("xx{}xx", std::string("TEST")));
-    EXPECT_EQ(plString("xxтəßtxx"), plFormat("xx{}xx", std::wstring(L"тəßt")));
+    EXPECT_EQ(plString("xxTESTxx"), plFormat("xx{}xx", std::wstring(L"TEST")));
     EXPECT_EQ(plString("xx/dev/nullxx"), plFormat("xx{}xx", plFileName("/dev/null")));
     EXPECT_EQ(plString(R"(xxC:\Users\Nobodyxx)"),
               plFormat("xx{}xx", plFileName(R"(C:\Users\Nobody)")));
@@ -360,22 +363,29 @@ TEST(plFormat, FloatingPoint)
     EXPECT_EQ(plString("xx16384.00xx"), plFormat("xx{.2f}xx", 16384.0));
     EXPECT_EQ(plString("xx0.01xx"), plFormat("xx{.2f}xx", 1.0 / 128));
 
-    // Scientific notation
-    EXPECT_EQ(plString("xx3.14e+00xx"), plFormat("xx{.2e}xx", 3.14159));
-    EXPECT_EQ(plString("xx3.141590e+00xx"), plFormat("xx{.6e}xx", 3.14159));
-    EXPECT_EQ(plString("xx1.64e+04xx"), plFormat("xx{.2e}xx", 16384.0));
-    EXPECT_EQ(plString("xx7.81e-03xx"), plFormat("xx{.2e}xx", 1.0 / 128));
+    // MSVC uses 3 digits for the exponent, whereas GCC uses two :/
+#ifdef _MSC_VER
+#   define EXTRA_DIGIT "0"
+#else
+#   define EXTRA_DIGIT ""
+#endif
+
+    // Scientific notation (MSVC uses 3 digits for the exponent)
+    EXPECT_EQ(plString("xx3.14e+" EXTRA_DIGIT "00xx"), plFormat("xx{.2e}xx", 3.14159));
+    EXPECT_EQ(plString("xx3.141590e+" EXTRA_DIGIT "00xx"), plFormat("xx{.6e}xx", 3.14159));
+    EXPECT_EQ(plString("xx1.64e+" EXTRA_DIGIT "04xx"), plFormat("xx{.2e}xx", 16384.0));
+    EXPECT_EQ(plString("xx7.81e-" EXTRA_DIGIT "03xx"), plFormat("xx{.2e}xx", 1.0 / 128));
 
     // Scientific notation (upper-case E)
-    EXPECT_EQ(plString("xx3.14E+00xx"), plFormat("xx{.2E}xx", 3.14159));
-    EXPECT_EQ(plString("xx3.141590E+00xx"), plFormat("xx{.6E}xx", 3.14159));
-    EXPECT_EQ(plString("xx1.64E+04xx"), plFormat("xx{.2E}xx", 16384.0));
-    EXPECT_EQ(plString("xx7.81E-03xx"), plFormat("xx{.2E}xx", 1.0 / 128));
+    EXPECT_EQ(plString("xx3.14E+" EXTRA_DIGIT "00xx"), plFormat("xx{.2E}xx", 3.14159));
+    EXPECT_EQ(plString("xx3.141590E+" EXTRA_DIGIT "00xx"), plFormat("xx{.6E}xx", 3.14159));
+    EXPECT_EQ(plString("xx1.64E+" EXTRA_DIGIT "04xx"), plFormat("xx{.2E}xx", 16384.0));
+    EXPECT_EQ(plString("xx7.81E-" EXTRA_DIGIT "03xx"), plFormat("xx{.2E}xx", 1.0 / 128));
 
     // Automatic (based on input)
     EXPECT_EQ(plString("xx3.1xx"), plFormat("xx{.2}xx", 3.14159));
     EXPECT_EQ(plString("xx3.14159xx"), plFormat("xx{.6}xx", 3.14159));
-    EXPECT_EQ(plString("xx1.6e+04xx"), plFormat("xx{.2}xx", 16384.0));
+    EXPECT_EQ(plString("xx1.6e+" EXTRA_DIGIT "04xx"), plFormat("xx{.2}xx", 16384.0));
     EXPECT_EQ(plString("xx0.0078xx"), plFormat("xx{.2}xx", 1.0 / 128));
 }