Merge remote-tracking branch 'upstream/master' into Dev_Master

Build/Changes.txt

@@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.22.1104.(build_#) (2022-11-04)
+Current BETA/RC Version 5.22.1114.(build_#) (2022-11-14)
 ========================================================
 
 --------------------------------------------------------
@@ -63,6 +63,10 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[1114.1]- Minor corrections to project properties.
+[1114.1]- VS2022-vc143 build (WM_DPICHANGED not send).
+[1114.1]- Revert all NP3 project files to vc142 toolset.
+[1114.1]- Workaround to fix DPI scaling issues related to VS2022 compiler toolset.
 [1104.1]- Full font description in resource files.
 [1029.1]- Refactoring of undo/redo and document modify handler.
 [1020.1]- Standard DarkMode Theme.
@@ -118,6 +122,13 @@ CHANGES Versions in Tools or Libraries:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[1114.1]- Reset change history except in case of "revert from file".
+[1114.1]- Set correct _WIN32_WINNT version (0x0601 /*_WIN32_WINNT_WIN7*/).
+[1114.1]- Common Base Whitespace style not cleared if default.
+[1114.1]- Linker must generate Manifest (???).
+[1114.1]- All static link libs should be toolset vc142 compiled.
+[1114.1]- Adapt AppVeyor AHK Tests to vc142.
+[1114.1]- Don't store contrast adapted dark mode foreground color themes.
 [1104.1]- Common base font size scheme handling.
 [1104.1]- Context menu: web action handler.
 [1104.1]- Modification marker based on selection history.

Versions/build.txt

@@ -1 +1 @@
-1
+2

Versions/day.txt

@@ -1 +1 @@
-1104
+1114

res/Notepad3.exe.conf.manifest

@@ -3,7 +3,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
 	<assemblyIdentity
 		name="Rizonesoft.Notepad3"
-		version="5.22.1105.5"
+		version="5.22.1114.2"
 		processorArchitecture="*"
 		type="win32"
 	/>

src/StyleLexers/styleLexStandard.c

@@ -82,7 +82,7 @@ EDITLEXER lexANSI =
 {
     SCLEX_NULL, "null", IDS_LEX_ANSI_ART, L"ANSI Art", L"nfo; diz; \\^Readme$", L"",
     &KeyWords_NULL,{
-        { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:Lucida Console; thin; size:11; smoothing:aliased", L"" },
+        { {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:Lucida Console; thin; size:+11; smoothing:aliased", L"" },
         { {STYLE_LINENUMBER}, IDS_LEX_STD_MARGIN, L"Margins and Line Numbers", L"font:Lucida Console; size:-2", L"" },
         { {STYLE_BRACELIGHT}, IDS_LEX_STD_BRACE, L"Matching Braces", L"", L"" },
         { {STYLE_BRACEBAD}, IDS_LEX_STD_BRACE_FAIL, L"Matching Braces Error", L"", L"" },

src/VersionEx.h

@@ -8,8 +8,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 22
-#define VERSION_REV 1104
-#define VERSION_BUILD 1
+#define VERSION_REV 1114
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 531
 #define LEXILLA_VER 520
 #define ONIGURUMA_REGEX_VER 6.9.8