From d09fdd61cbb11b7ef2ccdd4820349ffe898ad583 Mon Sep 17 00:00:00 2001 From: N <71219152+PokeCodec@users.noreply.github.com> Date: Wed, 25 Nov 2020 16:02:10 -0500 Subject: [PATCH] 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. --- .../actions/spell-check/dictionary/apis.txt | 1 + doc/WIL.md | 4 +- src/buffer/out/precomp.h | 4 +- src/buffer/out/ut_textbuffer/precomp.h | 6 +-- src/cascadia/ShellExtension/pch.h | 2 +- src/cascadia/TerminalApp/AppKeyBindings.h | 2 +- .../EmptyStringVisibilityConverter.h | 2 +- .../HasNestedCommandsVisibilityConverter.h | 2 +- src/cascadia/TerminalApp/IconPathConverter.h | 2 +- .../TerminalApp/ShortcutActionDispatch.h | 2 +- src/cascadia/TerminalApp/pch.h | 2 +- src/cascadia/TerminalControl/TermControl.cpp | 2 +- .../TermControlAutomationPeer.cpp | 2 +- .../TerminalSettingsModel/ActionAndArgs.h | 2 +- src/cascadia/TerminalSettingsModel/Command.h | 2 +- .../TerminalSettingsModel/KeyMapping.h | 2 +- src/cascadia/TerminalSettingsModel/pch.h | 2 +- src/cascadia/WindowsTerminal/pch.h | 2 +- .../WindowsTerminalUniversal/main.cpp | 2 +- src/cascadia/WindowsTerminalUniversal/pch.h | 2 +- src/host/ApiRoutines.h | 2 +- src/host/CommandListPopup.cpp | 2 +- src/host/CommandNumberPopup.cpp | 2 +- src/host/PtySignalInputThread.cpp | 4 +- src/host/VtInputThread.hpp | 2 +- src/host/VtIo.hpp | 6 +-- src/host/_stream.cpp | 2 +- src/host/_stream.h | 2 +- src/host/alias.cpp | 2 +- src/host/cmdline.cpp | 2 +- src/host/conapi.h | 2 +- src/host/conattrs.cpp | 2 +- src/host/consoleInformation.cpp | 4 +- src/host/directio.cpp | 2 +- src/host/exe/resource.h | 2 +- src/host/exemain.cpp | 4 +- src/host/ft_host/API_InputTests.cpp | 2 +- src/host/ft_host/API_OutputTests.cpp | 2 +- src/host/ft_host/Common.hpp | 2 +- src/host/ft_host/Message_KeyPressTests.cpp | 2 +- src/host/ft_host/OneCoreDelay.hpp | 2 +- src/host/ft_uia/Common/NativeMethods.cs | 2 +- src/host/getset.cpp | 2 +- src/host/globals.h | 10 ++--- src/host/handle.cpp | 2 +- src/host/history.cpp | 2 +- src/host/input.cpp | 4 +- src/host/inputBuffer.cpp | 2 +- src/host/misc.cpp | 2 +- src/host/outputStream.hpp | 8 ++-- src/host/popup.cpp | 2 +- src/host/precomp.h | 10 ++--- src/host/readDataCooked.cpp | 2 +- src/host/readDataDirect.cpp | 2 +- src/host/readDataRaw.cpp | 2 +- src/host/registry.cpp | 2 +- src/host/renderData.cpp | 2 +- src/host/renderData.hpp | 4 +- src/host/renderFontDefaults.hpp | 2 +- src/host/scrolling.cpp | 2 +- src/host/selection.hpp | 4 +- src/host/selectionInput.cpp | 2 +- src/host/selectionState.cpp | 2 +- src/host/server.h | 10 ++--- src/host/settings.cpp | 2 +- src/host/srvinit.cpp | 8 ++-- src/host/stream.cpp | 2 +- src/host/stream.h | 2 +- src/host/telemetry.cpp | 2 +- src/host/telemetry.hpp | 2 +- src/host/ut_host/AliasTests.cpp | 2 +- src/host/ut_host/ApiRoutinesTests.cpp | 4 +- src/host/ut_host/AttrRowTests.cpp | 2 +- src/host/ut_host/ClipboardTests.cpp | 6 +-- .../ut_host/CodepointWidthDetectorTests.cpp | 2 +- src/host/ut_host/CommandLineTests.cpp | 2 +- src/host/ut_host/CommandListPopupTests.cpp | 2 +- src/host/ut_host/CommandNumberPopupTests.cpp | 2 +- src/host/ut_host/ConsoleArgumentsTests.cpp | 2 +- src/host/ut_host/CopyFromCharPopupTests.cpp | 2 +- src/host/ut_host/CopyToCharPopupTests.cpp | 2 +- src/host/ut_host/DbcsTests.cpp | 2 +- src/host/ut_host/HistoryTests.cpp | 2 +- src/host/ut_host/InitTests.cpp | 2 +- src/host/ut_host/InputBufferTests.cpp | 6 +-- src/host/ut_host/ObjectTests.cpp | 2 +- src/host/ut_host/OutputCellIteratorTests.cpp | 2 +- src/host/ut_host/RendererTests.cpp | 4 +- src/host/ut_host/ScreenBufferTests.cpp | 8 ++-- src/host/ut_host/SearchTests.cpp | 4 +- src/host/ut_host/SelectionTests.cpp | 4 +- src/host/ut_host/TextBufferIteratorTests.cpp | 2 +- src/host/ut_host/TitleTests.cpp | 2 +- src/host/ut_host/UtilsTests.cpp | 4 +- src/host/ut_host/ViewportTests.cpp | 2 +- src/host/ut_host/VtIoTests.cpp | 16 ++++---- src/host/utils.cpp | 2 +- src/host/utils.hpp | 2 +- src/host/writeData.cpp | 4 +- .../base/InteractivityFactory.cpp | 14 +++---- .../base/InteractivityFactory.hpp | 2 +- src/interactivity/base/ServiceLocator.cpp | 2 +- src/interactivity/base/VtApiRedirection.cpp | 4 +- src/interactivity/base/precomp.h | 2 +- .../onecore/AccessibilityNotifier.hpp | 2 +- src/interactivity/onecore/BgfxEngine.cpp | 2 +- src/interactivity/onecore/BgfxEngine.hpp | 2 +- src/interactivity/onecore/ConIoSrvComm.cpp | 8 ++-- src/interactivity/onecore/ConIoSrvComm.hpp | 4 +- src/interactivity/onecore/ConsoleControl.hpp | 2 +- .../onecore/ConsoleInputThread.cpp | 4 +- .../onecore/ConsoleInputThread.hpp | 2 +- src/interactivity/onecore/ConsoleWindow.cpp | 4 +- src/interactivity/onecore/ConsoleWindow.hpp | 2 +- .../onecore/SystemConfigurationProvider.hpp | 2 +- src/interactivity/onecore/WindowMetrics.cpp | 4 +- src/interactivity/onecore/WindowMetrics.hpp | 2 +- src/interactivity/onecore/precomp.h | 2 +- .../win32/AccessibilityNotifier.cpp | 2 +- .../win32/AccessibilityNotifier.hpp | 2 +- src/interactivity/win32/Clipboard.cpp | 14 +++---- src/interactivity/win32/ConsoleControl.cpp | 2 +- src/interactivity/win32/ConsoleControl.hpp | 2 +- .../win32/ConsoleInputThread.hpp | 2 +- src/interactivity/win32/InputServices.hpp | 2 +- .../win32/SystemConfigurationProvider.cpp | 2 +- .../win32/SystemConfigurationProvider.hpp | 2 +- src/interactivity/win32/WindowIme.cpp | 2 +- src/interactivity/win32/WindowMetrics.cpp | 2 +- src/interactivity/win32/WindowMetrics.hpp | 2 +- src/interactivity/win32/clipboard.hpp | 2 +- src/interactivity/win32/find.cpp | 8 ++-- src/interactivity/win32/icon.cpp | 2 +- src/interactivity/win32/menu.cpp | 16 ++++---- src/interactivity/win32/precomp.h | 2 +- .../win32/screenInfoUiaProvider.hpp | 4 +- src/interactivity/win32/uiaTextRange.cpp | 2 +- src/interactivity/win32/uiaTextRange.hpp | 2 +- .../UiaTextRangeTests.cpp | 2 +- src/interactivity/win32/window.cpp | 38 +++++++++---------- src/interactivity/win32/window.hpp | 2 +- src/interactivity/win32/windowdpiapi.hpp | 2 +- src/interactivity/win32/windowio.cpp | 14 +++---- src/interactivity/win32/windowio.hpp | 2 +- src/interactivity/win32/windowproc.cpp | 26 ++++++------- src/internal/stubs.cpp | 2 +- src/propsheet/PropSheetHandler.cpp | 6 +-- src/propsheet/precomp.h | 2 +- src/propslib/precomp.h | 2 +- src/renderer/base/FontInfoBase.cpp | 2 +- src/renderer/base/FontInfoDesired.cpp | 2 +- src/renderer/base/fontinfo.cpp | 2 +- src/renderer/base/precomp.h | 4 +- src/renderer/base/thread.hpp | 4 +- src/renderer/dx/precomp.h | 2 +- .../dx/ut_dx/CustomTextLayoutTests.cpp | 4 +- src/renderer/gdi/gdirenderer.hpp | 2 +- src/renderer/vt/tracing.hpp | 2 +- src/renderer/wddmcon/WddmConRenderer.hpp | 2 +- src/server/ApiDispatchersInternal.cpp | 12 +++--- src/server/DeviceComm.h | 4 +- src/server/IoDispatchers.cpp | 14 +++---- src/server/IoSorter.cpp | 6 +-- src/server/ObjectHandle.cpp | 10 ++--- src/server/ObjectHeader.cpp | 2 +- src/server/ProcessHandle.cpp | 4 +- src/server/ProcessHandle.h | 2 +- src/server/ProcessList.cpp | 8 ++-- src/server/ProcessPolicy.cpp | 2 +- src/server/WaitBlock.cpp | 6 +-- src/server/WaitBlock.h | 2 +- src/server/WaitQueue.cpp | 4 +- src/server/WaitQueue.h | 2 +- src/server/precomp.h | 2 +- src/terminal/adapter/conGetSet.hpp | 6 +-- src/terminal/adapter/precomp.h | 2 +- src/terminal/adapter/telemetry.hpp | 2 +- .../adapter/ut_adapter/MouseInputTest.cpp | 4 +- .../adapter/ut_adapter/adapterTest.cpp | 2 +- src/terminal/adapter/ut_adapter/inputTest.cpp | 8 ++-- src/terminal/input/mouseInput.cpp | 2 +- src/terminal/input/precomp.h | 2 +- src/terminal/input/terminalInput.cpp | 8 ++-- src/terminal/parser/ft_fuzzwrapper/main.cpp | 4 +- src/tools/buffersize/main.cpp | 10 ++--- src/tools/echokey/main.cpp | 4 +- src/tools/fontlist/main.cpp | 2 +- src/tools/vtpipeterm/VtConsole.cpp | 2 +- src/tools/vtpipeterm/VtConsole.hpp | 4 +- src/tools/vtpipeterm/main.cpp | 10 ++--- src/tsf/precomp.h | 2 +- src/types/TermControlUiaTextRange.hpp | 2 +- src/types/UiaTextRangeBase.cpp | 2 +- src/types/inc/IInputEvent.hpp | 6 +-- src/types/precomp.h | 2 +- src/types/ut_types/UtilsTests.cpp | 6 +-- src/types/ut_types/UuidTests.cpp | 4 +- 197 files changed, 369 insertions(+), 368 deletions(-) diff --git a/.github/actions/spell-check/dictionary/apis.txt b/.github/actions/spell-check/dictionary/apis.txt index 867d3c831f..36b4f0fb84 100644 --- a/.github/actions/spell-check/dictionary/apis.txt +++ b/.github/actions/spell-check/dictionary/apis.txt @@ -46,6 +46,7 @@ NCRBUTTONDBLCLK NOAGGREGATION NOPROGRESS NOREDIRECTIONBITMAP +ntprivapi oaidl ocidl otms diff --git a/doc/WIL.md b/doc/WIL.md index 3dbd52a948..3caf0487fc 100644 --- a/doc/WIL.md +++ b/doc/WIL.md @@ -9,13 +9,13 @@ The primary usages of WIL in our code so far are... ### 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. ### 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. diff --git a/src/buffer/out/precomp.h b/src/buffer/out/precomp.h index b81322c901..8c7f99f9da 100644 --- a/src/buffer/out/precomp.h +++ b/src/buffer/out/precomp.h @@ -32,8 +32,8 @@ Abstract: #include // private dependencies -#include "..\inc\operators.hpp" -#include "..\inc\unicode.hpp" +#include "../inc/operators.hpp" +#include "../inc/unicode.hpp" #pragma warning(pop) // clang-format on diff --git a/src/buffer/out/ut_textbuffer/precomp.h b/src/buffer/out/ut_textbuffer/precomp.h index e5fb1dd090..1bfdfaa080 100644 --- a/src/buffer/out/ut_textbuffer/precomp.h +++ b/src/buffer/out/ut_textbuffer/precomp.h @@ -33,9 +33,9 @@ Abstract: #include // private dependencies -#include "..\host\conddkrefs.h" -#include "..\inc\operators.hpp" -#include "..\inc\unicode.hpp" +#include "../host/conddkrefs.h" +#include "../inc/operators.hpp" +#include "../inc/unicode.hpp" #pragma warning(pop) // clang-format on diff --git a/src/cascadia/ShellExtension/pch.h b/src/cascadia/ShellExtension/pch.h index 5962c68100..b5236947b4 100644 --- a/src/cascadia/ShellExtension/pch.h +++ b/src/cascadia/ShellExtension/pch.h @@ -27,4 +27,4 @@ #include #include -#include +#include diff --git a/src/cascadia/TerminalApp/AppKeyBindings.h b/src/cascadia/TerminalApp/AppKeyBindings.h index 19891d5ed6..5d790a0310 100644 --- a/src/cascadia/TerminalApp/AppKeyBindings.h +++ b/src/cascadia/TerminalApp/AppKeyBindings.h @@ -5,7 +5,7 @@ #include "AppKeyBindings.g.h" #include "ShortcutActionDispatch.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" // fwdecl unittest classes namespace TerminalAppLocalTests diff --git a/src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h b/src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h index bf6b9bbe9a..a982aed4d3 100644 --- a/src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h +++ b/src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h @@ -1,7 +1,7 @@ #pragma once #include "EmptyStringVisibilityConverter.g.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h b/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h index e8526b8b48..69c989b00a 100644 --- a/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h +++ b/src/cascadia/TerminalApp/HasNestedCommandsVisibilityConverter.h @@ -1,7 +1,7 @@ #pragma once #include "HasNestedCommandsVisibilityConverter.g.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/IconPathConverter.h b/src/cascadia/TerminalApp/IconPathConverter.h index 2dabd47f9c..d1c59d2118 100644 --- a/src/cascadia/TerminalApp/IconPathConverter.h +++ b/src/cascadia/TerminalApp/IconPathConverter.h @@ -1,7 +1,7 @@ #pragma once #include "IconPathConverter.g.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/ShortcutActionDispatch.h b/src/cascadia/TerminalApp/ShortcutActionDispatch.h index 2a9712a94c..2187e67df3 100644 --- a/src/cascadia/TerminalApp/ShortcutActionDispatch.h +++ b/src/cascadia/TerminalApp/ShortcutActionDispatch.h @@ -4,7 +4,7 @@ #pragma once #include "ShortcutActionDispatch.g.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" // fwdecl unittest classes namespace TerminalAppLocalTests diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h index ad57dccc52..9c5c880527 100644 --- a/src/cascadia/TerminalApp/pch.h +++ b/src/cascadia/TerminalApp/pch.h @@ -60,7 +60,7 @@ #include #include TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider); -#include +#include #include #include diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index 01eee9c269..74a0d8c535 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "..\..\types\inc\GlyphWidth.hpp" +#include "../../types/inc/GlyphWidth.hpp" #include "TermControl.g.cpp" #include "TermControlAutomationPeer.h" diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp index 94f0ef0e36..80ab74ada9 100644 --- a/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp +++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.cpp @@ -9,7 +9,7 @@ #include "TermControlAutomationPeer.g.cpp" #include "XamlUiaTextRange.h" -#include "..\types\UiaTracing.h" +#include "../types/UiaTracing.h" using namespace Microsoft::Console::Types; using namespace winrt::Windows::UI::Xaml::Automation::Peers; diff --git a/src/cascadia/TerminalSettingsModel/ActionAndArgs.h b/src/cascadia/TerminalSettingsModel/ActionAndArgs.h index 7bea215d7b..b8783b2743 100644 --- a/src/cascadia/TerminalSettingsModel/ActionAndArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionAndArgs.h @@ -5,7 +5,7 @@ #include "ActionAndArgs.g.h" #include "TerminalWarnings.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" namespace winrt::Microsoft::Terminal::Settings::Model::implementation { diff --git a/src/cascadia/TerminalSettingsModel/Command.h b/src/cascadia/TerminalSettingsModel/Command.h index 8cbd9e5fd0..552f5d702f 100644 --- a/src/cascadia/TerminalSettingsModel/Command.h +++ b/src/cascadia/TerminalSettingsModel/Command.h @@ -21,7 +21,7 @@ Author(s): #include "Command.g.h" #include "TerminalWarnings.h" #include "Profile.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" #include "SettingsTypes.h" // fwdecl unittest classes diff --git a/src/cascadia/TerminalSettingsModel/KeyMapping.h b/src/cascadia/TerminalSettingsModel/KeyMapping.h index aba3293685..d8c9c2ad72 100644 --- a/src/cascadia/TerminalSettingsModel/KeyMapping.h +++ b/src/cascadia/TerminalSettingsModel/KeyMapping.h @@ -17,7 +17,7 @@ Author(s): #include "KeyMapping.g.h" #include "ActionArgs.h" -#include "..\inc\cppwinrt_utils.h" +#include "../inc/cppwinrt_utils.h" // fwdecl unittest classes namespace SettingsModelLocalTests diff --git a/src/cascadia/TerminalSettingsModel/pch.h b/src/cascadia/TerminalSettingsModel/pch.h index d658fdf7d5..9b5b6fa443 100644 --- a/src/cascadia/TerminalSettingsModel/pch.h +++ b/src/cascadia/TerminalSettingsModel/pch.h @@ -39,7 +39,7 @@ #include #include TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider); -#include +#include #include // JsonCpp diff --git a/src/cascadia/WindowsTerminal/pch.h b/src/cascadia/WindowsTerminal/pch.h index bdf98d0d7d..fc11fec8f4 100644 --- a/src/cascadia/WindowsTerminal/pch.h +++ b/src/cascadia/WindowsTerminal/pch.h @@ -64,7 +64,7 @@ Abstract: #include #include TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider); -#include +#include #include // For commandline argument processing diff --git a/src/cascadia/WindowsTerminalUniversal/main.cpp b/src/cascadia/WindowsTerminalUniversal/main.cpp index 73e8d87f5a..0d2f2c7859 100644 --- a/src/cascadia/WindowsTerminalUniversal/main.cpp +++ b/src/cascadia/WindowsTerminalUniversal/main.cpp @@ -1,6 +1,6 @@ #include "pch.h" -#include "winrt\TerminalApp.h" +#include "winrt/TerminalApp.h" int __stdcall wWinMain(HINSTANCE, HINSTANCE, PWSTR, int) { diff --git a/src/cascadia/WindowsTerminalUniversal/pch.h b/src/cascadia/WindowsTerminalUniversal/pch.h index e0309d5b3f..61ff239414 100644 --- a/src/cascadia/WindowsTerminalUniversal/pch.h +++ b/src/cascadia/WindowsTerminalUniversal/pch.h @@ -20,4 +20,4 @@ #include #include -#include "..\..\inc\LibraryIncludes.h" +#include "../../inc/LibraryIncludes.h" diff --git a/src/host/ApiRoutines.h b/src/host/ApiRoutines.h index 13a06ce72e..107cc68780 100644 --- a/src/host/ApiRoutines.h +++ b/src/host/ApiRoutines.h @@ -17,7 +17,7 @@ Revision History: #pragma once -#include "..\server\IApiRoutines.h" +#include "../server/IApiRoutines.h" class ApiRoutines : public IApiRoutines { diff --git a/src/host/CommandListPopup.cpp b/src/host/CommandListPopup.cpp index 4143b19548..4aabc3f63a 100644 --- a/src/host/CommandListPopup.cpp +++ b/src/host/CommandListPopup.cpp @@ -12,7 +12,7 @@ #include "dbcs.h" #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 diff --git a/src/host/CommandNumberPopup.cpp b/src/host/CommandNumberPopup.cpp index fbbfff05cd..6b819350ad 100644 --- a/src/host/CommandNumberPopup.cpp +++ b/src/host/CommandNumberPopup.cpp @@ -9,7 +9,7 @@ #include "cmdline.h" #include "resource.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" // 5 digit number for command history static constexpr size_t COMMAND_NUMBER_LENGTH = 5; diff --git a/src/host/PtySignalInputThread.cpp b/src/host/PtySignalInputThread.cpp index 929baecef7..d6a6940a10 100644 --- a/src/host/PtySignalInputThread.cpp +++ b/src/host/PtySignalInputThread.cpp @@ -7,8 +7,8 @@ #include "output.h" #include "handle.h" -#include "..\interactivity\inc\ServiceLocator.hpp" -#include "..\terminal\adapter\DispatchCommon.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" +#include "../terminal/adapter/DispatchCommon.hpp" #define PTY_SIGNAL_RESIZE_WINDOW 8u diff --git a/src/host/VtInputThread.hpp b/src/host/VtInputThread.hpp index 20b232e879..da3f08a7a0 100644 --- a/src/host/VtInputThread.hpp +++ b/src/host/VtInputThread.hpp @@ -14,7 +14,7 @@ Author(s): --*/ #pragma once -#include "..\terminal\parser\StateMachine.hpp" +#include "../terminal/parser/StateMachine.hpp" namespace Microsoft::Console { diff --git a/src/host/VtIo.hpp b/src/host/VtIo.hpp index e48378d26b..77cc0fff3a 100644 --- a/src/host/VtIo.hpp +++ b/src/host/VtIo.hpp @@ -3,9 +3,9 @@ #pragma once -#include "..\inc\VtIoModes.hpp" -#include "..\inc\ITerminalOwner.hpp" -#include "..\renderer\vt\vtrenderer.hpp" +#include "../inc/VtIoModes.hpp" +#include "../inc/ITerminalOwner.hpp" +#include "../renderer/vt/vtrenderer.hpp" #include "VtInputThread.hpp" #include "PtySignalInputThread.hpp" diff --git a/src/host/_stream.cpp b/src/host/_stream.cpp index 8c15892fcc..4088a45602 100644 --- a/src/host/_stream.cpp +++ b/src/host/_stream.cpp @@ -19,7 +19,7 @@ #include "../types/inc/GlyphWidth.hpp" #include "../types/inc/Viewport.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop using namespace Microsoft::Console::Types; diff --git a/src/host/_stream.h b/src/host/_stream.h index 0352b959ca..11641fb086 100644 --- a/src/host/_stream.h +++ b/src/host/_stream.h @@ -17,7 +17,7 @@ Revision History: #pragma once -#include "..\server\IWaitRoutine.h" +#include "../server/IWaitRoutine.h" #include "writeData.hpp" /*++ diff --git a/src/host/alias.cpp b/src/host/alias.cpp index e58fbdb0e9..01c9bda995 100644 --- a/src/host/alias.cpp +++ b/src/host/alias.cpp @@ -18,7 +18,7 @@ #include "ApiRoutines.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/cmdline.cpp b/src/host/cmdline.cpp index 7adec5c8f9..25efcfc629 100644 --- a/src/host/cmdline.cpp +++ b/src/host/cmdline.cpp @@ -22,7 +22,7 @@ #include "ApiRoutines.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop using Microsoft::Console::Interactivity::ServiceLocator; diff --git a/src/host/conapi.h b/src/host/conapi.h index db5c2a41fc..c7b9f4a481 100644 --- a/src/host/conapi.h +++ b/src/host/conapi.h @@ -21,4 +21,4 @@ Revision History: #include #include -#include "..\server\ApiMessage.h" +#include "../server/ApiMessage.h" diff --git a/src/host/conattrs.cpp b/src/host/conattrs.cpp index 60cef22798..07d1f21f2d 100644 --- a/src/host/conattrs.cpp +++ b/src/host/conattrs.cpp @@ -14,7 +14,7 @@ Author(s): --*/ #include "precomp.h" -#include "..\inc\conattrs.hpp" +#include "../inc/conattrs.hpp" #include // Function Description: diff --git a/src/host/consoleInformation.cpp b/src/host/consoleInformation.cpp index 9cc437a223..60ad4ff420 100644 --- a/src/host/consoleInformation.cpp +++ b/src/host/consoleInformation.cpp @@ -8,8 +8,8 @@ #include "output.h" #include "srvinit.h" -#include "..\interactivity\inc\ServiceLocator.hpp" -#include "..\types\inc\convert.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" +#include "../types/inc/convert.hpp" using Microsoft::Console::Interactivity::ServiceLocator; using Microsoft::Console::Render::BlinkingState; diff --git a/src/host/directio.cpp b/src/host/directio.cpp index a02153f88e..760a7ecf75 100644 --- a/src/host/directio.cpp +++ b/src/host/directio.cpp @@ -18,7 +18,7 @@ #include "../types/inc/GlyphWidth.hpp" #include "../types/inc/viewport.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/exe/resource.h b/src/host/exe/resource.h index 7d34af61ba..215118696c 100644 --- a/src/host/exe/resource.h +++ b/src/host/exe/resource.h @@ -1,7 +1,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by Host.EXE.rc -#include "..\\resource.h" +#include "..//resource.h" // Next default values for new objects // #ifdef APSTUDIO_INVOKED diff --git a/src/host/exemain.cpp b/src/host/exemain.cpp index 67f2d9458f..8d338ff48e 100644 --- a/src/host/exemain.cpp +++ b/src/host/exemain.cpp @@ -5,8 +5,8 @@ #include "ConsoleArguments.hpp" #include "srvinit.h" -#include "..\server\Entrypoints.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../server/Entrypoints.h" +#include "../interactivity/inc/ServiceLocator.hpp" // Define TraceLogging provider TRACELOGGING_DEFINE_PROVIDER( diff --git a/src/host/ft_host/API_InputTests.cpp b/src/host/ft_host/API_InputTests.cpp index 6ce477bee5..6eed16bbc6 100644 --- a/src/host/ft_host/API_InputTests.cpp +++ b/src/host/ft_host/API_InputTests.cpp @@ -5,7 +5,7 @@ #include -#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. #define NUMBER_OF_SCENARIO_INPUTS 10 diff --git a/src/host/ft_host/API_OutputTests.cpp b/src/host/ft_host/API_OutputTests.cpp index 4912f17a59..e645178866 100644 --- a/src/host/ft_host/API_OutputTests.cpp +++ b/src/host/ft_host/API_OutputTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\types\inc\viewport.hpp" +#include "../types/inc/viewport.hpp" #include #include diff --git a/src/host/ft_host/Common.hpp b/src/host/ft_host/Common.hpp index 711d317ab2..465ab60b7c 100644 --- a/src/host/ft_host/Common.hpp +++ b/src/host/ft_host/Common.hpp @@ -17,7 +17,7 @@ Revision History: #pragma once -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" class Common { diff --git a/src/host/ft_host/Message_KeyPressTests.cpp b/src/host/ft_host/Message_KeyPressTests.cpp index f073d3b4ff..3b2bb21748 100644 --- a/src/host/ft_host/Message_KeyPressTests.cpp +++ b/src/host/ft_host/Message_KeyPressTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include #include diff --git a/src/host/ft_host/OneCoreDelay.hpp b/src/host/ft_host/OneCoreDelay.hpp index a15c5461a4..6ef732652c 100644 --- a/src/host/ft_host/OneCoreDelay.hpp +++ b/src/host/ft_host/OneCoreDelay.hpp @@ -17,7 +17,7 @@ Revision History: #pragma once -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" namespace OneCoreDelay { diff --git a/src/host/ft_uia/Common/NativeMethods.cs b/src/host/ft_uia/Common/NativeMethods.cs index 522feb2751..9188f6fd3f 100644 --- a/src/host/ft_uia/Common/NativeMethods.cs +++ b/src/host/ft_uia/Common/NativeMethods.cs @@ -330,7 +330,7 @@ namespace Conhost.UIA.Tests.Common.NativeMethods /// /// 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 /// public static class WinConP { diff --git a/src/host/getset.cpp b/src/host/getset.cpp index 53a112d3fe..1850b47c91 100644 --- a/src/host/getset.cpp +++ b/src/host/getset.cpp @@ -18,7 +18,7 @@ #include "ApiRoutines.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/globals.h b/src/host/globals.h index e0ed9f4116..3ab6dc7fc0 100644 --- a/src/host/globals.h +++ b/src/host/globals.h @@ -22,12 +22,12 @@ Revision History: #include "ConsoleArguments.hpp" #include "ApiRoutines.h" -#include "..\renderer\inc\IRenderData.hpp" -#include "..\renderer\inc\IRenderEngine.hpp" -#include "..\renderer\inc\IRenderer.hpp" -#include "..\renderer\inc\IFontDefaultList.hpp" +#include "../renderer/inc/IRenderData.hpp" +#include "../renderer/inc/IRenderEngine.hpp" +#include "../renderer/inc/IRenderer.hpp" +#include "../renderer/inc/IFontDefaultList.hpp" -#include "..\server\DeviceComm.h" +#include "../server/DeviceComm.h" #include #include diff --git a/src/host/handle.cpp b/src/host/handle.cpp index af0ed70254..999b9ac902 100644 --- a/src/host/handle.cpp +++ b/src/host/handle.cpp @@ -4,7 +4,7 @@ #include "precomp.h" #include "handle.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/history.cpp b/src/host/history.cpp index e9da38a2a2..25355534bb 100644 --- a/src/host/history.cpp +++ b/src/host/history.cpp @@ -18,7 +18,7 @@ #include "ApiRoutines.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/input.cpp b/src/host/input.cpp index 8e98c6f72d..58c876a328 100644 --- a/src/host/input.cpp +++ b/src/host/input.cpp @@ -8,9 +8,9 @@ #include "dbcs.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 diff --git a/src/host/inputBuffer.cpp b/src/host/inputBuffer.cpp index 82433c000d..9b8001723a 100644 --- a/src/host/inputBuffer.cpp +++ b/src/host/inputBuffer.cpp @@ -9,7 +9,7 @@ #include -#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) diff --git a/src/host/misc.cpp b/src/host/misc.cpp index 0793c9f23e..3a71861f1f 100644 --- a/src/host/misc.cpp +++ b/src/host/misc.cpp @@ -9,7 +9,7 @@ #include "../types/inc/convert.hpp" #include "../types/inc/GlyphWidth.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/outputStream.hpp b/src/host/outputStream.hpp index 48ccdfb50b..a7cc29ae1e 100644 --- a/src/host/outputStream.hpp +++ b/src/host/outputStream.hpp @@ -14,9 +14,9 @@ Author: #pragma once -#include "..\terminal\adapter\adaptDefaults.hpp" -#include "..\types\inc\IInputEvent.hpp" -#include "..\inc\conattrs.hpp" +#include "../terminal/adapter/adaptDefaults.hpp" +#include "../types/inc/IInputEvent.hpp" +#include "../inc/conattrs.hpp" #include "IIoProvider.hpp" class SCREEN_INFORMATION; @@ -42,7 +42,7 @@ private: 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. // Normally, these APIs are accessible from the outside of the conhost process (like by the process being "hosted") through diff --git a/src/host/popup.cpp b/src/host/popup.cpp index 211997d4e8..5fd28534c9 100644 --- a/src/host/popup.cpp +++ b/src/host/popup.cpp @@ -16,7 +16,7 @@ #include "utils.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/precomp.h b/src/host/precomp.h index 4368ec07db..507262a6f8 100644 --- a/src/host/precomp.h +++ b/src/host/precomp.h @@ -64,7 +64,7 @@ Abstract: #include #include TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider); -#include +#include #include #include "telemetry.hpp" #include "tracing.hpp" @@ -74,7 +74,7 @@ TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider); #endif #include -#include "..\propslib\conpropsp.hpp" +#include "../propslib/conpropsp.hpp" // Comment to build against the private SDK. #define CON_BUILD_PUBLIC @@ -84,9 +84,9 @@ TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider); #define CON_DPIAPI_INDIRECT #endif -#include "..\inc\contsf.h" -#include "..\inc\operators.hpp" -#include "..\inc\conattrs.hpp" +#include "../inc/contsf.h" +#include "../inc/operators.hpp" +#include "../inc/conattrs.hpp" // TODO: MSFT 9355094 Find a better way of doing this. http://osgvsowi/9355094 [[nodiscard]] inline NTSTATUS NTSTATUS_FROM_HRESULT(HRESULT hr) diff --git a/src/host/readDataCooked.cpp b/src/host/readDataCooked.cpp index 7263655bb3..77fdf3cdb8 100644 --- a/src/host/readDataCooked.cpp +++ b/src/host/readDataCooked.cpp @@ -12,7 +12,7 @@ #include "../types/inc/GlyphWidth.hpp" #include "../types/inc/convert.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #define LINE_INPUT_BUFFER_SIZE (256 * sizeof(WCHAR)) diff --git a/src/host/readDataDirect.cpp b/src/host/readDataDirect.cpp index f47d32b927..c8655fc4a8 100644 --- a/src/host/readDataDirect.cpp +++ b/src/host/readDataDirect.cpp @@ -6,7 +6,7 @@ #include "dbcs.h" #include "misc.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" // Routine Description: // - Constructs direct read data class to hold context across sessions diff --git a/src/host/readDataRaw.cpp b/src/host/readDataRaw.cpp index 708efdc523..896f5eb06f 100644 --- a/src/host/readDataRaw.cpp +++ b/src/host/readDataRaw.cpp @@ -7,7 +7,7 @@ #include "stream.h" #include "../types/inc/GlyphWidth.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" // Routine Description: // - Constructs raw read data class to hold context across sessions diff --git a/src/host/registry.cpp b/src/host/registry.cpp index f369b79d3c..9b022d983d 100644 --- a/src/host/registry.cpp +++ b/src/host/registry.cpp @@ -8,7 +8,7 @@ #include "dbcs.h" #include "srvinit.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/renderData.cpp b/src/host/renderData.cpp index a84b95ac5e..a777589307 100644 --- a/src/host/renderData.cpp +++ b/src/host/renderData.cpp @@ -7,7 +7,7 @@ #include "dbcs.h" #include "handle.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/renderData.hpp b/src/host/renderData.hpp index 17172aba43..78367bdbfd 100644 --- a/src/host/renderData.hpp +++ b/src/host/renderData.hpp @@ -14,8 +14,8 @@ Author(s): #pragma once -#include "..\renderer\inc\IRenderData.hpp" -#include "..\types\IUiaData.h" +#include "../renderer/inc/IRenderData.hpp" +#include "../types/IUiaData.h" class RenderData final : public Microsoft::Console::Render::IRenderData, diff --git a/src/host/renderFontDefaults.hpp b/src/host/renderFontDefaults.hpp index 10478995ab..b8faec971d 100644 --- a/src/host/renderFontDefaults.hpp +++ b/src/host/renderFontDefaults.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\renderer\inc\IFontDefaultList.hpp" +#include "../renderer/inc/IFontDefaultList.hpp" class RenderFontDefaults sealed : public Microsoft::Console::Render::IFontDefaultList { diff --git a/src/host/scrolling.cpp b/src/host/scrolling.cpp index e45d9aece7..51330a305d 100644 --- a/src/host/scrolling.cpp +++ b/src/host/scrolling.cpp @@ -7,7 +7,7 @@ #include "selection.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using Microsoft::Console::VirtualTerminal::StateMachine; using namespace Microsoft::Console::Interactivity; diff --git a/src/host/selection.hpp b/src/host/selection.hpp index c700a47cef..34dc872d8c 100644 --- a/src/host/selection.hpp +++ b/src/host/selection.hpp @@ -20,8 +20,8 @@ Revision History: #include "input.h" -#include "..\interactivity\inc\IAccessibilityNotifier.hpp" -#include "..\interactivity\inc\IConsoleWindow.hpp" +#include "../interactivity/inc/IAccessibilityNotifier.hpp" +#include "../interactivity/inc/IConsoleWindow.hpp" class Selection { diff --git a/src/host/selectionInput.cpp b/src/host/selectionInput.cpp index f551b346c1..afb5831a98 100644 --- a/src/host/selectionInput.cpp +++ b/src/host/selectionInput.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\buffer\out\search.h" +#include "../buffer/out/search.h" #include "../interactivity/inc/ServiceLocator.hpp" #include "../types/inc/convert.hpp" diff --git a/src/host/selectionState.cpp b/src/host/selectionState.cpp index 58ed9cb00f..af82bd764d 100644 --- a/src/host/selectionState.cpp +++ b/src/host/selectionState.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #include "../types/inc/viewport.hpp" diff --git a/src/host/server.h b/src/host/server.h index bc71e371a3..da408a4f4d 100644 --- a/src/host/server.h +++ b/src/host/server.h @@ -24,11 +24,11 @@ Revision History: #include "VtIo.hpp" #include "CursorBlinker.hpp" -#include "..\server\ProcessList.h" -#include "..\server\WaitQueue.h" +#include "../server/ProcessList.h" +#include "../server/WaitQueue.h" -#include "..\host\RenderData.hpp" -#include "..\renderer\inc\BlinkingState.hpp" +#include "../host/RenderData.hpp" +#include "../renderer/inc/BlinkingState.hpp" // clang-format off // Flags flags @@ -169,6 +169,6 @@ private: #define CONSOLE_STATUS_READ_COMPLETE 0xC0030002 #define CONSOLE_STATUS_WAIT_NO_BLOCK 0xC0030003 -#include "..\server\ObjectHandle.h" +#include "../server/ObjectHandle.h" void SetActiveScreenBuffer(SCREEN_INFORMATION& screenInfo); diff --git a/src/host/settings.cpp b/src/host/settings.cpp index 335276bb13..af1de09e38 100644 --- a/src/host/settings.cpp +++ b/src/host/settings.cpp @@ -4,7 +4,7 @@ #include "precomp.h" #include "settings.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #include "../types/inc/colorTable.hpp" #pragma hdrstop diff --git a/src/host/srvinit.cpp b/src/host/srvinit.cpp index 6bfe328b3e..5168bee9bb 100644 --- a/src/host/srvinit.cpp +++ b/src/host/srvinit.cpp @@ -14,11 +14,11 @@ #include "../types/inc/GlyphWidth.hpp" -#include "..\server\Entrypoints.h" -#include "..\server\IoSorter.h" +#include "../server/Entrypoints.h" +#include "../server/IoSorter.h" -#include "..\interactivity\inc\ServiceLocator.hpp" -#include "..\interactivity\base\ApiDetector.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" +#include "../interactivity/base/ApiDetector.hpp" #include "renderData.hpp" #include "../renderer/base/renderer.hpp" diff --git a/src/host/stream.cpp b/src/host/stream.cpp index 7682d8a249..4b0ba6c673 100644 --- a/src/host/stream.cpp +++ b/src/host/stream.cpp @@ -15,7 +15,7 @@ #include "../types/inc/GlyphWidth.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/host/stream.h b/src/host/stream.h index e90a280a25..d65622c8b4 100644 --- a/src/host/stream.h +++ b/src/host/stream.h @@ -17,7 +17,7 @@ Revision History: #pragma once #include "cmdline.h" -#include "..\server\IWaitRoutine.h" +#include "../server/IWaitRoutine.h" #include "readData.hpp" #define IS_CONTROL_CHAR(wch) ((wch) < L' ') diff --git a/src/host/telemetry.cpp b/src/host/telemetry.cpp index 2e4b90aaac..7b4ce210b7 100644 --- a/src/host/telemetry.cpp +++ b/src/host/telemetry.cpp @@ -10,7 +10,7 @@ #include "history.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" TRACELOGGING_DEFINE_PROVIDER(g_hConhostV2EventTraceProvider, "Microsoft.Windows.Console.Host", diff --git a/src/host/telemetry.hpp b/src/host/telemetry.hpp index 5cbdeaa17f..00f9a0d926 100644 --- a/src/host/telemetry.hpp +++ b/src/host/telemetry.hpp @@ -189,7 +189,7 @@ private: }; // 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 RIPMSG1(flags, msg, a) Telemetry::Instance().LogRipMessage(msg, a); #define RIPMSG2(flags, msg, a, b) Telemetry::Instance().LogRipMessage(msg, a, b); diff --git a/src/host/ut_host/AliasTests.cpp b/src/host/ut_host/AliasTests.cpp index befc8067e1..6eed3ac10c 100644 --- a/src/host/ut_host/AliasTests.cpp +++ b/src/host/ut_host/AliasTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "alias.h" diff --git a/src/host/ut_host/ApiRoutinesTests.cpp b/src/host/ut_host/ApiRoutinesTests.cpp index 437368d0bf..4ce5a6ac0b 100644 --- a/src/host/ut_host/ApiRoutinesTests.cpp +++ b/src/host/ut_host/ApiRoutinesTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" @@ -12,7 +12,7 @@ #include "dbcs.h" #include "misc.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace Microsoft::Console::Types; using namespace WEX::Logging; diff --git a/src/host/ut_host/AttrRowTests.cpp b/src/host/ut_host/AttrRowTests.cpp index 30d4b5e84b..4a4f85293a 100644 --- a/src/host/ut_host/AttrRowTests.cpp +++ b/src/host/ut_host/AttrRowTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/ClipboardTests.cpp b/src/host/ut_host/ClipboardTests.cpp index e00c685b64..75fa15e8e3 100644 --- a/src/host/ut_host/ClipboardTests.cpp +++ b/src/host/ut_host/ClipboardTests.cpp @@ -8,15 +8,15 @@ #include "globals.h" -#include "..\interactivity\win32\Clipboard.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/win32/Clipboard.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #include "dbcs.h" #include #ifdef BUILD_ONECORE_INTERACTIVITY -#include "..\..\interactivity\inc\VtApiRedirection.hpp" +#include "../../interactivity/inc/VtApiRedirection.hpp" #endif #include "../../inc/consoletaeftemplates.hpp" diff --git a/src/host/ut_host/CodepointWidthDetectorTests.cpp b/src/host/ut_host/CodepointWidthDetectorTests.cpp index f7992dc963..fdbc775e13 100644 --- a/src/host/ut_host/CodepointWidthDetectorTests.cpp +++ b/src/host/ut_host/CodepointWidthDetectorTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" #include "../types/inc/CodepointWidthDetector.hpp" diff --git a/src/host/ut_host/CommandLineTests.cpp b/src/host/ut_host/CommandLineTests.cpp index a9bd5a135f..c5988c8e94 100644 --- a/src/host/ut_host/CommandLineTests.cpp +++ b/src/host/ut_host/CommandLineTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/CommandListPopupTests.cpp b/src/host/ut_host/CommandListPopupTests.cpp index a000c24540..2bd19ebaed 100644 --- a/src/host/ut_host/CommandListPopupTests.cpp +++ b/src/host/ut_host/CommandListPopupTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/CommandNumberPopupTests.cpp b/src/host/ut_host/CommandNumberPopupTests.cpp index 6bad6d7105..8220452236 100644 --- a/src/host/ut_host/CommandNumberPopupTests.cpp +++ b/src/host/ut_host/CommandNumberPopupTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" #include "PopupTestHelper.hpp" diff --git a/src/host/ut_host/ConsoleArgumentsTests.cpp b/src/host/ut_host/ConsoleArgumentsTests.cpp index 05fecd0114..7a23a5995e 100644 --- a/src/host/ut_host/ConsoleArgumentsTests.cpp +++ b/src/host/ut_host/ConsoleArgumentsTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "globals.h" #include "../ConsoleArguments.hpp" diff --git a/src/host/ut_host/CopyFromCharPopupTests.cpp b/src/host/ut_host/CopyFromCharPopupTests.cpp index d303e73057..52b147535b 100644 --- a/src/host/ut_host/CopyFromCharPopupTests.cpp +++ b/src/host/ut_host/CopyFromCharPopupTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" #include "PopupTestHelper.hpp" diff --git a/src/host/ut_host/CopyToCharPopupTests.cpp b/src/host/ut_host/CopyToCharPopupTests.cpp index 4a4f3d5fee..7509910749 100644 --- a/src/host/ut_host/CopyToCharPopupTests.cpp +++ b/src/host/ut_host/CopyToCharPopupTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" #include "PopupTestHelper.hpp" diff --git a/src/host/ut_host/DbcsTests.cpp b/src/host/ut_host/DbcsTests.cpp index e62d70e7bf..70ca2be246 100644 --- a/src/host/ut_host/DbcsTests.cpp +++ b/src/host/ut_host/DbcsTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/HistoryTests.cpp b/src/host/ut_host/HistoryTests.cpp index 4088a0a3a7..0e2640edf3 100644 --- a/src/host/ut_host/HistoryTests.cpp +++ b/src/host/ut_host/HistoryTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/InitTests.cpp b/src/host/ut_host/InitTests.cpp index b3e32603e0..bbba0ace7c 100644 --- a/src/host/ut_host/InitTests.cpp +++ b/src/host/ut_host/InitTests.cpp @@ -9,7 +9,7 @@ #include "globals.h" #include "srvinit.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace WEX::Logging; using namespace WEX::TestExecution; diff --git a/src/host/ut_host/InputBufferTests.cpp b/src/host/ut_host/InputBufferTests.cpp index 70e44ee0a3..950180918b 100644 --- a/src/host/ut_host/InputBufferTests.cpp +++ b/src/host/ut_host/InputBufferTests.cpp @@ -3,11 +3,11 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" -#include "..\types\inc\IInputEvent.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" +#include "../types/inc/IInputEvent.hpp" using namespace WEX::Logging; using Microsoft::Console::Interactivity::ServiceLocator; diff --git a/src/host/ut_host/ObjectTests.cpp b/src/host/ut_host/ObjectTests.cpp index 7f0cd6e338..17f89d6cd5 100644 --- a/src/host/ut_host/ObjectTests.cpp +++ b/src/host/ut_host/ObjectTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/OutputCellIteratorTests.cpp b/src/host/ut_host/OutputCellIteratorTests.cpp index a71eca8eb7..fa084d21e8 100644 --- a/src/host/ut_host/OutputCellIteratorTests.cpp +++ b/src/host/ut_host/OutputCellIteratorTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "../buffer/out/outputCellIterator.hpp" diff --git a/src/host/ut_host/RendererTests.cpp b/src/host/ut_host/RendererTests.cpp index 0d37b74497..659ffdfea2 100644 --- a/src/host/ut_host/RendererTests.cpp +++ b/src/host/ut_host/RendererTests.cpp @@ -6,8 +6,8 @@ #include "CommonState.hpp" -#include "..\..\host\renderData.hpp" -#include "..\..\renderer\base\renderer.hpp" +#include "../../host/renderData.hpp" +#include "../../renderer/base/renderer.hpp" using namespace WEX::Logging; using namespace WEX::TestExecution; diff --git a/src/host/ut_host/ScreenBufferTests.cpp b/src/host/ut_host/ScreenBufferTests.cpp index c28366ef64..2ffb3390eb 100644 --- a/src/host/ut_host/ScreenBufferTests.cpp +++ b/src/host/ut_host/ScreenBufferTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" @@ -13,9 +13,9 @@ #include "getset.h" #include "_stream.h" // For WriteCharsLegacy -#include "..\interactivity\inc\ServiceLocator.hpp" -#include "..\..\inc\conattrs.hpp" -#include "..\..\types\inc\Viewport.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" +#include "../../inc/conattrs.hpp" +#include "../../types/inc/Viewport.hpp" #include diff --git a/src/host/ut_host/SearchTests.cpp b/src/host/ut_host/SearchTests.cpp index 1815a8eb62..38d9f1c110 100644 --- a/src/host/ut_host/SearchTests.cpp +++ b/src/host/ut_host/SearchTests.cpp @@ -3,11 +3,11 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" -#include "..\buffer\out\search.h" +#include "../buffer/out/search.h" using namespace WEX::Common; using namespace WEX::Logging; diff --git a/src/host/ut_host/SelectionTests.cpp b/src/host/ut_host/SelectionTests.cpp index e332f3ad0c..dcdaa7765f 100644 --- a/src/host/ut_host/SelectionTests.cpp +++ b/src/host/ut_host/SelectionTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" @@ -12,7 +12,7 @@ #include "selection.hpp" #include "cmdline.h" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace WEX::Common; using namespace WEX::Logging; diff --git a/src/host/ut_host/TextBufferIteratorTests.cpp b/src/host/ut_host/TextBufferIteratorTests.cpp index 55f0ae328a..197deffa14 100644 --- a/src/host/ut_host/TextBufferIteratorTests.cpp +++ b/src/host/ut_host/TextBufferIteratorTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/TitleTests.cpp b/src/host/ut_host/TitleTests.cpp index 2584e64d15..c52f986e76 100644 --- a/src/host/ut_host/TitleTests.cpp +++ b/src/host/ut_host/TitleTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "srvinit.h" diff --git a/src/host/ut_host/UtilsTests.cpp b/src/host/ut_host/UtilsTests.cpp index 9a266a0742..d466f1331f 100644 --- a/src/host/ut_host/UtilsTests.cpp +++ b/src/host/ut_host/UtilsTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" @@ -13,7 +13,7 @@ #include "utils.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace WEX::Common; using namespace WEX::Logging; diff --git a/src/host/ut_host/ViewportTests.cpp b/src/host/ut_host/ViewportTests.cpp index c5bdc3aa9e..2887ae811e 100644 --- a/src/host/ut_host/ViewportTests.cpp +++ b/src/host/ut_host/ViewportTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" diff --git a/src/host/ut_host/VtIoTests.cpp b/src/host/ut_host/VtIoTests.cpp index ef5afa3a5d..314fea273f 100644 --- a/src/host/ut_host/VtIoTests.cpp +++ b/src/host/ut_host/VtIoTests.cpp @@ -3,17 +3,17 @@ #include "precomp.h" #include -#include "..\..\inc\consoletaeftemplates.hpp" -#include "..\..\types\inc\Viewport.hpp" +#include "../../inc/consoletaeftemplates.hpp" +#include "../../types/inc/Viewport.hpp" -#include "..\..\renderer\vt\Xterm256Engine.hpp" -#include "..\..\renderer\vt\XtermEngine.hpp" -#include "..\..\renderer\base\Renderer.hpp" -#include "..\Settings.hpp" -#include "..\VtIo.hpp" +#include "../../renderer/vt/Xterm256Engine.hpp" +#include "../../renderer/vt/XtermEngine.hpp" +#include "../../renderer/base/Renderer.hpp" +#include "../Settings.hpp" +#include "../VtIo.hpp" #ifndef __INSIDE_WINDOWS -#include "..\..\renderer\dx\DxRenderer.hpp" +#include "../../renderer/dx/DxRenderer.hpp" #endif using namespace WEX::Common; diff --git a/src/host/utils.cpp b/src/host/utils.cpp index 450834e243..62281f3ee9 100644 --- a/src/host/utils.cpp +++ b/src/host/utils.cpp @@ -5,7 +5,7 @@ #include "utils.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" #include "srvinit.h" diff --git a/src/host/utils.hpp b/src/host/utils.hpp index af24621576..86f3baff9f 100644 --- a/src/host/utils.hpp +++ b/src/host/utils.hpp @@ -17,7 +17,7 @@ Author(s): #include "conapi.h" #include "server.h" -#include "..\server\ObjectHandle.h" +#include "../server/ObjectHandle.h" #define RECT_WIDTH(x) ((x)->right - (x)->left) #define RECT_HEIGHT(x) ((x)->bottom - (x)->top) diff --git a/src/host/writeData.cpp b/src/host/writeData.cpp index 1385caec08..6aede06263 100644 --- a/src/host/writeData.cpp +++ b/src/host/writeData.cpp @@ -5,9 +5,9 @@ #include "writeData.hpp" #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: // - Creates a new write data object for used in servicing write console requests diff --git a/src/interactivity/base/InteractivityFactory.cpp b/src/interactivity/base/InteractivityFactory.cpp index 0cca17aa8e..3c69ebb46b 100644 --- a/src/interactivity/base/InteractivityFactory.cpp +++ b/src/interactivity/base/InteractivityFactory.cpp @@ -15,13 +15,13 @@ #include "..\onecore\WindowMetrics.hpp" #endif -#include "..\win32\AccessibilityNotifier.hpp" -#include "..\win32\ConsoleControl.hpp" -#include "..\win32\ConsoleInputThread.hpp" -#include "..\win32\InputServices.hpp" -#include "..\win32\WindowDpiApi.hpp" -#include "..\win32\WindowMetrics.hpp" -#include "..\win32\SystemConfigurationProvider.hpp" +#include "../win32/AccessibilityNotifier.hpp" +#include "../win32/ConsoleControl.hpp" +#include "../win32/ConsoleInputThread.hpp" +#include "../win32/InputServices.hpp" +#include "../win32/WindowDpiApi.hpp" +#include "../win32/WindowMetrics.hpp" +#include "../win32/SystemConfigurationProvider.hpp" #pragma hdrstop diff --git a/src/interactivity/base/InteractivityFactory.hpp b/src/interactivity/base/InteractivityFactory.hpp index 70dbdaf77d..bf08158343 100644 --- a/src/interactivity/base/InteractivityFactory.hpp +++ b/src/interactivity/base/InteractivityFactory.hpp @@ -7,7 +7,7 @@ #include "ApiDetector.hpp" -#include "..\inc\IInteractivityFactory.hpp" +#include "../inc/IInteractivityFactory.hpp" #include diff --git a/src/interactivity/base/ServiceLocator.cpp b/src/interactivity/base/ServiceLocator.cpp index b2b8ad9c55..14d088368a 100644 --- a/src/interactivity/base/ServiceLocator.cpp +++ b/src/interactivity/base/ServiceLocator.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #include "InteractivityFactory.hpp" diff --git a/src/interactivity/base/VtApiRedirection.cpp b/src/interactivity/base/VtApiRedirection.cpp index 5acbec9070..d7bfef8d49 100644 --- a/src/interactivity/base/VtApiRedirection.cpp +++ b/src/interactivity/base/VtApiRedirection.cpp @@ -3,9 +3,9 @@ #include "precomp.h" -#include "..\inc\VtApiRedirection.hpp" +#include "../inc/VtApiRedirection.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/base/precomp.h b/src/interactivity/base/precomp.h index 7e62e825dc..0131712f0e 100644 --- a/src/interactivity/base/precomp.h +++ b/src/interactivity/base/precomp.h @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -#include "..\..\host\precomp.h" +#include "../../host/precomp.h" #ifdef BUILD_ONECORE_INTERACTIVITY // From ntdef.h and winnt.h diff --git a/src/interactivity/onecore/AccessibilityNotifier.hpp b/src/interactivity/onecore/AccessibilityNotifier.hpp index d5ceeaa6bf..9a8a9f945f 100644 --- a/src/interactivity/onecore/AccessibilityNotifier.hpp +++ b/src/interactivity/onecore/AccessibilityNotifier.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\IAccessibilityNotifier.hpp" +#include "../inc/IAccessibilityNotifier.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/BgfxEngine.cpp b/src/interactivity/onecore/BgfxEngine.cpp index fda66e6996..74fe40c42a 100644 --- a/src/interactivity/onecore/BgfxEngine.cpp +++ b/src/interactivity/onecore/BgfxEngine.cpp @@ -6,7 +6,7 @@ #include "BgfxEngine.hpp" #include "ConIoSrvComm.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/BgfxEngine.hpp b/src/interactivity/onecore/BgfxEngine.hpp index cebedfbda4..282fdd1ec1 100644 --- a/src/interactivity/onecore/BgfxEngine.hpp +++ b/src/interactivity/onecore/BgfxEngine.hpp @@ -22,7 +22,7 @@ Author(s): #pragma once -#include "..\..\renderer\inc\RenderEngineBase.hpp" +#include "../../renderer/inc/RenderEngineBase.hpp" namespace Microsoft::Console::Render { diff --git a/src/interactivity/onecore/ConIoSrvComm.cpp b/src/interactivity/onecore/ConIoSrvComm.cpp index 067fe0f511..8e3eb96b5d 100644 --- a/src/interactivity/onecore/ConIoSrvComm.cpp +++ b/src/interactivity/onecore/ConIoSrvComm.cpp @@ -6,11 +6,11 @@ #include "ConIoSrvComm.hpp" #include "ConIoSrv.h" -#include "..\..\host\dbcs.h" -#include "..\..\host\input.h" -#include "..\..\types\inc\IInputEvent.hpp" +#include "../../host/dbcs.h" +#include "../../host/input.h" +#include "../../types/inc/IInputEvent.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/ConIoSrvComm.hpp b/src/interactivity/onecore/ConIoSrvComm.hpp index 5e4cf3d82c..1a0a827e55 100644 --- a/src/interactivity/onecore/ConIoSrvComm.hpp +++ b/src/interactivity/onecore/ConIoSrvComm.hpp @@ -17,10 +17,10 @@ Author(s): #include #include "ConIoSrv.h" -#include "..\..\inc\IInputServices.hpp" +#include "../../inc/IInputServices.hpp" #include "BgfxEngine.hpp" -#include "..\..\renderer\wddmcon\wddmconrenderer.hpp" +#include "../../renderer/wddmcon/wddmconrenderer.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/ConsoleControl.hpp b/src/interactivity/onecore/ConsoleControl.hpp index 98e14af8ed..f64477acb7 100644 --- a/src/interactivity/onecore/ConsoleControl.hpp +++ b/src/interactivity/onecore/ConsoleControl.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\IConsoleControl.hpp" +#include "../inc/IConsoleControl.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/ConsoleInputThread.cpp b/src/interactivity/onecore/ConsoleInputThread.cpp index 91579bf3a2..e66c5a1540 100644 --- a/src/interactivity/onecore/ConsoleInputThread.cpp +++ b/src/interactivity/onecore/ConsoleInputThread.cpp @@ -9,9 +9,9 @@ #include "ConIoSrv.h" -#include "..\..\host\input.h" +#include "../../host/input.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity; using namespace Microsoft::Console::Interactivity::OneCore; diff --git a/src/interactivity/onecore/ConsoleInputThread.hpp b/src/interactivity/onecore/ConsoleInputThread.hpp index f901a0bb8a..fef4fedee9 100644 --- a/src/interactivity/onecore/ConsoleInputThread.hpp +++ b/src/interactivity/onecore/ConsoleInputThread.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\IConsoleInputThread.hpp" +#include "../inc/IConsoleInputThread.hpp" #include "ConIoSrvComm.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/ConsoleWindow.cpp b/src/interactivity/onecore/ConsoleWindow.cpp index d8bf9fcfa4..f06d7ffd37 100644 --- a/src/interactivity/onecore/ConsoleWindow.cpp +++ b/src/interactivity/onecore/ConsoleWindow.cpp @@ -5,8 +5,8 @@ #include "ConsoleWindow.hpp" -#include "..\inc\ServiceLocator.hpp" -#include "..\..\types\inc\Viewport.hpp" +#include "../inc/ServiceLocator.hpp" +#include "../../types/inc/Viewport.hpp" using namespace Microsoft::Console::Interactivity::OneCore; using namespace Microsoft::Console::Types; diff --git a/src/interactivity/onecore/ConsoleWindow.hpp b/src/interactivity/onecore/ConsoleWindow.hpp index c0e0fa072d..a5a790286f 100644 --- a/src/interactivity/onecore/ConsoleWindow.hpp +++ b/src/interactivity/onecore/ConsoleWindow.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\IConsoleWindow.hpp" +#include "../inc/IConsoleWindow.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/SystemConfigurationProvider.hpp b/src/interactivity/onecore/SystemConfigurationProvider.hpp index 1b628a89f9..4e79f68078 100644 --- a/src/interactivity/onecore/SystemConfigurationProvider.hpp +++ b/src/interactivity/onecore/SystemConfigurationProvider.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\ISystemConfigurationProvider.hpp" +#include "../inc/ISystemConfigurationProvider.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/WindowMetrics.cpp b/src/interactivity/onecore/WindowMetrics.cpp index 43d51c3b01..ed38cac4fd 100644 --- a/src/interactivity/onecore/WindowMetrics.cpp +++ b/src/interactivity/onecore/WindowMetrics.cpp @@ -6,9 +6,9 @@ #include "WindowMetrics.hpp" #include "ConIoSrvComm.hpp" -#include "..\..\renderer\wddmcon\wddmconrenderer.hpp" +#include "../../renderer/wddmcon/wddmconrenderer.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/WindowMetrics.hpp b/src/interactivity/onecore/WindowMetrics.hpp index 2721cc84e0..2dbf7cb3dc 100644 --- a/src/interactivity/onecore/WindowMetrics.hpp +++ b/src/interactivity/onecore/WindowMetrics.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\IWindowMetrics.hpp" +#include "../inc/IWindowMetrics.hpp" #pragma hdrstop diff --git a/src/interactivity/onecore/precomp.h b/src/interactivity/onecore/precomp.h index 546b173d91..1540a3f955 100644 --- a/src/interactivity/onecore/precomp.h +++ b/src/interactivity/onecore/precomp.h @@ -15,4 +15,4 @@ #include #define _DDK_INCLUDED -#include "..\..\host\precomp.h" +#include "../../host/precomp.h" diff --git a/src/interactivity/win32/AccessibilityNotifier.cpp b/src/interactivity/win32/AccessibilityNotifier.cpp index e7eeaaca6f..56d31a88c6 100644 --- a/src/interactivity/win32/AccessibilityNotifier.cpp +++ b/src/interactivity/win32/AccessibilityNotifier.cpp @@ -5,7 +5,7 @@ #include "AccessibilityNotifier.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #include "ConsoleControl.hpp" using namespace Microsoft::Console::Types; diff --git a/src/interactivity/win32/AccessibilityNotifier.hpp b/src/interactivity/win32/AccessibilityNotifier.hpp index 74402e5819..5bbad10b10 100644 --- a/src/interactivity/win32/AccessibilityNotifier.hpp +++ b/src/interactivity/win32/AccessibilityNotifier.hpp @@ -16,7 +16,7 @@ Author(s): #include "precomp.h" -#include "..\inc\IAccessibilityNotifier.hpp" +#include "../inc/IAccessibilityNotifier.hpp" #pragma hdrstop diff --git a/src/interactivity/win32/Clipboard.cpp b/src/interactivity/win32/Clipboard.cpp index ba22fb50ae..c86ef678de 100644 --- a/src/interactivity/win32/Clipboard.cpp +++ b/src/interactivity/win32/Clipboard.cpp @@ -6,15 +6,15 @@ #include "clipboard.hpp" #include "resource.h" -#include "..\..\host\dbcs.h" -#include "..\..\host\scrolling.hpp" -#include "..\..\host\output.h" +#include "../../host/dbcs.h" +#include "../../host/scrolling.hpp" +#include "../../host/output.h" -#include "..\..\types\inc\convert.hpp" -#include "..\..\types\inc\viewport.hpp" +#include "../../types/inc/convert.hpp" +#include "../../types/inc/viewport.hpp" -#include "..\inc\conint.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/conint.h" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/win32/ConsoleControl.cpp b/src/interactivity/win32/ConsoleControl.cpp index a64d1b36a9..0f8aa9953a 100644 --- a/src/interactivity/win32/ConsoleControl.cpp +++ b/src/interactivity/win32/ConsoleControl.cpp @@ -9,7 +9,7 @@ #include "ConsoleControl.hpp" -#include "..\..\interactivity\inc\ServiceLocator.hpp" +#include "../../interactivity/inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity::Win32; diff --git a/src/interactivity/win32/ConsoleControl.hpp b/src/interactivity/win32/ConsoleControl.hpp index dbd72896ee..aa8b10916b 100644 --- a/src/interactivity/win32/ConsoleControl.hpp +++ b/src/interactivity/win32/ConsoleControl.hpp @@ -13,7 +13,7 @@ Author(s): --*/ #pragma once -#include "..\inc\IConsoleControl.hpp" +#include "../inc/IConsoleControl.hpp" // Uncomment to build publicly targeted scenarios. //#define CON_USERPRIVAPI_INDIRECT diff --git a/src/interactivity/win32/ConsoleInputThread.hpp b/src/interactivity/win32/ConsoleInputThread.hpp index d560b73d6a..1dc9a20d21 100644 --- a/src/interactivity/win32/ConsoleInputThread.hpp +++ b/src/interactivity/win32/ConsoleInputThread.hpp @@ -14,7 +14,7 @@ Author(s): #include "precomp.h" -#include "..\inc\IConsoleInputThread.hpp" +#include "../inc/IConsoleInputThread.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/InputServices.hpp b/src/interactivity/win32/InputServices.hpp index 6efe6d62c4..1df8da3c8e 100644 --- a/src/interactivity/win32/InputServices.hpp +++ b/src/interactivity/win32/InputServices.hpp @@ -12,7 +12,7 @@ Author(s): - Hernan Gatta (HeGatta) 29-Mar-2017 --*/ -#include "..\inc\IInputServices.hpp" +#include "../inc/IInputServices.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/SystemConfigurationProvider.cpp b/src/interactivity/win32/SystemConfigurationProvider.cpp index 814c64dc3f..175f05a6d8 100644 --- a/src/interactivity/win32/SystemConfigurationProvider.cpp +++ b/src/interactivity/win32/SystemConfigurationProvider.cpp @@ -6,7 +6,7 @@ #include "SystemConfigurationProvider.hpp" #include "icon.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity::Win32; diff --git a/src/interactivity/win32/SystemConfigurationProvider.hpp b/src/interactivity/win32/SystemConfigurationProvider.hpp index a99e6eb4f7..8c5d9bf65e 100644 --- a/src/interactivity/win32/SystemConfigurationProvider.hpp +++ b/src/interactivity/win32/SystemConfigurationProvider.hpp @@ -16,7 +16,7 @@ Author(s): #include "precomp.h" -#include "..\inc\ISystemConfigurationProvider.hpp" +#include "../inc/ISystemConfigurationProvider.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/WindowIme.cpp b/src/interactivity/win32/WindowIme.cpp index 24b8697c4c..37e722f1f1 100644 --- a/src/interactivity/win32/WindowIme.cpp +++ b/src/interactivity/win32/WindowIme.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #include "window.hpp" diff --git a/src/interactivity/win32/WindowMetrics.cpp b/src/interactivity/win32/WindowMetrics.cpp index 690e20f789..c7f9f204b6 100644 --- a/src/interactivity/win32/WindowMetrics.cpp +++ b/src/interactivity/win32/WindowMetrics.cpp @@ -6,7 +6,7 @@ #include "WindowMetrics.hpp" #include "windowdpiapi.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/win32/WindowMetrics.hpp b/src/interactivity/win32/WindowMetrics.hpp index 3d1aa93523..04f0afbcb9 100644 --- a/src/interactivity/win32/WindowMetrics.hpp +++ b/src/interactivity/win32/WindowMetrics.hpp @@ -12,7 +12,7 @@ Author(s): - Hernan Gatta (HeGatta) 29-Mar-2017 --*/ -#include "..\inc\IWindowMetrics.hpp" +#include "../inc/IWindowMetrics.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/clipboard.hpp b/src/interactivity/win32/clipboard.hpp index cc196c0420..bc0a801358 100644 --- a/src/interactivity/win32/clipboard.hpp +++ b/src/interactivity/win32/clipboard.hpp @@ -20,7 +20,7 @@ Revision History: #include "precomp.h" -#include "..\..\host\screenInfo.hpp" +#include "../../host/screenInfo.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/find.cpp b/src/interactivity/win32/find.cpp index f9cbe68e5d..55bf0ecbe6 100644 --- a/src/interactivity/win32/find.cpp +++ b/src/interactivity/win32/find.cpp @@ -7,11 +7,11 @@ #include "resource.h" #include "window.hpp" -#include "..\..\host\dbcs.h" -#include "..\..\host\handle.h" -#include "..\buffer\out\search.h" +#include "../../host/dbcs.h" +#include "../../host/handle.h" +#include "../buffer/out/search.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/win32/icon.cpp b/src/interactivity/win32/icon.cpp index f156994b05..2e96c79e08 100644 --- a/src/interactivity/win32/icon.cpp +++ b/src/interactivity/win32/icon.cpp @@ -7,7 +7,7 @@ #include "window.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity::Win32; diff --git a/src/interactivity/win32/menu.cpp b/src/interactivity/win32/menu.cpp index 44c7e1d609..3229f5663b 100644 --- a/src/interactivity/win32/menu.cpp +++ b/src/interactivity/win32/menu.cpp @@ -8,15 +8,15 @@ #include "icon.hpp" #include "window.hpp" -#include "..\..\host\dbcs.h" -#include "..\..\host\getset.h" -#include "..\..\host\handle.h" -#include "..\..\host\misc.h" -#include "..\..\host\server.h" -#include "..\..\host\scrolling.hpp" -#include "..\..\host\telemetry.hpp" +#include "../../host/dbcs.h" +#include "../../host/getset.h" +#include "../../host/handle.h" +#include "../../host/misc.h" +#include "../../host/server.h" +#include "../../host/scrolling.hpp" +#include "../../host/telemetry.hpp" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity::Win32; diff --git a/src/interactivity/win32/precomp.h b/src/interactivity/win32/precomp.h index c975863203..65a79d60e9 100644 --- a/src/interactivity/win32/precomp.h +++ b/src/interactivity/win32/precomp.h @@ -1,4 +1,4 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -#include "..\..\host\precomp.h" +#include "../../host/precomp.h" diff --git a/src/interactivity/win32/screenInfoUiaProvider.hpp b/src/interactivity/win32/screenInfoUiaProvider.hpp index 929ce267c0..2050eb3542 100644 --- a/src/interactivity/win32/screenInfoUiaProvider.hpp +++ b/src/interactivity/win32/screenInfoUiaProvider.hpp @@ -21,8 +21,8 @@ Author(s): #include -#include "..\types\ScreenInfoUiaProviderBase.h" -#include "..\types\UiaTextRangeBase.hpp" +#include "../types/ScreenInfoUiaProviderBase.h" +#include "../types/UiaTextRangeBase.hpp" #include "uiaTextRange.hpp" namespace Microsoft::Console::Interactivity::Win32 diff --git a/src/interactivity/win32/uiaTextRange.cpp b/src/interactivity/win32/uiaTextRange.cpp index a33957bfc9..e2831b70cc 100644 --- a/src/interactivity/win32/uiaTextRange.cpp +++ b/src/interactivity/win32/uiaTextRange.cpp @@ -5,7 +5,7 @@ #include "uiaTextRange.hpp" #include "screenInfoUiaProvider.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace Microsoft::Console::Types; using namespace Microsoft::Console::Interactivity::Win32; diff --git a/src/interactivity/win32/uiaTextRange.hpp b/src/interactivity/win32/uiaTextRange.hpp index 056e013181..b97652e15a 100644 --- a/src/interactivity/win32/uiaTextRange.hpp +++ b/src/interactivity/win32/uiaTextRange.hpp @@ -17,7 +17,7 @@ Author(s): #pragma once #include "precomp.h" -#include "..\types\UiaTextRangeBase.hpp" +#include "../types/UiaTextRangeBase.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp b/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp index e390201f81..17c771830f 100644 --- a/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp +++ b/src/interactivity/win32/ut_interactivity_win32/UiaTextRangeTests.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "CommonState.hpp" #include "uiaTextRange.hpp" diff --git a/src/interactivity/win32/window.cpp b/src/interactivity/win32/window.cpp index 8ddb5abfab..e7a7c774db 100644 --- a/src/interactivity/win32/window.cpp +++ b/src/interactivity/win32/window.cpp @@ -11,34 +11,34 @@ #include "windowdpiapi.hpp" #include "windowmetrics.hpp" -#include "..\..\inc\conint.h" +#include "../../inc/conint.h" -#include "..\..\host\globals.h" -#include "..\..\host\dbcs.h" -#include "..\..\host\getset.h" -#include "..\..\host\misc.h" -#include "..\..\host\_output.h" -#include "..\..\host\output.h" -#include "..\..\host\renderData.hpp" -#include "..\..\host\scrolling.hpp" -#include "..\..\host\srvinit.h" -#include "..\..\host\stream.h" -#include "..\..\host\telemetry.hpp" -#include "..\..\host\tracing.hpp" +#include "../../host/globals.h" +#include "../../host/dbcs.h" +#include "../../host/getset.h" +#include "../../host/misc.h" +#include "../../host/_output.h" +#include "../../host/output.h" +#include "../../host/renderData.hpp" +#include "../../host/scrolling.hpp" +#include "../../host/srvinit.h" +#include "../../host/stream.h" +#include "../../host/telemetry.hpp" +#include "../../host/tracing.hpp" -#include "..\..\renderer\base\renderer.hpp" -#include "..\..\renderer\gdi\gdirenderer.hpp" +#include "../../renderer/base/renderer.hpp" +#include "../../renderer/gdi/gdirenderer.hpp" #ifndef __INSIDE_WINDOWS -#include "..\..\renderer\dx\DxRenderer.hpp" +#include "../../renderer/dx/DxRenderer.hpp" #else // Forward-declare this so we don't blow up later. struct DxEngine; #endif -#include "..\inc\ServiceLocator.hpp" -#include "..\..\types\inc\Viewport.hpp" -#include "..\interactivity\win32\windowUiaProvider.hpp" +#include "../inc/ServiceLocator.hpp" +#include "../../types/inc/Viewport.hpp" +#include "../interactivity/win32/windowUiaProvider.hpp" // The following default masks are used in creating windows // Make sure that these flags match when switching to fullscreen and back diff --git a/src/interactivity/win32/window.hpp b/src/interactivity/win32/window.hpp index 538c50479b..36841c8879 100644 --- a/src/interactivity/win32/window.hpp +++ b/src/interactivity/win32/window.hpp @@ -14,7 +14,7 @@ Author(s): --*/ #pragma once -#include "..\inc\IConsoleWindow.hpp" +#include "../inc/IConsoleWindow.hpp" namespace Microsoft::Console::Interactivity::Win32 { diff --git a/src/interactivity/win32/windowdpiapi.hpp b/src/interactivity/win32/windowdpiapi.hpp index b3bb9cad86..f64bc00b63 100644 --- a/src/interactivity/win32/windowdpiapi.hpp +++ b/src/interactivity/win32/windowdpiapi.hpp @@ -13,7 +13,7 @@ Author(s): --*/ #pragma once -#include "..\inc\IHighDpiApi.hpp" +#include "../inc/IHighDpiApi.hpp" // Uncomment to build ConFans or other down-level build scenarios. // #define CON_DPIAPI_INDIRECT diff --git a/src/interactivity/win32/windowio.cpp b/src/interactivity/win32/windowio.cpp index 19542281c7..d331607d45 100644 --- a/src/interactivity/win32/windowio.cpp +++ b/src/interactivity/win32/windowio.cpp @@ -11,14 +11,14 @@ #include "consoleKeyInfo.hpp" #include "window.hpp" -#include "..\..\host\ApiRoutines.h" -#include "..\..\host\init.hpp" -#include "..\..\host\input.h" -#include "..\..\host\handle.h" -#include "..\..\host\scrolling.hpp" -#include "..\..\host\output.h" +#include "../../host/ApiRoutines.h" +#include "../../host/init.hpp" +#include "../../host/input.h" +#include "../../host/handle.h" +#include "../../host/scrolling.hpp" +#include "../../host/output.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" #pragma hdrstop diff --git a/src/interactivity/win32/windowio.hpp b/src/interactivity/win32/windowio.hpp index f6ea3682df..4a26a37551 100644 --- a/src/interactivity/win32/windowio.hpp +++ b/src/interactivity/win32/windowio.hpp @@ -5,7 +5,7 @@ #include "precomp.h" -#include "..\..\server\ProcessHandle.h" +#include "../../server/ProcessHandle.h" #pragma hdrstop diff --git a/src/interactivity/win32/windowproc.cpp b/src/interactivity/win32/windowproc.cpp index e423cc2ea0..c9075d4c28 100644 --- a/src/interactivity/win32/windowproc.cpp +++ b/src/interactivity/win32/windowproc.cpp @@ -13,23 +13,23 @@ #include "windowio.hpp" #include "windowmetrics.hpp" -#include "..\..\host\_output.h" -#include "..\..\host\output.h" -#include "..\..\host\dbcs.h" -#include "..\..\host\handle.h" -#include "..\..\host\input.h" -#include "..\..\host\misc.h" -#include "..\..\host\registry.hpp" -#include "..\..\host\scrolling.hpp" -#include "..\..\host\srvinit.h" +#include "../../host/_output.h" +#include "../../host/output.h" +#include "../../host/dbcs.h" +#include "../../host/handle.h" +#include "../../host/input.h" +#include "../../host/misc.h" +#include "../../host/registry.hpp" +#include "../../host/scrolling.hpp" +#include "../../host/srvinit.h" -#include "..\inc\ServiceLocator.hpp" +#include "../inc/ServiceLocator.hpp" -#include "..\..\inc\conint.h" +#include "../../inc/conint.h" -#include "..\interactivity\win32\CustomWindowMessages.h" +#include "../interactivity/win32/CustomWindowMessages.h" -#include "..\interactivity\win32\windowUiaProvider.hpp" +#include "../interactivity/win32/windowUiaProvider.hpp" #include #include diff --git a/src/internal/stubs.cpp b/src/internal/stubs.cpp index d6b61ea120..c7b5dcfaff 100644 --- a/src/internal/stubs.cpp +++ b/src/internal/stubs.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\inc\conint.h" +#include "../inc/conint.h" using namespace Microsoft::Console::Internal; diff --git a/src/propsheet/PropSheetHandler.cpp b/src/propsheet/PropSheetHandler.cpp index f34581d52e..079f775c4f 100644 --- a/src/propsheet/PropSheetHandler.cpp +++ b/src/propsheet/PropSheetHandler.cpp @@ -3,9 +3,9 @@ #include "precomp.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/propsheet/precomp.h b/src/propsheet/precomp.h index adbeb22668..92d0fe17c3 100644 --- a/src/propsheet/precomp.h +++ b/src/propsheet/precomp.h @@ -47,7 +47,7 @@ #include #include "strid.h" -#include "..\propslib\conpropsp.hpp" +#include "../propslib/conpropsp.hpp" #include diff --git a/src/propslib/precomp.h b/src/propslib/precomp.h index c5a9cd8bc0..32555ebc72 100644 --- a/src/propslib/precomp.h +++ b/src/propslib/precomp.h @@ -36,7 +36,7 @@ typedef NTSTATUS* PNTSTATUS; #include "LibraryIncludes.h" #include -#include "..\host\settings.hpp" +#include "../host/settings.hpp" #include #include "conpropsp.hpp" diff --git a/src/renderer/base/FontInfoBase.cpp b/src/renderer/base/FontInfoBase.cpp index 6c232c02d5..8de26d8baf 100644 --- a/src/renderer/base/FontInfoBase.cpp +++ b/src/renderer/base/FontInfoBase.cpp @@ -5,7 +5,7 @@ #include -#include "..\inc\FontInfoBase.hpp" +#include "../inc/FontInfoBase.hpp" bool operator==(const FontInfoBase& a, const FontInfoBase& b) { diff --git a/src/renderer/base/FontInfoDesired.cpp b/src/renderer/base/FontInfoDesired.cpp index 3b3b167dfd..c293d141a4 100644 --- a/src/renderer/base/FontInfoDesired.cpp +++ b/src/renderer/base/FontInfoDesired.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\inc\FontInfoDesired.hpp" +#include "../inc/FontInfoDesired.hpp" bool operator==(const FontInfoDesired& a, const FontInfoDesired& b) { diff --git a/src/renderer/base/fontinfo.cpp b/src/renderer/base/fontinfo.cpp index 23a9911f15..4238abd0b4 100644 --- a/src/renderer/base/fontinfo.cpp +++ b/src/renderer/base/fontinfo.cpp @@ -3,7 +3,7 @@ #include "precomp.h" -#include "..\inc\FontInfo.hpp" +#include "../inc/FontInfo.hpp" bool operator==(const FontInfo& a, const FontInfo& b) { diff --git a/src/renderer/base/precomp.h b/src/renderer/base/precomp.h index d6d1d00189..4b0c259334 100644 --- a/src/renderer/base/precomp.h +++ b/src/renderer/base/precomp.h @@ -21,8 +21,8 @@ Abstract: #include #include -#include "..\..\types\inc\viewport.hpp" -#include "..\..\inc\operators.hpp" +#include "../../types/inc/viewport.hpp" +#include "../../inc/operators.hpp" #ifndef _NTSTATUS_DEFINED #define _NTSTATUS_DEFINED diff --git a/src/renderer/base/thread.hpp b/src/renderer/base/thread.hpp index 16dc753743..e65bb17714 100644 --- a/src/renderer/base/thread.hpp +++ b/src/renderer/base/thread.hpp @@ -14,8 +14,8 @@ Author(s): #pragma once -#include "..\inc\IRenderer.hpp" -#include "..\inc\IRenderThread.hpp" +#include "../inc/IRenderer.hpp" +#include "../inc/IRenderThread.hpp" namespace Microsoft::Console::Render { diff --git a/src/renderer/dx/precomp.h b/src/renderer/dx/precomp.h index 1d17a00bb4..5715fd8fed 100644 --- a/src/renderer/dx/precomp.h +++ b/src/renderer/dx/precomp.h @@ -10,7 +10,7 @@ #include #include -#include "..\host\conddkrefs.h" +#include "../host/conddkrefs.h" #include #include diff --git a/src/renderer/dx/ut_dx/CustomTextLayoutTests.cpp b/src/renderer/dx/ut_dx/CustomTextLayoutTests.cpp index 38d33efd8e..7952470029 100644 --- a/src/renderer/dx/ut_dx/CustomTextLayoutTests.cpp +++ b/src/renderer/dx/ut_dx/CustomTextLayoutTests.cpp @@ -3,9 +3,9 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" -#include "..\CustomTextLayout.h" +#include "../CustomTextLayout.h" using namespace WEX::Common; using namespace WEX::Logging; diff --git a/src/renderer/gdi/gdirenderer.hpp b/src/renderer/gdi/gdirenderer.hpp index 6268e21609..65a8c0248c 100644 --- a/src/renderer/gdi/gdirenderer.hpp +++ b/src/renderer/gdi/gdirenderer.hpp @@ -14,7 +14,7 @@ Author(s): #pragma once -#include "..\inc\RenderEngineBase.hpp" +#include "../inc/RenderEngineBase.hpp" namespace Microsoft::Console::Render { diff --git a/src/renderer/vt/tracing.hpp b/src/renderer/vt/tracing.hpp index c414c8ebca..7d1cc7dfa6 100644 --- a/src/renderer/vt/tracing.hpp +++ b/src/renderer/vt/tracing.hpp @@ -14,7 +14,7 @@ Abstract: #include #include #include -#include +#include #include "../../types/inc/Viewport.hpp" TRACELOGGING_DECLARE_PROVIDER(g_hConsoleVtRendererTraceProvider); diff --git a/src/renderer/wddmcon/WddmConRenderer.hpp b/src/renderer/wddmcon/WddmConRenderer.hpp index 370a03acb6..f9ad89b174 100644 --- a/src/renderer/wddmcon/WddmConRenderer.hpp +++ b/src/renderer/wddmcon/WddmConRenderer.hpp @@ -3,7 +3,7 @@ #pragma once -#include "..\..\renderer\inc\RenderEngineBase.hpp" +#include "../../renderer/inc/RenderEngineBase.hpp" namespace Microsoft::Console::Render { diff --git a/src/server/ApiDispatchersInternal.cpp b/src/server/ApiDispatchersInternal.cpp index 1b25804a2f..fc9abc5b47 100644 --- a/src/server/ApiDispatchersInternal.cpp +++ b/src/server/ApiDispatchersInternal.cpp @@ -5,14 +5,14 @@ #include "ApiDispatchers.h" -#include "..\host\globals.h" -#include "..\host\handle.h" -#include "..\host\server.h" -#include "..\host\telemetry.hpp" +#include "../host/globals.h" +#include "../host/handle.h" +#include "../host/server.h" +#include "../host/telemetry.hpp" -#include "..\host\ntprivapi.hpp" +#include "../host/ntprivapi.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using Microsoft::Console::Interactivity::ServiceLocator; diff --git a/src/server/DeviceComm.h b/src/server/DeviceComm.h index ec78caca5c..f170e858a6 100644 --- a/src/server/DeviceComm.h +++ b/src/server/DeviceComm.h @@ -16,9 +16,9 @@ Revision History: #pragma once -#include "..\host\conapi.h" +#include "../host/conapi.h" -#include +#include class DeviceComm { diff --git a/src/server/IoDispatchers.cpp b/src/server/IoDispatchers.cpp index 40c53a9bcd..1a5fb2534b 100644 --- a/src/server/IoDispatchers.cpp +++ b/src/server/IoDispatchers.cpp @@ -7,14 +7,14 @@ #include "ApiSorter.h" -#include "..\host\conserv.h" -#include "..\host\conwinuserrefs.h" -#include "..\host\directio.h" -#include "..\host\handle.h" -#include "..\host\srvinit.h" -#include "..\host\telemetry.hpp" +#include "../host/conserv.h" +#include "../host/conwinuserrefs.h" +#include "../host/directio.h" +#include "../host/handle.h" +#include "../host/srvinit.h" +#include "../host/telemetry.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity; diff --git a/src/server/IoSorter.cpp b/src/server/IoSorter.cpp index 9cbdf5a508..26ac482046 100644 --- a/src/server/IoSorter.cpp +++ b/src/server/IoSorter.cpp @@ -10,10 +10,10 @@ #include "ApiSorter.h" -#include "..\host\globals.h" +#include "../host/globals.h" -#include "..\host\getset.h" -#include "..\host\stream.h" +#include "../host/getset.h" +#include "../host/stream.h" void IoSorter::ServiceIoOperation(_In_ CONSOLE_API_MSG* const pMsg, _Out_ CONSOLE_API_MSG** ReplyMsg) diff --git a/src/server/ObjectHandle.cpp b/src/server/ObjectHandle.cpp index b16aae532b..641b4b8ae2 100644 --- a/src/server/ObjectHandle.cpp +++ b/src/server/ObjectHandle.cpp @@ -5,12 +5,12 @@ #include "ObjectHandle.h" -#include "..\host\globals.h" -#include "..\host\inputReadHandleData.h" -#include "..\host\input.h" -#include "..\host\screenInfo.hpp" +#include "../host/globals.h" +#include "../host/inputReadHandleData.h" +#include "../host/input.h" +#include "../host/screenInfo.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" ConsoleHandleData::ConsoleHandleData(const ACCESS_MASK amAccess, const ULONG ulShareAccess) : diff --git a/src/server/ObjectHeader.cpp b/src/server/ObjectHeader.cpp index aca88eadd8..22dc9bc9ba 100644 --- a/src/server/ObjectHeader.cpp +++ b/src/server/ObjectHeader.cpp @@ -6,7 +6,7 @@ #include "ObjectHeader.h" #include "ObjectHandle.h" -#include "..\host\inputReadHandleData.h" +#include "../host/inputReadHandleData.h" ConsoleObjectHeader::ConsoleObjectHeader() : _ulOpenCount(0), diff --git a/src/server/ProcessHandle.cpp b/src/server/ProcessHandle.cpp index 28e698efb6..f2920c7b43 100644 --- a/src/server/ProcessHandle.cpp +++ b/src/server/ProcessHandle.cpp @@ -5,8 +5,8 @@ #include "ProcessHandle.h" -#include "..\host\globals.h" -#include "..\host\telemetry.hpp" +#include "../host/globals.h" +#include "../host/telemetry.hpp" // Routine Description: // - Constructs an instance of the ConsoleProcessHandle Class diff --git a/src/server/ProcessHandle.h b/src/server/ProcessHandle.h index f92ce054e8..15ec6efff1 100644 --- a/src/server/ProcessHandle.h +++ b/src/server/ProcessHandle.h @@ -23,7 +23,7 @@ Revision History: #include "ConsoleShimPolicy.h" #include -#include +#include class ConsoleProcessHandle { diff --git a/src/server/ProcessList.cpp b/src/server/ProcessList.cpp index e828e35b9a..9c3f36de1a 100644 --- a/src/server/ProcessList.cpp +++ b/src/server/ProcessList.cpp @@ -5,11 +5,11 @@ #include "ProcessList.h" -#include "..\host\conwinuserrefs.h" -#include "..\host\globals.h" -#include "..\host\telemetry.hpp" +#include "../host/conwinuserrefs.h" +#include "../host/globals.h" +#include "../host/telemetry.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" using namespace Microsoft::Console::Interactivity; diff --git a/src/server/ProcessPolicy.cpp b/src/server/ProcessPolicy.cpp index 8191137ffd..090c1588d8 100644 --- a/src/server/ProcessPolicy.cpp +++ b/src/server/ProcessPolicy.cpp @@ -5,7 +5,7 @@ #include "ProcessPolicy.h" -#include "..\inc\conint.h" +#include "../inc/conint.h" // Routine Description: // - Constructs a new instance of the process policy class. diff --git a/src/server/WaitBlock.cpp b/src/server/WaitBlock.cpp index fd1b19e59a..2aab0352ff 100644 --- a/src/server/WaitBlock.cpp +++ b/src/server/WaitBlock.cpp @@ -8,10 +8,10 @@ #include "ApiSorter.h" -#include "..\host\globals.h" -#include "..\host\utils.hpp" +#include "../host/globals.h" +#include "../host/utils.hpp" -#include "..\interactivity\inc\ServiceLocator.hpp" +#include "../interactivity/inc/ServiceLocator.hpp" // Routine Description: // - Initializes a ConsoleWaitBlock diff --git a/src/server/WaitBlock.h b/src/server/WaitBlock.h index b757b004b3..d196439476 100644 --- a/src/server/WaitBlock.h +++ b/src/server/WaitBlock.h @@ -17,7 +17,7 @@ Revision History: #pragma once -#include "..\host\conapi.h" +#include "../host/conapi.h" #include "IWaitRoutine.h" #include "WaitTerminationReason.h" diff --git a/src/server/WaitQueue.cpp b/src/server/WaitQueue.cpp index 33775cc627..b183306112 100644 --- a/src/server/WaitQueue.cpp +++ b/src/server/WaitQueue.cpp @@ -6,8 +6,8 @@ #include "WaitQueue.h" #include "WaitBlock.h" -#include "..\host\globals.h" -#include "..\host\utils.hpp" +#include "../host/globals.h" +#include "../host/utils.hpp" // Routine Description: // - Instantiates a new ConsoleWaitQueue diff --git a/src/server/WaitQueue.h b/src/server/WaitQueue.h index 316dd3853e..929f364446 100644 --- a/src/server/WaitQueue.h +++ b/src/server/WaitQueue.h @@ -19,7 +19,7 @@ Revision History: #include -#include "..\host\conapi.h" +#include "../host/conapi.h" #include "IWaitRoutine.h" #include "WaitBlock.h" diff --git a/src/server/precomp.h b/src/server/precomp.h index a92adaa49b..9b9b2de382 100644 --- a/src/server/precomp.h +++ b/src/server/precomp.h @@ -68,7 +68,7 @@ __inline NTSTATUS_FROM_WIN32(long x) #include "LibraryIncludes.h" // private dependencies -#include "..\host\conddkrefs.h" +#include "../host/conddkrefs.h" #include #include diff --git a/src/terminal/adapter/conGetSet.hpp b/src/terminal/adapter/conGetSet.hpp index 186d88bd79..04049348df 100644 --- a/src/terminal/adapter/conGetSet.hpp +++ b/src/terminal/adapter/conGetSet.hpp @@ -15,9 +15,9 @@ Author(s): #pragma once -#include "..\..\types\inc\IInputEvent.hpp" -#include "..\..\buffer\out\TextAttribute.hpp" -#include "..\..\inc\conattrs.hpp" +#include "../../types/inc/IInputEvent.hpp" +#include "../../buffer/out/TextAttribute.hpp" +#include "../../inc/conattrs.hpp" #include #include diff --git a/src/terminal/adapter/precomp.h b/src/terminal/adapter/precomp.h index 3bac1b4b2a..838240d9b8 100644 --- a/src/terminal/adapter/precomp.h +++ b/src/terminal/adapter/precomp.h @@ -22,4 +22,4 @@ Abstract: #include "telemetry.hpp" #include "tracing.hpp" -#include "..\..\inc\conattrs.hpp" +#include "../../inc/conattrs.hpp" diff --git a/src/terminal/adapter/telemetry.hpp b/src/terminal/adapter/telemetry.hpp index a1f9c7fc8a..1a2ba41a86 100644 --- a/src/terminal/adapter/telemetry.hpp +++ b/src/terminal/adapter/telemetry.hpp @@ -15,6 +15,6 @@ Abstract: #include #include #include -#include +#include TRACELOGGING_DECLARE_PROVIDER(g_hConsoleVirtTermParserEventTraceProvider); diff --git a/src/terminal/adapter/ut_adapter/MouseInputTest.cpp b/src/terminal/adapter/ut_adapter/MouseInputTest.cpp index a5e28356ae..881f19543a 100644 --- a/src/terminal/adapter/ut_adapter/MouseInputTest.cpp +++ b/src/terminal/adapter/ut_adapter/MouseInputTest.cpp @@ -3,9 +3,9 @@ #include "precomp.h" #include -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" -#include "..\terminal\input\terminalInput.hpp" +#include "../terminal/input/terminalInput.hpp" using namespace WEX::Common; using namespace WEX::Logging; diff --git a/src/terminal/adapter/ut_adapter/adapterTest.cpp b/src/terminal/adapter/ut_adapter/adapterTest.cpp index b86494e52c..bc1b1b0112 100644 --- a/src/terminal/adapter/ut_adapter/adapterTest.cpp +++ b/src/terminal/adapter/ut_adapter/adapterTest.cpp @@ -3,7 +3,7 @@ #include "precomp.h" #include -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" #include "adaptDispatch.hpp" diff --git a/src/terminal/adapter/ut_adapter/inputTest.cpp b/src/terminal/adapter/ut_adapter/inputTest.cpp index 406a0292c8..fe19266a47 100644 --- a/src/terminal/adapter/ut_adapter/inputTest.cpp +++ b/src/terminal/adapter/ut_adapter/inputTest.cpp @@ -2,15 +2,15 @@ // Licensed under the MIT license. #include "precomp.h" -#include "..\precomp.h" +#include "../precomp.h" #include #include -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" -#include "..\..\input\terminalInput.hpp" +#include "../../input/terminalInput.hpp" #ifdef BUILD_ONECORE_INTERACTIVITY -#include "..\..\..\interactivity\inc\VtApiRedirection.hpp" +#include "../../../interactivity/inc/VtApiRedirection.hpp" #endif using namespace WEX::Common; diff --git a/src/terminal/input/mouseInput.cpp b/src/terminal/input/mouseInput.cpp index 047e56ecb8..6aecb68b7a 100644 --- a/src/terminal/input/mouseInput.cpp +++ b/src/terminal/input/mouseInput.cpp @@ -9,7 +9,7 @@ using namespace Microsoft::Console::VirtualTerminal; #ifdef BUILD_ONECORE_INTERACTIVITY -#include "..\..\interactivity\inc\VtApiRedirection.hpp" +#include "../../interactivity/inc/VtApiRedirection.hpp" #endif static const int s_MaxDefaultCoordinate = 94; diff --git a/src/terminal/input/precomp.h b/src/terminal/input/precomp.h index 56c7167c0e..b71a1065a2 100644 --- a/src/terminal/input/precomp.h +++ b/src/terminal/input/precomp.h @@ -13,4 +13,4 @@ Abstract: // This includes support libraries from the CRT, STL, WIL, and GSL #include "LibraryIncludes.h" -#include "..\..\inc\conattrs.hpp" +#include "../../inc/conattrs.hpp" diff --git a/src/terminal/input/terminalInput.cpp b/src/terminal/input/terminalInput.cpp index 328ec1c672..c02892abed 100644 --- a/src/terminal/input/terminalInput.cpp +++ b/src/terminal/input/terminalInput.cpp @@ -8,14 +8,14 @@ #include "strsafe.h" #define WIL_SUPPORT_BITOPERATION_PASCAL_NAMES -#include +#include #ifdef BUILD_ONECORE_INTERACTIVITY -#include "..\..\interactivity\inc\VtApiRedirection.hpp" +#include "../../interactivity/inc/VtApiRedirection.hpp" #endif -#include "..\..\inc\unicode.hpp" -#include "..\..\types\inc\Utf16Parser.hpp" +#include "../../inc/unicode.hpp" +#include "../../types/inc/Utf16Parser.hpp" using namespace Microsoft::Console::VirtualTerminal; diff --git a/src/terminal/parser/ft_fuzzwrapper/main.cpp b/src/terminal/parser/ft_fuzzwrapper/main.cpp index ca5a297d5d..b6f6334fdc 100644 --- a/src/terminal/parser/ft_fuzzwrapper/main.cpp +++ b/src/terminal/parser/ft_fuzzwrapper/main.cpp @@ -4,8 +4,8 @@ #include "precomp.h" #include "echoDispatch.hpp" -#include "..\stateMachine.hpp" -#include "..\OutputStateMachineEngine.hpp" +#include "../stateMachine.hpp" +#include "../OutputStateMachineEngine.hpp" using namespace Microsoft::Console::VirtualTerminal; diff --git a/src/tools/buffersize/main.cpp b/src/tools/buffersize/main.cpp index 9cfb7338ca..b508c7288e 100644 --- a/src/tools/buffersize/main.cpp +++ b/src/tools/buffersize/main.cpp @@ -2,11 +2,11 @@ // Licensed under the MIT license. #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include /* srand, rand */ #include /* time */ diff --git a/src/tools/echokey/main.cpp b/src/tools/echokey/main.cpp index e391754e34..001b77a53f 100644 --- a/src/tools/echokey/main.cpp +++ b/src/tools/echokey/main.cpp @@ -16,8 +16,8 @@ using namespace std; // WIL #define WIL_SUPPORT_BITOPERATION_PASCAL_NAMES -#include -#include +#include +#include bool gVtInput = false; bool gVtOutput = true; diff --git a/src/tools/fontlist/main.cpp b/src/tools/fontlist/main.cpp index 27442e0c04..11a7d94a0b 100644 --- a/src/tools/fontlist/main.cpp +++ b/src/tools/fontlist/main.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include int CALLBACK FontEnumForV2Console(ENUMLOGFONT* pelf, NEWTEXTMETRIC* pntm, int nFontType, LPARAM lParam); int AddFont( diff --git a/src/tools/vtpipeterm/VtConsole.cpp b/src/tools/vtpipeterm/VtConsole.cpp index bd244daaa9..8e521ee7ae 100644 --- a/src/tools/vtpipeterm/VtConsole.cpp +++ b/src/tools/vtpipeterm/VtConsole.cpp @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -#include "..\..\inc\conpty.h" +#include "../../inc/conpty.h" #include "VtConsole.hpp" #include /* srand, rand */ diff --git a/src/tools/vtpipeterm/VtConsole.hpp b/src/tools/vtpipeterm/VtConsole.hpp index bd65b6b1ff..a85c88d395 100644 --- a/src/tools/vtpipeterm/VtConsole.hpp +++ b/src/tools/vtpipeterm/VtConsole.hpp @@ -15,8 +15,8 @@ Author(s): --*/ #include -#include -#include +#include +#include #include diff --git a/src/tools/vtpipeterm/main.cpp b/src/tools/vtpipeterm/main.cpp index c5e165618c..32a039b563 100644 --- a/src/tools/vtpipeterm/main.cpp +++ b/src/tools/vtpipeterm/main.cpp @@ -2,11 +2,11 @@ // Licensed under the MIT license. #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include /* srand, rand */ #include /* time */ diff --git a/src/tsf/precomp.h b/src/tsf/precomp.h index eb95d0f1f2..d81ef6efb8 100644 --- a/src/tsf/precomp.h +++ b/src/tsf/precomp.h @@ -44,7 +44,7 @@ extern "C" { // This includes support libraries from the CRT, STL, WIL, and GSL #include "LibraryIncludes.h" -#include "..\inc\contsf.h" +#include "../inc/contsf.h" #include "globals.h" diff --git a/src/types/TermControlUiaTextRange.hpp b/src/types/TermControlUiaTextRange.hpp index 82c798431c..4ec34277af 100644 --- a/src/types/TermControlUiaTextRange.hpp +++ b/src/types/TermControlUiaTextRange.hpp @@ -16,7 +16,7 @@ Author(s): #pragma once -#include "..\types\UiaTextRangeBase.hpp" +#include "../types/UiaTextRangeBase.hpp" namespace Microsoft::Terminal { diff --git a/src/types/UiaTextRangeBase.cpp b/src/types/UiaTextRangeBase.cpp index 6c87f90b56..89ce8dc654 100644 --- a/src/types/UiaTextRangeBase.cpp +++ b/src/types/UiaTextRangeBase.cpp @@ -4,7 +4,7 @@ #include "precomp.h" #include "UiaTextRangeBase.hpp" #include "ScreenInfoUiaProviderBase.h" -#include "..\buffer\out\search.h" +#include "../buffer/out/search.h" #include "UiaTracing.h" using namespace Microsoft::Console::Types; diff --git a/src/types/inc/IInputEvent.hpp b/src/types/inc/IInputEvent.hpp index d4c7338191..bf662f0dfa 100644 --- a/src/types/inc/IInputEvent.hpp +++ b/src/types/inc/IInputEvent.hpp @@ -13,12 +13,12 @@ Author: #pragma once -#include -#include +#include +#include #ifndef ALTNUMPAD_BIT // from winconp.h -#define ALTNUMPAD_BIT 0x04000000 // AltNumpad OEM char (copied from ntuser\inc\kbd.h) +#define ALTNUMPAD_BIT 0x04000000 // AltNumpad OEM char (copied from ntuser/inc/kbd.h) #endif #include diff --git a/src/types/precomp.h b/src/types/precomp.h index 193b79decf..d14fc703a8 100644 --- a/src/types/precomp.h +++ b/src/types/precomp.h @@ -48,7 +48,7 @@ Abstract: // private dependencies #pragma warning(push) #pragma warning(disable: ALL_CPPCORECHECK_WARNINGS) -#include "..\host\conddkrefs.h" +#include "../host/conddkrefs.h" #pragma warning(pop) #include diff --git a/src/types/ut_types/UtilsTests.cpp b/src/types/ut_types/UtilsTests.cpp index 36d252369e..73992bc874 100644 --- a/src/types/ut_types/UtilsTests.cpp +++ b/src/types/ut_types/UtilsTests.cpp @@ -3,10 +3,10 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" -#include "..\inc\utils.hpp" -#include "..\inc\colorTable.hpp" +#include "../inc/utils.hpp" +#include "../inc/colorTable.hpp" #include using namespace WEX::Common; diff --git a/src/types/ut_types/UuidTests.cpp b/src/types/ut_types/UuidTests.cpp index b1e3ef1c0e..af35c4ebd2 100644 --- a/src/types/ut_types/UuidTests.cpp +++ b/src/types/ut_types/UuidTests.cpp @@ -3,9 +3,9 @@ #include "precomp.h" #include "WexTestClass.h" -#include "..\..\inc\consoletaeftemplates.hpp" +#include "../../inc/consoletaeftemplates.hpp" -#include "..\inc\utils.hpp" +#include "../inc/utils.hpp" using namespace WEX::Common; using namespace WEX::Logging;