[GDI32_APITEST]: Fix compilation under MSVC 2010.

svn path=/trunk/; revision=74962
This commit is contained in:
Hermès Bélusca-Maïto 2017-06-08 17:00:55 +00:00
parent 438d60c401
commit 72c5e65e8c

View file

@ -32,161 +32,161 @@ typedef struct _fnt_test
static fnt_test test_data[] = static fnt_test test_data[] =
{ {
{ {
.ResourceName = "PanosePitchTest.ttf", /* .ResourceName = */ "PanosePitchTest.ttf",
.NumFaces = 2, /* .NumFaces = */ 2,
.res = /* .res = */
{ {
{ {
.FontName = "PanosePitchTest", /* .FontName = */ "PanosePitchTest",
.tm.tmHeight = 11, /* .tm.tmHeight = */ 11,
.tm.tmAscent = 11, /* .tm.tmAscent = */ 11,
.tm.tmDescent = 0, /* .tm.tmDescent = */ 0,
.tm.tmInternalLeading = -5, /* .tm.tmInternalLeading = */ -5,
.tm.tmExternalLeading = 1, /* .tm.tmExternalLeading = */ 1,
.tm.tmAveCharWidth = 8, /* .tm.tmAveCharWidth = */ 8,
.tm.tmMaxCharWidth = 11, /* .tm.tmMaxCharWidth = */ 11,
.tm.tmWeight = FW_NORMAL, /* .tm.tmWeight = */ FW_NORMAL,
.tm.tmOverhang = 0, /* .tm.tmOverhang = */ 0,
.tm.tmDigitizedAspectX = 96, /* .tm.tmDigitizedAspectX = */ 96,
.tm.tmDigitizedAspectY = 96, /* .tm.tmDigitizedAspectY = */ 96,
.tm.tmFirstChar = 63, /* .tm.tmFirstChar = */ 63,
.tm.tmLastChar = 65, /* .tm.tmLastChar = */ 65,
.tm.tmDefaultChar = 165, /* .tm.tmDefaultChar = */ 165,
.tm.tmBreakChar = 65, /* .tm.tmBreakChar = */ 65,
.tm.tmItalic = 0, /* .tm.tmItalic = */ 0,
.tm.tmUnderlined = 0, /* .tm.tmUnderlined = */ 0,
.tm.tmStruckOut = 0, /* .tm.tmStruckOut = */ 0,
.tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR,
.tm.tmCharSet = SHIFTJIS_CHARSET, /* .tm.tmCharSet = */ SHIFTJIS_CHARSET,
}, },
{ {
.FontName = "@PanosePitchTest", /* .FontName = */ "@PanosePitchTest",
.tm.tmHeight = 11, /* .tm.tmHeight = */ 11,
.tm.tmAscent = 11, /* .tm.tmAscent = */ 11,
.tm.tmDescent = 0, /* .tm.tmDescent = */ 0,
.tm.tmInternalLeading = -5, /* .tm.tmInternalLeading = */ -5,
.tm.tmExternalLeading = 1, /* .tm.tmExternalLeading = */ 1,
.tm.tmAveCharWidth = 8, /* .tm.tmAveCharWidth = */ 8,
.tm.tmMaxCharWidth = 11, /* .tm.tmMaxCharWidth = */ 11,
.tm.tmWeight = FW_NORMAL, /* .tm.tmWeight = */ FW_NORMAL,
.tm.tmOverhang = 0, /* .tm.tmOverhang = */ 0,
.tm.tmDigitizedAspectX = 96, /* .tm.tmDigitizedAspectX = */ 96,
.tm.tmDigitizedAspectY = 96, /* .tm.tmDigitizedAspectY = */ 96,
.tm.tmFirstChar = 63, /* .tm.tmFirstChar = */ 63,
.tm.tmLastChar = 65, /* .tm.tmLastChar = */ 65,
.tm.tmDefaultChar = 165, /* .tm.tmDefaultChar = */ 165,
.tm.tmBreakChar = 65, /* .tm.tmBreakChar = */ 65,
.tm.tmItalic = 0, /* .tm.tmItalic = */ 0,
.tm.tmUnderlined = 0, /* .tm.tmUnderlined = */ 0,
.tm.tmStruckOut = 0, /* .tm.tmStruckOut = */ 0,
.tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR,
.tm.tmCharSet = SHIFTJIS_CHARSET, /* .tm.tmCharSet = */ SHIFTJIS_CHARSET,
}, },
}, },
}, },
{ {
.ResourceName = "TTCTestV.ttc", /* .ResourceName = */ "TTCTestV.ttc",
.NumFaces = 3, /* .NumFaces = */ 3,
.res = /* .res = */
{ {
{ {
.FontName = "No1Of3in1", /* .FontName = */ "No1Of3in1",
.tm.tmHeight = 12, /* .tm.tmHeight = */ 12,
.tm.tmAscent = 12, /* .tm.tmAscent = */ 12,
.tm.tmDescent = 0, /* .tm.tmDescent = */ 0,
.tm.tmInternalLeading = -4, /* .tm.tmInternalLeading = */ -4,
.tm.tmExternalLeading = 1, /* .tm.tmExternalLeading = */ 1,
.tm.tmAveCharWidth = -525, /* .tm.tmAveCharWidth = */ -525,
.tm.tmMaxCharWidth = 6, /* .tm.tmMaxCharWidth = */ 6,
.tm.tmWeight = FW_NORMAL, /* .tm.tmWeight = */ FW_NORMAL,
.tm.tmOverhang = 0, /* .tm.tmOverhang = */ 0,
.tm.tmDigitizedAspectX = 96, /* .tm.tmDigitizedAspectX = */ 96,
.tm.tmDigitizedAspectY = 96, /* .tm.tmDigitizedAspectY = */ 96,
.tm.tmFirstChar = 63, /* .tm.tmFirstChar = */ 63,
.tm.tmLastChar = 65, /* .tm.tmLastChar = */ 65,
.tm.tmDefaultChar = 64, /* .tm.tmDefaultChar = */ 64,
.tm.tmBreakChar = 65, /* .tm.tmBreakChar = */ 65,
.tm.tmItalic = 0, /* .tm.tmItalic = */ 0,
.tm.tmUnderlined = 0, /* .tm.tmUnderlined = */ 0,
.tm.tmStruckOut = 0, /* .tm.tmStruckOut = */ 0,
.tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH,
.tm.tmCharSet = ANSI_CHARSET, /* .tm.tmCharSet = */ ANSI_CHARSET,
}, },
{ {
.FontName = "No2Of3in1", /* .FontName = */ "No2Of3in1",
.tm.tmHeight = 12, /* .tm.tmHeight = */ 12,
.tm.tmAscent = 12, /* .tm.tmAscent = */ 12,
.tm.tmDescent = 0, /* .tm.tmDescent = */ 0,
.tm.tmInternalLeading = -4, /* .tm.tmInternalLeading = */ -4,
.tm.tmExternalLeading = 1, /* .tm.tmExternalLeading = */ 1,
.tm.tmAveCharWidth = 8, /* .tm.tmAveCharWidth = */ 8,
.tm.tmMaxCharWidth = 7, /* .tm.tmMaxCharWidth = */ 7,
.tm.tmWeight = FW_NORMAL, /* .tm.tmWeight = */ FW_NORMAL,
.tm.tmOverhang = 0, /* .tm.tmOverhang = */ 0,
.tm.tmDigitizedAspectX = 96, /* .tm.tmDigitizedAspectX = */ 96,
.tm.tmDigitizedAspectY = 96, /* .tm.tmDigitizedAspectY = */ 96,
.tm.tmFirstChar = 63, /* .tm.tmFirstChar = */ 63,
.tm.tmLastChar = 65, /* .tm.tmLastChar = */ 65,
.tm.tmDefaultChar = 64, /* .tm.tmDefaultChar = */ 64,
.tm.tmBreakChar = 65, /* .tm.tmBreakChar = */ 65,
.tm.tmItalic = 0, /* .tm.tmItalic = */ 0,
.tm.tmUnderlined = 0, /* .tm.tmUnderlined = */ 0,
.tm.tmStruckOut = 0, /* .tm.tmStruckOut = */ 0,
.tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH,
.tm.tmCharSet = ANSI_CHARSET, /* .tm.tmCharSet = */ ANSI_CHARSET,
}, },
{ {
.FontName = "No3Of3in1V", /* .FontName = */ "No3Of3in1V",
.tm.tmHeight = 12, /* .tm.tmHeight = */ 12,
.tm.tmAscent = 12, /* .tm.tmAscent = */ 12,
.tm.tmDescent = 0, /* .tm.tmDescent = */ 0,
.tm.tmInternalLeading = -4, /* .tm.tmInternalLeading = */ -4,
.tm.tmExternalLeading = 1, /* .tm.tmExternalLeading = */ 1,
.tm.tmAveCharWidth = 8, /* .tm.tmAveCharWidth = */ 8,
.tm.tmMaxCharWidth = 13, /* .tm.tmMaxCharWidth = */ 13,
.tm.tmWeight = FW_NORMAL, /* .tm.tmWeight = */ FW_NORMAL,
.tm.tmOverhang = 0, /* .tm.tmOverhang = */ 0,
.tm.tmDigitizedAspectX = 96, /* .tm.tmDigitizedAspectX = */ 96,
.tm.tmDigitizedAspectY = 96, /* .tm.tmDigitizedAspectY = */ 96,
.tm.tmFirstChar = 63, /* .tm.tmFirstChar = */ 63,
.tm.tmLastChar = 65, /* .tm.tmLastChar = */ 65,
.tm.tmDefaultChar = 64, /* .tm.tmDefaultChar = */ 64,
.tm.tmBreakChar = 65, /* .tm.tmBreakChar = */ 65,
.tm.tmItalic = 0, /* .tm.tmItalic = */ 0,
.tm.tmUnderlined = 0, /* .tm.tmUnderlined = */ 0,
.tm.tmStruckOut = 0, /* .tm.tmStruckOut = */ 0,
.tm.tmPitchAndFamily = FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR, /* .tm.tmPitchAndFamily = */ FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR,
.tm.tmCharSet = ANSI_CHARSET, /* .tm.tmCharSet = */ ANSI_CHARSET,
}, },
}, },
}, },
{ {
.ResourceName = "Shadows_Into_Light.ttf", /* .ResourceName = */ "Shadows_Into_Light.ttf",
.NumFaces = 1, /* .NumFaces = */ 1,
.res = /* .res = */
{ {
{ {
.FontName = "ufaXaAlLOxCUGYJ7KN51UP2Q==", /* .FontName = */ "ufaXaAlLOxCUGYJ7KN51UP2Q==",
.tm.tmHeight = 26, /* .tm.tmHeight = */ 26,
.tm.tmAscent = 19, /* .tm.tmAscent = */ 19,
.tm.tmDescent = 7, /* .tm.tmDescent = */ 7,
.tm.tmInternalLeading = 10, /* .tm.tmInternalLeading = */ 10,
.tm.tmExternalLeading = 0, /* .tm.tmExternalLeading = */ 0,
.tm.tmAveCharWidth = 7, /* .tm.tmAveCharWidth = */ 7,
.tm.tmMaxCharWidth = 23, /* .tm.tmMaxCharWidth = */ 23,
.tm.tmWeight = FW_NORMAL, /* .tm.tmWeight = */ FW_NORMAL,
.tm.tmOverhang = 0, /* .tm.tmOverhang = */ 0,
.tm.tmDigitizedAspectX = 96, /* .tm.tmDigitizedAspectX = */ 96,
.tm.tmDigitizedAspectY = 96, /* .tm.tmDigitizedAspectY = */ 96,
.tm.tmFirstChar = 30, /* .tm.tmFirstChar = */ 30,
.tm.tmLastChar = 255, /* .tm.tmLastChar = */ 255,
.tm.tmDefaultChar = 31, /* .tm.tmDefaultChar = */ 31,
.tm.tmBreakChar = 32, /* .tm.tmBreakChar = */ 32,
.tm.tmItalic = 0, /* .tm.tmItalic = */ 0,
.tm.tmUnderlined = 0, /* .tm.tmUnderlined = */ 0,
.tm.tmStruckOut = 0, /* .tm.tmStruckOut = */ 0,
.tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH,
.tm.tmCharSet = ANSI_CHARSET, /* .tm.tmCharSet = */ ANSI_CHARSET,
}, },
}, },
}, },