extern const MATRIX gmxWorldToDeviceDefault;
extern const MATRIX gmxWorldToPageDefault;
+static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)};
/* HACK!! Fix XFORMOBJ then use 1:16 / 16:1 */
#define gmxWorldToDeviceDefault gmxWorldToPageDefault
FT_Library g_FreeTypeLibrary;
+typedef struct
+{
+ FT_Int major;
+ FT_Int minor;
+ FT_Int patch;
+} FT_Version_t;
+static FT_Version_t FT_Version;
+static DWORD FT_SimpleVersion;
+#define FT_VERSION_VALUE(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch))
+
/* special font names */
static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett");
static void
RemoveCacheEntries(FT_Face Face)
{
- PLIST_ENTRY CurrentEntry;
+ PLIST_ENTRY CurrentEntry, NextEntry;
PFONT_CACHE_ENTRY FontEntry;
ASSERT_FREETYPE_LOCK_HELD();
- CurrentEntry = g_FontCacheListHead.Flink;
- while (CurrentEntry != &g_FontCacheListHead)
+ for (CurrentEntry = g_FontCacheListHead.Flink;
+ CurrentEntry != &g_FontCacheListHead;
+ CurrentEntry = NextEntry)
{
FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry);
- CurrentEntry = CurrentEntry->Flink;
+ NextEntry = CurrentEntry->Flink;
if (FontEntry->Face == Face)
{
IntUnLockFreeType();
}
+#if DBG
+VOID DumpFontGDI(PFONTGDI FontGDI)
+{
+ const char *family_name;
+ const char *style_name;
+ FT_Face Face;
+
+ if (!FontGDI)
+ {
+ DPRINT("FontGDI NULL\n");
+ return;
+ }
+
+ Face = (FontGDI->SharedFace ? FontGDI->SharedFace->Face : NULL);
+ if (Face)
+ {
+ family_name = Face->family_name;
+ if (!family_name)
+ family_name = "<NULL>";
+
+ style_name = Face->style_name;
+ if (!style_name)
+ style_name = "<NULL>";
+ }
+ else
+ {
+ family_name = "<invalid>";
+ style_name = "<invalid>";
+ }
+
+ DPRINT("family_name '%s', style_name '%s', FontGDI %p, FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n",
+ family_name,
+ style_name,
+ FontGDI,
+ FontGDI->FontObj,
+ FontGDI->iUnique,
+ FontGDI->SharedFace,
+ Face,
+ FontGDI->CharSet,
+ FontGDI->Filename);
+}
+
+VOID DumpFontList(PLIST_ENTRY Head)
+{
+ PLIST_ENTRY Entry;
+ PFONT_ENTRY CurrentEntry;
+ PFONTGDI FontGDI;
+
+ DPRINT("## DumpFontList(%p)\n", Head);
+
+ for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink)
+ {
+ CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
+ FontGDI = CurrentEntry->Font;
+
+ DumpFontGDI(FontGDI);
+ }
+}
+
+VOID DumpFontSubstEntry(PFONTSUBST_ENTRY pSubstEntry)
+{
+ DPRINT("%wZ,%u -> %wZ,%u\n",
+ &pSubstEntry->FontNames[FONTSUBST_FROM],
+ pSubstEntry->CharSets[FONTSUBST_FROM],
+ &pSubstEntry->FontNames[FONTSUBST_TO],
+ pSubstEntry->CharSets[FONTSUBST_TO]);
+}
+
+VOID DumpFontSubstList(VOID)
+{
+ PLIST_ENTRY pHead = &g_FontSubstListHead;
+ PLIST_ENTRY pListEntry;
+ PFONTSUBST_ENTRY pSubstEntry;
+
+ DPRINT("## DumpFontSubstList\n");
+
+ for (pListEntry = pHead->Flink;
+ pListEntry != pHead;
+ pListEntry = pListEntry->Flink)
+ {
+ pSubstEntry =
+ (PFONTSUBST_ENTRY)CONTAINING_RECORD(pListEntry, FONT_ENTRY, ListEntry);
+
+ DumpFontSubstEntry(pSubstEntry);
+ }
+}
+
+VOID DumpPrivateFontList(BOOL bDoLock)
+{
+ PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process();
+
+ if (!Win32Process)
+ return;
+
+ if (bDoLock)
+ IntLockProcessPrivateFonts(Win32Process);
+
+ DumpFontList(&Win32Process->PrivateFontListHead);
+
+ if (bDoLock)
+ IntUnLockProcessPrivateFonts(Win32Process);
+}
+
+VOID DumpGlobalFontList(BOOL bDoLock)
+{
+ if (bDoLock)
+ IntLockGlobalFonts();
+
+ DumpFontList(&g_FontListHead);
+
+ if (bDoLock)
+ IntUnLockGlobalFonts();
+}
+
+VOID DumpFontInfo(BOOL bDoLock)
+{
+ DumpGlobalFontList(bDoLock);
+ DumpPrivateFontList(bDoLock);
+ DumpFontSubstList();
+}
+#endif
/*
* IntLoadFontSubstList --- loads the list of font substitutes
CharSets[FONTSUBST_TO] = (BYTE)_wtoi(pch + 1);
}
+ /* is it identical? */
+ if (RtlEqualUnicodeString(&FromW, &ToW, TRUE) &&
+ CharSets[FONTSUBST_FROM] == CharSets[FONTSUBST_TO])
+ {
+ RtlFreeUnicodeString(&FromW);
+ RtlFreeUnicodeString(&ToW);
+ continue;
+ }
+
/* allocate an entry */
pEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONTSUBST_ENTRY), TAG_FONT);
if (pEntry == NULL)
return FALSE;
}
+ FT_Library_Version(g_FreeTypeLibrary,&FT_Version.major,&FT_Version.minor,&FT_Version.patch);
+
+ DPRINT1("FreeType version is %d.%d.%d\n",FT_Version.major,FT_Version.minor,FT_Version.patch);
+ FT_SimpleVersion = ((FT_Version.major << 16) & 0xff0000) |
+ ((FT_Version.minor << 8) & 0x00ff00) |
+ ((FT_Version.patch ) & 0x0000ff);
+
IntLoadSystemFonts();
IntLoadFontSubstList(&g_FontSubstListHead);
+#if DBG
+ DumpFontInfo(TRUE);
+#endif
+
return TRUE;
}
-VOID
-FtSetCoordinateTransform(
- FT_Face face,
- PMATRIX pmx)
+VOID FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth)
{
- FT_Matrix ftmatrix;
- FLOATOBJ efTemp;
+ LONG tmAveCharWidth;
+ TT_OS2 *pOS2;
+ FT_Fixed XScale;
+
+ *pmat = identityMat;
+
+ if (lfWidth == 0)
+ return;
+
+ ASSERT_FREETYPE_LOCK_HELD();
+ pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2);
+ if (!pOS2)
+ return;
+
+ XScale = face->size->metrics.x_scale;
+ tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6;
+ if (tmAveCharWidth == 0)
+ {
+ tmAveCharWidth = 1;
+ }
+
+ if (lfWidth == tmAveCharWidth)
+ return;
+
+ pmat->xx = (FT_Fixed)((1 << 16) * lfWidth / tmAveCharWidth);
+ pmat->xy = 0;
+ pmat->yx = 0;
+ pmat->yy = (FT_Fixed)(1 << 16);
+}
+
+VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement)
+{
+ double radian = (lfEscapement * M_PI) / 180 / 10;
+
+ pmat->xx = (FT_Fixed)(cos(radian) * (1 << 16));
+ pmat->xy = (FT_Fixed)(-sin(radian) * (1 << 16));
+ pmat->yx = -pmat->xy;
+ pmat->yy = pmat->xx;
+}
+
+VOID FASTCALL
+FtMatrixFromMx(FT_Matrix *pmat, PMATRIX pmx)
+{
+ FLOATOBJ ef;
/* Create a freetype matrix, by converting to 16.16 fixpoint format */
- efTemp = pmx->efM11;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.xx = FLOATOBJ_GetLong(&efTemp);
+ ef = pmx->efM11;
+ FLOATOBJ_MulLong(&ef, 0x00010000);
+ pmat->xx = FLOATOBJ_GetLong(&ef);
+
+ ef = pmx->efM21;
+ FLOATOBJ_MulLong(&ef, 0x00010000);
+ pmat->xy = FLOATOBJ_GetLong(&ef);
- efTemp = pmx->efM12;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.xy = FLOATOBJ_GetLong(&efTemp);
+ ef = pmx->efM12;
+ FLOATOBJ_MulLong(&ef, 0x00010000);
+ pmat->yx = FLOATOBJ_GetLong(&ef);
- efTemp = pmx->efM21;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.yx = FLOATOBJ_GetLong(&efTemp);
+ ef = pmx->efM22;
+ FLOATOBJ_MulLong(&ef, 0x00010000);
+ pmat->yy = FLOATOBJ_GetLong(&ef);
+}
- efTemp = pmx->efM22;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.yy = FLOATOBJ_GetLong(&efTemp);
+FORCEINLINE VOID FASTCALL
+FtSetCoordinateTransform(
+ FT_Face face,
+ PMATRIX pmx)
+{
+ FT_Matrix mat;
+ FtMatrixFromMx(&mat, pmx);
/* Set the transformation matrix */
- FT_Set_Transform(face, &ftmatrix, 0);
+ FT_Set_Transform(face, &mat, 0);
}
static BOOL
return FALSE;
}
+static VOID
+IntUnicodeStringToBuffer(LPWSTR pszBuffer, USHORT cbBuffer, const UNICODE_STRING *pString)
+{
+ USHORT cbLength = pString->Length;
+
+ if (cbBuffer < sizeof(UNICODE_NULL))
+ return;
+
+ if (cbLength > cbBuffer - sizeof(UNICODE_NULL))
+ cbLength = cbBuffer - sizeof(UNICODE_NULL);
+
+ RtlCopyMemory(pszBuffer, pString->Buffer, cbLength);
+ pszBuffer[cbLength / sizeof(WCHAR)] = UNICODE_NULL;
+}
+
static BOOL
SubstituteFontRecurse(LOGFONTW* pLogFont)
{
if (!Found)
break;
- RtlStringCchCopyW(pLogFont->lfFaceName, LF_FACESIZE, OutputNameW.Buffer);
+ IntUnicodeStringToBuffer(pLogFont->lfFaceName, sizeof(pLogFont->lfFaceName), &OutputNameW);
if (CharSetMap[FONTSUBST_FROM] == DEFAULT_CHARSET ||
CharSetMap[FONTSUBST_FROM] == pLogFont->lfCharSet)
FONTGDI * FontGDI;
NTSTATUS Status;
FT_Face Face;
- ANSI_STRING AnsiFaceName;
+ ANSI_STRING AnsiString;
FT_WinFNT_HeaderRec WinFNT;
INT FaceCount = 0, CharSetCount = 0;
PUNICODE_STRING pFileName = pLoadFont->pFileName;
EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
return 0; /* failure */
}
+
RtlCopyMemory(FontGDI->Filename, pFileName->Buffer, pFileName->Length);
FontGDI->Filename[pFileName->Length / sizeof(WCHAR)] = UNICODE_NULL;
}
FontGDI->OriginalWeight = WeightFromStyle(Face->style_name);
FontGDI->RequestWeight = FW_NORMAL;
- RtlInitAnsiString(&AnsiFaceName, Face->family_name);
- Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiFaceName, TRUE);
+ RtlInitAnsiString(&AnsiString, Face->family_name);
+ Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiString, TRUE);
+ if (NT_SUCCESS(Status))
+ {
+ if (Face->style_name && Face->style_name[0] &&
+ strcmp(Face->style_name, "Regular") != 0)
+ {
+ RtlInitAnsiString(&AnsiString, Face->style_name);
+ Status = RtlAnsiStringToUnicodeString(&Entry->StyleName, &AnsiString, TRUE);
+ if (!NT_SUCCESS(Status))
+ {
+ RtlFreeUnicodeString(&Entry->FaceName);
+ }
+ }
+ else
+ {
+ RtlInitUnicodeString(&Entry->StyleName, NULL);
+ }
+ }
if (!NT_SUCCESS(Status))
{
if (PrivateEntry)
if (CharSetIndex == -1)
{
INT i;
+ USHORT NameLength = Entry->FaceName.Length;
+
+ if (Entry->StyleName.Length)
+ NameLength += Entry->StyleName.Length + sizeof(WCHAR);
if (pLoadFont->RegValueName.Length == 0)
{
- RtlCreateUnicodeString(pValueName, Entry->FaceName.Buffer);
+ pValueName->Length = 0;
+ pValueName->MaximumLength = NameLength + sizeof(WCHAR);
+ pValueName->Buffer = ExAllocatePoolWithTag(PagedPool,
+ pValueName->MaximumLength,
+ TAG_USTR);
+ pValueName->Buffer[0] = UNICODE_NULL;
+ RtlAppendUnicodeStringToString(pValueName, &Entry->FaceName);
}
else
{
UNICODE_STRING NewString;
- USHORT Length = pValueName->Length + 3 * sizeof(WCHAR) + Entry->FaceName.Length;
+ USHORT Length = pValueName->Length + 3 * sizeof(WCHAR) + NameLength;
NewString.Length = 0;
NewString.MaximumLength = Length + sizeof(WCHAR);
NewString.Buffer = ExAllocatePoolWithTag(PagedPool,
RtlFreeUnicodeString(pValueName);
*pValueName = NewString;
}
+ if (Entry->StyleName.Length)
+ {
+ RtlAppendUnicodeToString(pValueName, L" ");
+ RtlAppendUnicodeStringToString(pValueName, &Entry->StyleName);
+ }
for (i = 1; i < CharSetCount; ++i)
{
PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process();
IntLockProcessPrivateFonts(Win32Process);
- Entry = Win32Process->PrivateMemFontListHead.Flink;
- while (Entry != &Win32Process->PrivateMemFontListHead)
+ for (Entry = Win32Process->PrivateMemFontListHead.Flink;
+ Entry != &Win32Process->PrivateMemFontListHead;
+ Entry = Entry->Flink)
{
CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY_COLL_MEM, ListEntry);
UnlinkFontMemCollection(CurrentEntry);
break;
}
-
- Entry = Entry->Flink;
}
IntUnLockProcessPrivateFonts(Win32Process);
} while (Entry);
}
-BOOL FASTCALL
-IntIsFontRenderingEnabled(VOID)
+static BOOL is_hinting_enabled(void)
{
- BOOL Ret = g_RenderingEnabled;
- HDC hDC;
+ static int enabled = -1;
- hDC = IntGetScreenDC();
- if (hDC)
- Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && g_RenderingEnabled;
+ if (enabled == -1)
+ {
+ /* Use the >= 2.2.0 function if available */
+ FT_TrueTypeEngineType type = FT_Get_TrueType_Engine_Type(g_FreeTypeLibrary);
+ enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED);
- return Ret;
+ DPRINT1("hinting is %senabled\n", enabled ? "" : "NOT ");
+ }
+ return enabled;
+}
+
+static BOOL is_subpixel_rendering_enabled( void )
+{
+ static int enabled = -1;
+ if (enabled == -1)
+ {
+ /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */
+ if (FT_SimpleVersion >= FT_VERSION_VALUE(2, 8, 1))
+ enabled = TRUE;
+ else enabled = FALSE;
+
+ DPRINT1("subpixel rendering is %senabled\n", enabled ? "" : "NOT ");
+ }
+ return enabled;
+}
+
+BOOL FASTCALL
+IntIsFontRenderingEnabled(VOID)
+{
+ return is_hinting_enabled() && is_subpixel_rendering_enabled() && g_RenderingEnabled;
}
VOID FASTCALL
PLFONT plfont;
LOGFONTW *plf;
+ ASSERT(lf);
plfont = LFONT_AllocFontWithHandle();
if (!plfont)
{
Index++;
}
break;
+ case TCI_SRCLOCALE:
+ UNIMPLEMENTED;
+ return FALSE;
default:
return FALSE;
}
int Ascent, Descent;
FT_Face Face = FontGDI->SharedFace->Face;
+ ASSERT_FREETYPE_LOCK_HELD();
+
XScale = Face->size->metrics.x_scale;
YScale = Face->size->metrics.y_scale;
IntGetFontLocalizedName(PUNICODE_STRING pNameW, PSHARED_FACE SharedFace,
FT_UShort NameID, FT_UShort LangID);
+typedef struct FONT_NAMES
+{
+ UNICODE_STRING FamilyNameW; /* family name (TT_NAME_ID_FONT_FAMILY) */
+ UNICODE_STRING FaceNameW; /* face name (TT_NAME_ID_FULL_NAME) */
+ UNICODE_STRING StyleNameW; /* style name (TT_NAME_ID_FONT_SUBFAMILY) */
+ UNICODE_STRING FullNameW; /* unique name (TT_NAME_ID_UNIQUE_ID) */
+ ULONG OtmSize; /* size of OUTLINETEXTMETRICW with extra data */
+} FONT_NAMES, *LPFONT_NAMES;
+
+static __inline void FASTCALL
+IntInitFontNames(FONT_NAMES *Names, PSHARED_FACE SharedFace)
+{
+ ULONG OtmSize;
+
+ RtlInitUnicodeString(&Names->FamilyNameW, NULL);
+ RtlInitUnicodeString(&Names->FaceNameW, NULL);
+ RtlInitUnicodeString(&Names->StyleNameW, NULL);
+ RtlInitUnicodeString(&Names->FullNameW, NULL);
+
+ /* family name */
+ IntGetFontLocalizedName(&Names->FamilyNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID);
+ /* face name */
+ IntGetFontLocalizedName(&Names->FaceNameW, SharedFace, TT_NAME_ID_FULL_NAME, gusLanguageID);
+ /* style name */
+ IntGetFontLocalizedName(&Names->StyleNameW, SharedFace, TT_NAME_ID_FONT_SUBFAMILY, gusLanguageID);
+ /* unique name (full name) */
+ IntGetFontLocalizedName(&Names->FullNameW, SharedFace, TT_NAME_ID_UNIQUE_ID, gusLanguageID);
+
+ /* Calculate the size of OUTLINETEXTMETRICW with extra data */
+ OtmSize = sizeof(OUTLINETEXTMETRICW) +
+ Names->FamilyNameW.Length + sizeof(UNICODE_NULL) +
+ Names->FaceNameW.Length + sizeof(UNICODE_NULL) +
+ Names->StyleNameW.Length + sizeof(UNICODE_NULL) +
+ Names->FullNameW.Length + sizeof(UNICODE_NULL);
+ Names->OtmSize = OtmSize;
+}
+
+static __inline SIZE_T FASTCALL
+IntStoreName(const UNICODE_STRING *pName, BYTE *pb)
+{
+ RtlCopyMemory(pb, pName->Buffer, pName->Length);
+ *(WCHAR *)&pb[pName->Length] = UNICODE_NULL;
+ return pName->Length + sizeof(UNICODE_NULL);
+}
+
+static __inline BYTE *FASTCALL
+IntStoreFontNames(const FONT_NAMES *Names, OUTLINETEXTMETRICW *Otm)
+{
+ BYTE *pb = (BYTE *)Otm + sizeof(OUTLINETEXTMETRICW);
+
+ /* family name */
+ Otm->otmpFamilyName = (LPSTR)(pb - (BYTE*) Otm);
+ pb += IntStoreName(&Names->FamilyNameW, pb);
+
+ /* face name */
+ Otm->otmpFaceName = (LPSTR)(pb - (BYTE*) Otm);
+ pb += IntStoreName(&Names->FaceNameW, pb);
+
+ /* style name */
+ Otm->otmpStyleName = (LPSTR)(pb - (BYTE*) Otm);
+ pb += IntStoreName(&Names->StyleNameW, pb);
+
+ /* unique name (full name) */
+ Otm->otmpFullName = (LPSTR)(pb - (BYTE*) Otm);
+ pb += IntStoreName(&Names->FullNameW, pb);
+
+ return pb;
+}
+
+static __inline void FASTCALL
+IntFreeFontNames(FONT_NAMES *Names)
+{
+ RtlFreeUnicodeString(&Names->FamilyNameW);
+ RtlFreeUnicodeString(&Names->FaceNameW);
+ RtlFreeUnicodeString(&Names->StyleNameW);
+ RtlFreeUnicodeString(&Names->FullNameW);
+}
+
/*************************************************************
* IntGetOutlineTextMetrics
*
TT_HoriHeader *pHori;
TT_Postscript *pPost;
FT_Fixed XScale, YScale;
- FT_WinFNT_HeaderRec Win;
+ FT_WinFNT_HeaderRec WinFNT;
FT_Error Error;
- char *Cp;
- UNICODE_STRING FamilyNameW, FaceNameW, StyleNameW, FullNameW;
+ BYTE *pb;
+ FONT_NAMES FontNames;
PSHARED_FACE SharedFace = FontGDI->SharedFace;
- PSHARED_FACE_CACHE Cache = (PRIMARYLANGID(gusLanguageID) == LANG_ENGLISH) ? &SharedFace->EnglishUS : &SharedFace->UserLanguage;
+ PSHARED_FACE_CACHE Cache;
FT_Face Face = SharedFace->Face;
+ if (PRIMARYLANGID(gusLanguageID) == LANG_ENGLISH)
+ {
+ Cache = &SharedFace->EnglishUS;
+ }
+ else
+ {
+ Cache = &SharedFace->UserLanguage;
+ }
+
if (Cache->OutlineRequiredSize && Size < Cache->OutlineRequiredSize)
{
return Cache->OutlineRequiredSize;
}
- /* family name */
- RtlInitUnicodeString(&FamilyNameW, NULL);
- IntGetFontLocalizedName(&FamilyNameW, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID);
-
- /* face name */
- RtlInitUnicodeString(&FaceNameW, NULL);
- IntGetFontLocalizedName(&FaceNameW, SharedFace, TT_NAME_ID_FULL_NAME, gusLanguageID);
-
- /* style name */
- RtlInitUnicodeString(&StyleNameW, NULL);
- IntGetFontLocalizedName(&StyleNameW, SharedFace, TT_NAME_ID_FONT_SUBFAMILY, gusLanguageID);
-
- /* unique name (full name) */
- RtlInitUnicodeString(&FullNameW, NULL);
- IntGetFontLocalizedName(&FullNameW, SharedFace, TT_NAME_ID_UNIQUE_ID, gusLanguageID);
+ IntInitFontNames(&FontNames, SharedFace);
if (!Cache->OutlineRequiredSize)
{
- UINT Needed;
- Needed = sizeof(OUTLINETEXTMETRICW);
- Needed += FamilyNameW.Length + sizeof(WCHAR);
- Needed += FaceNameW.Length + sizeof(WCHAR);
- Needed += StyleNameW.Length + sizeof(WCHAR);
- Needed += FullNameW.Length + sizeof(WCHAR);
-
- Cache->OutlineRequiredSize = Needed;
+ Cache->OutlineRequiredSize = FontNames.OtmSize;
}
if (Size < Cache->OutlineRequiredSize)
{
- RtlFreeUnicodeString(&FamilyNameW);
- RtlFreeUnicodeString(&FaceNameW);
- RtlFreeUnicodeString(&StyleNameW);
- RtlFreeUnicodeString(&FullNameW);
+ IntFreeFontNames(&FontNames);
return Cache->OutlineRequiredSize;
}
YScale = Face->size->metrics.y_scale;
IntLockFreeType();
- pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
+
+ pOS2 = FT_Get_Sfnt_Table(Face, FT_SFNT_OS2);
if (NULL == pOS2)
{
IntUnLockFreeType();
DPRINT1("Can't find OS/2 table - not TT font?\n");
- RtlFreeUnicodeString(&FamilyNameW);
- RtlFreeUnicodeString(&FaceNameW);
- RtlFreeUnicodeString(&StyleNameW);
- RtlFreeUnicodeString(&FullNameW);
+ IntFreeFontNames(&FontNames);
return 0;
}
- pHori = FT_Get_Sfnt_Table(Face, ft_sfnt_hhea);
+ pHori = FT_Get_Sfnt_Table(Face, FT_SFNT_HHEA);
if (NULL == pHori)
{
IntUnLockFreeType();
DPRINT1("Can't find HHEA table - not TT font?\n");
- RtlFreeUnicodeString(&FamilyNameW);
- RtlFreeUnicodeString(&FaceNameW);
- RtlFreeUnicodeString(&StyleNameW);
- RtlFreeUnicodeString(&FullNameW);
+ IntFreeFontNames(&FontNames);
return 0;
}
- pPost = FT_Get_Sfnt_Table(Face, ft_sfnt_post); /* We can live with this failing */
+ pPost = FT_Get_Sfnt_Table(Face, FT_SFNT_POST); /* We can live with this failing */
- Error = FT_Get_WinFNT_Header(Face , &Win);
+ Error = FT_Get_WinFNT_Header(Face, &WinFNT);
Otm->otmSize = Cache->OutlineRequiredSize;
- FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &Win : 0);
+ FillTM(&Otm->otmTextMetrics, FontGDI, pOS2, pHori, !Error ? &WinFNT : 0);
Otm->otmFiller = 0;
RtlCopyMemory(&Otm->otmPanoseNumber, pOS2->panose, PANOSE_COUNT);
Otm->otmsCharSlopeRun = pHori->caret_Slope_Run;
Otm->otmItalicAngle = 0; /* POST table */
Otm->otmEMSquare = Face->units_per_EM;
- Otm->otmAscent = (FT_MulFix(pOS2->sTypoAscender, YScale) + 32) >> 6;
- Otm->otmDescent = (FT_MulFix(pOS2->sTypoDescender, YScale) + 32) >> 6;
- Otm->otmLineGap = (FT_MulFix(pOS2->sTypoLineGap, YScale) + 32) >> 6;
- Otm->otmsCapEmHeight = (FT_MulFix(pOS2->sCapHeight, YScale) + 32) >> 6;
- Otm->otmsXHeight = (FT_MulFix(pOS2->sxHeight, YScale) + 32) >> 6;
- Otm->otmrcFontBox.left = (FT_MulFix(Face->bbox.xMin, XScale) + 32) >> 6;
- Otm->otmrcFontBox.right = (FT_MulFix(Face->bbox.xMax, XScale) + 32) >> 6;
- Otm->otmrcFontBox.top = (FT_MulFix(Face->bbox.yMax, YScale) + 32) >> 6;
- Otm->otmrcFontBox.bottom = (FT_MulFix(Face->bbox.yMin, YScale) + 32) >> 6;
+
+#define SCALE_X(value) ((FT_MulFix((value), XScale) + 32) >> 6)
+#define SCALE_Y(value) ((FT_MulFix((value), YScale) + 32) >> 6)
+
+ Otm->otmAscent = SCALE_Y(pOS2->sTypoAscender);
+ Otm->otmDescent = SCALE_Y(pOS2->sTypoDescender);
+ Otm->otmLineGap = SCALE_Y(pOS2->sTypoLineGap);
+ Otm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight);
+ Otm->otmsXHeight = SCALE_Y(pOS2->sxHeight);
+ Otm->otmrcFontBox.left = SCALE_X(Face->bbox.xMin);
+ Otm->otmrcFontBox.right = SCALE_X(Face->bbox.xMax);
+ Otm->otmrcFontBox.top = SCALE_Y(Face->bbox.yMax);
+ Otm->otmrcFontBox.bottom = SCALE_Y(Face->bbox.yMin);
Otm->otmMacAscent = Otm->otmTextMetrics.tmAscent;
Otm->otmMacDescent = -Otm->otmTextMetrics.tmDescent;
Otm->otmMacLineGap = Otm->otmLineGap;
Otm->otmusMinimumPPEM = 0; /* TT Header */
- Otm->otmptSubscriptSize.x = (FT_MulFix(pOS2->ySubscriptXSize, XScale) + 32) >> 6;
- Otm->otmptSubscriptSize.y = (FT_MulFix(pOS2->ySubscriptYSize, YScale) + 32) >> 6;
- Otm->otmptSubscriptOffset.x = (FT_MulFix(pOS2->ySubscriptXOffset, XScale) + 32) >> 6;
- Otm->otmptSubscriptOffset.y = (FT_MulFix(pOS2->ySubscriptYOffset, YScale) + 32) >> 6;
- Otm->otmptSuperscriptSize.x = (FT_MulFix(pOS2->ySuperscriptXSize, XScale) + 32) >> 6;
- Otm->otmptSuperscriptSize.y = (FT_MulFix(pOS2->ySuperscriptYSize, YScale) + 32) >> 6;
- Otm->otmptSuperscriptOffset.x = (FT_MulFix(pOS2->ySuperscriptXOffset, XScale) + 32) >> 6;
- Otm->otmptSuperscriptOffset.y = (FT_MulFix(pOS2->ySuperscriptYOffset, YScale) + 32) >> 6;
- Otm->otmsStrikeoutSize = (FT_MulFix(pOS2->yStrikeoutSize, YScale) + 32) >> 6;
- Otm->otmsStrikeoutPosition = (FT_MulFix(pOS2->yStrikeoutPosition, YScale) + 32) >> 6;
+ Otm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize);
+ Otm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize);
+ Otm->otmptSubscriptOffset.x = SCALE_X(pOS2->ySubscriptXOffset);
+ Otm->otmptSubscriptOffset.y = SCALE_Y(pOS2->ySubscriptYOffset);
+ Otm->otmptSuperscriptSize.x = SCALE_X(pOS2->ySuperscriptXSize);
+ Otm->otmptSuperscriptSize.y = SCALE_Y(pOS2->ySuperscriptYSize);
+ Otm->otmptSuperscriptOffset.x = SCALE_X(pOS2->ySuperscriptXOffset);
+ Otm->otmptSuperscriptOffset.y = SCALE_Y(pOS2->ySuperscriptYOffset);
+ Otm->otmsStrikeoutSize = SCALE_Y(pOS2->yStrikeoutSize);
+ Otm->otmsStrikeoutPosition = SCALE_Y(pOS2->yStrikeoutPosition);
+
if (!pPost)
{
Otm->otmsUnderscoreSize = 0;
}
else
{
- Otm->otmsUnderscoreSize = (FT_MulFix(pPost->underlineThickness, YScale) + 32) >> 6;
- Otm->otmsUnderscorePosition = (FT_MulFix(pPost->underlinePosition, YScale) + 32) >> 6;
+ Otm->otmsUnderscoreSize = SCALE_Y(pPost->underlineThickness);
+ Otm->otmsUnderscorePosition = SCALE_Y(pPost->underlinePosition);
}
- IntUnLockFreeType();
-
- Cp = (char*) Otm + sizeof(OUTLINETEXTMETRICW);
+#undef SCALE_X
+#undef SCALE_Y
- /* family name */
- Otm->otmpFamilyName = (LPSTR)(Cp - (char*) Otm);
- wcscpy((WCHAR*) Cp, FamilyNameW.Buffer);
- Cp += FamilyNameW.Length + sizeof(WCHAR);
-
- /* face name */
- Otm->otmpFaceName = (LPSTR)(Cp - (char*) Otm);
- wcscpy((WCHAR*) Cp, FaceNameW.Buffer);
- Cp += FaceNameW.Length + sizeof(WCHAR);
-
- /* style name */
- Otm->otmpStyleName = (LPSTR)(Cp - (char*) Otm);
- wcscpy((WCHAR*) Cp, StyleNameW.Buffer);
- Cp += StyleNameW.Length + sizeof(WCHAR);
-
- /* unique name (full name) */
- Otm->otmpFullName = (LPSTR)(Cp - (char*) Otm);
- wcscpy((WCHAR*) Cp, FullNameW.Buffer);
- Cp += FullNameW.Length + sizeof(WCHAR);
+ IntUnLockFreeType();
- ASSERT(Cp - (char*)Otm == Cache->OutlineRequiredSize);
+ pb = IntStoreFontNames(&FontNames, Otm);
+ ASSERT(pb - (BYTE*)Otm == Cache->OutlineRequiredSize);
- RtlFreeUnicodeString(&FamilyNameW);
- RtlFreeUnicodeString(&FaceNameW);
- RtlFreeUnicodeString(&StyleNameW);
- RtlFreeUnicodeString(&FullNameW);
+ IntFreeFontNames(&FontNames);
return Cache->OutlineRequiredSize;
}
-static PFONTGDI FASTCALL
-FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head)
+/* See https://msdn.microsoft.com/en-us/library/bb165625(v=vs.90).aspx */
+static BYTE
+CharSetFromLangID(LANGID LangID)
{
- PLIST_ENTRY Entry;
- PFONT_ENTRY CurrentEntry;
- ANSI_STRING EntryFaceNameA;
- UNICODE_STRING EntryFaceNameW;
- FONTGDI *FontGDI;
- NTSTATUS status;
-
- Entry = Head->Flink;
- while (Entry != Head)
+ /* FIXME: Add more and fix if wrong */
+ switch (PRIMARYLANGID(LangID))
{
- CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
+ case LANG_CHINESE:
+ switch (SUBLANGID(LangID))
+ {
+ case SUBLANG_CHINESE_TRADITIONAL:
+ return CHINESEBIG5_CHARSET;
+ case SUBLANG_CHINESE_SIMPLIFIED:
+ default:
+ break;
+ }
+ return GB2312_CHARSET;
- FontGDI = CurrentEntry->Font;
- ASSERT(FontGDI);
+ case LANG_CZECH: case LANG_HUNGARIAN: case LANG_POLISH:
+ case LANG_SLOVAK: case LANG_SLOVENIAN: case LANG_ROMANIAN:
+ return EASTEUROPE_CHARSET;
- RtlInitAnsiString(&EntryFaceNameA, FontGDI->SharedFace->Face->family_name);
- status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE);
- if (!NT_SUCCESS(status))
- {
- break;
- }
-
- if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length)
- {
- EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR);
- EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0';
- }
-
- if (RtlEqualUnicodeString(FaceName, &EntryFaceNameW, TRUE))
- {
- RtlFreeUnicodeString(&EntryFaceNameW);
- return FontGDI;
- }
-
- RtlFreeUnicodeString(&EntryFaceNameW);
- Entry = Entry->Flink;
- }
-
- return NULL;
-}
-
-static PFONTGDI FASTCALL
-FindFaceNameInLists(PUNICODE_STRING FaceName)
-{
- PPROCESSINFO Win32Process;
- PFONTGDI Font;
-
- /* Search the process local list.
- We do not have to search the 'Mem' list, since those fonts are linked in the PrivateFontListHead */
- Win32Process = PsGetCurrentProcessWin32Process();
- IntLockProcessPrivateFonts(Win32Process);
- Font = FindFaceNameInList(FaceName, &Win32Process->PrivateFontListHead);
- IntUnLockProcessPrivateFonts(Win32Process);
- if (NULL != Font)
- {
- return Font;
- }
-
- /* Search the global list */
- IntLockGlobalFonts();
- Font = FindFaceNameInList(FaceName, &g_FontListHead);
- IntUnLockGlobalFonts();
-
- return Font;
-}
-
-/* See https://msdn.microsoft.com/en-us/library/bb165625(v=vs.90).aspx */
-static BYTE
-CharSetFromLangID(LANGID LangID)
-{
- /* FIXME: Add more and fix if wrong */
- switch (PRIMARYLANGID(LangID))
- {
- case LANG_CHINESE:
- switch (SUBLANGID(LangID))
- {
- case SUBLANG_CHINESE_TRADITIONAL:
- return CHINESEBIG5_CHARSET;
- case SUBLANG_CHINESE_SIMPLIFIED:
- default:
- break;
- }
- return GB2312_CHARSET;
-
- case LANG_CZECH: case LANG_HUNGARIAN: case LANG_POLISH:
- case LANG_SLOVAK: case LANG_SLOVENIAN: case LANG_ROMANIAN:
- return EASTEUROPE_CHARSET;
-
- case LANG_RUSSIAN: case LANG_BULGARIAN: case LANG_MACEDONIAN:
- case LANG_SERBIAN: case LANG_UKRAINIAN:
- return RUSSIAN_CHARSET;
+ case LANG_RUSSIAN: case LANG_BULGARIAN: case LANG_MACEDONIAN:
+ case LANG_SERBIAN: case LANG_UKRAINIAN:
+ return RUSSIAN_CHARSET;
case LANG_ARABIC: return ARABIC_CHARSET;
case LANG_GREEK: return GREEK_CHARSET;
if (0 == Ntm->ntmFlags) Ntm->ntmFlags = NTM_REGULAR;
- Ntm->ntmSizeEM = Otm->otmEMSquare;
- Ntm->ntmCellHeight = Otm->otmEMSquare;
- Ntm->ntmAvgWidth = 0;
-
Info->FontType = (0 != (TM->tmPitchAndFamily & TMPF_TRUETYPE)
? TRUETYPE_FONTTYPE : 0);
/* full name */
if (!FullName)
FullName = (WCHAR*)((ULONG_PTR) Otm + (ULONG_PTR)Otm->otmpFaceName);
-
+
RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName,
sizeof(Info->EnumLogFontEx.elfFullName),
FullName);
- ExFreePoolWithTag(Otm, GDITAG_TEXT);
-
RtlInitAnsiString(&StyleA, Face->style_name);
StyleW.Buffer = Info->EnumLogFontEx.elfStyle;
StyleW.MaximumLength = sizeof(Info->EnumLogFontEx.elfStyle);
status = RtlAnsiStringToUnicodeString(&StyleW, &StyleA, FALSE);
if (!NT_SUCCESS(status))
{
+ ExFreePoolWithTag(Otm, GDITAG_TEXT);
return;
}
Info->EnumLogFontEx.elfScript[0] = UNICODE_NULL;
if (!pOS2)
{
IntUnLockFreeType();
+ ExFreePoolWithTag(Otm, GDITAG_TEXT);
return;
}
+ Ntm->ntmSizeEM = Otm->otmEMSquare;
+ Ntm->ntmCellHeight = pOS2->usWinAscent + pOS2->usWinDescent;
+ Ntm->ntmAvgWidth = 0;
+
+ ExFreePoolWithTag(Otm, GDITAG_TEXT);
+
fs.fsCsb[0] = pOS2->ulCodePageRange1;
fs.fsCsb[1] = pOS2->ulCodePageRange2;
fs.fsUsb[0] = pOS2->ulUnicodeRange1;
Info->NewTextMetricEx.ntmFontSig = fs;
}
-static int FASTCALL
-FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries)
-{
- DWORD i;
- UNICODE_STRING InfoFaceName;
-
- for (i = 0; i < InfoEntries; i++)
- {
- RtlInitUnicodeString(&InfoFaceName, Info[i].EnumLogFontEx.elfLogFont.lfFaceName);
- if (RtlEqualUnicodeString(&InfoFaceName, FaceName, TRUE))
- {
- return i;
- }
- }
-
- return -1;
-}
-
-static BOOLEAN FASTCALL
-FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName,
- PFONTFAMILYINFO Info, DWORD InfoEntries)
-{
- UNICODE_STRING LogFontFaceName;
-
- RtlInitUnicodeString(&LogFontFaceName, LogFont->lfFaceName);
- if (0 != LogFontFaceName.Length &&
- !RtlEqualUnicodeString(&LogFontFaceName, FaceName, TRUE))
- {
- return FALSE;
- }
-
- return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0;
-}
-
-static BOOL FASTCALL
-FontFamilyFound(PFONTFAMILYINFO InfoEntry,
- PFONTFAMILYINFO Info, DWORD InfoCount)
-{
- LPLOGFONTW plf1 = &InfoEntry->EnumLogFontEx.elfLogFont;
- LPWSTR pFullName1 = InfoEntry->EnumLogFontEx.elfFullName;
- LPWSTR pFullName2;
- DWORD i;
-
- for (i = 0; i < InfoCount; ++i)
- {
- LPLOGFONTW plf2 = &Info[i].EnumLogFontEx.elfLogFont;
- if (plf1->lfCharSet != plf2->lfCharSet)
- continue;
-
- pFullName2 = Info[i].EnumLogFontEx.elfFullName;
- if (_wcsicmp(pFullName1, pFullName2) != 0)
- continue;
-
- return TRUE;
- }
- return FALSE;
-}
-
static BOOLEAN FASTCALL
GetFontFamilyInfoForList(LPLOGFONTW LogFont,
PFONTFAMILYINFO Info,
+ LPCWSTR NominalName,
DWORD *pCount,
DWORD MaxCount,
PLIST_ENTRY Head)
{
if (Count < MaxCount)
{
- FontFamilyFillInfo(&Info[Count], NULL, NULL, FontGDI);
+ FontFamilyFillInfo(&Info[Count], NominalName, NULL, FontGDI);
}
Count++;
continue;
}
- FontFamilyFillInfo(&InfoEntry, NULL, NULL, FontGDI);
+ FontFamilyFillInfo(&InfoEntry, NominalName, NULL, FontGDI);
- if (_wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0 &&
- _wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfFullName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0)
+ if (NominalName)
{
- continue;
+ RtlStringCchCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName,
+ RTL_NUMBER_OF(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName),
+ NominalName);
}
-
- if (!FontFamilyFound(&InfoEntry, Info, min(Count, MaxCount)))
+ else
{
- if (Count < MaxCount)
+ if (_wcsnicmp(LogFont->lfFaceName,
+ InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName,
+ RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0 &&
+ _wcsnicmp(LogFont->lfFaceName,
+ InfoEntry.EnumLogFontEx.elfFullName,
+ RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0)
{
- RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry));
+ continue;
}
- Count++;
}
+
+ if (Count < MaxCount)
+ {
+ RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry));
+ }
+ Count++;
}
*pCount = Count;
{
PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead;
PFONTSUBST_ENTRY pCurrentEntry;
- PUNICODE_STRING pFromW;
- FONTGDI *FontGDI;
+ PUNICODE_STRING pFromW, pToW;
LOGFONTW lf = *LogFont;
- UNICODE_STRING NameW;
+ PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process();
for (pEntry = pHead->Flink; pEntry != pHead; pEntry = pEntry->Flink)
{
pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM];
if (LogFont->lfFaceName[0] != UNICODE_NULL)
{
- if (!FontFamilyInclude(LogFont, pFromW, Info, min(*pCount, MaxCount)))
+ if (_wcsicmp(LogFont->lfFaceName, pFromW->Buffer) != 0)
continue; /* mismatch */
}
- RtlStringCchCopyW(lf.lfFaceName, LF_FACESIZE, pFromW->Buffer);
- SubstituteFontRecurse(&lf);
-
- RtlInitUnicodeString(&NameW, lf.lfFaceName);
- FontGDI = FindFaceNameInLists(&NameW);
- if (FontGDI == NULL)
+ pToW = &pCurrentEntry->FontNames[FONTSUBST_TO];
+ if (RtlEqualUnicodeString(pFromW, pToW, TRUE) &&
+ pCurrentEntry->CharSets[FONTSUBST_FROM] ==
+ pCurrentEntry->CharSets[FONTSUBST_TO])
{
- continue; /* no real font */
+ continue;
}
- if (*pCount < MaxCount)
- {
- FontFamilyFillInfo(&Info[*pCount], pFromW->Buffer, NULL, FontGDI);
- }
- (*pCount)++;
+ IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW);
+ SubstituteFontRecurse(&lf);
+ if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != lf.lfCharSet)
+ continue;
+
+ IntLockGlobalFonts();
+ GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &g_FontListHead);
+ IntUnLockGlobalFonts();
+
+ IntLockProcessPrivateFonts(Win32Process);
+ GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount,
+ &Win32Process->PrivateFontListHead);
+ IntUnLockProcessPrivateFonts(Win32Process);
+ break;
}
return TRUE;
ASSERT_FREETYPE_LOCK_HELD();
- CurrentEntry = g_FontCacheListHead.Flink;
- while (CurrentEntry != &g_FontCacheListHead)
+ for (CurrentEntry = g_FontCacheListHead.Flink;
+ CurrentEntry != &g_FontCacheListHead;
+ CurrentEntry = CurrentEntry->Flink)
{
FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry);
if ((FontEntry->Face == Face) &&
(FontEntry->RenderMode == RenderMode) &&
(SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx)))
break;
- CurrentEntry = CurrentEntry->Flink;
}
if (CurrentEntry == &g_FontCacheListHead)
{
error = FT_Get_WinFNT_Header(face, &WinFNT);
if (error)
+ {
+ DPRINT1("%s: Failed to request font size.\n", face->family_name);
+ ASSERT(FALSE);
return error;
+ }
FontGDI->tmHeight = WinFNT.pixel_height;
FontGDI->tmAscent = WinFNT.ascent;
return FT_Request_Size(face, &req);
}
+ /* See also: https://docs.microsoft.com/en-us/typography/opentype/spec/os2#fsselection */
+#define FM_SEL_USE_TYPO_METRICS 0x80
if (lfHeight > 0)
{
/* case (A): lfHeight is positive */
Sum = pOS2->usWinAscent + pOS2->usWinDescent;
- if (Sum == 0)
+ if (Sum == 0 || (pOS2->fsSelection & FM_SEL_USE_TYPO_METRICS))
{
Ascent = pHori->Ascender;
Descent = -pHori->Descender;
else if (lfHeight < 0)
{
/* case (B): lfHeight is negative */
- FontGDI->tmAscent = FT_MulDiv(-lfHeight, pOS2->usWinAscent, face->units_per_EM);
- FontGDI->tmDescent = FT_MulDiv(-lfHeight, pOS2->usWinDescent, face->units_per_EM);
+ if (pOS2->fsSelection & FM_SEL_USE_TYPO_METRICS)
+ {
+ FontGDI->tmAscent = FT_MulDiv(-lfHeight, pHori->Ascender, face->units_per_EM);
+ FontGDI->tmDescent = FT_MulDiv(-lfHeight, -pHori->Descender, face->units_per_EM);
+ }
+ else
+ {
+ FontGDI->tmAscent = FT_MulDiv(-lfHeight, pOS2->usWinAscent, face->units_per_EM);
+ FontGDI->tmDescent = FT_MulDiv(-lfHeight, pOS2->usWinDescent, face->units_per_EM);
+ }
FontGDI->tmHeight = FontGDI->tmAscent + FontGDI->tmDescent;
FontGDI->tmInternalLeading = FontGDI->tmHeight + lfHeight;
}
+#undef FM_SEL_USE_TYPO_METRICS
FontGDI->EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading;
FontGDI->EmHeight = max(FontGDI->EmHeight, 1);
LPMAT2 pmat2,
BOOL bIgnoreRotation)
{
- static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)};
PDC_ATTR pdcattr;
PTEXTOBJ TextObj;
PFONTGDI FontGDI;
/* World transform */
{
FT_Matrix ftmatrix;
- FLOATOBJ efTemp;
PMATRIX pmx = DC_pmxWorldToDevice(dc);
/* Create a freetype matrix, by converting to 16.16 fixpoint format */
- efTemp = pmx->efM11;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.xx = FLOATOBJ_GetLong(&efTemp);
-
- efTemp = pmx->efM12;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.xy = FLOATOBJ_GetLong(&efTemp);
-
- efTemp = pmx->efM21;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.yx = FLOATOBJ_GetLong(&efTemp);
-
- efTemp = pmx->efM22;
- FLOATOBJ_MulLong(&efTemp, 0x00010000);
- ftmatrix.yy = FLOATOBJ_GetLong(&efTemp);
+ FtMatrixFromMx(&ftmatrix, pmx);
if (memcmp(&ftmatrix, &identityMat, sizeof(identityMat)) != 0)
{
FT_GlyphSlot glyph;
FT_BitmapGlyph realglyph;
INT error, glyph_index, i, previous;
- ULONGLONG TotalWidth = 0;
+ ULONGLONG TotalWidth64 = 0;
BOOL use_kerning;
FT_Render_Mode RenderMode;
BOOLEAN Render;
{
FT_Vector delta;
FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
- TotalWidth += delta.x;
+ TotalWidth64 += delta.x;
}
- TotalWidth += realglyph->root.advance.x >> 10;
+ TotalWidth64 += realglyph->root.advance.x >> 10;
- if (((TotalWidth + 32) >> 6) <= MaxExtent && NULL != Fit)
+ if (((TotalWidth64 + 32) >> 6) <= MaxExtent && NULL != Fit)
{
*Fit = i + 1;
}
if (NULL != Dx)
{
- Dx[i] = (TotalWidth + 32) >> 6;
+ Dx[i] = (TotalWidth64 + 32) >> 6;
}
+ /* Bold and italic do not use the cache */
if (EmuBold || EmuItalic)
{
FT_Done_Glyph((FT_Glyph)realglyph);
- realglyph = NULL;
}
previous = glyph_index;
descender = FontGDI->tmDescent; /* Units below baseline */
IntUnLockFreeType();
- Size->cx = (TotalWidth + 32) >> 6;
+ Size->cx = (TotalWidth64 + 32) >> 6;
Size->cy = ascender + descender;
return TRUE;
Face = FontGdi->SharedFace->Face;
TEXTOBJ_UnlockText(TextObj);
+ memset(&fs, 0, sizeof(FONTSIGNATURE));
IntLockFreeType();
pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
- IntUnLockFreeType();
- memset(&fs, 0, sizeof(FONTSIGNATURE));
if (NULL != pOS2)
{
fs.fsCsb[0] = pOS2->ulCodePageRange1;
fs.fsCsb[0] |= FS_SYMBOL;
}
}
+ pOS2 = NULL;
+ IntUnLockFreeType();
DPRINT("Csb 1=%x 0=%x\n", fs.fsCsb[1],fs.fsCsb[0]);
if (fs.fsCsb[0] == 0)
{ /* Let's see if we can find any interesting cmaps */
Error = FT_Get_WinFNT_Header(Face, &Win);
- IntUnLockFreeType();
-
if (NT_SUCCESS(Status))
{
FillTM(&ptmwi->TextMetric, FontGDI, pOS2, pHori, !Error ? &Win : 0);
/* FIXME: Fill Diff member */
RtlZeroMemory(&ptmwi->Diff, sizeof(ptmwi->Diff));
}
+
+ IntUnLockFreeType();
}
TEXTOBJ_UnlockText(TextObj);
}
return Result;
}
+#define GOT_PENALTY(name, value) Penalty += (value)
+
// NOTE: See Table 1. of https://msdn.microsoft.com/en-us/library/ms969909.aspx
static UINT
GetFontPenalty(const LOGFONTW * LogFont,
{
/* CharSet Penalty 65000 */
/* Requested charset does not match the candidate's. */
- Penalty += 65000;
+ GOT_PENALTY("CharSet", 65000);
}
else
{
if (UserCharSet != TM->tmCharSet)
{
- /* UNDOCUMENTED */
- Penalty += 100;
+ /* UNDOCUMENTED: Not user language */
+ GOT_PENALTY("UNDOCUMENTED:NotUserLanguage", 100);
+
if (ANSI_CHARSET != TM->tmCharSet)
{
- /* UNDOCUMENTED */
- Penalty += 100;
+ /* UNDOCUMENTED: Not ANSI charset */
+ GOT_PENALTY("UNDOCUMENTED:NotAnsiCharSet", 100);
}
}
}
}
Byte = LogFont->lfOutPrecision;
- if (Byte == OUT_DEFAULT_PRECIS)
- Byte = OUT_OUTLINE_PRECIS; /* Is it OK? */
switch (Byte)
{
+ case OUT_DEFAULT_PRECIS:
+ /* nothing to do */
+ break;
case OUT_DEVICE_PRECIS:
if (!(TM->tmPitchAndFamily & TMPF_DEVICE) ||
!(TM->tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE)))
/* OutputPrecision Penalty 19000 */
/* Requested OUT_STROKE_PRECIS, but the device can't do it
or the candidate is not a vector font. */
- Penalty += 19000;
+ GOT_PENALTY("OutputPrecision", 19000);
}
break;
default:
/* OutputPrecision Penalty 19000 */
/* Or OUT_STROKE_PRECIS not requested, and the candidate
is a vector font that requires GDI support. */
- Penalty += 19000;
+ GOT_PENALTY("OutputPrecision", 19000);
}
break;
}
Byte = (LogFont->lfPitchAndFamily & 0x0F);
if (Byte == DEFAULT_PITCH)
Byte = VARIABLE_PITCH;
- if ((Byte & FIXED_PITCH) || (Byte & MONO_FONT))
+ if (Byte == FIXED_PITCH)
{
if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)
{
/* FixedPitch Penalty 15000 */
/* Requested a fixed pitch font, but the candidate is a
variable pitch font. */
- Penalty += 15000;
+ GOT_PENALTY("FixedPitch", 15000);
}
}
- if (Byte & VARIABLE_PITCH)
+ if (Byte == VARIABLE_PITCH)
{
if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH))
{
/* PitchVariable Penalty 350 */
/* Requested a variable pitch font, but the candidate is not a
variable pitch font. */
- Penalty += 350;
+ GOT_PENALTY("PitchVariable", 350);
}
}
{
/* DefaultPitchFixed Penalty 1 */
/* Requested DEFAULT_PITCH, but the candidate is fixed pitch. */
- Penalty += 1;
+ GOT_PENALTY("DefaultPitchFixed", 1);
}
}
/* FaceName Penalty 10000 */
/* Requested a face name, but the candidate's face name
does not match. */
- Penalty += 10000;
+ GOT_PENALTY("FaceName", 10000);
}
}
Byte = (LogFont->lfPitchAndFamily & 0xF0);
if (Byte != FF_DONTCARE)
{
- if (Byte & FF_MODERN)
- {
- if (TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH)
- {
- /* FixedPitch Penalty 15000 */
- /* Requested a fixed pitch font, but the candidate is a
- variable pitch font. */
- Penalty += 15000;
- }
- }
-
- if ((Byte & FF_ROMAN) || (Byte & FF_SWISS))
- {
- if (!(TM->tmPitchAndFamily & _TMPF_VARIABLE_PITCH))
- {
- /* PitchVariable Penalty 350 */
- /* Requested a variable pitch font, but the candidate is not a
- variable pitch font. */
- Penalty += 350;
- }
- }
-
-#define FF_MASK (FF_DECORATIVE | FF_SCRIPT | FF_SWISS)
- if ((Byte & FF_MASK) != (TM->tmPitchAndFamily & FF_MASK))
+ if (Byte != (TM->tmPitchAndFamily & 0xF0))
{
/* Family Penalty 9000 */
/* Requested a family, but the candidate's family is different. */
- Penalty += 9000;
+ GOT_PENALTY("Family", 9000);
}
-#undef FF_MASK
+ }
- if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE)
- {
- /* FamilyUnknown Penalty 8000 */
- /* Requested a family, but the candidate has no family. */
- Penalty += 8000;
- }
+ if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE)
+ {
+ /* FamilyUnknown Penalty 8000 */
+ /* Requested a family, but the candidate has no family. */
+ GOT_PENALTY("FamilyUnknown", 8000);
}
/* Is the candidate a non-vector font? */
/* HeightBigger Penalty 600 */
/* The candidate is a nonvector font and is bigger than the
requested height. */
- Penalty += 600;
+ GOT_PENALTY("HeightBigger", 600);
/* HeightBiggerDifference Penalty 150 */
/* The candidate is a raster font and is larger than the
requested height. Penalty * height difference */
- Penalty += 150 * labs(TM->tmHeight - labs(LogFont->lfHeight));
+ GOT_PENALTY("HeightBiggerDifference", 150 * labs(TM->tmHeight - labs(LogFont->lfHeight)));
fNeedScaling = TRUE;
}
/* HeightSmaller Penalty 150 */
/* The candidate is a raster font and is smaller than the
requested height. Penalty * height difference */
- Penalty += 150 * labs(TM->tmHeight - labs(LogFont->lfHeight));
+ GOT_PENALTY("HeightSmaller", 150 * labs(TM->tmHeight - labs(LogFont->lfHeight)));
fNeedScaling = TRUE;
}
/* FamilyUnlikely Penalty 50 */
/* Requested a roman/modern/swiss family, but the
candidate is decorative/script. */
- Penalty += 50;
+ GOT_PENALTY("FamilyUnlikely", 50);
break;
default:
break;
/* FamilyUnlikely Penalty 50 */
/* Or requested decorative/script, and the candidate is
roman/modern/swiss. */
- Penalty += 50;
+ GOT_PENALTY("FamilyUnlikely", 50);
break;
default:
break;
/* Width Penalty 50 */
/* Requested a nonzero width, but the candidate's width
doesn't match. Penalty * width difference */
- Penalty += 50 * labs(LogFont->lfWidth - TM->tmAveCharWidth);
+ GOT_PENALTY("Width", 50 * labs(LogFont->lfWidth - TM->tmAveCharWidth));
if (!(TM->tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR)))
fNeedScaling = TRUE;
{
/* SizeSynth Penalty 50 */
/* The candidate is a raster font that needs scaling by GDI. */
- Penalty += 50;
+ GOT_PENALTY("SizeSynth", 50);
}
if (!!LogFont->lfItalic != !!TM->tmItalic)
/* Requested font and candidate font do not agree on italic status,
and the desired result cannot be simulated. */
/* Adjusted to 40 to satisfy (Oblique Penalty > Book Penalty). */
- Penalty += 40;
+ GOT_PENALTY("Italic", 40);
}
else if (LogFont->lfItalic && !ItalicFromStyle(style_name))
{
/* ItalicSim Penalty 1 */
/* Requested italic font but the candidate is not italic,
although italics can be simulated. */
- Penalty += 1;
+ GOT_PENALTY("ItalicSim", 1);
}
}
/* NotTrueType Penalty 4 */
/* Requested OUT_TT_PRECIS, but the candidate is not a
TrueType font. */
- Penalty += 4;
+ GOT_PENALTY("NotTrueType", 4);
}
}
/* Weight Penalty 3 */
/* The candidate's weight does not match the requested weight.
Penalty * (weight difference/10) */
- Penalty += 3 * (labs(Long - TM->tmWeight) / 10);
+ GOT_PENALTY("Weight", 3 * (labs(Long - TM->tmWeight) / 10));
}
if (!LogFont->lfUnderline && TM->tmUnderlined)
/* Underline Penalty 3 */
/* Requested font has no underline, but the candidate is
underlined. */
- Penalty += 3;
+ GOT_PENALTY("Underline", 3);
}
if (!LogFont->lfStrikeOut && TM->tmStruckOut)
/* StrikeOut Penalty 3 */
/* Requested font has no strike-out, but the candidate is
struck out. */
- Penalty += 3;
+ GOT_PENALTY("StrikeOut", 3);
}
/* Is the candidate a non-vector font? */
/* VectorHeightSmaller Penalty 2 */
/* Candidate is a vector font that is smaller than the
requested height. Penalty * height difference */
- Penalty += 2 * labs(TM->tmHeight - LogFont->lfHeight);
+ GOT_PENALTY("VectorHeightSmaller", 2 * labs(TM->tmHeight - LogFont->lfHeight));
}
if (LogFont->lfHeight != 0 && TM->tmHeight > LogFont->lfHeight)
{
/* VectorHeightBigger Penalty 1 */
/* Candidate is a vector font that is bigger than the
requested height. Penalty * height difference */
- Penalty += 1 * labs(TM->tmHeight - LogFont->lfHeight);
+ GOT_PENALTY("VectorHeightBigger", 1 * labs(TM->tmHeight - LogFont->lfHeight));
}
}
{
/* DeviceFavor Penalty 2 */
/* Extra penalty for all nondevice fonts. */
- Penalty += 2;
+ GOT_PENALTY("DeviceFavor", 2);
}
if (TM->tmAveCharWidth >= 5 && TM->tmHeight >= 5)
{
/* Aspect Penalty 30 */
/* The aspect rate is >= 3. It seems like a bad font. */
- Penalty += ((TM->tmAveCharWidth / TM->tmHeight) - 2) * 30;
+ GOT_PENALTY("Aspect", ((TM->tmAveCharWidth / TM->tmHeight) - 2) * 30);
}
else if (TM->tmHeight / TM->tmAveCharWidth >= 3)
{
/* Aspect Penalty 30 */
/* The aspect rate is >= 3. It seems like a bad font. */
- Penalty += ((TM->tmHeight / TM->tmAveCharWidth) - 2) * 30;
+ GOT_PENALTY("Aspect", ((TM->tmHeight / TM->tmAveCharWidth) - 2) * 30);
}
}
return Penalty; /* success */
}
+#undef GOT_PENALTY
+
static __inline VOID
FindBestFontFromList(FONTOBJ **FontObj, ULONG *MatchPenalty,
const LOGFONTW *LogFont,
Otm = ExAllocatePoolWithTag(PagedPool, OldOtmSize, GDITAG_TEXT);
/* get the FontObj of lowest penalty */
- Entry = Head->Flink;
- while (Entry != Head)
+ for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink)
{
CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry);
- Entry = Entry->Flink;
FontGDI = CurrentEntry->Font;
ASSERT(FontGDI);
FT_ULong tmp_size = 0;
FT_Face Face = Font->SharedFace->Face;
+ ASSERT_FREETYPE_LOCK_NOT_HELD();
+ IntLockFreeType();
+
if (FT_HAS_MULTIPLE_MASTERS(Face))
Font->FontObj.flFontType |= FO_MULTIPLEMASTER;
if (FT_HAS_VERTICAL(Face))
{
Font->FontObj.flFontType |= (FO_CFF|FO_POSTSCRIPT);
}
+
+ IntUnLockFreeType();
+}
+
+static BOOL
+MatchFontName(PSHARED_FACE SharedFace, LPCWSTR lfFaceName, FT_UShort NameID, FT_UShort LangID)
+{
+ NTSTATUS Status;
+ UNICODE_STRING Name1, Name2;
+
+ if (lfFaceName[0] == UNICODE_NULL)
+ return FALSE;
+
+ RtlInitUnicodeString(&Name1, lfFaceName);
+
+ RtlInitUnicodeString(&Name2, NULL);
+ Status = IntGetFontLocalizedName(&Name2, SharedFace, NameID, LangID);
+
+ if (NT_SUCCESS(Status))
+ {
+ if (RtlCompareUnicodeString(&Name1, &Name2, TRUE) == 0)
+ {
+ RtlFreeUnicodeString(&Name2);
+ return TRUE;
+ }
+
+ RtlFreeUnicodeString(&Name2);
+ }
+
+ return FALSE;
+}
+
+static BOOL
+MatchFontNames(PSHARED_FACE SharedFace, LPCWSTR lfFaceName)
+{
+ if (MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FONT_FAMILY, LANG_ENGLISH) ||
+ MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FULL_NAME, LANG_ENGLISH))
+ {
+ return TRUE;
+ }
+ if (PRIMARYLANGID(gusLanguageID) != LANG_ENGLISH)
+ {
+ if (MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FONT_FAMILY, gusLanguageID) ||
+ MatchFontName(SharedFace, lfFaceName, TT_NAME_ID_FULL_NAME, gusLanguageID))
+ {
+ return TRUE;
+ }
+ }
+ return FALSE;
}
NTSTATUS
}
else
{
- UNICODE_STRING FaceName;
+ UNICODE_STRING Name;
PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT);
+ PSHARED_FACE SharedFace = FontGdi->SharedFace;
IntLockFreeType();
IntRequestFontSize(NULL, FontGdi, pLogFont->lfWidth, pLogFont->lfHeight);
IntUnLockFreeType();
- RtlInitUnicodeString(&FaceName, NULL);
- IntGetFontLocalizedName(&FaceName, FontGdi->SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID);
-
- /* truncated copy */
- FaceName.Length = (USHORT)min(FaceName.Length, (LF_FACESIZE - 1) * sizeof(WCHAR));
- FaceName.MaximumLength = (USHORT)(FaceName.Length + sizeof(UNICODE_NULL));
- RtlCopyMemory(TextObj->FaceName, FaceName.Buffer, FaceName.MaximumLength);
-
- RtlFreeUnicodeString(&FaceName);
+ TextObj->TextFace[0] = UNICODE_NULL;
+ if (MatchFontNames(SharedFace, SubstitutedLogFont.lfFaceName))
+ {
+ RtlStringCchCopyW(TextObj->TextFace, _countof(TextObj->TextFace), pLogFont->lfFaceName);
+ }
+ else
+ {
+ RtlInitUnicodeString(&Name, NULL);
+ Status = IntGetFontLocalizedName(&Name, SharedFace, TT_NAME_ID_FONT_FAMILY, gusLanguageID);
+ if (NT_SUCCESS(Status))
+ {
+ /* truncated copy */
+ IntUnicodeStringToBuffer(TextObj->TextFace, sizeof(TextObj->TextFace), &Name);
+ RtlFreeUnicodeString(&Name);
+ }
+ }
// Need hdev, when freetype is loaded need to create DEVOBJ for
// Consumer and Producer.
DWORD dwType)
{
UNICODE_STRING EntryFileName;
- POBJECT_NAME_INFORMATION NameInfo1, NameInfo2;
+ POBJECT_NAME_INFORMATION NameInfo1 = NULL, NameInfo2 = NULL;
PLIST_ENTRY ListEntry;
PFONT_ENTRY FontEntry;
ULONG Size, i, Count;
BOOL IsEqual;
FONTFAMILYINFO *FamInfo;
const ULONG MaxFamInfo = 64;
+ const ULONG MAX_FAM_INFO_BYTES = sizeof(FONTFAMILYINFO) * MaxFamInfo;
BOOL bSuccess;
+ const ULONG NAMEINFO_SIZE = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR);
DPRINT("IntGdiGetFontResourceInfo: dwType == %lu\n", dwType);
- /* Create buffer for full path name */
- Size = sizeof(OBJECT_NAME_INFORMATION) + MAX_PATH * sizeof(WCHAR);
- NameInfo1 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF);
- if (!NameInfo1)
+ do
{
- EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
- return FALSE;
- }
+ /* Create buffer for full path name */
+ NameInfo1 = ExAllocatePoolWithTag(PagedPool, NAMEINFO_SIZE, TAG_FINF);
+ if (!NameInfo1)
+ break;
- /* Get the full path name */
- if (!IntGetFullFileName(NameInfo1, Size, FileName))
- {
- ExFreePoolWithTag(NameInfo1, TAG_FINF);
- return FALSE;
- }
+ /* Get the full path name */
+ if (!IntGetFullFileName(NameInfo1, NAMEINFO_SIZE, FileName))
+ break;
- /* Create a buffer for the entries' names */
- NameInfo2 = ExAllocatePoolWithTag(PagedPool, Size, TAG_FINF);
- if (!NameInfo2)
- {
- ExFreePoolWithTag(NameInfo1, TAG_FINF);
- EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
- return FALSE;
- }
+ /* Create a buffer for the entries' names */
+ NameInfo2 = ExAllocatePoolWithTag(PagedPool, NAMEINFO_SIZE, TAG_FINF);
+ if (!NameInfo2)
+ break;
- FamInfo = ExAllocatePoolWithTag(PagedPool,
- sizeof(FONTFAMILYINFO) * MaxFamInfo,
- TAG_FINF);
- if (!FamInfo)
+ FamInfo = ExAllocatePoolWithTag(PagedPool, MAX_FAM_INFO_BYTES, TAG_FINF);
+ } while (0);
+
+ if (!NameInfo1 || !NameInfo2 || !FamInfo)
{
- ExFreePoolWithTag(NameInfo2, TAG_FINF);
- ExFreePoolWithTag(NameInfo1, TAG_FINF);
+ if (NameInfo2)
+ ExFreePoolWithTag(NameInfo2, TAG_FINF);
+
+ if (NameInfo1)
+ ExFreePoolWithTag(NameInfo1, TAG_FINF);
+
EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
return FALSE;
}
- /* Try to find the pathname in the global font list */
+
Count = 0;
+
+ /* Try to find the pathname in the global font list */
IntLockGlobalFonts();
for (ListEntry = g_FontListHead.Flink; ListEntry != &g_FontListHead;
ListEntry = ListEntry->Flink)
continue;
RtlInitUnicodeString(&EntryFileName , FontEntry->Font->Filename);
- if (!IntGetFullFileName(NameInfo2, Size, &EntryFileName))
+ if (!IntGetFullFileName(NameInfo2, NAMEINFO_SIZE, &EntryFileName))
continue;
if (!RtlEqualUnicodeString(&NameInfo1->Name, &NameInfo2->Name, FALSE))
/* Free the buffers */
ExFreePoolWithTag(NameInfo1, TAG_FINF);
- ExFreePool(NameInfo2);
+ ExFreePoolWithTag(NameInfo2, TAG_FINF);
if (Count == 0 && dwType != 5)
{
case 1: /* copy the font title */
/* calculate the required size */
Size = 0;
- Size += wcslen(FamInfo[0].EnumLogFontEx.elfLogFont.lfFaceName);
- if (FamInfo[0].EnumLogFontEx.elfStyle[0] &&
- _wcsicmp(FamInfo[0].EnumLogFontEx.elfStyle, L"Regular") != 0)
- {
- Size += 1 + wcslen(FamInfo[0].EnumLogFontEx.elfStyle);
- }
- for (i = 1; i < Count; ++i)
+ for (i = 0; i < Count; ++i)
{
- Size += 3; /* " & " */
+ if (i > 0)
+ Size += 3; /* " & " */
Size += wcslen(FamInfo[i].EnumLogFontEx.elfLogFont.lfFaceName);
if (FamInfo[i].EnumLogFontEx.elfStyle[0] &&
_wcsicmp(FamInfo[i].EnumLogFontEx.elfStyle, L"Regular") != 0)
/* store font title to buffer */
WCHAR *psz = pBuffer;
*psz = 0;
- IntAddNameFromFamInfo(psz, &FamInfo[0]);
- for (i = 1; i < Count; ++i)
+ for (i = 0; i < Count; ++i)
{
- wcscat(psz, L" & ");
+ if (i > 0)
+ wcscat(psz, L" & ");
IntAddNameFromFamInfo(psz, &FamInfo[i]);
}
psz[wcslen(psz) + 1] = UNICODE_NULL;
/* Enumerate font families in the global list */
IntLockGlobalFonts();
Count = 0;
- if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &g_FontListHead) )
+ if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &g_FontListHead) )
{
IntUnLockGlobalFonts();
ExFreePoolWithTag(Info, GDITAG_TEXT);
/* Enumerate font families in the process local list */
Win32Process = PsGetCurrentProcessWin32Process();
IntLockProcessPrivateFonts(Win32Process);
- if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size,
+ if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size,
&Win32Process->PrivateFontListHead))
{
IntUnLockProcessPrivateFonts(Win32Process);
return lValue;
}
+FORCEINLINE LONG FASTCALL
+IntNormalizeAngle(LONG nTenthAngle)
+{
+ const LONG nFullAngle = 360 * 10;
+ nTenthAngle %= nFullAngle;
+ return (nTenthAngle + nFullAngle) % nFullAngle;
+}
+
BOOL
APIENTRY
-GreExtTextOutW(
- IN HDC hDC,
+IntExtTextOutW(
+ IN PDC dc,
IN INT XStart,
IN INT YStart,
IN UINT fuOptions,
* appropriate)
*/
- DC *dc;
PDC_ATTR pdcattr;
SURFOBJ *SurfObj;
SURFACE *psurf = NULL;
FT_Face face;
FT_GlyphSlot glyph;
FT_BitmapGlyph realglyph;
- LONGLONG TextLeft, RealXStart;
- ULONG TextTop, previous, BackgroundLeft;
+ LONGLONG TextLeft64, TextTop64, DeltaX64, DeltaY64, XStart64, YStart64;
+ ULONG previous;
FT_Bool use_kerning;
RECTL DestRect, MaskRect;
POINTL SourcePoint, BrushOrigin;
HBITMAP HSourceGlyph;
SURFOBJ *SourceGlyphSurf;
SIZEL bitSize;
- INT yoff;
FONTOBJ *FontObj;
PFONTGDI FontGDI;
PTEXTOBJ TextObj = NULL;
BOOL DoBreak = FALSE;
USHORT DxShift;
PMATRIX pmxWorldToDevice;
- LONG fixAscender, fixDescender;
+ LONG lfEscapement, lfWidth;
FLOATOBJ Scale;
LOGFONTW *plf;
BOOL EmuBold, EmuItalic;
int thickness;
BOOL bResult;
+ FT_Matrix mat = identityMat, matWidth, matEscape, matWorld;
+ FT_Vector vecs[9];
/* Check if String is valid */
if ((Count > 0xFFFF) || (Count > 0 && String == NULL))
return FALSE;
}
- /* NOTE: This function locks the screen DC, so it must never be called
- with a DC already locked */
Render = IntIsFontRenderingEnabled();
- // TODO: Write test-cases to exactly match real Windows in different
- // bad parameters (e.g. does Windows check the DC or the RECT first?).
- dc = DC_LockDc(hDC);
- if (!dc)
- {
- EngSetLastError(ERROR_INVALID_HANDLE);
- return FALSE;
- }
-
if (PATH_IsPathOpen(dc->dclevel))
{
bResult = PATH_ExtTextOut(dc,
IntLPtoDP(dc, (POINT *)lprc, 2);
}
- if (pdcattr->lTextAlign & TA_UPDATECP)
+ if (pdcattr->flTextAlign & TA_UPDATECP)
{
Start.x = pdcattr->ptlCurrent.x;
Start.y = pdcattr->ptlCurrent.y;
Start.y = YStart;
}
- IntLPtoDP(dc, &Start, 1);
- RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6;
- YStart = Start.y + dc->ptlDCOrig.y;
-
SourcePoint.x = 0;
SourcePoint.y = 0;
MaskRect.left = 0;
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL);
EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic);
+ if (FT_IS_SCALABLE(face))
+ {
+ lfEscapement = IntNormalizeAngle(plf->lfEscapement);
+ lfWidth = labs(plf->lfWidth);
+ }
+ else
+ {
+ lfEscapement = lfWidth = 0;
+ }
if (Render)
RenderMode = IntGetFontRenderMode(plf);
}
/* NOTE: Don't trust face->size->metrics.ascender and descender values. */
+ DC_vUpdateWorldToDevice(dc);
if (dc->pdcattr->iGraphicsMode == GM_ADVANCED)
{
pmxWorldToDevice = DC_pmxWorldToDevice(dc);
- FtSetCoordinateTransform(face, pmxWorldToDevice);
-
- fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6;
- fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6;
}
else
{
pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault;
- FtSetCoordinateTransform(face, pmxWorldToDevice);
-
- fixAscender = FontGDI->tmAscent << 6;
- fixDescender = FontGDI->tmDescent << 6;
}
- /*
- * Process the vertical alignment and determine the yoff.
- */
-#define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM)
- if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE)
- yoff = 0;
- else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM)
- yoff = -(fixDescender >> 6);
- else /* TA_TOP */
- yoff = fixAscender >> 6;
-#undef VALIGN_MASK
+ IntWidthMatrix(face, &matWidth, lfWidth);
+ FT_Matrix_Multiply(&matWidth, &mat);
- use_kerning = FT_HAS_KERNING(face);
- previous = 0;
-
- /*
- * Process the horizontal alignment and modify XStart accordingly.
- */
- DxShift = fuOptions & ETO_PDY ? 1 : 0;
- if (pdcattr->lTextAlign & (TA_RIGHT | TA_CENTER))
- {
- ULONGLONG TextWidth = 0;
- LPCWSTR TempText = String;
- int iStart;
-
- /*
- * Calculate width of the text.
- */
-
- if (NULL != Dx)
- {
- iStart = Count < 2 ? 0 : Count - 2;
- TextWidth = Count < 2 ? 0 : (Dx[(Count-2)<<DxShift] << 6);
- }
- else
- {
- iStart = 0;
- }
- TempText = String + iStart;
-
- for (i = iStart; i < Count; i++)
- {
- glyph_index = get_glyph_index_flagged(face, *TempText, ETO_GLYPH_INDEX, fuOptions);
-
- if (EmuBold || EmuItalic)
- realglyph = NULL;
- else
- realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight,
- RenderMode, pmxWorldToDevice);
- if (!realglyph)
- {
- error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
- if (error)
- {
- DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index);
- }
-
- glyph = face->glyph;
- if (EmuBold || EmuItalic)
- {
- if (EmuBold)
- FT_GlyphSlot_Embolden(glyph);
- if (EmuItalic)
- FT_GlyphSlot_Oblique(glyph);
- realglyph = ftGdiGlyphSet(face, glyph, RenderMode);
- }
- else
- {
- realglyph = ftGdiGlyphCacheSet(face,
- glyph_index,
- plf->lfHeight,
- pmxWorldToDevice,
- glyph,
- RenderMode);
- }
- if (!realglyph)
- {
- DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
- IntUnLockFreeType();
- goto Cleanup;
- }
+ IntEscapeMatrix(&matEscape, lfEscapement);
+ FT_Matrix_Multiply(&matEscape, &mat);
- }
- /* Retrieve kerning distance */
- if (use_kerning && previous && glyph_index)
- {
- FT_Vector delta;
- FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
- TextWidth += delta.x;
- }
+ FtMatrixFromMx(&matWorld, pmxWorldToDevice);
+ matWorld.yx = -matWorld.yx;
+ matWorld.xy = -matWorld.xy;
+ FT_Matrix_Multiply(&matWorld, &mat);
- TextWidth += realglyph->root.advance.x >> 10;
+ FT_Set_Transform(face, &mat, NULL);
- if (EmuBold || EmuItalic)
- {
- FT_Done_Glyph((FT_Glyph)realglyph);
- realglyph = NULL;
- }
-
- previous = glyph_index;
- TempText++;
- }
-
- previous = 0;
-
- if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER)
- {
- RealXStart -= TextWidth / 2;
- }
- else
- {
- RealXStart -= TextWidth;
- }
- }
-
- psurf = dc->dclevel.pSurface;
- SurfObj = &psurf->SurfObj ;
-
- if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND))
- DC_vUpdateBackgroundBrush(dc) ;
-
- if(dc->pdcattr->ulDirty_ & DIRTY_TEXT)
- DC_vUpdateTextBrush(dc) ;
-
- if (!face->units_per_EM)
- {
- thickness = 1;
- }
- else
- {
- thickness = face->underline_thickness *
- face->size->metrics.y_ppem / face->units_per_EM;
- if (thickness <= 0)
- thickness = 1;
- }
-
- if ((fuOptions & ETO_OPAQUE) && plf->lfItalic)
+ // Calculate displacement of the text.
+ DeltaX64 = DeltaY64 = 0;
+ DxShift = fuOptions & ETO_PDY ? 1 : 0;
+ use_kerning = FT_HAS_KERNING(face);
+ previous = 0;
+ if ((fuOptions & ETO_OPAQUE) ||
+ (pdcattr->flTextAlign & (TA_CENTER | TA_RIGHT)) ||
+ memcmp(&mat, &identityMat, sizeof(mat)) != 0 ||
+ plf->lfUnderline || plf->lfStrikeOut)
{
- /* Draw background */
- TextLeft = RealXStart;
- TextTop = YStart;
- BackgroundLeft = (RealXStart + 32) >> 6;
for (i = 0; i < Count; ++i)
{
glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions);
+ // FIXME: Use FT_LOAD_BITMAP_METRICS_ONLY or cache.
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error)
{
- DPRINT1("Failed to load and render glyph! [index: %d]\n", glyph_index);
+ DPRINT1("Failed to load glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType();
+ bResult = FALSE;
goto Cleanup;
}
{
DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
IntUnLockFreeType();
+ bResult = FALSE;
goto Cleanup;
}
/* retrieve kerning distance and move pen position */
- if (use_kerning && previous && glyph_index && NULL == Dx)
+ if (use_kerning && previous && glyph_index && Dx == NULL)
{
FT_Vector delta;
FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
- TextLeft += delta.x;
- }
- DPRINT("TextLeft: %I64d\n", TextLeft);
- DPRINT("TextTop: %lu\n", TextTop);
- DPRINT("Advance: %d\n", realglyph->root.advance.x);
-
- DestRect.left = BackgroundLeft;
- DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6;
- DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6);
- DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6);
- MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
- if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
- {
- IntUpdateBoundsRect(dc, &DestRect);
+ DeltaX64 += delta.x;
+ DeltaY64 -= delta.y;
}
- IntEngBitBlt(
- &psurf->SurfObj,
- NULL,
- NULL,
- (CLIPOBJ *)&dc->co,
- NULL,
- &DestRect,
- &SourcePoint,
- &SourcePoint,
- &dc->eboBackground.BrushObject,
- &BrushOrigin,
- ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY));
- MouseSafetyOnDrawEnd(dc->ppdev);
- BackgroundLeft = DestRect.right;
-
- DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left;
- DestRect.right = DestRect.left + realglyph->bitmap.width;
- DestRect.top = TextTop + yoff - realglyph->top;
- DestRect.bottom = DestRect.top + realglyph->bitmap.rows;
-
- bitSize.cx = realglyph->bitmap.width;
- bitSize.cy = realglyph->bitmap.rows;
- MaskRect.right = realglyph->bitmap.width;
- MaskRect.bottom = realglyph->bitmap.rows;
- if (NULL == Dx)
+ if (Dx == NULL)
{
- TextLeft += realglyph->root.advance.x >> 10;
- DPRINT("New TextLeft: %I64d\n", TextLeft);
+ DeltaX64 += realglyph->root.advance.x >> 10;
+ DeltaY64 -= realglyph->root.advance.y >> 10;
}
else
{
- // FIXME this should probably be a matrix transform with TextTop as well.
+ // FIXME this should probably be a matrix transform with DeltaY64 as well.
Scale = pdcattr->mxWorldToDevice.efM11;
if (FLOATOBJ_Equal0(&Scale))
FLOATOBJ_Set1(&Scale);
/* do the shift before multiplying to preserve precision */
- FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6);
- TextLeft += FLOATOBJ_GetLong(&Scale);
- DPRINT("New TextLeft2: %I64d\n", TextLeft);
+ FLOATOBJ_MulLong(&Scale, Dx[i << DxShift] << 6);
+ DeltaX64 += FLOATOBJ_GetLong(&Scale);
}
if (DxShift)
{
- TextTop -= Dx[2 * i + 1] << 6;
+ DeltaY64 -= Dx[2 * i + 1] << 6;
}
previous = glyph_index;
- if (EmuBold || EmuItalic)
+ FT_Done_Glyph((FT_Glyph)realglyph);
+ }
+ }
+
+ // Process the X and Y alignments.
+ if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER)
+ {
+ XStart64 = -DeltaX64 / 2;
+ YStart64 = -DeltaY64 / 2;
+ }
+ else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT)
+ {
+ XStart64 = -DeltaX64;
+ YStart64 = -DeltaY64;
+ }
+ else
+ {
+ XStart64 = YStart64 = 0;
+ }
+
+ psurf = dc->dclevel.pSurface;
+ SurfObj = &psurf->SurfObj ;
+
+ if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND))
+ DC_vUpdateBackgroundBrush(dc) ;
+
+ if(dc->pdcattr->ulDirty_ & DIRTY_TEXT)
+ DC_vUpdateTextBrush(dc) ;
+
+ thickness = 1;
+ if (face->units_per_EM)
+ {
+ thickness = face->underline_thickness *
+ face->size->metrics.y_ppem / face->units_per_EM;
+ if (thickness <= 0)
+ thickness = 1;
+ }
+
+ /* Process the vertical alignment */
+#define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM)
+ RtlZeroMemory(vecs, sizeof(vecs));
+ if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BASELINE)
+ {
+ vecs[1].y = -FontGDI->tmAscent << 16; // upper left
+ vecs[4].y = 0; // baseline
+ vecs[0].y = FontGDI->tmDescent << 16; // lower left
+ }
+ else if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BOTTOM)
+ {
+ vecs[1].y = -FontGDI->tmHeight << 16; // upper left
+ vecs[4].y = -FontGDI->tmDescent << 16; // baseline
+ vecs[0].y = 0; // lower left
+ }
+ else /* TA_TOP */
+ {
+ vecs[1].y = 0; // upper left
+ vecs[4].y = FontGDI->tmAscent << 16; // baseline
+ vecs[0].y = FontGDI->tmHeight << 16; // lower left
+ }
+ vecs[2] = vecs[1]; // upper right
+ vecs[3] = vecs[0]; // lower right
+#undef VALIGN_MASK
+
+ // underline
+ if (plf->lfUnderline)
+ {
+ int position = 0;
+ if (face->units_per_EM)
+ {
+ position = face->underline_position *
+ face->size->metrics.y_ppem / face->units_per_EM;
+ }
+ vecs[5].y = vecs[6].y = vecs[4].y - (position << 16);
+ }
+
+ // strike through
+ if (plf->lfStrikeOut)
+ {
+ vecs[7].y = vecs[8].y = vecs[4].y - ((FontGDI->tmAscent / 3) << 16);
+ }
+
+ // invert y axis
+ IntEscapeMatrix(&matEscape, -lfEscapement);
+
+ // convert vecs
+ for (i = 0; i < 9; ++i)
+ {
+ POINT pt;
+ FT_Vector_Transform(&vecs[i], &matWidth);
+ FT_Vector_Transform(&vecs[i], &matEscape);
+ vecs[i].x += (Start.x << 16) + (XStart64 << 10);
+ vecs[i].y += (Start.y << 16) + (YStart64 << 10);
+ pt.x = vecs[i].x >> 16;
+ pt.y = vecs[i].y >> 16;
+ IntLPtoDP(dc, &pt, 1);
+ vecs[i].x = pt.x + dc->ptlDCOrig.x;
+ vecs[i].y = pt.y + dc->ptlDCOrig.y;
+ }
+ vecs[2].x += DeltaX64 >> 6;
+ vecs[2].y += DeltaY64 >> 6; // upper right
+ vecs[3].x += DeltaX64 >> 6;
+ vecs[3].y += DeltaY64 >> 6; // lower right
+ vecs[6].x += DeltaX64 >> 6;
+ vecs[6].y += DeltaY64 >> 6; // underline right
+ vecs[8].x += DeltaX64 >> 6;
+ vecs[8].y += DeltaY64 >> 6; // strike through right
+
+ if (fuOptions & ETO_OPAQUE)
+ {
+ /* Draw background */
+ RECTL Rect;
+ RtlZeroMemory(&Rect, sizeof(Rect));
+
+ if ((mat.xy == 0 && mat.yx == 0) || (mat.xx == 0 && mat.yy == 0))
+ {
+ Rect.left = Rect.top = MAXLONG;
+ Rect.right = Rect.bottom = MINLONG;
+ for (i = 0; i < 4; ++i)
{
- FT_Done_Glyph((FT_Glyph)realglyph);
- realglyph = NULL;
+ Rect.left = min(Rect.left, vecs[i].x);
+ Rect.top = min(Rect.top, vecs[i].y);
+ Rect.right = max(Rect.right, vecs[i].x);
+ Rect.bottom = max(Rect.bottom, vecs[i].y);
}
}
+ else
+ {
+ // FIXME: Use vecs[0] ... vecs[3] and EngFillPath
+ }
+
+ if (dc->fs & (DC_ACCUM_APP | DC_ACCUM_WMGR))
+ {
+ IntUpdateBoundsRect(dc, &Rect);
+ }
+
+ if (pdcattr->ulDirty_ & DIRTY_BACKGROUND)
+ DC_vUpdateBackgroundBrush(dc);
+ if (dc->dctype == DCTYPE_DIRECT)
+ MouseSafetyOnDrawStart(dc->ppdev, Rect.left, Rect.top, Rect.right, Rect.bottom);
+
+ SourcePoint.x = SourcePoint.y = 0;
+ BrushOrigin.x = BrushOrigin.y = 0;
+
+ psurf = dc->dclevel.pSurface;
+ IntEngBitBlt(
+ &psurf->SurfObj,
+ NULL,
+ NULL,
+ (CLIPOBJ *)&dc->co,
+ NULL,
+ &Rect,
+ &SourcePoint,
+ &SourcePoint,
+ &dc->eboBackground.BrushObject,
+ &BrushOrigin,
+ ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY));
+
+ if (dc->dctype == DCTYPE_DIRECT)
+ MouseSafetyOnDrawEnd(dc->ppdev);
}
EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0);
EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0);
- /* Assume success */
+ // The main rendering loop.
bResult = TRUE;
-
- /*
- * The main rendering loop.
- */
- TextLeft = RealXStart;
- TextTop = YStart;
- BackgroundLeft = (RealXStart + 32) >> 6;
+ TextLeft64 = vecs[4].x << 6;
+ TextTop64 = vecs[4].y << 6;
+ previous = 0;
for (i = 0; i < Count; ++i)
{
+ BOOL bNeedCache = (!EmuBold && !EmuItalic &&
+ memcmp(&mat, &identityMat, sizeof(mat)) == 0);
glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions);
-
- if (EmuBold || EmuItalic)
- realglyph = NULL;
- else
+ realglyph = NULL;
+ if (bNeedCache)
+ {
realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight,
RenderMode, pmxWorldToDevice);
+ }
if (!realglyph)
{
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
bResult = FALSE;
break;
}
-
glyph = face->glyph;
- if (EmuBold || EmuItalic)
- {
- if (EmuBold)
- FT_GlyphSlot_Embolden(glyph);
- if (EmuItalic)
- FT_GlyphSlot_Oblique(glyph);
- realglyph = ftGdiGlyphSet(face, glyph, RenderMode);
- }
- else
+ if (bNeedCache)
{
realglyph = ftGdiGlyphCacheSet(face,
glyph_index,
glyph,
RenderMode);
}
+ else
+ {
+ if (EmuBold)
+ FT_GlyphSlot_Embolden(glyph);
+ if (EmuItalic)
+ FT_GlyphSlot_Oblique(glyph);
+ realglyph = ftGdiGlyphSet(face, glyph, RenderMode);
+ }
if (!realglyph)
{
DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index);
{
FT_Vector delta;
FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
- TextLeft += delta.x;
+ TextLeft64 += delta.x;
+ TextTop64 -= delta.y;
}
- DPRINT("TextLeft: %I64d\n", TextLeft);
- DPRINT("TextTop: %lu\n", TextTop);
+ DPRINT("TextLeft64: %I64d\n", TextLeft64);
+ DPRINT("TextTop64: %I64d\n", TextTop64);
DPRINT("Advance: %d\n", realglyph->root.advance.x);
- if ((fuOptions & ETO_OPAQUE) && !plf->lfItalic)
- {
- DestRect.left = BackgroundLeft;
- DestRect.right = (TextLeft + (realglyph->root.advance.x >> 10) + 32) >> 6;
- DestRect.top = TextTop + yoff - ((fixAscender + 32) >> 6);
- DestRect.bottom = DestRect.top + ((fixAscender + fixDescender) >> 6);
-
- if (dc->dctype == DCTYPE_DIRECT)
- MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
-
- if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR))
- {
- IntUpdateBoundsRect(dc, &DestRect);
- }
- IntEngBitBlt(
- &psurf->SurfObj,
- NULL,
- NULL,
- (CLIPOBJ *)&dc->co,
- NULL,
- &DestRect,
- &SourcePoint,
- &SourcePoint,
- &dc->eboBackground.BrushObject,
- &BrushOrigin,
- ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY));
-
- if (dc->dctype == DCTYPE_DIRECT)
- MouseSafetyOnDrawEnd(dc->ppdev);
-
- BackgroundLeft = DestRect.right;
- }
-
- DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left;
+ DestRect.left = ((TextLeft64 + 32) >> 6) + realglyph->left;
DestRect.right = DestRect.left + realglyph->bitmap.width;
- DestRect.top = TextTop + yoff - realglyph->top;
+ DestRect.top = ((TextTop64 + 32) >> 6) - realglyph->top;
DestRect.bottom = DestRect.top + realglyph->bitmap.rows;
bitSize.cx = realglyph->bitmap.width;
if ( !HSourceGlyph )
{
DPRINT1("WARNING: EngCreateBitmap() failed!\n");
- // FT_Done_Glyph(realglyph);
bResult = FALSE;
+ if (EmuBold || EmuItalic)
+ {
+ FT_Done_Glyph((FT_Glyph)realglyph);
+ }
+
break;
}
SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph);
EngDeleteSurface((HSURF)HSourceGlyph);
DPRINT1("WARNING: EngLockSurface() failed!\n");
bResult = FALSE;
+ if (EmuBold || EmuItalic)
+ {
+ FT_Done_Glyph((FT_Glyph)realglyph);
+ }
+
break;
}
if (DoBreak)
{
- break;
- }
-
- if (plf->lfUnderline)
- {
- int i, position;
- if (!face->units_per_EM)
- {
- position = 0;
- }
- else
- {
- position = face->underline_position *
- face->size->metrics.y_ppem / face->units_per_EM;
- }
- for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i)
- {
- EngLineTo(SurfObj,
- (CLIPOBJ *)&dc->co,
- &dc->eboText.BrushObject,
- (TextLeft >> 6),
- TextTop + yoff - position + i,
- ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6),
- TextTop + yoff - position + i,
- NULL,
- ROP2_TO_MIX(R2_COPYPEN));
- }
- }
- if (plf->lfStrikeOut)
- {
- int i;
- for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i)
+ if (EmuBold || EmuItalic)
{
- EngLineTo(SurfObj,
- (CLIPOBJ *)&dc->co,
- &dc->eboText.BrushObject,
- (TextLeft >> 6),
- TextTop + yoff - (fixAscender >> 6) / 3 + i,
- ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6),
- TextTop + yoff - (fixAscender >> 6) / 3 + i,
- NULL,
- ROP2_TO_MIX(R2_COPYPEN));
+ FT_Done_Glyph((FT_Glyph)realglyph);
}
+
+ break;
}
if (NULL == Dx)
{
- TextLeft += realglyph->root.advance.x >> 10;
- DPRINT("New TextLeft: %I64d\n", TextLeft);
+ TextLeft64 += realglyph->root.advance.x >> 10;
+ TextTop64 -= realglyph->root.advance.y >> 10;
+ DPRINT("New TextLeft64: %I64d\n", TextLeft64);
+ DPRINT("New TextTop64: %I64d\n", TextTop64);
}
else
{
- // FIXME this should probably be a matrix transform with TextTop as well.
+ // FIXME this should probably be a matrix transform with TextTop64 as well.
Scale = pdcattr->mxWorldToDevice.efM11;
if (FLOATOBJ_Equal0(&Scale))
FLOATOBJ_Set1(&Scale);
/* do the shift before multiplying to preserve precision */
FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6);
- TextLeft += FLOATOBJ_GetLong(&Scale);
- DPRINT("New TextLeft2: %I64d\n", TextLeft);
+ TextLeft64 += FLOATOBJ_GetLong(&Scale);
+ DPRINT("New TextLeft64 2: %I64d\n", TextLeft64);
}
if (DxShift)
{
- TextTop -= Dx[2 * i + 1] << 6;
+ TextTop64 -= Dx[2 * i + 1] << 6;
}
previous = glyph_index;
- if (EmuBold || EmuItalic)
+ /* No cache, so clean up */
+ if (!bNeedCache)
{
FT_Done_Glyph((FT_Glyph)realglyph);
- realglyph = NULL;
}
}
- if (pdcattr->lTextAlign & TA_UPDATECP) {
+ if (plf->lfUnderline || plf->lfStrikeOut)
+ {
+ INT x0 = min(vecs[0].x, vecs[2].x);
+ INT y0 = min(vecs[0].y, vecs[2].y);
+ INT x1 = max(vecs[0].x, vecs[2].x);
+ INT y1 = max(vecs[0].y, vecs[2].y);
+ if (dc->dctype == DCTYPE_DIRECT)
+ MouseSafetyOnDrawStart(dc->ppdev, x0, y0, x1, y1);
+ }
+
+ if (plf->lfUnderline)
+ {
+ for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i)
+ {
+ LONG dx = (LONG)(DeltaX64 >> 6), dy = (LONG)(DeltaY64 >> 6);
+ if (labs(dx) > labs(dy))
+ {
+ // move vertical
+ EngLineTo(SurfObj, (CLIPOBJ *)&dc->co,
+ &dc->eboText.BrushObject,
+ vecs[5].x, vecs[5].y + i,
+ vecs[6].x, vecs[6].y + i,
+ NULL, ROP2_TO_MIX(R2_COPYPEN));
+ }
+ else
+ {
+ // move horizontal
+ EngLineTo(SurfObj, (CLIPOBJ *)&dc->co,
+ &dc->eboText.BrushObject,
+ vecs[5].x + i, vecs[5].y,
+ vecs[6].x + i, vecs[6].y,
+ NULL, ROP2_TO_MIX(R2_COPYPEN));
+ }
+ }
+ }
+
+ if (plf->lfStrikeOut)
+ {
+ for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i)
+ {
+ LONG dx = (LONG)(DeltaX64 >> 6), dy = (LONG)(DeltaY64 >> 6);
+ if (labs(dx) > labs(dy))
+ {
+ // move vertical
+ EngLineTo(SurfObj, (CLIPOBJ *)&dc->co,
+ &dc->eboText.BrushObject,
+ vecs[7].x, vecs[7].y + i,
+ vecs[8].x, vecs[8].y + i,
+ NULL, ROP2_TO_MIX(R2_COPYPEN));
+ }
+ else
+ {
+ // move horizontal
+ EngLineTo(SurfObj, (CLIPOBJ *)&dc->co,
+ &dc->eboText.BrushObject,
+ vecs[7].x + i, vecs[7].y,
+ vecs[8].x + i, vecs[8].y,
+ NULL, ROP2_TO_MIX(R2_COPYPEN));
+ }
+ }
+ }
+
+ if (plf->lfUnderline || plf->lfStrikeOut)
+ {
+ if (dc->dctype == DCTYPE_DIRECT)
+ MouseSafetyOnDrawEnd(dc->ppdev);
+ }
+
+ if (pdcattr->flTextAlign & TA_UPDATECP) {
pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x;
}
if (TextObj != NULL)
TEXTOBJ_UnlockText(TextObj);
+ return bResult;
+}
+
+
+BOOL
+APIENTRY
+GreExtTextOutW(
+ IN HDC hDC,
+ IN INT XStart,
+ IN INT YStart,
+ IN UINT fuOptions,
+ IN OPTIONAL PRECTL lprc,
+ IN LPCWSTR String,
+ IN INT Count,
+ IN OPTIONAL LPINT Dx,
+ IN DWORD dwCodePage)
+{
+ BOOL bResult;
+ DC *dc;
+
+ // TODO: Write test-cases to exactly match real Windows in different
+ // bad parameters (e.g. does Windows check the DC or the RECT first?).
+ dc = DC_LockDc(hDC);
+ if (!dc)
+ {
+ EngSetLastError(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ bResult = IntExtTextOutW( dc,
+ XStart,
+ YStart,
+ fuOptions,
+ lprc,
+ String,
+ Count,
+ Dx,
+ dwCodePage );
+
DC_UnlockDc(dc);
return bResult;
FT_Face Face = FontGDI->SharedFace->Face;
if (FT_IS_SFNT(Face))
{
- TT_OS2 *pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
+ TT_OS2 *pOS2;
+
+ IntLockFreeType();
+ pOS2 = FT_Get_Sfnt_Table(Face, ft_sfnt_os2);
DefChar = (pOS2->usDefaultChar ? get_glyph_index(Face, pOS2->usDefaultChar) : 0);
+ IntUnLockFreeType();
}
else
{
projects / reactos.git / blobdiff