Tera TermRevision: 9128
https://osdn.net/projects/ttssh2/scm/svn/commits/9128
Author: zmatsuo
Date: 2021-01-16 14:20:59 +0900 (Sat, 16 Jan 2021)
Log Message:
-----------
User32.dll の 遅延ロード指定がなくても動作するようにした
Modified Paths:
--------------
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj
trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v8.vcproj
-------------- next part --------------
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2021-01-16 05:20:46 UTC (rev 9127)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c 2021-01-16 05:20:59 UTC (rev 9128)
@@ -7,6 +7,7 @@
#include <string.h>
#include "compat_w95.h"
+#include "compat_win.h"
#define ORDER 5900
#define SECTION "Resize Menu"
@@ -50,9 +51,9 @@
HMONITOR hm;
MONITORINFO mi;
- hm = MonitorFromWindow(pvar->cv->HWin, MONITOR_DEFAULTTONEAREST);
+ hm = pMonitorFromWindow(pvar->cv->HWin, MONITOR_DEFAULTTONEAREST);
mi.cbSize = sizeof(MONITORINFO);
- if (! GetMonitorInfo(hm, &mi)) {
+ if (! pGetMonitorInfoA(hm, &mi)) {
return FALSE;
}
rc_dsk = mi.rcWork;
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj 2021-01-16 05:20:46 UTC (rev 9127)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v16.vcxproj 2021-01-16 05:20:59 UTC (rev 9128)
@@ -65,7 +65,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -83,7 +83,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
- <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>$(SolutionDir)..\teraterm\$(Configuration)\common_static.lib;$(SolutionDir)..\teraterm\$(Configuration)\ttpcmn.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>user32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v8.vcproj
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v8.vcproj 2021-01-16 05:20:46 UTC (rev 9127)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.v8.vcproj 2021-01-16 05:20:59 UTC (rev 9128)
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
+ AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
LinkIncremental="2"
DelayLoadDLLs="user32.dll"
GenerateDebugInformation="true"
@@ -137,7 +137,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
+ AdditionalDependencies=""$(SolutionDir)..\teraterm\$(ConfigurationName)\common_static.lib" "$(SolutionDir)..\teraterm\$(ConfigurationName)\ttpcmn.lib" user32.lib"
LinkIncremental="1"
DelayLoadDLLs="user32.dll"
GenerateDebugInformation="true"