[WIN32K]

Revert r56462. Should fix some win32k crashes. See CORE-7965

svn path=/trunk/; revision=63339

diff --git a/reactos/win32ss/gdi/ntgdi/bitmaps.c b/reactos/win32ss/gdi/ntgdi/bitmaps.c
index 584dde5..ec44b9f 100644 (file)
--- a/reactos/win32ss/gdi/ntgdi/bitmaps.c
+++ b/reactos/win32ss/gdi/ntgdi/bitmaps.c
@@ -142,7 +142,7 @@ NtGdiCreateBitmap(
     IN OPTIONAL LPBYTE pUnsafeBits)
 {
     HBITMAP hbmp;
     IN OPTIONAL LPBYTE pUnsafeBits)
 {
     HBITMAP hbmp;

-    ULONG cRealBpp, cjWidthBytes, iFormat, fjBitmap;
+    ULONG cRealBpp, cjWidthBytes, iFormat;

     ULONGLONG cjSize;
     PSURFACE psurf;
 
     ULONGLONG cjSize;
     PSURFACE psurf;
 


@@ -164,15 +164,12 @@ NtGdiCreateBitmap(
         return NULL;
     }
 
         return NULL;
     }
 

-    /* Allocations larger than PAGE_SIZE go into user mem */
-    fjBitmap = (cjSize > PAGE_SIZE) ? BMF_USERMEM : 0;
-

     /* Allocate the surface (but don't set the bits) */
     psurf = SURFACE_AllocSurface(STYPE_BITMAP,
                                  nWidth,
                                  nHeight,
                                  iFormat,
     /* Allocate the surface (but don't set the bits) */
     psurf = SURFACE_AllocSurface(STYPE_BITMAP,
                                  nWidth,
                                  nHeight,
                                  iFormat,

-                                 fjBitmap,
+                                 0,

                                  0,
                                  NULL);
     if (!psurf)
                                  0,
                                  NULL);
     if (!psurf)