Load settings from user's profile folder (home directory) instead of …

…"My Documents" folder, fix commit 63f3bad.
zufuliu · Jan 15, 2019 · 1796663 · 1796663
1 parent cac743c
commit 1796663
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/metapath/src/metapath.c b/metapath/src/metapath.c
@@ -2886,9 +2886,16 @@ int CheckIniFile(LPWSTR lpszFile, LPCWSTR lpszModule) {
 			lstrcpy(lpszFile, tchBuild);
 			return 1;
 		}
-		// Application Data or My Documents
-		if (S_OK == SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, tchBuild)
-			|| S_OK == SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, tchBuild)) {
+		// Application Data
+		if (S_OK == SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, tchBuild)) {
+			PathAppend(tchBuild, tchFileExpanded);
+			if (PathFileExists(tchBuild)) {
+				lstrcpy(lpszFile, tchBuild);
+				return 1;
+			}
+		}
+		// Home
+		if (S_OK == SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, tchBuild)) {
 			PathAppend(tchBuild, tchFileExpanded);
 			if (PathFileExists(tchBuild)) {
 				lstrcpy(lpszFile, tchBuild);

diff --git a/src/Notepad2.c b/src/Notepad2.c
@@ -6380,9 +6380,16 @@ int CheckIniFile(LPWSTR lpszFile, LPCWSTR lpszModule) {
 			lstrcpy(lpszFile, tchBuild);
 			return 1;
 		}
-		// Application Data or My Documents
-		if (S_OK == SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, tchBuild)
-			|| S_OK == SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, tchBuild)) {
+		// Application Data
+		if (S_OK == SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, tchBuild)) {
+			PathAppend(tchBuild, tchFileExpanded);
+			if (PathFileExists(tchBuild)) {
+				lstrcpy(lpszFile, tchBuild);
+				return 1;
+			}
+		}
+		// Home
+		if (S_OK == SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, tchBuild)) {
 			PathAppend(tchBuild, tchFileExpanded);
 			if (PathFileExists(tchBuild)) {
 				lstrcpy(lpszFile, tchBuild);