Fix gdi init so it can support batch. Used wrong limit source.

[reactos.git] / reactos / dll / win32 / gdi32 / main / dllmain.c

diff --git a/reactos/dll/win32/gdi32/main/dllmain.c b/reactos/dll/win32/gdi32/main/dllmain.c
index c21cde7..a4e2672 100644 (file)
--- a/reactos/dll/win32/gdi32/main/dllmain.c
+++ b/reactos/dll/win32/gdi32/main/dllmain.c
@@ -37,7 +37,7 @@ GdiProcessSetup (VOID)
         /* map the gdi handle table to user space */
        GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable;
        CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess;
-       GDI_BatchLimit = NtCurrentTeb()->GdiBatchCount;
+       GDI_BatchLimit = (DWORD) NtCurrentTeb()->ProcessEnvironmentBlock->GdiDCAttributeList;
 }
 
 
@@ -59,23 +59,21 @@ GdiDllInitialize (
                        break;
 
                case DLL_THREAD_ATTACH:
+                        NtCurrentTeb()->GdiTebBatch.Offset = 0;
+                        NtCurrentTeb()->GdiBatchCount = 0;
                        break;
 
                default:
                        return FALSE;
        }
 
-#if 0
-       /* FIXME: working teb handling needed */
-       NtCurrentTeb()->GdiTebBatch.Offset = 0;
-       NtCurrentTeb()->GdiBatchCount = 0;
-#endif
   // Very simple, the list will fill itself as it is needed.
         if(!SetStockObjects)
         {
           RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty.
           SetStockObjects = TRUE;
         }
+
        return TRUE;
 }