--- mstools/samples/ntfonts/ntfonts.rc	2018/08/09 18:20:59	1.1.1.1
+++ mstools/samples/ntfonts/ntfonts.rc	2018/08/09 18:22:12	1.1.1.2
@@ -2,18 +2,63 @@
 #include "windows.h"
 #include "ntfonts.h"
 
+#define FONTDIALOG FONT 10, "Helv"
+
 ntfontsIcon  ICON	ntfonts.ico
 bmtt         BITMAP     bmtt.bmp
 bmdevice     BITMAP     bmdevice.bmp
 
 
-#define FONTDIALOG FONT 10, "Helv"
 
-#define DLGWIDTH   110
-#define DLGHEIGHT  160
 
 
 
+
+ntfontsMenu MENU
+BEGIN
+
+    POPUP "&Control"
+    BEGIN
+        MENUITEM "EnumFonts (&Display)" ,       TBID_ENUM
+        MENUITEM "EnumFonts (P&rinter)",        TBID_PRINT
+        MENUITEM "&CreateFont",                 TBID_CREATE
+        MENUITEM "&GetMetrics",                 TBID_GETTM
+        MENUITEM "Get&FontData",                TBID_GETFONTDATA
+        MENUITEM SEPARATOR
+        MENUITEM "&Print",                      IDM_PRINT
+    END
+
+    POPUP "&Display"
+    BEGIN
+        MENUITEM "&Centered string 'Hello'",          IDM_MODEHELLO
+        MENUITEM "&Range [tmFirstChar, tmLastChar]",  IDM_MODETMRANGE
+        MENUITEM "&All Glyphs from FontData",         IDM_MODEALL
+    END
+
+    POPUP "&Window"
+    BEGIN
+        MENUITEM "&Cascade",                 IDM_CASCADE
+        MENUITEM "&Tile",                    IDM_TILE
+        MENUITEM "&Arrange",                 IDM_ARRANGE
+    END
+
+    POPUP "&Options"
+    BEGIN
+        MENUITEM "&Flying rectangles",                IDM_FLYWINWIN
+        MENUITEM "SetMapperFlags",                    -1, GRAYED
+        MENUITEM "Grid Display",                      IDM_GRID, GRAYED
+        MENUITEM "Label codepoints",                  -1, GRAYED
+    END
+
+    POPUP "&Help"
+    BEGIN
+        MENUITEM "Help &Index",             IDM_HELP
+        MENUITEM SEPARATOR
+        MENUITEM "&About",                  IDM_ABOUT
+    END
+END
+
+
 logfontDlg DIALOG 0,0, DLGWIDTH, DLGHEIGHT
 STYLE WS_MINIMIZEBOX | WS_CHILD | WS_VISIBLE | WS_CAPTION
                      | WS_SYSMENU | WS_CLIPSIBLINGS
@@ -75,16 +120,75 @@ BEGIN
                LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
 END
 
+oltextmetricDlg DIALOG 0,0, 170, DLGHEIGHT
+STYLE WS_MINIMIZEBOX | WS_CHILD | WS_VISIBLE | WS_CAPTION
+                     | WS_SYSMENU | WS_CLIPSIBLINGS
+CAPTION "OUTLINE TEXTMETRIC"
+FONTDIALOG
+BEGIN
+    LISTBOX    DID_LISTBOX, 0, 0, 170,160,
+               LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+END
+
+
+getfontdataDlg DIALOG 45, 18, 170, DLGHEIGHT
+STYLE WS_MINIMIZEBOX | WS_CHILD | WS_VISIBLE | WS_CAPTION
+                     | WS_SYSMENU | WS_CLIPSIBLINGS
+CAPTION "GetFontData"
+FONTDIALOG
+BEGIN
+    RTEXT           "dwTable", -1,  0, 5, 35, 8
+    COMBOBOX        DID_DWTABLE,  41, 3, 50, 100, CBS_DROPDOWN | CBS_HASSTRINGS |
+                    WS_VSCROLL
+    RTEXT           "dwOffset",-1,  0, 20, 35, 8
+    EDITTEXT         DID_DWOFFSET, 41, 18, 50, 12
+    RTEXT           "cbData",  -1,  0, 35, 35, 8
+    EDITTEXT         DID_CBDATA,   41, 33, 50, 12
+    LISTBOX          DID_LISTBOX,  0, 50, 170, 110,
+                     LBS_USETABSTOPS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL
+    DEFPUSHBUTTON   "GetFontData", DID_DOIT, 100, 14, 60, 15
+    CTEXT           "all values in Hex", -1, 100, 30, 60, 15
+END
+
+
+
+aboutBox DIALOG 30, 14, 136, 90
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "About NTFonts"
+BEGIN
+    ICON            "ntFontsIcon", 101, 8, 20, 18, 20
+    LTEXT           "NTFonts Win32 SDK sample ", 103, 40, 25, 95, 8
+    LTEXT           "version 1.3", 106, 40, 35, 95, 8
+    DEFPUSHBUTTON   "OK", IDOK, 95, 6, 40, 14
+    CONTROL         "", 108, "Static", SS_BLACKRECT, 0, 53, 136, 2
+    CTEXT           "Microsoft Developer Support",      105, 0, 62, 136, 8
+    CTEXT           "Copyright (c) 1992 Microsoft Corporation", 105, 0, 74, 
+                    136, 8
+END
+
 
 
-TBAccel ACCELERATORS
+STRINGTABLE
 BEGIN
-  "e",   TBID_ENUM,   ALT
-  "c",   TBID_CREATE, ALT
-  "t",   TBID_GETTM,  ALT
-  "p",   TBID_PRINT,  ALT
-  "E",   TBID_ENUM
-  "C",   TBID_CREATE
-  "T",   TBID_GETTM
-  "P",   TBID_PRINT
+     1, "cmap"
+     2, "glyf"
+     3, "head"
+     4, "hhea"
+     5, "hmtx"
+     6, "loca"
+     7, "maxp"
+     8, "name"
+     9, "post"
+    10, "OS/2"
+    11, "cvt"
+    12, "fpgm"
+    13, "hdmx"
+    14, "kern"
+    15, "LTSH"
+    16, "prep"
+    17, "WIN"
+    18, "VDMX"
+    19, "FOCA"
+    20, "PCLT"
 END