From d385734856041f920bd69da52383fbf9354c8a0c Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Sat, 19 Apr 2008 02:42:37 +0000
Subject: [PATCH] Tidy ups some missed changes.

svn path=/trunk/; revision=33031
---
 reactos/dll/win32/gdi32/objects/eng.c     |  6 ++++++
 reactos/include/reactos/win32k/ntgdibad.h | 13 -------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/reactos/dll/win32/gdi32/objects/eng.c b/reactos/dll/win32/gdi32/objects/eng.c
index 33c5000ca3f..11cb5bf5edc 100644
--- a/reactos/dll/win32/gdi32/objects/eng.c
+++ b/reactos/dll/win32/gdi32/objects/eng.c
@@ -155,6 +155,9 @@ EngGetDriverName(HDEV hdev)
 {
   // 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 @@ LPWSTR STDCALL
 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;
diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h
index c59b727477c..0ab4468faeb 100644
--- a/reactos/include/reactos/win32k/ntgdibad.h
+++ b/reactos/include/reactos/win32k/ntgdibad.h
@@ -91,19 +91,6 @@ NtGdiOffsetWindowOrgEx (
 	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