Fix save file failure for ISO-2022 encoding.

zufuliu · Jun 14, 2019 · 698347e · 698347e
1 parent e9f33d1
commit 698347e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/Edit.c b/src/Edit.c
@@ -716,18 +716,19 @@ BOOL EditSaveFile(HWND hwnd, LPCWSTR pszFile, BOOL bSaveCopy, EditFileIOStatus *
 		} else if (uFlags & NCP_8BIT) {
 			BOOL bCancelDataLoss = FALSE;
 			const UINT uCodePage = mEncoding[iEncoding].uCodePage;
+			const BOOL zeroFlags = IsZeroFlagsCodePage(uCodePage);
 
 			LPWSTR lpDataWide = (LPWSTR)NP2HeapAlloc(cbData * 2 + 16);
 			const int cbDataWide = MultiByteToWideChar(CP_UTF8, 0, lpData, cbData, lpDataWide, (int)(NP2HeapSize(lpDataWide) / sizeof(WCHAR)));
-			// Special cases: 42, 50220, 50221, 50222, 50225, 50227, 50229, 54936 GB18030, 57002-11, 65000, 65001
-			if (uCodePage == CP_UTF7 || uCodePage == 54936) {
+
+			if (zeroFlags) {
 				NP2HeapFree(lpData);
 				lpData = (char *)NP2HeapAlloc(NP2HeapSize(lpDataWide) * 2);
 			} else {
 				ZeroMemory(lpData, NP2HeapSize(lpData));
 			}
 
-			if (uCodePage == CP_UTF7 || uCodePage == 54936) {
+			if (zeroFlags) {
 				cbData = WideCharToMultiByte(uCodePage, 0, lpDataWide, cbDataWide, lpData, (int)NP2HeapSize(lpData), NULL, NULL);
 			} else {
 				cbData = WideCharToMultiByte(uCodePage, WC_NO_BEST_FIT_CHARS, lpDataWide, cbDataWide, lpData, (int)NP2HeapSize(lpData), NULL, &bCancelDataLoss);

diff --git a/src/Edit.h b/src/Edit.h
@@ -283,7 +283,7 @@ void	EditShowCallTips(Sci_Position position);
 #define NCP_UNICODE_REVERSE			16
 #define NCP_UNICODE_BOM				32
 #define NCP_8BIT					64
-#define NCP_INTERNAL				(NCP_DEFAULT|NCP_UTF8|NCP_UTF8_SIGN|NCP_UNICODE|NCP_UNICODE_REVERSE|NCP_UNICODE_BOM)
+#define NCP_INTERNAL				(NCP_DEFAULT | NCP_UTF8 | NCP_UTF8_SIGN | NCP_UNICODE | NCP_UNICODE_REVERSE | NCP_UNICODE_BOM)
 #define NCP_RECODE					128
 #define CPI_NONE					(-1)
 #define CPI_DEFAULT					0
@@ -311,6 +311,22 @@ static inline BOOL IsDBCSCodePage(UINT page) {
 	return page == 932 || page == 936 || page == 949 || page == 950 || page == 1361;
 }
 
+// dwFlags must be 0 for MultiByteToWideChar() and WideCharToMultiByte()
+static inline BOOL IsZeroFlagsCodePage(UINT page) {
+	return page == CP_UTF8
+		|| page == CP_UTF7
+		|| page == 54936	// GB18030
+		|| page == 50220	// ISO-2022-JP
+		|| page == 50221	// CS ISO-2022-JP
+		|| page == 50222	// ISO-2022-JP SO/SI
+		|| page == 50225	// ISO-2022-KR
+		|| page == 50227	// ISO-2022-CN Simplified
+		|| page == 50229	// ISO-2022-CN Traditional
+		//|| (page >= 57002 && page <= 57011) // ISCII
+		//|| page == 42		// Symbol
+		;
+}
+
 // in EditEncoding.c
 extern NP2ENCODING mEncoding[];
 void	Encoding_ReleaseResources(void);