From bc2c337fcef5013407cb415c888b37c77ddd905a Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Fri, 6 Oct 2017 16:38:25 +0200
Subject: [PATCH] +fix bug: in-text encoding (convert encoding)

---
 src/Edit.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Edit.c b/src/Edit.c
index 48611a0a5..5ff61c06a 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -449,7 +449,8 @@ BOOL EditConvertText(HWND hwnd,int encSource,int encDest,BOOL bSetSavePoint)
 
   length = (int)SendMessage(hwnd,SCI_GETLENGTH,0,0);
 
-  if (length == 0) {
+  if (length == 0) 
+  {
     SendMessage(hwnd,SCI_CANCEL,0,0);
     SendMessage(hwnd,SCI_SETUNDOCOLLECTION,0,0);
     UndoRedoSelectionMap(-1,NULL);
@@ -464,26 +465,22 @@ BOOL EditConvertText(HWND hwnd,int encSource,int encDest,BOOL bSetSavePoint)
     if (bSetSavePoint)
       SendMessage(hwnd,SCI_SETSAVEPOINT,0,0);
   }
-
   else {
 
-    UINT cpSrc = Encoding_SciGetCodePage(hwnd); // fixed internal 
-    UINT cpDst = mEncoding[encDest].uCodePage;
-
-    if (cpSrc == cpDst)
-      return(TRUE);
-
-    const int chLen = length * 5 + 2;
+    const int chLen = length * 5 + 1;
     pchText = GlobalAlloc(GPTR,chLen);
 
     tr.lpstrText = pchText;
     SendMessage(hwnd,SCI_GETTEXTRANGE,0,(LPARAM)&tr);
 
-    const int wchLen = length * 3 + 2;
+    const int wchLen = length * 3 + 1;
     pwchText = GlobalAlloc(GPTR,wchLen);
 
-    cbwText = MultiByteToWideChar(cpSrc,0,pchText,length,pwchText,wchLen);
-    cbText = WideCharToMultiByte(cpDst,0,pwchText,cbwText,pchText,chLen,NULL,NULL);
+    // MultiBytes(Sci) -> WideChar(destination) -> Sci(MultiByte)
+    UINT cpSci = Encoding_SciGetCodePage(hwnd); // fixed internal 
+    UINT cpDst = mEncoding[encDest].uCodePage;
+    cbwText = MultiByteToWideChar(cpDst,0,pchText,length,pwchText,wchLen);
+    cbText = WideCharToMultiByte(cpSci,0,pwchText,cbwText,pchText,chLen,NULL,NULL);
 
     SendMessage(hwnd,SCI_CANCEL,0,0);
     SendMessage(hwnd,SCI_SETUNDOCOLLECTION,0,0);