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

dlls/wineps/Makefile.in

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

dlls/wineps/psdrv.h

@@ -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);
 

dlls/wineps/truetype.c

@@ -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';