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

gdi32: Add a helper function to convert a string from A to W.

Browse Source
This commit is contained in:
Kusanagi Kouichi 2011-12-20 21:04:56 +09:00 committed by Alexandre Julliard
parent 95677c5099
commit 5bdbf6c681
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dlls/gdi32/freetype.c
View File

@ -1020,19 +1020,27 @@ static BOOL add_font_subst(struct list *subst_list, FontSubst *subst, INT flags)
return FALSE; return FALSE;
} }
static WCHAR *towstr(UINT cp, const char *str)
{
int len;
WCHAR *wstr;
len = MultiByteToWideChar(cp, 0, str, -1, NULL, 0);
wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(cp, 0, str, -1, wstr, len);
return wstr;
}
static void split_subst_info(NameCs *nc, LPSTR str) static void split_subst_info(NameCs *nc, LPSTR str)
{ {
CHAR *p = strrchr(str, ','); CHAR *p = strrchr(str, ',');
DWORD len;
nc->charset = -1; nc->charset = -1;
if(p && *(p+1)) { if(p && *(p+1)) {
nc->charset = strtol(p+1, NULL, 10); nc->charset = strtol(p+1, NULL, 10);
*p = '\0'; *p = '\0';
} }
len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); nc->name = towstr(CP_ACP, str);
nc->name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, str, -1, nc->name, len);
} }
static void LoadSubstList(void) static void LoadSubstList(void)
@ -1452,7 +1460,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
TT_OS2 *pOS2; TT_OS2 *pOS2;
TT_Header *pHeader = NULL; TT_Header *pHeader = NULL;
WCHAR *english_family, *localised_family, *StyleW; WCHAR *english_family, *localised_family, *StyleW;
DWORD len;
Family *family; Family *family;
Face *face; Face *face;
struct list *family_elem_ptr, *face_elem_ptr; struct list *family_elem_ptr, *face_elem_ptr;
@ -1579,19 +1586,13 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
if(fake_family) if(fake_family)
{ {
len = MultiByteToWideChar(CP_ACP, 0, fake_family, -1, NULL, 0); english_family = towstr(CP_ACP, fake_family);
english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, fake_family, -1, english_family, len);
} }
else else
{ {
english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES);
if(!english_family) if(!english_family)
{ english_family = towstr(CP_ACP, ft_face->family_name);
len = MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, NULL, 0);
english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, english_family, len);
}
} }
localised_family = NULL; localised_family = NULL;
@ -1629,9 +1630,7 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
HeapFree(GetProcessHeap(), 0, localised_family); HeapFree(GetProcessHeap(), 0, localised_family);
HeapFree(GetProcessHeap(), 0, english_family); HeapFree(GetProcessHeap(), 0, english_family);
len = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0); StyleW = towstr(CP_ACP, ft_face->style_name);
StyleW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, StyleW, len);
internal_leading = 0; internal_leading = 0;
memset(&fs, 0, sizeof(fs)); memset(&fs, 0, sizeof(fs));
@ -2779,7 +2778,6 @@ static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *con
Face *face; Face *face;
const char *file; const char *file;
WCHAR *fileW; WCHAR *fileW;
int fileLen;
WCHAR buff[MAX_PATH]; WCHAR buff[MAX_PATH];
WCHAR *data; WCHAR *data;
int entryLen; int entryLen;
@ -2817,9 +2815,7 @@ static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *con
} }
if (!file) if (!file)
continue; continue;
fileLen = MultiByteToWideChar(CP_UNIXCP, 0, file, -1, NULL, 0); fileW = towstr(CP_UNIXCP, file);
fileW = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR));
MultiByteToWideChar(CP_UNIXCP, 0, file, -1, fileW, fileLen);
entryLen = strlenW(fileW) + 1 + strlenW(value) + 1; entryLen = strlenW(fileW) + 1 + strlenW(value) + 1;
if (sizeof(buff)-(data-buff) < entryLen + 1) if (sizeof(buff)-(data-buff) < entryLen + 1)
{ {