ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Don't hold the GDI lock when calling DC_InitDC.

This commit is contained in:
Alexandre Julliard 2008-02-05 18:26:18 +01:00
parent 67a9edbdf4
commit 630c976f88
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/gdi32/bitmap.c
View File

@ -576,13 +576,8 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc )
BITMAPOBJ *bitmap; BITMAPOBJ *bitmap;
DC *dc; DC *dc;
if (!(bitmap = GDI_GetObjPtr( handle, BITMAP_MAGIC ))) return 0; if (!(dc = get_dc_ptr( hdc ))) return 0;
if (!(dc = get_dc_ptr( hdc )))
{
GDI_ReleaseObj( handle );
return 0;
}
if (GetObjectType( hdc ) != OBJ_MEMDC) if (GetObjectType( hdc ) != OBJ_MEMDC)
{ {
ret = 0; ret = 0;
@ -591,34 +586,44 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc )
ret = dc->hBitmap; ret = dc->hBitmap;
if (handle == dc->hBitmap) goto done; /* nothing to do */ if (handle == dc->hBitmap) goto done; /* nothing to do */
if (!(bitmap = GDI_GetObjPtr( handle, BITMAP_MAGIC )))
{
ret = 0;
goto done;
}
if (bitmap->header.dwCount && (handle != GetStockObject(DEFAULT_BITMAP))) if (bitmap->header.dwCount && (handle != GetStockObject(DEFAULT_BITMAP)))
{ {
WARN( "Bitmap already selected in another DC\n" ); WARN( "Bitmap already selected in another DC\n" );
GDI_ReleaseObj( handle );
ret = 0; ret = 0;
goto done; goto done;
} }
if (!bitmap->funcs && !BITMAP_SetOwnerDC( handle, dc )) if (!bitmap->funcs && !BITMAP_SetOwnerDC( handle, dc ))
{ {
GDI_ReleaseObj( handle );
ret = 0; ret = 0;
goto done; goto done;
} }
if (dc->funcs->pSelectBitmap) handle = dc->funcs->pSelectBitmap( dc->physDev, handle ); if (dc->funcs->pSelectBitmap && !dc->funcs->pSelectBitmap( dc->physDev, handle ))
{
if (handle) GDI_ReleaseObj( handle );
ret = 0;
}
else
{ {
dc->hBitmap = handle; dc->hBitmap = handle;
GDI_inc_ref_count( handle ); GDI_inc_ref_count( handle );
dc->dirty = 0; dc->dirty = 0;
SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight); SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight);
GDI_ReleaseObj( handle );
DC_InitDC( dc ); DC_InitDC( dc );
GDI_dec_ref_count( ret ); GDI_dec_ref_count( ret );
} }
else ret = 0;
done: done:
GDI_ReleaseObj( handle );
release_dc_ptr( dc ); release_dc_ptr( dc );
return ret; return ret;
} }