CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ fixing manifest embedding (Notepad3 & minipath) in VS2017 Solution / vcproj

Browse Source 
- using Linker generated manifests (knows dependencies)
   - activate VS2017's postprocessing manifest-tool to merge manifest with
     Version.exe's .manifest.conf part (re-embedding assembled manifest)
     - by the way: Version.exe (Release/Win32) should only patch the items in
       <assemblyIdentity /> node of .manifest.conf and not re-create the complete manifest wiith dependencies
       (it works fine yet, but, if the Linker change dependencies, this will lead to merge conflicts)
   - switching DPI awarenes to 'false', cause only MFC Application can be made DPI aware
     (setting 'true' for non MFC Applications will end up in blurry effects on scaled desktops [MS doc])

- Tip: the embedded manifest resource can be checked by:
    i) load the .exe via file open dialog into VS2017
   ii) or using  Sysinternal's  > sigcheck.exe -a -m Notepad3.exe
This commit is contained in:
Rainer Kottenhoff 2017-08-10 09:52:05 +02:00
parent 2b1959e08f
commit ada5b0c2b6
13 changed files with 802 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
minipath/minipath_VS2017.vcxproj
View File

@ -116,6 +116,13 @@
<PreBuildEvent>
<Command>Version.exe</Command>
</PreBuildEvent>
<Manifest>
<EnableDpiAwareness>false</EnableDpiAwareness>
<InputResourceManifests>
</InputResourceManifests>
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -155,6 +162,13 @@
<PreBuildEvent>
<Command>Version.exe</Command>
</PreBuildEvent>
<Manifest>
<EnableDpiAwareness>false</EnableDpiAwareness>
<InputResourceManifests>
</InputResourceManifests>
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Link>
@ -173,6 +187,13 @@
</PrecompiledHeaderOutputFile>
<PrecompiledHeaderFile />
</ClCompile>
<Manifest>
<EnableDpiAwareness>false</EnableDpiAwareness>
<InputResourceManifests>
</InputResourceManifests>
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Link>
@ -190,6 +211,13 @@
</PrecompiledHeaderOutputFile>
<PrecompiledHeaderFile />
</ClCompile>
<Manifest>
<EnableDpiAwareness>false</EnableDpiAwareness>
<InputResourceManifests>
</InputResourceManifests>
<AdditionalManifestFiles>$(ProjDir)res\Notepad3$(TargetExt).manifest.conf</AdditionalManifestFiles>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
</Manifest>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\Dialogs.c" />

123
minipath/minipath_VS2017.vcxproj.filters Normal file
View File

@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="C/C++ Source Files">
<UniqueIdentifier>{5553d3c0-044f-438f-b1b2-867093fe3ae1}</UniqueIdentifier>
<Extensions>c;cpp</Extensions>
</Filter>
<Filter Include="H Source Files">
<UniqueIdentifier>{e1f8cff3-413c-4dc8-948b-890b217e91a9}</UniqueIdentifier>
<Extensions>h;hpp</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{2dcd5d78-6817-4e88-95dd-45317fb30c57}</UniqueIdentifier>
<Extensions>rc;manifest;ver</Extensions>
</Filter>
<Filter Include="Image Files">
<UniqueIdentifier>{ed5af34a-ecde-4869-92de-751b5f039b98}</UniqueIdentifier>
<Extensions>bmp;ico;cur</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\Dialogs.c">
<Filter>C/C++ Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Dlapi.c">
<Filter>C/C++ Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Dropsource.cpp">
<Filter>C/C++ Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Helpers.c">
<Filter>C/C++ Source Files</Filter>
</ClCompile>
<ClCompile Include="src\minipath.c">
<Filter>C/C++ Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\Dialogs.h">
<Filter>H Source Files</Filter>
</ClInclude>
<ClInclude Include="src\Dlapi.h">
<Filter>H Source Files</Filter>
</ClInclude>
<ClInclude Include="src\Dropsource.h">
<Filter>H Source Files</Filter>
</ClInclude>
<ClInclude Include="src\Helpers.h">
<Filter>H Source Files</Filter>
</ClInclude>
<ClInclude Include="src\resource.h">
<Filter>H Source Files</Filter>
</ClInclude>
<ClInclude Include="src\version.h">
<Filter>H Source Files</Filter>
</ClInclude>
<ClInclude Include="src\minipath.h">
<Filter>H Source Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\Hover.cur">
<Filter>Image Files</Filter>
</None>
<None Include="res\crosshair.cur">
<Filter>Image Files</Filter>
</None>
<None Include="src\minipath.ver">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Image Include="res\Folder.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Goto.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Items.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Open.bmp">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Options.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Options2.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Progs.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Run.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\Toolbar.bmp">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\cross1.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\cross2.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\metapath.ico">
<Filter>Image Files</Filter>
</Image>
<Image Include="res\MiniPath.ico">
<Filter>Image Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<Manifest Include="res\minipath.exe.manifest">
<Filter>Resource Files</Filter>
</Manifest>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="src\minipath.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

15
minipath/res/MiniPath.exe.manifest
View File

@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
name="MiniPath"
processorArchitecture="*"
version="0.0.9.92"
type="win32"
/>
<description>metapath</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
@ -28,10 +21,10 @@
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">

35
minipath/res/Notepad3.exe.manifest.conf
View File

@ -3,40 +3,7 @@
<assemblyIdentity
name="MiniPath"
processorArchitecture="*"
version="1.0.2.133"
version="1.0.2.138"
type="win32"
/>
<description>metapath</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"/>
</dependentAssembly>
</dependency>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>

4
minipath/src/minipath.rc
View File

@ -22,8 +22,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// RT_MANIFEST
//
IDR_RT_MANIFEST RT_MANIFEST "..\\res\\minipath.exe.manifest"
//~~~ Linker generated and merged & embedded by manifesttool
//~~~IDR_RT_MANIFEST RT_MANIFEST "..\\res\\minipath.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
//

2
minipath/src/resource.h
View File

@ -2,7 +2,7 @@
// Microsoft Visual C++ generated include file.
// Used by minipath.rc
//
#define IDR_RT_MANIFEST 99
#define IDR_RT_MANIFEST 1
#define IDR_MAINWND 100
#define IDC_COMMANDLINE 100
#define IDD_ABOUT 100

8
res/Notepad3.exe.manifest
View File

@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="0.3.1.319"
type="win32"
/>
<description>Notepad3</description>
<dependency>
<dependentAssembly>
@ -37,7 +31,7 @@
</compatibility>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
<dpiAware>false</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>

36
res/Notepad3.exe.manifest.conf
View File

@ -3,41 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="2.0.2.403"
version="2.0.2.405"
type="win32"
/>
<description>Notepad3</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
</application>
</compatibility>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware>
</asmv3:windowsSettings>
</asmv3:application>
</assembly>

437
scintilla/Scintilla_VS2017.vcxproj.filters Normal file
View File

@ -0,0 +1,437 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{b78c6486-26fc-4890-89c0-f7f3e301b79c}</UniqueIdentifier>
</Filter>
<Filter Include="lexers">
<UniqueIdentifier>{6b8793d0-aa9c-432f-aa65-b763bc23ae40}</UniqueIdentifier>
</Filter>
<Filter Include="lexlib">
<UniqueIdentifier>{b4579e25-25b5-4f0d-8dab-c34ed9f53913}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{9dbbd18e-d068-478e-82f3-5b03317a670d}</UniqueIdentifier>
</Filter>
<Filter Include="win32">
<UniqueIdentifier>{afe7e35e-cd81-406c-a770-df29d2b3fc95}</UniqueIdentifier>
</Filter>
<Filter Include="deelx">
<UniqueIdentifier>{67242aad-9133-44e7-9774-c36f5a9194bc}</UniqueIdentifier>
</Filter>
<Filter Include="deelx\doc">
<UniqueIdentifier>{4e167b73-0447-4a31-a66b-64c2d684516d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="lexers\LexAHK.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexAsm.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexAU3.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexAVS.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexBash.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexBatch.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexCmake.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexCoffeeScript.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexConf.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexCPP.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexCSS.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexDiff.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexErrorList.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexHTML.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexInno.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexLaTeX.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexLua.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexMake.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexMarkdown.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexNsis.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexNull.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexPascal.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexPerl.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexPowerShell.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexProps.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexPython.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexRuby.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexSQL.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexTCL.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexVB.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexYAML.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexVHDL.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexlib\Accessor.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\CharacterCategory.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\CharacterSet.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\LexerBase.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\LexerModule.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\LexerNoExceptions.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\LexerSimple.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\PropSetSimple.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\StyleContext.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="lexlib\WordList.cxx">
<Filter>lexlib</Filter>
</ClCompile>
<ClCompile Include="src\AutoComplete.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\CallTip.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\CaseConvert.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\CaseFolder.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Catalogue.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\CellBuffer.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\CharClassify.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ContractionState.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Decoration.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Document.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\EditModel.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Editor.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\EditView.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ExternalLexer.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Indicator.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\KeyMap.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\LineMarker.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\MarginView.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\PerLine.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\PositionCache.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\RESearch.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\RunStyles.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ScintillaBase.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Selection.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\Style.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\UniConversion.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\ViewStyle.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="src\XPM.cxx">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="win32\HanjaDic.cxx">
<Filter>win32</Filter>
</ClCompile>
<ClCompile Include="win32\PlatWin.cxx">
<Filter>win32</Filter>
</ClCompile>
<ClCompile Include="win32\ScintillaWin.cxx">
<Filter>win32</Filter>
</ClCompile>
<ClCompile Include="deelx\DeelxRegexSearch.cxx">
<Filter>deelx</Filter>
</ClCompile>
<ClCompile Include="lexers\LexJSON.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexMatlab.cxx">
<Filter>lexers</Filter>
</ClCompile>
<ClCompile Include="lexers\LexRegistry.cxx">
<Filter>lexers</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\ILexer.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\Platform.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\SciLexer.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="include\Scintilla.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="lexlib\Accessor.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\CharacterCategory.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\CharacterSet.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\LexAccessor.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\LexerBase.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\LexerModule.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\LexerNoExceptions.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\LexerSimple.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\OptionSet.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\PropSetSimple.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\SparseState.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\StringCopy.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\StyleContext.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\SubStyles.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="lexlib\WordList.h">
<Filter>lexlib</Filter>
</ClInclude>
<ClInclude Include="src\AutoComplete.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\CallTip.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\CaseConvert.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\CaseFolder.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Catalogue.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\CellBuffer.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\CharClassify.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ContractionState.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Decoration.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Document.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\EditModel.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Editor.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\EditView.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ExternalLexer.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\FontQuality.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Indicator.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\KeyMap.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\LineMarker.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\MarginView.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Partitioning.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\PerLine.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Position.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\PositionCache.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\RESearch.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\RunStyles.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ScintillaBase.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Selection.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\SplitVector.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\Style.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\UnicodeFromUTF8.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\UniConversion.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\ViewStyle.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\XPM.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="win32\PlatWin.h">
<Filter>win32</Filter>
</ClInclude>
<ClInclude Include="deelx\deelx64.h">
<Filter>deelx</Filter>
</ClInclude>
<ClInclude Include="include\Sci_Position.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="src\SparseVector.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="src\UniqueString.h">
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="deelx\doc\deelx_en.chm">
<Filter>deelx\doc</Filter>
</None>
</ItemGroup>
</Project>

5
src/Notepad3.rc
View File

@ -22,9 +22,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
// RT_MANIFEST
//
1 RT_MANIFEST "..\\res\\Notepad3.exe.manifest"
//~~~ Linker generated and merged & embedded by manifesttool
//~~~IDR_RT_MANIFEST RT_MANIFEST "..\\res\\Notepad3.exe.manifest"
/////////////////////////////////////////////////////////////////////////////
//

56
src/Notepad3_VS2017.vcxproj
View File

@ -71,25 +71,25 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest>
<GenerateManifest>true</GenerateManifest>
<IntDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
<GenerateManifest>true</GenerateManifest>
<IntDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest>
<GenerateManifest>true</GenerateManifest>
<IntDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest>
<GenerateManifest>true</GenerateManifest>
<IntDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\</OutDir>
@ -126,6 +126,18 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Manifest>
<InputResourceManifests>
</InputResourceManifests>
</Manifest>
<Manifest>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
<AdditionalManifestFiles>$(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf</AdditionalManifestFiles>
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@ -161,6 +173,18 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Manifest>
<InputResourceManifests>
</InputResourceManifests>
</Manifest>
<Manifest>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
<AdditionalManifestFiles>$(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf</AdditionalManifestFiles>
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -196,6 +220,18 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Manifest>
<InputResourceManifests>
</InputResourceManifests>
</Manifest>
<Manifest>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
<AdditionalManifestFiles>$(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf</AdditionalManifestFiles>
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
@ -232,6 +268,18 @@
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
</ProjectReference>
<Manifest>
<InputResourceManifests>
</InputResourceManifests>
</Manifest>
<Manifest>
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
<AdditionalManifestFiles>$(ProjDir)..\res\$(TargetName)$(TargetExt).manifest.conf</AdditionalManifestFiles>
<EnableDpiAwareness>false</EnableDpiAwareness>
</Manifest>
<ManifestResourceCompile>
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
</ManifestResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\crypto\crypto.c" />

144
src/Notepad3_VS2017.vcxproj.filters Normal file
View File

@ -0,0 +1,144 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Crypto">
<UniqueIdentifier>{aad339da-f291-4358-9ab1-a0fdee012ac6}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Dialogs.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Dlapi.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Edit.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Helpers.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Print.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Styles.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="Notepad3.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\crypto\crypto.c">
<Filter>Crypto</Filter>
</ClCompile>
<ClCompile Include="..\crypto\rijndael-alg-fst.c">
<Filter>Crypto</Filter>
</ClCompile>
<ClCompile Include="..\crypto\rijndael-api-fst.c">
<Filter>Crypto</Filter>
</ClCompile>
<ClCompile Include="..\crypto\sha-256.c">
<Filter>Crypto</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Dialogs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Dlapi.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Edit.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Helpers.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SciCall.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Styles.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Notepad3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\crypto\crypto.h">
<Filter>Crypto</Filter>
</ClInclude>
<ClInclude Include="..\crypto\rijndael-alg-fst.h">
<Filter>Crypto</Filter>
</ClInclude>
<ClInclude Include="..\crypto\rijndael-api-fst.h">
<Filter>Crypto</Filter>
</ClInclude>
<ClInclude Include="..\crypto\sha-256.h">
<Filter>Crypto</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\res\Copy.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Encoding.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Next.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Open.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Pick.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Prev.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Run.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Styles.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\Toolbar.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="Notepad3.ver">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\res\Notepad3.exe.manifest" />
</ItemGroup>
<ItemGroup>
<Image Include="..\res\Notepad3.ico">
<Filter>Resource Files</Filter>
</Image>
<Image Include="..\res\Toolbar2.bmp">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Notepad3.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

11
src/resource.h
View File

@ -2,6 +2,7 @@
// Von Microsoft Visual C++ generierte Includedatei.
// Verwendet durch Notepad3.rc
//
#define IDR_RT_MANIFEST 1
#define IDR_MAINWND 100
#define IDC_FINDTEXT 100
#define IDC_LINENUM 100
@ -453,10 +454,10 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 3
#define _APS_NEXT_COMMAND_VALUE 5
#define _APS_NEXT_CONTROL_VALUE 0
#define _APS_NEXT_SYMED_VALUE 0
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 600
#define _APS_NEXT_COMMAND_VALUE 700
#define _APS_NEXT_CONTROL_VALUE 800
#define _APS_NEXT_SYMED_VALUE 900
#endif
#endif