If source and destination are the same object, don't lock the object

twice as it will only be unlocked once.

If source and destination are the same object, don't lock the object
6d58de63 · Jukka Heinonen · Alexandre Julliard · 2b5b00b0 · 6d58de63
Commit 6d58de63 authored Apr 26, 2004 by Jukka Heinonen Committed by Alexandre Julliard Apr 26, 2004
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

bitblt.c dlls/x11drv/bitblt.c +5 -1

No files found.
--- a/dlls/x11drv/bitblt.c
+++ b/dlls/x11drv/bitblt.c
@@ -1552,8 +1552,12 @@ BOOL X11DRV_BitBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst,
       * we can pass TRUE instead of FALSE to CoerceDIBSection(dcDst...),
       * which may avoid a copy in some situations */
    }
+
    sDst = X11DRV_LockDIBSection( physDevDst, DIB_Status_None, FALSE );
-    sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None, FALSE );
+    if (physDevDst != physDevSrc)
+        sSrc = X11DRV_LockDIBSection( physDevSrc, DIB_Status_None, FALSE );
+    else
+        sSrc = sDst;

    if ((sSrc == DIB_Status_AppMod) && (rop == SRCCOPY) &&
        (physDevSrc->depth == physDevDst->depth))