Fixed display of UTF-8 characters. Release 1.21

Author: kapilratnani

NppJSONViewer/JSONDialog.cpp

@@ -59,7 +59,7 @@ HTREEITEM JSONDialog::insertToTree(HWND hWndDlg,HTREEITEM parent,char *text)
 	int len = strlen(text) + 1;
 	wchar_t *w_msg = new wchar_t[len];
 	memset(w_msg, 0, len);
-	MultiByteToWideChar(CP_ACP, NULL, text, -1, w_msg, len);
+	MultiByteToWideChar(CP_UTF8, NULL, text, -1, w_msg, len);
 
 	tvinsert.item.pszText=w_msg;
 	HTREEITEM item=(HTREEITEM)SendDlgItemMessage(hWndDlg,IDC_TREE1,TVM_INSERTITEM,0,(LPARAM)&tvinsert);
@@ -102,7 +102,7 @@ void JSONDialog::populateTree (HWND hWndDlg, HTREEITEM tree_root, json_t * json_
 				len = strlen(txt) + 1;
 				wchar_t *w_txt = new wchar_t[len];
 				memset(w_txt, 0, len);
-				MultiByteToWideChar(CP_ACP, NULL, txt, -1, w_txt, len);
+				MultiByteToWideChar(CP_UTF8, NULL, txt, -1, w_txt, len);
 
 				t.pszText=w_txt;
 				t.mask=TVIF_TEXT;
@@ -137,7 +137,7 @@ void JSONDialog::populateTree (HWND hWndDlg, HTREEITEM tree_root, json_t * json_
 				len = strlen(txt) + 1;
 				wchar_t *w_txt = new wchar_t[len];
 				memset(w_txt, 0, len);
-				MultiByteToWideChar(CP_ACP, NULL, txt, -1, w_txt, len);
+				MultiByteToWideChar(CP_UTF8, NULL, txt, -1, w_txt, len);
 
 				t.pszText=w_txt;
 				t.mask=TVIF_TEXT;

NppJSONViewer/resource.rc

@@ -25,7 +25,7 @@ FONT 8, "Ms Shell Dlg"
     LTEXT           "Author:", IDC_STATIC, 27, 21, 24, 8, SS_LEFT
     LTEXT           "Kapil Ratnani", IDC_STATIC, 105, 21, 43, 8, SS_LEFT
     LTEXT           "Version:", IDC_STATIC, 27, 35, 26, 8, SS_LEFT
-    LTEXT           "1.20", IDC_STATIC, 104, 35, 15, 8, SS_LEFT
+    LTEXT           "1.21", IDC_STATIC, 104, 35, 15, 8, SS_LEFT
     LTEXT           "Licence:", IDC_STATIC, 27, 48, 28, 8, SS_LEFT
     LTEXT           "GPL", IDC_STATIC, 104, 48, 15, 8, SS_LEFT
     LTEXT           "Special thanks to:", IDC_STATIC, 27, 63, 58, 8, SS_LEFT
@@ -53,8 +53,8 @@ FONT 8, "Ms Shell Dlg"
 //
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 1 VERSIONINFO
-    FILEVERSION     1,20,0,0
-    PRODUCTVERSION  1,20,0,0
+    FILEVERSION     1,21,0,0
+    PRODUCTVERSION  1,21,0,0
     FILEOS          VOS__WINDOWS32
     FILETYPE        VFT_DLL
     FILESUBTYPE     VFT2_UNKNOWN
@@ -68,11 +68,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
             VALUE "Comments", "JSONViewer plugin for Notepad++"
             VALUE "CompanyName", "Kapil Ratnani"
             VALUE "FileDescription", "Notepad++ plugin"
-            VALUE "FileVersion", "1.20"
+            VALUE "FileVersion", "1.21"
             VALUE "InternalName", "JSONViewer"
             VALUE "OriginalFilename", "NPPJSONViewer.dll"
             VALUE "ProductName", "JSONViewer plugin for Notepad++"
-            VALUE "ProductVersion", "1.20"
+            VALUE "ProductVersion", "1.21"
             VALUE "SpecialBuild", "UNICODE"
         }
     }

README

@@ -1,5 +1,5 @@
 =================
-JSONViewer 1.20
+JSONViewer 1.21
 by Kapil Ratnani
 =================
 
@@ -22,6 +22,12 @@ Rui Maciel for mjson library
 ==================
 Latest Updates:
 ==================
+
+----
+1.21
+----
+1. Fixed display of UTF-8 characters.
+
 ----
 1.20
 ----