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

gdi32: Avoid locking in CreateCompatibleBitmap.

This commit is contained in:
Alexandre Julliard 2008-02-05 17:34:56 +01:00
parent e5b4c0f84b
commit b962fca75c
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/gdi32/bitmap.c
View File

@ -132,13 +132,10 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes,
HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
{ {
HBITMAP hbmpRet = 0; HBITMAP hbmpRet = 0;
DC *dc;
TRACE("(%p,%d,%d) =\n", hdc, width, height); TRACE("(%p,%d,%d) =\n", hdc, width, height);
if (!(dc = DC_GetDCPtr(hdc))) return 0; if (GetObjectType( hdc ) != OBJ_MEMDC)
if (GDIMAGIC( dc->header.wMagic ) != MEMORY_DC_MAGIC)
{ {
hbmpRet = CreateBitmap(width, height, hbmpRet = CreateBitmap(width, height,
GetDeviceCaps(hdc, PLANES), GetDeviceCaps(hdc, PLANES),
@ -147,14 +144,18 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
} }
else /* Memory DC */ else /* Memory DC */
{ {
BITMAPOBJ *bmp = GDI_GetObjPtr( dc->hBitmap, BITMAP_MAGIC ); DIBSECTION dib;
HBITMAP bitmap = GetCurrentObject( hdc, OBJ_BITMAP );
INT size = GetObjectW( bitmap, sizeof(dib), &dib );
if (!bmp->dib) if (!size) return 0;
if (size == sizeof(BITMAP))
{ {
/* A device-dependent bitmap is selected in the DC */ /* A device-dependent bitmap is selected in the DC */
hbmpRet = CreateBitmap(width, height, hbmpRet = CreateBitmap(width, height,
bmp->bitmap.bmPlanes, dib.dsBm.bmPlanes,
bmp->bitmap.bmBitsPixel, dib.dsBm.bmBitsPixel,
NULL); NULL);
} }
else else
@ -174,19 +175,19 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
bi->bmiHeader.biSize = sizeof(bi->bmiHeader); bi->bmiHeader.biSize = sizeof(bi->bmiHeader);
bi->bmiHeader.biWidth = width; bi->bmiHeader.biWidth = width;
bi->bmiHeader.biHeight = height; bi->bmiHeader.biHeight = height;
bi->bmiHeader.biPlanes = bmp->dib->dsBmih.biPlanes; bi->bmiHeader.biPlanes = dib.dsBmih.biPlanes;
bi->bmiHeader.biBitCount = bmp->dib->dsBmih.biBitCount; bi->bmiHeader.biBitCount = dib.dsBmih.biBitCount;
bi->bmiHeader.biCompression = bmp->dib->dsBmih.biCompression; bi->bmiHeader.biCompression = dib.dsBmih.biCompression;
bi->bmiHeader.biSizeImage = 0; bi->bmiHeader.biSizeImage = 0;
bi->bmiHeader.biXPelsPerMeter = bmp->dib->dsBmih.biXPelsPerMeter; bi->bmiHeader.biXPelsPerMeter = dib.dsBmih.biXPelsPerMeter;
bi->bmiHeader.biYPelsPerMeter = bmp->dib->dsBmih.biYPelsPerMeter; bi->bmiHeader.biYPelsPerMeter = dib.dsBmih.biYPelsPerMeter;
bi->bmiHeader.biClrUsed = bmp->dib->dsBmih.biClrUsed; bi->bmiHeader.biClrUsed = dib.dsBmih.biClrUsed;
bi->bmiHeader.biClrImportant = bmp->dib->dsBmih.biClrImportant; bi->bmiHeader.biClrImportant = dib.dsBmih.biClrImportant;
if (bi->bmiHeader.biCompression == BI_BITFIELDS) if (bi->bmiHeader.biCompression == BI_BITFIELDS)
{ {
/* Copy the color masks */ /* Copy the color masks */
CopyMemory(bi->bmiColors, bmp->dib->dsBitfields, 3 * sizeof(DWORD)); CopyMemory(bi->bmiColors, dib.dsBitfields, 3 * sizeof(DWORD));
} }
else if (bi->bmiHeader.biBitCount <= 8) else if (bi->bmiHeader.biBitCount <= 8)
{ {
@ -198,9 +199,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
HeapFree(GetProcessHeap(), 0, bi); HeapFree(GetProcessHeap(), 0, bi);
} }
} }
GDI_ReleaseObj(dc->hBitmap);
} }
DC_ReleaseDCPtr( dc );
TRACE("\t\t%p\n", hbmpRet); TRACE("\t\t%p\n", hbmpRet);
return hbmpRet; return hbmpRet;