--- mstools/samples/mfedit/mfedit.h	2018/08/09 18:21:57	1.1.1.2
+++ mstools/samples/mfedit/mfedit.h	2018/08/09 18:24:08	1.1.1.3
@@ -23,6 +23,9 @@
 #define MAX_POINTS              256
 #define MAX_POINTS_MF           3
 #define MAX_POINTS_BMP          3
+#define MAX_FRAME           800
+#define MAX_FILE            800
+
 //
 // Menu ID's
 //
@@ -50,11 +53,16 @@
 #define MM_BRUSH                7022
 #define MM_FONT                 7023
 #define MM_LEABOUT              7024
+#define MM_FIT2WND              7025
+#define MM_IMPORT_3X            7026
+#define MM_EXPORT_3X            7027
+#define MM_TTOUTLN_STROKEFILL   7028
+#define MM_TTOUTLN_POLYDRAW     7029
 
 #define SIZEOFCAPTIONTEXT	20
 
 #define ACCEL_ID                100
-#define APPICON                 100
+#define APP_ICON                 100
 
 //
 // Control Panel ID's
@@ -253,8 +261,8 @@
 typedef struct
   {
   DWORD   key;
-  HANDLE  hmf;
-  RECT    bbox;
+  WORD          hmf;
+  SMALL_RECT    bbox;
   WORD    inch;
   DWORD   reserved;
   WORD    checksum;
@@ -395,6 +403,13 @@ METALOOKUP rgMetaName[] =
    { "EXTCREATEPEN              ", MR_EXTCREATEPEN           },
    };
 
+
+typedef struct _PRTDATA {
+    BOOL            bFit2Wnd;
+    HENHMETAFILE    hMetaf;
+} PRTDATA, *PPRTDATA;
+
+
 HANDLE  ghModule;
 HWND    ghwndMain   = NULL;
 HWND    ghwndClient = NULL;
@@ -402,6 +417,8 @@ HWND    ghwndDrawSurf = NULL;
 HWND    ghwndCtrlPanel = NULL;
 HWND    ghwndTools = NULL;
 HWND    ghTextWnd = NULL;
+HPALETTE ghPal = NULL;
+HPALETTE ghHT = NULL;
 
 LONG    glcyStatus;
 BOOL    gbRecording = FALSE;
@@ -426,6 +443,7 @@ HMENU   hChildMenu, hChildMenuWindow;
 HDC     ghDCMem;
 HDC     ghDCMetaf = (HDC) NULL;
 HENHMETAFILE ghMetaf = NULL;
+HMETAFILE ghmf=NULL;
 
 HBITMAP ghBmp = NULL, ghBmpMask = NULL;
 
@@ -443,3 +461,28 @@ HBRUSH  ghbrAppBkgd;
 HPEN    ghpnWide;
 
 HWND    ghwndNext = NULL;
+BOOL    gbFit2Wnd = TRUE;
+BOOL    gbImport3X = FALSE;
+BOOL    gbExport3X = FALSE;
+BOOL    gbSFOutln = FALSE;
+BOOL    gbPDOutln = FALSE;
+BOOL    gbTT = FALSE;
+
+BOOL    gbUseDIB = FALSE;
+
+typedef struct _FileInfo{
+    HANDLE      hFile;
+    HANDLE      hMapFile;
+    LPVOID      lpvMapView;
+} FILEINFO, *PFILEINFO;
+
+typedef struct _DIBDATA{
+    ULONG           ulFiles;
+    ULONG           ulFrames;
+    FILEINFO        rgFileInfo[MAX_FILE];
+    PBYTE           rgpjFrame[MAX_FRAME];
+    PBITMAPINFO     rgpbmi[MAX_FILE];
+    BOOL            rgbCoreHdr[MAX_FILE];
+} DIBDATA, *PDIBDATA;
+
+DIBDATA gDib;