Fixed infinite WMI enumeration.

raspopov · Jul 23, 2024 · 242d387 · 242d387
1 parent 6583f22
commit 242d387
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/VisualDiskImager/DeviceEnum.cpp b/VisualDiskImager/DeviceEnum.cpp
@@ -62,7 +62,7 @@ void CVisualDiskImagerDlg::EnumDevices(bool bSilent)
 				{
 					CComPtr< IWbemClassObject > disk;
 					ULONG uReturn = 0;
-					hr = disks->Next( WBEM_INFINITE, 1, &disk, &uReturn );
+					hr = disks->Next( WMI_TIMEOUT, 1, &disk, &uReturn );
 					if ( FAILED( hr ) || uReturn == 0 )
 					{
 						break;

diff --git a/VisualDiskImager/VisualDiskImager.h b/VisualDiskImager/VisualDiskImager.h
@@ -43,6 +43,8 @@ extern CVisualDiskImagerApp theApp;
 #define REG_VERIFY		_T("Verify")
 #define REG_OFFSET		_T("Offset")
 
+#define WMI_TIMEOUT		5000	// WMI query timeout (ms)
+
 // Log priority
 enum LogPriority { LOG_ERROR = 0, LOG_INFO, LOG_WARNING, LOG_ACTION, LOG_DEVICE, LOG_VOLUME };