Skip to content

Commit ba1d7da

Browse files
nulled666nulled666
authored
Merge pull request nulled666#40 from chcg/appveyor
appveyor.yml CI + x64
2 parents dbb01e0 + d67668f commit ba1d7da

File tree

6 files changed

+251
-33
lines changed

6 files changed

+251
-33
lines changed

‎NppQCP.sln‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2012
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
46
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppQCP", "NppQCP.vcxproj", "{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}"
57
EndProject
68
Global
79
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8-
Debug|Any CPU = Debug|Any CPU
910
Debug|Win32 = Debug|Win32
10-
Release|Any CPU = Release|Any CPU
11+
Debug|x64 = Debug|x64
1112
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Any CPU.ActiveCfg = Debug|Win32
1516
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.ActiveCfg = Debug|Win32
1617
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|Win32.Build.0 = Debug|Win32
17-
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Any CPU.ActiveCfg = Release|Win32
18+
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.ActiveCfg = Unicode Debug|x64
19+
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.Build.0 = Debug|x64
20+
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Debug|x64.Build.2 = Unicode Debug|x64
1821
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.ActiveCfg = Release|Win32
1922
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|Win32.Build.0 = Release|Win32
23+
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.ActiveCfg = Release|x64
24+
{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}.Release|x64.Build.0 = Release|x64
2025
EndGlobalSection
2126
GlobalSection(SolutionProperties) = preSolution
2227
HideSolutionNode = FALSE

‎NppQCP.vcxproj‎

Lines changed: 168 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,34 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="Unicode Debug|Win32">
1321
<Configuration>Unicode Debug</Configuration>
1422
<Platform>Win32</Platform>
1523
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Unicode Debug|x64">
25+
<Configuration>Unicode Debug</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
1628
<ProjectConfiguration Include="Unicode Release|Win32">
1729
<Configuration>Unicode Release</Configuration>
1830
<Platform>Win32</Platform>
1931
</ProjectConfiguration>
32+
<ProjectConfiguration Include="Unicode Release|x64">
33+
<Configuration>Unicode Release</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
2036
</ItemGroup>
2137
<PropertyGroup Label="Globals">
2238
<ProjectName>NppQCP</ProjectName>
@@ -30,72 +46,116 @@
3046
<PlatformToolset>v140</PlatformToolset>
3147
<CharacterSet>Unicode</CharacterSet>
3248
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
50+
<ConfigurationType>DynamicLibrary</ConfigurationType>
51+
<PlatformToolset>v140</PlatformToolset>
52+
<CharacterSet>Unicode</CharacterSet>
53+
</PropertyGroup>
3354
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3455
<ConfigurationType>DynamicLibrary</ConfigurationType>
3556
<PlatformToolset>v140</PlatformToolset>
3657
<CharacterSet>Unicode</CharacterSet>
3758
</PropertyGroup>
59+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
60+
<ConfigurationType>DynamicLibrary</ConfigurationType>
61+
<PlatformToolset>v140</PlatformToolset>
62+
<CharacterSet>Unicode</CharacterSet>
63+
</PropertyGroup>
3864
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
3965
<ConfigurationType>DynamicLibrary</ConfigurationType>
4066
<PlatformToolset>v140</PlatformToolset>
4167
<CharacterSet>Unicode</CharacterSet>
4268
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
70+
<ConfigurationType>DynamicLibrary</ConfigurationType>
71+
<PlatformToolset>v140</PlatformToolset>
72+
<CharacterSet>Unicode</CharacterSet>
73+
</PropertyGroup>
4374
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4475
<ConfigurationType>DynamicLibrary</ConfigurationType>
4576
<PlatformToolset>v140</PlatformToolset>
4677
<CharacterSet>Unicode</CharacterSet>
4778
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
80+
<ConfigurationType>DynamicLibrary</ConfigurationType>
81+
<PlatformToolset>v140</PlatformToolset>
82+
<CharacterSet>Unicode</CharacterSet>
83+
</PropertyGroup>
4884
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4985
<ImportGroup Label="ExtensionSettings">
5086
</ImportGroup>
5187
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="PropertySheets">
5288
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5389
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
54-
<Import Project="no_ms.props" />
90+
</ImportGroup>
91+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="PropertySheets">
92+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
93+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
5594
</ImportGroup>
5695
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
5796
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5897
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
59-
<Import Project="no_ms.props" />
98+
</ImportGroup>
99+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
100+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
101+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
60102
</ImportGroup>
61103
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="PropertySheets">
62104
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63105
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
64-
<Import Project="no_ms.props" />
106+
</ImportGroup>
107+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="PropertySheets">
108+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
109+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
65110
</ImportGroup>
66111
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
67112
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68113
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
69-
<Import Project="no_ms.props" />
114+
</ImportGroup>
115+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
116+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
117+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
70118
</ImportGroup>
71119
<PropertyGroup Label="UserMacros" />
72120
<PropertyGroup>
73121
<_ProjectFileVersion>11.0.51106.1</_ProjectFileVersion>
74122
</PropertyGroup>
75123
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
76-
<OutDir>D:\Notepad++\plugins\</OutDir>
77124
<IntDir>Release\Unicode\</IntDir>
78125
<LinkIncremental>false</LinkIncremental>
79126
</PropertyGroup>
127+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
128+
<LinkIncremental>false</LinkIncremental>
129+
</PropertyGroup>
80130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
81-
<OutDir>D:\Notepad++\plugins\</OutDir>
82131
<IntDir>Release\Unicode\</IntDir>
83132
<LinkIncremental>false</LinkIncremental>
84133
</PropertyGroup>
134+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
135+
<LinkIncremental>false</LinkIncremental>
136+
</PropertyGroup>
85137
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
86-
<OutDir>D:\Notepad++\plugins\</OutDir>
87138
<IntDir>Debug\Unicode\</IntDir>
88139
<LinkIncremental>true</LinkIncremental>
89140
<RunCodeAnalysis>false</RunCodeAnalysis>
90141
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
91142
</PropertyGroup>
143+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
144+
<LinkIncremental>true</LinkIncremental>
145+
<RunCodeAnalysis>false</RunCodeAnalysis>
146+
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
147+
</PropertyGroup>
92148
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
93-
<OutDir>D:\Notepad++\plugins\</OutDir>
94149
<IntDir>Debug\Unicode\</IntDir>
95150
<LinkIncremental>true</LinkIncremental>
96151
<RunCodeAnalysis>false</RunCodeAnalysis>
97152
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
98153
</PropertyGroup>
154+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
155+
<LinkIncremental>true</LinkIncremental>
156+
<RunCodeAnalysis>false</RunCodeAnalysis>
157+
<CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
158+
</PropertyGroup>
99159
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
100160
<ClCompile>
101161
<AdditionalIncludeDirectories>.\shared;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -105,6 +165,7 @@
105165
<PrecompiledHeaderFile />
106166
<WarningLevel>Level3</WarningLevel>
107167
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
168+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
108169
</ClCompile>
109170
<Link>
110171
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -116,6 +177,28 @@
116177
<TargetMachine>MachineX86</TargetMachine>
117178
</Link>
118179
</ItemDefinitionGroup>
180+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
181+
<ClCompile>
182+
<AdditionalIncludeDirectories>.\shared;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
183+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINDEMO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
185+
<PrecompiledHeader>
186+
</PrecompiledHeader>
187+
<PrecompiledHeaderFile>
188+
</PrecompiledHeaderFile>
189+
<WarningLevel>Level3</WarningLevel>
190+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
191+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
192+
</ClCompile>
193+
<Link>
194+
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
195+
<GenerateDebugInformation>true</GenerateDebugInformation>
196+
<SubSystem>Windows</SubSystem>
197+
<OptimizeReferences>true</OptimizeReferences>
198+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
199+
<ImportLibrary>$(OutDir)NppQCP.lib</ImportLibrary>
200+
</Link>
201+
</ItemDefinitionGroup>
119202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
120203
<ClCompile>
121204
<AdditionalIncludeDirectories>.\shared;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -127,6 +210,7 @@
127210
</PrecompiledHeaderFile>
128211
<WarningLevel>Level3</WarningLevel>
129212
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
213+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
130214
</ClCompile>
131215
<Link>
132216
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -138,6 +222,28 @@
138222
<TargetMachine>MachineX86</TargetMachine>
139223
</Link>
140224
</ItemDefinitionGroup>
225+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
226+
<ClCompile>
227+
<AdditionalIncludeDirectories>.\shared;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
228+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NPPPLUGINDEMO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
229+
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
230+
<PrecompiledHeader>
231+
</PrecompiledHeader>
232+
<PrecompiledHeaderFile>
233+
</PrecompiledHeaderFile>
234+
<WarningLevel>Level3</WarningLevel>
235+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
236+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
237+
</ClCompile>
238+
<Link>
239+
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
240+
<GenerateDebugInformation>true</GenerateDebugInformation>
241+
<SubSystem>Windows</SubSystem>
242+
<OptimizeReferences>true</OptimizeReferences>
243+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
244+
<ImportLibrary>$(OutDir)NppQCP.lib</ImportLibrary>
245+
</Link>
246+
</ItemDefinitionGroup>
141247
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
142248
<ClCompile>
143249
<Optimization>Disabled</Optimization>
@@ -151,6 +257,7 @@
151257
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
152258
<BrowseInformation>true</BrowseInformation>
153259
<EnablePREfast>false</EnablePREfast>
260+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
154261
</ClCompile>
155262
<Link>
156263
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -164,6 +271,32 @@
164271
<PreserveSbr>true</PreserveSbr>
165272
</Bscmake>
166273
</ItemDefinitionGroup>
274+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
275+
<ClCompile>
276+
<Optimization>Disabled</Optimization>
277+
<AdditionalIncludeDirectories>.\shared;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
278+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPQCP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
279+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
280+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
281+
<PrecompiledHeader>
282+
</PrecompiledHeader>
283+
<WarningLevel>Level3</WarningLevel>
284+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
285+
<BrowseInformation>true</BrowseInformation>
286+
<EnablePREfast>false</EnablePREfast>
287+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
288+
</ClCompile>
289+
<Link>
290+
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
291+
<GenerateDebugInformation>true</GenerateDebugInformation>
292+
<ProgramDatabaseFile>$(OutDir)NppQCP.pdb</ProgramDatabaseFile>
293+
<SubSystem>Windows</SubSystem>
294+
<ImportLibrary>$(OutDir)NppQCP.lib</ImportLibrary>
295+
</Link>
296+
<Bscmake>
297+
<PreserveSbr>true</PreserveSbr>
298+
</Bscmake>
299+
</ItemDefinitionGroup>
167300
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
168301
<ClCompile>
169302
<Optimization>Disabled</Optimization>
@@ -178,6 +311,7 @@
178311
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
179312
<BrowseInformation>true</BrowseInformation>
180313
<EnablePREfast>false</EnablePREfast>
314+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
181315
</ClCompile>
182316
<Link>
183317
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -191,6 +325,32 @@
191325
<PreserveSbr>true</PreserveSbr>
192326
</Bscmake>
193327
</ItemDefinitionGroup>
328+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
329+
<ClCompile>
330+
<Optimization>Disabled</Optimization>
331+
<AdditionalIncludeDirectories>.\shared;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
332+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NPPQCP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
333+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
334+
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
335+
<PrecompiledHeader>
336+
</PrecompiledHeader>
337+
<WarningLevel>Level3</WarningLevel>
338+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
339+
<BrowseInformation>true</BrowseInformation>
340+
<EnablePREfast>false</EnablePREfast>
341+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
342+
</ClCompile>
343+
<Link>
344+
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
345+
<GenerateDebugInformation>true</GenerateDebugInformation>
346+
<ProgramDatabaseFile>$(OutDir)NppQCP.pdb</ProgramDatabaseFile>
347+
<SubSystem>Windows</SubSystem>
348+
<ImportLibrary>$(OutDir)NppQCP.lib</ImportLibrary>
349+
</Link>
350+
<Bscmake>
351+
<PreserveSbr>true</PreserveSbr>
352+
</Bscmake>
353+
</ItemDefinitionGroup>
194354
<ItemGroup>
195355
<ClCompile Include="QuickColorPicker\ColorPicker.cpp" />
196356
<ClCompile Include="QuickColorPicker\ScreenPicker.cpp" />

‎QuickColorPicker/ColorPicker.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ BOOL CALLBACK ColorPicker::ColorPopupWinproc(HWND hwnd, UINT message, WPARAM wpa
254254
}
255255
default:
256256
{
257-
ColorPicker *pColorPicker = reinterpret_cast<ColorPicker*>(::GetWindowLongPtr(hwnd, GWL_USERDATA));
257+
ColorPicker *pColorPicker = reinterpret_cast<ColorPicker*>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
258258
if (!pColorPicker)
259259
return FALSE;
260260
return pColorPicker->ColorPopupMessageHandle(message, wparam, lparam);

‎QuickColorPicker/ScreenPicker.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ LRESULT CALLBACK ScreenPicker::MaskWindowWINPROC(HWND hwnd, UINT message, WPARAM
9393
}
9494
default:
9595
{
96-
ScreenPicker* pScreenPicker = reinterpret_cast<ScreenPicker*>(::GetWindowLongPtr(hwnd, GWL_USERDATA));
96+
ScreenPicker* pScreenPicker = reinterpret_cast<ScreenPicker*>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
9797
if (!pScreenPicker)
9898
return FALSE;
9999
return pScreenPicker->MaskWindowMessageHandle(message, wparam, lparam);
@@ -336,7 +336,7 @@ BOOL CALLBACK ScreenPicker::InfoWindowWINPROC(HWND hwnd, UINT message, WPARAM wp
336336
}
337337
default:
338338
{
339-
ScreenPicker *pScreenPicker = reinterpret_cast<ScreenPicker*>(::GetWindowLongPtr(hwnd, GWL_USERDATA));
339+
ScreenPicker *pScreenPicker = reinterpret_cast<ScreenPicker*>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
340340
if (!pScreenPicker)
341341
return FALSE;
342342
return pScreenPicker->InfoWindowMessageHandle(message, wparam, lparam);
@@ -375,7 +375,7 @@ BOOL ScreenPicker::InfoWindowMessageHandle(UINT message, WPARAM wparam, LPARAM l
375375
void ScreenPicker::PrepareInfoWindow(){
376376

377377
::SetWindowPos(_info_window, HWND_TOP, 0, 0, INFO_WINDOW_WIDTH, INFO_WINDOW_HEIGHT, SWP_HIDEWINDOW);
378-
::SetWindowLong(_info_window, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
378+
::SetWindowLongPtr(_info_window, GWL_EXSTYLE, WS_EX_TOOLWINDOW);
379379

380380
HWND ctrl;
381381

0 commit comments

Comments
 (0)