From 72c5e65e8c18449f28bd2472f1db6f048479a3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Thu, 8 Jun 2017 17:00:55 +0000 Subject: [PATCH] [GDI32_APITEST]: Fix compilation under MSVC 2010. svn path=/trunk/; revision=74962 --- .../apitests/gdi32/AddFontMemResourceEx.c | 270 +++++++++--------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/rostests/apitests/gdi32/AddFontMemResourceEx.c b/rostests/apitests/gdi32/AddFontMemResourceEx.c index d5587befcfa..e429f773c7b 100644 --- a/rostests/apitests/gdi32/AddFontMemResourceEx.c +++ b/rostests/apitests/gdi32/AddFontMemResourceEx.c @@ -32,161 +32,161 @@ typedef struct _fnt_test static fnt_test test_data[] = { { - .ResourceName = "PanosePitchTest.ttf", - .NumFaces = 2, - .res = + /* .ResourceName = */ "PanosePitchTest.ttf", + /* .NumFaces = */ 2, + /* .res = */ { { - .FontName = "PanosePitchTest", - .tm.tmHeight = 11, - .tm.tmAscent = 11, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -5, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 11, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 165, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR, - .tm.tmCharSet = SHIFTJIS_CHARSET, + /* .FontName = */ "PanosePitchTest", + /* .tm.tmHeight = */ 11, + /* .tm.tmAscent = */ 11, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -5, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 11, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 165, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR, + /* .tm.tmCharSet = */ SHIFTJIS_CHARSET, }, { - .FontName = "@PanosePitchTest", - .tm.tmHeight = 11, - .tm.tmAscent = 11, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -5, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 11, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 165, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR, - .tm.tmCharSet = SHIFTJIS_CHARSET, + /* .FontName = */ "@PanosePitchTest", + /* .tm.tmHeight = */ 11, + /* .tm.tmAscent = */ 11, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -5, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 11, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 165, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR, + /* .tm.tmCharSet = */ SHIFTJIS_CHARSET, }, }, }, { - .ResourceName = "TTCTestV.ttc", - .NumFaces = 3, - .res = + /* .ResourceName = */ "TTCTestV.ttc", + /* .NumFaces = */ 3, + /* .res = */ { { - .FontName = "No1Of3in1", - .tm.tmHeight = 12, - .tm.tmAscent = 12, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -4, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = -525, - .tm.tmMaxCharWidth = 6, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 64, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, - .tm.tmCharSet = ANSI_CHARSET, + /* .FontName = */ "No1Of3in1", + /* .tm.tmHeight = */ 12, + /* .tm.tmAscent = */ 12, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -4, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ -525, + /* .tm.tmMaxCharWidth = */ 6, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 64, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, + /* .tm.tmCharSet = */ ANSI_CHARSET, }, { - .FontName = "No2Of3in1", - .tm.tmHeight = 12, - .tm.tmAscent = 12, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -4, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 7, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 64, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, - .tm.tmCharSet = ANSI_CHARSET, + /* .FontName = */ "No2Of3in1", + /* .tm.tmHeight = */ 12, + /* .tm.tmAscent = */ 12, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -4, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 7, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 64, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, + /* .tm.tmCharSet = */ ANSI_CHARSET, }, { - .FontName = "No3Of3in1V", - .tm.tmHeight = 12, - .tm.tmAscent = 12, - .tm.tmDescent = 0, - .tm.tmInternalLeading = -4, - .tm.tmExternalLeading = 1, - .tm.tmAveCharWidth = 8, - .tm.tmMaxCharWidth = 13, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 63, - .tm.tmLastChar = 65, - .tm.tmDefaultChar = 64, - .tm.tmBreakChar = 65, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR, - .tm.tmCharSet = ANSI_CHARSET, + /* .FontName = */ "No3Of3in1V", + /* .tm.tmHeight = */ 12, + /* .tm.tmAscent = */ 12, + /* .tm.tmDescent = */ 0, + /* .tm.tmInternalLeading = */ -4, + /* .tm.tmExternalLeading = */ 1, + /* .tm.tmAveCharWidth = */ 8, + /* .tm.tmMaxCharWidth = */ 13, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 63, + /* .tm.tmLastChar = */ 65, + /* .tm.tmDefaultChar = */ 64, + /* .tm.tmBreakChar = */ 65, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ FF_MODERN | TMPF_TRUETYPE | TMPF_VECTOR, + /* .tm.tmCharSet = */ ANSI_CHARSET, }, }, }, { - .ResourceName = "Shadows_Into_Light.ttf", - .NumFaces = 1, - .res = + /* .ResourceName = */ "Shadows_Into_Light.ttf", + /* .NumFaces = */ 1, + /* .res = */ { { - .FontName = "ufaXaAlLOxCUGYJ7KN51UP2Q==", - .tm.tmHeight = 26, - .tm.tmAscent = 19, - .tm.tmDescent = 7, - .tm.tmInternalLeading = 10, - .tm.tmExternalLeading = 0, - .tm.tmAveCharWidth = 7, - .tm.tmMaxCharWidth = 23, - .tm.tmWeight = FW_NORMAL, - .tm.tmOverhang = 0, - .tm.tmDigitizedAspectX = 96, - .tm.tmDigitizedAspectY = 96, - .tm.tmFirstChar = 30, - .tm.tmLastChar = 255, - .tm.tmDefaultChar = 31, - .tm.tmBreakChar = 32, - .tm.tmItalic = 0, - .tm.tmUnderlined = 0, - .tm.tmStruckOut = 0, - .tm.tmPitchAndFamily = TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, - .tm.tmCharSet = ANSI_CHARSET, + /* .FontName = */ "ufaXaAlLOxCUGYJ7KN51UP2Q==", + /* .tm.tmHeight = */ 26, + /* .tm.tmAscent = */ 19, + /* .tm.tmDescent = */ 7, + /* .tm.tmInternalLeading = */ 10, + /* .tm.tmExternalLeading = */ 0, + /* .tm.tmAveCharWidth = */ 7, + /* .tm.tmMaxCharWidth = */ 23, + /* .tm.tmWeight = */ FW_NORMAL, + /* .tm.tmOverhang = */ 0, + /* .tm.tmDigitizedAspectX = */ 96, + /* .tm.tmDigitizedAspectY = */ 96, + /* .tm.tmFirstChar = */ 30, + /* .tm.tmLastChar = */ 255, + /* .tm.tmDefaultChar = */ 31, + /* .tm.tmBreakChar = */ 32, + /* .tm.tmItalic = */ 0, + /* .tm.tmUnderlined = */ 0, + /* .tm.tmStruckOut = */ 0, + /* .tm.tmPitchAndFamily = */ TMPF_TRUETYPE | TMPF_VECTOR | TMPF_FIXED_PITCH, + /* .tm.tmCharSet = */ ANSI_CHARSET, }, }, },