From efce279c5cae5add0558fda9f080f544f1eb18d2 Mon Sep 17 00:00:00 2001
From: Dustin Howett <duhowett@microsoft.com>
Date: Thu, 4 Jun 2020 22:09:17 +0000
Subject: [PATCH] Reflect OS build fixes on 7b489128ac back to inbox

Retrieved from https://microsoft.visualstudio.com os OS official/rs_onecore_dep_uxp 677d15a4e298a0e1e3ce093bc1dff8d832e3c2b1

Related work items: #26765368
---
 consolegit2gitfilters.json         | 3 ++-
 src/host/ut_host/VtIoTests.cpp     | 5 ++++-
 src/interactivity/win32/window.cpp | 6 ++++++
 src/renderer/base/renderer.cpp     | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/consolegit2gitfilters.json b/consolegit2gitfilters.json
index df4076178..3a818fc5b 100644
--- a/consolegit2gitfilters.json
+++ b/consolegit2gitfilters.json
@@ -36,6 +36,7 @@
     ".db",
     ".wrn",
     ".rec",
-    ".err"
+    ".err",
+    ".xlsx"
   ]    
 }
diff --git a/src/host/ut_host/VtIoTests.cpp b/src/host/ut_host/VtIoTests.cpp
index 01124b083..cd7f41d32 100644
--- a/src/host/ut_host/VtIoTests.cpp
+++ b/src/host/ut_host/VtIoTests.cpp
@@ -9,11 +9,14 @@
 #include "..\..\renderer\vt\Xterm256Engine.hpp"
 #include "..\..\renderer\vt\XtermEngine.hpp"
 #include "..\..\renderer\vt\WinTelnetEngine.hpp"
-#include "..\..\renderer\dx\DxRenderer.hpp"
 #include "..\..\renderer\base\Renderer.hpp"
 #include "..\Settings.hpp"
 #include "..\VtIo.hpp"
 
+#ifndef __INSIDE_WINDOWS
+#include "..\..\renderer\dx\DxRenderer.hpp"
+#endif
+
 using namespace WEX::Common;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
diff --git a/src/interactivity/win32/window.cpp b/src/interactivity/win32/window.cpp
index 35bcf9610..3b2ce7828 100644
--- a/src/interactivity/win32/window.cpp
+++ b/src/interactivity/win32/window.cpp
@@ -28,7 +28,13 @@
 
 #include "..\..\renderer\base\renderer.hpp"
 #include "..\..\renderer\gdi\gdirenderer.hpp"
+
+#ifndef __INSIDE_WINDOWS
 #include "..\..\renderer\dx\DxRenderer.hpp"
+#else
+// Forward-declare this so we don't blow up later.
+struct DxEngine;
+#endif
 
 #include "..\inc\ServiceLocator.hpp"
 #include "..\..\types\inc\Viewport.hpp"
diff --git a/src/renderer/base/renderer.cpp b/src/renderer/base/renderer.cpp
index 7fe69daa9..3caaf4b83 100644
--- a/src/renderer/base/renderer.cpp
+++ b/src/renderer/base/renderer.cpp
@@ -808,7 +808,7 @@ void Renderer::_PaintBufferOutputHelper(_In_ IRenderEngine* const pEngine,
                     // We could theoretically pre-pass for this in the loop above to be more efficient about walking
                     // the iterator, but I fear it would make the code even more confusing than it already is.
                     // Do that in the future if some WPR trace points you to this spot as super bad.
-                    for (auto colsPainted = 0; colsPainted < cols; ++colsPainted, ++lineIt, ++lineTarget.X)
+                    for (auto colsPainted = 0u; colsPainted < cols; ++colsPainted, ++lineIt, ++lineTarget.X)
                     {
                         auto lines = lineIt->TextAttr();
                         _PaintBufferOutputGridLineHelper(pEngine, lines, 1, lineTarget);