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

Merge remote-tracking branch 'openconsole/inbox'

Browse source
This commit is contained in:
Dustin Howett 2020-05-05 16:03:37 -07:00
parent ce91c164c2 92812bf316
commit 25f650578e
9 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/host/sources.inc
View file

@ -190,7 +190,6 @@ TARGETLIBS = \
$(WINCORE_OBJ_PATH)\console\open\src\terminal\adapter\lib\$(O)\ConTermAdapter.lib \
$(WINCORE_OBJ_PATH)\console\open\src\terminal\parser\lib\$(O)\ConTermParser.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\base\lib\$(O)\ConRenderBase.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\dx\lib\$(O)\ConRenderDx.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\lib\$(O)\ConRenderVt.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \

5
src/host/ut_host/VtIoTests.cpp
View file

@ -35,7 +35,10 @@ class Microsoft::Console::VirtualTerminal::VtIoTests
TEST_METHOD(DtorTestStackAllocMany);
TEST_METHOD(RendererDtorAndThread);
#ifndef __INSIDE_WINDOWS
TEST_METHOD(RendererDtorAndThreadAndDx);
#endif
TEST_METHOD(BasicAnonymousPipeOpeningWithSignalChannelTest);
};
@ -370,6 +373,7 @@ void VtIoTests::RendererDtorAndThread()
}
}
#ifndef __INSIDE_WINDOWS
void VtIoTests::RendererDtorAndThreadAndDx()
{
Log::Comment(NoThrowString().Format(
@ -396,6 +400,7 @@ void VtIoTests::RendererDtorAndThreadAndDx()
pRenderer.reset();
}
}
#endif
void VtIoTests::BasicAnonymousPipeOpeningWithSignalChannelTest()
{

2
src/host/ut_host/sources
View file

@ -70,5 +70,5 @@ TARGETLIBS = \
# -------------------------------------
# Autogenerated. Sets file name for Device Guard whitelisting effort, used in RC.exe.
C_DEFINES = $(C_DEFINES) -D___TARGETNAME="""$(TARGETNAME).$(TARGETTYPE)"""
C_DEFINES = $(C_DEFINES) -D___TARGETNAME="""$(TARGETNAME).$(TARGETTYPE)""" -D__INSIDE_WINDOWS
MUI_VERIFY_NO_LOC_RESOURCE = 1

2
src/interactivity/win32/sources.inc
View file

@ -12,7 +12,7 @@
# Preprocessor Settings
# -------------------------------------
C_DEFINES = $(C_DEFINES) -DFE_SB
C_DEFINES = $(C_DEFINES) -DFE_SB -D__INSIDE_WINDOWS
# -------------------------------------
# Compiler Settings

1
src/interactivity/win32/ut_interactivity_win32/sources
View file

@ -82,7 +82,6 @@ TARGETLIBS = \
$(WINCORE_OBJ_PATH)\console\open\src\terminal\input\lib\$(O)\ConTermInput.lib \
$(WINCORE_OBJ_PATH)\console\open\src\terminal\parser\lib\$(O)\ConTermParser.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\base\lib\$(O)\ConRenderBase.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\dx\lib\$(O)\ConRenderDx.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\lib\$(O)\ConRenderVt.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \

6
src/interactivity/win32/window.cpp
View file

@ -206,9 +206,10 @@ void Window::_UpdateSystemMetrics() const
const bool useDx = pSettings->GetUseDx();
GdiEngine* pGdiEngine = nullptr;
DxEngine* pDxEngine = nullptr;
[[maybe_unused]] DxEngine* pDxEngine = nullptr;
try
{
#ifndef __INSIDE_WINDOWS
if (useDx)
{
pDxEngine = new DxEngine();
@ -221,6 +222,7 @@ void Window::_UpdateSystemMetrics() const
g.pRender->AddRenderEngine(pDxEngine);
}
else
#endif
{
pGdiEngine = new GdiEngine();
g.pRender->AddRenderEngine(pGdiEngine);
@ -308,6 +310,7 @@ void Window::_UpdateSystemMetrics() const
{
_hWnd = hWnd;
#ifndef __INSIDE_WINDOWS
if (useDx)
{
status = NTSTATUS_FROM_WIN32(HRESULT_CODE((pDxEngine->SetHwnd(hWnd))));
@ -318,6 +321,7 @@ void Window::_UpdateSystemMetrics() const
}
}
else
#endif
{
status = NTSTATUS_FROM_WIN32(HRESULT_CODE((pGdiEngine->SetHwnd(hWnd))));
}

1
src/renderer/dirs
View file

@ -1,6 +1,5 @@
DIRS= \
base \
dx \
gdi \
wddmcon \
vt \

1
src/terminal/adapter/ut_adapter/sources
View file

@ -85,7 +85,6 @@ TARGETLIBS = \
$(WINCORE_OBJ_PATH)\console\open\src\terminal\input\lib\$(O)\ConTermInput.lib \
$(WINCORE_OBJ_PATH)\console\open\src\terminal\parser\lib\$(O)\ConTermParser.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\base\lib\$(O)\ConRenderBase.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\dx\lib\$(O)\ConRenderDx.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \
$(WINCORE_OBJ_PATH)\console\open\src\renderer\vt\lib\$(O)\ConRenderVt.lib \

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

@ -78,7 +78,6 @@ TARGETLIBS = \
$(CONSOLE_OBJ_PATH)\terminal\adapter\lib\$(O)\ConTermAdapter.lib \
$(CONSOLE_OBJ_PATH)\terminal\parser\lib\$(O)\ConTermParser.lib \
$(CONSOLE_OBJ_PATH)\renderer\base\lib\$(O)\ConRenderBase.lib \
$(CONSOLE_OBJ_PATH)\renderer\dx\lib\$(O)\ConRenderDx.lib \
$(CONSOLE_OBJ_PATH)\renderer\gdi\lib\$(O)\ConRenderGdi.lib \
$(CONSOLE_OBJ_PATH)\renderer\wddmcon\lib\$(O)\ConRenderWddmCon.lib \
$(CONSOLE_OBJ_PATH)\renderer\vt\lib\$(O)\ConRenderVt.lib \