From 88abaa75d90bc7f4924323721ecea780f9d93056 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Fri, 30 Nov 2007 20:19:25 +0000
Subject: [PATCH] - Move the check for a NULL dc higher (before it's actually
 used). Fixes crashes (in FireFox, for example).

svn path=/trunk/; revision=30920
---
 reactos/subsystems/win32/win32k/objects/gdibatch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/reactos/subsystems/win32/win32k/objects/gdibatch.c b/reactos/subsystems/win32/win32k/objects/gdibatch.c
index a6e350f5836..523197c8dc4 100644
--- a/reactos/subsystems/win32/win32k/objects/gdibatch.c
+++ b/reactos/subsystems/win32/win32k/objects/gdibatch.c
@@ -23,6 +23,8 @@ GdiFlushUserBatch(HDC hDC, PGDIBATCHHDR pHdr)
   if (hDC)
   {
     dc = DC_LockDc(hDC);
+    if (!dc)
+        return pHdr->Size; // Return the full size of the structure.
     Dc_Attr = dc->pDc_Attr;
     if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr;
   }
@@ -40,7 +42,6 @@ GdiFlushUserBatch(HDC hDC, PGDIBATCHHDR pHdr)
      case GdiBCSetBrushOrg:
      {
         PGDIBSSETBRHORG pgSBO;
-        if (!dc) break;
         pgSBO = (PGDIBSSETBRHORG) pHdr;
         Dc_Attr->ptlBrushOrigin = pgSBO->ptlBrushOrigin;
         break;