From d8f2c8b67c26113916177105aaa73351c83b2630 Mon Sep 17 00:00:00 2001
From: Ian Pilcher <ian.pilcher@home.com>
Date: Tue, 24 Jul 2001 21:40:15 +0000
Subject: [PATCH] Make built-in font data read-only.

---
 dlls/wineps/data/AvantGarde_Book.c            |  4 +-
 dlls/wineps/data/AvantGarde_BookOblique.c     |  4 +-
 dlls/wineps/data/AvantGarde_Demi.c            |  4 +-
 dlls/wineps/data/AvantGarde_DemiOblique.c     |  4 +-
 dlls/wineps/data/Bookman_Demi.c               |  4 +-
 dlls/wineps/data/Bookman_DemiItalic.c         |  4 +-
 dlls/wineps/data/Bookman_Light.c              |  4 +-
 dlls/wineps/data/Bookman_LightItalic.c        |  4 +-
 dlls/wineps/data/Courier.c                    |  4 +-
 dlls/wineps/data/Courier_Bold.c               |  4 +-
 dlls/wineps/data/Courier_BoldOblique.c        |  4 +-
 dlls/wineps/data/Courier_Oblique.c            |  4 +-
 dlls/wineps/data/Helvetica.c                  |  4 +-
 dlls/wineps/data/Helvetica_Bold.c             |  4 +-
 dlls/wineps/data/Helvetica_BoldOblique.c      |  4 +-
 dlls/wineps/data/Helvetica_Narrow.c           |  4 +-
 dlls/wineps/data/Helvetica_Narrow_Bold.c      |  4 +-
 .../data/Helvetica_Narrow_BoldOblique.c       |  4 +-
 dlls/wineps/data/Helvetica_Narrow_Oblique.c   |  4 +-
 dlls/wineps/data/Helvetica_Oblique.c          |  4 +-
 dlls/wineps/data/NewCenturySchlbk_Bold.c      |  4 +-
 .../wineps/data/NewCenturySchlbk_BoldItalic.c |  4 +-
 dlls/wineps/data/NewCenturySchlbk_Italic.c    |  4 +-
 dlls/wineps/data/NewCenturySchlbk_Roman.c     |  4 +-
 dlls/wineps/data/Palatino_Bold.c              |  4 +-
 dlls/wineps/data/Palatino_BoldItalic.c        |  4 +-
 dlls/wineps/data/Palatino_Italic.c            |  4 +-
 dlls/wineps/data/Palatino_Roman.c             |  4 +-
 dlls/wineps/data/Symbol.c                     |  4 +-
 dlls/wineps/data/Times_Bold.c                 |  4 +-
 dlls/wineps/data/Times_BoldItalic.c           |  4 +-
 dlls/wineps/data/Times_Italic.c               |  4 +-
 dlls/wineps/data/Times_Roman.c                |  4 +-
 dlls/wineps/data/ZapfChancery_MediumItalic.c  |  4 +-
 dlls/wineps/data/ZapfDingbats.c               |  4 +-
 dlls/wineps/data/agl.c                        |  2 +-
 dlls/wineps/data/agl.h                        | 70 +++++++++----------
 dlls/wineps/mkagl.c                           |  4 +-
 dlls/wineps/psdrv.h                           |  2 +-
 39 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/dlls/wineps/data/AvantGarde_Book.c b/dlls/wineps/data/AvantGarde_Book.c
index c2c1a3ecc1e..dce1b0582a9 100644
--- a/dlls/wineps/data/AvantGarde_Book.c
+++ b/dlls/wineps/data/AvantGarde_Book.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_AvantGarde_Book[228] = 
+static const AFMMETRICS met_AvantGarde_Book[228] = 
 {
     {
 	 32, 0x0020,  277, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_Book[228] =
  *  Font metrics
  */
 
-AFM PSDRV_AvantGarde_Book =
+const AFM PSDRV_AvantGarde_Book =
 {
     "AvantGarde-Book",				/* FontName */
     "ITC Avant Garde Gothic Book",		/* FullName */
diff --git a/dlls/wineps/data/AvantGarde_BookOblique.c b/dlls/wineps/data/AvantGarde_BookOblique.c
index e96acea7fa0..d23543f2b62 100644
--- a/dlls/wineps/data/AvantGarde_BookOblique.c
+++ b/dlls/wineps/data/AvantGarde_BookOblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_AvantGarde_BookOblique[228] = 
+static const AFMMETRICS met_AvantGarde_BookOblique[228] = 
 {
     {
 	 32, 0x0020,  277, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_BookOblique[228] =
  *  Font metrics
  */
 
-AFM PSDRV_AvantGarde_BookOblique =
+const AFM PSDRV_AvantGarde_BookOblique =
 {
     "AvantGarde-BookOblique",			/* FontName */
     "ITC Avant Garde Gothic Book Oblique",	/* FullName */
diff --git a/dlls/wineps/data/AvantGarde_Demi.c b/dlls/wineps/data/AvantGarde_Demi.c
index 7c4983da106..2becffd53e2 100644
--- a/dlls/wineps/data/AvantGarde_Demi.c
+++ b/dlls/wineps/data/AvantGarde_Demi.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_AvantGarde_Demi[228] = 
+static const AFMMETRICS met_AvantGarde_Demi[228] = 
 {
     {
 	 32, 0x0020,  280, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_Demi[228] =
  *  Font metrics
  */
 
-AFM PSDRV_AvantGarde_Demi =
+const AFM PSDRV_AvantGarde_Demi =
 {
     "AvantGarde-Demi",				/* FontName */
     "ITC Avant Garde Gothic Demi",		/* FullName */
diff --git a/dlls/wineps/data/AvantGarde_DemiOblique.c b/dlls/wineps/data/AvantGarde_DemiOblique.c
index 5ba6c8a7dc1..ce962138995 100644
--- a/dlls/wineps/data/AvantGarde_DemiOblique.c
+++ b/dlls/wineps/data/AvantGarde_DemiOblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_AvantGarde_DemiOblique[228] = 
+static const AFMMETRICS met_AvantGarde_DemiOblique[228] = 
 {
     {
 	 32, 0x0020,  280, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_AvantGarde_DemiOblique[228] =
  *  Font metrics
  */
 
-AFM PSDRV_AvantGarde_DemiOblique =
+const AFM PSDRV_AvantGarde_DemiOblique =
 {
     "AvantGarde-DemiOblique",			/* FontName */
     "ITC Avant Garde Gothic Demi Oblique",	/* FullName */
diff --git a/dlls/wineps/data/Bookman_Demi.c b/dlls/wineps/data/Bookman_Demi.c
index 36a2a4ff218..8137d0924fe 100644
--- a/dlls/wineps/data/Bookman_Demi.c
+++ b/dlls/wineps/data/Bookman_Demi.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Bookman_Demi[228] = 
+static const AFMMETRICS met_Bookman_Demi[228] = 
 {
     {
 	 32, 0x0020,  340, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_Demi[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Bookman_Demi =
+const AFM PSDRV_Bookman_Demi =
 {
     "Bookman-Demi",				/* FontName */
     "ITC Bookman Demi",				/* FullName */
diff --git a/dlls/wineps/data/Bookman_DemiItalic.c b/dlls/wineps/data/Bookman_DemiItalic.c
index 143a3e26779..96359c696be 100644
--- a/dlls/wineps/data/Bookman_DemiItalic.c
+++ b/dlls/wineps/data/Bookman_DemiItalic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Bookman_DemiItalic[228] = 
+static const AFMMETRICS met_Bookman_DemiItalic[228] = 
 {
     {
 	 32, 0x0020,  340, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_DemiItalic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Bookman_DemiItalic =
+const AFM PSDRV_Bookman_DemiItalic =
 {
     "Bookman-DemiItalic",			/* FontName */
     "ITC Bookman Demi Italic",			/* FullName */
diff --git a/dlls/wineps/data/Bookman_Light.c b/dlls/wineps/data/Bookman_Light.c
index 3fabde2c12a..ae4cbe9eae6 100644
--- a/dlls/wineps/data/Bookman_Light.c
+++ b/dlls/wineps/data/Bookman_Light.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Bookman_Light[228] = 
+static const AFMMETRICS met_Bookman_Light[228] = 
 {
     {
 	 32, 0x0020,  320, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_Light[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Bookman_Light =
+const AFM PSDRV_Bookman_Light =
 {
     "Bookman-Light",				/* FontName */
     "ITC Bookman Light",			/* FullName */
diff --git a/dlls/wineps/data/Bookman_LightItalic.c b/dlls/wineps/data/Bookman_LightItalic.c
index 1f11cb8b9f1..5025d0f9418 100644
--- a/dlls/wineps/data/Bookman_LightItalic.c
+++ b/dlls/wineps/data/Bookman_LightItalic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Bookman_LightItalic[228] = 
+static const AFMMETRICS met_Bookman_LightItalic[228] = 
 {
     {
 	 32, 0x0020,  300, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Bookman_LightItalic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Bookman_LightItalic =
+const AFM PSDRV_Bookman_LightItalic =
 {
     "Bookman-LightItalic",			/* FontName */
     "ITC Bookman Light Italic",			/* FullName */
diff --git a/dlls/wineps/data/Courier.c b/dlls/wineps/data/Courier.c
index daa50a2911e..020b1a53bea 100644
--- a/dlls/wineps/data/Courier.c
+++ b/dlls/wineps/data/Courier.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Courier[243] = 
+static const AFMMETRICS met_Courier[243] = 
 {
     {
 	 32, 0x0020,  600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier[243] =
  *  Font metrics
  */
 
-AFM PSDRV_Courier =
+const AFM PSDRV_Courier =
 {
     "Courier",					/* FontName */
     "Courier",					/* FullName */
diff --git a/dlls/wineps/data/Courier_Bold.c b/dlls/wineps/data/Courier_Bold.c
index 59a1c3982c5..e775c382d42 100644
--- a/dlls/wineps/data/Courier_Bold.c
+++ b/dlls/wineps/data/Courier_Bold.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Courier_Bold[243] = 
+static const AFMMETRICS met_Courier_Bold[243] = 
 {
     {
 	 32, 0x0020,  600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier_Bold[243] =
  *  Font metrics
  */
 
-AFM PSDRV_Courier_Bold =
+const AFM PSDRV_Courier_Bold =
 {
     "Courier-Bold",				/* FontName */
     "Courier Bold",				/* FullName */
diff --git a/dlls/wineps/data/Courier_BoldOblique.c b/dlls/wineps/data/Courier_BoldOblique.c
index bf84a7222b2..000f2acbca9 100644
--- a/dlls/wineps/data/Courier_BoldOblique.c
+++ b/dlls/wineps/data/Courier_BoldOblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Courier_BoldOblique[243] = 
+static const AFMMETRICS met_Courier_BoldOblique[243] = 
 {
     {
 	 32, 0x0020,  600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier_BoldOblique[243] =
  *  Font metrics
  */
 
-AFM PSDRV_Courier_BoldOblique =
+const AFM PSDRV_Courier_BoldOblique =
 {
     "Courier-BoldOblique",			/* FontName */
     "Courier Bold Oblique",			/* FullName */
diff --git a/dlls/wineps/data/Courier_Oblique.c b/dlls/wineps/data/Courier_Oblique.c
index 23c6ed3177a..4fffaca14f2 100644
--- a/dlls/wineps/data/Courier_Oblique.c
+++ b/dlls/wineps/data/Courier_Oblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Courier_Oblique[243] = 
+static const AFMMETRICS met_Courier_Oblique[243] = 
 {
     {
 	 32, 0x0020,  600, PSDRV_AGLGlyphNames + 1169,
@@ -1004,7 +1004,7 @@ static AFMMETRICS met_Courier_Oblique[243] =
  *  Font metrics
  */
 
-AFM PSDRV_Courier_Oblique =
+const AFM PSDRV_Courier_Oblique =
 {
     "Courier-Oblique",				/* FontName */
     "Courier Oblique",				/* FullName */
diff --git a/dlls/wineps/data/Helvetica.c b/dlls/wineps/data/Helvetica.c
index c285db95f28..1ff9645ec74 100644
--- a/dlls/wineps/data/Helvetica.c
+++ b/dlls/wineps/data/Helvetica.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica[228] = 
+static const AFMMETRICS met_Helvetica[228] = 
 {
     {
 	 32, 0x0020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica =
+const AFM PSDRV_Helvetica =
 {
     "Helvetica",				/* FontName */
     "Helvetica",				/* FullName */
diff --git a/dlls/wineps/data/Helvetica_Bold.c b/dlls/wineps/data/Helvetica_Bold.c
index 333a92491af..0159e22595c 100644
--- a/dlls/wineps/data/Helvetica_Bold.c
+++ b/dlls/wineps/data/Helvetica_Bold.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_Bold[228] = 
+static const AFMMETRICS met_Helvetica_Bold[228] = 
 {
     {
 	 32, 0x0020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Bold[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_Bold =
+const AFM PSDRV_Helvetica_Bold =
 {
     "Helvetica-Bold",				/* FontName */
     "Helvetica Bold",				/* FullName */
diff --git a/dlls/wineps/data/Helvetica_BoldOblique.c b/dlls/wineps/data/Helvetica_BoldOblique.c
index f9512d5f8d8..a4845721113 100644
--- a/dlls/wineps/data/Helvetica_BoldOblique.c
+++ b/dlls/wineps/data/Helvetica_BoldOblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_BoldOblique[228] = 
+static const AFMMETRICS met_Helvetica_BoldOblique[228] = 
 {
     {
 	 32, 0x0020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_BoldOblique[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_BoldOblique =
+const AFM PSDRV_Helvetica_BoldOblique =
 {
     "Helvetica-BoldOblique",			/* FontName */
     "Helvetica Bold Oblique",			/* FullName */
diff --git a/dlls/wineps/data/Helvetica_Narrow.c b/dlls/wineps/data/Helvetica_Narrow.c
index 104a99b29d7..75742eb7d35 100644
--- a/dlls/wineps/data/Helvetica_Narrow.c
+++ b/dlls/wineps/data/Helvetica_Narrow.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_Narrow[228] = 
+static const AFMMETRICS met_Helvetica_Narrow[228] = 
 {
     {
 	 32, 0x0020,  228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_Narrow =
+const AFM PSDRV_Helvetica_Narrow =
 {
     "Helvetica-Narrow",				/* FontName */
     "Helvetica Narrow",				/* FullName */
diff --git a/dlls/wineps/data/Helvetica_Narrow_Bold.c b/dlls/wineps/data/Helvetica_Narrow_Bold.c
index 8fd1dc4ed46..a486e2ac562 100644
--- a/dlls/wineps/data/Helvetica_Narrow_Bold.c
+++ b/dlls/wineps/data/Helvetica_Narrow_Bold.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_Narrow_Bold[228] = 
+static const AFMMETRICS met_Helvetica_Narrow_Bold[228] = 
 {
     {
 	 32, 0x0020,  228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow_Bold[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_Narrow_Bold =
+const AFM PSDRV_Helvetica_Narrow_Bold =
 {
     "Helvetica-Narrow-Bold",			/* FontName */
     "Helvetica Narrow Bold",			/* FullName */
diff --git a/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c b/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c
index 98fc0671950..789485e07ae 100644
--- a/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c
+++ b/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] = 
+static const AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] = 
 {
     {
 	 32, 0x0020,  228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow_BoldOblique[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_Narrow_BoldOblique =
+const AFM PSDRV_Helvetica_Narrow_BoldOblique =
 {
     "Helvetica-Narrow-BoldOblique",		/* FontName */
     "Helvetica Narrow Bold Oblique",		/* FullName */
diff --git a/dlls/wineps/data/Helvetica_Narrow_Oblique.c b/dlls/wineps/data/Helvetica_Narrow_Oblique.c
index e3632772836..a2296101b0c 100644
--- a/dlls/wineps/data/Helvetica_Narrow_Oblique.c
+++ b/dlls/wineps/data/Helvetica_Narrow_Oblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_Narrow_Oblique[228] = 
+static const AFMMETRICS met_Helvetica_Narrow_Oblique[228] = 
 {
     {
 	 32, 0x0020,  228, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Narrow_Oblique[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_Narrow_Oblique =
+const AFM PSDRV_Helvetica_Narrow_Oblique =
 {
     "Helvetica-Narrow-Oblique",			/* FontName */
     "Helvetica Narrow Oblique",			/* FullName */
diff --git a/dlls/wineps/data/Helvetica_Oblique.c b/dlls/wineps/data/Helvetica_Oblique.c
index 5d8cc2488b3..d16d3bce43d 100644
--- a/dlls/wineps/data/Helvetica_Oblique.c
+++ b/dlls/wineps/data/Helvetica_Oblique.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Helvetica_Oblique[228] = 
+static const AFMMETRICS met_Helvetica_Oblique[228] = 
 {
     {
 	 32, 0x0020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Helvetica_Oblique[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Helvetica_Oblique =
+const AFM PSDRV_Helvetica_Oblique =
 {
     "Helvetica-Oblique",			/* FontName */
     "Helvetica Oblique",			/* FullName */
diff --git a/dlls/wineps/data/NewCenturySchlbk_Bold.c b/dlls/wineps/data/NewCenturySchlbk_Bold.c
index f1332ebd01e..096f75ff49a 100644
--- a/dlls/wineps/data/NewCenturySchlbk_Bold.c
+++ b/dlls/wineps/data/NewCenturySchlbk_Bold.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_NewCenturySchlbk_Bold[228] = 
+static const AFMMETRICS met_NewCenturySchlbk_Bold[228] = 
 {
     {
 	 32, 0x0020,  287, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_Bold[228] =
  *  Font metrics
  */
 
-AFM PSDRV_NewCenturySchlbk_Bold =
+const AFM PSDRV_NewCenturySchlbk_Bold =
 {
     "NewCenturySchlbk-Bold",			/* FontName */
     "New Century Schoolbook Bold",		/* FullName */
diff --git a/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c b/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c
index b73da017095..172d023cd6b 100644
--- a/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c
+++ b/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] = 
+static const AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] = 
 {
     {
 	 32, 0x0020,  287, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_BoldItalic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_NewCenturySchlbk_BoldItalic =
+const AFM PSDRV_NewCenturySchlbk_BoldItalic =
 {
     "NewCenturySchlbk-BoldItalic",		/* FontName */
     "New Century Schoolbook Bold Italic",	/* FullName */
diff --git a/dlls/wineps/data/NewCenturySchlbk_Italic.c b/dlls/wineps/data/NewCenturySchlbk_Italic.c
index 95ef83d8026..56777d0d9e2 100644
--- a/dlls/wineps/data/NewCenturySchlbk_Italic.c
+++ b/dlls/wineps/data/NewCenturySchlbk_Italic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_NewCenturySchlbk_Italic[228] = 
+static const AFMMETRICS met_NewCenturySchlbk_Italic[228] = 
 {
     {
 	 32, 0x0020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_Italic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_NewCenturySchlbk_Italic =
+const AFM PSDRV_NewCenturySchlbk_Italic =
 {
     "NewCenturySchlbk-Italic",			/* FontName */
     "New Century Schoolbook Italic",		/* FullName */
diff --git a/dlls/wineps/data/NewCenturySchlbk_Roman.c b/dlls/wineps/data/NewCenturySchlbk_Roman.c
index 71ac7cd0e6e..2ccfa43a641 100644
--- a/dlls/wineps/data/NewCenturySchlbk_Roman.c
+++ b/dlls/wineps/data/NewCenturySchlbk_Roman.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_NewCenturySchlbk_Roman[228] = 
+static const AFMMETRICS met_NewCenturySchlbk_Roman[228] = 
 {
     {
 	 32, 0x0020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_NewCenturySchlbk_Roman[228] =
  *  Font metrics
  */
 
-AFM PSDRV_NewCenturySchlbk_Roman =
+const AFM PSDRV_NewCenturySchlbk_Roman =
 {
     "NewCenturySchlbk-Roman",			/* FontName */
     "New Century Schoolbook Roman",		/* FullName */
diff --git a/dlls/wineps/data/Palatino_Bold.c b/dlls/wineps/data/Palatino_Bold.c
index a3f726f6c10..e33e508b1f0 100644
--- a/dlls/wineps/data/Palatino_Bold.c
+++ b/dlls/wineps/data/Palatino_Bold.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Palatino_Bold[228] = 
+static const AFMMETRICS met_Palatino_Bold[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_Bold[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Palatino_Bold =
+const AFM PSDRV_Palatino_Bold =
 {
     "Palatino-Bold",				/* FontName */
     "Palatino Bold",				/* FullName */
diff --git a/dlls/wineps/data/Palatino_BoldItalic.c b/dlls/wineps/data/Palatino_BoldItalic.c
index 3a8ae3a1493..ff8efd59194 100644
--- a/dlls/wineps/data/Palatino_BoldItalic.c
+++ b/dlls/wineps/data/Palatino_BoldItalic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Palatino_BoldItalic[228] = 
+static const AFMMETRICS met_Palatino_BoldItalic[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_BoldItalic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Palatino_BoldItalic =
+const AFM PSDRV_Palatino_BoldItalic =
 {
     "Palatino-BoldItalic",			/* FontName */
     "Palatino Bold Italic",			/* FullName */
diff --git a/dlls/wineps/data/Palatino_Italic.c b/dlls/wineps/data/Palatino_Italic.c
index f186120bd24..b75fe8afa2f 100644
--- a/dlls/wineps/data/Palatino_Italic.c
+++ b/dlls/wineps/data/Palatino_Italic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Palatino_Italic[228] = 
+static const AFMMETRICS met_Palatino_Italic[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_Italic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Palatino_Italic =
+const AFM PSDRV_Palatino_Italic =
 {
     "Palatino-Italic",				/* FontName */
     "Palatino Italic",				/* FullName */
diff --git a/dlls/wineps/data/Palatino_Roman.c b/dlls/wineps/data/Palatino_Roman.c
index 5c8298f82fa..7a177fc626d 100644
--- a/dlls/wineps/data/Palatino_Roman.c
+++ b/dlls/wineps/data/Palatino_Roman.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Palatino_Roman[228] = 
+static const AFMMETRICS met_Palatino_Roman[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Palatino_Roman[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Palatino_Roman =
+const AFM PSDRV_Palatino_Roman =
 {
     "Palatino-Roman",				/* FontName */
     "Palatino Roman",				/* FullName */
diff --git a/dlls/wineps/data/Symbol.c b/dlls/wineps/data/Symbol.c
index 8000c9af245..26a2832f905 100644
--- a/dlls/wineps/data/Symbol.c
+++ b/dlls/wineps/data/Symbol.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Symbol[188] = 
+static const AFMMETRICS met_Symbol[188] = 
 {
     {
 	 32, 0xf020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -784,7 +784,7 @@ static AFMMETRICS met_Symbol[188] =
  *  Font metrics
  */
 
-AFM PSDRV_Symbol =
+const AFM PSDRV_Symbol =
 {
     "Symbol",					/* FontName */
     "Symbol",					/* FullName */
diff --git a/dlls/wineps/data/Times_Bold.c b/dlls/wineps/data/Times_Bold.c
index 0f0f9d8f9e7..d3f5e5b4b6a 100644
--- a/dlls/wineps/data/Times_Bold.c
+++ b/dlls/wineps/data/Times_Bold.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Times_Bold[228] = 
+static const AFMMETRICS met_Times_Bold[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Times_Bold[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Times_Bold =
+const AFM PSDRV_Times_Bold =
 {
     "Times-Bold",				/* FontName */
     "Times Bold",				/* FullName */
diff --git a/dlls/wineps/data/Times_BoldItalic.c b/dlls/wineps/data/Times_BoldItalic.c
index 6c0d93dc2d9..64f8e0d0e3d 100644
--- a/dlls/wineps/data/Times_BoldItalic.c
+++ b/dlls/wineps/data/Times_BoldItalic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Times_BoldItalic[228] = 
+static const AFMMETRICS met_Times_BoldItalic[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Times_BoldItalic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Times_BoldItalic =
+const AFM PSDRV_Times_BoldItalic =
 {
     "Times-BoldItalic",				/* FontName */
     "Times Bold Italic",			/* FullName */
diff --git a/dlls/wineps/data/Times_Italic.c b/dlls/wineps/data/Times_Italic.c
index ccb6e593ca8..8e819c2be14 100644
--- a/dlls/wineps/data/Times_Italic.c
+++ b/dlls/wineps/data/Times_Italic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Times_Italic[228] = 
+static const AFMMETRICS met_Times_Italic[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Times_Italic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Times_Italic =
+const AFM PSDRV_Times_Italic =
 {
     "Times-Italic",				/* FontName */
     "Times Italic",				/* FullName */
diff --git a/dlls/wineps/data/Times_Roman.c b/dlls/wineps/data/Times_Roman.c
index 7503bb30328..f756ad5ef56 100644
--- a/dlls/wineps/data/Times_Roman.c
+++ b/dlls/wineps/data/Times_Roman.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_Times_Roman[228] = 
+static const AFMMETRICS met_Times_Roman[228] = 
 {
     {
 	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_Times_Roman[228] =
  *  Font metrics
  */
 
-AFM PSDRV_Times_Roman =
+const AFM PSDRV_Times_Roman =
 {
     "Times-Roman",				/* FontName */
     "Times Roman",				/* FullName */
diff --git a/dlls/wineps/data/ZapfChancery_MediumItalic.c b/dlls/wineps/data/ZapfChancery_MediumItalic.c
index 32d82d0a14c..e863e0eb5e4 100644
--- a/dlls/wineps/data/ZapfChancery_MediumItalic.c
+++ b/dlls/wineps/data/ZapfChancery_MediumItalic.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_ZapfChancery_MediumItalic[228] = 
+static const AFMMETRICS met_ZapfChancery_MediumItalic[228] = 
 {
     {
 	 32, 0x0020,  220, PSDRV_AGLGlyphNames + 1169,
@@ -944,7 +944,7 @@ static AFMMETRICS met_ZapfChancery_MediumItalic[228] =
  *  Font metrics
  */
 
-AFM PSDRV_ZapfChancery_MediumItalic =
+const AFM PSDRV_ZapfChancery_MediumItalic =
 {
     "ZapfChancery-MediumItalic",		/* FontName */
     "ITC Zapf Chancery Medium Italic",		/* FullName */
diff --git a/dlls/wineps/data/ZapfDingbats.c b/dlls/wineps/data/ZapfDingbats.c
index 8a138d7a6a1..db714e19962 100644
--- a/dlls/wineps/data/ZapfDingbats.c
+++ b/dlls/wineps/data/ZapfDingbats.c
@@ -23,7 +23,7 @@
  *  Glyph metrics
  */
 
-static AFMMETRICS met_ZapfDingbats[188] = 
+static const AFMMETRICS met_ZapfDingbats[188] = 
 {
     {
 	 32, 0xf020,  278, PSDRV_AGLGlyphNames + 1169,
@@ -784,7 +784,7 @@ static AFMMETRICS met_ZapfDingbats[188] =
  *  Font metrics
  */
 
-AFM PSDRV_ZapfDingbats =
+const AFM PSDRV_ZapfDingbats =
 {
     "ZapfDingbats",				/* FontName */
     "ITC Zapf Dingbats",			/* FullName */
diff --git a/dlls/wineps/data/agl.c b/dlls/wineps/data/agl.c
index 8433bbb8d6c..76e8271f69f 100644
--- a/dlls/wineps/data/agl.c
+++ b/dlls/wineps/data/agl.c
@@ -25,7 +25,7 @@
  *  Built-in font metrics
  */
 
-AFM *const PSDRV_BuiltinAFMs[] =
+const AFM *const PSDRV_BuiltinAFMs[] =
 {
     &PSDRV_AvantGarde_Demi,
     &PSDRV_AvantGarde_DemiOblique,
diff --git a/dlls/wineps/data/agl.h b/dlls/wineps/data/agl.h
index 49040be91f4..794ed8e6022 100644
--- a/dlls/wineps/data/agl.h
+++ b/dlls/wineps/data/agl.h
@@ -1,38 +1,38 @@
-extern AFM PSDRV_AvantGarde_Demi;
-extern AFM PSDRV_AvantGarde_DemiOblique;
-extern AFM PSDRV_AvantGarde_Book;
-extern AFM PSDRV_AvantGarde_BookOblique;
-extern AFM PSDRV_Bookman_Demi;
-extern AFM PSDRV_Bookman_DemiItalic;
-extern AFM PSDRV_Bookman_Light;
-extern AFM PSDRV_Bookman_LightItalic;
-extern AFM PSDRV_Courier_Bold;
-extern AFM PSDRV_Courier_BoldOblique;
-extern AFM PSDRV_Courier;
-extern AFM PSDRV_Courier_Oblique;
-extern AFM PSDRV_Helvetica;
-extern AFM PSDRV_Helvetica_Bold;
-extern AFM PSDRV_Helvetica_BoldOblique;
-extern AFM PSDRV_Helvetica_Narrow;
-extern AFM PSDRV_Helvetica_Narrow_Bold;
-extern AFM PSDRV_Helvetica_Narrow_BoldOblique;
-extern AFM PSDRV_Helvetica_Narrow_Oblique;
-extern AFM PSDRV_Helvetica_Oblique;
-extern AFM PSDRV_NewCenturySchlbk_Bold;
-extern AFM PSDRV_NewCenturySchlbk_BoldItalic;
-extern AFM PSDRV_NewCenturySchlbk_Italic;
-extern AFM PSDRV_NewCenturySchlbk_Roman;
-extern AFM PSDRV_Palatino_Bold;
-extern AFM PSDRV_Palatino_BoldItalic;
-extern AFM PSDRV_Palatino_Italic;
-extern AFM PSDRV_Palatino_Roman;
-extern AFM PSDRV_Symbol;
-extern AFM PSDRV_Times_Bold;
-extern AFM PSDRV_Times_BoldItalic;
-extern AFM PSDRV_Times_Italic;
-extern AFM PSDRV_Times_Roman;
-extern AFM PSDRV_ZapfChancery_MediumItalic;
-extern AFM PSDRV_ZapfDingbats;
+extern const AFM PSDRV_AvantGarde_Demi;
+extern const AFM PSDRV_AvantGarde_DemiOblique;
+extern const AFM PSDRV_AvantGarde_Book;
+extern const AFM PSDRV_AvantGarde_BookOblique;
+extern const AFM PSDRV_Bookman_Demi;
+extern const AFM PSDRV_Bookman_DemiItalic;
+extern const AFM PSDRV_Bookman_Light;
+extern const AFM PSDRV_Bookman_LightItalic;
+extern const AFM PSDRV_Courier_Bold;
+extern const AFM PSDRV_Courier_BoldOblique;
+extern const AFM PSDRV_Courier;
+extern const AFM PSDRV_Courier_Oblique;
+extern const AFM PSDRV_Helvetica;
+extern const AFM PSDRV_Helvetica_Bold;
+extern const AFM PSDRV_Helvetica_BoldOblique;
+extern const AFM PSDRV_Helvetica_Narrow;
+extern const AFM PSDRV_Helvetica_Narrow_Bold;
+extern const AFM PSDRV_Helvetica_Narrow_BoldOblique;
+extern const AFM PSDRV_Helvetica_Narrow_Oblique;
+extern const AFM PSDRV_Helvetica_Oblique;
+extern const AFM PSDRV_NewCenturySchlbk_Bold;
+extern const AFM PSDRV_NewCenturySchlbk_BoldItalic;
+extern const AFM PSDRV_NewCenturySchlbk_Italic;
+extern const AFM PSDRV_NewCenturySchlbk_Roman;
+extern const AFM PSDRV_Palatino_Bold;
+extern const AFM PSDRV_Palatino_BoldItalic;
+extern const AFM PSDRV_Palatino_Italic;
+extern const AFM PSDRV_Palatino_Roman;
+extern const AFM PSDRV_Symbol;
+extern const AFM PSDRV_Times_Bold;
+extern const AFM PSDRV_Times_BoldItalic;
+extern const AFM PSDRV_Times_Italic;
+extern const AFM PSDRV_Times_Roman;
+extern const AFM PSDRV_ZapfChancery_MediumItalic;
+extern const AFM PSDRV_ZapfDingbats;
 #define GN_A			(PSDRV_AGLGlyphNames + 0)
 #define GN_AE			(PSDRV_AGLGlyphNames + 1)
 #define GN_AEacute		(PSDRV_AGLGlyphNames + 2)
diff --git a/dlls/wineps/mkagl.c b/dlls/wineps/mkagl.c
index 116c3f962fb..cdbe14c9260 100644
--- a/dlls/wineps/mkagl.c
+++ b/dlls/wineps/mkagl.c
@@ -164,7 +164,7 @@ static void read_afms(FILE *f_c, FILE *f_h)
     	    " *  Built-in font metrics\n"
 	    " */\n"
 	    "\n"
-	    "AFM *const PSDRV_BuiltinAFMs[] =\n"
+	    "const AFM *const PSDRV_BuiltinAFMs[] =\n"
 	    "{\n", f_c);
 		
     
@@ -209,7 +209,7 @@ static void read_afms(FILE *f_c, FILE *f_h)
 	    if (font_family[i] == '-')
 	    	font_family[i] = '_';
 		
-	fprintf(f_h, "extern AFM PSDRV_%s;\n", font_family);
+	fprintf(f_h, "extern const AFM PSDRV_%s;\n", font_family);
 	fprintf(f_c, "    &PSDRV_%s,\n", font_family);
 	
 	while (1)
diff --git a/dlls/wineps/psdrv.h b/dlls/wineps/psdrv.h
index 03cf0a629a0..4d0e3933113 100644
--- a/dlls/wineps/psdrv.h
+++ b/dlls/wineps/psdrv.h
@@ -93,7 +93,7 @@ typedef struct _tagFONTFAMILY {
 } FONTFAMILY;
 
 extern FONTFAMILY   *PSDRV_AFMFontList;
-extern AFM  	    *const PSDRV_BuiltinAFMs[];     /* last element is NULL */
+extern const AFM    *const PSDRV_BuiltinAFMs[];     /* last element is NULL */
 
 typedef struct _tagFONTNAME {
     char		*Name;
-- 
GitLab