diff -rU5 charmap.orig/charmap.c charmap/charmap.c
--- charmap.orig/charmap.c	2014-08-07 23:19:32.000000000 +0800
+++ charmap/charmap.c	2014-12-26 18:00:21.142000000 +0800
@@ -32,10 +32,13 @@
               LPARAM lParam)
 {
     HWND hwndCombo = (HWND)lParam;
     LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
 
+    /* Skip rotated font */
+    if(pszName[0] == L'@') return 1;
+
     /* make sure font doesn't already exist in our list */
     if(SendMessageW(hwndCombo,
                     CB_FINDSTRINGEXACT,
                     0,
                     (LPARAM)pszName) == CB_ERR)
@@ -319,11 +322,11 @@
             FillFontStyleComboList(GetDlgItem(hDlg,
                                               IDC_FONTCOMBO));
 
             ChangeMapFont(hDlg);
 
-            // Configure Richedi control for sending notification changes.
+            // Configure Richedit control for sending notification changes.
             evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0);
             evMask |= ENM_CHANGE;
             SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask);
 
             return TRUE;
Only in charmap: lang
diff -rU5 charmap.orig/lrgcell.c charmap/lrgcell.c
--- charmap.orig/lrgcell.c	2014-08-07 23:19:32.000000000 +0800
+++ charmap/lrgcell.c	2014-12-26 18:00:50.329500000 +0800
@@ -33,11 +33,11 @@
 
         if (lpFontName)
         {
             SendMessageW(hCombo,
                          WM_GETTEXT,
-                         31,
+                         Len + 1,
                          (LPARAM)lpFontName);
 
             ZeroMemory(&lf,
                        sizeof(lf));
 
diff -rU5 charmap.orig/map.c charmap/map.c
--- charmap.orig/map.c	2014-08-07 23:19:32.000000000 +0800
+++ charmap/map.c	2014-12-26 18:08:39.626375000 +0800
@@ -12,10 +12,12 @@
 #include <stdlib.h>
 
 static const WCHAR szMapWndClass[] = L"FontMapWnd";
 static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";
 
+#define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS
+
 static
 VOID
 TagFontToCell(PCELL pCell,
               WCHAR ch)
 {
@@ -375,11 +377,11 @@
 
             infoPtr->pActiveCell = NULL;
 
             SetGrid(infoPtr);
 
-            SetScrollRange(hwnd, SB_VERT, 0, 255, FALSE);
+            SetScrollRange(hwnd, SB_VERT, 0, MAX_ROWS, FALSE);
             SetScrollPos(hwnd, SB_VERT, 0, TRUE);
 
             Ret = TRUE;
         }
     }
@@ -421,11 +423,11 @@
        default:
             break;
        }
 
     infoPtr->iYStart = max(0,
-                         min(infoPtr->iYStart, 255*16));
+                         min(infoPtr->iYStart, MAX_ROWS));
 
     iYDiff = iOldYStart - infoPtr->iYStart;
     if (iYDiff)
     {
         if (infoPtr->hLrgWnd != NULL)
Only in charmap: res