Skip to content

Commit ef1cefc

Browse files
committed
Fix correct method being loaded when not using conptydll
Part of microsoft/vscode#224488
1 parent 8fc21c9 commit ef1cefc

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/win/conpty.cc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,9 @@ static Napi::Value PtyResize(const Napi::CallbackInfo& info) {
461461
bool fLoadedDll = hLibrary != nullptr;
462462
if (fLoadedDll)
463463
{
464-
PFNRESIZEPSEUDOCONSOLE const pfnResizePseudoConsole = (PFNRESIZEPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ConptyResizePseudoConsole");
464+
PFNRESIZEPSEUDOCONSOLE const pfnResizePseudoConsole = (PFNRESIZEPSEUDOCONSOLE)GetProcAddress(
465+
(HMODULE)hLibrary,
466+
useConptyDll ? "ConptyResizePseudoConsole" : "ResizePseudoConsole");
465467
if (pfnResizePseudoConsole)
466468
{
467469
COORD size = {cols, rows};
@@ -491,7 +493,9 @@ static Napi::Value PtyClear(const Napi::CallbackInfo& info) {
491493
// bool fLoadedDll = hLibrary != nullptr;
492494
// if (fLoadedDll)
493495
// {
494-
// PFNCLEARPSEUDOCONSOLE const pfnClearPseudoConsole = (PFNCLEARPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ClearPseudoConsole");
496+
// PFNCLEARPSEUDOCONSOLE const pfnClearPseudoConsole = (PFNCLEARPSEUDOCONSOLE)GetProcAddress(
497+
// (HMODULE)hLibrary,
498+
// useConptyDll ? "ConptyClearPseudoConsole" : "ClearPseudoConsole");
495499
// if (pfnClearPseudoConsole)
496500
// {
497501
// pfnClearPseudoConsole(handle->hpc);
@@ -522,7 +526,9 @@ static Napi::Value PtyKill(const Napi::CallbackInfo& info) {
522526
bool fLoadedDll = hLibrary != nullptr;
523527
if (fLoadedDll)
524528
{
525-
PFNCLOSEPSEUDOCONSOLE const pfnClosePseudoConsole = (PFNCLOSEPSEUDOCONSOLE)GetProcAddress((HMODULE)hLibrary, "ConptyClosePseudoConsole");
529+
PFNCLOSEPSEUDOCONSOLE const pfnClosePseudoConsole = (PFNCLOSEPSEUDOCONSOLE)GetProcAddress(
530+
(HMODULE)hLibrary,
531+
useConptyDll ? "ConptyClosePseudoConsole" : "ClosePseudoConsole");
526532
if (pfnClosePseudoConsole)
527533
{
528534
pfnClosePseudoConsole(handle->hpc);

0 commit comments

Comments
 (0)