添加Wine环境的检测，在Wine环境下不显示菜单图标

Author: zhongyang219

TrafficMonitor/TrafficMonitor.cpp

@@ -751,10 +751,15 @@ CString CTrafficMonitorApp::GetSystemInfoString()
     info += _T("System Info:\r\n");
 
     CString strTmp;
-    strTmp.Format(_T("Windows Version: %d.%d build %d\r\n"), m_win_version.GetMajorVersion(),
+    strTmp.Format(_T("Windows Version: %d.%d build %d"), m_win_version.GetMajorVersion(),
         m_win_version.GetMinorVersion(), m_win_version.GetBuildNumber());
     info += strTmp;
 
+    if (m_win_version.IsWine())
+        info += _T(" (Wine)");
+
+    info += _T("\r\n");
+
     strTmp.Format(_T("DPI: %d"), m_dpi);
     info += strTmp;
     info += _T("\r\n");

TrafficMonitor/TrafficMonitorDlg.cpp

@@ -1660,7 +1660,7 @@ void CTrafficMonitorDlg::OnTimer(UINT_PTR nIDEvent)
         if (!theApp.m_cfg_data.m_hide_main_window || theApp.m_cfg_data.m_show_task_bar_wnd)
         {
             //每隔10秒钟检测一次是否可以嵌入任务栏
-            if (IsTaskbarWndValid() && m_timer_cnt % 10 == 1)
+            if (!theApp.m_win_version.IsWine() && IsTaskbarWndValid() && m_timer_cnt % 10 == 1)
             {
                 if (m_tBarDlg->GetCannotInsertToTaskBar() && m_insert_to_taskbar_cnt < MAX_INSERT_TO_TASKBAR_CNT)
                 {

TrafficMonitor/WIC.cpp

@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "WIC.h"
+#include "TrafficMonitor.h"
 
 CWICFactory CWICFactory::m_instance;
 
@@ -44,6 +45,10 @@ CMenuIcon::~CMenuIcon()
 
 HRESULT CMenuIcon::AddIconToMenuItem(HMENU hmenu, int iMenuItem, BOOL fByPosition, HICON hicon)
 {
+    //由于Wine环境下菜单图标会出现异常，因此不为菜单添加图标
+    if (theApp.m_win_version.IsWine())
+        return 0;
+
 #ifndef COMPILE_IN_WIN_XP
     HBITMAP hbmp{};
     HRESULT hr = GetBitmapByIcon(hicon, hbmp);

TrafficMonitor/WinVersionHelper.cpp

@@ -17,6 +17,14 @@ CWinVersionHelper::CWinVersionHelper()
 			pfRtlGetNtVersionNumbers(&dwMajorVer, &dwMinorVer, &dwBuildNumber);
 			dwBuildNumber &= 0x0ffff;
 		}
+
+		//判断是否在Wine环境中
+		FARPROC pProc = GetProcAddress(hModNtdll, "wine_get_version");
+		if (pProc != NULL)
+		{
+			m_is_wine = true;
+		}
+
 		::FreeLibrary(hModNtdll);
 		hModNtdll = NULL;
 	}
@@ -90,3 +98,8 @@ bool CWinVersionHelper::IsWindows10OrLater() const
 {
     return m_major_version >= 10;
 }
+
+bool CWinVersionHelper::IsWine() const
+{
+	return m_is_wine;
+}

TrafficMonitor/WinVersionHelper.h

@@ -12,6 +12,7 @@ class CWinVersionHelper
     bool IsWindows8Point1OrLater() const;       //判断Windows版本是否大于等于Windows8.1
     bool IsWindows8OrLater() const;
     bool IsWindows10OrLater() const;
+	bool IsWine() const;
 
 	int GetMajorVersion() const { return m_major_version; }
 	int GetMinorVersion() const { return m_minor_version; }
@@ -20,4 +21,5 @@ class CWinVersionHelper
 	int m_major_version{};
 	int m_minor_version{};
 	int m_build_number{};
+	bool m_is_wine{};
 };