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

Merge inbox changes up to eb480b6bb

Browse source 
Fixes #4427
This commit is contained in:
Dustin Howett 2020-02-03 11:49:42 -08:00
parent 55b638801b eb480b6bbb
commit e9f2d034de
27 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/buffer/out/ut_textbuffer/sources.dep
View file

@ -1,2 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

3
src/host/ft_host/sources.dep
View file

@ -1,6 +1,3 @@
BUILD_PASS2_CONSUMES= \
onecore\windows\core\console\open\src\tools\nihilist|PASS2 \
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

3
src/host/ft_integrity/sources.dep
View file

@ -4,6 +4,3 @@ PUBLIC_PASS1_CONSUMES= \
BUILD_PASS2_CONSUMES= \
onecore\base\appmodel\test\common\testhelper\samples\nativecxapp\appx|PASS2 \
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

3
src/host/ft_uia/sources.dep
View file

@ -8,6 +8,3 @@ PUBLIC_PASS1_CONSUMES= \
onecore\sdktools\winappdriver\selenium.support|PASS1 \
onecore\sdktools\winappdriver\selenium.webdriver|PASS1 \
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

2
src/host/ut_host/sources.dep
View file

@ -1,2 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

2
src/interactivity/onecore/ConsoleWindow.cpp
View file

@ -135,7 +135,7 @@ void ConsoleWindow::VerticalScroll(const WORD /*wScrollCommand*/, const WORD /*w
return E_NOTIMPL;
}
RECT ConsoleWindow::GetWindowRect() const
RECT ConsoleWindow::GetWindowRect() const noexcept
{
RECT rc = { 0 };
return rc;

6
src/interactivity/onecore/ConsoleWindow.hpp
View file

@ -14,13 +14,13 @@ Author(s):
#pragma once
#include "..\inc\IConsoleWindow.hpp"
#include "..\..\types\IConsoleWindow.hpp"
#pragma hdrstop
namespace Microsoft::Console::Interactivity::OneCore
{
class ConsoleWindow sealed : public IConsoleWindow
class ConsoleWindow sealed : public Microsoft::Console::Types::IConsoleWindow
{
public:
// Inherited via IConsoleWindow
@ -57,6 +57,6 @@ namespace Microsoft::Console::Interactivity::OneCore
[[nodiscard]] HRESULT SignalUia(_In_ EVENTID id);
[[nodiscard]] HRESULT UiaSetTextAreaFocus();
RECT GetWindowRect() const;
RECT GetWindowRect() const noexcept;
};
}

2
src/interactivity/onecore/SystemConfigurationProvider.cpp
View file

@ -5,8 +5,6 @@
#include "SystemConfigurationProvider.hpp"
static constexpr wchar_t DEFAULT_TT_FONT_FACENAME[]{ L"__DefaultTTFont__" };
using namespace Microsoft::Console::Interactivity::OneCore;
UINT SystemConfigurationProvider::GetCaretBlinkTime()

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

@ -42,6 +42,7 @@ TARGETLIBS = \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

3
src/interactivity/win32/ut_interactivity_win32/sources.dep
View file

@ -1,3 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

5
src/interactivity/win32/windowUiaProvider.cpp
View file

@ -85,7 +85,8 @@ IFACEMETHODIMP WindowUiaProvider::Navigate(_In_ NavigateDirection direction, _CO
if (direction == NavigateDirection_FirstChild || direction == NavigateDirection_LastChild)
{
*ppProvider = _pScreenInfoProvider.Get();
RETURN_IF_FAILED(_pScreenInfoProvider.CopyTo(ppProvider));
// signal that the focus changed
LOG_IF_FAILED(_pScreenInfoProvider->Signal(UIA_AutomationFocusChangedEventId));
@ -110,7 +111,7 @@ IFACEMETHODIMP WindowUiaProvider::ElementProviderFromPoint(_In_ double /*x*/,
{
RETURN_IF_FAILED(_EnsureValidHwnd());
*ppProvider = _pScreenInfoProvider.Get();
RETURN_IF_FAILED(_pScreenInfoProvider.CopyTo(ppProvider));
return S_OK;
}

4
src/renderer/base/renderer.cpp
View file

@ -84,7 +84,8 @@ Renderer::~Renderer()
return S_OK;
}
[[nodiscard]] HRESULT Renderer::_PaintFrameForEngine(_In_ IRenderEngine* const pEngine)
[[nodiscard]] HRESULT Renderer::_PaintFrameForEngine(_In_ IRenderEngine* const pEngine) noexcept
try
{
FAIL_FAST_IF_NULL(pEngine); // This is a programming error. Fail fast.
@ -148,6 +149,7 @@ Renderer::~Renderer()
// As we leave the scope, EndPaint will be called (declared above)
return S_OK;
}
CATCH_RETURN()
void Renderer::_NotifyPaintFrame()
{

2
src/renderer/base/renderer.hpp
View file

@ -86,7 +86,7 @@ namespace Microsoft::Console::Render
void _NotifyPaintFrame();
[[nodiscard]] HRESULT _PaintFrameForEngine(_In_ IRenderEngine* const pEngine);
[[nodiscard]] HRESULT _PaintFrameForEngine(_In_ IRenderEngine* const pEngine) noexcept;
bool _CheckViewportAndScroll();

6
src/renderer/dx/DxRenderer.cpp
View file

@ -74,6 +74,7 @@ DxEngine::DxEngine() :
_selectionBackground{},
_glyphCell{ 0 },
_haveDeviceResources{ false },
_retroTerminalEffects{ false },
_hwndTarget{ static_cast<HWND>(INVALID_HANDLE_VALUE) },
_sizeTarget{ 0 },
_dpi{ USER_DEFAULT_SCREEN_DPI },
@ -161,6 +162,10 @@ _CompileShader(
std::string target,
std::string entry = "main")
{
#ifdef __INSIDE_WINDOWS
THROW_HR(E_UNEXPECTED);
return 0;
#else
Microsoft::WRL::ComPtr<ID3DBlob> code{};
Microsoft::WRL::ComPtr<ID3DBlob> error{};
@ -189,6 +194,7 @@ _CompileShader(
}
return code;
#endif
}
// Routine Description:

4
src/renderer/dx/ScreenPixelShader.h
View file

@ -1,5 +1,8 @@
#pragma once
#ifdef __INSIDE_WINDOWS
const char screenPixelShaderString[] = "";
#else
const char screenPixelShaderString[] = R"(
Texture2D shaderTexture;
SamplerState samplerState;
@ -77,3 +80,4 @@ float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
return color;
}
)";
#endif

4
src/renderer/dx/ScreenVertexShader.h
View file

@ -1,5 +1,8 @@
#pragma once
#ifdef __INSIDE_WINDOWS
const char screenVertexShaderString[] = "";
#else
const char screenVertexShaderString[] = R"(
struct VS_OUTPUT
{
@ -14,3 +17,4 @@ VS_OUTPUT main(float4 pos : POSITION, float2 tex : TEXCOORD)
return output;
}
)";
#endif

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

@ -35,3 +35,5 @@ SOURCES = \
..\DxRenderer.cpp \
..\CustomTextRenderer.cpp \
..\CustomTextLayout.cpp \
C_DEFINES=$(C_DEFINES) -D__INSIDE_WINDOWS

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

@ -46,6 +46,7 @@ TARGETLIBS = \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

2
src/terminal/adapter/ut_adapter/sources.dep
View file

@ -1,2 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

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

@ -39,6 +39,7 @@ TARGETLIBS = \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

2
src/terminal/parser/ut_parser/sources.dep
View file

@ -1,2 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

2
src/tools/integrity/exewin32/sources.dep
View file

@ -1,2 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

3
src/tools/integrity/packageuwp/sources.dep
View file

@ -1,6 +1,3 @@
BUILD_PASS2_CONSUMES= \
onecore\windows\core\console\open\src\tools\integrity\exeuwp|PASS2 \
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

2
src/tools/nihilist/sources.dep
View file

@ -1,2 +0,0 @@
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

2
src/tools/vtapp/sources.dep
View file

@ -1,5 +1,3 @@
PUBLIC_PASS0_CONSUMES= \
onecore\redist\mspartners\netfx45\core\binary_release|PASS0 \
BUILD_PASS3_CONSUMES= \
onecore\merged\mbs\bootableskus\prepareimagingtools|PASS3 \

1
src/types/WindowUiaProviderBase.hpp
View file

@ -21,7 +21,6 @@ Author(s):
#pragma once
#include <UIAutomationCore.h>
#include <wrl/implements.h>
namespace Microsoft::Console::Types

3
src/types/sources.inc
View file

@ -42,6 +42,9 @@ SOURCES= \
..\Utf16Parser.cpp \
..\utils.cpp \
..\ThemeUtils.cpp \
..\WindowUiaProviderBase.cpp \
..\ScreenInfoUiaProviderBase.cpp \
..\UiaTextRangeBase.cpp \
INCLUDES= \
$(INCLUDES); \