From 0ffbb1001d9c70bafde802d86984ce8f6705ea4f Mon Sep 17 00:00:00 2001
From: zmatsuo <6488847+zmatsuo@users.noreply.github.com>
Date: Mon, 1 Apr 2024 00:02:06 +0900
Subject: [PATCH] =?UTF-8?q?COM=E3=83=9D=E3=83=BC=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=81=AB=E7=84=A1=E5=8A=B9=E5=8C=96=E3=81=97?=
 =?UTF-8?q?=E3=81=9FCOM=E3=83=9D=E3=83=BC=E3=83=88=E3=81=AF=E5=90=AB?=
 =?UTF-8?q?=E3=82=81=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=20#164?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/en/html/about/history.html  |  1 +
 doc/ja/html/about/history.html  |  1 +
 teraterm/common/comportinfo.cpp | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/en/html/about/history.html b/doc/en/html/about/history.html
index 1fa7b1af6..bfa222286 100644
--- a/doc/en/html/about/history.html
+++ b/doc/en/html/about/history.html
@@ -42,6 +42,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
       <li>Right-click(paste) is not disabled even when <a href="../setup/teraterm-win.html#textselect">SelectOnActivate</a> is off.</li>
       <li>allow users to select creating automatic backup or not by <a href="../setup/teraterm-misc.html#IniAutoBackup">IniAutoBackup</a> when overwriting the ini file.
       <li><a href="../setup/teraterm-win.html#space">VTFontSpace</a> can be used to adjust to narrow the space between characters.
+      <li>Disabled COM ports are not included when making list of COM ports.</li>
     </ul>
   </li>
 
diff --git a/doc/ja/html/about/history.html b/doc/ja/html/about/history.html
index d25cef86e..4274ed887 100644
--- a/doc/ja/html/about/history.html
+++ b/doc/ja/html/about/history.html
@@ -42,6 +42,7 @@ <h3 id="teraterm_5.3">YYYY.MM.DD (Ver 5.3 not released yet)</h3>
       <li><a href="../setup/teraterm-win.html#textselect">SelectOnActivate</a> が off でも右クリックによる貼り付けは行われるようにした。</li>
       <li>iniファイルを上書きする際に自動バックアップを作成するかどうかを <a href="../setup/teraterm-misc.html#IniAutoBackup">IniAutoBackup</a> で設定できるようにした。</li>
       <li><a href="../setup/teraterm-win.html#space">VTFontSpace</a> で負の値を設定できるようにした。</li>
+      <li>COMポートの一覧に無効化したCOMポートは含めないようにした。</li>
     </ul>
   </li>
 
diff --git a/teraterm/common/comportinfo.cpp b/teraterm/common/comportinfo.cpp
index 6c2879855..9e592003f 100644
--- a/teraterm/common/comportinfo.cpp
+++ b/teraterm/common/comportinfo.cpp
@@ -29,6 +29,7 @@
 #include <windows.h>
 #include <devguid.h>
 #include <setupapi.h>
+#include <cfgmgr32.h>
 #include <stdio.h>
 #define _CRTDBG_MAP_ALLOC
 #include <crtdbg.h>
@@ -197,8 +198,8 @@ static BOOL GetComPortName(HDEVINFO hDevInfo, SP_DEVINFO_DATA *DeviceInfoData, w
  * HKEY_LOCAL_MACHINE\SYSTEM\ControlSet001\Control\Class\{GUID}\0000
  *
  */
-static void GetComPropartys(HDEVINFO hDevInfo, SP_DEVINFO_DATA *DeviceInfoData,
-							wchar_t **friendly_name, wchar_t **prop_str)
+static void GetComProperty(HDEVINFO hDevInfo, SP_DEVINFO_DATA *DeviceInfoData,
+						   wchar_t **friendly_name, wchar_t **prop_str)
 {
 	typedef struct {
 		const wchar_t *name;
@@ -441,6 +442,15 @@ static ComPortInfo_t *ComPortInfoGetByGetSetupAPI(int *count)
 				break;
 			}
 
+			// check status
+			ULONG status  = 0;
+			ULONG problem = 0;
+			CONFIGRET cr = CM_Get_DevNode_Status(&status, &problem, DeviceInfoData.DevInst, 0);
+			if (cr != CR_SUCCESS || problem == CM_PROB_DISABLED) {
+				// ステータス取得に失敗 又は デバイスが無効の時
+				continue;
+			}
+
 			wchar_t *port_name;
 			if (!GetComPortName(hDevInfo, &DeviceInfoData, &port_name)) {
 				continue;
@@ -453,7 +463,7 @@ static ComPortInfo_t *ComPortInfoGetByGetSetupAPI(int *count)
 			// 情報取得
 			wchar_t *str_friendly_name = NULL;
 			wchar_t *str_prop = NULL;
-			GetComPropartys(hDevInfo, &DeviceInfoData, &str_friendly_name, &str_prop);
+			GetComProperty(hDevInfo, &DeviceInfoData, &str_friendly_name, &str_prop);
 
 			ComPortInfo_t *p =
 				(ComPortInfo_t *)realloc(comport_infos,