mirror of
https://github.com/microsoft/terminal.git
synced 2025-12-19 09:58:08 -05:00
Reflect inbox changes from RS (#19258)
Reflect inbox changes to `onecore/windows/core/console/open`. *eed3a6fa5Merged PR 13076689: Update managed TAEF tests that exist in GE branches to use the new publishing locations of TAEF's managed reference binaries. *718d7d02dMerged PR 12483430: build console* with clang Somebody internal is trying to build the console with Clang (which is cool). --------- Co-authored-by: Dragos Sambotin <dragoss@microsoft.com> Co-authored-by: Phil Deets <pdeets@microsoft.com>
This commit is contained in:
4
.github/actions/spelling/expect/expect.txt
vendored
4
.github/actions/spelling/expect/expect.txt
vendored
@@ -822,6 +822,7 @@ INPUTSCOPE
|
||||
INSERTMODE
|
||||
INTERACTIVITYBASE
|
||||
INTERCEPTCOPYPASTE
|
||||
internalevent
|
||||
INTERNALNAME
|
||||
intsafe
|
||||
INVALIDARG
|
||||
@@ -960,6 +961,7 @@ lstatus
|
||||
lstrcmp
|
||||
lstrcmpi
|
||||
LTEXT
|
||||
lto
|
||||
ltsc
|
||||
LUID
|
||||
luma
|
||||
@@ -1708,6 +1710,7 @@ titlebars
|
||||
TITLEISLINKNAME
|
||||
TLDP
|
||||
TLEN
|
||||
Tlgg
|
||||
TMAE
|
||||
TMPF
|
||||
tmultiple
|
||||
@@ -1970,6 +1973,7 @@ WRITECONSOLEOUTPUT
|
||||
WRITECONSOLEOUTPUTSTRING
|
||||
wrkstr
|
||||
WRL
|
||||
wrl
|
||||
wrp
|
||||
WRunoff
|
||||
WSLENV
|
||||
|
||||
@@ -281,7 +281,7 @@ CATCH_RETURN();
|
||||
// If .AsciiChar and .UnicodeChar have the same offset (since they're a union),
|
||||
// we can just write the latter with a byte-sized value to set the former
|
||||
// _and_ simultaneously clear the upper byte of .UnicodeChar to 0. Nice!
|
||||
static_assert(offsetof(CHAR_INFO, Char.AsciiChar) == offsetof(CHAR_INFO, Char.UnicodeChar));
|
||||
static_assert(__builtin_offsetof(CHAR_INFO, Char.AsciiChar) == __builtin_offsetof(CHAR_INFO, Char.UnicodeChar));
|
||||
|
||||
// Any time we see the lead flag, we presume there will be a trailing one following it.
|
||||
// Giving us two bytes of space (one per cell in the ascii part of the character union)
|
||||
|
||||
3
src/host/exe/lto_symbols.inc
Normal file
3
src/host/exe/lto_symbols.inc
Normal file
@@ -0,0 +1,3 @@
|
||||
LLVM_LTO_EXPORTED_SYMBOLS = \
|
||||
_tlgDefineProvider_annotation__Tlgg_ConhostLauncherProviderProv \
|
||||
wWinMain \
|
||||
@@ -1,3 +1,5 @@
|
||||
!include $(BASEDIR)\onecore\windows\core\console\console_clang_feature.inc
|
||||
|
||||
!include ..\sources.inc
|
||||
# -------------------------------------
|
||||
# Windows Console
|
||||
@@ -20,6 +22,10 @@ UMTYPE = windows
|
||||
UMENTRY = wwinmain
|
||||
TARGET_DESTINATION = retail
|
||||
|
||||
!if "$(CLANG_LTO)" == "1"
|
||||
!include lto_symbols.inc
|
||||
!endif
|
||||
|
||||
# -------------------------------------
|
||||
# Build System Settings
|
||||
# -------------------------------------
|
||||
|
||||
@@ -48,9 +48,9 @@ REFERENCES = $(CLR_REF_PATH)\System.metadata_dll; \
|
||||
$(CLR_REF_PATH)\System.Core.metadata_dll; \
|
||||
$(CLR_REF_PATH)\System.Data.metadata_dll; \
|
||||
$(CLR_REF_PATH)\System.Drawing.metadata_dll; \
|
||||
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\wex.common.managed.metadata_dll; \
|
||||
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\wex.logger.interop.metadata_dll; \
|
||||
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\te.managed.metadata_dll; \
|
||||
$(ONECORE_TAEF_REF_PATH)\net452\wex.common.managed.metadata_dll; \
|
||||
$(ONECORE_TAEF_REF_PATH)\net452\wex.logger.interop.metadata_dll; \
|
||||
$(ONECORE_TAEF_REF_PATH)\net452\te.managed.metadata_dll; \
|
||||
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\appium-dotnet-driver.metadata_dll; \
|
||||
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\castle.core.metadata_dll; \
|
||||
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\newtonsoft.json.metadata_dll; \
|
||||
|
||||
@@ -89,10 +89,12 @@ SOURCES = \
|
||||
# Sources, Headers, and Libraries
|
||||
# -------------------------------------
|
||||
|
||||
!if "$(USE_CLANG)" != "1"
|
||||
PRECOMPILED_CXX = 1
|
||||
PRECOMPILED_INCLUDE = ..\precomp.h
|
||||
PRECOMPILED_PCH = precomp.pch
|
||||
PRECOMPILED_OBJ = precomp.obj
|
||||
!endif
|
||||
|
||||
INCLUDES = \
|
||||
$(INCLUDES); \
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
_Out_ NTSTATUS* const pReplyStatus,
|
||||
_Out_ size_t* const pNumBytes,
|
||||
_Out_ DWORD* const pControlKeyState,
|
||||
_Out_ void* const pOutputData);
|
||||
_Out_ void* const pOutputData) override;
|
||||
|
||||
private:
|
||||
SCREEN_INFORMATION& _siContext;
|
||||
|
||||
@@ -101,6 +101,8 @@
|
||||
// The compiler doesn't like that. --> Suppress the warning.
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 4324) // structure was padded due to alignment specifier
|
||||
// undefine BUILD_WINDOWS so that wrl/event.h doesn't include wrl/internalevent.h
|
||||
#undef BUILD_WINDOWS
|
||||
#include <wrl.h>
|
||||
#pragma warning(pop)
|
||||
|
||||
|
||||
@@ -45,9 +45,9 @@ namespace Microsoft::Console::Interactivity::Win32
|
||||
};
|
||||
|
||||
// IConsoleControl Members
|
||||
[[nodiscard]] NTSTATUS NotifyConsoleApplication(_In_ DWORD dwProcessId);
|
||||
[[nodiscard]] NTSTATUS SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground);
|
||||
[[nodiscard]] NTSTATUS EndTask(_In_ DWORD dwProcessId, _In_ DWORD dwEventType, _In_ ULONG ulCtrlFlags);
|
||||
[[nodiscard]] NTSTATUS NotifyConsoleApplication(_In_ DWORD dwProcessId) override;
|
||||
[[nodiscard]] NTSTATUS SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground) override;
|
||||
[[nodiscard]] NTSTATUS EndTask(_In_ DWORD dwProcessId, _In_ DWORD dwEventType, _In_ ULONG ulCtrlFlags) override;
|
||||
[[nodiscard]] NTSTATUS SetWindowOwner(HWND hwnd, DWORD processId, DWORD threadId) noexcept override;
|
||||
|
||||
// Public Members
|
||||
|
||||
Reference in New Issue
Block a user