Author: hbelusca
Date: Thu Jun 8 17:00:55 2017
New Revision: 74962
URL: http://svn.reactos.org/svn/reactos?rev=74962&view=rev
Log:
[GDI32_APITEST]: Fix compilation under MSVC 2010.
Modified:
trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c
Modified: trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c?rev=74962&r1=74961&r2=74962&view=diff
==============================================================================
--- trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c [iso-8859-1]
(original)
+++ trunk/rostests/apitests/gdi32/AddFontMemResourceEx.c [iso-8859-1]
Thu Jun 8 17:00:55 2017
@@ -32,161 +32,161 @@
static fnt_test test_data[] =
{
{
- .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,
+ /* .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,
},
},
},
{
- .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 = "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,
+ /* .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 = */ "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,
},
},
},
{
- .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,
+ /* .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,
},
},
},
