From 78bdedec32495d3760c1b2cbdd8e1f1644a748b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sun, 22 Jul 2012 21:19:02 +0000 Subject: [PATCH] [WIN32SS/NTGDI] - Don't assume DC surface in non NULL in NtGdiSetDIBitsToDeviceInternal svn path=/trunk/; revision=56942 --- reactos/win32ss/gdi/ntgdi/dc.h | 1 + reactos/win32ss/gdi/ntgdi/dibobj.c | 1 + 2 files changed, 2 insertions(+) diff --git a/reactos/win32ss/gdi/ntgdi/dc.h b/reactos/win32ss/gdi/ntgdi/dc.h index 97bd42e39dd..5ba26b629c0 100644 --- a/reactos/win32ss/gdi/ntgdi/dc.h +++ b/reactos/win32ss/gdi/ntgdi/dc.h @@ -260,5 +260,6 @@ DC_vSelectPalette(PDC pdc, PPALETTE ppal) } extern PBRUSH pbrDefaultBrush ; +extern PSURFACE psurfDefaultBitmap; #endif /* not __WIN32K_DC_H */ diff --git a/reactos/win32ss/gdi/ntgdi/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c index 694463de204..6fd01ee87c0 100644 --- a/reactos/win32ss/gdi/ntgdi/dibobj.c +++ b/reactos/win32ss/gdi/ntgdi/dibobj.c @@ -446,6 +446,7 @@ NtGdiSetDIBitsToDeviceInternal( } pSurf = pDC->dclevel.pSurface; + if(!pSurf) pSurf = psurfDefaultBitmap; pDestSurf = pSurf ? &pSurf->SurfObj : NULL;