diff --git a/grepWinNP3/grepWinNP3.vcxproj b/grepWinNP3/grepWinNP3.vcxproj index fc6107616..f7023d818 100644 --- a/grepWinNP3/grepWinNP3.vcxproj +++ b/grepWinNP3/grepWinNP3.vcxproj @@ -96,18 +96,18 @@ <_ProjectFileVersion>10.0.30319.1 ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\grepWin\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\grepWin\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ true true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\grepWin\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\grepWin\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\grepWin\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\grepWin\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false false false diff --git a/lexilla/Lexilla.vcxproj b/lexilla/Lexilla.vcxproj index 2a52ebed3..d678b1005 100644 --- a/lexilla/Lexilla.vcxproj +++ b/lexilla/Lexilla.vcxproj @@ -194,32 +194,32 @@ true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\lexilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\lexilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\lexilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\lexilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\lexilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\lexilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ diff --git a/minipath/language/mp_af_za/mp_af_za.vcxproj b/minipath/language/mp_af_za/mp_af_za.vcxproj index 931ba2f0e..90669fcb9 100644 --- a/minipath/language/mp_af_za/mp_af_za.vcxproj +++ b/minipath/language/mp_af_za/mp_af_za.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_be_by/mp_be_by.vcxproj b/minipath/language/mp_be_by/mp_be_by.vcxproj index b1947a8f3..99804e791 100644 --- a/minipath/language/mp_be_by/mp_be_by.vcxproj +++ b/minipath/language/mp_be_by/mp_be_by.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_de_de/mp_de_de.vcxproj b/minipath/language/mp_de_de/mp_de_de.vcxproj index 8bc61dfa5..4012c9684 100644 --- a/minipath/language/mp_de_de/mp_de_de.vcxproj +++ b/minipath/language/mp_de_de/mp_de_de.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_el_gr/mp_el_gr.vcxproj b/minipath/language/mp_el_gr/mp_el_gr.vcxproj index 5631936fd..cc802d195 100644 --- a/minipath/language/mp_el_gr/mp_el_gr.vcxproj +++ b/minipath/language/mp_el_gr/mp_el_gr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_en_gb/mp_en_gb.vcxproj b/minipath/language/mp_en_gb/mp_en_gb.vcxproj index d3754f987..3ea90db98 100644 --- a/minipath/language/mp_en_gb/mp_en_gb.vcxproj +++ b/minipath/language/mp_en_gb/mp_en_gb.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_en_us/mp_en_us.vcxproj b/minipath/language/mp_en_us/mp_en_us.vcxproj index 16c3f6d14..bd8af410d 100644 --- a/minipath/language/mp_en_us/mp_en_us.vcxproj +++ b/minipath/language/mp_en_us/mp_en_us.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -176,6 +178,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -207,6 +211,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -240,6 +246,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -273,6 +281,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -306,6 +316,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_es_419/mp_es_419.vcxproj b/minipath/language/mp_es_419/mp_es_419.vcxproj index c5907f902..318a583b2 100644 --- a/minipath/language/mp_es_419/mp_es_419.vcxproj +++ b/minipath/language/mp_es_419/mp_es_419.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_es_es/mp_es_es.vcxproj b/minipath/language/mp_es_es/mp_es_es.vcxproj index 17c3d75d1..4576e55a9 100644 --- a/minipath/language/mp_es_es/mp_es_es.vcxproj +++ b/minipath/language/mp_es_es/mp_es_es.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_fr_fr/mp_fr_fr.vcxproj b/minipath/language/mp_fr_fr/mp_fr_fr.vcxproj index a0414de17..be18243b6 100644 --- a/minipath/language/mp_fr_fr/mp_fr_fr.vcxproj +++ b/minipath/language/mp_fr_fr/mp_fr_fr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_hi_in/mp_hi_in.vcxproj b/minipath/language/mp_hi_in/mp_hi_in.vcxproj index 49fff6e3a..7d3578b6a 100644 --- a/minipath/language/mp_hi_in/mp_hi_in.vcxproj +++ b/minipath/language/mp_hi_in/mp_hi_in.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_hu_hu/mp_hu_hu.vcxproj b/minipath/language/mp_hu_hu/mp_hu_hu.vcxproj index e946f0419..4de99869a 100644 --- a/minipath/language/mp_hu_hu/mp_hu_hu.vcxproj +++ b/minipath/language/mp_hu_hu/mp_hu_hu.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_id_id/mp_id_id.vcxproj b/minipath/language/mp_id_id/mp_id_id.vcxproj index 16532ff70..2d3505134 100644 --- a/minipath/language/mp_id_id/mp_id_id.vcxproj +++ b/minipath/language/mp_id_id/mp_id_id.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_it_it/mp_it_it.vcxproj b/minipath/language/mp_it_it/mp_it_it.vcxproj index 48275fb73..fb51f8917 100644 --- a/minipath/language/mp_it_it/mp_it_it.vcxproj +++ b/minipath/language/mp_it_it/mp_it_it.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_ja_jp/mp_ja_jp.vcxproj b/minipath/language/mp_ja_jp/mp_ja_jp.vcxproj index 52784c38f..db63afbcf 100644 --- a/minipath/language/mp_ja_jp/mp_ja_jp.vcxproj +++ b/minipath/language/mp_ja_jp/mp_ja_jp.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_ko_kr/mp_ko_kr.vcxproj b/minipath/language/mp_ko_kr/mp_ko_kr.vcxproj index e52ede90e..41920ce5c 100644 --- a/minipath/language/mp_ko_kr/mp_ko_kr.vcxproj +++ b/minipath/language/mp_ko_kr/mp_ko_kr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_nl_nl/mp_nl_nl.vcxproj b/minipath/language/mp_nl_nl/mp_nl_nl.vcxproj index 20ac46f32..dcdaa3665 100644 --- a/minipath/language/mp_nl_nl/mp_nl_nl.vcxproj +++ b/minipath/language/mp_nl_nl/mp_nl_nl.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_pl_pl/mp_pl_pl.vcxproj b/minipath/language/mp_pl_pl/mp_pl_pl.vcxproj index db569ffcd..2709f1db5 100644 --- a/minipath/language/mp_pl_pl/mp_pl_pl.vcxproj +++ b/minipath/language/mp_pl_pl/mp_pl_pl.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_pt_br/mp_pt_br.vcxproj b/minipath/language/mp_pt_br/mp_pt_br.vcxproj index 452afde05..d8fad0065 100644 --- a/minipath/language/mp_pt_br/mp_pt_br.vcxproj +++ b/minipath/language/mp_pt_br/mp_pt_br.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_pt_pt/mp_pt_pt.vcxproj b/minipath/language/mp_pt_pt/mp_pt_pt.vcxproj index b48bc9045..710472c26 100644 --- a/minipath/language/mp_pt_pt/mp_pt_pt.vcxproj +++ b/minipath/language/mp_pt_pt/mp_pt_pt.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_ru_ru/mp_ru_ru.vcxproj b/minipath/language/mp_ru_ru/mp_ru_ru.vcxproj index c7acad42b..84b147f29 100644 --- a/minipath/language/mp_ru_ru/mp_ru_ru.vcxproj +++ b/minipath/language/mp_ru_ru/mp_ru_ru.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_sk_sk/mp_sk_sk.vcxproj b/minipath/language/mp_sk_sk/mp_sk_sk.vcxproj index b2e6660bd..0f8262fba 100644 --- a/minipath/language/mp_sk_sk/mp_sk_sk.vcxproj +++ b/minipath/language/mp_sk_sk/mp_sk_sk.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_sv_se/mp_sv_se.vcxproj b/minipath/language/mp_sv_se/mp_sv_se.vcxproj index b88a5add9..b5eb103fd 100644 --- a/minipath/language/mp_sv_se/mp_sv_se.vcxproj +++ b/minipath/language/mp_sv_se/mp_sv_se.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_tr_tr/mp_tr_tr.vcxproj b/minipath/language/mp_tr_tr/mp_tr_tr.vcxproj index 0f4de2e15..4622de8b1 100644 --- a/minipath/language/mp_tr_tr/mp_tr_tr.vcxproj +++ b/minipath/language/mp_tr_tr/mp_tr_tr.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_vi_vn/mp_vi_vn.vcxproj b/minipath/language/mp_vi_vn/mp_vi_vn.vcxproj index 0a06f26ba..7c104e1bd 100644 --- a/minipath/language/mp_vi_vn/mp_vi_vn.vcxproj +++ b/minipath/language/mp_vi_vn/mp_vi_vn.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_zh_cn/mp_zh_cn.vcxproj b/minipath/language/mp_zh_cn/mp_zh_cn.vcxproj index 484263cdb..dfd4a5f26 100644 --- a/minipath/language/mp_zh_cn/mp_zh_cn.vcxproj +++ b/minipath/language/mp_zh_cn/mp_zh_cn.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/language/mp_zh_tw/mp_zh_tw.vcxproj b/minipath/language/mp_zh_tw/mp_zh_tw.vcxproj index 4e5612cf3..b820c9e62 100644 --- a/minipath/language/mp_zh_tw/mp_zh_tw.vcxproj +++ b/minipath/language/mp_zh_tw/mp_zh_tw.vcxproj @@ -149,6 +149,8 @@ _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -177,6 +179,8 @@ WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -209,6 +213,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -243,6 +249,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -277,6 +285,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows @@ -311,6 +321,8 @@ AnySuitable Size /utf-8 %(AdditionalOptions) + stdcpp17 + stdc17 Windows diff --git a/minipath/minipath.vcxproj b/minipath/minipath.vcxproj index 3bd7865ea..b891597b7 100644 --- a/minipath/minipath.vcxproj +++ b/minipath/minipath.vcxproj @@ -141,7 +141,7 @@ /MACHINE:I386 %(AdditionalOptions) - shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) + shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) true DebugFull Windows @@ -150,6 +150,7 @@ false uxtheme.dll true + $(OutputPath)obj;%(AdditionalLibraryDirectories) _DEBUG;%(PreprocessorDefinitions) @@ -208,7 +209,7 @@ /MACHINE:I386 %(AdditionalOptions) - shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) + shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) true Windows UseLinkTimeCodeGeneration @@ -216,6 +217,7 @@ false uxtheme.dll true + $(OutputPath)obj;%(AdditionalLibraryDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -276,7 +278,7 @@ /MACHINE:I386 %(AdditionalOptions) - shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) + shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) true Windows UseLinkTimeCodeGeneration @@ -285,6 +287,7 @@ false uxtheme.dll true + $(OutputPath)obj;%(AdditionalLibraryDirectories) NDEBUG;%(PreprocessorDefinitions) @@ -315,13 +318,14 @@ - shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) + shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) Windows Default false uxtheme.dll true + $(OutputPath)obj;%(AdditionalLibraryDirectories) @@ -359,13 +363,14 @@ - shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) + shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) Windows UseLinkTimeCodeGeneration false uxtheme.dll true + $(OutputPath)obj;%(AdditionalLibraryDirectories) @@ -409,7 +414,7 @@ - shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) + shlwapi.lib;muiload.lib;psapi.lib;legacy_stdio_definitions.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) Windows UseLinkTimeCodeGeneration @@ -417,6 +422,7 @@ false uxtheme.dll true + $(OutputPath)obj;%(AdditionalLibraryDirectories) @@ -515,14 +521,6 @@ - - - {1f757558-0e57-4de5-82d6-a14e9d81f05f} - - - {0873b090-7ffd-4abd-9b42-619a06c5041f} - - diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj index 3e01643c4..964a06a89 100644 --- a/scintilla/Scintilla.vcxproj +++ b/scintilla/Scintilla.vcxproj @@ -114,12 +114,12 @@ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ @@ -148,8 +148,8 @@ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ @@ -158,8 +158,8 @@ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false false false diff --git a/src/DarkMode/user32-stub/user32-stub.vcxproj b/src/DarkMode/user32-stub/user32-stub.vcxproj index 35c25b6a0..2678e5def 100644 --- a/src/DarkMode/user32-stub/user32-stub.vcxproj +++ b/src/DarkMode/user32-stub/user32-stub.vcxproj @@ -189,63 +189,63 @@ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ false - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ $(ProjectName) false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ $(ProjectName) false - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\user32\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ $(ProjectName) diff --git a/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj b/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj index ced37c4b8..8451944e9 100644 --- a/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj +++ b/src/DarkMode/uxtheme-stub/uxtheme-stub.vcxproj @@ -189,64 +189,64 @@ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(ProjectName) false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(ProjectName) false $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\uxtheme\ + $(SolutionDir)\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ $(ProjectName) diff --git a/src/Edit.c b/src/Edit.c index a7fd01033..1d7ff119b 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -5484,6 +5484,22 @@ static void _SetSearchFlags(HWND hwnd, LPEDITFINDREPLACE lpefr) } } + if (IsDialogControlEnabled(hwnd, IDC_FINDTRANSFORMBS)) { + bIsFlagSet = lpefr->bTransformBS; + if (IsButtonChecked(hwnd, IDC_FINDTRANSFORMBS)) { + if (!bIsFlagSet) { + lpefr->bTransformBS = true; + lpefr->bStateChanged = true; + } + } + else { + if (bIsFlagSet) { + lpefr->bTransformBS = false; + lpefr->bStateChanged = true; + } + } + } + bIsFlagSet = lpefr->bRegExprSearch; if (IsButtonChecked(hwnd, IDC_FINDREGEXP)) { if (!bIsFlagSet) { @@ -5522,16 +5538,24 @@ static void _SetSearchFlags(HWND hwnd, LPEDITFINDREPLACE lpefr) if (IsButtonChecked(hwnd, IDC_WILDCARDSEARCH)) { if (!bIsFlagSet) { lpefr->bWildcardSearch = true; - lpefr->fuFlags |= SCFIND_REGEXP; // Wildcard search based on RegExpr + lpefr->bStateChanged = true; + } + // Wildcard search based on RegExpr + if (!(lpefr->fuFlags & SCFIND_REGEXP)) { + lpefr->fuFlags |= SCFIND_REGEXP; lpefr->bStateChanged = true; } } else { if (bIsFlagSet) { lpefr->bWildcardSearch = false; + lpefr->bStateChanged = true; + } + // Wildcard search based on RegExpr + if (lpefr->fuFlags & SCFIND_REGEXP) { if (!(lpefr->bRegExprSearch)) { lpefr->fuFlags &= ~SCFIND_REGEXP; + lpefr->bStateChanged = true; } - lpefr->bStateChanged = true; } } @@ -5561,21 +5585,6 @@ static void _SetSearchFlags(HWND hwnd, LPEDITFINDREPLACE lpefr) } } - if (IsDialogControlEnabled(hwnd, IDC_FINDTRANSFORMBS)) { - bIsFlagSet = lpefr->bTransformBS; - if (IsButtonChecked(hwnd, IDC_FINDTRANSFORMBS)) { - if (!bIsFlagSet) { - lpefr->bTransformBS = true; - lpefr->bStateChanged = true; - } - } else { - if (bIsFlagSet) { - lpefr->bTransformBS = false; - lpefr->bStateChanged = true; - } - } - } - if (bIsFindDlg) { bIsFlagSet = lpefr->bFindClose; if (IsButtonChecked(hwnd, IDC_FINDCLOSE)) { @@ -5644,11 +5653,10 @@ static void _EscapeWildcards(char* szFind2, size_t cch, LPEDITFINDREPLACE lpefr ) ) { if (!bEsc) { szWildcardEscaped[iDest++] = '\\'; - } else { - bEsc = false; } + bEsc = false; } else if (bEsc) { - szWildcardEscaped[iDest++] = '\\'; + //~szWildcardEscaped[iDest++] = '\\'; ~ don't esc' backslash here bEsc = false; } szWildcardEscaped[iDest++] = c; @@ -5666,18 +5674,18 @@ static void _EscapeWildcards(char* szFind2, size_t cch, LPEDITFINDREPLACE lpefr // // _EditGetFindStrg() // -static void _EditGetFindStrg(HWND hwnd, LPEDITFINDREPLACE lpefr, LPSTR szFind, size_t cchCnt) +static size_t _EditGetFindStrg(HWND hwnd, LPEDITFINDREPLACE lpefr, LPSTR szFind, size_t cchCnt, bool bReplEmpty) { if (!lpefr) { - return; + return 0; } - if (!StrIsEmptyA(lpefr->szFind)) { - StringCchCopyA(szFind, cchCnt, lpefr->szFind); - } else { + if (StrIsEmptyA(lpefr->szFind) && bReplEmpty) { CopyFindPatternMB(szFind, cchCnt); + } else { + StringCchCopyA(szFind, cchCnt, lpefr->szFind); } - if (StrIsEmptyA(szFind)) { + if (StrIsEmptyA(szFind) && bReplEmpty) { // get most recently used find pattern WCHAR mruItem[FNDRPL_BUFFER] = { L'\0' }; MRU_Enum(Globals.pMRUfind, 0, mruItem, COUNTOF(mruItem)); @@ -5685,7 +5693,7 @@ static void _EditGetFindStrg(HWND hwnd, LPEDITFINDREPLACE lpefr, LPSTR szFind, s WideCharToMultiByte(Encoding_SciCP, 0, mruItem, -1, szFind, (int)cchCnt, NULL, NULL); } } - if (StrIsEmptyA(szFind)) { + if (StrIsEmptyA(szFind) && bReplEmpty) { // get clipboard content char *const pClip = EditGetClipboardText(hwnd, false, NULL, NULL); if (!StrIsEmptyA(pClip)) { @@ -5693,20 +5701,49 @@ static void _EditGetFindStrg(HWND hwnd, LPEDITFINDREPLACE lpefr, LPSTR szFind, s } FreeMem(pClip); } + if (StrIsEmptyA(szFind)) { - return; + return 0; } // ensure to F/R-dialog data structure consistency StringCchCopyA(lpefr->szFind, COUNTOF(lpefr->szFind), szFind); - if (!StrIsEmptyA(szFind) && lpefr->bWildcardSearch) { + if (lpefr->bWildcardSearch) { _EscapeWildcards(szFind, cchCnt, lpefr); } bool const bIsRegEx = (lpefr->fuFlags & SCFIND_REGEXP); if (lpefr->bTransformBS || bIsRegEx) { TransformBackslashes(szFind, bIsRegEx, Encoding_SciCP, NULL); } + + return StringCchLenA(szFind, cchCnt); +} + + +//============================================================================= +// +// _GetReplaceString() +// +static char* _GetReplaceString(HWND hwnd, CLPCEDITFINDREPLACE lpefr, int* iReplaceMsg) +{ + char* pszReplace = NULL; // replace text of arbitrary size + if (StringCchCompareNIA(lpefr->szReplace, COUNTOF(lpefr->szReplace), "^c", 2) == 0) { + *iReplaceMsg = SCI_REPLACETARGET; + pszReplace = EditGetClipboardText(hwnd, true, NULL, NULL); + } + else { + size_t const cch = StringCchLenA(lpefr->szReplace, COUNTOF(lpefr->szReplace)); + pszReplace = (char*)AllocMem(cch + 1, HEAP_ZERO_MEMORY); + if (pszReplace) { + StringCchCopyA(pszReplace, SizeOfMem(pszReplace), lpefr->szReplace); + bool const bIsRegEx = (lpefr->fuFlags & SCFIND_REGEXP); + if (lpefr->bTransformBS || bIsRegEx) { + TransformBackslashes(pszReplace, bIsRegEx, Encoding_SciCP, iReplaceMsg); + } + } + } + return pszReplace; // move ownership } @@ -5779,7 +5816,9 @@ typedef enum { MATCH = 0, NO_MATCH = 1, INVALID = 2 } RegExResult_t; static RegExResult_t _FindHasMatch(HWND hwnd, LPEDITFINDREPLACE lpefr, DocPos iStartPos, bool bMarkAll) { - DocPos const slen = strlen(lpefr->szFind); + char szFind[FNDRPL_BUFFER] = { '\0' }; + DocPos const slen = _EditGetFindStrg(hwnd, lpefr, szFind, COUNTOF(szFind), false); + //DocPos const slen = StringCchLenA(lpefr->szFind, COUNTOF(lpefr->szFind)); if (slen == 0) { return NO_MATCH; } @@ -5790,12 +5829,12 @@ static RegExResult_t _FindHasMatch(HWND hwnd, LPEDITFINDREPLACE lpefr, DocPos iS DocPos start = iStart; DocPos end = iTextEnd; - DocPos const iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, false, FRMOD_IGNORE); + DocPos const iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, false, FRMOD_IGNORE); if (bMarkAll) { EditClearAllOccurrenceMarkers(hwnd); if (iPos >= 0) { - EditMarkAll(lpefr->szFind, (int)(lpefr->fuFlags), 0, iTextEnd, false); + EditMarkAll(szFind, (int)(lpefr->fuFlags), 0, iTextEnd, false); if (FocusedView.HideNonMatchedLines) { EditFoldMarkedLineRange(lpefr->hwnd, true); } @@ -6381,7 +6420,7 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd, UINT umsg, WPARAM wPar // if first time you bring up find/replace dialog, // use most recent search pattern to find box // in case of no history: paste clipboard - _EditGetFindStrg(Globals.hwndEdit, s_pEfrDataDlg, lpszSelection, SizeOfMem(lpszSelection)); + _EditGetFindStrg(Globals.hwndEdit, s_pEfrDataDlg, lpszSelection, SizeOfMem(lpszSelection), true); } } if (lpszSelection) { @@ -6396,20 +6435,15 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd, UINT umsg, WPARAM wPar } // Globals.bFindReplCopySelOrClip // ------------------------ - if (!bFndPatternChanged) { - break; // return - } _SetSearchFlags(hwnd, s_pEfrDataDlg); SetFindPatternMB(s_pEfrDataDlg->szFind); + EditClearAllOccurrenceMarkers(s_pEfrDataDlg->hwnd); - if (s_pEfrDataDlg->bWildcardSearch) { - _EscapeWildcards(s_pEfrDataDlg->szFind, COUNTOF(s_pEfrDataDlg->szFind), s_pEfrDataDlg); - } - bool const bIsRegex = (s_pEfrDataDlg->fuFlags & SCFIND_REGEXP); - if (s_pEfrDataDlg->bTransformBS || bIsRegex) { - TransformBackslashes(s_pEfrDataDlg->szFind, bIsRegex, Encoding_SciCP, NULL); + if (!(bFndPatternChanged || s_pEfrDataDlg->bStateChanged)) { + break; // return } + // ------------------------ if (_EnableFRDlgCtrls(hwnd)) { @@ -6418,8 +6452,10 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd, UINT umsg, WPARAM wPar DocPos start = s_InitialSearchStart; DocPos end = Sci_GetDocEndPosition(); - DocPos const slen = StringCchLenA(s_pEfrDataDlg->szFind, COUNTOF(s_pEfrDataDlg->szFind)); - DocPos const iPos = _FindInTarget(s_pEfrDataDlg->szFind, slen, (int)(s_pEfrDataDlg->fuFlags), &start, &end, false, FRMOD_NORM); + + char szFind[FNDRPL_BUFFER] = { '\0' }; + DocPos const slen = _EditGetFindStrg(s_pEfrDataDlg->hwnd, s_pEfrDataDlg, szFind, COUNTOF(szFind), false); + DocPos const iPos = _FindInTarget(szFind, slen, (int)(s_pEfrDataDlg->fuFlags), &start, &end, false, FRMOD_NORM); if (iPos >= 0) { if (s_bIsReplaceDlg) { @@ -6874,15 +6910,14 @@ bool EditFindNext(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo SetFocus(hwnd); } - DocPos const slen = strlen(lpefr->szFind); + char szFind[FNDRPL_BUFFER]; + DocPos const slen = _EditGetFindStrg(hwnd, lpefr, szFind, COUNTOF(szFind), false); if (slen <= 0LL) { return false; } int const sFlags = (int)(lpefr->fuFlags); DocPos const iDocEndPos = Sci_GetDocEndPosition(); - //DocPos const iSelStartPos = SciCall_GetSelectionStart(); - //DocPos const iSelEndPos = SciCall_GetSelectionEnd(); EditSetCaretToSelectionEnd(); // fluent swittch between Prev/Next DocPos start = SciCall_GetCurrentPos(); @@ -6890,7 +6925,7 @@ bool EditFindNext(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo SciCall_CallTipCancel(); - DocPos iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, true, FRMOD_NORM); + DocPos iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, true, FRMOD_NORM); if ((iPos < -1LL) && (lpefr->fuFlags & SCFIND_REGEXP)) { InfoBoxLng(MB_ICONWARNING, L"MsgInvalidRegex", IDS_MUI_REGEX_INVALID); @@ -6902,7 +6937,7 @@ bool EditFindNext(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo //DocPos const _end = end; end = min_p(start, iDocEndPos); start = 0LL; - iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, false, FRMOD_WRAPED); + iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, false, FRMOD_WRAPED); if ((iPos < 0LL) || (end == _start)) { if ((iPos < -1) && (lpefr->fuFlags & SCFIND_REGEXP)) { @@ -6958,15 +6993,14 @@ bool EditFindPrev(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo if (bFocusWnd) { SetFocus(hwnd); } - DocPos const slen = strlen(lpefr->szFind); + char szFind[FNDRPL_BUFFER]; + DocPos const slen = _EditGetFindStrg(hwnd, lpefr, szFind, COUNTOF(szFind), false); if (slen <= 0LL) { return false; } int const sFlags = (int)(lpefr->fuFlags); DocPos const iDocEndPos = Sci_GetDocEndPosition(); - //DocPos const iSelStartPos = SciCall_GetSelectionStart(); - //DocPos const iSelEndPos = SciCall_GetSelectionEnd(); EditSetCaretToSelectionStart(); // fluent switch between Next/Prev DocPos start = SciCall_GetCurrentPos(); @@ -6974,7 +7008,7 @@ bool EditFindPrev(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo SciCall_CallTipCancel(); - DocPos iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, true, FRMOD_NORM); + DocPos iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, true, FRMOD_NORM); if ((iPos < -1LL) && (sFlags & SCFIND_REGEXP)) { InfoBoxLng(MB_ICONWARNING, L"MsgInvalidRegex", IDS_MUI_REGEX_INVALID); @@ -6986,7 +7020,7 @@ bool EditFindPrev(HWND hwnd, LPEDITFINDREPLACE lpefr, bool bExtendSelection, boo //DocPos const _end = end; end = max_p(start, 0LL); start = iDocEndPos; - iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, false, FRMOD_WRAPED); + iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, false, FRMOD_WRAPED); if ((iPos < 0LL) || (start == _start)) { if ((iPos < -1LL) && (sFlags & SCFIND_REGEXP)) { @@ -7091,7 +7125,7 @@ void EditSelectionMultiSelectAll() // // EditSelectionMultiSelectAllEx() // -void EditSelectionMultiSelectAllEx(CLPCEDITFINDREPLACE edFndRpl) +void EditSelectionMultiSelectAllEx(HWND hwnd, CLPCEDITFINDREPLACE edFndRpl) { EDITFINDREPLACE efr; CopyMemory(&efr, edFndRpl, sizeof(EDITFINDREPLACE)); @@ -7102,34 +7136,13 @@ void EditSelectionMultiSelectAllEx(CLPCEDITFINDREPLACE edFndRpl) efr.fuFlags = GetMarkAllOccSearchFlags(); } - DocChangeTransactionBegin(); - EditMarkAll(efr.szFind, efr.fuFlags, 0, Sci_GetDocEndPosition(), true); - EndDocChangeTransaction(); -} - - -//============================================================================= -// -// _GetReplaceString() -// -static char* _GetReplaceString(HWND hwnd, CLPCEDITFINDREPLACE lpefr, int* iReplaceMsg) -{ - char* pszReplace = NULL; // replace text of arbitrary size - if (StringCchCompareNIA(lpefr->szReplace, COUNTOF(lpefr->szReplace), "^c", 2) == 0) { - *iReplaceMsg = SCI_REPLACETARGET; - pszReplace = EditGetClipboardText(hwnd, true, NULL, NULL); - } else { - size_t const cch = StringCchLenA(lpefr->szReplace, COUNTOF(lpefr->szReplace)); - pszReplace = (char*)AllocMem(cch + 1, HEAP_ZERO_MEMORY); - if (pszReplace) { - StringCchCopyA(pszReplace, SizeOfMem(pszReplace), lpefr->szReplace); - bool const bIsRegEx = (lpefr->fuFlags & SCFIND_REGEXP); - if (lpefr->bTransformBS || bIsRegEx) { - TransformBackslashes(pszReplace, bIsRegEx, Encoding_SciCP, iReplaceMsg); - } - } + char szFind[FNDRPL_BUFFER] = { '\0' }; + DocPos const slen = _EditGetFindStrg(hwnd, &efr, szFind, COUNTOF(szFind), false); + if (slen > 0) { + DocChangeTransactionBegin(); + EditMarkAll(szFind, efr.fuFlags, 0, Sci_GetDocEndPosition(), true); + EndDocChangeTransaction(); } - return pszReplace; // move ownership } @@ -7153,9 +7166,10 @@ bool EditReplace(HWND hwnd, LPEDITFINDREPLACE lpefr) DocPos _start = start; Globals.iReplacedOccurrences = 0; - DocPos const slen = strlen(lpefr->szFind); - int const sFlags = (int)(lpefr->fuFlags); - DocPos const iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, false, FRMOD_NORM); + char szFind[FNDRPL_BUFFER]; + DocPos const slen = _EditGetFindStrg(hwnd, lpefr, szFind, COUNTOF(szFind), false); + int const sFlags = (int)(lpefr->fuFlags); + DocPos const iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, false, FRMOD_NORM); // w/o selection, replacement string is put into current position // but this maybe not intended here @@ -7206,13 +7220,14 @@ int EditReplaceAllInRange(HWND hwnd, LPEDITFINDREPLACE lpefr, DocPos iStartPos, } DocPos const iOrigEndPos = iEndPos; // remember - DocPos const slen = strlen(lpefr->szFind); + char szFind[FNDRPL_BUFFER]; + DocPos const slen = _EditGetFindStrg(hwnd, lpefr, szFind, COUNTOF(szFind), false); if (slen <= 0) { return FALSE; } int const sFlags = (int)(lpefr->fuFlags); bool const bIsRegExpr = (sFlags & SCFIND_REGEXP); - bool const bRegexStartOfLine = bIsRegExpr && (lpefr->szFind[0] == '^'); + bool const bRegexStartOfLine = bIsRegExpr && (szFind[0] == '^'); // SCI_REPLACETARGET or SCI_REPLACETARGETRE int iReplaceMsg = SCI_REPLACETARGET; @@ -7226,7 +7241,7 @@ int EditReplaceAllInRange(HWND hwnd, LPEDITFINDREPLACE lpefr, DocPos iStartPos, DocPos start = iStartPos; DocPos end = iEndPos; - DocPos iPos = _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, false, FRMOD_NORM); + DocPos iPos = _FindInTarget(szFind, slen, sFlags, &start, &end, false, FRMOD_NORM); if ((iPos < -1LL) && bIsRegExpr) { InfoBoxLng(MB_ICONWARNING, L"MsgInvalidRegex", IDS_MUI_REGEX_INVALID); @@ -7248,7 +7263,7 @@ int EditReplaceAllInRange(HWND hwnd, LPEDITFINDREPLACE lpefr, DocPos iStartPos, iEndPos += replLen - (end - iPos); start = iStartPos; end = iEndPos; - iPos = (start <= end) ? _FindInTarget(lpefr->szFind, slen, sFlags, &start, &end, true, FRMOD_NORM) : -1LL; + iPos = (start <= end) ? _FindInTarget(szFind, slen, sFlags, &start, &end, true, FRMOD_NORM) : -1LL; } EndUndoTransAction(); diff --git a/src/Edit.h b/src/Edit.h index b9ee90db6..bd43f9c97 100644 --- a/src/Edit.h +++ b/src/Edit.h @@ -136,7 +136,7 @@ void EditFoldMarkedLineRange(HWND hwnd, bool bHideLines); void EditBookMarkLineRange(HWND hwnd); void EditDeleteMarkerInSelection(); void EditSelectionMultiSelectAll(); -void EditSelectionMultiSelectAllEx(CLPCEDITFINDREPLACE edFndRpl); +void EditSelectionMultiSelectAllEx(HWND hwnd, CLPCEDITFINDREPLACE edFndRpl); // // Folding Functions diff --git a/src/Notepad3.c b/src/Notepad3.c index 234baa097..f2b0fe54a 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -4674,7 +4674,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam) EditSelectionMultiSelectAll(); } else { SetFindReplaceData(); // s_FindReplaceData - EditSelectionMultiSelectAllEx(&s_FindReplaceData); + EditSelectionMultiSelectAllEx(Globals.hwndEdit, &s_FindReplaceData); } } } diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj index 5273070a7..283700157 100644 --- a/src/Notepad3.vcxproj +++ b/src/Notepad3.vcxproj @@ -111,37 +111,37 @@ true - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ true - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ true - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ true - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ true - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ true - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\$(ProjectName)\ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ @@ -173,11 +173,11 @@ false - ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) + ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) DebugFull Windows MachineX86 - $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + $(OutputPath)obj;%(AdditionalLibraryDirectories) Default true @@ -247,11 +247,11 @@ false - ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) + ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) DebugFull Windows MachineX64 - $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + $(OutputPath)obj;%(AdditionalLibraryDirectories) Default true @@ -324,14 +324,14 @@ false - ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) + ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) false .rdata=.text true true Windows MachineX86 - $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + $(OutputPath)obj;%(AdditionalLibraryDirectories) UseLinkTimeCodeGeneration true @@ -404,14 +404,14 @@ false - ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) + ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) true .rdata=.text true true Windows MachineX86 - $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + $(OutputPath)obj;%(AdditionalLibraryDirectories) UseLinkTimeCodeGeneration @@ -486,14 +486,14 @@ false - ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) + ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) false .rdata=.text true true Windows MachineX64 - $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + $(OutputPath)obj;%(AdditionalLibraryDirectories) UseLinkTimeCodeGeneration true @@ -565,14 +565,14 @@ false - ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;%(AdditionalDependencies) + ntdll.lib;comctl32.lib;imm32.lib;shlwapi.lib;muiload.lib;scintilla.lib;lexilla.lib;user32-stub.lib;uxtheme-stub.lib;%(AdditionalDependencies) true .rdata=.text true true Windows MachineX64 - $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + $(OutputPath)obj;%(AdditionalLibraryDirectories) UseLinkTimeCodeGeneration @@ -901,16 +901,6 @@ - - - {1f757558-0e57-4de5-82d6-a14e9d81f05f} - true - - - {0873b090-7ffd-4abd-9b42-619a06c5041f} - true - -