Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NtGDI]

Browse source 
- Memory DC with no surface selected return true. WIP and part of CORE-12888.

svn path=/trunk/; revision=75251
This commit is contained in:
James Tabor 2017-06-30 23:23:33 +00:00
parent c4b72f20c6
commit 9338a7ec63
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/win32ss/gdi/ntgdi/fillshap.c
View file

@ -597,7 +597,7 @@ IntRectangle(PDC dc,
psurf = dc->dclevel.pSurface; psurf = dc->dclevel.pSurface;
if (!psurf) if (!psurf)
{ {
ret = FALSE; ret = TRUE;
goto cleanup; goto cleanup;
} }
@ -1085,7 +1085,7 @@ NtGdiExtFloodFill(
if (!dc->dclevel.pSurface) if (!dc->dclevel.pSurface)
{ {
Ret = FALSE; Ret = TRUE;
goto cleanup; goto cleanup;
} }

12
reactos/win32ss/gdi/ntgdi/freetype.c
View file

@ -5147,6 +5147,13 @@ GreExtTextOutW(
goto good; goto good;
} }
if (!dc->dclevel.pSurface)
{
/* Memory DC with no surface selected */
DC_UnlockDc(dc);
return TRUE;
}
if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED)))
{ {
IntLPtoDP(dc, (POINT *)lprc, 2); IntLPtoDP(dc, (POINT *)lprc, 2);
@ -5172,11 +5179,6 @@ GreExtTextOutW(
BrushOrigin.x = 0; BrushOrigin.x = 0;
BrushOrigin.y = 0; BrushOrigin.y = 0;
if (!dc->dclevel.pSurface)
{
goto fail;
}
if ((fuOptions & ETO_OPAQUE) && lprc) if ((fuOptions & ETO_OPAQUE) && lprc)
{ {
DestRect.left = lprc->left; DestRect.left = lprc->left;