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

Tab to spaces (#578)

Browse source 
* tab to spaces

* change tab size to 4.
This commit is contained in:
pythias 2019-05-14 09:06:36 +08:00 committed by Dustin L. Howett (MSFT)
parent af3a421938
commit 2c1ab620bf
6 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
NuGet.Config
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="NuGet.org" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
<!-- Add repositories here to the list of available repositories --> <!-- Add repositories here to the list of available repositories -->
<!-- Dependencies that we must carry because they're not on public nuget feeds right now. --> <!-- Dependencies that we must carry because they're not on public nuget feeds right now. -->
<add key="Static Package Dependencies" value="dep\packages" /> <add key="Static Package Dependencies" value="dep\packages" />
<!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network --> <!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network -->
<!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" /> <!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />
<add key="OpenConsole - Internal" value="https://microsoft.pkgs.visualstudio.com/_packaging/OpenConsole/nuget/v3/index.json" />--> <add key="OpenConsole - Internal" value="https://microsoft.pkgs.visualstudio.com/_packaging/OpenConsole/nuget/v3/index.json" />-->
</packageSources> </packageSources>
<config> <config>
<add key="repositorypath" value=".\packages" /> <add key="repositorypath" value=".\packages" />
</config> </config>
</configuration> </configuration>

46
src/ConsolePerf.regions.xml
View file

@ -1,32 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<InstrumentationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <InstrumentationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Instrumentation> <Instrumentation>
<Regions> <Regions>
<!-- The RegionRoot and Region GUID are made up. Make some up. --> <!-- The RegionRoot and Region GUID are made up. Make some up. -->
<RegionRoot Guid="{ff1020e3-3f3a-3656-44a0-096b0b9b575a}" Name="TAEF"> <RegionRoot Guid="{ff1020e3-3f3a-3656-44a0-096b0b9b575a}" Name="TAEF">
<Region Guid="{e1f18b03-d49c-6f10-3753-2dc36fa663f1}" Name="TestRun"> <Region Guid="{e1f18b03-d49c-6f10-3753-2dc36fa663f1}" Name="TestRun">
<Start> <Start>
<!-- This GUID corresponds to one of the TAEF providers that will send this start/stop event pair. --> <!-- This GUID corresponds to one of the TAEF providers that will send this start/stop event pair. -->
<Event Provider="{70d27130-f2f3-4365-b790-d31223254ef4}" Name="RunTest_TestRunScope" Opcode="1"/> <Event Provider="{70d27130-f2f3-4365-b790-d31223254ef4}" Name="RunTest_TestRunScope" Opcode="1"/>
</Start> </Start>
<Stop> <Stop>
<Event Provider="{70d27130-f2f3-4365-b790-d31223254ef4}" Name="RunTest_TestRunScope" Opcode="2"/> <Event Provider="{70d27130-f2f3-4365-b790-d31223254ef4}" Name="RunTest_TestRunScope" Opcode="2"/>
</Stop> </Stop>
<Match> <Match>
<Event> <Event>
<Payload FieldName="ScopeName"/> <Payload FieldName="ScopeName"/>
</Event> </Event>
</Match> </Match>
<Naming> <Naming>
<PayloadBased NameField="ScopeName"/> <PayloadBased NameField="ScopeName"/>
</Naming> </Naming>
<Metadata> <Metadata>
<!-- At a bare minimum, you must collect something to get the wall time measurement. --> <!-- At a bare minimum, you must collect something to get the wall time measurement. -->
<!-- The WinPerf team recommended collecting CPU if you don't care about anything else. --> <!-- The WinPerf team recommended collecting CPU if you don't care about anything else. -->
<WinperfWPAPreset.1>CPU</WinperfWPAPreset.1> <WinperfWPAPreset.1>CPU</WinperfWPAPreset.1>
<WinperfWPAPreset.1.ProcessName>te.processhost.exe</WinperfWPAPreset.1.ProcessName> <WinperfWPAPreset.1.ProcessName>te.processhost.exe</WinperfWPAPreset.1.ProcessName>
</Metadata> </Metadata>
</Region> </Region>
<!-- Again, this GUID is just straight up made up. --> <!-- Again, this GUID is just straight up made up. -->
<!-- Also, just keep making regions. There's also a provision to stack a region inside a region. --> <!-- Also, just keep making regions. There's also a provision to stack a region inside a region. -->
<!-- Go look up "Region of Interest" files in respect to WPA to learn more. --> <!-- Go look up "Region of Interest" files in respect to WPA to learn more. -->
@ -56,9 +56,9 @@
<!-- You must also go change the .wprp to COLLECT the relevant data in the first place. --> <!-- You must also go change the .wprp to COLLECT the relevant data in the first place. -->
<WinperfWPAPreset.2>Commit</WinperfWPAPreset.2> <WinperfWPAPreset.2>Commit</WinperfWPAPreset.2>
<WinperfWPAPreset.2.ProcessName>conhost.exe;openconsole.exe</WinperfWPAPreset.2.ProcessName> <WinperfWPAPreset.2.ProcessName>conhost.exe;openconsole.exe</WinperfWPAPreset.2.ProcessName>
</Metadata> </Metadata>
</Region> </Region>
</RegionRoot> </RegionRoot>
</Regions> </Regions>
</Instrumentation> </Instrumentation>
</InstrumentationManifest> </InstrumentationManifest>

62
src/ConsolePerf.wprp
View file

@ -1,9 +1,9 @@
<WindowsPerformanceRecorder Version="1.0" Comments="Test" Company="Microsoft Corporation" Copyright="Microsoft Corporation"> <WindowsPerformanceRecorder Version="1.0" Comments="Test" Company="Microsoft Corporation" Copyright="Microsoft Corporation">
<Profiles> <Profiles>
<SystemCollector Id="SystemCollector_ConsolePerfSystemCollectorInFileLarge"> <SystemCollector Id="SystemCollector_ConsolePerfSystemCollectorInFileLarge">
<BufferSize Value="1024"/> <BufferSize Value="1024"/>
<Buffers Value="100"/> <Buffers Value="100"/>
</SystemCollector> </SystemCollector>
<!-- Leave this system provider alone. It's for environmental statistics by the plugin only --> <!-- Leave this system provider alone. It's for environmental statistics by the plugin only -->
<SystemProvider Id="SystemProvider_Winperf_Environment_Light"> <SystemProvider Id="SystemProvider_Winperf_Environment_Light">
<Keywords Operation="Add"> <Keywords Operation="Add">
@ -11,21 +11,21 @@
</Keywords> </Keywords>
</SystemProvider> </SystemProvider>
<!-- This one is our system provider to customize as we see fit. --> <!-- This one is our system provider to customize as we see fit. -->
<SystemProvider Id="SystemProvider_ConsolePerf_Verbose" Base="SystemProvider_Base"> <SystemProvider Id="SystemProvider_ConsolePerf_Verbose" Base="SystemProvider_Base">
<Keywords Operation="Add"> <Keywords Operation="Add">
<!-- Add additional kernel system collection here if we decide we need it for the regions of interest file --> <!-- Add additional kernel system collection here if we decide we need it for the regions of interest file -->
<Keyword Value="CSwitch"/> <Keyword Value="CSwitch"/>
<Keyword Value="MemoryInfo"/> <Keyword Value="MemoryInfo"/>
<Keyword Value="MemoryInfoWS"/> <Keyword Value="MemoryInfoWS"/>
<Keyword Value="VirtualAllocation"/> <Keyword Value="VirtualAllocation"/>
</Keywords> </Keywords>
</SystemProvider> </SystemProvider>
<!-- Then add all the event providers we might possibly need. The first batch up here is boilerplate ones --> <!-- Then add all the event providers we might possibly need. The first batch up here is boilerplate ones -->
<EventProvider Id="EventProvider-Microsoft.OSGENG.Testing.TaefEngine" Name="70d27130-f2f3-4365-b790-d31223254ef4"/> <EventProvider Id="EventProvider-Microsoft.OSGENG.Testing.TaefEngine" Name="70d27130-f2f3-4365-b790-d31223254ef4"/>
<EventProvider Id="EventProvider-Microsoft-Windows-TestExecution" Name="Microsoft-Windows-TestExecution"/> <EventProvider Id="EventProvider-Microsoft-Windows-TestExecution" Name="Microsoft-Windows-TestExecution"/>
<EventProvider Id="EventProvider-Microsoft.Windows.TestExecution.WexLogger" Name="40c4df8b-00a9-5159-62bc-9bbc5ee78a29"/> <EventProvider Id="EventProvider-Microsoft.Windows.TestExecution.WexLogger" Name="40c4df8b-00a9-5159-62bc-9bbc5ee78a29"/>
<EventProvider Id="EventProvider-Microsoft-Windows-WinPerf" Name="7dba59f2-a1ff-40f0-b9f1-34b7531e9580"/> <EventProvider Id="EventProvider-Microsoft-Windows-WinPerf" Name="7dba59f2-a1ff-40f0-b9f1-34b7531e9580"/>
<EventProvider Id="EventProvider-Microsoft.Windows.WinPerf" Name="BE6F04EA-3488-4543-8082-24843EAEC303"/> <EventProvider Id="EventProvider-Microsoft.Windows.WinPerf" Name="BE6F04EA-3488-4543-8082-24843EAEC303"/>
<EventProvider Id="EventProvider-Census" Name="262CDE7A-5C84-46CF-9420-94963791EF69"/> <EventProvider Id="EventProvider-Census" Name="262CDE7A-5C84-46CF-9420-94963791EF69"/>
<!-- These providers are relevant to specific Regions of Interest --> <!-- These providers are relevant to specific Regions of Interest -->
<EventProvider Id="EventProvider-Microsoft-Windows-Kernel-Memory" Name="Microsoft-Windows-Kernel-Memory"/> <EventProvider Id="EventProvider-Microsoft-Windows-Kernel-Memory" Name="Microsoft-Windows-Kernel-Memory"/>
@ -45,31 +45,31 @@
<EventProvider Id="EventProvider-Microsoft.Windows.Console.Render.VtEngine" Name="c9ba2a95-d3ca-5e19-2bd6-776a0910cb9d"/> <EventProvider Id="EventProvider-Microsoft.Windows.Console.Render.VtEngine" Name="c9ba2a95-d3ca-5e19-2bd6-776a0910cb9d"/>
<!-- Now define some profiles. We'll call them by ID when collecting. Also, the Base is where it is inheriting from and is a .wprpi file built... --> <!-- Now define some profiles. We'll call them by ID when collecting. Also, the Base is where it is inheriting from and is a .wprpi file built... -->
<!-- ... into WPR automatically. Go look in the WPR install directory or in the documentation to find it. --> <!-- ... into WPR automatically. Go look in the WPR install directory or in the documentation to find it. -->
<Profile Id="ConsolePerf.Verbose.File" Base="GeneralProfile.Light.File" LoggingMode="File" Name="ConsolePerfProfile" DetailLevel="Verbose" Description="Console Performance default profile"> <Profile Id="ConsolePerf.Verbose.File" Base="GeneralProfile.Light.File" LoggingMode="File" Name="ConsolePerfProfile" DetailLevel="Verbose" Description="Console Performance default profile">
<Collectors Operation="Add"> <Collectors Operation="Add">
<SystemCollectorId Value="SystemCollector_ConsolePerfSystemCollectorInFileLarge"> <SystemCollectorId Value="SystemCollector_ConsolePerfSystemCollectorInFileLarge">
<!-- You don't have to change anything here when system keywords are added above. --> <!-- You don't have to change anything here when system keywords are added above. -->
<!-- Kernel collection is a bit more unified than user collection of events. --> <!-- Kernel collection is a bit more unified than user collection of events. -->
<SystemProviderId Value="SystemProvider_ConsolePerf_Verbose"/> <SystemProviderId Value="SystemProvider_ConsolePerf_Verbose"/>
</SystemCollectorId> </SystemCollectorId>
<EventCollectorId Value="EventCollector_WPREventCollectorInFile"> <EventCollectorId Value="EventCollector_WPREventCollectorInFile">
<EventProviders Operation="Add"> <EventProviders Operation="Add">
<!-- Anything we need to collect for our perf test has to be referenced again here. --> <!-- Anything we need to collect for our perf test has to be referenced again here. -->
<EventProviderId Value="EventProvider-Microsoft.OSGENG.Testing.TaefEngine"/> <EventProviderId Value="EventProvider-Microsoft.OSGENG.Testing.TaefEngine"/>
<EventProviderId Value="EventProvider-Microsoft-Windows-TestExecution"/> <EventProviderId Value="EventProvider-Microsoft-Windows-TestExecution"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.TestExecution.WexLogger"/> <EventProviderId Value="EventProvider-Microsoft.Windows.TestExecution.WexLogger"/>
<EventProviderId Value="EventProvider-Microsoft-Windows-WinPerf"/> <EventProviderId Value="EventProvider-Microsoft-Windows-WinPerf"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.WinPerf"/> <EventProviderId Value="EventProvider-Microsoft.Windows.WinPerf"/>
<EventProviderId Value="EventProvider-Microsoft-Windows-Kernel-Memory"/> <EventProviderId Value="EventProvider-Microsoft-Windows-Kernel-Memory"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Launcher"/> <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Launcher"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Host"/> <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Host"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Server"/> <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Server"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.VirtualTerminal.Parser"/> <EventProviderId Value="EventProvider-Microsoft.Windows.Console.VirtualTerminal.Parser"/>
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Render.VtEngine"/> <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Render.VtEngine"/>
</EventProviders> </EventProviders>
</EventCollectorId> </EventCollectorId>
</Collectors> </Collectors>
</Profile> </Profile>
<!-- Leave everything below here alone. They're needed for WinPerf to collect environmental census information --> <!-- Leave everything below here alone. They're needed for WinPerf to collect environmental census information -->
<Profile Id="WinPerfEnvironment.Light.File" Base="" LoggingMode="File" Name="WinPerfEnvironment" DetailLevel="Light" Description="WinPerf environment profile"> <Profile Id="WinPerfEnvironment.Light.File" Base="" LoggingMode="File" Name="WinPerfEnvironment" DetailLevel="Light" Description="WinPerf environment profile">
<Collectors Operation="Add"> <Collectors Operation="Add">

6
src/server/ApiSorter.cpp
View file

@ -165,10 +165,10 @@ PCONSOLE_API_MSG ApiSorter::ConsoleDispatchRequest(_Inout_ PCONSOLE_API_MSG Mess
const auto trace = Tracing::s_TraceApiCall(Status, Descriptor->TraceName); const auto trace = Tracing::s_TraceApiCall(Status, Descriptor->TraceName);
Status = (*Descriptor->Routine)(Message, &ReplyPending); Status = (*Descriptor->Routine)(Message, &ReplyPending);
} }
if (Status != STATUS_BUFFER_TOO_SMALL) if (Status != STATUS_BUFFER_TOO_SMALL)
{ {
Status = NTSTATUS_FROM_HRESULT(Status); Status = NTSTATUS_FROM_HRESULT(Status);
} }
if (!ReplyPending) if (!ReplyPending)
{ {

2
src/terminal/adapter/adaptDispatch.cpp
View file

@ -1512,7 +1512,7 @@ bool AdaptDispatch::SoftReset()
} }
if (fSuccess) if (fSuccess)
{ {
DispatchTypes::GraphicsOptions opt = DispatchTypes::GraphicsOptions::Off; DispatchTypes::GraphicsOptions opt = DispatchTypes::GraphicsOptions::Off;
fSuccess = SetGraphicsRendition(&opt, 1); // Normal rendition. fSuccess = SetGraphicsRendition(&opt, 1); // Normal rendition.
} }
if (fSuccess) if (fSuccess)

2
src/terminal/parser/ut_parser/OutputEngineTest.cpp
View file

@ -840,7 +840,7 @@ public:
bool _fDeleteCharacter; bool _fDeleteCharacter;
DispatchTypes::EraseType _eraseType; DispatchTypes::EraseType _eraseType;
bool _fSetGraphics; bool _fSetGraphics;
DispatchTypes::AnsiStatusType _statusReportType; DispatchTypes::AnsiStatusType _statusReportType;
bool _fDeviceStatusReport; bool _fDeviceStatusReport;
bool _fDeviceAttributes; bool _fDeviceAttributes;
bool _fIsAltBuffer; bool _fIsAltBuffer;