tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incoherence about supporting 2GB+ files

This commit is contained in:
Don Ho 2022-02-24 01:48:28 +01:00
parent 11128e5c3e
commit bfbad49cf4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
View File

@ -4061,9 +4061,7 @@ void Finder::add(FoundInfo fi, SearchResultMarking mi, const TCHAR* foundline)
str += _prefixLineStr; str += _prefixLineStr;
str += TEXT(" "); str += TEXT(" ");
TCHAR lnb[16]; str += std::to_wstring(fi._lineNumber);
wsprintf(lnb, TEXT("%d"), static_cast<int>(fi._lineNumber));
str += lnb;
str += TEXT(": "); str += TEXT(": ");
mi._start += str.length(); mi._start += str.length();
mi._end += str.length(); mi._end += str.length();

6
PowerEditor/src/WinControls/StaticDialog/RunDlg/RunDlg.cpp
View File

@ -21,6 +21,7 @@
#include "shortcut.h" #include "shortcut.h"
#include "Parameters.h" #include "Parameters.h"
#include "Notepad_plus.h" #include "Notepad_plus.h"
#include <strsafe.h>
void Command::extractArgs(TCHAR* cmd2Exec, size_t cmd2ExecLen, TCHAR* args, size_t argsLen, const TCHAR* cmdEntier) void Command::extractArgs(TCHAR* cmd2Exec, size_t cmd2ExecLen, TCHAR* args, size_t argsLen, const TCHAR* cmdEntier)
@ -145,8 +146,9 @@ void expandNppEnvironmentStrs(const TCHAR *strSrc, TCHAR *stringDest, size_t str
TCHAR expandedStr[CURRENTWORD_MAXLENGTH] = { '\0' }; TCHAR expandedStr[CURRENTWORD_MAXLENGTH] = { '\0' };
if (internalVar == CURRENT_LINE || internalVar == CURRENT_COLUMN) if (internalVar == CURRENT_LINE || internalVar == CURRENT_COLUMN)
{ {
int lineNumber = static_cast<int>(::SendMessage(hWnd, RUNCOMMAND_USER + internalVar, 0, 0)); size_t lineNumber = ::SendMessage(hWnd, RUNCOMMAND_USER + internalVar, 0, 0);
wsprintf(expandedStr, TEXT("%d"), lineNumber); std::wstring lineNumStr = std::to_wstring(lineNumber);
StringCchCopyW(expandedStr, CURRENTWORD_MAXLENGTH, lineNumStr.c_str());
} }
else else
::SendMessage(hWnd, RUNCOMMAND_USER + internalVar, CURRENTWORD_MAXLENGTH, reinterpret_cast<LPARAM>(expandedStr)); ::SendMessage(hWnd, RUNCOMMAND_USER + internalVar, CURRENTWORD_MAXLENGTH, reinterpret_cast<LPARAM>(expandedStr));