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

+ fix: TinyExpr: UTF-8 to ANSI-CP-1252 conversion should yield invalid characters instead of blank or currency

Browse Source
This commit is contained in:
Rainer Kottenhoff 2021-05-11 19:21:34 +02:00
parent 535655ab9c
commit 7102269510
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Notepad3.c
View File

@ -209,7 +209,7 @@ static const int NUMTOOLBITMAPS = 30;
// ----------------------------------------------------------------------------
const char chr_currency[6] = { '$', 0x80, 0xA2, 0xA3, 0xA5, '\0' }; // "$€¢£¥"
const char chr_currency[6] = { '$', 0x80, 0xA2, 0xA3, 0xA5, '\0' }; // "$€¢£¥" CP-1252
// ----------------------------------------------------------------------------
@ -2104,10 +2104,13 @@ static bool _EvalTinyExpr(bool qmark)
DocPos const iLnCaretPos = SciCall_GetCurLine((lineLen - 1), lineBuf);
lineBuf[iLnCaretPos - (posSelStart - posBefore)] = '\0'; // exclude "=?"
char const defchar = (char)0x24;
char const defchar = (char)te_invalid_chr();
MultiByteToWideChar(Encoding_SciCP, 0, lineBuf, -1, lineBufW, lineLen);
WideCharToMultiByte(te_cp(), (WC_COMPOSITECHECK | WC_DISCARDNS), lineBufW, -1, lineBuf, lineLen, &defchar, NULL);
int const len = WideCharToMultiByte(te_cp(), (WC_COMPOSITECHECK | WC_DISCARDNS), lineBufW, -1, lineBuf, lineLen, &defchar, NULL);
FreeMem(lineBufW);
if (!len) {
return false;
}
// canonicalize fetched line
StrDelChrA(lineBuf, chr_currency);

2
src/tinyexpr/tinyexpr.h
View File

@ -108,6 +108,8 @@ void te_free(te_expr *n);
/* ANSI codepage of te operators */
inline unsigned te_cp() { return 1252U; }
inline unsigned te_invalid_chr() { return '#'; }
/* check for operator or special character. */
inline int te_is_op(const char* const expr) {
if (!expr)