Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-26 08:30:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Zero the last character in lfFaceName when converting a LOGFONT from A to W or vice versa. Fixes 1 gdi32_winetest font.

Browse source 
DPRINT1 -> DPRINT

svn path=/trunk/; revision=38183
This commit is contained in:
Timo Kreuzer 2008-12-19 00:12:43 +00:00
parent 23eb0e8a4a
commit fd478ccca5
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/gdi32/objects/font.c
View file

@ -108,7 +108,7 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP)
lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0);
strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR)); strW = HeapAlloc(GetProcessHeap(), 0, lenW*sizeof(WCHAR));
MultiByteToWideChar(cp, 0, str, count, strW, lenW); MultiByteToWideChar(cp, 0, str, count, strW, lenW);
DPRINT1("mapped %s -> %S\n", str, strW); DPRINT("mapped %s -> %S\n", str, strW);
if(plenW) *plenW = lenW; if(plenW) *plenW = lenW;
if(pCP) *pCP = cp; if(pCP) *pCP = cp;
return strW; return strW;

2
reactos/dll/win32/gdi32/objects/utils.c
View file

@ -329,6 +329,7 @@ LogFontA2W(LPLOGFONTW pW, CONST LOGFONTA *pA)
COPYN(lfQuality); COPYN(lfQuality);
COPYN(lfPitchAndFamily); COPYN(lfPitchAndFamily);
COPYS(lfFaceName,LF_FACESIZE); COPYS(lfFaceName,LF_FACESIZE);
pW->lfFaceName[LF_FACESIZE - 1] = '\0';
#undef COPYN #undef COPYN
#undef COPYS #undef COPYS
@ -355,6 +356,7 @@ LogFontW2A(LPLOGFONTA pA, CONST LOGFONTW *pW)
COPYN(lfQuality); COPYN(lfQuality);
COPYN(lfPitchAndFamily); COPYN(lfPitchAndFamily);
COPYS(lfFaceName,LF_FACESIZE); COPYS(lfFaceName,LF_FACESIZE);
pA->lfFaceName[LF_FACESIZE - 1] = '\0';
#undef COPYN #undef COPYN
#undef COPYS #undef COPYS