[ROSAPPS][VGAFONTEDIT] String/Memory check

[reactos.git] / modules / rosapps / applications / devutils / vgafontedit / precomp.h

diff --git a/modules/rosapps/applications/devutils/vgafontedit/precomp.h b/modules/rosapps/applications/devutils/vgafontedit/precomp.h
index c86441e..94ac9dd 100644 (file)
--- a/modules/rosapps/applications/devutils/vgafontedit/precomp.h
+++ b/modules/rosapps/applications/devutils/vgafontedit/precomp.h
@@ -1,9 +1,8 @@
 /*
  * PROJECT:     ReactOS VGA Font Editor
- * LICENSE:     GNU General Public License Version 2.0 or any later version
- * FILE:        devutils/vgafontedit/precomp.h
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     Main header
- * COPYRIGHT:   Copyright 2008 Colin Finck <mail@colinfinck.de>
+ * COPYRIGHT:   Copyright 2008 Colin Finck (colin@reactos.org)
  */
 
 #ifndef __PRECOMP_H
@@ -12,19 +11,32 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
+#include <strsafe.h>
 #include "resource.h"
 #include "customwndclasses.h"
 
+#include "raw.h"
+#include "cpi.h"
+#include "psf.h"
+
+typedef enum
+{
+    RAW,
+    CPI,
+    PSF
+} VGAFONT_TYPE;
+
+typedef struct _VGAFONT
+{
+    VGAFONT_TYPE FontType;
+    PVOID        FontPtr;
+} VGAFONT, *PVGAFONT;
+
 // Forward declarations
 typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO;
 typedef struct _EDIT_GLYPH_INFO EDIT_GLYPH_INFO, *PEDIT_GLYPH_INFO;
 
 // Structure declarations
-typedef struct _BITMAP_FONT
-{
-    UCHAR Bits[2048];
-} BITMAP_FONT, *PBITMAP_FONT;
-
 typedef struct _MAIN_WND_INFO
 {
     HWND hMainWnd;
@@ -106,17 +118,6 @@ struct _EDIT_GLYPH_INFO
 #define TOOLBAR_EDIT_GLYPH            0
 #define TOOLBOX_PEN                   0
 
-// PSFv1 file handling
-#define PSF1_MAGIC0                   0x36
-#define PSF1_MAGIC1                   0x04
-
-typedef struct _PSF1_HEADER
-{
-    UCHAR uMagic[2];
-    UCHAR uMode;
-    UCHAR uCharSize;
-} PSF1_HEADER, *PPSF1_HEADER;
-
 
 //
 // Function prototypes