From 26ee2ca4451463f4cc5dc8ea7991b87b09cea4e1 Mon Sep 17 00:00:00 2001
From: Huw D M Davies <hdavies@codeweavers.com>
Date: Wed, 4 Apr 2001 00:09:53 +0000
Subject: [PATCH] Fix member names in NEWTEXTMETRICEX structs.

---
 include/wine/wingdi16.h |  6 +++---
 include/wingdi.h        |  8 ++++----
 objects/font.c          | 33 +++++++++++++++------------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/include/wine/wingdi16.h b/include/wine/wingdi16.h
index 1db6663cbf9..7e883ba39b8 100644
--- a/include/wine/wingdi16.h
+++ b/include/wine/wingdi16.h
@@ -150,7 +150,7 @@ typedef struct _OUTLINETEXTMETRIC16
 {
     UINT16          otmSize;
     TEXTMETRIC16    otmTextMetrics;
-    BYTE            otmFilter;
+    BYTE            otmFiller;
     PANOSE          otmPanoseNumber;
     UINT16          otmfsSelection;
     UINT16          otmfsType;
@@ -212,8 +212,8 @@ typedef struct
 
 typedef struct
 {
-    NEWTEXTMETRIC16	ntmetm;
-    FONTSIGNATURE       ntmeFontSignature;
+    NEWTEXTMETRIC16	ntmTm;
+    FONTSIGNATURE       ntmFontSig;
 } NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16;
 
 typedef INT16 CALLBACK (*FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
diff --git a/include/wingdi.h b/include/wingdi.h
index 0dde49e60f3..c02e428d91c 100644
--- a/include/wingdi.h
+++ b/include/wingdi.h
@@ -1133,14 +1133,14 @@ DECL_WINELIB_TYPE_AW(LPNEWTEXTMETRIC)
 
 typedef struct
 {
-    NEWTEXTMETRICA	ntmetm;
-    FONTSIGNATURE       ntmeFontSignature;
+    NEWTEXTMETRICA	ntmTm;
+    FONTSIGNATURE       ntmFontSig;
 } NEWTEXTMETRICEXA,*LPNEWTEXTMETRICEXA;
 
 typedef struct
 {
-    NEWTEXTMETRICW	ntmetm;
-    FONTSIGNATURE       ntmeFontSignature;
+    NEWTEXTMETRICW	ntmTm;
+    FONTSIGNATURE       ntmFontSig;
 } NEWTEXTMETRICEXW,*LPNEWTEXTMETRICEXW;
 
 DECL_WINELIB_TYPE_AW(NEWTEXTMETRICEX)
diff --git a/objects/font.c b/objects/font.c
index d7a927f8f0f..6f5432ff2bd 100644
--- a/objects/font.c
+++ b/objects/font.c
@@ -380,34 +380,31 @@ void FONT_TextMetricWToA(const TEXTMETRICW *ptmW, LPTEXTMETRICA ptmA )
 void FONT_NewTextMetricExWTo16(const NEWTEXTMETRICEXW *ptmW, LPNEWTEXTMETRICEX16 ptm16 )
 {
     FONT_TextMetricWTo16((LPTEXTMETRICW)ptmW, (LPTEXTMETRIC16)ptm16);
-    ptm16->ntmetm.ntmFlags = ptmW->ntmetm.ntmFlags;
-    ptm16->ntmetm.ntmSizeEM = ptmW->ntmetm.ntmSizeEM;
-    ptm16->ntmetm.ntmCellHeight = ptmW->ntmetm.ntmCellHeight;
-    ptm16->ntmetm.ntmAvgWidth = ptmW->ntmetm.ntmAvgWidth;
-    memcpy(&ptm16->ntmeFontSignature, &ptmW->ntmeFontSignature,
-	   sizeof(FONTSIGNATURE));
+    ptm16->ntmTm.ntmFlags = ptmW->ntmTm.ntmFlags;
+    ptm16->ntmTm.ntmSizeEM = ptmW->ntmTm.ntmSizeEM;
+    ptm16->ntmTm.ntmCellHeight = ptmW->ntmTm.ntmCellHeight;
+    ptm16->ntmTm.ntmAvgWidth = ptmW->ntmTm.ntmAvgWidth;
+    memcpy(&ptm16->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE));
 }
 
 void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, LPNEWTEXTMETRICEXA ptmA )
 {
     FONT_TextMetricWToA((LPTEXTMETRICW)ptmW, (LPTEXTMETRICA)ptmA);
-    ptmA->ntmetm.ntmFlags = ptmW->ntmetm.ntmFlags;
-    ptmA->ntmetm.ntmSizeEM = ptmW->ntmetm.ntmSizeEM;
-    ptmA->ntmetm.ntmCellHeight = ptmW->ntmetm.ntmCellHeight;
-    ptmA->ntmetm.ntmAvgWidth = ptmW->ntmetm.ntmAvgWidth;
-    memcpy(&ptmA->ntmeFontSignature, &ptmW->ntmeFontSignature,
-	   sizeof(FONTSIGNATURE));
+    ptmA->ntmTm.ntmFlags = ptmW->ntmTm.ntmFlags;
+    ptmA->ntmTm.ntmSizeEM = ptmW->ntmTm.ntmSizeEM;
+    ptmA->ntmTm.ntmCellHeight = ptmW->ntmTm.ntmCellHeight;
+    ptmA->ntmTm.ntmAvgWidth = ptmW->ntmTm.ntmAvgWidth;
+    memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE));
 }
 
 void FONT_NewTextMetricEx16ToW(const NEWTEXTMETRICEX16 *ptm16, LPNEWTEXTMETRICEXW ptmW )
 {
     FONT_TextMetric16ToW((LPTEXTMETRIC16)ptm16, (LPTEXTMETRICW)ptmW);
-    ptmW->ntmetm.ntmFlags = ptm16->ntmetm.ntmFlags;
-    ptmW->ntmetm.ntmSizeEM = ptm16->ntmetm.ntmSizeEM;
-    ptmW->ntmetm.ntmCellHeight = ptm16->ntmetm.ntmCellHeight;
-    ptmW->ntmetm.ntmAvgWidth = ptm16->ntmetm.ntmAvgWidth;
-    memcpy(&ptmW->ntmeFontSignature, &ptm16->ntmeFontSignature,
-	   sizeof(FONTSIGNATURE));
+    ptmW->ntmTm.ntmFlags = ptm16->ntmTm.ntmFlags;
+    ptmW->ntmTm.ntmSizeEM = ptm16->ntmTm.ntmSizeEM;
+    ptmW->ntmTm.ntmCellHeight = ptm16->ntmTm.ntmCellHeight;
+    ptmW->ntmTm.ntmAvgWidth = ptm16->ntmTm.ntmAvgWidth;
+    memcpy(&ptmW->ntmFontSig, &ptm16->ntmFontSig, sizeof(FONTSIGNATURE));
 }