ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite and separate AFM parsing code (no more [afmfiles]).

This commit is contained in:
Ian Pilcher 2001-08-08 23:22:06 +00:00 committed by Alexandre Julliard
parent 6e9ab40b28
commit 625bef463f
5 changed files with 1230 additions and 734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/wineps/Makefile.in
View File

@ -69,6 +69,7 @@ C_SRCS = \
ps.c \
text.c \
truetype.c \
type1afm.c \
$(DATA_C_SRCS)
RC_SRCS= \

749
dlls/wineps/afm.c
View File

@ -1,454 +1,25 @@
/*
* Adobe Font Metric (AFM) file parsing
* See http://partners.adobe.com/asn/developer/PDFS/TN/5004.AFM_Spec.pdf
* Font metric functions common to Type 1 (AFM) and TrueType font files.
* Functions specific to Type 1 and TrueType fonts are in type1afm.c and
* truetype.c respectively.
*
* Copyright 1998 Huw D M Davies
* Copyright 2001 Ian Pilcher
*
*/
#include "config.h"
#include <string.h>
#include <stdlib.h> /* qsort() & bsearch() */
#include <stdio.h>
#include <dirent.h>
#include <limits.h> /* INT_MIN */
#ifdef HAVE_FLOAT_H
# include <float.h> /* FLT_MAX */
#endif
#include "winnt.h" /* HEAP_ZERO_MEMORY */
#include "winreg.h"
#include "psdrv.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(psdrv);
#include <ctype.h>
/* ptr to fonts for which we have afm files */
FONTFAMILY *PSDRV_AFMFontList = NULL;
/* qsort/bsearch callback functions */
typedef int (*compar_callback_fn) (const void *, const void *);
static VOID SortFontMetrics(AFM *afm, AFMMETRICS *metrics);
static VOID CalcWindowsMetrics(AFM *afm);
static void PSDRV_ReencodeCharWidths(AFM *afm);
/*******************************************************************************
* IsWinANSI
*
* Checks whether Unicode value is part of Microsoft code page 1252
*
*/
static const INT ansiChars[21] =
{
0x0152, 0x0153, 0x0160, 0x0161, 0x0178, 0x017d, 0x017e, 0x0192, 0x02c6,
0x02c9, 0x02dc, 0x03bc, 0x2013, 0x2014, 0x2026, 0x2030, 0x2039, 0x203a,
0x20ac, 0x2122, 0x2219
};
static int cmpUV(const INT *a, const INT *b)
{
return *a - *b;
}
inline static BOOL IsWinANSI(INT uv)
{
if ((0x0020 <= uv && uv <= 0x007e) || (0x00a0 <= uv && uv <= 0x00ff) ||
(0x2018 <= uv && uv <= 0x201a) || (0x201c <= uv && uv <= 0x201e) ||
(0x2020 <= uv && uv <= 2022))
return TRUE;
if (bsearch(&uv, ansiChars, 21, sizeof(INT),
(compar_callback_fn)cmpUV) != NULL)
return TRUE;
return FALSE;
}
/*******************************************************************************
* CheckMetrics
*
* Check an AFMMETRICS structure to make sure all elements have been properly
* filled in. (Don't check UV or L.)
*
*/
static const AFMMETRICS badMetrics =
{
INT_MIN, /* C */
INT_MIN, /* UV */
FLT_MAX, /* WX */
NULL, /* N */
{ FLT_MAX, FLT_MAX, FLT_MAX, FLT_MAX }, /* B */
NULL /* L */
};
inline static BOOL CheckMetrics(const AFMMETRICS *metrics)
{
if ( metrics->C == badMetrics.C ||
metrics->WX == badMetrics.WX ||
metrics->N == badMetrics.N ||
metrics->B.llx == badMetrics.B.llx ||
metrics->B.lly == badMetrics.B.lly ||
metrics->B.urx == badMetrics.B.urx ||
metrics->B.ury == badMetrics.B.ury )
return FALSE;
return TRUE;
}
/***********************************************************
*
* PSDRV_AFMGetCharMetrics
*
* Parses CharMetric section of AFM file.
*
* Actually only collects the widths of numbered chars and puts then in
* afm->CharWidths.
*/
static BOOL PSDRV_AFMGetCharMetrics(AFM *afm, FILE *fp)
{
unsigned char line[256], valbuf[256];
unsigned char *cp, *item, *value, *curpos, *endpos;
int i;
AFMMETRICS *metric, *retval;
metric = HeapAlloc( PSDRV_Heap, 0, afm->NumofMetrics * sizeof(AFMMETRICS));
if (metric == NULL)
return FALSE;
retval = metric;
for(i = 0; i < afm->NumofMetrics; i++, metric++) {
*metric = badMetrics;
do {
if(!fgets(line, sizeof(line), fp)) {
ERR("Unexpected EOF\n");
HeapFree(PSDRV_Heap, 0, retval);
return FALSE;
}
cp = line + strlen(line);
do {
*cp = '\0';
cp--;
} while(cp >= line && isspace(*cp));
} while (!(*line));
curpos = line;
while(*curpos) {
item = curpos;
while(isspace(*item))
item++;
value = strpbrk(item, " \t");
if (!value) {
ERR("No whitespace found.\n");
HeapFree(PSDRV_Heap, 0, retval);
return FALSE;
}
while(isspace(*value))
value++;
cp = endpos = strchr(value, ';');
if (!cp) {
ERR("missing ;, failed. [%s]\n", line);
HeapFree(PSDRV_Heap, 0, retval);
return FALSE;
}
while(isspace(*--cp))
;
memcpy(valbuf, value, cp - value + 1);
valbuf[cp - value + 1] = '\0';
value = valbuf;
if(!strncmp(item, "C ", 2)) {
value = strchr(item, ' ');
sscanf(value, " %d", &metric->C);
} else if(!strncmp(item, "CH ", 3)) {
value = strrchr(item, ' ');
sscanf(value, " %x", &metric->C);
}
else if(!strncmp("WX ", item, 3) || !strncmp("W0X ", item, 4)) {
sscanf(value, "%f", &metric->WX);
if(metric->C >= 0 && metric->C <= 0xff)
afm->CharWidths[metric->C] = metric->WX;
}
else if(!strncmp("N ", item, 2)) {
metric->N = PSDRV_GlyphName(value);
}
else if(!strncmp("B ", item, 2)) {
sscanf(value, "%f%f%f%f", &metric->B.llx, &metric->B.lly,
&metric->B.urx, &metric->B.ury);
/* Store height of Aring to use as lfHeight */
if(metric->N && !strncmp(metric->N->sz, "Aring", 5))
afm->FullAscender = metric->B.ury;
}
/* Ligatures go here... */
curpos = endpos + 1;
}
if (CheckMetrics(metric) == FALSE) {
ERR("Error parsing character metrics\n");
HeapFree(PSDRV_Heap, 0, retval);
return FALSE;
}
TRACE("Metrics for '%s' WX = %f B = %f,%f - %f,%f\n",
metric->N->sz, metric->WX, metric->B.llx, metric->B.lly,
metric->B.urx, metric->B.ury);
}
SortFontMetrics(afm, retval);
afm->Metrics = retval;
return TRUE;
}
/***********************************************************
*
* PSDRV_AFMParse
*
* Fills out an AFM structure and associated substructures (see psdrv.h)
* for a given AFM file. All memory is allocated from the driver heap.
* Returns a ptr to the AFM structure or NULL on error.
*
* This is not complete (we don't handle kerning yet) and not efficient
*/
static const AFM *PSDRV_AFMParse(char const *file)
{
FILE *fp;
unsigned char buf[256];
unsigned char *value;
AFM *afm;
unsigned char *cp;
int afmfile = 0;
int c;
LPSTR font_name = NULL, full_name = NULL, family_name = NULL,
encoding_scheme = NULL;
TRACE("parsing '%s'\n", file);
if((fp = fopen(file, "r")) == NULL) {
MESSAGE("Can't open AFM file '%s'. Please check wine.conf .\n", file);
return NULL;
}
afm = HeapAlloc(PSDRV_Heap, 0, sizeof(AFM));
if(!afm) {
fclose(fp);
return NULL;
}
cp = buf;
while ( ( c = fgetc ( fp ) ) != EOF ) {
*cp = c;
if ( *cp == '\r' || *cp == '\n' || cp - buf == sizeof(buf)-2 ) {
if ( cp == buf )
continue;
*(cp+1)='\0';
}
else {
cp ++;
continue;
}
cp = buf + strlen(buf);
do {
*cp = '\0';
cp--;
} while(cp > buf && isspace(*cp));
cp = buf;
if ( afmfile == 0 && strncmp ( buf, "StartFontMetrics", 16 ) )
break;
afmfile = 1;
value = strchr(buf, ' ');
if(value)
while(isspace(*value))
value++;
if(!strncmp("FontName", buf, 8)) {
if (!(afm->FontName = font_name = HeapAlloc(PSDRV_Heap, 0, strlen(value)+1 )))
goto cleanup_fp;
strcpy( (char *)afm->FontName, value );
continue;
}
if(!strncmp("FullName", buf, 8)) {
if (!(afm->FullName = full_name = HeapAlloc(PSDRV_Heap, 0, strlen(value)+1 )))
goto cleanup_fp;
strcpy( (char *)afm->FullName, value );
continue;
}
if(!strncmp("FamilyName", buf, 10)) {
if (!(afm->FamilyName = family_name = HeapAlloc(PSDRV_Heap, 0, strlen(value)+1 )))
goto cleanup_fp;
strcpy( (char *)afm->FamilyName, value );
continue;
}
if(!strncmp("Weight", buf, 6)) {
if(!strncmp("Roman", value, 5) || !strncmp("Medium", value, 6)
|| !strncmp("Book", value, 4) || !strncmp("Regular", value, 7)
|| !strncmp("Normal", value, 6))
afm->Weight = FW_NORMAL;
else if(!strncmp("Demi", value, 4))
afm->Weight = FW_DEMIBOLD;
else if(!strncmp("Bold", value, 4))
afm->Weight = FW_BOLD;
else if(!strncmp("Light", value, 5))
afm->Weight = FW_LIGHT;
else if(!strncmp("Black", value, 5))
afm->Weight = FW_BLACK;
else {
WARN("%s specifies unknown Weight '%s'; treating as Roman\n",
file, value);
afm->Weight = FW_NORMAL;
}
continue;
}
if(!strncmp("ItalicAngle", buf, 11)) {
sscanf(value, "%f", &(afm->ItalicAngle));
continue;
}
if(!strncmp("IsFixedPitch", buf, 12)) {
if(!strncasecmp("false", value, 5))
afm->IsFixedPitch = FALSE;
else
afm->IsFixedPitch = TRUE;
continue;
}
if(!strncmp("FontBBox", buf, 8)) {
sscanf(value, "%f %f %f %f", &(afm->FontBBox.llx),
&(afm->FontBBox.lly), &(afm->FontBBox.urx),
&(afm->FontBBox.ury) );
continue;
}
if(!strncmp("UnderlinePosition", buf, 17)) {
sscanf(value, "%f", &(afm->UnderlinePosition) );
continue;
}
if(!strncmp("UnderlineThickness", buf, 18)) {
sscanf(value, "%f", &(afm->UnderlineThickness) );
continue;
}
if(!strncmp("CapHeight", buf, 9)) {
sscanf(value, "%f", &(afm->CapHeight) );
continue;
}
if(!strncmp("XHeight", buf, 7)) {
sscanf(value, "%f", &(afm->XHeight) );
continue;
}
if(!strncmp("Ascender", buf, 8)) {
sscanf(value, "%f", &(afm->Ascender) );
continue;
}
if(!strncmp("Descender", buf, 9)) {
sscanf(value, "%f", &(afm->Descender) );
continue;
}
if(!strncmp("StartCharMetrics", buf, 16)) {
sscanf(value, "%d", &(afm->NumofMetrics) );
if (PSDRV_AFMGetCharMetrics(afm, fp) == FALSE)
goto cleanup_fp;
continue;
}
if(!strncmp("EncodingScheme", buf, 14)) {
if (!(afm->EncodingScheme = encoding_scheme = HeapAlloc(PSDRV_Heap, 0, strlen(value)+1)))
goto cleanup_fp;
strcpy( (char *)afm->EncodingScheme, value );
continue;
}
}
fclose(fp);
if (afmfile == 0) {
HeapFree ( PSDRV_Heap, 0, afm );
return NULL;
}
if(afm->FontName == NULL) {
WARN("%s contains no FontName.\n", file);
if (!(afm->FontName = font_name = HeapAlloc(PSDRV_Heap, 0, 7)))
goto cleanup;
strcpy( (char *)afm->FontName, "nofont" );
}
if(afm->FullName == NULL)
{
if (!(afm->FullName = full_name = HeapAlloc(PSDRV_Heap, 0, strlen(afm->FontName)+1 )))
goto cleanup;
strcpy( (char *)afm->FullName, afm->FontName );
}
if(afm->FamilyName == NULL)
{
if (!(afm->FamilyName = family_name = HeapAlloc(PSDRV_Heap, 0, strlen(afm->FontName)+1 )))
goto cleanup;
strcpy( (char *)afm->FamilyName, afm->FontName );
}
if(afm->Ascender == 0.0)
afm->Ascender = afm->FontBBox.ury;
if(afm->Descender == 0.0)
afm->Descender = afm->FontBBox.lly;
if(afm->FullAscender == 0.0)
afm->FullAscender = afm->Ascender;
if(afm->Weight == 0)
afm->Weight = FW_NORMAL;
CalcWindowsMetrics(afm);
if (afm->EncodingScheme != NULL &&
strcmp(afm->EncodingScheme, "AdobeStandardEncoding") == 0)
PSDRV_ReencodeCharWidths(afm);
return afm;
cleanup_fp:
fclose(fp);
cleanup:
if (font_name == NULL)
HeapFree(PSDRV_Heap, 0, font_name);
if (full_name == NULL)
HeapFree(PSDRV_Heap, 0, full_name);
if (family_name == NULL)
HeapFree(PSDRV_Heap, 0, family_name);
if (encoding_scheme == NULL)
HeapFree(PSDRV_Heap, 0, encoding_scheme);
HeapFree(PSDRV_Heap, 0, afm);
return NULL;
}
/***********************************************************
*
@ -479,7 +50,7 @@ void PSDRV_FreeAFMList( FONTFAMILY *head )
* Returns ptr to an AFM if name (which is a PS font name) exists in list
* headed by head.
*/
const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, char *name)
const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name)
{
FONTFAMILY *family;
AFMLISTENTRY *afmle;
@ -564,40 +135,6 @@ BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm, BOOL *p_added)
return TRUE;
}
/**********************************************************
*
* PSDRV_ReencodeCharWidths
*
* Re map the CharWidths field of the afm to correspond to an ANSI encoding
*
*/
static void PSDRV_ReencodeCharWidths(AFM *afm)
{
int i, j;
const AFMMETRICS *metric;
for(i = 0; i < 256; i++) {
if(isalnum(i))
continue;
if(PSDRV_ANSIVector[i] == NULL) {
afm->CharWidths[i] = 0.0;
continue;
}
for (j = 0, metric = afm->Metrics; j < afm->NumofMetrics; j++, metric++) {
if(metric->N && !strcmp(metric->N->sz, PSDRV_ANSIVector[i])) {
afm->CharWidths[i] = metric->WX;
break;
}
}
if(j == afm->NumofMetrics) {
WARN("Couldn't find glyph '%s' in font '%s'\n",
PSDRV_ANSIVector[i], afm->FontName);
afm->CharWidths[i] = 0.0;
}
}
return;
}
/***********************************************************
*
@ -629,77 +166,6 @@ static void PSDRV_DumpFontList(void)
return;
}
/*******************************************************************************
* SortFontMetrics
*
* Initializes the UV member of each glyph's AFMMETRICS and sorts each font's
* Metrics by Unicode Value. If the font has a standard encoding (i.e. it is
* using the Adobe Glyph List encoding vector), look up each glyph's Unicode
* Value based on it's glyph name. If the font has a font-specific encoding,
* map the default PostScript encodings into the Unicode private use area.
*
*/
static int UnicodeGlyphByNameIndex(const UNICODEGLYPH *a, const UNICODEGLYPH *b)
{
return a->name->index - b->name->index;
}
static int AFMMetricsByUV(const AFMMETRICS *a, const AFMMETRICS *b)
{
return a->UV - b->UV;
}
static VOID SortFontMetrics(AFM *afm, AFMMETRICS *metrics)
{
INT i;
TRACE("%s\n", afm->FontName);
if (strcmp(afm->EncodingScheme, "FontSpecific") != 0)
{
PSDRV_IndexGlyphList(); /* enable searching by name index */
for (i = 0; i < afm->NumofMetrics; ++i)
{
UNICODEGLYPH ug, *pug;
ug.name = metrics[i].N;
pug = bsearch(&ug, PSDRV_AGLbyName, PSDRV_AGLbyNameSize,
sizeof(UNICODEGLYPH),
(compar_callback_fn)UnicodeGlyphByNameIndex);
if (pug == NULL)
{
WARN("Glyph '%s' in font '%s' does not have a UV\n",
ug.name->sz, afm->FullName);
metrics[i].UV = -1;
}
else
{
metrics[i].UV = pug->UV;
}
}
}
else /* FontSpecific encoding */
{
for (i = 0; i < afm->NumofMetrics; ++i)
metrics[i].UV = metrics[i].C;
}
qsort(metrics, afm->NumofMetrics, sizeof(AFMMETRICS),
(compar_callback_fn)AFMMetricsByUV);
for (i = 0; i < afm->NumofMetrics; ++i) /* count unencoded glyphs */
if (metrics[i].UV >= 0)
break;
if (i != 0)
{
TRACE("Ignoring %i unencoded glyphs\n", i);
afm->NumofMetrics -= i;
memmove(metrics, metrics + i, afm->NumofMetrics * sizeof(*metrics));
}
}
/*******************************************************************************
* PSDRV_CalcAvgCharWidth
@ -755,83 +221,6 @@ SHORT PSDRV_CalcAvgCharWidth(const AFM *afm)
return (SHORT)(w + 0.5);
}
/*******************************************************************************
* CalcWindowsMetrics
*
* Calculates several Windows-specific font metrics for each font.
*
*/
static VOID CalcWindowsMetrics(AFM *afm)
{
WINMETRICS wm;
INT i;
wm.usUnitsPerEm = 1000; /* for PostScript fonts */
wm.sTypoAscender = (SHORT)(afm->Ascender + 0.5);
wm.sTypoDescender = (SHORT)(afm->Descender - 0.5);
wm.sTypoLineGap = 1200 - (wm.sTypoAscender - wm.sTypoDescender);
if (wm.sTypoLineGap < 0)
wm.sTypoLineGap = 0;
wm.usWinAscent = 0;
wm.usWinDescent = 0;
for (i = 0; i < afm->NumofMetrics; ++i)
{
if (IsWinANSI(afm->Metrics[i].UV) == FALSE)
continue;
if (afm->Metrics[i].B.ury > 0)
{
USHORT ascent = (USHORT)(afm->Metrics[i].B.ury + 0.5);
if (ascent > wm.usWinAscent)
wm.usWinAscent = ascent;
}
if (afm->Metrics[i].B.lly < 0)
{
USHORT descent = (USHORT)(-(afm->Metrics[i].B.lly) + 0.5);
if (descent > wm.usWinDescent)
wm.usWinDescent = descent;
}
}
if (wm.usWinAscent == 0 && afm->FontBBox.ury > 0)
wm.usWinAscent = (USHORT)(afm->FontBBox.ury + 0.5);
if (wm.usWinDescent == 0 && afm->FontBBox.lly < 0)
wm.usWinDescent = (USHORT)(-(afm->FontBBox.lly) + 0.5);
wm.sAscender = wm.usWinAscent;
wm.sDescender = -(wm.usWinDescent);
wm.sLineGap = 1150 - (wm.sAscender - wm.sDescender);
if (wm.sLineGap < 0)
wm.sLineGap = 0;
wm.sAvgCharWidth = PSDRV_CalcAvgCharWidth(afm);
TRACE("Windows metrics for '%s':\n", afm->FullName);
TRACE("\tsAscender = %i\n", wm.sAscender);
TRACE("\tsDescender = %i\n", wm.sDescender);
TRACE("\tsLineGap = %i\n", wm.sLineGap);
TRACE("\tusUnitsPerEm = %u\n", wm.usUnitsPerEm);
TRACE("\tsTypoAscender = %i\n", wm.sTypoAscender);
TRACE("\tsTypoDescender = %i\n", wm.sTypoDescender);
TRACE("\tsTypoLineGap = %i\n", wm.sTypoLineGap);
TRACE("\tusWinAscent = %u\n", wm.usWinAscent);
TRACE("\tusWinDescent = %u\n", wm.usWinDescent);
TRACE("\tsAvgCharWidth = %i\n", wm.sAvgCharWidth);
afm->WinMetrics = wm;
/* See afm2c.c and mkagl.c for an explanation of this */
/* PSDRV_AFM2C(afm); */
}
/*******************************************************************************
* AddBuiltinAFMs
@ -863,129 +252,33 @@ static BOOL AddBuiltinAFMs()
*
* PSDRV_GetFontMetrics
*
* Parses all afm files listed in [afmfiles] and [afmdirs] of wine.conf
* Parses all afm files listed in [afmdirs] and [TrueType Font Directories]
* sections of Wine configuration file. Adds built-in data last, so it can
* be overridden by user-supplied AFM or TTF files.
*
* If this function fails, PSDRV_Init will destroy PSDRV_Heap, so don't worry
* about freeing all the memory that's been allocated.
*/
static BOOL PSDRV_ReadAFMDir(const char* afmdir) {
DIR *dir;
const AFM *afm;
BOOL added;
dir = opendir(afmdir);
if (dir) {
struct dirent *dent;
while ((dent=readdir(dir))) {
if (strstr(dent->d_name,".afm")) {
char *afmfn;
afmfn=(char*)HeapAlloc(PSDRV_Heap,0,
strlen(afmdir)+strlen(dent->d_name)+2);
if (afmfn == NULL) {
closedir(dir);
return FALSE;
}
strcpy(afmfn,afmdir);
strcat(afmfn,"/");
strcat(afmfn,dent->d_name);
TRACE("loading AFM %s\n",afmfn);
afm = PSDRV_AFMParse(afmfn);
if (afm) {
if (PSDRV_AddAFMtoList(&PSDRV_AFMFontList, afm, &added) == FALSE) {
closedir(dir);
return FALSE;
}
}
else {
WARN("Error parsing %s\n", afmfn);
}
HeapFree(PSDRV_Heap,0,afmfn);
}
}
closedir(dir);
}
else {
WARN("Error opening %s\n", afmdir);
}
return TRUE;
}
BOOL PSDRV_GetFontMetrics(void)
{
int idx;
char key[256];
char value[256];
HKEY hkey;
DWORD type, key_len, value_len;
BOOL added;
if (PSDRV_GlyphListInit() != 0)
return FALSE;
if(RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\afmfiles",
0, KEY_READ, &hkey))
goto no_afmfiles;
idx = 0;
key_len = sizeof(key);
value_len = sizeof(value);
while(!RegEnumValueA(hkey, idx++, key, &key_len, NULL, &type, value, &value_len))
{
const AFM* afm = PSDRV_AFMParse(value);
return FALSE;
if (afm) {
if (PSDRV_AddAFMtoList(&PSDRV_AFMFontList, afm, &added) == FALSE) {
RegCloseKey(hkey);
return FALSE;
}
}
else {
WARN("Error parsing %s\n", value);
}
if (PSDRV_GetType1Metrics() == FALSE)
return FALSE;
/* initialize lengths for new iteration */
key_len = sizeof(key);
value_len = sizeof(value);
}
RegCloseKey(hkey);
no_afmfiles:
if(RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\afmdirs",
0, KEY_READ, &hkey))
goto no_afmdirs;
idx = 0;
key_len = sizeof(key);
value_len = sizeof(value);
while(!RegEnumValueA(hkey, idx++, key, &key_len, NULL, &type, value, &value_len))
{
if (PSDRV_ReadAFMDir (value) == FALSE)
{
RegCloseKey(hkey);
return FALSE;
}
/* initialize lengths for new iteration */
key_len = sizeof(key);
value_len = sizeof(value);
}
RegCloseKey(hkey);
no_afmdirs:
#ifdef HAVE_FREETYPE
if (PSDRV_GetTrueTypeMetrics() == FALSE)
return FALSE;
#endif
if (AddBuiltinAFMs() == FALSE)
return FALSE;
#ifdef HAVE_FREETYPE
if (PSDRV_GetTrueTypeMetrics() == FALSE)
return FALSE;
PSDRV_IndexGlyphList();
#endif
PSDRV_IndexGlyphList(); /* Enable fast searching of glyph names */
PSDRV_DumpFontList();
return TRUE;
}

9
dlls/wineps/psdrv.h
View File

@ -303,7 +303,7 @@ extern void PSDRV_MergeDevmodes(PSDRV_DEVMODEA *dm1, PSDRV_DEVMODEA *dm2,
extern BOOL PSDRV_GetFontMetrics(void);
extern PPD *PSDRV_ParsePPD(char *fname);
extern PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name);
extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, char *name);
extern const AFM *PSDRV_FindAFMinList(FONTFAMILY *head, LPCSTR name);
extern BOOL PSDRV_AddAFMtoList(FONTFAMILY **head, const AFM *afm,
BOOL *p_added);
extern void PSDRV_FreeAFMList( FONTFAMILY *head );
@ -431,10 +431,11 @@ extern DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice,
WORD fwCapability, LPSTR lpszOutput,
LPDEVMODEA lpdm);
VOID PSDRV_DrawLine( DC *dc );
INT PSDRV_GlyphListInit();
INT PSDRV_GlyphListInit(void);
const GLYPHNAME *PSDRV_GlyphName(LPCSTR szName);
VOID PSDRV_IndexGlyphList();
BOOL PSDRV_GetTrueTypeMetrics();
VOID PSDRV_IndexGlyphList(void);
BOOL PSDRV_GetTrueTypeMetrics(void);
BOOL PSDRV_GetType1Metrics(void);
const AFMMETRICS *PSDRV_UVMetrics(LONG UV, const AFM *afm);
SHORT PSDRV_CalcAvgCharWidth(const AFM *afm);

4
dlls/wineps/truetype.c
View File

@ -577,7 +577,7 @@ BOOL PSDRV_GetTrueTypeMetrics(void)
HKEY hkey;
DWORD type, name_len, value_len;
if(RegOpenKeyExA(HKEY_LOCAL_MACHINE,
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"Software\\Wine\\Wine\\Config\\TrueType Font Directories",
0, KEY_READ, &hkey) != ERROR_SUCCESS)
return TRUE;
@ -593,7 +593,7 @@ BOOL PSDRV_GetTrueTypeMetrics(void)
name_len = sizeof(name_buf);
value_len = sizeof(value_buf);
while(RegEnumValueA(hkey, i++, name_buf, &name_len, NULL, &type, value_buf,
while (RegEnumValueA(hkey, i++, name_buf, &name_len, NULL, &type, value_buf,
&value_len) == ERROR_SUCCESS)
{
value_buf[sizeof(value_buf) - 1] = '\0';

1201
dlls/wineps/type1afm.c Normal file
View File

File diff suppressed because it is too large Load Diff