tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-31 01:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in x86 build

Browse Source 
Use the constant instead of the magic number.
This commit is contained in:
Don Ho 2022-01-22 02:05:40 +01:00
parent 7ce1fd71fa
commit 66789aba2e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PowerEditor/src/ScintillaComponent/Buffer.cpp
View File

@ -647,14 +647,14 @@ BufferID FileManager::loadFile(const TCHAR * filename, Document doc, int encodin
if (!fp) if (!fp)
return BUFFER_INVALID; return BUFFER_INVALID;
_fseeki64(fp, 0, SEEK_END); _fseeki64(fp, 0, SEEK_END);
size_t fileSize = _ftelli64(fp); int64_t fileSize = _ftelli64(fp);
fclose(fp); fclose(fp);
bool ownDoc = false; bool ownDoc = false;
if (!doc) if (!doc)
{ {
// If file exceeds 200MB, activate large file mode // If file exceeds 200MB, activate large file mode
doc = (Document)_pscratchTilla->execute(SCI_CREATEDOCUMENT, 0, fileSize < (200 * 1024 * 1024) ? 0 : SC_DOCUMENTOPTION_STYLES_NONE | SC_DOCUMENTOPTION_TEXT_LARGE); doc = (Document)_pscratchTilla->execute(SCI_CREATEDOCUMENT, 0, fileSize < NPP_STYLING_FILESIZE_LIMIT ? 0 : SC_DOCUMENTOPTION_STYLES_NONE | SC_DOCUMENTOPTION_TEXT_LARGE);
ownDoc = true; ownDoc = true;
} }
@ -751,7 +751,7 @@ bool FileManager::reloadBuffer(BufferID id)
if (!fp) if (!fp)
return false; return false;
_fseeki64(fp, 0, SEEK_END); _fseeki64(fp, 0, SEEK_END);
size_t fileSize = _ftelli64(fp); int64_t fileSize = _ftelli64(fp);
fclose(fp); fclose(fp);
bool res = loadFileData(doc, fileSize, buf->getFullPathName(), data, &UnicodeConvertor, loadedFileFormat); bool res = loadFileData(doc, fileSize, buf->getFullPathName(), data, &UnicodeConvertor, loadedFileFormat);
@ -1352,14 +1352,14 @@ LangType FileManager::detectLanguageFromTextBegining(const unsigned char *data,
return L_TEXT; return L_TEXT;
} }
bool FileManager::loadFileData(Document doc, size_t fileSize, const TCHAR * filename, char* data, Utf8_16_Read * unicodeConvertor, LoadedFileFormat& fileFormat) bool FileManager::loadFileData(Document doc, int64_t fileSize, const TCHAR * filename, char* data, Utf8_16_Read * unicodeConvertor, LoadedFileFormat& fileFormat)
{ {
FILE *fp = generic_fopen(filename, TEXT("rb")); FILE *fp = generic_fopen(filename, TEXT("rb"));
if (!fp) if (!fp)
return false; return false;
// size/6 is the normal room Scintilla keeps for editing, but here we limit it to 1MiB when loading (maybe we want to load big files without editing them too much) // size/6 is the normal room Scintilla keeps for editing, but here we limit it to 1MiB when loading (maybe we want to load big files without editing them too much)
size_t bufferSizeRequested = fileSize +min(1 << 20, fileSize / 6); int64_t bufferSizeRequested = fileSize +min(1 << 20, fileSize / 6);
NppParameters& nppParam = NppParameters::getInstance(); NppParameters& nppParam = NppParameters::getInstance();
NativeLangSpeaker* pNativeSpeaker = nppParam.getNativeLangSpeaker(); NativeLangSpeaker* pNativeSpeaker = nppParam.getNativeLangSpeaker();

3
PowerEditor/src/ScintillaComponent/Buffer.h
View File

@ -24,6 +24,7 @@ class Notepad_plus;
class Buffer; class Buffer;
typedef Buffer* BufferID; //each buffer has unique ID by which it can be retrieved typedef Buffer* BufferID; //each buffer has unique ID by which it can be retrieved
#define BUFFER_INVALID reinterpret_cast<BufferID>(0) #define BUFFER_INVALID reinterpret_cast<BufferID>(0)
#define NPP_STYLING_FILESIZE_LIMIT (200 * 1024 * 1024) // 200MB+ file won't be styled
typedef sptr_t Document; typedef sptr_t Document;
@ -124,7 +125,7 @@ private:
FileManager& operator=(FileManager&&) = delete; FileManager& operator=(FileManager&&) = delete;
int detectCodepage(char* buf, size_t len); int detectCodepage(char* buf, size_t len);
bool loadFileData(Document doc, size_t fileSize, const TCHAR* filename, char* buffer, Utf8_16_Read* UnicodeConvertor, LoadedFileFormat& fileFormat); bool loadFileData(Document doc, int64_t fileSize, const TCHAR* filename, char* buffer, Utf8_16_Read* UnicodeConvertor, LoadedFileFormat& fileFormat);
LangType detectLanguageFromTextBegining(const unsigned char *data, size_t dataLen); LangType detectLanguageFromTextBegining(const unsigned char *data, size_t dataLen);