Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions Notepad3.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{D32CB1
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grepWinNP3", "grepWinNP3\grepWinNP3.vcxproj", "{0049F8CF-1BEC-4E6E-B457-0187A33AD522}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}"
ProjectSection(ProjectDependencies) = postProject
{07C218D7-D510-4D63-95E8-F661F62ED418} = {07C218D7-D510-4D63-95E8-F661F62ED418}
Expand Down Expand Up @@ -289,8 +287,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_ja_jp", "language\np3_j
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "grepWinNP3", "grepWinNP3", "{0E679756-ECA4-4CAC-8799-1D2B9A294B3A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_pt_pt", "language\np3_pt_pt\np3_pt_pt.vcxproj", "{B7C9135A-C4AA-4A85-B361-B610B442B57C}"
ProjectSection(ProjectDependencies) = postProject
{9DC82B0D-2484-4925-92AD-1237C64CCB78} = {9DC82B0D-2484-4925-92AD-1237C64CCB78}
Expand Down Expand Up @@ -385,25 +381,6 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|ARM.ActiveCfg = Debug|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|ARM64.ActiveCfg = Debug|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|Win32.ActiveCfg = Debug|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|Win32.Build.0 = Debug|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|x64.ActiveCfg = Debug|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Debug|x64.Build.0 = Debug|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|ARM.ActiveCfg = Release_AVX2|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|ARM.Build.0 = Release_AVX2|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|ARM64.ActiveCfg = Release_AVX2|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|Win32.ActiveCfg = Release_AVX2|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|Win32.Build.0 = Release_AVX2|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|x64.ActiveCfg = Release_AVX2|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release_AVX2|x64.Build.0 = Release_AVX2|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|ARM.ActiveCfg = Release|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|ARM64.ActiveCfg = Release|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|Win32.ActiveCfg = Release|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|Win32.Build.0 = Release|Win32
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|x64.ActiveCfg = Release|x64
{0049F8CF-1BEC-4E6E-B457-0187A33AD522}.Release|x64.Build.0 = Release|x64
{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|ARM.ActiveCfg = Debug|Win32
{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|ARM64.ActiveCfg = Debug|Win32
{BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -1658,7 +1635,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0049F8CF-1BEC-4E6E-B457-0187A33AD522} = {0E679756-ECA4-4CAC-8799-1D2B9A294B3A}
{BAAD32AB-CD47-12FD-873C-0BBC204B7641} = {C3735E17-6EAE-4CC5-980E-30BCEF094862}
{781B17E7-427F-488F-A8E9-360BA38A10F3} = {D21C1F85-6FA3-4695-82CD-DDC5690E2D66}
{146D0122-33C6-4C1B-9E7A-178DEC80842E} = {8C28F8E6-5B4E-4233-B5C7-5A903596AEB2}
Expand Down
4 changes: 3 additions & 1 deletion minipath/src/Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,9 @@ int CheckIniFile(LPWSTR lpszFile, LPCWSTR lpszModule)
if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_RoamingAppData, 0, nullptr, &pszPath))) {
StringCchCopy(tchBuild, COUNTOF(tchBuild), pszPath);
CoTaskMemFree(pszPath);
if (SUCCEEDED(PathCchAppend(tchBuild, COUNTOF(tchBuild), tchFileExpanded))) {
if (SUCCEEDED(PathCchAppend(tchBuild, COUNTOF(tchBuild), L"Rizonesoft")) &&
SUCCEEDED(PathCchAppend(tchBuild, COUNTOF(tchBuild), L"Notepad3")) &&
SUCCEEDED(PathCchAppend(tchBuild, COUNTOF(tchBuild), tchFileExpanded))) {
if (PathIsExistingFile(tchBuild)) {
StringCchCopy(lpszFile, MAX_PATH, tchBuild);
return 1;
Expand Down
6 changes: 4 additions & 2 deletions src/Config/Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,8 @@ static bool _CheckAndSetIniFile(HPATHL hpth_in_out)
// Application Data (%APPDATA%)
HPATHL happdata = Path_Allocate(NULL);
if (Path_GetKnownFolder(FOLDERID_RoamingAppData, happdata)) {
Path_Append(happdata, L"Rizonesoft");
Path_Append(happdata, L"Notepad3");
Path_Append(happdata, wchMore);
result = Path_IsExistingFile(happdata);
if (result) {
Expand Down Expand Up @@ -1614,7 +1616,7 @@ void LoadSettings()
Defaults.EFR_Data.bHideNonMatchedLines = false;
Settings.EFR_Data.bHideNonMatchedLines = IniSectionGetBool(IniSecSettings, L"HideNonMatchedLines", Defaults.EFR_Data.bHideNonMatchedLines);
Defaults.EFR_Data.fuFlags = 0;
Settings.EFR_Data.fuFlags = (UINT)IniSectionGetInt(IniSecSettings, L"efrData_fuFlags", (int)Defaults.EFR_Data.fuFlags);
Settings.EFR_Data.fuFlags = (UINT)IniSectionGetLong(IniSecSettings, L"efrData_fuFlags", (long)Defaults.EFR_Data.fuFlags);

if (Path_GetKnownFolder(FOLDERID_Desktop, Defaults.OpenWithDir)) {
LPWSTR const wchOpenWithDir = Path_WriteAccessBuf(Settings.OpenWithDir, PATHLONG_MAX_CCH);
Expand Down Expand Up @@ -2096,7 +2098,7 @@ static bool _SaveSettings(bool bForceSaveSettings)
IniSectionDelete(IniSecSettings, L"HideNonMatchedLines", false);
}
if (Settings.EFR_Data.fuFlags != Defaults.EFR_Data.fuFlags) {
IniSectionSetInt(IniSecSettings, L"efrData_fuFlags", Settings.EFR_Data.fuFlags);
IniSectionSetLong(IniSecSettings, L"efrData_fuFlags", Settings.EFR_Data.fuFlags);
} else {
IniSectionDelete(IniSecSettings, L"efrData_fuFlags", false);
}
Expand Down
Loading
Loading