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

Avoid directly accessing the BITMAPOBJ structure.

This commit is contained in:
Alexandre Julliard 2005-03-31 19:05:48 +00:00
parent 0b1d1d9752
commit 313554f01f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/x11drv/xrender.c
View File

@ -1623,7 +1623,7 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst,
Picture dst_pict, src_pict; Picture dst_pict, src_pict;
Pixmap xpm; Pixmap xpm;
HBITMAP hBitmap; HBITMAP hBitmap;
BITMAPOBJ *bmp; DIBSECTION dib;
XImage *image; XImage *image;
GC gc; GC gc;
XGCValues gcv; XGCValues gcv;
@ -1667,26 +1667,24 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst,
} }
hBitmap = GetCurrentObject( devSrc->hdc, OBJ_BITMAP ); hBitmap = GetCurrentObject( devSrc->hdc, OBJ_BITMAP );
bmp = (BITMAPOBJ *)GDI_GetObjPtr( hBitmap, BITMAP_MAGIC ); if (GetObjectW( hBitmap, sizeof(dib), &dib ) != sizeof(dib))
if(!bmp || !bmp->dib) { {
FIXME("not a dibsection\n"); FIXME("not a dibsection\n");
GDI_ReleaseObj( hBitmap );
return FALSE; return FALSE;
} }
if(bmp->dib->dsBm.bmBitsPixel != 32) { if(dib.dsBm.bmBitsPixel != 32) {
FIXME("not a 32 bpp dibsection\n"); FIXME("not a 32 bpp dibsection\n");
GDI_ReleaseObj( hBitmap );
return FALSE; return FALSE;
} }
dstbits = data = HeapAlloc(GetProcessHeap(), 0, heightSrc * widthSrc * 4); dstbits = data = HeapAlloc(GetProcessHeap(), 0, heightSrc * widthSrc * 4);
if(bmp->dib->dsBmih.biHeight < 0) { /* top-down dib */ if(dib.dsBmih.biHeight < 0) { /* top-down dib */
top_down = TRUE; top_down = TRUE;
dstbits += widthSrc * (heightSrc - 1) * 4; dstbits += widthSrc * (heightSrc - 1) * 4;
} }
for(y = ySrc + heightSrc - 1; y >= ySrc; y--) { for(y = ySrc + heightSrc - 1; y >= ySrc; y--) {
memcpy(dstbits, (char *)bmp->dib->dsBm.bmBits + y * bmp->dib->dsBm.bmWidthBytes + xSrc * 4, memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4,
widthSrc * 4); widthSrc * 4);
dstbits += (top_down ? -1 : 1) * widthSrc * 4; dstbits += (top_down ? -1 : 1) * widthSrc * 4;
} }
@ -1749,7 +1747,6 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst,
wine_tsx11_unlock(); wine_tsx11_unlock();
HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, data);
GDI_ReleaseObj( hBitmap );
return TRUE; return TRUE;
} }