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

+ fix: broken enforce encoding (recode)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-08-14 01:55:54 +02:00
parent ed0fcf9568
commit 0e9f4264ca
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Edit.c
View File

@ -1067,18 +1067,20 @@ bool EditLoadFile(
Globals.CallTipType = CT_ENC_INFO;
#endif
}
}
else {
if (Flags.bDevDebugMode) {
WCHAR wchBuf[128] = { L'\0' };
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"ForcedEncoding='%s'", g_Encodings[iForcedEncoding].wchLabel);
SetAdditionalTitleInfo(wchBuf);
if (bForceEncDetection && !Encoding_IsNONE(iAnalyzedEncoding)) {
iForcedEncoding = iAnalyzedEncoding; // no bIsReliable check (forced unreliable detection)
}
}
if (Flags.bDevDebugMode && IS_ENC_ENFORCED()) {
WCHAR wchBuf[128] = { L'\0' };
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L"ForcedEncoding='%s'", g_Encodings[iForcedEncoding].wchLabel);
SetAdditionalTitleInfo(wchBuf);
}
// ------------------------------------------------------
if (!bForceEncDetection)
if (!IS_ENC_ENFORCED())
{
bool const bIsUnicode = Encoding_IsUTF8(iAnalyzedEncoding) || Encoding_IsUNICODE(iAnalyzedEncoding);
@ -1103,12 +1105,6 @@ bool EditLoadFile(
// --------------------------------------------------------------------------
if (bForceEncDetection && !Encoding_IsNONE(iAnalyzedEncoding))
{
iForcedEncoding = iAnalyzedEncoding; // no bIsReliable check (forced unreliable detection)
}
// --------------------------------------------------------------------------
// --- 3rd Unicode Checks
bool const bIsUnicodeForced = Encoding_IsUNICODE(iForcedEncoding);
@ -1145,7 +1141,7 @@ bool EditLoadFile(
if (cbData == 0) {
FileVars_Init(NULL, 0, &Globals.fvCurFile);
status->iEOLMode = Settings.DefaultEOLMode;
status->iEncoding = IS_ENC_ENFORCED() ? iForcedEncoding : (Settings.LoadASCIIasUTF8 ? CPI_UTF8 : iPreferredEncoding);
status->iEncoding = Settings.LoadASCIIasUTF8 ? CPI_UTF8 : iPreferredEncoding;
EditSetNewText(hwnd, "", 0, bClearUndoHistory);
SciCall_SetEOLMode(Settings.DefaultEOLMode);
FreeMem(lpData);
@ -1211,14 +1207,15 @@ bool EditLoadFile(
cpi_enc_t const iFileVarEncoding = (FileVars_IsValidEncoding(&Globals.fvCurFile) && !Settings.NoEncodingTags) ?
FileVars_GetEncoding(&Globals.fvCurFile) : CPI_NONE;
if (!Encoding_IsNONE(iFileVarEncoding) && !bForceEncDetection) {
if (!IS_ENC_ENFORCED() && !Encoding_IsNONE(iFileVarEncoding)) {
iForcedEncoding = (Globals.fvCurFile.mask & FV_ENCODING) ? iFileVarEncoding : iForcedEncoding;
iPreferredEncoding = IS_ENC_ENFORCED() ? iForcedEncoding : iPreferredEncoding;
}
if (Flags.bDevDebugMode) {
if (!Encoding_IsNONE(iFileVarEncoding) && FileVars_IsValidEncoding(&Globals.fvCurFile)) {
WCHAR wchBuf[128] = { L'\0' };
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L" - FileVarEncoding='%s'",
StringCchPrintf(wchBuf, COUNTOF(wchBuf), L" - FilEncTag='%s'",
g_Encodings[FileVars_GetEncoding(&Globals.fvCurFile)].wchLabel);
AppendAdditionalTitleInfo(wchBuf);
}
@ -1249,11 +1246,9 @@ bool EditLoadFile(
else { // === ALL OTHER ===
// ----------------------------------------------------------------------
status->iEncoding = IS_ENC_ENFORCED() ? iForcedEncoding :
(!Encoding_IsNONE(iPreferredEncoding) ? iPreferredEncoding : CPI_ANSI_DEFAULT);
status->iEncoding = Encoding_IsValid(iPreferredEncoding) ? iPreferredEncoding : CPI_ANSI_DEFAULT;
// ----------------------------------------------------------------------
if (((Encoding_GetCodePage(status->iEncoding) != CP_UTF7) && Encoding_IsEXTERNAL_8BIT(status->iEncoding)) ||
((Encoding_GetCodePage(status->iEncoding) == CP_UTF7) && IsValidUTF7(lpData, cbData))) {
@ -1290,7 +1285,6 @@ bool EditLoadFile(
}
}
else {
status->iEncoding = Encoding_IsValid(iForcedEncoding) ? iForcedEncoding : iPreferredEncoding;
EditSetNewText(hwnd, lpData, cbData, bClearUndoHistory);
EditDetectEOLMode(lpData, cbData, status);
FreeMem(lpData);