marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix member names in NEWTEXTMETRICEX structs.

oldstable
Huw D M Davies 2001-04-04 00:09:53 +00:00 committed by Alexandre Julliard
parent 9c2d2bad90
commit 26ee2ca445
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wine/wingdi16.h
View File

@ -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);

8
include/wingdi.h
View File

@ -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)

33
objects/font.c
View File

@ -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));
}