CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Dev_RC_Fixes' into Dev_ONIGURUMA

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-05-29 18:56:50 +02:00
commit 57e408c133
23 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
language/np3_af_za/strings_af_za.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Geassosieerde lêernaam uitbreidings:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

2
language/np3_be_by/menu_be_by.rc
View File

@ -345,7 +345,7 @@ BEGIN
MENUITEM "Ôàêóñàâàíû ïðàãëÿä\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Íàç³ðàííå çà ôà&éëàì", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Ïðàêðó÷âàöü çà ìÿæó àïîøíÿãà ðàäêà", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
MENUITEM "Ïàêàçâàöü &ïàäêàçêó äëÿ ã³ïåðñïàñûëàê", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "Ïàë³öà ïðû&ëàäà¢"
BEGIN

12
language/np3_be_by/strings_be_by.rc
View File

@ -181,8 +181,8 @@ BEGIN
IDS_MUI_EXPORT_FAIL "Ïàìûëêà ýêñïàðòó íàëàäࢠñòûëÿ¢ «%s»."
IDS_MUI_REGEX_INVALID "Ïàìûëêà àïðàöî¢ê³ ðýãóëÿðíàãà âûðàçó. Âûðàç íåñàïðà¢äíû!"
IDS_MUI_DROP_NO_FILE "Íå âûéøëà àòðûìàöü ³ìÿ ôàéëà. \nÊàë³ ïåðàöÿãâàåöå ç 32-á³òíàé ïðàãðàìû,\nïåðàöÿãí³öå íà ïàë³öó ïðûëàäࢠNotepad3."
IDS_MUI_URL_OPEN_FILE "\nAlt + Click to open the file."
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_URL_OPEN_FILE "\nAlt + Click, ęŕá ŕäęđűöü ôŕéë."
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click, ęŕá ŕäęđűöü ńďŕńűëęó ˘ áđŕ˘çĺđű."
END
STRINGTABLE
@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Çâÿçàíûÿ ïàøûðýíí³ ôàéëà¢:"
IDS_MUI_EXAMPLE_TEXT "Ó ²¢³ õóäû æâàâû ÷îðò ó çÿë¸íàé êàì³çýëüöû ïàáåã ïàä'åñö³ ôàðøó ç þøêàé, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Ñóïàäçåííå íóëÿâîé äà¢æûí³"
IDS_MUI_GOTO_LINE "Ðàäîê (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Ñëóïîê (1 - %lli):"
IDS_MUI_GOTO_LINE "Đŕäîę (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Ńëóďîę (1 - %ti):"
END
STRINGTABLE
@ -285,8 +285,8 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Ïàøûðýíí³ ôàéëࢠïàâ³ííû áûöü ïàäçåëåíû ñ³ìâàëàì ;\r\n\
with a backslash (\\), RegEx defines an end-of-filename patterns:\r\n\
\\xyz$; => filenames(basename+ext) with 'xyz' as last chars\r\n\r\n\
ç ŕäâŕđîňíŕé đűńęŕé (\\), RegEx âűçíŕ÷ŕĺ řŕáëîí ęŕí÷ŕňęó łě˙ ôŕéëŕ:\r\n\
\\xyz$; => łě˙ ôŕéëŕ (basename+ext) ç 'xyz' íŕ ęŕíöű.\r\n\r\n\
Ôàðìàò ñòûëþ:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\r\n\

4
language/np3_de_de/strings_de_de.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Zugeordnete Dateitypen:"
IDS_MUI_EXAMPLE_TEXT "Zwölf laxe Typen qualmen verdächtig süße Objekte, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Null-Längen-Fund"
IDS_MUI_GOTO_LINE "Zeile (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Spalte (1 - %lli):"
IDS_MUI_GOTO_LINE "Zeile (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Spalte (1 - %ti):"
END
STRINGTABLE

4
language/np3_en_gb/strings_en_gb.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_en_us/strings_en_us.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_es_es/strings_es_es.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Extensiones de nombre de archivo asociadas:"
IDS_MUI_EXAMPLE_TEXT "El veloz murciélago hindú comía feliz cardillo y kiwi. La cigüeña tocaba el saxofón detrás del palenque de paja, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Corresponde a longitud cero"
IDS_MUI_GOTO_LINE "Línea (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Columna (1 - %lli):"
IDS_MUI_GOTO_LINE "Línea (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Columna (1 - %ti):"
END
STRINGTABLE

4
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Extensions des fichiers associés:"
IDS_MUI_EXAMPLE_TEXT "Voix ambiguë d'un cœur qui au zéphyr préfère les jattes de kiwis, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Correspond à longueur zéro"
IDS_MUI_GOTO_LINE "Ligne (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Colonne (1 - %lli):"
IDS_MUI_GOTO_LINE "Ligne (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Colonne (1 - %ti):"
END
STRINGTABLE

4
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Hozzárendelt kiterjesztések:"
IDS_MUI_EXAMPLE_TEXT "Árvíztűrő tükörfúrógép, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Nulla hosszú egyezés"
IDS_MUI_GOTO_LINE "Sor (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Oszlop (1 - %lli):"
IDS_MUI_GOTO_LINE "Sor (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Oszlop (1 - %ti):"
END
STRINGTABLE

2
language/np3_it_it/menu_it_it.rc
View File

@ -345,7 +345,7 @@ BEGIN
MENUITEM "Visualizzazione focalizzata\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "&Monitoraggio log", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Scorri oltre la fine del file (EOF)", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
MENUITEM "Mostra Tooltip &Hyperlink", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "&Toolbar"
BEGIN

10
language/np3_it_it/strings_it_it.rc
View File

@ -181,8 +181,8 @@ BEGIN
IDS_MUI_EXPORT_FAIL "Errore nell'esportazione degli Stili su ""%s""."
IDS_MUI_REGEX_INVALID "Errore nella valutazione della regular expression. La RegExp non è valida!"
IDS_MUI_DROP_NO_FILE "Nessun nomefile valido.\nSe stai facendo drag-n-drop da una applicazione 32-bit,\nrilascia il file sulla toolbar di Notepad3."
IDS_MUI_URL_OPEN_FILE "\nAlt + Click to open the file."
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_URL_OPEN_FILE "\nAlt + Click per aprire il file."
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click per aprire il link nel browser."
END
STRINGTABLE
@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Estensioni associate:"
IDS_MUI_EXAMPLE_TEXT "Nel Quebec zio John postava: W Eddy Merckx in fuga!, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Riga (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Colonna (1 - %lli):"
IDS_MUI_GOTO_LINE "Riga (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Colonna (1 - %ti):"
END
STRINGTABLE
@ -285,7 +285,7 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Le estensioni devono essere separate con ';'\r\n\
with a backslash (\\), RegEx defines an end-of-filename patterns:\r\n\
un backslash (\\), la RegEx definisce un pattern EOF:\r\n\
\\xyz$; => filenames(basename+ext) with 'xyz' as last chars.\r\n\r\n\
Formato Stile:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\

4
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "関連付けるファイル拡張子:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\nいろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす。\nとても綺麗な夕日、今日もたくさん動いて、ご飯もおいしい。よく眠れそうだ。"
IDS_MUI_ZERO_LEN_MATCH "^ 空文字列に一致"
IDS_MUI_GOTO_LINE "<22>s (1 - %lli):"
IDS_MUI_GOTO_COLUMN "—ñ (1 - %lli):"
IDS_MUI_GOTO_LINE "<22>s (1 - %ti):"
IDS_MUI_GOTO_COLUMN "—ñ (1 - %ti):"
END
STRINGTABLE

4
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "연결된 확장자:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\r\n빠른 갈색 여우가 느린 개를 뛰어 넘었다.\r\n\\ * & ^ % $ # @ ! ~"
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Çà (1 - %lli):"
IDS_MUI_GOTO_COLUMN "¿­ (1 - %lli):"
IDS_MUI_GOTO_LINE "Çà (1 - %ti):"
IDS_MUI_GOTO_COLUMN "¿­ (1 - %ti):"
END
STRINGTABLE

4
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Bijbehorende bestandsextensies:"
IDS_MUI_EXAMPLE_TEXT "Pa's wijze lynx bezag vroom het fikse aquaduct, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Nul-lengte Match"
IDS_MUI_GOTO_LINE "Lijn (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Kolom (1 - %lli):"
IDS_MUI_GOTO_LINE "Lijn (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Kolom (1 - %ti):"
END
STRINGTABLE

4
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

4
language/np3_pt_br/strings_pt_br.rc
View File

@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Associated filename extensions:"
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Zero-Length Match"
IDS_MUI_GOTO_LINE "Line (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Column (1 - %lli):"
IDS_MUI_GOTO_LINE "Line (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Column (1 - %ti):"
END
STRINGTABLE

2
language/np3_ru_ru/menu_ru_ru.rc
View File

@ -345,7 +345,7 @@ BEGIN
MENUITEM "Фокусировка просмотра\tCtrl+Alt+V", IDM_VIEW_TOGGLE_VIEW
MENUITEM "Слежение за фа&йлом", IDM_VIEW_CHASING_DOCTAIL
MENUITEM "Прокрутка за пределы последней строки", IDM_VIEW_SCROLLPASTEOF
MENUITEM "Show &Hyperlink Tooltip", IDM_VIEW_SHOW_HYPLNK_CALLTIP
MENUITEM "Показывать &подсказку для гиперссылок", IDM_VIEW_SHOW_HYPLNK_CALLTIP
END
POPUP "Панель инстр&ументов"
BEGIN

12
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -181,8 +181,8 @@ BEGIN
IDS_MUI_EXPORT_FAIL "Ошибка экспорта настроек стилей в «%s»."
IDS_MUI_REGEX_INVALID "Ошибка обработки регулярного выражения. Выражение недействительно!"
IDS_MUI_DROP_NO_FILE "Не удается получить имя файла. \nЕсли перетаскиваете из 32-битного приложения,\nперетащите на панели инструментов Notepad3."
IDS_MUI_URL_OPEN_FILE "\nAlt + Click to open the file."
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click to open link in browser."
IDS_MUI_URL_OPEN_FILE "\nAlt + Click, чтобы открыть файл."
IDS_MUI_URL_OPEN_BROWSER "\nCtrl + Click, чтобы открыть ссылку в браузере."
END
STRINGTABLE
@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "Связанные расширения файлов:"
IDS_MUI_EXAMPLE_TEXT "Съешь ещё этих мягких французских булок да выпей чаю, 0123456789."
IDS_MUI_ZERO_LEN_MATCH "^ Совпадение нулевой длины"
IDS_MUI_GOTO_LINE "Ñòðîêà (1 - %lli):"
IDS_MUI_GOTO_COLUMN "Êîëîíêà (1 - %lli):"
IDS_MUI_GOTO_LINE "Строка (1 - %ti):"
IDS_MUI_GOTO_COLUMN "Колонка (1 - %ti):"
END
STRINGTABLE
@ -285,8 +285,8 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
Расширения файлов должны быть разделены символом ;\r\n\
with a backslash (\\), RegEx defines an end-of-filename patterns:\r\n\
\\xyz$; => filenames(basename+ext) with 'xyz' as last chars.\r\n\r\n\
с обратной чертой (\\), RegEx определяет шаблон конца имени файла:\r\n\
\\xyz$; => имя файла (basename+ext) с 'xyz' в конце.\r\n\r\n\
Формат стиля:\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\r\n\

12
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -181,8 +181,8 @@ BEGIN
IDS_MUI_EXPORT_FAIL "导出样式设置到文件“%s”时遇到错误。"
IDS_MUI_REGEX_INVALID "正则表达式无效。"
IDS_MUI_DROP_NO_FILE "未能获取文件名。\n\n如果从 32 位应用程序拖放文件，请拖放到 Notepad3 的工具栏上。"
IDS_MUI_URL_OPEN_FILE "\n按住Alt同时点击以打开文件."
IDS_MUI_URL_OPEN_BROWSER "\n按住Ctrl同时点击以在浏览器中打开链接."
IDS_MUI_URL_OPEN_FILE "\n按住 Alt 同时点击以打开文件."
IDS_MUI_URL_OPEN_BROWSER "\n按住 Ctrl 同时点击以在浏览器中打开链接."
END
STRINGTABLE
@ -227,8 +227,8 @@ BEGIN
IDS_MUI_ASSOCIATED_EXT "关联的文件扩展名："
IDS_MUI_EXAMPLE_TEXT "The quick brown fox jumps over the lazy dog, 0123456789.\n中国智造，慧及全球"
IDS_MUI_ZERO_LEN_MATCH "^ 零宽度匹配"
IDS_MUI_GOTO_LINE "行（1 - %lli）："
IDS_MUI_GOTO_COLUMN "列（1 - %lli）："
IDS_MUI_GOTO_LINE "行（1 - %ti）："
IDS_MUI_GOTO_COLUMN "列（1 - %ti）："
END
STRINGTABLE
@ -285,8 +285,8 @@ Notepad3 /v d:\\temp\\Test.txt\r\n\
IDS_MUI_STYLEEDIT_HELP "\
文件扩展名必须以 ; 隔开。\r\n\
with a backslash (\\), RegEx defines an end-of-filename patterns:\r\n\
\\xyz$; => filenames(basename+ext) with 'xyz' as last chars.\r\n\r\n\
使用反斜杠（\\）可定义用于匹配文件名后缀的正则表达式：\r\n\
例如 \\xyz$; 可匹配以 xyz 结尾的文件名（含扩展名）。\r\n\r\n\
样式格式：\r\n\
font:Name; size:[+/-]nn.mm; bold; italic; underline;\r\n\
fore:#ffffff; back:#bbbbbb; eolfilled; indic_gradient\r\n\r\n\

9
src/Edit.c
View File

@ -7064,14 +7064,15 @@ static INT_PTR CALLBACK EditLinenumDlgProc(HWND hwnd,UINT umsg,WPARAM wParam,LPA
DocPos const iCurColumn = SciCall_GetColumn(SciCall_GetCurrentPos()) + 1;
DocPos const iLineEndPos = Sci_GetNetLineLength(iCurLine);
FormatLngStringW(wchLineCaption, COUNTOF(wchLineCaption), IDS_MUI_GOTO_LINE, iMaxLnNum);
FormatLngStringW(wchLineCaption, COUNTOF(wchLineCaption), IDS_MUI_GOTO_LINE,
(int)clampp(iMaxLnNum, 0, INT_MAX));
FormatLngStringW(wchColumnCaption, COUNTOF(wchColumnCaption), IDS_MUI_GOTO_COLUMN,
max_p(iLineEndPos, (DocPos)Globals.fvCurFile.iLongLinesLimit));
(int)clampp(max_p(iLineEndPos, (DocPos)Globals.fvCurFile.iLongLinesLimit), 0, INT_MAX));
SetDlgItemText(hwnd, IDC_LINE_TEXT, wchLineCaption);
SetDlgItemText(hwnd, IDC_COLUMN_TEXT, wchColumnCaption);
SetDlgItemInt(hwnd, IDC_LINENUM, (UINT)iCurLine, false);
SetDlgItemInt(hwnd, IDC_COLNUM, (UINT)iCurColumn, false);
SetDlgItemInt(hwnd, IDC_LINENUM, (int)clampp(iCurLine, 0, INT_MAX), false);
SetDlgItemInt(hwnd, IDC_COLNUM, (int)clampp(iCurColumn, 0, INT_MAX), false);
SendDlgItemMessage(hwnd,IDC_LINENUM,EM_LIMITTEXT,80,0);
SendDlgItemMessage(hwnd,IDC_COLNUM,EM_LIMITTEXT,80,0);
CenterDlgInParent(hwnd);

6
src/Helpers.c
View File

@ -234,9 +234,9 @@ DocPos IniSectionGetPos(LPCWSTR lpCachedIniSection, LPCWSTR lpName, DocPos posDe
int const ich = (int)StringCchLen(lpName,0);
while (*p) {
if ((StrCmpNI(p, lpName, ich) == 0) && (p[ich] == L'=')) {
long long pos = 0;
if (swscanf_s((p + ich + 1), L"%lli", &pos) == 1) {
return (DocPos)pos;
DocPos pos = 0;
if (swscanf_s((p + ich + 1), DOCPOSFMTW, &pos) == 1) {
return pos;
}
return posDefault;
}

10
src/Helpers.h
View File

@ -122,6 +122,10 @@ inline unsigned clampul(unsigned long x, unsigned long lower, unsigned long uppe
return (x < lower) ? lower : ((x > upper) ? upper : x);
}
inline DocPos clampp(DocPos x, DocPos lower, DocPos upper) {
return (x < lower) ? lower : ((x > upper) ? upper : x);
}
// Is the character an octal digit?
inline bool IsDigitA(const CHAR ch) { return ((ch >= '0') && (ch <= '9')); }
inline bool IsDigitW(const WCHAR wch) { return ((wch >= L'0') && (wch <= L'9')); }
@ -190,13 +194,15 @@ inline bool IniSectionGetBool(LPCWSTR lpCachedIniSection, LPCWSTR lpName, bool b
bool IniSectionSetString(LPWSTR lpCachedIniSection,LPCWSTR lpName,LPCWSTR lpString);
inline bool IniSectionSetInt(LPWSTR lpCachedIniSection,LPCWSTR lpName, int i) {
WCHAR tch[32]={L'\0'}; StringCchPrintf(tch,COUNTOF(tch),L"%i",i); return IniSectionSetString(lpCachedIniSection,lpName,tch);
WCHAR tch[32]={L'\0'}; StringCchPrintf(tch,COUNTOF(tch),L"%i",i);
return IniSectionSetString(lpCachedIniSection,lpName,tch);
}
inline bool IniSectionSetBool(LPWSTR lpCachedIniSection, LPCWSTR lpName, bool b) {
return IniSectionSetInt(lpCachedIniSection, lpName, (b ? 1 : 0));
}
inline bool IniSectionSetPos(LPWSTR lpCachedIniSection, LPCWSTR lpName, DocPos pos){
WCHAR tch[64] = { L'\0' }; StringCchPrintf(tch, COUNTOF(tch), L"%td", (long long)pos); return IniSectionSetString(lpCachedIniSection, lpName, tch);
WCHAR tch[64] = { L'\0' }; StringCchPrintf(tch, COUNTOF(tch), DOCPOSFMTW, pos);
return IniSectionSetString(lpCachedIniSection, lpName, tch);
}
// ----------------------------------------------------------------------------

2
src/Notepad3.c
View File

@ -9160,7 +9160,7 @@ static void _UpdateStatusbarDelayed(bool bForceRedraw)
tchLinesSelected[2] = L'\0';
}
else {
StringCchPrintf(tchLinesSelected, COUNTOF(tchLinesSelected), L"%lli", iLinesSelected);
StringCchPrintf(tchLinesSelected, COUNTOF(tchLinesSelected), DOCPOSFMTW, iLinesSelected);
FormatNumberStr(tchLinesSelected, COUNTOF(tchLinesSelected), 0);
}
StringCchPrintf(tchStatusBar[STATUS_SELCTLINES], txtWidth, L"%s%s%s",