Merge inbox back into main after the 1.19 ingestion

TheRakeshPurohit · Oct 27, 2023 · 49c177f · 49c177f
2 parents d0d3039 + 68b5e58
commit 49c177f
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 26 deletions.
diff --git a/oss/libpopcnt/libpopcnt.h b/oss/libpopcnt/libpopcnt.h
@@ -95,7 +95,7 @@
   #define HAVE_AVX512
 #endif
 
-#if defined(X86_OR_X64)
+#if defined(X86_OR_X64) && !defined(_M_ARM64EC)
   /* MSVC compatible compilers (Windows) */
   #if defined(_MSC_VER)
     /* clang-cl (LLVM 10 from 2020) requires /arch:AVX2 or

diff --git a/src/host/ft_host/sources b/src/host/ft_host/sources
@@ -55,4 +55,5 @@ TARGETLIBS = \
 
 DELAYLOAD = \
     $(DELAYLOAD) \
+    icu.dll; \
     ext-ms-win-rtcore-ntuser-dpi-l1.dll; \
diff --git a/src/host/ft_host/sources.dep b/src/host/ft_host/sources.dep
@@ -1,6 +1,3 @@
 BUILD_PASS1_CONSUMES= \
     onecore\windows\vcpkg|PASS1 \
 
-BUILD_PASS2_CONSUMES= \
-    onecore\windows\core\console\open\src\tools\nihilist|PASS2 \
-
diff --git a/src/host/ft_integrity/IntegrityTest.cpp b/src/host/ft_integrity/IntegrityTest.cpp
@@ -214,14 +214,14 @@ void IntegrityTest::_TestValidationHelper(const bool fIsBlockExpected,
     GetConsoleScreenBufferInfoEx(GetStdHandle(STD_OUTPUT_HANDLE),
                                  &csbiex);
 
-    LOG_OUTPUT(L"Buffer Size X:%d Y:%d", csbiex.dwSize.width, csbiex.dwSize.height);
+    LOG_OUTPUT(L"Buffer Size X:%d Y:%d", csbiex.dwSize.X, csbiex.dwSize.Y);
 
-    size_t cch = csbiex.dwSize.width;
+    size_t cch = csbiex.dwSize.X;
     wistd::unique_ptr<wchar_t[]> stringData = wil::make_unique_nothrow<wchar_t[]>(cch);
     THROW_IF_NULL_ALLOC(stringData);
 
     COORD coordRead = { 0 };
-    for (coordRead.y = 0; coordRead.y < 8; coordRead.y++)
+    for (coordRead.Y = 0; coordRead.Y < 8; coordRead.Y++)
     {
         ZeroMemory(stringData.get(), sizeof(wchar_t) * cch);
 
@@ -237,7 +237,7 @@ void IntegrityTest::_TestValidationHelper(const bool fIsBlockExpected,
         WEX::Common::String strActual;
 
         // At position 0, check the integrity.
-        if (coordRead.y == 0)
+        if (coordRead.Y == 0)
         {
             strExpected = pwszIntegrityExpected;
         }
@@ -246,11 +246,11 @@ void IntegrityTest::_TestValidationHelper(const bool fIsBlockExpected,
             // For the rest, check whether the API call worked.
             if (fIsBlockExpected)
             {
-                strExpected = _rgpwszExpectedFail[coordRead.y - 1];
+                strExpected = _rgpwszExpectedFail[coordRead.Y - 1];
             }
             else
             {
-                strExpected = _rgpwszExpectedSuccess[coordRead.y - 1];
+                strExpected = _rgpwszExpectedSuccess[coordRead.Y - 1];
             }
         }
         stringData[strExpected.GetLength()] = L'\0';
@@ -312,7 +312,7 @@ PCWSTR IntegrityTest::s_GetMyIntegrityLevel()
     DWORD dwIntegrityLevel = 0;
 
     // Get the Integrity level.
-    wistd::unique_ptr<TOKEN_MANDATORY_LABEL> tokenLabel;
+    wil::unique_tokeninfo_ptr<TOKEN_MANDATORY_LABEL> tokenLabel;
     THROW_IF_FAILED(wil::GetTokenInformationNoThrow(tokenLabel, GetCurrentProcessToken()));
 
     dwIntegrityLevel = *GetSidSubAuthority(tokenLabel->Label.Sid,

diff --git a/src/host/ft_integrity/sources b/src/host/ft_integrity/sources
@@ -33,7 +33,6 @@ INCLUDES=\
     $(COM_INC_PATH); \
     $(ONECOREBASE_INTERNAL_INC_PATH_L)\appmodel\test\common; \
     $(ONECOREREDIST_INTERNAL_INC_PATH_L)\TAEF; \
-    $(ONECORE_PRIV_SDK_INC_PATH); \
     $(MINCORE_INTERNAL_PRIV_SDK_INC_PATH_L); \
 
 TARGETLIBS=\

diff --git a/src/host/ft_integrity/sources.dep b/src/host/ft_integrity/sources.dep
diff --git a/src/host/sources.inc b/src/host/sources.inc
@@ -198,6 +198,7 @@ DELAYLOAD = \
     DXGI.dll; \
     OLEAUT32.dll; \
     PROPSYS.dll; \
+    icu.dll; \
     api-ms-win-core-com-l1.dll; \
     api-ms-win-core-registry-l2.dll; \
     api-ms-win-mm-playsound-l1.dll; \

diff --git a/src/inc/HostAndPropsheetIncludes.h b/src/inc/HostAndPropsheetIncludes.h
@@ -14,7 +14,9 @@
 #include <windows.h>
 #undef WIN32_NO_STATUS
 
+#ifndef NO_WINTERNL_INBOX_BUILD
 #include <winternl.h>
+#endif
 
 #pragma warning(push)
 #pragma warning(disable:4430) // Must disable 4430 "default int" warning for C++ because ntstatus.h is inflexible SDK definition.

diff --git a/src/inc/LibraryIncludes.h b/src/inc/LibraryIncludes.h
@@ -18,7 +18,9 @@
 // Block minwindef.h min/max macros to prevent <algorithm> conflict
 #define NOMINMAX
 // Exclude rarely-used stuff from Windows headers
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 
 #include <algorithm>
 #include <atomic>
@@ -65,6 +67,7 @@
 // GSL
 // Block GSL Multi Span include because it both has C++17 deprecated iterators
 // and uses the C-namespaced "max" which conflicts with Windows definitions.
+#include <gsl/gsl>
 #include <gsl/gsl_util>
 #include <gsl/pointers>
 

diff --git a/src/interactivity/onecore/precomp.h b/src/interactivity/onecore/precomp.h
@@ -10,13 +10,16 @@
 #include <nt.h>
 #include <ntrtl.h>
 #include <nturtl.h>
+#define WIN32_NO_STATUS
 #include <windows.h>
+#undef WIN32_NO_STATUS
 #include "wchar.h"
 
 // Extension presence detection
 #include <sysparamsext.h>
 
 #define _DDK_INCLUDED
+#define NO_WINTERNL_INBOX_BUILD
 #include "../../host/precomp.h"
 
 #else

diff --git a/src/interactivity/win32/ut_interactivity_win32/sources b/src/interactivity/win32/ut_interactivity_win32/sources
@@ -110,6 +110,7 @@ DELAYLOAD = \
     DXGI.dll; \
     D3D11.dll; \
     OLEAUT32.dll; \
+    icu.dll; \
     api-ms-win-mm-playsound-l1.dll; \
     api-ms-win-shcore-scaling-l1.dll; \
     api-ms-win-shell-dataobject-l1.dll; \

diff --git a/src/project.inc b/src/project.inc
@@ -35,7 +35,7 @@ USE_NATIVE_EH           = 1
 
 USE_STD_CPP20           = 1
 MSC_WARNING_LEVEL       = /W4 /WX
-USER_C_FLAGS            = $(USER_C_FLAGS) /fp:contract /utf-8
+USER_C_FLAGS            = $(USER_C_FLAGS) /Zc:preprocessor /fp:contract /utf-8
 
 # -------------------------------------
 # Common Console Includes and Libraries

diff --git a/src/propsheet/misc.cpp b/src/propsheet/misc.cpp
@@ -398,6 +398,10 @@ int AddFont(
     /*
      * Store the font info
      */
+    if (FontInfo[nFont].hFont != nullptr)
+    {
+        DeleteObject(FontInfo[nFont].hFont);
+    }
     FontInfo[nFont].hFont = hFont;
     FontInfo[nFont].Family = tmFamily;
     FontInfo[nFont].Size = SizeActual;

diff --git a/src/terminal/adapter/ut_adapter/sources b/src/terminal/adapter/ut_adapter/sources
@@ -105,6 +105,7 @@ DELAYLOAD = \
     DXGI.dll; \
     D3D11.dll; \
     OLEAUT32.dll; \
+    icu.dll; \
     api-ms-win-mm-playsound-l1.dll; \
     api-ms-win-shcore-scaling-l1.dll; \
     api-ms-win-shell-dataobject-l1.dll; \
@@ -144,7 +145,6 @@ DLOAD_ERROR_HANDLER = kernelbase
 
 #INCLUDES                        =   $(INCLUDES); \
 #                                    ..\..\..\inc; \
-#                                    $(SDKTOOLS_INC_PATH)\WexTest\Cue; \
 #
 #SOURCES                         =   $(SOURCES) \
 #

diff --git a/src/terminal/parser/ut_parser/sources b/src/terminal/parser/ut_parser/sources
@@ -96,6 +96,7 @@ DELAYLOAD = \
     DXGI.dll; \
     D3D11.dll; \
     OLEAUT32.dll; \
+    icu.dll; \
     api-ms-win-mm-playsound-l1.dll; \
     api-ms-win-shcore-scaling-l1.dll; \
     api-ms-win-shell-dataobject-l1.dll; \

diff --git a/src/tools/integrity/lib/util.cpp b/src/tools/integrity/lib/util.cpp
@@ -14,7 +14,7 @@ PCWSTR GetIntegrityLevel()
     DWORD dwIntegrityLevel = 0;
 
     // Get the Integrity level.
-    wistd::unique_ptr<TOKEN_MANDATORY_LABEL> tokenLabel;
+    wil::unique_tokeninfo_ptr<TOKEN_MANDATORY_LABEL> tokenLabel;
     THROW_IF_FAILED(wil::GetTokenInformationNoThrow(tokenLabel, GetCurrentProcessToken()));
 
     dwIntegrityLevel = *GetSidSubAuthority(tokenLabel->Label.Sid,

diff --git a/src/tools/vtapp/sources.dep b/src/tools/vtapp/sources.dep
diff --git a/src/tsf/sources b/src/tsf/sources
@@ -53,7 +53,6 @@ SOURCES = \
 INCLUDES = \
     $(INCLUDES); \
     ..\inc; \
-    $(ONECORE_PRIV_SDK_INC_PATH); \
     $(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
     $(SDK_INC_PATH)\atl30; \
     $(ONECORE_EXTERNAL_SDK_INC_PATH)\atl30; \
diff --git a/src/types/sources.inc b/src/types/sources.inc
@@ -31,7 +31,6 @@ SOURCES= \
     ..\CodepointWidthDetector.cpp \
     ..\ColorFix.cpp \
     ..\GlyphWidth.cpp \
-    ..\ModifierKeyState.cpp \
     ..\Viewport.cpp \
     ..\convert.cpp \
     ..\colorTable.cpp \