Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a regression regarding notepad replacement issue

Browse Source 
Fixed command line parsing logic error.

Root cause:
When you double click a file (where NPP has already replaced original Windows Notepad.exe) command like something like below is generated -

-notepadStyleCmdline -z "C:\WINDOWS\system32\NOTEPAD.EXE" F:\FakePath\PowerEditor\bin\change.log

After processing this command line, final command line is left as " F:\FakePath\PowerEditor\bin\change.log while others are ignored. Notice, quote " here just before the actual file path.

Later on, MS PAI ::PathIsRelative treats it as relative path because of quote " rather considering single file. It is expected too as per input to this API.

Now, notepad++ tries to open all the file from path F:\FakePath\PowerEditor\bin\ (in above case) along with file F:\FakePath\PowerEditor\bin\change.log.

Close #6215, fix #6211
This commit is contained in:
Rajendra Singh 2019-10-13 12:49:22 +05:30 committed by Don HO
parent a739eade8e
commit c16f7bbc1e
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/winmain.cpp
View File

@ -299,8 +299,8 @@ PWSTR advanceCmdLine(PWSTR pCmdLine, const generic_string& string)
}
// Match the substring only if it matched an entire substring
if ( (ignoredString == pCmdLine || iswspace(*(ignoredString-1)) ) && // Check start
(iswspace(*(ignoredString+len)) || *(ignoredString+len) == '\0') )
if ((ignoredString == pCmdLine || iswspace(*(ignoredString - 1))) && // Check start
(iswspace(*(ignoredString + len)) || *(ignoredString + len) == '\0' || *(ignoredString + len) == '"'))
{
ignoredString += len;