richedit: Correctly set the pitch and family for a font when reading an RTF stream.

This commit is contained in:
Eric Pouech 2008-03-16 21:47:25 +01:00 committed by Alexandre Julliard
parent a86d7bdcea
commit 0c2c43d39b
2 changed files with 3 additions and 3 deletions

View File

@ -420,7 +420,7 @@ static void ME_RTFCharAttrHook(RTF_Info *info)
fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0';
fmt.bCharSet = f->rtfFCharSet;
fmt.dwMask = CFM_FACE | CFM_CHARSET;
fmt.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
fmt.bPitchAndFamily = f->rtfFPitch | (f->rtfFFamily << 4);
}
}
break;

View File

@ -857,9 +857,9 @@ static void ReadFontTbl(RTF_Info *info)
fp->rtfFName = NULL;
fp->rtfFAltName = NULL;
fp->rtfFNum = -1;
fp->rtfFFamily = 0;
fp->rtfFFamily = FF_DONTCARE;
fp->rtfFCharSet = DEFAULT_CHARSET; /* 1 */
fp->rtfFPitch = 0;
fp->rtfFPitch = DEFAULT_PITCH;
fp->rtfFType = 0;
fp->rtfFCodePage = CP_ACP;