Revert "Don't use ConPTY on WoW64 Windows"
This reverts commit fcfae3b55e
.
Fixes #74640
This commit is contained in:
parent
dbbafdf428
commit
78378de365
2 changed files with 2 additions and 9 deletions
|
@ -260,7 +260,7 @@ configurationRegistry.registerConfiguration({
|
|||
default: 'inherited'
|
||||
},
|
||||
'terminal.integrated.windowsEnableConpty': {
|
||||
description: nls.localize('terminal.integrated.windowsEnableConpty', "Whether to use ConPTY for Windows terminal process communication. Winpty will be used if this is false. Note that ConPTY will be disabled regardless of this setting when the Windows 10 build number is lower than 18309 or when you're running the 32-bit VS Code client under 64-bit Windows."),
|
||||
description: nls.localize('terminal.integrated.windowsEnableConpty', "Whether to use ConPTY for Windows terminal process communication (requires Windows 10 build number 18309+). Winpty will be used if this is false."),
|
||||
type: 'boolean',
|
||||
default: true
|
||||
},
|
||||
|
|
|
@ -54,14 +54,7 @@ export class TerminalProcess implements ITerminalChildProcess, IDisposable {
|
|||
|
||||
this._initialCwd = cwd;
|
||||
|
||||
// Only use ConPTY when the client is non WoW64 (see #72190) and the Windows build number is at least 18309 (for
|
||||
// stability/performance reasons)
|
||||
const is32ProcessOn64Windows = process.env.hasOwnProperty('PROCESSOR_ARCHITEW6432');
|
||||
const useConpty = windowsEnableConpty &&
|
||||
process.platform === 'win32' &&
|
||||
!is32ProcessOn64Windows &&
|
||||
getWindowsBuildNumber() >= 18309;
|
||||
|
||||
const useConpty = windowsEnableConpty && process.platform === 'win32' && getWindowsBuildNumber() >= 18309;
|
||||
const options: pty.IPtyForkOptions | pty.IWindowsPtyForkOptions = {
|
||||
name: shellName,
|
||||
cwd,
|
||||
|
|
Loading…
Reference in a new issue