maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Sync with latest inbox changes

Browse source 
[Git2Git] Git Train: Merge of building/rs_onecore_dep_uxp/191011-1234 into official/rs_onecore_dep_uxp Retrieved from https://microsoft.visualstudio.com os OS official/rs_onecore_dep_uxp b80345479891d1e7a9f7e38b6b5f40083c6a564a

sources changes from 21H1

Merged PR 3896217: [Git2Git] Changes from vb_release_dep_dev1

server init changes from 20H1 (onecore headless mode)
This commit is contained in:
gittrain 2019-10-12 09:14:13 +00:00 committed by Dustin Howett
parent 9e5792ba51
commit 73462c3986
15 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cppwinrt.build.pre.props
View file

@ -95,7 +95,7 @@
<PrecompiledHeaderOutputFile>$(IntDir)pch.pch</PrecompiledHeaderOutputFile>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj /Zc:twoPhase- /std:c++17 </AdditionalOptions>
<AdditionalOptions>%(AdditionalOptions) /permissive- /bigobj /Zc:twoPhase- /std:c++17</AdditionalOptions>
<DisableSpecificWarnings>28204</DisableSpecificWarnings>
<PreprocessorDefinitions Condition="'$(ConfigurationType)'=='DynamicLibrary'">_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>

17
src/host/srvinit.cpp
View file

@ -502,6 +502,18 @@ PWSTR TranslateConsoleTitle(_In_ PCWSTR pwszConsoleTitle, const BOOL fUnexpand,
return STATUS_SUCCESS;
}
[[nodiscard]] bool ConsoleConnectionDeservesVisibleWindow(PCONSOLE_API_CONNECTINFO p)
{
Globals& g = ServiceLocator::LocateGlobals();
// processes that are created ...
// ... with CREATE_NO_WINDOW never get a window.
// ... on Desktop, with a visible window always get one (even a fake one)
// ... not on Desktop, with a visible window only get one if we are headful (not ConPTY).
// This prevents pseudoconsole-hosted applications from taking over the screen,
// even if they really beg us for a window.
return p->WindowVisible && (s_IsOnDesktop() || !g.IsHeadless());
}
[[nodiscard]] NTSTATUS ConsoleAllocateConsole(PCONSOLE_API_CONNECTINFO p)
{
// AllocConsole is outside our codebase, but we should be able to mostly track the call here.
@ -546,7 +558,7 @@ PWSTR TranslateConsoleTitle(_In_ PCWSTR pwszConsoleTitle, const BOOL fUnexpand,
Status = NTSTATUS_FROM_HRESULT(wil::ResultFromCaughtException());
}
if (NT_SUCCESS(Status) && p->WindowVisible)
if (NT_SUCCESS(Status) && ConsoleConnectionDeservesVisibleWindow(p))
{
HANDLE Thread = nullptr;
@ -576,9 +588,6 @@ PWSTR TranslateConsoleTitle(_In_ PCWSTR pwszConsoleTitle, const BOOL fUnexpand,
CloseHandle(Thread); // This doesn't stop the thread from running.
g.consoleInputInitializedEvent.release();
g.consoleInputSetupEvent.release();
if (!NT_SUCCESS(g.ntstatusConsoleInputInitStatus))
{
Status = g.ntstatusConsoleInputInitStatus;

2
src/project.inc
View file

@ -26,7 +26,6 @@ USE_NATIVE_EH = 1
# -------------------------------------
MSC_WARNING_LEVEL = /W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
# -------------------------------------
# Common Console Includes and Libraries
@ -39,6 +38,7 @@ INCLUDES= \
$(CONSOLE_SRC_PATH)\inc; \
$(CONSOLE_SRC_PATH)\..\..\inc; \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(MINWIN_RESTRICTED_PRIV_SDK_INC_PATH_L); \
$(MINCORE_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(ONECORE_INTERNAL_SDK_INC_PATH); \
$(ONECORE_EXTERNAL_SDK_INC_PATH); \

1
src/renderer/dx/sources.inc
View file

@ -28,6 +28,7 @@ INCLUDES = \
..\..\..\inc; \
..\..\..\host; \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(MINWIN_RESTRICTED_PRIV_SDK_INC_PATH_L); \
SOURCES = \
$(SOURCES) \

1
src/renderer/wddmcon/sources.inc
View file

@ -29,6 +29,7 @@ INCLUDES = \
..\..\..\inc; \
..\..\..\host; \
$(MINWIN_INTERNAL_PRIV_SDK_INC_PATH_L); \
$(MINWIN_RESTRICTED_PRIV_SDK_INC_PATH_L); \
SOURCES = \
$(SOURCES) \

1
src/terminal/parser/ft_fuzzer/sources
View file

@ -44,7 +44,6 @@ C_DEFINES = $(C_DEFINES) -DUNICODE -D_UNICODE
# -------------------------------------
MSC_WARNING_LEVEL = /W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
# -------------------------------------
# Build System Settings

1
src/tools/closetest/sources
View file

@ -12,7 +12,6 @@ USE_UNICRT=1
C_DEFINES=-DUNICODE
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TARGETLIBS=\
$(MINCORE_SDK_LIB_PATH)\mincore.lib \

1
src/tools/echokey/sources
View file

@ -22,7 +22,6 @@ USE_NATIVE_EH=1
C_DEFINES= -DUNICODE -D_UNICODE
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TARGETLIBS=\
$(MINWIN_SDK_LIB_PATH)\ntdll.lib \

1
src/tools/integrity/exeuwp/sources
View file

@ -5,7 +5,6 @@ C_DEFINES = $(C_DEFINES) -DUNICODE -D_UNICODE
MSC_WARNING_LEVEL = /W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TEST_CODE=1
UMTYPE=console

1
src/tools/integrity/exewin32/sources
View file

@ -1,6 +1,5 @@
MSC_WARNING_LEVEL=/W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TARGETNAME=conintegrity
TARGETTYPE=PROGRAM

1
src/tools/integrity/lib/sources
View file

@ -1,6 +1,5 @@
MSC_WARNING_LEVEL=/W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TARGETNAME=conintegritylib
TARGETTYPE=LIBRARY

1
src/tools/lnkd/sources
View file

@ -1,5 +1,4 @@
MSC_WARNING_LEVEL=/W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
!include $(NTMAKEENV)\system_defaultmk.inc
!include $(WINCORE_PATH)\core.inc
SOURCES_USED=$(WINCORE_PATH)\core.inc

1
src/tools/nihilist/sources
View file

@ -1,6 +1,5 @@
MSC_WARNING_LEVEL=/W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TARGETNAME=nihilist
TARGETTYPE=PROGRAM

1
src/tools/pixels/sources
View file

@ -1,5 +1,4 @@
MSC_WARNING_LEVEL=/W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
!include $(NTMAKEENV)\system_defaultmk.inc
!include $(WINCORE_PATH)\core.inc
SOURCES_USED=$(WINCORE_PATH)\core.inc

1
src/tools/vtpipeterm/sources
View file

@ -1,6 +1,5 @@
MSC_WARNING_LEVEL=/W4 /WX
USER_C_FLAGS = $(USER_C_FLAGS) /std:c++17
TARGETNAME=vtpipeterm
TARGETTYPE=PROGRAM