Alexandre Julliard : wineps: Always escape Postscript reserved characters in font names.
Alexandre Julliard
julliard at winehq.org
Wed Sep 26 14:06:51 CDT 2012
Module: wine
Branch: master
Commit: 16f900fd5adc03317012cc7e02d2bc369352e378
URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f900fd5adc03317012cc7e02d2bc369352e378
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Sep 26 16:58:03 2012 +0200
wineps: Always escape Postscript reserved characters in font names.
---
dlls/wineps.drv/download.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c
index fbd868c..037ea34 100644
--- a/dlls/wineps.drv/download.c
+++ b/dlls/wineps.drv/download.c
@@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
*/
static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str)
{
+ static const char reserved_chars[] = " %/(){}[]<>\n\r\t\b\f";
int len;
char *p;
DWORD size;
@@ -92,7 +93,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str
memcpy(*str, strings + name_record->offset, name_record->length);
*(*str + name_record->length) = '\0';
HeapFree(GetProcessHeap(), 0, name);
- return;
+ goto done;
}
if(name_record->platform_id == 3 && name_record->encoding_id == 1 &&
name_record->language_id == 0x409 && name_record->name_id == 6)
@@ -110,7 +111,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str
WideCharToMultiByte(1252, 0, unicode, -1, *str, len, NULL, NULL);
HeapFree(GetProcessHeap(), 0, unicode);
HeapFree(GetProcessHeap(), 0, name);
- return;
+ goto done;
}
}
TRACE("Unable to find PostScript name\n");
@@ -122,11 +123,8 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str
*str = HeapAlloc(GetProcessHeap(),0,len);
strcpy(*str, (char*)potm + (ptrdiff_t)potm->otmpFaceName);
- p = *str;
- while((p = strchr(p, ' ')))
- *p = '_';
-
- return;
+done:
+ for (p = *str; *p; p++) if (strchr( reserved_chars, *p )) *p = '_';
}
/****************************************************************************
More information about the wine-cvs
mailing list