Skip to content

Commit 1067337

Browse files
d0vgand0vgan
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents cd587c5 + d462b8a commit 1067337

10 files changed

+984
-2
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ NppExecPluginMsgTester/[Rr]elease*/*
1919
UnitTests/[Rr]elease*/*
2020
x64/
2121
x86/
22+
arm64/
2223
#[Bb]in/
2324
[Oo]bj/
2425
*.pdb

‎NppExec/NppExec_VC2026.sln‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 18
3+
VisualStudioVersion = 18.2.11408.102 d18.0
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NppExec", "NppExec_VC2026.vcxproj", "{653F5B73-87D2-48E3-BF19-309274028BF7}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug (ANSI)|ARM64 = Debug (ANSI)|ARM64
10+
Debug (ANSI)|Win32 = Debug (ANSI)|Win32
11+
Debug (ANSI)|x64 = Debug (ANSI)|x64
12+
Debug|ARM64 = Debug|ARM64
13+
Debug|Win32 = Debug|Win32
14+
Debug|x64 = Debug|x64
15+
Release|ARM64 = Release|ARM64
16+
Release|Win32 = Release|Win32
17+
Release|x64 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug (ANSI)|ARM64.ActiveCfg = Debug (ANSI)|ARM64
21+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug (ANSI)|ARM64.Build.0 = Debug (ANSI)|ARM64
22+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug (ANSI)|Win32.ActiveCfg = Debug (ANSI)|Win32
23+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug (ANSI)|Win32.Build.0 = Debug (ANSI)|Win32
24+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug (ANSI)|x64.ActiveCfg = Debug (ANSI)|x64
25+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug (ANSI)|x64.Build.0 = Debug (ANSI)|x64
26+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug|ARM64.ActiveCfg = Debug|ARM64
27+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug|ARM64.Build.0 = Debug|ARM64
28+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug|Win32.ActiveCfg = Debug|Win32
29+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug|Win32.Build.0 = Debug|Win32
30+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug|x64.ActiveCfg = Debug|x64
31+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Debug|x64.Build.0 = Debug|x64
32+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Release|ARM64.ActiveCfg = Release|ARM64
33+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Release|ARM64.Build.0 = Release|ARM64
34+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Release|Win32.ActiveCfg = Release|Win32
35+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Release|Win32.Build.0 = Release|Win32
36+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Release|x64.ActiveCfg = Release|x64
37+
{653F5B73-87D2-48E3-BF19-309274028BF7}.Release|x64.Build.0 = Release|x64
38+
EndGlobalSection
39+
GlobalSection(SolutionProperties) = preSolution
40+
HideSolutionNode = FALSE
41+
EndGlobalSection
42+
EndGlobal

‎NppExec/NppExec_VC2026.vcxproj‎

Lines changed: 464 additions & 0 deletions
Large diffs are not rendered by default.

‎NppExec/NppExec_VC2026.vcxproj.filters‎

Lines changed: 323 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,323 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
15+
</Filter>
16+
<Filter Include="Source Files\fparser">
17+
<UniqueIdentifier>{3dd2d2c6-05d4-41b8-a602-2731eddfc239}</UniqueIdentifier>
18+
</Filter>
19+
<Filter Include="Header Files\fparser">
20+
<UniqueIdentifier>{2e542de7-1a8f-4b53-97a0-736ae0c257c3}</UniqueIdentifier>
21+
</Filter>
22+
<Filter Include="Header Files\npp_files">
23+
<UniqueIdentifier>{d6bb39d9-dfd2-4771-a80d-2617c7f0ec31}</UniqueIdentifier>
24+
</Filter>
25+
<Filter Include="Header Files\cpp">
26+
<UniqueIdentifier>{e6dadeeb-d381-419e-8c25-f921e51b9235}</UniqueIdentifier>
27+
</Filter>
28+
<Filter Include="Header Files\c_base">
29+
<UniqueIdentifier>{7f553aa3-1d98-4f1c-b924-024428bfff6d}</UniqueIdentifier>
30+
</Filter>
31+
<Filter Include="Source Files\cpp">
32+
<UniqueIdentifier>{975a6d58-a2e8-4a99-9cf8-78f4754bf1dc}</UniqueIdentifier>
33+
</Filter>
34+
<Filter Include="Source Files\c_base">
35+
<UniqueIdentifier>{17860ebd-8035-4dd1-aa6b-3db759dcd616}</UniqueIdentifier>
36+
</Filter>
37+
</ItemGroup>
38+
<ItemGroup>
39+
<ClCompile Include="src\CAnyCheckBox.cpp">
40+
<Filter>Source Files</Filter>
41+
</ClCompile>
42+
<ClCompile Include="src\CAnyComboBox.cpp">
43+
<Filter>Source Files</Filter>
44+
</ClCompile>
45+
<ClCompile Include="src\CAnyListBox.cpp">
46+
<Filter>Source Files</Filter>
47+
</ClCompile>
48+
<ClCompile Include="src\CAnyRichEdit.cpp">
49+
<Filter>Source Files</Filter>
50+
</ClCompile>
51+
<ClCompile Include="src\CAnyWindow.cpp">
52+
<Filter>Source Files</Filter>
53+
</ClCompile>
54+
<ClCompile Include="src\CFileModificationChecker.cpp">
55+
<Filter>Source Files</Filter>
56+
</ClCompile>
57+
<ClCompile Include="src\CPopupListBox.cpp">
58+
<Filter>Source Files</Filter>
59+
</ClCompile>
60+
<ClCompile Include="src\CSimpleLogger.cpp">
61+
<Filter>Source Files</Filter>
62+
</ClCompile>
63+
<ClCompile Include="src\CStaticOptionsManager.cpp">
64+
<Filter>Source Files</Filter>
65+
</ClCompile>
66+
<ClCompile Include="src\DirFileLister.cpp">
67+
<Filter>Source Files</Filter>
68+
</ClCompile>
69+
<ClCompile Include="src\DlgAdvancedOptions.cpp">
70+
<Filter>Source Files</Filter>
71+
</ClCompile>
72+
<ClCompile Include="src\DlgConsole.cpp">
73+
<Filter>Source Files</Filter>
74+
</ClCompile>
75+
<ClCompile Include="src\DlgConsoleEncoding.cpp">
76+
<Filter>Source Files</Filter>
77+
</ClCompile>
78+
<ClCompile Include="src\DlgConsoleOutputFilter.cpp">
79+
<Filter>Source Files</Filter>
80+
</ClCompile>
81+
<ClCompile Include="src\DlgDoExec.cpp">
82+
<Filter>Source Files</Filter>
83+
</ClCompile>
84+
<ClCompile Include="src\DlgHelpAbout.cpp">
85+
<Filter>Source Files</Filter>
86+
</ClCompile>
87+
<ClCompile Include="src\DlgInputBox.cpp">
88+
<Filter>Source Files</Filter>
89+
</ClCompile>
90+
<ClCompile Include="src\NppExec.cpp">
91+
<Filter>Source Files</Filter>
92+
</ClCompile>
93+
<ClCompile Include="src\NppExecScriptEngine.cpp">
94+
<Filter>Source Files</Filter>
95+
</ClCompile>
96+
<ClCompile Include="src\PluginCommunication\NppExecPluginInterface.cpp">
97+
<Filter>Source Files</Filter>
98+
</ClCompile>
99+
<ClCompile Include="src\NppScriptList.cpp">
100+
<Filter>Source Files</Filter>
101+
</ClCompile>
102+
<ClCompile Include="src\encodings\SysUniConv.cpp">
103+
<Filter>Source Files</Filter>
104+
</ClCompile>
105+
<ClCompile Include="src\WarningAnalyzer.cpp">
106+
<Filter>Source Files</Filter>
107+
</ClCompile>
108+
<ClCompile Include="src\NppExecCommandExecutor.cpp">
109+
<Filter>Source Files</Filter>
110+
</ClCompile>
111+
<ClCompile Include="src\NppExecHelpers.cpp">
112+
<Filter>Source Files</Filter>
113+
</ClCompile>
114+
<ClCompile Include="src\fparser\fparser.cc">
115+
<Filter>Source Files\fparser</Filter>
116+
</ClCompile>
117+
<ClCompile Include="src\NppScript.cpp">
118+
<Filter>Source Files</Filter>
119+
</ClCompile>
120+
<ClCompile Include="src\cpp\CFileBufT.cpp">
121+
<Filter>Source Files\cpp</Filter>
122+
</ClCompile>
123+
<ClCompile Include="src\c_base\HexStr.c">
124+
<Filter>Source Files\c_base</Filter>
125+
</ClCompile>
126+
<ClCompile Include="src\c_base\int2str.c">
127+
<Filter>Source Files\c_base</Filter>
128+
</ClCompile>
129+
<ClCompile Include="src\c_base\MatchMask.c">
130+
<Filter>Source Files\c_base</Filter>
131+
</ClCompile>
132+
<ClCompile Include="src\c_base\max_int.c">
133+
<Filter>Source Files\c_base</Filter>
134+
</ClCompile>
135+
<ClCompile Include="src\c_base\PackDataStr.c">
136+
<Filter>Source Files\c_base</Filter>
137+
</ClCompile>
138+
<ClCompile Include="src\c_base\str_func.c">
139+
<Filter>Source Files\c_base</Filter>
140+
</ClCompile>
141+
<ClCompile Include="src\c_base\str2int.c">
142+
<Filter>Source Files\c_base</Filter>
143+
</ClCompile>
144+
<ClCompile Include="src\PickColorBtn.cpp">
145+
<Filter>Source Files</Filter>
146+
</ClCompile>
147+
<ClCompile Include="src\ChildProcess.cpp">
148+
<Filter>Source Files</Filter>
149+
</ClCompile>
150+
</ItemGroup>
151+
<ItemGroup>
152+
<ClInclude Include="src\base.h">
153+
<Filter>Header Files</Filter>
154+
</ClInclude>
155+
<ClInclude Include="src\CAnyCheckBox.h">
156+
<Filter>Header Files</Filter>
157+
</ClInclude>
158+
<ClInclude Include="src\CAnyComboBox.h">
159+
<Filter>Header Files</Filter>
160+
</ClInclude>
161+
<ClInclude Include="src\CAnyListBox.h">
162+
<Filter>Header Files</Filter>
163+
</ClInclude>
164+
<ClInclude Include="src\CAnyRichEdit.h">
165+
<Filter>Header Files</Filter>
166+
</ClInclude>
167+
<ClInclude Include="src\CAnyWindow.h">
168+
<Filter>Header Files</Filter>
169+
</ClInclude>
170+
<ClInclude Include="src\CFileModificationChecker.h">
171+
<Filter>Header Files</Filter>
172+
</ClInclude>
173+
<ClInclude Include="src\CPopupListBox.h">
174+
<Filter>Header Files</Filter>
175+
</ClInclude>
176+
<ClInclude Include="src\CSimpleLogger.h">
177+
<Filter>Header Files</Filter>
178+
</ClInclude>
179+
<ClInclude Include="src\CStaticOptionsManager.h">
180+
<Filter>Header Files</Filter>
181+
</ClInclude>
182+
<ClInclude Include="src\DirFileLister.h">
183+
<Filter>Header Files</Filter>
184+
</ClInclude>
185+
<ClInclude Include="src\DlgAdvancedOptions.h">
186+
<Filter>Header Files</Filter>
187+
</ClInclude>
188+
<ClInclude Include="src\DlgConsole.h">
189+
<Filter>Header Files</Filter>
190+
</ClInclude>
191+
<ClInclude Include="src\DlgConsoleEncoding.h">
192+
<Filter>Header Files</Filter>
193+
</ClInclude>
194+
<ClInclude Include="src\DlgConsoleOutputFilter.h">
195+
<Filter>Header Files</Filter>
196+
</ClInclude>
197+
<ClInclude Include="src\DlgDoExec.h">
198+
<Filter>Header Files</Filter>
199+
</ClInclude>
200+
<ClInclude Include="src\DlgHelpAbout.h">
201+
<Filter>Header Files</Filter>
202+
</ClInclude>
203+
<ClInclude Include="src\DlgInputBox.h">
204+
<Filter>Header Files</Filter>
205+
</ClInclude>
206+
<ClInclude Include="src\NppExec.h">
207+
<Filter>Header Files</Filter>
208+
</ClInclude>
209+
<ClInclude Include="src\PluginCommunication\nppexec_msgs.h">
210+
<Filter>Header Files</Filter>
211+
</ClInclude>
212+
<ClInclude Include="src\NppExecScriptEngine.h">
213+
<Filter>Header Files</Filter>
214+
</ClInclude>
215+
<ClInclude Include="src\PluginCommunication\NppExecPluginInterface.h">
216+
<Filter>Header Files</Filter>
217+
</ClInclude>
218+
<ClInclude Include="src\NppScriptList.h">
219+
<Filter>Header Files</Filter>
220+
</ClInclude>
221+
<ClInclude Include="src\resource.h">
222+
<Filter>Header Files</Filter>
223+
</ClInclude>
224+
<ClInclude Include="src\encodings\SysUniConv.h">
225+
<Filter>Header Files</Filter>
226+
</ClInclude>
227+
<ClInclude Include="src\WarningAnalyzer.h">
228+
<Filter>Header Files</Filter>
229+
</ClInclude>
230+
<ClInclude Include="src\NppExecCommandExecutor.h">
231+
<Filter>Header Files</Filter>
232+
</ClInclude>
233+
<ClInclude Include="src\NppExecHelpers.h">
234+
<Filter>Header Files</Filter>
235+
</ClInclude>
236+
<ClInclude Include="src\fparser\fpconfig.hh">
237+
<Filter>Header Files\fparser</Filter>
238+
</ClInclude>
239+
<ClInclude Include="src\fparser\fparser.hh">
240+
<Filter>Header Files\fparser</Filter>
241+
</ClInclude>
242+
<ClInclude Include="src\fparser\extrasrc\fpaux.hh">
243+
<Filter>Header Files\fparser</Filter>
244+
</ClInclude>
245+
<ClInclude Include="src\fparser\extrasrc\fptypes.hh">
246+
<Filter>Header Files\fparser</Filter>
247+
</ClInclude>
248+
<ClInclude Include="src\NppScript.h">
249+
<Filter>Header Files</Filter>
250+
</ClInclude>
251+
<ClInclude Include="src\npp_files\BoostRegexSearch.h">
252+
<Filter>Header Files\npp_files</Filter>
253+
</ClInclude>
254+
<ClInclude Include="src\npp_files\Docking.h">
255+
<Filter>Header Files\npp_files</Filter>
256+
</ClInclude>
257+
<ClInclude Include="src\npp_files\menuCmdID.h">
258+
<Filter>Header Files\npp_files</Filter>
259+
</ClInclude>
260+
<ClInclude Include="src\npp_files\Notepad_plus_msgs.h">
261+
<Filter>Header Files\npp_files</Filter>
262+
</ClInclude>
263+
<ClInclude Include="src\npp_files\PluginInterface.h">
264+
<Filter>Header Files\npp_files</Filter>
265+
</ClInclude>
266+
<ClInclude Include="src\npp_files\Scintilla.h">
267+
<Filter>Header Files\npp_files</Filter>
268+
</ClInclude>
269+
<ClInclude Include="src\npp_files\Sci_Position.h">
270+
<Filter>Header Files\npp_files</Filter>
271+
</ClInclude>
272+
<ClInclude Include="src\cpp\CBufT.h">
273+
<Filter>Header Files\cpp</Filter>
274+
</ClInclude>
275+
<ClInclude Include="src\cpp\CFileBufT.h">
276+
<Filter>Header Files\cpp</Filter>
277+
</ClInclude>
278+
<ClInclude Include="src\cpp\CListT.h">
279+
<Filter>Header Files\cpp</Filter>
280+
</ClInclude>
281+
<ClInclude Include="src\cpp\CStrT.h">
282+
<Filter>Header Files\cpp</Filter>
283+
</ClInclude>
284+
<ClInclude Include="src\cpp\StrSplitT.h">
285+
<Filter>Header Files\cpp</Filter>
286+
</ClInclude>
287+
<ClInclude Include="src\c_base\types.h">
288+
<Filter>Header Files\c_base</Filter>
289+
</ClInclude>
290+
<ClInclude Include="src\c_base\HexStr.h">
291+
<Filter>Header Files\c_base</Filter>
292+
</ClInclude>
293+
<ClInclude Include="src\c_base\int2str.h">
294+
<Filter>Header Files\c_base</Filter>
295+
</ClInclude>
296+
<ClInclude Include="src\c_base\MatchMask.h">
297+
<Filter>Header Files\c_base</Filter>
298+
</ClInclude>
299+
<ClInclude Include="src\c_base\max_int.h">
300+
<Filter>Header Files\c_base</Filter>
301+
</ClInclude>
302+
<ClInclude Include="src\c_base\PackDataStr.h">
303+
<Filter>Header Files\c_base</Filter>
304+
</ClInclude>
305+
<ClInclude Include="src\c_base\str_func.h">
306+
<Filter>Header Files\c_base</Filter>
307+
</ClInclude>
308+
<ClInclude Include="src\c_base\str2int.h">
309+
<Filter>Header Files\c_base</Filter>
310+
</ClInclude>
311+
<ClInclude Include="src\PickColorBtn.h">
312+
<Filter>Header Files</Filter>
313+
</ClInclude>
314+
<ClInclude Include="src\ChildProcess.h">
315+
<Filter>Header Files</Filter>
316+
</ClInclude>
317+
</ItemGroup>
318+
<ItemGroup>
319+
<ResourceCompile Include="src\NppExec.rc">
320+
<Filter>Resource Files</Filter>
321+
</ResourceCompile>
322+
</ItemGroup>
323+
</Project>

0 commit comments

Comments
 (0)