Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from microsoft:main #108

Merged
merged 4 commits into from
Jan 10, 2024
Merged

[pull] main from microsoft:main #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
375d00d
Fix similarIssues.yml to not fail when no similar issues found (#16542)
craigloewen-msft Jan 8, 2024
c4c06da
Remove EDP auditing completely (#16460)
DHowett Jan 9, 2024
d115500
Enable alternate scroll mode by default (#16535)
j4james Jan 9, 2024
fb8b120
Remove leftover telemetry code (#16468)
lhecker Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/actions/spelling/expect/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,6 @@
EDITKEYS
EDITTEXT
EDITUPDATE
edputil
Efast
efghijklmn
EHsc
Expand Down Expand Up @@ -790,7 +789,7 @@
Hostx
HPA
hpcon
HPCON

Check warning on line 792 in .github/actions/spelling/expect/expect.txt

View workflow job for this annotation

GitHub Actions / Spell checking 

`HPCON` is ignored by check spelling because another more general variant is also in expect. (ignored-expect-variant)
hpen
HPR
HProvider
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/similarIssues.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
runs-on: ubuntu-latest
permissions:
issues: write
if: needs.getSimilarIssues.outputs.message != ''
steps:
- name: Add comment
run: gh issue comment "$NUMBER" --repo "$REPO" --body "$BODY"
Expand Down
2 changes: 0 additions & 2 deletions src/host/host-common.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<ClCompile Include="..\settings.cpp" />
<ClCompile Include="..\srvinit.cpp" />
<ClCompile Include="..\stream.cpp" />
<ClCompile Include="..\telemetry.cpp" />
<ClCompile Include="..\tracing.cpp" />
<ClCompile Include="..\utils.cpp" />
<ClCompile Include="..\VtApiRoutines.cpp" />
Expand Down Expand Up @@ -96,7 +95,6 @@
<ClInclude Include="..\settings.hpp" />
<ClInclude Include="..\srvinit.h" />
<ClInclude Include="..\stream.h" />
<ClInclude Include="..\telemetry.hpp" />
<ClInclude Include="..\tracing.hpp" />
<ClInclude Include="..\utils.hpp" />
<ClInclude Include="..\VtApiRoutines.h" />
Expand Down
6 changes: 2 additions & 4 deletions src/host/lib/hostlib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@
<ClCompile Include="..\stream.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\telemetry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\tracing.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -320,5 +317,6 @@
</ItemGroup>
<ItemGroup>
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
<Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/host/precomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Module Name:
TRACELOGGING_DECLARE_PROVIDER(g_hConhostV2EventTraceProvider);
#include <telemetry/ProjectTelemetry.h>
#include <TraceLoggingActivity.h>
#include "telemetry.hpp"

#include "tracing.hpp"

#ifdef BUILDING_INSIDE_WINIDE
Expand Down
3 changes: 0 additions & 3 deletions src/host/res.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ BEGIN

ID_CONSOLE_FMT_WINDOWTITLE, "%s%s"

/* WIP Audit destination name */
ID_CONSOLE_WIP_DESTINATIONNAME, "console application"

/* Menu items that replace the standard ones. These don't have the accelerators */
SC_CLOSE, "&Close"

Expand Down
1 change: 0 additions & 1 deletion src/host/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ Author(s):
#define ID_CONSOLE_MSGMARKMODE 0x100C
#define ID_CONSOLE_MSGSCROLLMODE 0x100D
#define ID_CONSOLE_FMT_WINDOWTITLE 0x100E
#define ID_CONSOLE_WIP_DESTINATIONNAME 0x100F

// Menu Item strings
#define ID_CONSOLE_COPY 0xFFF0
Expand Down
3 changes: 0 additions & 3 deletions src/host/sources.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ SOURCES = \
..\_output.cpp \
..\_stream.cpp \
..\utils.cpp \
..\telemetry.cpp \
..\tracing.cpp \
..\registry.cpp \
..\settings.cpp \
Expand Down Expand Up @@ -138,7 +137,6 @@ TARGETLIBS = \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-draw-l1.lib \
Expand Down Expand Up @@ -206,7 +204,6 @@ DELAYLOAD = \
api-ms-win-shell-dataobject-l1.dll; \
api-ms-win-shell-namespace-l1.dll; \
ext-ms-win-dwmapi-ext-l1.dll; \
ext-ms-win-edputil-policy-l1.dll; \
ext-ms-win-usp10-l1.dll; \
ext-ms-win-gdi-dc-l1.dll; \
ext-ms-win-gdi-dc-create-l1.dll; \
Expand Down
21 changes: 0 additions & 21 deletions src/host/telemetry.cpp
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/host/telemetry.hpp
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/inc/conint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ namespace Microsoft::Console::Internal

}

namespace EdpPolicy
{
void AuditClipboard(const std::wstring_view destinationName) noexcept;
}

namespace Theming
{
[[nodiscard]] HRESULT TrySetDarkMode(HWND hwnd) noexcept;
Expand Down
2 changes: 0 additions & 2 deletions src/interactivity/win32/Clipboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,6 @@ void Clipboard::Paste()
StringPaste(pwstr, (ULONG)GlobalSize(ClipboardDataHandle) / sizeof(WCHAR));

// WIP auditing if user is enrolled
static auto DestinationName = _LoadString(ID_CONSOLE_WIP_DESTINATIONNAME);
Microsoft::Console::Internal::EdpPolicy::AuditClipboard(DestinationName);

GlobalUnlock(ClipboardDataHandle);

Expand Down
1 change: 0 additions & 1 deletion src/interactivity/win32/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "../../host/misc.h"
#include "../../host/server.h"
#include "../../host/scrolling.hpp"
#include "../../host/telemetry.hpp"

#include "../inc/ServiceLocator.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/interactivity/win32/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ Author(s):
#define ID_CONSOLE_MSGMARKMODE 0x100C
#define ID_CONSOLE_MSGSCROLLMODE 0x100D
#define ID_CONSOLE_FMT_WINDOWTITLE 0x100E
#define ID_CONSOLE_WIP_DESTINATIONNAME 0x100F

// Menu Item strings
#define ID_CONSOLE_COPY 0xFFF0
Expand Down
2 changes: 0 additions & 2 deletions src/interactivity/win32/ut_interactivity_win32/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ TARGETLIBS = \
$(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
$(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-draw-l1.lib \
Expand Down Expand Up @@ -116,7 +115,6 @@ DELAYLOAD = \
api-ms-win-shell-dataobject-l1.dll; \
api-ms-win-shell-namespace-l1.dll; \
ext-ms-win-dwmapi-ext-l1.dll; \
ext-ms-win-edputil-policy-l1.dll; \
ext-ms-win-gdi-dc-l1.dll; \
ext-ms-win-gdi-dc-create-l1.dll; \
ext-ms-win-gdi-draw-l1.dll; \
Expand Down
1 change: 0 additions & 1 deletion src/interactivity/win32/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#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"
Expand Down
4 changes: 0 additions & 4 deletions src/internal/stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ using namespace Microsoft::Console::Internal;
return S_OK;
}

void EdpPolicy::AuditClipboard(const std::wstring_view /*destinationName*/) noexcept
{
}

[[nodiscard]] HRESULT Theming::TrySetDarkMode(HWND /*hwnd*/) noexcept
{
return S_FALSE;
Expand Down
2 changes: 0 additions & 2 deletions src/propsheet/sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ TARGETLIBS = \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\onecoreuap_internal.lib \
$(ONECOREUAP_INTERNAL_SDK_LIB_PATH)\onecoreuapuuid.lib \
$(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-dc-create-l1.lib \
$(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-gdi-draw-l1.lib \
Expand All @@ -109,7 +108,6 @@ TARGETLIBS = \

DELAYLOAD = \
ext-ms-win-dwmapi-ext-l1.dll; \
ext-ms-win-edputil-policy-l1.dll; \
ext-ms-win-uxtheme-themes-l1.dll; \
ext-ms-win-shell32-shellfolders-l1.dll; \
ext-ms-win-gdi-dc-l1.dll; \
Expand Down
1 change: 0 additions & 1 deletion src/server/ApiDispatchers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "../host/getset.h"
#include "../host/stream.h"
#include "../host/srvinit.h"
#include "../host/telemetry.hpp"
#include "../host/cmdline.h"

// Assumes that it will find <m> in the calling environment.
Expand Down
1 change: 0 additions & 1 deletion src/server/ApiDispatchersInternal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "../host/globals.h"
#include "../host/handle.h"
#include "../host/server.h"
#include "../host/telemetry.hpp"

#include "../host/ntprivapi.hpp"

Expand Down
1 change: 0 additions & 1 deletion src/server/IoDispatchers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "../host/directio.h"
#include "../host/handle.h"
#include "../host/srvinit.h"
#include "../host/telemetry.hpp"

#include "../interactivity/base/HostSignalInputThread.hpp"
#include "../interactivity/inc/ServiceLocator.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/server/ProcessHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "ProcessHandle.h"

#include "../host/globals.h"
#include "../host/telemetry.hpp"

// Routine Description:
// - Constructs an instance of the ConsoleProcessHandle Class
Expand Down
6 changes: 1 addition & 5 deletions src/terminal/adapter/lib/adapter.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
<ClCompile Include="..\InteractDispatch.cpp" />
<ClCompile Include="..\MacroBuffer.cpp" />
<ClCompile Include="..\adaptDispatchGraphics.cpp" />
<ClCompile Include="..\telemetry.cpp" />
<ClCompile Include="..\terminalOutput.cpp" />
<ClCompile Include="..\tracing.cpp" />
<ClCompile Include="..\precomp.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
Expand All @@ -32,12 +30,10 @@
<ClInclude Include="..\ITerminalApi.hpp" />
<ClInclude Include="..\MacroBuffer.hpp" />
<ClInclude Include="..\precomp.h" />
<ClInclude Include="..\telemetry.hpp" />
<ClInclude Include="..\terminalOutput.hpp" />
<ClInclude Include="..\ITermDispatch.hpp" />
<ClInclude Include="..\termDispatch.hpp" />
<ClInclude Include="..\IInteractDispatch.hpp" />
<ClInclude Include="..\tracing.hpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\types\lib\types.vcxproj">
Expand All @@ -50,4 +46,4 @@
<!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
<Import Project="$(SolutionDir)src\common.build.post.props" />
<Import Project="$(SolutionDir)src\common.nugetversions.targets" />
</Project>
</Project>
13 changes: 1 addition & 12 deletions src/terminal/adapter/lib/adapter.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@
<ClCompile Include="..\adaptDispatch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\telemetry.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\terminalOutput.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\tracing.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\adaptDispatchGraphics.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -53,15 +47,9 @@
<ClInclude Include="..\precomp.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\telemetry.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\terminalOutput.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\tracing.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\IInteractDispatch.hpp">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -89,5 +77,6 @@
</ItemGroup>
<ItemGroup>
<Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
<Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions src/terminal/adapter/precomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@ Module Name:

#include <sal.h>

#include "telemetry.hpp"
#include "tracing.hpp"

#include "../../inc/conattrs.hpp"
2 changes: 0 additions & 2 deletions src/terminal/adapter/sources.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ SOURCES= \
..\MacroBuffer.cpp \
..\adaptDispatchGraphics.cpp \
..\terminalOutput.cpp \
..\telemetry.cpp \
..\tracing.cpp \

INCLUDES = \
$(INCLUDES); \
Expand Down
6 changes: 0 additions & 6 deletions src/terminal/adapter/telemetry.cpp
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions src/terminal/adapter/telemetry.hpp
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/terminal/adapter/tracing.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading