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

Fix downlevel support for traditional console (#562)

Browse source
This commit is contained in:
Malcolm Smith 2019-05-13 16:10:46 -07:00 committed by Michael Niksa
parent 5b1183a4b3
commit c2ee6277f8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/interactivity/base/ApiDetector.cpp
View file

@ -78,13 +78,13 @@ NTSTATUS ApiDetector::TryLoadWellKnownLibrary(_In_ LPCWSTR lpLibrary, _Outptr_re
// This however has the side-effect of not working on downlevel.
// LoadLibraryEx asserts that the flags passed in are valid. If any
// invalid flags are passed, it sets the last error to
// STATUS_INVALID_PARAMETER and returns. Since
// ERROR_INVALID_PARAMETER and returns. Since
// LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER does not exist on
// downlevel Windows, the call will fail there.
//
// To counteract that, we try to load the library skipping forwarders
// first under the assumption that we are running on a sufficiently
// new system. If the call fails with STATUS_INVALID_PARAMETER, we
// new system. If the call fails with ERROR_INVALID_PARAMETER, we
// know there is a problem with the flags, so we try again without
// the NO_FORWARDER part. Because reverse forwarders do not exist on
// downlevel (i.e. < Windows 10), we do not run the risk of failing
@ -98,7 +98,7 @@ NTSTATUS ApiDetector::TryLoadWellKnownLibrary(_In_ LPCWSTR lpLibrary, _Outptr_re
// versioning API's behave sanely.
status = TryLoadWellKnownLibrary(lpLibrary, LOAD_LIBRARY_SEARCH_SYSTEM32_NO_FORWARDER, phModule);
if (!NT_SUCCESS(status) && GetLastError() == STATUS_INVALID_PARAMETER)
if (!NT_SUCCESS(status) && GetLastError() == ERROR_INVALID_PARAMETER)
{
status = TryLoadWellKnownLibrary(lpLibrary, LOAD_LIBRARY_SEARCH_SYSTEM32, phModule);
}