system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 22:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wineandroid: Set the window cursor immediately in SetCursor.

Browse source
This commit is contained in:
Rémi Bernon 2023-01-26 12:30:04 +01:00 committed by Alexandre Julliard
parent 4b968267c1
commit b17b77c707
1 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dlls/wineandroid.drv/window.c
View file

@ -1448,42 +1448,33 @@ static BOOL get_icon_info( HICON handle, ICONINFOEXW *ret )
*/
void ANDROID_SetCursor( HWND hwnd, HCURSOR handle )
{
static HCURSOR last_cursor;
static DWORD last_cursor_change;
if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle ||
NtGetTickCount() - last_cursor_change > 100)
if (handle)
{
last_cursor_change = NtGetTickCount();
unsigned int width = 0, height = 0, *bits = NULL;
ICONINFOEXW info;
int id;
if (handle)
if (!get_icon_info( handle, &info )) return;
if (!(id = get_cursor_system_id( &info )))
{
unsigned int width = 0, height = 0, *bits = NULL;
ICONINFOEXW info;
int id;
HDC hdc = NtGdiCreateCompatibleDC( 0 );
bits = get_bitmap_argb( hdc, info.hbmColor, info.hbmMask, &width, &height );
NtGdiDeleteObjectApp( hdc );
if (!get_icon_info( handle, &info )) return;
if (!(id = get_cursor_system_id( &info )))
/* make sure hotspot is valid */
if (info.xHotspot >= width || info.yHotspot >= height)
{
HDC hdc = NtGdiCreateCompatibleDC( 0 );
bits = get_bitmap_argb( hdc, info.hbmColor, info.hbmMask, &width, &height );
NtGdiDeleteObjectApp( hdc );
/* make sure hotspot is valid */
if (info.xHotspot >= width || info.yHotspot >= height)
{
info.xHotspot = width / 2;
info.yHotspot = height / 2;
}
info.xHotspot = width / 2;
info.yHotspot = height / 2;
}
ioctl_set_cursor( id, width, height, info.xHotspot, info.yHotspot, bits );
free( bits );
NtGdiDeleteObjectApp( info.hbmColor );
NtGdiDeleteObjectApp( info.hbmMask );
}
else ioctl_set_cursor( 0, 0, 0, 0, 0, NULL );
ioctl_set_cursor( id, width, height, info.xHotspot, info.yHotspot, bits );
free( bits );
NtGdiDeleteObjectApp( info.hbmColor );
NtGdiDeleteObjectApp( info.hbmMask );
}
else ioctl_set_cursor( 0, 0, 0, 0, 0, NULL );
}