wine/programs/wineconsole dialog.c
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Nov 2 14:51:16 CST 2005
ChangeSet ID: 21058
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/02 14:51:16
Modified files:
programs/wineconsole: dialog.c
Log message:
Eric Pouech <eric.pouech at wanadoo.fr>
Fixed crash in font browsing for raster fonts.
Patch: http://cvs.winehq.org/patch.py?id=21058
Old revision New revision Changes Path
1.20 1.21 +8 -3 wine/programs/wineconsole/dialog.c
Index: wine/programs/wineconsole/dialog.c
diff -u -p wine/programs/wineconsole/dialog.c:1.20 wine/programs/wineconsole/dialog.c:1.21
--- wine/programs/wineconsole/dialog.c:1.20 2 Nov 2005 20:51:16 -0000
+++ wine/programs/wineconsole/dialog.c 2 Nov 2005 20:51:16 -0000
@@ -393,9 +393,14 @@ static int CALLBACK font_enum_size(const
SendDlgItemMessage(di->hDlg, IDC_FNT_LIST_SIZE, LB_INSERTSTRING, idx, (LPARAM)buf);
/* now grow our arrays and insert the values at the same index than in the list box */
- di->font = HeapReAlloc(GetProcessHeap(), 0, di->font, sizeof(*di->font) * (di->nFont + 1));
- if (idx != di->nFont)
- memmove(&di->font[idx + 1], &di->font[idx], (di->nFont - idx) * sizeof(*di->font));
+ if (di->nFont)
+ {
+ di->font = HeapReAlloc(GetProcessHeap(), 0, di->font, sizeof(*di->font) * (di->nFont + 1));
+ if (idx != di->nFont)
+ memmove(&di->font[idx + 1], &di->font[idx], (di->nFont - idx) * sizeof(*di->font));
+ }
+ else
+ di->font = HeapAlloc(GetProcessHeap(), 0, sizeof(*di->font));
di->font[idx].height = tm->tmHeight;
di->font[idx].weight = tm->tmWeight;
lstrcpy(di->font[idx].faceName, lf->lfFaceName);
More information about the wine-cvs
mailing list