svn path=/trunk/; revision=74353
/* Convert UTF-16 big endian to little endian */
SwapEndian(Buf, Name.string_len);
/* Convert UTF-16 big endian to little endian */
SwapEndian(Buf, Name.string_len);
- Status = RtlCreateUnicodeString(pNameW, Buf);
+ RtlCreateUnicodeString(pNameW, Buf);
+ Status = STATUS_SUCCESS;
-FontFamilyFillInfo(PFONTFAMILYINFO Info, PCWSTR FaceName, PFONTGDI FontGDI)
+FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName,
+ LPCWSTR FullName, PFONTGDI FontGDI)
{
ANSI_STRING StyleA;
UNICODE_STRING StyleW;
{
ANSI_STRING StyleA;
UNICODE_STRING StyleW;
DWORD fs0;
NTSTATUS status;
FT_Face Face = FontGDI->SharedFace->Face;
DWORD fs0;
NTSTATUS status;
FT_Face Face = FontGDI->SharedFace->Face;
+ RtlInitUnicodeString(&NameW, NULL);
RtlZeroMemory(Info, sizeof(FONTFAMILYINFO));
Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
Otm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT);
RtlZeroMemory(Info, sizeof(FONTFAMILYINFO));
Size = IntGetOutlineTextMetrics(FontGDI, 0, NULL);
Otm = ExAllocatePoolWithTag(PagedPool, Size, GDITAG_TEXT);
ExFreePoolWithTag(Otm, GDITAG_TEXT);
/* face name */
ExFreePoolWithTag(Otm, GDITAG_TEXT);
/* face name */
- RtlStringCbCopyW(Info->EnumLogFontEx.elfLogFont.lfFaceName,
- sizeof(Info->EnumLogFontEx.elfLogFont.lfFaceName),
- FaceName);
- RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName,
- sizeof(Info->EnumLogFontEx.elfFullName),
- FaceName);
+ RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName), FaceName);
- UNICODE_STRING NameW;
- RtlInitUnicodeString(&NameW, NULL);
status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY,
gusLanguageID);
if (NT_SUCCESS(status))
{
/* store it */
status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FONT_FAMILY,
gusLanguageID);
if (NT_SUCCESS(status))
{
/* store it */
- RtlStringCbCopyW(Info->EnumLogFontEx.elfLogFont.lfFaceName,
- sizeof(Info->EnumLogFontEx.elfLogFont.lfFaceName),
+ RtlStringCbCopyW(Lf->lfFaceName, sizeof(Lf->lfFaceName),
+ RtlFreeUnicodeString(&NameW);
+ }
+ }
+
+ /* full name */
+ if (FullName)
+ {
+ RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName,
+ sizeof(Info->EnumLogFontEx.elfFullName),
+ FullName);
+ }
+ else
+ {
+ status = IntGetFontLocalizedName(&NameW, Face, TT_NAME_ID_FULL_NAME,
+ gusLanguageID);
+ if (NT_SUCCESS(status))
+ {
+ /* store it */
RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName,
sizeof(Info->EnumLogFontEx.elfFullName),
NameW.Buffer);
RtlStringCbCopyW(Info->EnumLogFontEx.elfFullName,
sizeof(Info->EnumLogFontEx.elfFullName),
NameW.Buffer);
- FontFamilyFillInfo(Info + *Count, EntryFaceNameW.Buffer, FontGDI);
+ FontFamilyFillInfo(Info + *Count, EntryFaceNameW.Buffer,
+ NULL, FontGDI);
if (InfoContext->Count < InfoContext->Size)
{
FontFamilyFillInfo(InfoContext->Info + InfoContext->Count,
if (InfoContext->Count < InfoContext->Size)
{
FontFamilyFillInfo(InfoContext->Info + InfoContext->Count,
- RegistryName.Buffer, FontGDI);
+ RegistryName.Buffer, NULL, FontGDI);
}
InfoContext->Count++;
return STATUS_SUCCESS;
}
InfoContext->Count++;
return STATUS_SUCCESS;
IsEqual = FALSE;
FontFamilyFillInfo(&FamInfo[Count], FontEntry->FaceName.Buffer,
IsEqual = FALSE;
FontFamilyFillInfo(&FamInfo[Count], FontEntry->FaceName.Buffer,
+ NULL, FontEntry->Font);
for (i = 0; i < Count; ++i)
{
if (EqualFamilyInfo(&FamInfo[i], &FamInfo[Count]))
for (i = 0; i < Count; ++i)
{
if (EqualFamilyInfo(&FamInfo[i], &FamInfo[Count]))