Author: jimtabor
Date: Fri Apr 18 21:42:37 2008
New Revision: 33031
URL:
http://svn.reactos.org/svn/reactos?rev=33031&view=rev
Log:
Tidy ups some missed changes.
Modified:
trunk/reactos/dll/win32/gdi32/objects/eng.c
trunk/reactos/include/reactos/win32k/ntgdibad.h
Modified: trunk/reactos/dll/win32/gdi32/objects/eng.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/en…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/eng.c [iso-8859-1] Fri Apr 18 21:42:37 2008
@@ -155,6 +155,9 @@
{
// DHPDEV from NtGdiGetDhpdev must be from print driver.
PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev);
+
+ if (!pDrvInfo2) return NULL;
+
if (pDrvInfo2->cVersion != 0xFEDCBA98 ) // Init mask for ver 2+
{
PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2;
@@ -170,6 +173,9 @@
EngGetPrinterDataFileName(HDEV hdev)
{
PDRIVER_INFO_2W pDrvInfo2 = (PDRIVER_INFO_2W)NtGdiGetDhpdev(hdev);
+
+ if (!pDrvInfo2) return NULL;
+
if (pDrvInfo2->cVersion != 0xFEDCBA98 )
{
PDRIVER_INFO_1W pDrvInfo1 = (PDRIVER_INFO_1W) pDrvInfo2;
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Fri Apr 18 21:42:37 2008
@@ -91,19 +91,6 @@
LPPOINT Point
);
-/* Use SetDIBitsToDevice in gdi32. */
-INT
-STDCALL
-NtGdiSetDIBits (
- HDC hDC,
- HBITMAP hBitmap,
- UINT StartScan,
- UINT ScanLines,
- CONST VOID * Bits,
- CONST BITMAPINFO * bmi,
- UINT ColorUse
- );
-
/* Needs to be done in user-mode. */
BOOL
STDCALL