-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
DO NOT MERGE - INBOX INTEGRATION TEST #14005
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a94e508
Merged PR 7705187: [Git2Git] Merged PR 7693103: Reintroduce OneCore r…
DHowett 0973aea
Merged PR 7705347: Add stubs to Terminal for OneCoreSafe*, fix the Co…
DHowett 79ef747
Migrate OSS up to 704458ee0
DHowett d21036d
Merged PR 7847415: [Git2Git] Migrate all GSL Golden Path references t…
DHowett fba4e22
Merged PR 7854069: [Git2Git] Build fixes on top of 704458ee0
DHowett 6567201
Merge remote-tracking branch 'openconsole/inbox' into main
DHowett File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,6 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
||
BUILD_PASS2_CONSUMES= \ | ||
onecore\windows\core\console\open\src\tools\nihilist|PASS2 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
BUILD_PASS1_CONSUMES= \ | ||
onecore\windows\vcpkg|PASS1 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
// Copyright (c) Microsoft Corporation | ||
// Licensed under the MIT license. | ||
|
||
#include "precomp.h" | ||
#include "../inc/VtApiRedirection.hpp" | ||
#include "../onecore/ConIoSrvComm.hpp" | ||
#pragma hdrstop | ||
|
||
// The project include file defines these to be invalid symbols | ||
// to clue in developers across the project not to use them. | ||
// | ||
// We have to use them here. | ||
#undef VkKeyScanW | ||
#undef MapVirtualKeyW | ||
#undef GetKeyState | ||
|
||
UINT OneCoreSafeMapVirtualKeyW(_In_ UINT uCode, _In_ UINT uMapType) | ||
{ | ||
auto ret{ MapVirtualKeyW(uCode, uMapType) }; | ||
#ifdef BUILD_ONECORE_INTERACTIVITY | ||
if (ret == 0) | ||
{ | ||
const auto lastError{ GetLastError() }; | ||
if (lastError == ERROR_PROC_NOT_FOUND || lastError == ERROR_DELAY_LOAD_FAILED) | ||
{ | ||
if (auto conIoSrvComm{ Microsoft::Console::Interactivity::OneCore::ConIoSrvComm::GetConIoSrvComm() }) | ||
{ | ||
SetLastError(0); | ||
ret = conIoSrvComm->ConIoMapVirtualKeyW(uCode, uMapType); | ||
} | ||
} | ||
} | ||
#endif | ||
return ret; | ||
} | ||
|
||
SHORT OneCoreSafeVkKeyScanW(_In_ WCHAR ch) | ||
{ | ||
auto ret{ VkKeyScanW(ch) }; | ||
#ifdef BUILD_ONECORE_INTERACTIVITY | ||
if (ret == -1) | ||
{ | ||
const auto lastError{ GetLastError() }; | ||
if (lastError == ERROR_PROC_NOT_FOUND || lastError == ERROR_DELAY_LOAD_FAILED) | ||
{ | ||
if (auto conIoSrvComm{ Microsoft::Console::Interactivity::OneCore::ConIoSrvComm::GetConIoSrvComm() }) | ||
{ | ||
SetLastError(0); | ||
ret = conIoSrvComm->ConIoVkKeyScanW(ch); | ||
} | ||
} | ||
} | ||
#endif | ||
return ret; | ||
} | ||
|
||
SHORT OneCoreSafeGetKeyState(_In_ int nVirtKey) | ||
{ | ||
auto ret{ GetKeyState(nVirtKey) }; | ||
#ifdef BUILD_ONECORE_INTERACTIVITY | ||
if (ret == 0) | ||
{ | ||
const auto lastError{ GetLastError() }; | ||
if (lastError == ERROR_PROC_NOT_FOUND || lastError == ERROR_DELAY_LOAD_FAILED) | ||
{ | ||
if (auto conIoSrvComm{ Microsoft::Console::Interactivity::OneCore::ConIoSrvComm::GetConIoSrvComm() }) | ||
{ | ||
SetLastError(0); | ||
ret = conIoSrvComm->ConIoGetKeyState(nVirtKey); | ||
} | ||
} | ||
} | ||
#endif | ||
return ret; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@j4james Two things!
DECPS
is now supported in Windows! Rolling out to an insider build near you in a few weeks probably...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent! That looks good to me.