wineandroid: Use logical co-ords to call GdiAlphaBlend().
Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
daae0d6adc
commit
99069934f7
|
@ -1247,7 +1247,7 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO
|
||||||
char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
|
char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )];
|
||||||
BITMAPINFO *bmi = (BITMAPINFO *)buffer;
|
BITMAPINFO *bmi = (BITMAPINFO *)buffer;
|
||||||
void *src_bits, *dst_bits;
|
void *src_bits, *dst_bits;
|
||||||
RECT rect;
|
RECT rect, src_rect;
|
||||||
HDC hdc = 0;
|
HDC hdc = 0;
|
||||||
HBITMAP dib;
|
HBITMAP dib;
|
||||||
BOOL ret = FALSE;
|
BOOL ret = FALSE;
|
||||||
|
@ -1297,11 +1297,13 @@ BOOL CDECL ANDROID_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO
|
||||||
memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage );
|
memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage );
|
||||||
PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS );
|
PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS );
|
||||||
}
|
}
|
||||||
|
src_rect = rect;
|
||||||
|
if (info->pptSrc) OffsetRect( &src_rect, info->pptSrc->x, info->pptSrc->y );
|
||||||
|
DPtoLP( info->hdcSrc, (POINT *)&src_rect, 2 );
|
||||||
|
|
||||||
ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
|
ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
|
||||||
info->hdcSrc,
|
info->hdcSrc, src_rect.left, src_rect.top,
|
||||||
rect.left + (info->pptSrc ? info->pptSrc->x : 0),
|
src_rect.right - src_rect.left, src_rect.bottom - src_rect.top,
|
||||||
rect.top + (info->pptSrc ? info->pptSrc->y : 0),
|
|
||||||
rect.right - rect.left, rect.bottom - rect.top,
|
|
||||||
(info->dwFlags & ULW_ALPHA) ? *info->pblend : blend );
|
(info->dwFlags & ULW_ALPHA) ? *info->pblend : blend );
|
||||||
if (ret)
|
if (ret)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue