From 32b997d3d8eed3440f8e25073280f921e12096c0 Mon Sep 17 00:00:00 2001
From: nukoyluoglu <48370863+nukoyluoglu@users.noreply.github.com>
Date: Wed, 24 Jun 2020 00:59:29 +0300
Subject: [PATCH 1/2] ignore 'screen size is bogus' error; fixes
 microsoft/vscode/issues/100563 (and microsoft/vscode/issues/75932) (#5669)

* ignore 'screen size is bogus' error; fixes microsoft/vscode#75932; imitiates similar fix for a different extension microsoft/vscode-node-debug/commit/5298920
---
 Extension/src/Debugger/nativeAttach.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Extension/src/Debugger/nativeAttach.ts b/Extension/src/Debugger/nativeAttach.ts
index 4b382f3805..82571fde89 100644
--- a/Extension/src/Debugger/nativeAttach.ts
+++ b/Extension/src/Debugger/nativeAttach.ts
@@ -175,7 +175,12 @@ function execChildProcess(process: string, workingDirectory?: string): Promise<s
             }
 
             if (stderr && stderr.length > 0) {
-                reject(new Error(stderr));
+                if (stderr.indexOf('screen size is bogus') >= 0) {
+                    // ignore this error silently; see https://github.com/microsoft/vscode/issues/75932
+                    // see similar fix for the Node - Debug (Legacy) Extension at https://github.com/microsoft/vscode-node-debug/commit/5298920
+                } else {
+                    reject(new Error(stderr));
+                }
                 return;
             }
 

From d87cc30854d8ca8e130871482359e09bae8e2a1a Mon Sep 17 00:00:00 2001
From: Sean McManus <seanmcm@microsoft.com>
Date: Fri, 26 Jun 2020 11:00:10 -0700
Subject: [PATCH 2/2] Screen size follow up.

---
 Extension/CHANGELOG.md                 | 7 +++++--
 Extension/src/Debugger/nativeAttach.ts | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
index a866f906db..9c68f3b493 100644
--- a/Extension/CHANGELOG.md
+++ b/Extension/CHANGELOG.md
@@ -1,5 +1,10 @@
 # C/C++ for Visual Studio Code Change Log
 
+## Version 0.29.0-insiders2: July 1, 2020
+### Bug Fixes
+* Ignore "screen size is bogus" error when debugging. [PR #5669](https://github.com/microsoft/vscode-cpptools/pull/5669)
+  * nukoyluoglu (@nukoyluoglu)
+
 ## Version 0.29.0-insiders: June 24, 2020
 ### New Features
 * Add Doxygen comment support (to tooltip display of hover, completion, and signature help). [#658](https://github.com/microsoft/vscode-cpptools/issues/658)
@@ -27,8 +32,6 @@
 * Fix default build tasks failing on Windows if the compiler isn't on the PATH. [#5604](https://github.com/microsoft/vscode-cpptools/issues/5604)
 * Fix updating `files.associations` and .C files being associated with C instead of C++. [#5618](https://github.com/microsoft/vscode-cpptools/issues/5618)
 * Fix IntelliSense malfunction when RxCpp is used. [#5619](https://github.com/microsoft/vscode-cpptools/issues/5619)
-* Ignore "screen size is bogus" error when debugging. [PR #5669](https://github.com/microsoft/vscode-cpptools/pull/5669)
-  * nukoyluoglu (@nukoyluoglu)
 * Fix potential thread deadlock in cpptools.
 * Fix copying a long value from debug watch results in pasting partial value [#5470](https://github.com/microsoft/vscode-cpptools/issues/5470)
   * [PR MIEngine#1009](https://github.com/microsoft/MIEngine/pull/1009)
diff --git a/Extension/src/Debugger/nativeAttach.ts b/Extension/src/Debugger/nativeAttach.ts
index 82571fde89..0180dbbd11 100644
--- a/Extension/src/Debugger/nativeAttach.ts
+++ b/Extension/src/Debugger/nativeAttach.ts
@@ -180,8 +180,8 @@ function execChildProcess(process: string, workingDirectory?: string): Promise<s
                     // see similar fix for the Node - Debug (Legacy) Extension at https://github.com/microsoft/vscode-node-debug/commit/5298920
                 } else {
                     reject(new Error(stderr));
+                    return;
                 }
-                return;
             }
 
             resolve(stdout);