Skip to content

Commit ad48162

Browse files
DHowettdragoss-yodaPDeets
authored
Reflect inbox changes from RS (#19258)
Reflect inbox changes to `onecore/windows/core/console/open`. * eed3a6f Merged PR 13076689: Update managed TAEF tests that exist in GE branches to use the new publishing locations of TAEF's managed reference binaries. * 718d7d0 Merged PR 12483430: build console* with clang Somebody internal is trying to build the console with Clang (which is cool). --------- Co-authored-by: Dragos Sambotin <[email protected]> Co-authored-by: Phil Deets <[email protected]>
1 parent 6771470 commit ad48162

File tree

9 files changed

+25
-8
lines changed

9 files changed

+25
-8
lines changed

.github/actions/spelling/expect/expect.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,7 @@ INPUTSCOPE
822822
INSERTMODE
823823
INTERACTIVITYBASE
824824
INTERCEPTCOPYPASTE
825+
internalevent
825826
INTERNALNAME
826827
intsafe
827828
INVALIDARG
@@ -960,6 +961,7 @@ lstatus
960961
lstrcmp
961962
lstrcmpi
962963
LTEXT
964+
lto
963965
ltsc
964966
LUID
965967
luma
@@ -1708,6 +1710,7 @@ titlebars
17081710
TITLEISLINKNAME
17091711
TLDP
17101712
TLEN
1713+
Tlgg
17111714
TMAE
17121715
TMPF
17131716
tmultiple
@@ -1970,6 +1973,7 @@ WRITECONSOLEOUTPUT
19701973
WRITECONSOLEOUTPUTSTRING
19711974
wrkstr
19721975
WRL
1976+
wrl
19731977
wrp
19741978
WRunoff
19751979
WSLENV

src/host/directio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ CATCH_RETURN();
281281
// If .AsciiChar and .UnicodeChar have the same offset (since they're a union),
282282
// we can just write the latter with a byte-sized value to set the former
283283
// _and_ simultaneously clear the upper byte of .UnicodeChar to 0. Nice!
284-
static_assert(offsetof(CHAR_INFO, Char.AsciiChar) == offsetof(CHAR_INFO, Char.UnicodeChar));
284+
static_assert(__builtin_offsetof(CHAR_INFO, Char.AsciiChar) == __builtin_offsetof(CHAR_INFO, Char.UnicodeChar));
285285

286286
// Any time we see the lead flag, we presume there will be a trailing one following it.
287287
// Giving us two bytes of space (one per cell in the ascii part of the character union)

src/host/exe/lto_symbols.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
LLVM_LTO_EXPORTED_SYMBOLS = \
2+
_tlgDefineProvider_annotation__Tlgg_ConhostLauncherProviderProv \
3+
wWinMain \

src/host/exe/sources

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
!include $(BASEDIR)\onecore\windows\core\console\console_clang_feature.inc
2+
13
!include ..\sources.inc
24
# -------------------------------------
35
# Windows Console
@@ -20,6 +22,10 @@ UMTYPE = windows
2022
UMENTRY = wwinmain
2123
TARGET_DESTINATION = retail
2224

25+
!if "$(CLANG_LTO)" == "1"
26+
!include lto_symbols.inc
27+
!endif
28+
2329
# -------------------------------------
2430
# Build System Settings
2531
# -------------------------------------

src/host/ft_uia/sources

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ REFERENCES = $(CLR_REF_PATH)\System.metadata_dll; \
4848
$(CLR_REF_PATH)\System.Core.metadata_dll; \
4949
$(CLR_REF_PATH)\System.Data.metadata_dll; \
5050
$(CLR_REF_PATH)\System.Drawing.metadata_dll; \
51-
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\wex.common.managed.metadata_dll; \
52-
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\wex.logger.interop.metadata_dll; \
53-
$(ONECORESDKTOOLS_INTERNAL_REF_PATH_L)\wextest\cue\te.managed.metadata_dll; \
51+
$(ONECORE_TAEF_REF_PATH)\net452\wex.common.managed.metadata_dll; \
52+
$(ONECORE_TAEF_REF_PATH)\net452\wex.logger.interop.metadata_dll; \
53+
$(ONECORE_TAEF_REF_PATH)\net452\te.managed.metadata_dll; \
5454
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\appium-dotnet-driver.metadata_dll; \
5555
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\castle.core.metadata_dll; \
5656
$(ONECORESDKTOOLS_PRIVATE_REF_PATH_L)\WinAppDriver\newtonsoft.json.metadata_dll; \

src/host/sources.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,12 @@ SOURCES = \
8989
# Sources, Headers, and Libraries
9090
# -------------------------------------
9191

92+
!if "$(USE_CLANG)" != "1"
9293
PRECOMPILED_CXX = 1
9394
PRECOMPILED_INCLUDE = ..\precomp.h
9495
PRECOMPILED_PCH = precomp.pch
9596
PRECOMPILED_OBJ = precomp.obj
97+
!endif
9698

9799
INCLUDES = \
98100
$(INCLUDES); \

src/host/writeData.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class WriteData : public IWaitRoutine
4040
_Out_ NTSTATUS* const pReplyStatus,
4141
_Out_ size_t* const pNumBytes,
4242
_Out_ DWORD* const pControlKeyState,
43-
_Out_ void* const pOutputData);
43+
_Out_ void* const pOutputData) override;
4444

4545
private:
4646
SCREEN_INFORMATION& _siContext;

src/inc/LibraryIncludes.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@
101101
// The compiler doesn't like that. --> Suppress the warning.
102102
#pragma warning(push)
103103
#pragma warning(disable: 4324) // structure was padded due to alignment specifier
104+
// undefine BUILD_WINDOWS so that wrl/event.h doesn't include wrl/internalevent.h
105+
#undef BUILD_WINDOWS
104106
#include <wrl.h>
105107
#pragma warning(pop)
106108

src/interactivity/win32/ConsoleControl.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ namespace Microsoft::Console::Interactivity::Win32
4545
};
4646

4747
// IConsoleControl Members
48-
[[nodiscard]] NTSTATUS NotifyConsoleApplication(_In_ DWORD dwProcessId);
49-
[[nodiscard]] NTSTATUS SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground);
50-
[[nodiscard]] NTSTATUS EndTask(_In_ DWORD dwProcessId, _In_ DWORD dwEventType, _In_ ULONG ulCtrlFlags);
48+
[[nodiscard]] NTSTATUS NotifyConsoleApplication(_In_ DWORD dwProcessId) override;
49+
[[nodiscard]] NTSTATUS SetForeground(_In_ HANDLE hProcess, _In_ BOOL fForeground) override;
50+
[[nodiscard]] NTSTATUS EndTask(_In_ DWORD dwProcessId, _In_ DWORD dwEventType, _In_ ULONG ulCtrlFlags) override;
5151
[[nodiscard]] NTSTATUS SetWindowOwner(HWND hwnd, DWORD processId, DWORD threadId) noexcept override;
5252

5353
// Public Members

0 commit comments

Comments
 (0)