Don't search PATH when activating previous instance.

zufuliu · Jan 14, 2019 · 2b42c80 · 2b42c80
1 parent 6edb85a
commit 2b42c80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/metapath/src/metapath.c b/metapath/src/metapath.c
@@ -3238,23 +3238,12 @@ BOOL ActivatePrevInst(void) {
 			SetForegroundWindow(hwnd);
 
 			if (lpPathArg) {
-				// Search working directory from second instance, first!
-				// lpPathArg is at least MAX_PATH+2 bytes
-				WCHAR tchTmp[MAX_PATH];
-
 				ExpandEnvironmentStringsEx(lpPathArg, (DWORD)(GlobalSize(lpPathArg) / sizeof(WCHAR)));
 
 				if (PathIsRelative(lpPathArg)) {
+					WCHAR tchTmp[MAX_PATH];
 					GetCurrentDirectory(COUNTOF(tchTmp), tchTmp);
 					PathAppend(tchTmp, lpPathArg);
-					if (PathFileExists(tchTmp)) {
-						lstrcpy(lpPathArg, tchTmp);
-					} else {
-						if (SearchPath(NULL, lpPathArg, NULL, COUNTOF(tchTmp), tchTmp, NULL)) {
-							lstrcpy(lpPathArg, tchTmp);
-						}
-					}
-				} else if (SearchPath(NULL, lpPathArg, NULL, COUNTOF(tchTmp), tchTmp, NULL)) {
 					lstrcpy(lpPathArg, tchTmp);
 				}
 

diff --git a/src/Notepad2.c b/src/Notepad2.c
@@ -7307,18 +7307,13 @@ BOOL ActivatePrevInst(void) {
 	}
 
 	if (flagSingleFileInstance && lpFileArg) {
-		// Search working directory from second instance, first!
-		// lpFileArg is at least MAX_PATH+2 bytes
-		WCHAR tchTmp[MAX_PATH];
-
 		ExpandEnvironmentStringsEx(lpFileArg, (DWORD)(NP2HeapSize(lpFileArg) / sizeof(WCHAR)));
 
 		if (PathIsRelative(lpFileArg)) {
+			WCHAR tchTmp[MAX_PATH];
 			lstrcpyn(tchTmp, g_wchWorkingDirectory, COUNTOF(tchTmp));
 			PathAppend(tchTmp, lpFileArg);
 			lstrcpy(lpFileArg, tchTmp);
-		} else if (SearchPath(NULL, lpFileArg, NULL, COUNTOF(tchTmp), tchTmp, NULL)) {
-			lstrcpy(lpFileArg, tchTmp);
 		}
 
 		GetLongPathNameEx(lpFileArg, MAX_PATH);
@@ -7413,23 +7408,12 @@ BOOL ActivatePrevInst(void) {
 			SetForegroundWindow(hwnd);
 
 			if (lpFileArg) {
-				// Search working directory from second instance, first!
-				// lpFileArg is at least MAX_PATH+2 bytes
-				WCHAR tchTmp[MAX_PATH];
-
 				ExpandEnvironmentStringsEx(lpFileArg, (DWORD)(NP2HeapSize(lpFileArg) / sizeof(WCHAR)));
 
 				if (PathIsRelative(lpFileArg)) {
+					WCHAR tchTmp[MAX_PATH];
 					lstrcpyn(tchTmp, g_wchWorkingDirectory, COUNTOF(tchTmp));
 					PathAppend(tchTmp, lpFileArg);
-					if (PathFileExists(tchTmp)) {
-						lstrcpy(lpFileArg, tchTmp);
-					} else {
-						if (SearchPath(NULL, lpFileArg, NULL, COUNTOF(tchTmp), tchTmp, NULL)) {
-							lstrcpy(lpFileArg, tchTmp);
-						}
-					}
-				} else if (SearchPath(NULL, lpFileArg, NULL, COUNTOF(tchTmp), tchTmp, NULL)) {
 					lstrcpy(lpFileArg, tchTmp);
 				}