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

Change backslashes in include statements to forward slashes (#8205) 

Many include statements use forward slashes, while others use backwards
slashes. This is inconsistent formatting. For this reason, I changed the
backward slashes to forward slashes since that is the standard.
This commit is contained in:
N 2020-11-25 16:02:10 -05:00 committed by GitHub
parent 274f5a74f5
commit d09fdd61cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
197 changed files with 369 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/dictionary/apis.txt vendored
View File

@ -46,6 +46,7 @@ NCRBUTTONDBLCLK
NOAGGREGATION NOAGGREGATION
NOPROGRESS NOPROGRESS
NOREDIRECTIONBITMAP NOREDIRECTIONBITMAP
ntprivapi
oaidl oaidl
ocidl ocidl
otms otms

4
doc/WIL.md
View File

@ -9,13 +9,13 @@ The primary usages of WIL in our code so far are...
### Smart Pointers ### ### Smart Pointers ###
Inside [wil\resource.h](https://github.com/microsoft/wil/blob/master/include/wil/resource.h) are smart pointer like classes for many Windows OS resources like file handles, socket handles, process handles, and so on. They're of the form `wil::unique_handle` and call the appropriate/matching OS function (like `CloseHandle()` in this case) when they go out of scope. Inside [wil/resource.h](https://github.com/microsoft/wil/blob/master/include/wil/resource.h) are smart pointer like classes for many Windows OS resources like file handles, socket handles, process handles, and so on. They're of the form `wil::unique_handle` and call the appropriate/matching OS function (like `CloseHandle()` in this case) when they go out of scope.
Another useful item is `wil::make_unique_nothrow()` which is analogous to `std::make_unique` (except without the exception which might help you integrate with existing exception-free code in the console.) This will return a `wistd::unique_ptr` (vs. a `std::unique_ptr`) which can be used in a similar manner. Another useful item is `wil::make_unique_nothrow()` which is analogous to `std::make_unique` (except without the exception which might help you integrate with existing exception-free code in the console.) This will return a `wistd::unique_ptr` (vs. a `std::unique_ptr`) which can be used in a similar manner.
### Result Handling ### ### Result Handling ###
To manage the various types of result codes that come back from Windows APIs, the file [wil\result.h](https://github.com/microsoft/wil/blob/master/include/wil/result.h) provides a wealth of macros that can help. To manage the various types of result codes that come back from Windows APIs, the file [wil/result.h](https://github.com/microsoft/wil/blob/master/include/wil/result.h) provides a wealth of macros that can help.
As an example, the method `DuplicateHandle()` returns a `BOOL` value that is `FALSE` under failure and would like you to `GetLastError()` from the operating system to find out what the actual result code is. In this circumstance, you could use the macro `RETURN_IF_WIN32_BOOL_FALSE` to wrap the call to `DuplicateHandle()` which would automatically handle this pattern for you and return the `HRESULT` equivalent on failure. As an example, the method `DuplicateHandle()` returns a `BOOL` value that is `FALSE` under failure and would like you to `GetLastError()` from the operating system to find out what the actual result code is. In this circumstance, you could use the macro `RETURN_IF_WIN32_BOOL_FALSE` to wrap the call to `DuplicateHandle()` which would automatically handle this pattern for you and return the `HRESULT` equivalent on failure.

4
src/buffer/out/precomp.h
View File

@ -32,8 +32,8 @@ Abstract:
#include <intsafe.h> #include <intsafe.h>
// private dependencies // private dependencies
#include "..\inc\operators.hpp" #include "../inc/operators.hpp"
#include "..\inc\unicode.hpp" #include "../inc/unicode.hpp"
#pragma warning(pop) #pragma warning(pop)
// clang-format on // clang-format on

6
src/buffer/out/ut_textbuffer/precomp.h
View File

@ -33,9 +33,9 @@ Abstract:
#include <intsafe.h> #include <intsafe.h>
// private dependencies // private dependencies
#include "..\host\conddkrefs.h" #include "../host/conddkrefs.h"
#include "..\inc\operators.hpp" #include "../inc/operators.hpp"
#include "..\inc\unicode.hpp" #include "../inc/unicode.hpp"
#pragma warning(pop) #pragma warning(pop)
// clang-format on // clang-format on

2
src/cascadia/ShellExtension/pch.h
View File

@ -27,4 +27,4 @@
#include <shlwapi.h> #include <shlwapi.h>
#include <wrl.h> #include <wrl.h>
#include <wrl\module.h> #include <wrl/module.h>

2
src/cascadia/TerminalApp/AppKeyBindings.h
View File

@ -5,7 +5,7 @@
#include "AppKeyBindings.g.h" #include "AppKeyBindings.g.h"
#include "ShortcutActionDispatch.h" #include "ShortcutActionDispatch.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
// fwdecl unittest classes // fwdecl unittest classes
namespace TerminalAppLocalTests namespace TerminalAppLocalTests

2
src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "EmptyStringVisibilityConverter.g.h" #include "EmptyStringVisibilityConverter.g.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation namespace winrt::TerminalApp::implementation
{ {

2
src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "HasNestedCommandsVisibilityConverter.g.h" #include "HasNestedCommandsVisibilityConverter.g.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation namespace winrt::TerminalApp::implementation
{ {

2
src/cascadia/TerminalApp/IconPathConverter.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "IconPathConverter.g.h" #include "IconPathConverter.g.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation namespace winrt::TerminalApp::implementation
{ {

2
src/cascadia/TerminalApp/ShortcutActionDispatch.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "ShortcutActionDispatch.g.h" #include "ShortcutActionDispatch.g.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
// fwdecl unittest classes // fwdecl unittest classes
namespace TerminalAppLocalTests namespace TerminalAppLocalTests

2
src/cascadia/TerminalApp/pch.h
View File

@ -60,7 +60,7 @@
#include <TraceLoggingProvider.h> #include <TraceLoggingProvider.h>
#include <winmeta.h> #include <winmeta.h>
TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider); TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
#include <telemetry\ProjectTelemetry.h> #include <telemetry/ProjectTelemetry.h>
#include <TraceLoggingActivity.h> #include <TraceLoggingActivity.h>
#include <shellapi.h> #include <shellapi.h>

2
src/cascadia/TerminalControl/TermControl.cpp
View File

@ -10,7 +10,7 @@
#include <Utils.h> #include <Utils.h>
#include <WinUser.h> #include <WinUser.h>
#include <LibraryResources.h> #include <LibraryResources.h>
#include "..\..\types\inc\GlyphWidth.hpp" #include "../../types/inc/GlyphWidth.hpp"
#include "TermControl.g.cpp" #include "TermControl.g.cpp"
#include "TermControlAutomationPeer.h" #include "TermControlAutomationPeer.h"

2
src/cascadia/TerminalControl/TermControlAutomationPeer.cpp
View File

@ -9,7 +9,7 @@
#include "TermControlAutomationPeer.g.cpp" #include "TermControlAutomationPeer.g.cpp"
#include "XamlUiaTextRange.h" #include "XamlUiaTextRange.h"
#include "..\types\UiaTracing.h" #include "../types/UiaTracing.h"
using namespace Microsoft::Console::Types; using namespace Microsoft::Console::Types;
using namespace winrt::Windows::UI::Xaml::Automation::Peers; using namespace winrt::Windows::UI::Xaml::Automation::Peers;

2
src/cascadia/TerminalSettingsModel/ActionAndArgs.h
View File

@ -5,7 +5,7 @@
#include "ActionAndArgs.g.h" #include "ActionAndArgs.g.h"
#include "TerminalWarnings.h" #include "TerminalWarnings.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Settings::Model::implementation namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{ {

2
src/cascadia/TerminalSettingsModel/Command.h
View File

@ -21,7 +21,7 @@ Author(s):
#include "Command.g.h" #include "Command.g.h"
#include "TerminalWarnings.h" #include "TerminalWarnings.h"
#include "Profile.h" #include "Profile.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
#include "SettingsTypes.h" #include "SettingsTypes.h"
// fwdecl unittest classes // fwdecl unittest classes

2
src/cascadia/TerminalSettingsModel/KeyMapping.h
View File

@ -17,7 +17,7 @@ Author(s):
#include "KeyMapping.g.h" #include "KeyMapping.g.h"
#include "ActionArgs.h" #include "ActionArgs.h"
#include "..\inc\cppwinrt_utils.h" #include "../inc/cppwinrt_utils.h"
// fwdecl unittest classes // fwdecl unittest classes
namespace SettingsModelLocalTests namespace SettingsModelLocalTests

2
src/cascadia/TerminalSettingsModel/pch.h
View File

@ -39,7 +39,7 @@
#include <TraceLoggingProvider.h> #include <TraceLoggingProvider.h>
#include <winmeta.h> #include <winmeta.h>
TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider); TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider);
#include <telemetry\ProjectTelemetry.h> #include <telemetry/ProjectTelemetry.h>
#include <TraceLoggingActivity.h> #include <TraceLoggingActivity.h>
// JsonCpp // JsonCpp

2
src/cascadia/WindowsTerminal/pch.h
View File

@ -64,7 +64,7 @@ Abstract:
#include <TraceLoggingProvider.h> #include <TraceLoggingProvider.h>
#include <winmeta.h> #include <winmeta.h>
TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider); TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider);
#include <telemetry\ProjectTelemetry.h> #include <telemetry/ProjectTelemetry.h>
#include <TraceLoggingActivity.h> #include <TraceLoggingActivity.h>
// For commandline argument processing // For commandline argument processing

2
src/cascadia/WindowsTerminalUniversal/main.cpp
View File

@ -1,6 +1,6 @@
#include "pch.h" #include "pch.h"
#include "winrt\TerminalApp.h" #include "winrt/TerminalApp.h"
int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int) int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
{ {

2
src/cascadia/WindowsTerminalUniversal/pch.h
View File

@ -20,4 +20,4 @@
#include <winrt/Windows.UI.Input.h> #include <winrt/Windows.UI.Input.h>
#include <winrt/Windows.UI.Xaml.h> #include <winrt/Windows.UI.Xaml.h>
#include "..\..\inc\LibraryIncludes.h" #include "../../inc/LibraryIncludes.h"

2
src/host/ApiRoutines.h
View File

@ -17,7 +17,7 @@ Revision History:
#pragma once #pragma once
#include "..\server\IApiRoutines.h" #include "../server/IApiRoutines.h"
class ApiRoutines : public IApiRoutines class ApiRoutines : public IApiRoutines
{ {

2
src/host/CommandListPopup.cpp
View File

@ -12,7 +12,7 @@
#include "dbcs.h" #include "dbcs.h"
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
static constexpr size_t COMMAND_NUMBER_SIZE = 8; // size of command number buffer static constexpr size_t COMMAND_NUMBER_SIZE = 8; // size of command number buffer

2
src/host/CommandNumberPopup.cpp
View File

@ -9,7 +9,7 @@
#include "cmdline.h" #include "cmdline.h"
#include "resource.h" #include "resource.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
// 5 digit number for command history // 5 digit number for command history
static constexpr size_t COMMAND_NUMBER_LENGTH = 5; static constexpr size_t COMMAND_NUMBER_LENGTH = 5;

4
src/host/PtySignalInputThread.cpp
View File

@ -7,8 +7,8 @@
#include "output.h" #include "output.h"
#include "handle.h" #include "handle.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "..\terminal\adapter\DispatchCommon.hpp" #include "../terminal/adapter/DispatchCommon.hpp"
#define PTY_SIGNAL_RESIZE_WINDOW 8u #define PTY_SIGNAL_RESIZE_WINDOW 8u

2
src/host/VtInputThread.hpp
View File

@ -14,7 +14,7 @@ Author(s):
--*/ --*/
#pragma once #pragma once
#include "..\terminal\parser\StateMachine.hpp" #include "../terminal/parser/StateMachine.hpp"
namespace Microsoft::Console namespace Microsoft::Console
{ {

6
src/host/VtIo.hpp
View File

@ -3,9 +3,9 @@
#pragma once #pragma once
#include "..\inc\VtIoModes.hpp" #include "../inc/VtIoModes.hpp"
#include "..\inc\ITerminalOwner.hpp" #include "../inc/ITerminalOwner.hpp"
#include "..\renderer\vt\vtrenderer.hpp" #include "../renderer/vt/vtrenderer.hpp"
#include "VtInputThread.hpp" #include "VtInputThread.hpp"
#include "PtySignalInputThread.hpp" #include "PtySignalInputThread.hpp"

2
src/host/_stream.cpp
View File

@ -19,7 +19,7 @@
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "../types/inc/Viewport.hpp" #include "../types/inc/Viewport.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop
using namespace Microsoft::Console::Types; using namespace Microsoft::Console::Types;

2
src/host/_stream.h
View File

@ -17,7 +17,7 @@ Revision History:
#pragma once #pragma once
#include "..\server\IWaitRoutine.h" #include "../server/IWaitRoutine.h"
#include "writeData.hpp" #include "writeData.hpp"
/*++ /*++

2
src/host/alias.cpp
View File

@ -18,7 +18,7 @@
#include "ApiRoutines.h" #include "ApiRoutines.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

2
src/host/cmdline.cpp
View File

@ -22,7 +22,7 @@
#include "ApiRoutines.h" #include "ApiRoutines.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop
using Microsoft::Console::Interactivity::ServiceLocator; using Microsoft::Console::Interactivity::ServiceLocator;

2
src/host/conapi.h
View File

@ -21,4 +21,4 @@ Revision History:
#include <conmsgl2.h> #include <conmsgl2.h>
#include <conmsgl3.h> #include <conmsgl3.h>
#include "..\server\ApiMessage.h" #include "../server/ApiMessage.h"

2
src/host/conattrs.cpp
View File

@ -14,7 +14,7 @@ Author(s):
--*/ --*/
#include "precomp.h" #include "precomp.h"
#include "..\inc\conattrs.hpp" #include "../inc/conattrs.hpp"
#include <cmath> #include <cmath>
// Function Description: // Function Description:

4
src/host/consoleInformation.cpp
View File

@ -8,8 +8,8 @@
#include "output.h" #include "output.h"
#include "srvinit.h" #include "srvinit.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "..\types\inc\convert.hpp" #include "../types/inc/convert.hpp"
using Microsoft::Console::Interactivity::ServiceLocator; using Microsoft::Console::Interactivity::ServiceLocator;
using Microsoft::Console::Render::BlinkingState; using Microsoft::Console::Render::BlinkingState;

2
src/host/directio.cpp
View File

@ -18,7 +18,7 @@
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "../types/inc/viewport.hpp" #include "../types/inc/viewport.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

2
src/host/exe/resource.h
View File

@ -1,7 +1,7 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by Host.EXE.rc // Used by Host.EXE.rc
#include "..\\resource.h" #include "..//resource.h"
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED

4
src/host/exemain.cpp
View File

@ -5,8 +5,8 @@
#include "ConsoleArguments.hpp" #include "ConsoleArguments.hpp"
#include "srvinit.h" #include "srvinit.h"
#include "..\server\Entrypoints.h" #include "../server/Entrypoints.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
// Define TraceLogging provider // Define TraceLogging provider
TRACELOGGING_DEFINE_PROVIDER( TRACELOGGING_DEFINE_PROVIDER(

2
src/host/ft_host/API_InputTests.cpp
View File

@ -5,7 +5,7 @@
#include <thread> #include <thread>
#include "..\..\interactivity\onecore\SystemConfigurationProvider.hpp" #include "../../interactivity/onecore/SystemConfigurationProvider.hpp"
// some assumptions have been made on this value. only change it if you have a good reason to. // some assumptions have been made on this value. only change it if you have a good reason to.
#define NUMBER_OF_SCENARIO_INPUTS 10 #define NUMBER_OF_SCENARIO_INPUTS 10

2
src/host/ft_host/API_OutputTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "..\types\inc\viewport.hpp" #include "../types/inc/viewport.hpp"
#include <thread> #include <thread>
#include <vector> #include <vector>

2
src/host/ft_host/Common.hpp
View File

@ -17,7 +17,7 @@ Revision History:
#pragma once #pragma once
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
class Common class Common
{ {

2
src/host/ft_host/Message_KeyPressTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include <memory> #include <memory>
#include <utility> #include <utility>

2
src/host/ft_host/OneCoreDelay.hpp
View File

@ -17,7 +17,7 @@ Revision History:
#pragma once #pragma once
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
namespace OneCoreDelay namespace OneCoreDelay
{ {

2
src/host/ft_uia/Common/NativeMethods.cs
View File

@ -330,7 +330,7 @@ namespace Conhost.UIA.Tests.Common.NativeMethods
/// <summary> /// <summary>
/// The definitions within this file match the winconp.h file that is generated from wincon.w /// The definitions within this file match the winconp.h file that is generated from wincon.w
/// Please see \windows\published\main\wincon.w /// Please see /windows/published/main/wincon.w
/// </summary> /// </summary>
public static class WinConP public static class WinConP
{ {

2
src/host/getset.cpp
View File

@ -18,7 +18,7 @@
#include "ApiRoutines.h" #include "ApiRoutines.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

10
src/host/globals.h
View File

@ -22,12 +22,12 @@ Revision History:
#include "ConsoleArguments.hpp" #include "ConsoleArguments.hpp"
#include "ApiRoutines.h" #include "ApiRoutines.h"
#include "..\renderer\inc\IRenderData.hpp" #include "../renderer/inc/IRenderData.hpp"
#include "..\renderer\inc\IRenderEngine.hpp" #include "../renderer/inc/IRenderEngine.hpp"
#include "..\renderer\inc\IRenderer.hpp" #include "../renderer/inc/IRenderer.hpp"
#include "..\renderer\inc\IFontDefaultList.hpp" #include "../renderer/inc/IFontDefaultList.hpp"
#include "..\server\DeviceComm.h" #include "../server/DeviceComm.h"
#include <TraceLoggingProvider.h> #include <TraceLoggingProvider.h>
#include <winmeta.h> #include <winmeta.h>

2
src/host/handle.cpp
View File

@ -4,7 +4,7 @@
#include "precomp.h" #include "precomp.h"
#include "handle.h" #include "handle.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

2
src/host/history.cpp
View File

@ -18,7 +18,7 @@
#include "ApiRoutines.h" #include "ApiRoutines.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

4
src/host/input.cpp
View File

@ -8,9 +8,9 @@
#include "dbcs.h" #include "dbcs.h"
#include "stream.h" #include "stream.h"
#include "..\terminal\input\terminalInput.hpp" #include "../terminal/input/terminalInput.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

2
src/host/inputBuffer.cpp
View File

@ -9,7 +9,7 @@
#include <functional> #include <functional>
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#define INPUT_BUFFER_DEFAULT_INPUT_MODE (ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT) #define INPUT_BUFFER_DEFAULT_INPUT_MODE (ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT | ENABLE_MOUSE_INPUT)

2
src/host/misc.cpp
View File

@ -9,7 +9,7 @@
#include "../types/inc/convert.hpp" #include "../types/inc/convert.hpp"
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

8
src/host/outputStream.hpp
View File

@ -14,9 +14,9 @@ Author:
#pragma once #pragma once
#include "..\terminal\adapter\adaptDefaults.hpp" #include "../terminal/adapter/adaptDefaults.hpp"
#include "..\types\inc\IInputEvent.hpp" #include "../types/inc/IInputEvent.hpp"
#include "..\inc\conattrs.hpp" #include "../inc/conattrs.hpp"
#include "IIoProvider.hpp" #include "IIoProvider.hpp"
class SCREEN_INFORMATION; class SCREEN_INFORMATION;
@ -42,7 +42,7 @@ private:
NTSTATUS _ntstatus; NTSTATUS _ntstatus;
}; };
#include "..\terminal\adapter\conGetSet.hpp" #include "../terminal/adapter/conGetSet.hpp"
// The ConhostInternalGetSet is for the Conhost process to call the entrypoints for its own Get/Set APIs. // The ConhostInternalGetSet is for the Conhost process to call the entrypoints for its own Get/Set APIs.
// Normally, these APIs are accessible from the outside of the conhost process (like by the process being "hosted") through // Normally, these APIs are accessible from the outside of the conhost process (like by the process being "hosted") through

2
src/host/popup.cpp
View File

@ -16,7 +16,7 @@
#include "utils.hpp" #include "utils.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

10
src/host/precomp.h
View File

@ -64,7 +64,7 @@ Abstract:
#include <TraceLoggingProvider.h> #include <TraceLoggingProvider.h>
#include <winmeta.h> #include <winmeta.h>
TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider); TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider);
#include <telemetry\ProjectTelemetry.h> #include <telemetry/ProjectTelemetry.h>
#include <TraceLoggingActivity.h> #include <TraceLoggingActivity.h>
#include "telemetry.hpp" #include "telemetry.hpp"
#include "tracing.hpp" #include "tracing.hpp"
@ -74,7 +74,7 @@ TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider);
#endif #endif
#include <ShellScalingApi.h> #include <ShellScalingApi.h>
#include "..\propslib\conpropsp.hpp" #include "../propslib/conpropsp.hpp"
// Comment to build against the private SDK. // Comment to build against the private SDK.
#define CON_BUILD_PUBLIC #define CON_BUILD_PUBLIC
@ -84,9 +84,9 @@ TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider);
#define CON_DPIAPI_INDIRECT #define CON_DPIAPI_INDIRECT
#endif #endif
#include "..\inc\contsf.h" #include "../inc/contsf.h"
#include "..\inc\operators.hpp" #include "../inc/operators.hpp"
#include "..\inc\conattrs.hpp" #include "../inc/conattrs.hpp"
// TODO: MSFT 9355094 Find a better way of doing this. http://osgvsowi/9355094 // TODO: MSFT 9355094 Find a better way of doing this. http://osgvsowi/9355094
[[nodiscard]] inline NTSTATUS NTSTATUS_FROM_HRESULT(HRESULT hr) [[nodiscard]] inline NTSTATUS NTSTATUS_FROM_HRESULT(HRESULT hr)

2
src/host/readDataCooked.cpp
View File

@ -12,7 +12,7 @@
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "../types/inc/convert.hpp" #include "../types/inc/convert.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#define LINE_INPUT_BUFFER_SIZE (256 * sizeof(WCHAR)) #define LINE_INPUT_BUFFER_SIZE (256 * sizeof(WCHAR))

2
src/host/readDataDirect.cpp
View File

@ -6,7 +6,7 @@
#include "dbcs.h" #include "dbcs.h"
#include "misc.h" #include "misc.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
// Routine Description: // Routine Description:
// - Constructs direct read data class to hold context across sessions // - Constructs direct read data class to hold context across sessions

2
src/host/readDataRaw.cpp
View File

@ -7,7 +7,7 @@
#include "stream.h" #include "stream.h"
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
// Routine Description: // Routine Description:
// - Constructs raw read data class to hold context across sessions // - Constructs raw read data class to hold context across sessions

2
src/host/registry.cpp
View File

@ -8,7 +8,7 @@
#include "dbcs.h" #include "dbcs.h"
#include "srvinit.h" #include "srvinit.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

2
src/host/renderData.cpp
View File

@ -7,7 +7,7 @@
#include "dbcs.h" #include "dbcs.h"
#include "handle.h" #include "handle.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

4
src/host/renderData.hpp
View File

@ -14,8 +14,8 @@ Author(s):
#pragma once #pragma once
#include "..\renderer\inc\IRenderData.hpp" #include "../renderer/inc/IRenderData.hpp"
#include "..\types\IUiaData.h" #include "../types/IUiaData.h"
class RenderData final : class RenderData final :
public Microsoft::Console::Render::IRenderData, public Microsoft::Console::Render::IRenderData,

2
src/host/renderFontDefaults.hpp
View File

@ -14,7 +14,7 @@ Author(s):
#pragma once #pragma once
#include "..\renderer\inc\IFontDefaultList.hpp" #include "../renderer/inc/IFontDefaultList.hpp"
class RenderFontDefaults sealed : public Microsoft::Console::Render::IFontDefaultList class RenderFontDefaults sealed : public Microsoft::Console::Render::IFontDefaultList
{ {

2
src/host/scrolling.cpp
View File

@ -7,7 +7,7 @@
#include "selection.hpp" #include "selection.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
using Microsoft::Console::VirtualTerminal::StateMachine; using Microsoft::Console::VirtualTerminal::StateMachine;
using namespace Microsoft::Console::Interactivity; using namespace Microsoft::Console::Interactivity;

4
src/host/selection.hpp
View File

@ -20,8 +20,8 @@ Revision History:
#include "input.h" #include "input.h"
#include "..\interactivity\inc\IAccessibilityNotifier.hpp" #include "../interactivity/inc/IAccessibilityNotifier.hpp"
#include "..\interactivity\inc\IConsoleWindow.hpp" #include "../interactivity/inc/IConsoleWindow.hpp"
class Selection class Selection
{ {

2
src/host/selectionInput.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "..\buffer\out\search.h" #include "../buffer/out/search.h"
#include "../interactivity/inc/ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "../types/inc/convert.hpp" #include "../types/inc/convert.hpp"

2
src/host/selectionState.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "../types/inc/viewport.hpp" #include "../types/inc/viewport.hpp"

10
src/host/server.h
View File

@ -24,11 +24,11 @@ Revision History:
#include "VtIo.hpp" #include "VtIo.hpp"
#include "CursorBlinker.hpp" #include "CursorBlinker.hpp"
#include "..\server\ProcessList.h" #include "../server/ProcessList.h"
#include "..\server\WaitQueue.h" #include "../server/WaitQueue.h"
#include "..\host\RenderData.hpp" #include "../host/RenderData.hpp"
#include "..\renderer\inc\BlinkingState.hpp" #include "../renderer/inc/BlinkingState.hpp"
// clang-format off // clang-format off
// Flags flags // Flags flags
@ -169,6 +169,6 @@ private:
#define CONSOLE_STATUS_READ_COMPLETE 0xC0030002 #define CONSOLE_STATUS_READ_COMPLETE 0xC0030002
#define CONSOLE_STATUS_WAIT_NO_BLOCK 0xC0030003 #define CONSOLE_STATUS_WAIT_NO_BLOCK 0xC0030003
#include "..\server\ObjectHandle.h" #include "../server/ObjectHandle.h"
void SetActiveScreenBuffer(SCREEN_INFORMATION& screenInfo); void SetActiveScreenBuffer(SCREEN_INFORMATION& screenInfo);

2
src/host/settings.cpp
View File

@ -4,7 +4,7 @@
#include "precomp.h" #include "precomp.h"
#include "settings.hpp" #include "settings.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "../types/inc/colorTable.hpp" #include "../types/inc/colorTable.hpp"
#pragma hdrstop #pragma hdrstop

8
src/host/srvinit.cpp
View File

@ -14,11 +14,11 @@
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "..\server\Entrypoints.h" #include "../server/Entrypoints.h"
#include "..\server\IoSorter.h" #include "../server/IoSorter.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "..\interactivity\base\ApiDetector.hpp" #include "../interactivity/base/ApiDetector.hpp"
#include "renderData.hpp" #include "renderData.hpp"
#include "../renderer/base/renderer.hpp" #include "../renderer/base/renderer.hpp"

2
src/host/stream.cpp
View File

@ -15,7 +15,7 @@
#include "../types/inc/GlyphWidth.hpp" #include "../types/inc/GlyphWidth.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#pragma hdrstop #pragma hdrstop

2
src/host/stream.h
View File

@ -17,7 +17,7 @@ Revision History:
#pragma once #pragma once
#include "cmdline.h" #include "cmdline.h"
#include "..\server\IWaitRoutine.h" #include "../server/IWaitRoutine.h"
#include "readData.hpp" #include "readData.hpp"
#define IS_CONTROL_CHAR(wch) ((wch) < L' ') #define IS_CONTROL_CHAR(wch) ((wch) < L' ')

2
src/host/telemetry.cpp
View File

@ -10,7 +10,7 @@
#include "history.h" #include "history.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
TRACELOGGING_DEFINE_PROVIDER(g_hConhostV2EventTraceProvider, TRACELOGGING_DEFINE_PROVIDER(g_hConhostV2EventTraceProvider,
"Microsoft.Windows.Console.Host", "Microsoft.Windows.Console.Host",

2
src/host/telemetry.hpp
View File

@ -189,7 +189,7 @@ private:
}; };
// Log the RIPMSG through telemetry, and also through a normal OutputDebugStringW call. // Log the RIPMSG through telemetry, and also through a normal OutputDebugStringW call.
// These are drop-in substitutes for the RIPMSG0-4 macros from \windows\Core\ntcon2\conhost\consrv.h // These are drop-in substitutes for the RIPMSG0-4 macros from /windows/Core/ntcon2/conhost/consrv.h
#define RIPMSG0(flags, msg) Telemetry::Instance().LogRipMessage(msg); #define RIPMSG0(flags, msg) Telemetry::Instance().LogRipMessage(msg);
#define RIPMSG1(flags, msg, a) Telemetry::Instance().LogRipMessage(msg, a); #define RIPMSG1(flags, msg, a) Telemetry::Instance().LogRipMessage(msg, a);
#define RIPMSG2(flags, msg, a, b) Telemetry::Instance().LogRipMessage(msg, a, b); #define RIPMSG2(flags, msg, a, b) Telemetry::Instance().LogRipMessage(msg, a, b);

2
src/host/ut_host/AliasTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "alias.h" #include "alias.h"

4
src/host/ut_host/ApiRoutinesTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
@ -12,7 +12,7 @@
#include "dbcs.h" #include "dbcs.h"
#include "misc.h" #include "misc.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
using namespace Microsoft::Console::Types; using namespace Microsoft::Console::Types;
using namespace WEX::Logging; using namespace WEX::Logging;

2
src/host/ut_host/AttrRowTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

6
src/host/ut_host/ClipboardTests.cpp
View File

@ -8,15 +8,15 @@
#include "globals.h" #include "globals.h"
#include "..\interactivity\win32\Clipboard.hpp" #include "../interactivity/win32/Clipboard.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "dbcs.h" #include "dbcs.h"
#include <cctype> #include <cctype>
#ifdef BUILD_ONECORE_INTERACTIVITY #ifdef BUILD_ONECORE_INTERACTIVITY
#include "..\..\interactivity\inc\VtApiRedirection.hpp" #include "../../interactivity/inc/VtApiRedirection.hpp"
#endif #endif
#include "../../inc/consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"

2
src/host/ut_host/CodepointWidthDetectorTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
#include "../types/inc/CodepointWidthDetector.hpp" #include "../types/inc/CodepointWidthDetector.hpp"

2
src/host/ut_host/CommandLineTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

2
src/host/ut_host/CommandListPopupTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

2
src/host/ut_host/CommandNumberPopupTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
#include "PopupTestHelper.hpp" #include "PopupTestHelper.hpp"

2
src/host/ut_host/ConsoleArgumentsTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "globals.h" #include "globals.h"
#include "../ConsoleArguments.hpp" #include "../ConsoleArguments.hpp"

2
src/host/ut_host/CopyFromCharPopupTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
#include "PopupTestHelper.hpp" #include "PopupTestHelper.hpp"

2
src/host/ut_host/CopyToCharPopupTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
#include "PopupTestHelper.hpp" #include "PopupTestHelper.hpp"

2
src/host/ut_host/DbcsTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

2
src/host/ut_host/HistoryTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

2
src/host/ut_host/InitTests.cpp
View File

@ -9,7 +9,7 @@
#include "globals.h" #include "globals.h"
#include "srvinit.h" #include "srvinit.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
using namespace WEX::Logging; using namespace WEX::Logging;
using namespace WEX::TestExecution; using namespace WEX::TestExecution;

6
src/host/ut_host/InputBufferTests.cpp
View File

@ -3,11 +3,11 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "..\types\inc\IInputEvent.hpp" #include "../types/inc/IInputEvent.hpp"
using namespace WEX::Logging; using namespace WEX::Logging;
using Microsoft::Console::Interactivity::ServiceLocator; using Microsoft::Console::Interactivity::ServiceLocator;

2
src/host/ut_host/ObjectTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

2
src/host/ut_host/OutputCellIteratorTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "../buffer/out/outputCellIterator.hpp" #include "../buffer/out/outputCellIterator.hpp"

4
src/host/ut_host/RendererTests.cpp
View File

@ -6,8 +6,8 @@
#include "CommonState.hpp" #include "CommonState.hpp"
#include "..\..\host\renderData.hpp" #include "../../host/renderData.hpp"
#include "..\..\renderer\base\renderer.hpp" #include "../../renderer/base/renderer.hpp"
using namespace WEX::Logging; using namespace WEX::Logging;
using namespace WEX::TestExecution; using namespace WEX::TestExecution;

8
src/host/ut_host/ScreenBufferTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
@ -13,9 +13,9 @@
#include "getset.h" #include "getset.h"
#include "_stream.h" // For WriteCharsLegacy #include "_stream.h" // For WriteCharsLegacy
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "..\..\inc\conattrs.hpp" #include "../../inc/conattrs.hpp"
#include "..\..\types\inc\Viewport.hpp" #include "../../types/inc/Viewport.hpp"
#include <sstream> #include <sstream>

4
src/host/ut_host/SearchTests.cpp
View File

@ -3,11 +3,11 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
#include "..\buffer\out\search.h" #include "../buffer/out/search.h"
using namespace WEX::Common; using namespace WEX::Common;
using namespace WEX::Logging; using namespace WEX::Logging;

4
src/host/ut_host/SelectionTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
@ -12,7 +12,7 @@
#include "selection.hpp" #include "selection.hpp"
#include "cmdline.h" #include "cmdline.h"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
using namespace WEX::Common; using namespace WEX::Common;
using namespace WEX::Logging; using namespace WEX::Logging;

2
src/host/ut_host/TextBufferIteratorTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

2
src/host/ut_host/TitleTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "srvinit.h" #include "srvinit.h"

4
src/host/ut_host/UtilsTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"
@ -13,7 +13,7 @@
#include "utils.hpp" #include "utils.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
using namespace WEX::Common; using namespace WEX::Common;
using namespace WEX::Logging; using namespace WEX::Logging;

2
src/host/ut_host/ViewportTests.cpp
View File

@ -3,7 +3,7 @@
#include "precomp.h" #include "precomp.h"
#include "WexTestClass.h" #include "WexTestClass.h"
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "CommonState.hpp" #include "CommonState.hpp"

16
src/host/ut_host/VtIoTests.cpp
View File

@ -3,17 +3,17 @@
#include "precomp.h" #include "precomp.h"
#include <wextestclass.h> #include <wextestclass.h>
#include "..\..\inc\consoletaeftemplates.hpp" #include "../../inc/consoletaeftemplates.hpp"
#include "..\..\types\inc\Viewport.hpp" #include "../../types/inc/Viewport.hpp"
#include "..\..\renderer\vt\Xterm256Engine.hpp" #include "../../renderer/vt/Xterm256Engine.hpp"
#include "..\..\renderer\vt\XtermEngine.hpp" #include "../../renderer/vt/XtermEngine.hpp"
#include "..\..\renderer\base\Renderer.hpp" #include "../../renderer/base/Renderer.hpp"
#include "..\Settings.hpp" #include "../Settings.hpp"
#include "..\VtIo.hpp" #include "../VtIo.hpp"
#ifndef __INSIDE_WINDOWS #ifndef __INSIDE_WINDOWS
#include "..\..\renderer\dx\DxRenderer.hpp" #include "../../renderer/dx/DxRenderer.hpp"
#endif #endif
using namespace WEX::Common; using namespace WEX::Common;

2
src/host/utils.cpp
View File

@ -5,7 +5,7 @@
#include "utils.hpp" #include "utils.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
#include "srvinit.h" #include "srvinit.h"

2
src/host/utils.hpp
View File

@ -17,7 +17,7 @@ Author(s):
#include "conapi.h" #include "conapi.h"
#include "server.h" #include "server.h"
#include "..\server\ObjectHandle.h" #include "../server/ObjectHandle.h"
#define RECT_WIDTH(x) ((x)->right - (x)->left) #define RECT_WIDTH(x) ((x)->right - (x)->left)
#define RECT_HEIGHT(x) ((x)->bottom - (x)->top) #define RECT_HEIGHT(x) ((x)->bottom - (x)->top)

4
src/host/writeData.cpp
View File

@ -5,9 +5,9 @@
#include "writeData.hpp" #include "writeData.hpp"
#include "_stream.h" #include "_stream.h"
#include "..\types\inc\convert.hpp" #include "../types/inc/convert.hpp"
#include "..\interactivity\inc\ServiceLocator.hpp" #include "../interactivity/inc/ServiceLocator.hpp"
// Routine Description: // Routine Description:
// - Creates a new write data object for used in servicing write console requests // - Creates a new write data object for used in servicing write console requests

14
src/interactivity/base/InteractivityFactory.cpp
View File

@ -15,13 +15,13 @@
#include "..\onecore\WindowMetrics.hpp" #include "..\onecore\WindowMetrics.hpp"
#endif #endif
#include "..\win32\AccessibilityNotifier.hpp" #include "../win32/AccessibilityNotifier.hpp"
#include "..\win32\ConsoleControl.hpp" #include "../win32/ConsoleControl.hpp"
#include "..\win32\ConsoleInputThread.hpp" #include "../win32/ConsoleInputThread.hpp"
#include "..\win32\InputServices.hpp" #include "../win32/InputServices.hpp"
#include "..\win32\WindowDpiApi.hpp" #include "../win32/WindowDpiApi.hpp"
#include "..\win32\WindowMetrics.hpp" #include "../win32/WindowMetrics.hpp"
#include "..\win32\SystemConfigurationProvider.hpp" #include "../win32/SystemConfigurationProvider.hpp"
#pragma hdrstop #pragma hdrstop

Some files were not shown because too many files have changed in this diff Show More