修正引入GetDpiForMonitor函数后(zhongyang219#1097)在Win7下提示找不到dll的问题

semool · Jul 30, 2022 · 7d52e8a · 7d52e8a
1 parent b85326c
commit 7d52e8a
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 5 deletions.
diff --git a/TrafficMonitor/DllFunctions.cpp b/TrafficMonitor/DllFunctions.cpp
@@ -0,0 +1,28 @@
+#include "stdafx.h"
+#include "DllFunctions.h"
+
+CDllFunctions::CDllFunctions()
+{
+    //shellscalingapi
+    m_shcore_module = ::LoadLibrary(_T("Shcore.dll"));
+    if (m_shcore_module != NULL)
+    {
+        m_getDpiForMonitor = (_GetDpiForMonitor)::GetProcAddress(m_shcore_module, "GetDpiForMonitor");
+    }
+}
+
+CDllFunctions::~CDllFunctions()
+{
+    if (m_shcore_module != NULL)
+    {
+        FreeLibrary(m_shcore_module);
+        m_shcore_module = NULL;
+    }
+}
+
+HRESULT CDllFunctions::GetDpiForMonitor(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType, UINT* dpiX, UINT* dpiY)
+{
+    if (m_getDpiForMonitor != nullptr)
+        return m_getDpiForMonitor(hmonitor, dpiType, dpiX, dpiY);
+    return 0;
+}
diff --git a/TrafficMonitor/DllFunctions.h b/TrafficMonitor/DllFunctions.h
@@ -0,0 +1,21 @@
+#pragma once
+#include <shellscalingapi.h> // °üº¬::GetDpiForMonitor
+
+typedef HRESULT(WINAPI* _GetDpiForMonitor)(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType, UINT* dpiX, UINT* dpiY);
+
+class CDllFunctions
+{
+public:
+    CDllFunctions();
+    ~CDllFunctions();
+
+public:
+    HRESULT GetDpiForMonitor(HMONITOR hmonitor, MONITOR_DPI_TYPE dpiType, UINT* dpiX, UINT* dpiY);
+
+private:
+    _GetDpiForMonitor m_getDpiForMonitor{};
+
+private:
+    HMODULE m_shcore_module{};
+};
+
diff --git a/TrafficMonitor/TaskBarDlg.cpp b/TrafficMonitor/TaskBarDlg.cpp
@@ -2,15 +2,12 @@
 //
 
 #include "stdafx.h"
-#include <shellscalingapi.h> // 包含::GetDpiForMonitor
 #include "TrafficMonitor.h"
 #include "TaskBarDlg.h"
 #include "afxdialogex.h"
 #include "TrafficMonitorDlg.h"
 #include "WindowsSettingHelper.h"
 
-#pragma comment(lib, "Shcore.lib") // 函数::GetDpiForMonitor依赖此lib
-
 // CTaskBarDlg 对话框
 
 IMPLEMENT_DYNAMIC(CTaskBarDlg, CDialogEx)
@@ -612,7 +609,7 @@ void CTaskBarDlg::DPI(CRect& rect) const
 void CTaskBarDlg::DPIFromRect(const RECT& rect, UINT* out_dpi_x, UINT* out_dpi_y)
 {
     HMONITOR h_current_monitor = ::MonitorFromRect(&rect, MONITOR_DEFAULTTONEAREST);
-    ::GetDpiForMonitor(h_current_monitor, MDT_EFFECTIVE_DPI, out_dpi_x, out_dpi_y);
+    theApp.m_dll_functions.GetDpiForMonitor(h_current_monitor, MDT_EFFECTIVE_DPI, out_dpi_x, out_dpi_y);
 }
 
 CTaskBarDlg::ClassCheckWindowMonitorDPIAndHandle CTaskBarDlg::CheckWindowMonitorDPIAndHandle{};

diff --git a/TrafficMonitor/TrafficMonitor.h b/TrafficMonitor/TrafficMonitor.h
@@ -17,6 +17,7 @@
 #include <map>
 #include "OpenHardwareMonitor/OpenHardwareMonitorApi.h"
 #include "PluginManager.h"
+#include "DllFunctions.h"
 
 // CTrafficMonitorApp:
 // 有关此类的实现，请参阅 TrafficMonitor.cpp
@@ -82,8 +83,8 @@ class CTrafficMonitorApp : public CWinApp
     HICON m_notify_icons[MAX_NOTIFY_ICON];
 
     CTaskbarDefaultStyle m_taskbar_default_style;
-
     CPluginManager m_plugins;
+    CDllFunctions m_dll_functions;
 
     CMenu m_main_menu;
     CMenu m_taskbar_menu;

diff --git a/TrafficMonitor/TrafficMonitor.vcxproj b/TrafficMonitor/TrafficMonitor.vcxproj
@@ -442,6 +442,7 @@
     <ClInclude Include="CTabCtrlEx.h" />
     <ClInclude Include="CVariant.h" />
     <ClInclude Include="DisplayTextSettingDlg.h" />
+    <ClInclude Include="DllFunctions.h" />
     <ClInclude Include="DrawCommonEx.h" />
     <ClInclude Include="FilePathHelper.h" />
     <ClInclude Include="HighResolutionTimer.h" />
@@ -513,6 +514,7 @@
     <ClCompile Include="CTabCtrlEx.cpp" />
     <ClCompile Include="CVariant.cpp" />
     <ClCompile Include="DisplayTextSettingDlg.cpp" />
+    <ClCompile Include="DllFunctions.cpp" />
     <ClCompile Include="DrawCommonEx.cpp" />
     <ClCompile Include="FilePathHelper.cpp" />
     <ClCompile Include="HistoryTrafficCalendarDlg.cpp" />

diff --git a/TrafficMonitor/TrafficMonitor.vcxproj.filters b/TrafficMonitor/TrafficMonitor.vcxproj.filters
@@ -410,6 +410,9 @@
     <ClInclude Include="WindowsSettingHelper.h">
       <Filter>源文件和头文件\公共的类\WindowsSettingHelper</Filter>
     </ClInclude>
+    <ClInclude Include="DllFunctions.h">
+      <Filter>源文件和头文件\头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="StaticEx.cpp">
@@ -607,6 +610,9 @@
     <ClCompile Include="WindowsSettingHelper.cpp">
       <Filter>源文件和头文件\公共的类\WindowsSettingHelper</Filter>
     </ClCompile>
+    <ClCompile Include="DllFunctions.cpp">
+      <Filter>源文件和头文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="TrafficMonitor.rc">