Fix names of NEWTEXTMETRICEX
Huw D M Davies
h.davies1 at physics.ox.ac.uk
Tue Apr 3 10:58:33 CDT 2001
Huw D M Davies <hdavies at codeweavers.com>
Fix member names in NEWTEXTMETRICEX structs.
--
Dr. Huw D M Davies | Clarendon Laboratory
h.davies1 at physics.ox.ac.uk | Parks Road
Tel: +44 1865 272390 | Oxford OX1 3PU
Fax: +44 1865 272400 | UK
-------------- next part --------------
Index: include/wingdi.h
===================================================================
RCS file: /home/wine/wine/include/wingdi.h,v
retrieving revision 1.56
diff -u -r1.56 wingdi.h
--- include/wingdi.h 2001/03/20 01:55:18 1.56
+++ include/wingdi.h 2001/04/03 15:13:20
@@ -1133,14 +1133,14 @@
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)
Index: objects/font.c
===================================================================
RCS file: /home/wine/wine/objects/font.c,v
retrieving revision 1.39
diff -u -r1.39 font.c
--- objects/font.c 2001/03/16 16:43:15 1.39
+++ objects/font.c 2001/04/03 15:13:20
@@ -380,34 +380,31 @@
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));
}
Index: include/wine/wingdi16.h
===================================================================
RCS file: /home/wine/wine/include/wine/wingdi16.h,v
retrieving revision 1.15
diff -u -r1.15 wingdi16.h
--- include/wine/wingdi16.h 2001/01/06 00:35:37 1.15
+++ include/wine/wingdi16.h 2001/04/03 15:13:20
@@ -150,7 +150,7 @@
{
UINT16 otmSize;
TEXTMETRIC16 otmTextMetrics;
- BYTE otmFilter;
+ BYTE otmFiller;
PANOSE otmPanoseNumber;
UINT16 otmfsSelection;
UINT16 otmfsType;
@@ -212,8 +212,8 @@
typedef struct
{
- NEWTEXTMETRIC16 ntmetm;
- FONTSIGNATURE ntmeFontSignature;
+ NEWTEXTMETRIC16 ntmTm;
+ FONTSIGNATURE ntmFontSig;
} NEWTEXTMETRICEX16,*LPNEWTEXTMETRICEX16;
typedef INT16 CALLBACK (*FONTENUMPROC16)(SEGPTR,SEGPTR,UINT16,LPARAM);
More information about the wine-patches
mailing list