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

Merge branch 'xomx-fix_possible_2GB+_files_loading_Scintilla_exception'

This commit is contained in:
Don Ho 2024-04-09 19:51:45 +02:00
parent 5f93e046ec 318c9a994c
commit ddc080785d
24 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/installer/nativeLang/brazilian_portuguese.xml
View File

@ -1260,7 +1260,7 @@ Translation note:
<Item id="7141" name="Restrição para Arquivos Grandes"/>
<Item id="7143" name="Habilitar Restrição para Arquivos Grandes (sem destaque de sintaxe)"/>
<Item id="7144" name="Definir Tamanho de Arquivos Grandes:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Permitr Chaves Correspondentes"/>
<Item id="7148" name="Permitir Autocompletar"/>
<Item id="7149" name="Permitir Destaque Inteligente"/>

2
PowerEditor/installer/nativeLang/chineseSimplified.xml
View File

@ -1198,7 +1198,7 @@ The comments are here for explanation, it's not necessary to translate them.
<Item id="7141" name="大文件限制"/>
<Item id="7143" name="启用大文件限制（无语法高亮）"/>
<Item id="7144" name="定义大文件大小:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="匹配括号"/>
<Item id="7148" name="自动完成"/>
<Item id="7149" name="智能高亮"/>

2
PowerEditor/installer/nativeLang/croatian.xml
View File

@ -1276,7 +1276,7 @@
<Item id="7141" name="Ograničenja za velike datoteke"/>
<Item id="7143" name="Omogući ograničenja za velike datoteke (bez označavanja sintakse)"/>
<Item id="7144" name="Velike datoteke su veće ili jednake:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Omogući nalaženje pripadajućih zagrada"/>
<Item id="7148" name="Omogući automatsko dopunjavanje"/>
<Item id="7149" name="Omogući pametno označavanje"/>

2
PowerEditor/installer/nativeLang/czech.xml
View File

@ -1315,7 +1315,7 @@
<Item id="7141" name="Omezení funkcí pro velké soubory"/>
<Item id="7143" name="Povolit vypnutí zvýrazňování syntaxe pro velké soubory"/>
<Item id="7144" name="Velký soubor je >= "/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Povolit párování závorek"/>
<Item id="7148" name="Povolit automatické dokončování"/>
<Item id="7149" name="Povolit inteligentní zvýrazňování"/>

2
PowerEditor/installer/nativeLang/danish.xml
View File

@ -1204,7 +1204,7 @@ Brug mellemrum til at angive flere markører."/>
<Item id="7141" name="Begræns store filer"/>
<Item id="7143" name="Aktivér begrænsning (ingen syntaks fremhævning)"/>
<Item id="7144" name="Definér filstørrelse:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Tillad parantesmatch"/>
<Item id="7148" name="Tillad autofuldførelse"/>
<Item id="7149" name="Tillad smart fremhævning"/>

2
PowerEditor/installer/nativeLang/dutch.xml
View File

@ -1256,7 +1256,7 @@ U kunt verschillende kolommarkeringen vastleggen door gebruik te maken van spati
<Item id="7141" name="Beperking grote bestanden"/>
<Item id="7143" name="Beperking grote bestanden inschakelen (geen syntaxismarkering)"/>
<Item id="7144" name="Grootte van groot bestand opgeven:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Overeenkomende haakjes toestaan"/>
<Item id="7148" name="Automatisch aanvullen toestaan"/>
<Item id="7149" name="Slim markeren toestaan"/>

2
PowerEditor/installer/nativeLang/english.xml
View File

@ -1262,7 +1262,7 @@ Translation note:
<Item id="7141" name="Large File Restriction"/>
<Item id="7143" name="Enable Large File Restriction (no syntax highlighting)"/>
<Item id="7144" name="Define Large File Size:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Allow Brace Match"/>
<Item id="7148" name="Allow Auto-Completion"/>
<Item id="7149" name="Allow Smart Highlighting"/>

2
PowerEditor/installer/nativeLang/english_customizable.xml
View File

@ -1261,7 +1261,7 @@ Translation note:
<Item id="7141" name="Large File Restriction"/>
<Item id="7143" name="Enable Large File Restriction (no syntax highlighting)"/>
<Item id="7144" name="Define Large File Size:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Allow Brace Match"/>
<Item id="7148" name="Allow Auto-Completion"/>
<Item id="7149" name="Allow Smart Highlighting"/>

2
PowerEditor/installer/nativeLang/german.xml
View File

@ -1271,7 +1271,7 @@ Translation note:
<Item id="7141" name="Einschränkung für große Dateien"/>
<Item id="7143" name="Aktivieren der Einschränkung für große Dateien (keine Syntaxhervorhebung)"/>
<Item id="7144" name="Große Dateigröße definieren:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Klammerübereinstimmung zulassen"/>
<Item id="7148" name="Auto-Vervollständigung zulassen"/>
<Item id="7149" name="Intelligente Hervorhebung zulassen"/>

2
PowerEditor/installer/nativeLang/hongKongCantonese.xml
View File

@ -1302,7 +1302,7 @@
<Item id="7141" name="大型檔案限制"/><!-- #new v8.4.7 -->
<Item id="7143" name="啟用大型檔案限制（會失去語法突顯功能）"/><!-- #new v8.4.7 -->
<Item id="7144" name="定義大檔案 size："/><!-- #new v8.4.7 -->
<Item id="7146" name="MB (1 - 4096)"/><!-- #new v8.4.7 -->
<Item id="7146" name="MB (1 - 2046)"/><!-- #new v8.4.7 -->
<Item id="7147" name="容許顯示對應括號"/><!-- #new v8.4.7 -->
<Item id="7148" name="容許自動完成功能"/><!-- #new v8.4.7 -->
<Item id="7149" name="容許醒目提示功能"/><!-- #new v8.4.7 -->

2
PowerEditor/installer/nativeLang/italian.xml
View File

@ -1267,7 +1267,7 @@ Translation note:
<Item id="7141" name="Restrizioni per File di grandi dimensioni"/>
<Item id="7143" name="Abilita restrizioni per i file di grandi dimensioni (no evidenziazione sintattica)"/>
<Item id="7144" name="Definizione dei file di grandi dimensioni:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Permetti l&apos;evidenziazione della parentesi corrispondente"/>
<Item id="7148" name="Permetti l&apos;attivazione Auto-Completamento"/>
<Item id="7149" name="Permetti l&apos;attivazione della colorazione automatica"/>

2
PowerEditor/installer/nativeLang/japanese.xml
View File

@ -1270,7 +1270,7 @@ Translation note:
<Item id="7141" name="大きなファイルでの制約"/>
<Item id="7143" name="大きなファイルで制約をかける（強調表示なし）"/>
<Item id="7144" name="ファイルサイズのしきい値："/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="対応する括弧の強調表示を利用する"/>
<Item id="7148" name="自動補完を利用する"/>
<Item id="7149" name="スマート強調表示を利用する"/>

2
PowerEditor/installer/nativeLang/korean.xml
View File

@ -1243,7 +1243,7 @@
<Item id="7141" name="큰 파일 제한"/>
<Item id="7143" name="큰 파일 제한 활성화 (구문 강조 없음)"/>
<Item id="7144" name="큰 파일 크기 정의:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="중괄호 대응표시 허용"/>
<Item id="7148" name="자동완성 허용"/>
<Item id="7149" name="지능적 구문강조 허용"/>

2
PowerEditor/installer/nativeLang/polish.xml
View File

@ -1262,7 +1262,7 @@ Translation note:
<Item id="7141" name="Ograniczenia dla dużych plików"/>
<Item id="7143" name="Włącz ograniczenia dla dużych plików (trwały brak podświetlania składni)"/>
<Item id="7144" name="Zdefiniuj rozmiar dużego pliku:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Zezwól na dopasowanie nawiasów"/>
<Item id="7148" name="Zezwól na autouzupełnianie"/>
<Item id="7149" name="Zezwól na inteligentne podświetlanie"/>

2
PowerEditor/installer/nativeLang/portuguese.xml
View File

@ -1262,7 +1262,7 @@ v <Item id="6352" name="Corresponder a maiúsculas/minúsculas"/>
<Item id="7141" name="Restrição de ficheiros grandes"/>
<Item id="7143" name="Ativar restrição de ficheiros grandes (sem destaque de sintaxe)"/>
<Item id="7144" name="Definir tamanho de ficheiro grande:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Permitir a coloração simétrica do delimitador"/>
<Item id="7148" name="Permitir preenchimento automático"/>
<Item id="7149" name="Permitir destaque inteligente"/>

2
PowerEditor/installer/nativeLang/romanian.xml
View File

@ -1276,7 +1276,7 @@
<Item id="7141" name="Restricția fișierelor mari"/>
<Item id="7143" name="Permiterea restricției fișierelor mari (fără sintaxă evidențiată)"/>
<Item id="7144" name="Definirea mărimii fișierelor mari:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Permite potrivirea acoladelor"/>
<Item id="7148" name="Permite autocompletarea"/>
<Item id="7149" name="Permite evidențierea inteligentă"/>

2
PowerEditor/installer/nativeLang/slovak.xml
View File

@ -1260,7 +1260,7 @@
<Item id="7141" name="Obmedzenie veľkých súborov"/>
<Item id="7143" name="Povoliť obmedzenie veľkých súborov (bez zvýraznenia syntaxe)"/>
<Item id="7144" name="Veľký súbor je:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Povoliť párové zátvorky"/>
<Item id="7148" name="Povoliť automatické dokončovanie"/>
<Item id="7149" name="Povoliť inteligentné zvýrazňovanie"/>

2
PowerEditor/installer/nativeLang/slovenian.xml
View File

@ -1262,7 +1262,7 @@
<Item id="7141" name="Omejitev velikih datotek"/>
<Item id="7143" name="Omogoči omejitev velikih datotek (brez označevanja sintakse)"/>
<Item id="7144" name="Določi velikost velike datoteke:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Dovoli ujemanje oklepajev"/>
<Item id="7148" name="Dovoli samodejno dokončanje"/>
<Item id="7149" name="Dovoli pametno označevanje"/>

2
PowerEditor/installer/nativeLang/swedish.xml
View File

@ -1248,7 +1248,7 @@ Ange flera kolumnmarkörer genom att separera talen med blanksteg."/>
<Item id="7141" name="Begränsning för stora filer"/>
<Item id="7143" name="Aktivera begränsning för stora filer (ingen syntaxmarkering)"/>
<Item id="7144" name="Definiera stor filstorlek:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Tillåt matchande klamrar"/>
<Item id="7148" name="Tillåt automatisk komplettering"/>
<Item id="7149" name="Tillåt smart markering"/>

2
PowerEditor/installer/nativeLang/taiwaneseMandarin.xml
View File

@ -1204,7 +1204,7 @@
<Item id="7141" name="大型檔案限制"/>
<Item id="7143" name="啟動大型檔案限制（沒有語法醒目提示）"/>
<Item id="7144" name="定義大型檔案文件長度大小："/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="允許顏色顯示對應括號"/>
<Item id="7148" name="允許自動完成功能"/>
<Item id="7149" name="允許智慧醒目提示"/>

2
PowerEditor/installer/nativeLang/turkish.xml
View File

@ -1263,7 +1263,7 @@
<Item id="7141" name="Büyük Dosya Kısıtlaması"/>
<Item id="7143" name="Büyük Dosya Kısıtlamasını Etkinleştir (Sözdizim Vurgulamasız)"/>
<Item id="7144" name="Büyük Dosya Boyutunu Belirle:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Ayraç Eşleştirmeye İzin Ver"/>
<Item id="7148" name="Otomatik Tamamlamaya İzin Ver"/>
<Item id="7149" name="Akıllı Vurgulamaya İzin Ver"/>

2
PowerEditor/installer/nativeLang/vietnamese.xml
View File

@ -1160,7 +1160,7 @@ Bạn có thể định nghĩa một vài mốc đánh dấu bằng cách sử d
<Item id="7142" name="Khi mở một tệp lớn, một số tính năng sẽ bị tắt đi để cải thiện hiệu năng. Bạn có thể tuỳ chỉnh chúng ở đây."/>
<Item id="7143" name="Bật giới hạn tệp lớn (không tô sáng cú pháp)"/>
<Item id="7144" name="Định nghĩa kích cỡ tệp lớn:"/>
<Item id="7146" name="MB (1 - 4096)"/>
<Item id="7146" name="MB (1 - 2046)"/>
<Item id="7147" name="Cho phép khớp dấu ngoặc"/>
<Item id="7148" name="Cho phép tự động hoàn thành"/>
<Item id="7149" name="Cho phép tô sáng thông minh"/>

2
PowerEditor/src/WinControls/Preference/preference.rc
View File

@ -559,7 +559,7 @@ BEGIN
CONTROL "Enable Large File Restriction (no syntax highlighting)",IDC_CHECK_PERFORMANCE_ENABLE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,78,41,290,10
RTEXT "Define Large File Size:",IDC_STATIC_PERFORMANCE_FILESIZE,75,59,125,8
EDITTEXT IDC_EDIT_PERFORMANCE_FILESIZE,201,57,24,14,ES_RIGHT | ES_NUMBER
LTEXT "MB (1 - 4096)",IDC_STATIC_PERFORMANCE_MB,228,59,90,8
LTEXT "MB (1 - 2046)",IDC_STATIC_PERFORMANCE_MB,228,59,90,8
CONTROL "Deactivate Word Wrap globally", IDC_CHECK_PERFORMANCE_DEACTIVATEWORDWRAP, "Button", BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP, 127, 80, 200, 10
CONTROL "Allow Auto-Completion",IDC_CHECK_PERFORMANCE_ALLOWAUTOCOMPLETION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,95,200,10
CONTROL "Allow Smart Highlighting",IDC_CHECK_PERFORMANCE_ALLOWSMARTHILITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,110,200,10

8
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -5483,12 +5483,12 @@ intptr_t CALLBACK PerformanceSubDlg::run_dlgProc(UINT message , WPARAM wParam, L
if (lstrcmp(str, TEXT("")) == 0)
return TRUE;
int64_t fileLenInMB = ::GetDlgItemInt(_hSelf, IDC_EDIT_PERFORMANCE_FILESIZE, NULL, FALSE);
if (fileLenInMB > 4096)
constexpr int fileLenInMBMax = (INT32_MAX - 1024 * 1024) / 1024 / 1024; // -1MB ... have to to consider also the bufferSizeRequested algo in FileManager::loadFileData
int64_t fileLenInMB = ::GetDlgItemInt(_hSelf, IDC_EDIT_PERFORMANCE_FILESIZE, NULL, FALSE);
if (fileLenInMB > fileLenInMBMax)
{
fileLenInMB = 4096;
fileLenInMB = fileLenInMBMax;
::SetDlgItemInt(_hSelf, IDC_EDIT_PERFORMANCE_FILESIZE, UINT(fileLenInMB), FALSE);
}