[ros-diffs] [tkreuzer] 32745: - don't use shared locks, when modifying bitmaps - remove another reference to GDIOBJ_AllocObjDepricated

Author: tkreuzer
Date: Fri Mar 21 22:14:57 2008
New Revision: 32745

URL: http://svn.reactos.org/svn/reactos?rev=3D32745&view=3Drev
Log:
- don't use shared locks, when modifying bitmaps
- remove another reference to GDIOBJ_AllocObjDepricated

Modified:
    trunk/reactos/subsystems/win32/win32k/eng/surface.c
    trunk/reactos/subsystems/win32/win32k/include/bitmaps.h

Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/eng/surface.c?rev=3D32745&r1=3D32744&r2=3D32745&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Fri Mar 21 22:14:57=
 2008
@@ -298,11 +298,13 @@
     if (Format =3D=3D 0)
         return 0;
 =

-    NewBitmap =3D BITMAPOBJ_AllocBitmapDepricated();
-    if (NewBitmap =3D=3D NULL)
+    BitmapObj =3D BITMAPOBJ_AllocBitmapWithHandle();
+    if (BitmapObj =3D=3D NULL)
+    {
         return 0;
-
-    BitmapObj =3D BITMAPOBJ_LockBitmap(NewBitmap);
+    }
+    NewBitmap =3D BitmapObj->BaseObject.hHmgr;
+
     if (! BITMAPOBJ_InitBitsLock(BitmapObj))
     {
         BITMAPOBJ_UnlockBitmap(BitmapObj);

Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/include/bitmaps.h?rev=3D32745&r1=3D32744&r2=3D32745&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h (original)
+++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h Fri Mar 21 22:1=
4:57 2008
@@ -34,8 +34,12 @@
 =

 /* NOTE: Use shared locks! */
 #define  BITMAPOBJ_LockBitmap(hBMObj) \
+  ((PBITMAPOBJ) GDIOBJ_LockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP))
+#define  BITMAPOBJ_ShareLockBitmap(hBMObj) \
   ((PBITMAPOBJ) GDIOBJ_ShareLockObj ((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BIT=
MAP))
 #define  BITMAPOBJ_UnlockBitmap(pBMObj)  \
+  GDIOBJ_UnlockObjByPtr ((POBJ)pBMObj)
+#define  BITMAPOBJ_ShareUnlockBitmap(pBMObj)  \
   GDIOBJ_ShareUnlockObjByPtr ((POBJ)pBMObj)
 =

 BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody);