Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-14 06:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Don't copy data to null buffer, just return the string length in this case

Browse source 
- Fix some buffer calculation problems, handle buffer termination if it's shorter than the font string
- Fixes >= 10 gdi32 font winetests (NtGdiGetTextFaceW/NtGdiGetTextFaceA related)

svn path=/trunk/; revision=40469
This commit is contained in:
Gregor Schneider 2009-04-11 21:24:25 +00:00
parent 9e3589a7b1
commit 72585aa30d
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reactos/subsystems/win32/win32k/objects/text.c
View file

@ -326,6 +326,7 @@ NtGdiGetTextFaceW(
HFONT hFont; HFONT hFont;
PTEXTOBJ TextObj; PTEXTOBJ TextObj;
NTSTATUS Status; NTSTATUS Status;
INT fLen, ret;
/* FIXME: Handle bAliasName */ /* FIXME: Handle bAliasName */
@ -341,16 +342,32 @@ NtGdiGetTextFaceW(
TextObj = RealizeFontInit(hFont); TextObj = RealizeFontInit(hFont);
ASSERT(TextObj != NULL); ASSERT(TextObj != NULL);
Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1;
Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR));
TEXTOBJ_UnlockText(TextObj); if (FaceName != NULL)
if (!NT_SUCCESS(Status))
{ {
SetLastNtError(Status); Count = min(Count, fLen);
return 0; Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR));
if (!NT_SUCCESS(Status))
{
TEXTOBJ_UnlockText(TextObj);
SetLastNtError(Status);
return 0;
}
/* Terminate if we copied only part of the font name */
if (Count > 0 && Count < fLen)
{
FaceName[Count - 1] = '\0';
}
ret = Count;
}
else
{
ret = fLen;
} }
return Count; TEXTOBJ_UnlockText(TextObj);
return ret;
} }
W32KAPI W32KAPI