Skip to content

Commit

Permalink
Revert "Don't use ConPTY on WoW64 Windows"
Browse files Browse the repository at this point in the history
This reverts commit fcfae3b.

Fixes #74640
  • Loading branch information
Tyriar committed Jun 3, 2019
1 parent dbbafdf commit 78378de
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
9 changes: 1 addition & 8 deletions src/vs/workbench/contrib/terminal/node/terminalProcess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 78378de

Please sign in to comment.