February 2022 - Wine-commits

Jacek Caban : user32: Simplify cursor hotspot handling.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 064838c5809ee8d43a202ce4ec72465f649e3b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=064838c5809ee8d43a202ce4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:42 2022 +0100 user32: Simplify cursor hotspot handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8f8774b0b4e..d2739278f21 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -66,6 +66,7 @@ struct cursoricon_frame HBITMAP color; /* color bitmap */ HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ + POINT hotspot; }; struct cursoricon_object @@ -80,7 +81,6 @@ struct cursoricon_object BOOL is_icon; /* whether icon or cursor */ BOOL is_ani; /* whether this object is a static cursor or an animated cursor */ UINT delay; /* delay between this frame and the next (in jiffies) */ - POINT hotspot; union { struct cursoricon_frame frame; /* frame-specific icon data */ @@ -1184,7 +1184,6 @@ done: struct cursoricon_frame *frame; info->is_icon = bIcon; - info->hotspot = hotspot; frame = get_icon_frame( info, 0 ); frame->delay = ~0; frame->width = width; @@ -1192,6 +1191,7 @@ done: frame->color = color; frame->mask = mask; frame->alpha = alpha; + frame->hotspot = hotspot; release_icon_frame( info, frame ); if (!IS_INTRESOURCE(resname)) { @@ -1435,13 +1435,14 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, const CURSORICONFILEDIRENTRY *entry; INT frameWidth, frameHeight; const BITMAPINFO *bmi; + POINT hotspot; entry = CURSORICON_FindBestIconFile((const CURSORICONFILEDIR *) icon_data, bits + bits_size - icon_data, width, height, depth, loadflags ); - info->hotspot.x = entry->xHotspot; - info->hotspot.y = entry->yHotspot; + hotspot.x = entry->xHotspot; + hotspot.y = entry->yHotspot; if (!header.width || !header.height) { frameWidth = entry->bWidth; @@ -1459,7 +1460,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); /* Grab a frame from the animation */ frames[i] = create_icon_from_bmi( bmi, bits + bits_size - (const BYTE *)bmi, - NULL, NULL, NULL, info->hotspot, + NULL, NULL, NULL, hotspot, is_icon, frameWidth, frameHeight, loadflags ); } @@ -2201,8 +2202,8 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) TRACE("%p => %dx%d\n", icon, frame->width, frame->height); info->fIcon = ptr->is_icon; - info->xHotspot = ptr->hotspot.x; - info->yHotspot = ptr->hotspot.y; + info->xHotspot = frame->hotspot.x; + info->yHotspot = frame->hotspot.y; info->hbmColor = copy_bitmap( frame->color ); info->hbmMask = copy_bitmap( frame->mask ); info->wResID = 0; @@ -2330,18 +2331,18 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) frame->color = color; frame->mask = mask; frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); - release_icon_frame( info, frame ); if (info->is_icon) { - info->hotspot.x = width / 2; - info->hotspot.y = height / 2; + frame->hotspot.x = width / 2; + frame->hotspot.y = height / 2; } else { - info->hotspot.x = iconinfo->xHotspot; - info->hotspot.y = iconinfo->yHotspot; + frame->hotspot.x = iconinfo->xHotspot; + frame->hotspot.y = iconinfo->yHotspot; } + release_icon_frame( info, frame ); release_user_handle_ptr( info ); } return hObj; @@ -3052,8 +3053,8 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, } info.fIcon = icon->is_icon; - info.xHotspot = icon->hotspot.x; - info.yHotspot = icon->hotspot.y; + info.xHotspot = frame->hotspot.x; + info.yHotspot = frame->hotspot.y; if (desiredx == frame->width && desiredy == frame->height) {

1 0

Jacek Caban : user32: Factor out create_icon_frame.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 8ce4c07f507984bd948d2f525c5a3825824e4eab URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce4c07f507984bd948d2f52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:41:01 2022 +0100 user32: Factor out create_icon_frame. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 134 ++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 70 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d2739278f21..b629e1412ae 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -173,6 +173,13 @@ static UINT get_icon_steps( struct cursoricon_object *obj ) return obj->is_ani ? obj->ani.num_steps : 1; } +static void free_icon_frame( struct cursoricon_frame *frame ) +{ + if (frame->color) DeleteObject( frame->color ); + if (frame->alpha) DeleteObject( frame->alpha ); + if (frame->mask) DeleteObject( frame->mask ); +} + static BOOL free_icon_handle( HICON handle ) { struct cursoricon_object *obj = free_user_handle( handle, NTUSER_OBJ_ICON ); @@ -187,12 +194,7 @@ static BOOL free_icon_handle( HICON handle ) if (!obj->is_ani) { - struct cursoricon_frame *frame = get_icon_frame( obj, 0 ); - - if (frame->alpha) DeleteObject( frame->alpha ); - if (frame->color) DeleteObject( frame->color ); - DeleteObject( frame->mask ); - release_icon_frame( obj, frame ); + free_icon_frame( &obj->frame ); } else { @@ -984,54 +986,42 @@ done: return alpha; } - -/*********************************************************************** - * create_icon_from_bmi - * - * Create an icon from its BITMAPINFO. - */ -static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE module, LPCWSTR resname, - HRSRC rsrc, POINT hotspot, BOOL bIcon, INT width, INT height, - UINT cFlag ) +static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotspot, BOOL is_icon, + INT width, INT height, UINT flags, struct cursoricon_frame *frame ) { - DWORD size, color_size, mask_size; - HBITMAP color = 0, mask = 0, alpha = 0; + DWORD size, color_size, mask_size, compr; const void *color_bits, *mask_bits; void *alpha_mask_bits = NULL; + LONG bmi_width, bmi_height; BITMAPINFO *bmi_copy; - BOOL ret = FALSE; BOOL do_stretch; - HICON hObj = 0; HDC hdc = 0; - LONG bmi_width, bmi_height; WORD bpp; - DWORD compr; + BOOL ret = FALSE; + + memset( frame, 0, sizeof(*frame) ); /* Check bitmap header */ if (bmi->bmiHeader.biSize == PNG_SIGN) { - BITMAPINFO *bmi_png = load_png( (const char *)bmi, &maxsize ); + BITMAPINFO *bmi_png; - if (bmi_png) - { - hObj = create_icon_from_bmi( bmi_png, maxsize, module, resname, - rsrc, hotspot, bIcon, width, height, cFlag ); - HeapFree( GetProcessHeap(), 0, bmi_png ); - return hObj; - } - return 0; + if (!(bmi_png = load_png( (const char *)bmi, &maxsize ))) return FALSE; + ret = create_icon_frame( bmi_png, maxsize, hotspot, is_icon, width, height, flags, frame ); + HeapFree( GetProcessHeap(), 0, bmi_png ); + return ret; } if (maxsize < sizeof(BITMAPCOREHEADER)) { WARN( "invalid size %u\n", maxsize ); - return 0; + return FALSE; } if (maxsize < bmi->bmiHeader.biSize) { WARN( "invalid header size %u\n", bmi->bmiHeader.biSize ); - return 0; + return FALSE; } if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && (bmi->bmiHeader.biSize != sizeof(BITMAPINFOHEADER) || @@ -1039,7 +1029,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE bmi->bmiHeader.biCompression != BI_BITFIELDS)) ) { WARN( "invalid bitmap header %u\n", bmi->bmiHeader.biSize ); - return 0; + return FALSE; } size = bitmap_info_size( bmi, DIB_RGB_COLORS ); @@ -1054,21 +1044,20 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE } if (mask_size > maxsize - size - color_size) mask_size = 0; /* no mask */ - if (cFlag & LR_DEFAULTSIZE) + if (flags & LR_DEFAULTSIZE) { - if (!width) width = GetSystemMetrics( bIcon ? SM_CXICON : SM_CXCURSOR ); - if (!height) height = GetSystemMetrics( bIcon ? SM_CYICON : SM_CYCURSOR ); + if (!width) width = GetSystemMetrics( is_icon ? SM_CXICON : SM_CXCURSOR ); + if (!height) height = GetSystemMetrics( is_icon ? SM_CYICON : SM_CYCURSOR ); } else { if (!width) width = bmi_width; if (!height) height = bmi_height/2; } - do_stretch = (bmi_height/2 != height) || - (bmi_width != width); + do_stretch = (bmi_height/2 != height) || (bmi_width != width); /* Scale the hotspot */ - if (bIcon) + if (is_icon) { hotspot.x = width / 2; hotspot.y = height / 2; @@ -1093,34 +1082,28 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE color_bits = (const char*)bmi + size; mask_bits = (const char*)color_bits + color_size; - alpha = 0; if (is_dib_monochrome( bmi )) { - if (!(mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done; - color = 0; + if (!(frame->mask = CreateBitmap( width, height * 2, 1, 1, NULL ))) goto done; /* copy color data into second half of mask bitmap */ - SelectObject( hdc, mask ); + SelectObject( hdc, frame->mask ); StretchDIBits( hdc, 0, height, width, height, 0, 0, bmi_width, bmi_height, color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } else { - if (!(mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; - if (!(color = create_color_bitmap( width, height ))) - { - DeleteObject( mask ); - goto done; - } - SelectObject( hdc, color ); + if (!(frame->mask = CreateBitmap( width, height, 1, 1, NULL ))) goto done; + if (!(frame->color = create_color_bitmap( width, height ))) goto done; + SelectObject( hdc, frame->color ); StretchDIBits( hdc, 0, 0, width, height, 0, 0, bmi_width, bmi_height, color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) { - alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); + frame->alpha = create_alpha_bitmap( frame->color, bmi_copy, color_bits ); if (!mask_size) /* generate mask from alpha */ { LONG x, y, dst_stride = ((bmi_width + 31) / 8) & ~3; @@ -1164,35 +1147,48 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE if (mask_size) { - SelectObject( hdc, mask ); + SelectObject( hdc, frame->mask ); StretchDIBits( hdc, 0, 0, width, height, 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + + frame->delay = ~0; + frame->width = width; + frame->height = height; + frame->hotspot = hotspot; ret = TRUE; done: + if (!ret) free_icon_frame( frame ); DeleteDC( hdc ); HeapFree( GetProcessHeap(), 0, bmi_copy ); HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); + return ret; +} + +/*********************************************************************** + * create_icon_from_bmi + * + * Create an icon from its BITMAPINFO. + */ +static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE module, LPCWSTR resname, + HRSRC rsrc, POINT hotspot, BOOL bIcon, INT width, INT height, + UINT flags ) +{ + struct cursoricon_frame frame; + HICON ret; + if (!create_icon_frame( bmi, maxsize, hotspot, bIcon, width, height, flags, &frame )) return 0; + + ret = alloc_icon_handle( FALSE, 0 ); if (ret) - hObj = alloc_icon_handle( FALSE, 0 ); - if (hObj) { - struct cursoricon_object *info = get_icon_ptr( hObj ); - struct cursoricon_frame *frame; + struct cursoricon_object *info = get_icon_ptr( ret ); info->is_icon = bIcon; - frame = get_icon_frame( info, 0 ); - frame->delay = ~0; - frame->width = width; - frame->height = height; - frame->color = color; - frame->mask = mask; - frame->alpha = alpha; - frame->hotspot = hotspot; - release_icon_frame( info, frame ); + info->frame = frame; + if (!IS_INTRESOURCE(resname)) { info->resname = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(resname) + 1) * sizeof(WCHAR) ); @@ -1213,7 +1209,7 @@ done: } } - if (cFlag & LR_SHARED) + if (flags & LR_SHARED) { info->is_shared = TRUE; if (module) @@ -1226,11 +1222,9 @@ done: } else { - DeleteObject( color ); - DeleteObject( alpha ); - DeleteObject( mask ); + free_icon_frame( &frame ); } - return hObj; + return ret; }

1 0

Jacek Caban : user32: Introduce NtUserSetCursorIconData.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: f0176397adde8856c9149265121bd0b710c209cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0176397adde8856c9149265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:41:40 2022 +0100 user32: Introduce NtUserSetCursorIconData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 196 ++++++++++++++++++++++++++++++++++++----------- include/ntuser.h | 15 ++++ 2 files changed, 168 insertions(+), 43 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b629e1412ae..556bc1b0f91 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -904,6 +904,123 @@ static const CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( const CURSORIC return &dir->idEntries[n]; } +static HICON alloc_cursoricon_handle( BOOL is_icon ) +{ + struct cursoricon_object *obj; + HICON handle; + + if (!(obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj) ))) return NULL; + obj->is_icon = is_icon; + + if (!(handle = alloc_user_handle( &obj->obj, NTUSER_OBJ_ICON ))) free( obj ); + return handle; +} + +/*********************************************************************** + * NtUserSetCursorIconData (win32u.@) + */ +BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, + struct cursoricon_desc *desc ) +{ + struct cursoricon_object *obj; + UINT i, j; + + if (!(obj = get_icon_ptr( cursor ))) return FALSE; + + if (obj->is_ani || obj->frame.width) + { + /* already initialized */ + release_user_handle_ptr( obj ); + SetLastError( ERROR_INVALID_CURSOR_HANDLE ); + return FALSE; + } + + obj->delay = desc->delay; + + if (desc->num_steps) + { + if (!(obj->ani.frames = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + desc->num_steps * sizeof(*obj->ani.frames) ))) + { + release_user_handle_ptr( obj ); + return FALSE; + } + obj->is_ani = TRUE; + obj->ani.num_steps = desc->num_steps; + obj->ani.num_frames = desc->num_frames; + } + else obj->frame = desc->frames[0]; + + if (!res_name) + obj->resname = NULL; + else if (res_name->Length) + { + obj->resname = HeapAlloc( GetProcessHeap(), 0, res_name->Length + sizeof(WCHAR) ); + if (obj->resname) + { + memcpy( obj->resname, res_name->Buffer, res_name->Length ); + obj->resname[res_name->Length / sizeof(WCHAR)] = 0; + } + } + else + obj->resname = MAKEINTRESOURCEW( LOWORD(res_name->Buffer) ); + + if (module && module->Length && (obj->module.Buffer = HeapAlloc( GetProcessHeap(), 0, module->Length ))) + { + memcpy( obj->module.Buffer, module->Buffer, module->Length ); + obj->module.Length = module->Length; + } + + if (obj->is_ani) + { + /* Setup the animated frames in the correct sequence */ + for (i = 0; i < desc->num_steps; i++) + { + struct cursoricon_desc frame_desc; + DWORD frame_id; + + if (obj->ani.frames[i]) continue; /* already set */ + + frame_id = desc->frame_seq ? desc->frame_seq[i] : i; + if (frame_id >= obj->ani.num_frames) + { + frame_id = obj->ani.num_frames - 1; + ERR_(cursor)( "Sequence indicates frame past end of list, corrupt?\n" ); + } + memset( &frame_desc, 0, sizeof(frame_desc) ); + frame_desc.delay = desc->frame_rates ? desc->frame_rates[i] : desc->delay; + frame_desc.frames = &desc->frames[frame_id]; + if (!(obj->ani.frames[i] = alloc_cursoricon_handle( obj->is_icon )) || + !NtUserSetCursorIconData( obj->ani.frames[i], NULL, NULL, &frame_desc )) + { + release_user_handle_ptr( obj ); + return 0; + } + + if (desc->frame_seq) + { + for (j = i + 1; j < obj->ani.num_steps; j++) + { + if (desc->frame_seq[j] == frame_id) obj->ani.frames[j] = obj->ani.frames[i]; + } + } + } + } + + if (desc->flags & LR_SHARED) + { + obj->is_shared = TRUE; + if (obj->module.Length) + { + obj->rsrc = desc->rsrc; + list_add_head( &icon_cache, &obj->entry ); + } + } + + release_user_handle_ptr( obj ); + return TRUE; +} + /*********************************************************************** * bmi_has_alpha */ @@ -1167,6 +1284,35 @@ done: return ret; } +static HICON create_cursoricon_object( struct cursoricon_desc *desc, BOOL is_icon, HINSTANCE module, + const WCHAR *resname, HRSRC rsrc ) +{ + WCHAR buf[MAX_PATH]; + UNICODE_STRING module_name = { 0, sizeof(buf), buf }; + UNICODE_STRING res_str = { 0 }; + HICON handle; + + if (!(handle = alloc_cursoricon_handle( is_icon ))) return 0; + + if (module) LdrGetDllFullName( module, &module_name ); + + res_str.Buffer = (WCHAR *)resname; + if (!IS_INTRESOURCE(resname)) + { + res_str.Length = lstrlenW( resname ) * sizeof(WCHAR); + res_str.MaximumLength = res_str.Length + sizeof(WCHAR); + } + desc->rsrc = rsrc; /* FIXME: we should probably avoid storing rsrc */ + + if (!NtUserSetCursorIconData( handle, &module_name, &res_str, desc )) + { + DestroyCursor( handle ); + return 0; + } + + return handle; +} + /*********************************************************************** * create_icon_from_bmi * @@ -1177,53 +1323,17 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE UINT flags ) { struct cursoricon_frame frame; + struct cursoricon_desc desc = + { + .flags = flags, + .frames = &frame, + }; HICON ret; if (!create_icon_frame( bmi, maxsize, hotspot, bIcon, width, height, flags, &frame )) return 0; - ret = alloc_icon_handle( FALSE, 0 ); - if (ret) - { - struct cursoricon_object *info = get_icon_ptr( ret ); - - info->is_icon = bIcon; - info->frame = frame; - - if (!IS_INTRESOURCE(resname)) - { - info->resname = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(resname) + 1) * sizeof(WCHAR) ); - if (info->resname) lstrcpyW( info->resname, resname ); - } - else info->resname = MAKEINTRESOURCEW( LOWORD(resname) ); - - if (module) - { - WCHAR buf[MAX_PATH]; - UNICODE_STRING module_name = { 0, sizeof(buf), buf }; - - if (!LdrGetDllFullName( module, &module_name ) && - (info->module.Buffer = HeapAlloc( GetProcessHeap(), 0, module_name.Length ))) - { - memcpy( info->module.Buffer, module_name.Buffer, module_name.Length ); - info->module.Length = module_name.Length; - } - } - - if (flags & LR_SHARED) - { - info->is_shared = TRUE; - if (module) - { - info->rsrc = rsrc; - list_add_head( &icon_cache, &info->entry ); - } - } - release_user_handle_ptr( info ); - } - else - { - free_icon_frame( &frame ); - } + ret = create_cursoricon_object( &desc, bIcon, module, resname, rsrc ); + if (!ret) free_icon_frame( &frame ); return ret; } diff --git a/include/ntuser.h b/include/ntuser.h index c34270653ea..a54da6095f1 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -113,6 +113,19 @@ enum #define NTUSER_OBJ_ACCEL 0x08 #define NTUSER_OBJ_HOOK 0x0f +/* NtUserSetCursorIconData parameter, not compatible with Windows */ +struct cursoricon_desc +{ + UINT flags; + UINT num_steps; + UINT num_frames; + UINT delay; + struct cursoricon_frame *frames; + DWORD *frame_seq; + DWORD *frame_rates; + HRSRC rsrc; +}; + /* internal messages codes */ enum wine_internal_message { @@ -199,6 +212,8 @@ HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ); BOOL WINAPI NtUserScrollDC( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE palette, WORD force_background ); +BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNICODE_STRING *res_name, + struct cursoricon_desc *desc ); BOOL WINAPI NtUserSetCursorPos( INT x, INT y ); BOOL WINAPI NtUserSetKeyboardState( BYTE *state ); BOOL WINAPI NtUserSetProcessDpiAwarenessContext( ULONG awareness, ULONG unknown );

1 0

Jacek Caban : user32: Use create_cursoricon_object in CreateIconIndirect.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: a37a0a94d40367b4885ea7438ac191c2aca9ae27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37a0a94d40367b4885ea743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:41:52 2022 +0100 user32: Use create_cursoricon_object in CreateIconIndirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 73 ++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 42 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 556bc1b0f91..8b74f7ba4e8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2373,10 +2373,10 @@ static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, */ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { + struct cursoricon_frame frame = { 0 }; + struct cursoricon_desc desc = { .frames = &frame }; BITMAP bmpXor, bmpAnd; - HICON hObj; - HBITMAP color = 0, mask; - int width, height; + HICON ret; HDC hdc; TRACE("color %p, mask %p, hotspot %ux%u, fIcon %d\n", @@ -2397,59 +2397,48 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) bmpXor.bmWidth, bmpXor.bmHeight, bmpXor.bmWidthBytes, bmpXor.bmPlanes, bmpXor.bmBitsPixel); - width = bmpXor.bmWidth; - height = bmpXor.bmHeight; - color = create_color_bitmap( width, height ); + frame.width = bmpXor.bmWidth; + frame.height = bmpXor.bmHeight; + frame.color = create_color_bitmap( frame.width, frame.height ); } else { - width = bmpAnd.bmWidth; - height = bmpAnd.bmHeight; + frame.width = bmpAnd.bmWidth; + frame.height = bmpAnd.bmHeight; } - mask = CreateBitmap( width, height, 1, 1, NULL ); + frame.mask = CreateBitmap( frame.width, frame.height, 1, 1, NULL ); hdc = CreateCompatibleDC( 0 ); - SelectObject( hdc, mask ); - stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmMask, bmpAnd.bmWidth, bmpAnd.bmHeight ); + SelectObject( hdc, frame.mask ); + stretch_blt_icon( hdc, 0, 0, frame.width, frame.height, iconinfo->hbmMask, + bmpAnd.bmWidth, bmpAnd.bmHeight ); - if (color) + if (frame.color) { - SelectObject( hdc, color ); - stretch_blt_icon( hdc, 0, 0, width, height, iconinfo->hbmColor, width, height ); + SelectObject( hdc, frame.color ); + stretch_blt_icon( hdc, 0, 0, frame.width, frame.height, iconinfo->hbmColor, + frame.width, frame.height ); } - else height /= 2; + else frame.height /= 2; DeleteDC( hdc ); - hObj = alloc_icon_handle( FALSE, 0 ); - if (hObj) - { - struct cursoricon_object *info = get_icon_ptr( hObj ); - struct cursoricon_frame *frame; - - info->is_icon = iconinfo->fIcon; - frame = get_icon_frame( info, 0 ); - frame->delay = ~0; - frame->width = width; - frame->height = height; - frame->color = color; - frame->mask = mask; - frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); - if (info->is_icon) - { - frame->hotspot.x = width / 2; - frame->hotspot.y = height / 2; - } - else - { - frame->hotspot.x = iconinfo->xHotspot; - frame->hotspot.y = iconinfo->yHotspot; - } + frame.alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); - release_icon_frame( info, frame ); - release_user_handle_ptr( info ); + if (iconinfo->fIcon) + { + frame.hotspot.x = frame.width / 2; + frame.hotspot.y = frame.height / 2; + } + else + { + frame.hotspot.x = iconinfo->xHotspot; + frame.hotspot.y = iconinfo->yHotspot; } - return hObj; + + ret = create_cursoricon_object( &desc, iconinfo->fIcon, 0, 0, 0 ); + if (!ret) free_icon_frame( &frame ); + return ret; } /******************************************************************************

1 0

Jacek Caban : user32: Use create_cursoricon_object in CURSORICON_CreateIconFromANI.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: a771eb4405f45e7042ee1b93f7373b2f507d0b71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a771eb4405f45e7042ee1b93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:42:16 2022 +0100 user32: Use create_cursoricon_object in CURSORICON_CreateIconFromANI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 122 ++++++++++------------------------------------- 1 file changed, 24 insertions(+), 98 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8b74f7ba4e8..5eb7ddc695a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -109,34 +109,6 @@ static int get_display_bpp(void) return ret; } -static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) -{ - struct cursoricon_object *obj; - HICON handle; - - if (!(obj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj) ))) return NULL; - obj->delay = 0; - obj->is_ani = is_ani; - if (is_ani) - { - if (!(obj->ani.frames = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - num_steps * sizeof(*obj->ani.frames) ))) - { - HeapFree( GetProcessHeap(), 0, obj ); - return NULL; - } - obj->ani.num_steps = num_steps; - obj->ani.num_frames = num_steps; /* changed later for some animated cursors */ - } - - if (!(handle = alloc_user_handle( &obj->obj, NTUSER_OBJ_ICON ))) - { - if (obj->is_ani) HeapFree( GetProcessHeap(), 0, obj->ani.frames ); - HeapFree( GetProcessHeap(), 0, obj ); - } - return handle; -} - static struct cursoricon_object *get_icon_ptr( HICON handle ) { struct cursoricon_object *obj = get_user_handle_ptr( handle, NTUSER_OBJ_ICON ); @@ -990,6 +962,7 @@ BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNI memset( &frame_desc, 0, sizeof(frame_desc) ); frame_desc.delay = desc->frame_rates ? desc->frame_rates[i] : desc->delay; frame_desc.frames = &desc->frames[frame_id]; + frame_desc.frames->delay = frame_desc.delay; /* FIXME */ if (!(obj->ani.frames[i] = alloc_cursoricon_handle( obj->is_icon )) || !NtUserSetCursorIconData( obj->ani.frames[i], NULL, NULL, &frame_desc )) { @@ -1446,15 +1419,11 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, INT width, INT height, INT depth, BOOL is_icon, UINT loadflags ) { - struct cursoricon_object *info; - DWORD *frame_rates = NULL; - DWORD *frame_seq = NULL; + struct cursoricon_desc desc = { 0 }; ani_header header; - BOOL use_seq = FALSE; HCURSOR cursor; UINT i; BOOL error = FALSE; - HICON *frames; riff_chunk_t root_chunk = { bits_size, bits }; riff_chunk_t ACON_chunk = {0}; @@ -1494,8 +1463,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, riff_find_chunk( ANI_seq__ID, 0, &ACON_chunk, &seq_chunk ); if (seq_chunk.data) { - frame_seq = (DWORD *) seq_chunk.data; - use_seq = TRUE; + desc.frame_seq = (DWORD *)seq_chunk.data; } else { @@ -1506,7 +1474,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, riff_find_chunk( ANI_rate_ID, 0, &ACON_chunk, &rate_chunk ); if (rate_chunk.data) - frame_rates = (DWORD *) rate_chunk.data; + desc.frame_rates = (DWORD *)rate_chunk.data; riff_find_chunk( ANI_fram_ID, ANI_LIST_ID, &ACON_chunk, &fram_chunk ); if (!fram_chunk.data) @@ -1515,25 +1483,16 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, return 0; } - cursor = alloc_icon_handle( TRUE, header.num_steps ); - if (!cursor) return 0; - frames = HeapAlloc( GetProcessHeap(), 0, sizeof(*frames) * header.num_frames ); - if (!frames) - { - free_icon_handle( cursor ); - return 0; - } - - info = get_icon_ptr( cursor ); - info->is_icon = is_icon; - info->ani.num_frames = header.num_frames; - /* The .ANI stores the display rate in jiffies (1/60s) */ - info->delay = header.display_rate; + desc.delay = header.display_rate; + desc.num_frames = header.num_frames; + desc.num_steps = header.num_steps; + if (!(desc.frames = HeapAlloc( GetProcessHeap(), 0, sizeof(*desc.frames) * desc.num_frames ))) + return 0; icon_chunk = fram_chunk.data; icon_data = fram_chunk.data + (2 * sizeof(DWORD)); - for (i=0; i<header.num_frames; i++) + for (i = 0; i < desc.num_frames; i++) { const DWORD chunk_size = *(const DWORD *)(icon_chunk + sizeof(DWORD)); const CURSORICONFILEDIRENTRY *entry; @@ -1558,29 +1517,28 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, frameHeight = header.height; } - frames[i] = NULL; - if (entry->dwDIBOffset < bits + bits_size - icon_data) + if (!(error = entry->dwDIBOffset >= bits + bits_size - icon_data)) { bmi = (const BITMAPINFO *) (icon_data + entry->dwDIBOffset); /* Grab a frame from the animation */ - frames[i] = create_icon_from_bmi( bmi, bits + bits_size - (const BYTE *)bmi, - NULL, NULL, NULL, hotspot, - is_icon, frameWidth, frameHeight, loadflags ); + error = !create_icon_frame( bmi, bits + bits_size - (const BYTE *)bmi, hotspot, + is_icon, frameWidth, frameHeight, loadflags, &desc.frames[i] ); } - if (!frames[i]) + if (error) { - FIXME_(cursor)("failed to convert animated cursor frame.\n"); - error = TRUE; if (i == 0) { FIXME_(cursor)("Completely failed to create animated cursor!\n"); - info->ani.num_frames = 0; - release_user_handle_ptr( info ); - free_icon_handle( cursor ); - HeapFree( GetProcessHeap(), 0, frames ); + HeapFree( GetProcessHeap(), 0, desc.frames ); return 0; } + /* There was an error but we at least decoded the first frame, so just use that frame */ + FIXME_(cursor)("Error creating animated cursor, only using first frame!\n"); + while (i > 1) free_icon_frame( &desc.frames[--i] ); + desc.num_frames = desc.num_steps = 1; + desc.frame_seq = NULL; + desc.delay = 0; break; } @@ -1589,41 +1547,9 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, icon_data = icon_chunk + (2 * sizeof(DWORD)); } - /* There was an error but we at least decoded the first frame, so just use that frame */ - if (error) - { - FIXME_(cursor)("Error creating animated cursor, only using first frame!\n"); - for (i=1; i < info->ani.num_frames; i++) - free_icon_handle( info->ani.frames[i] ); - use_seq = FALSE; - info->delay = 0; - info->ani.num_steps = 1; - info->ani.num_frames = 1; - } - - /* Setup the animated frames in the correct sequence */ - for (i=0; i < info->ani.num_steps; i++) - { - DWORD frame_id = use_seq ? frame_seq[i] : i; - struct cursoricon_frame *frame; - - if (frame_id >= info->ani.num_frames) - { - frame_id = info->ani.num_frames-1; - ERR_(cursor)("Sequence indicates frame past end of list, corrupt?\n"); - } - info->ani.frames[i] = frames[frame_id]; - frame = get_icon_frame( info, i ); - if (frame_rates) - frame->delay = frame_rates[i]; - else - frame->delay = ~0; - release_icon_frame( info, frame ); - } - - HeapFree( GetProcessHeap(), 0, frames ); - release_user_handle_ptr( info ); - + cursor = create_cursoricon_object( &desc, is_icon, 0, 0, 0 ); + if (!cursor) for (i = 0; i < desc.num_frames; i++) free_icon_frame( &desc.frames[i] ); + HeapFree( GetProcessHeap(), 0, desc.frames ); return cursor; }

1 0

Jacek Caban : user32: Simplify icon delay handling.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: b13521367a3856385d8ad2d8006a197bdec02f8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13521367a3856385d8ad2d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:42:36 2022 +0100 user32: Simplify icon delay handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 5eb7ddc695a..20cbf070334 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -62,7 +62,6 @@ struct cursoricon_frame { UINT width; /* frame-specific width */ UINT height; /* frame-specific height */ - UINT delay; /* frame-specific delay between this frame and the next (in jiffies) */ HBITMAP color; /* color bitmap */ HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ @@ -962,7 +961,6 @@ BOOL WINAPI NtUserSetCursorIconData( HCURSOR cursor, UNICODE_STRING *module, UNI memset( &frame_desc, 0, sizeof(frame_desc) ); frame_desc.delay = desc->frame_rates ? desc->frame_rates[i] : desc->delay; frame_desc.frames = &desc->frames[frame_id]; - frame_desc.frames->delay = frame_desc.delay; /* FIXME */ if (!(obj->ani.frames[i] = alloc_cursoricon_handle( obj->is_icon )) || !NtUserSetCursorIconData( obj->ani.frames[i], NULL, NULL, &frame_desc )) { @@ -1243,7 +1241,6 @@ static BOOL create_icon_frame( const BITMAPINFO *bmi, DWORD maxsize, POINT hotsp mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } - frame->delay = ~0; frame->width = width; frame->height = height; frame->hotspot = hotspot; @@ -2137,20 +2134,16 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, } else if (istep < icon_steps) { - struct cursoricon_frame *frame; + struct cursoricon_object *frame; *num_steps = icon_steps; - frame = get_icon_frame( ptr, istep ); - if (get_icon_steps(ptr) == 1) + frame = get_icon_ptr( ptr->ani.frames[istep] ); + if (ptr->ani.num_steps == 1) *num_steps = ~0; else - *num_steps = get_icon_steps(ptr); - /* If this specific frame does not have a delay then use the global delay */ - if (frame->delay == ~0) - *rate_jiffies = ptr->delay; - else - *rate_jiffies = frame->delay; - release_icon_frame( ptr, frame ); + *num_steps = ptr->ani.num_steps; + *rate_jiffies = frame->delay; + release_user_handle_ptr( frame ); } }

1 0

Jacek Caban : win32u: Move user lock from user32.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 3e4f83f762943b4f3fe026754c2e87ec02209237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4f83f762943b4f3fe02675… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:43:44 2022 +0100 win32u: Move user lock from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 2 -- dlls/user32/user_main.c | 20 +++----------------- dlls/win32u/hook.c | 2 ++ dlls/win32u/sysparams.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ include/ntuser.h | 1 + 6 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 1ccd69f5a98..c068231cca7 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -651,8 +651,6 @@ BOOL WINAPI User32CallWinEventHook( const struct win_hook_proc_params *params, U WINEVENTPROC proc = params->proc; HMODULE free_module = 0; - USER_CheckNotLock(); /* FIXME: move to NtUserNotifyWinEvent */ - if (params->module[0] && !(proc = get_hook_proc( proc, params->module, &free_module ))) return FALSE; TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index ea30772067d..47f7ec7513a 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -35,15 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics); HMODULE user32_module = 0; -static CRITICAL_SECTION user_section; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &user_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": user_section") } -}; -static CRITICAL_SECTION user_section = { &critsect_debug, -1, 0, 0, 0, 0 }; - static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); @@ -53,7 +44,7 @@ extern void WDML_NotifyThreadDetach(void); */ void USER_Lock(void) { - EnterCriticalSection( &user_section ); + NtUserCallOneParam( 0, NtUserLock ); } @@ -62,7 +53,7 @@ void USER_Lock(void) */ void USER_Unlock(void) { - LeaveCriticalSection( &user_section ); + NtUserCallOneParam( 1, NtUserLock ); } @@ -73,11 +64,7 @@ void USER_Unlock(void) */ void USER_CheckNotLock(void) { - if (RtlIsCriticalSectionLockedByThread(&user_section)) - { - ERR( "BUG: holding USER lock\n" ); - DebugBreak(); - } + NtUserCallOneParam( 2, NtUserLock ); } @@ -237,7 +224,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_DETACH: USER_unload_driver(); FreeLibrary(imm32_module); - DeleteCriticalSection(&user_section); break; } return ret; diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index b390676fc60..427f4cc8527 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -254,6 +254,8 @@ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG c TRACE( "%04x, %p, %d, %d\n", event, hwnd, object_id, child_id ); + user_check_not_lock(); + if (!hwnd) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 58bd22a3adf..c2b09689c2b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -25,6 +25,8 @@ #endif #include <pthread.h> +#include <assert.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "ntgdi_private.h" @@ -360,6 +362,30 @@ static RECT work_area; static HDC display_dc; static pthread_mutex_t display_dc_lock = PTHREAD_MUTEX_INITIALIZER; +static pthread_mutex_t user_mutex; +static unsigned int user_lock_thread, user_lock_rec; + +void user_lock(void) +{ + pthread_mutex_lock( &user_mutex ); + if (!user_lock_rec++) user_lock_thread = GetCurrentThreadId(); +} + +void user_unlock(void) +{ + if (!--user_lock_rec) user_lock_thread = 0; + pthread_mutex_unlock( &user_mutex ); +} + +void user_check_not_lock(void) +{ + if (user_lock_thread == GetCurrentThreadId()) + { + ERR( "BUG: holding USER lock\n" ); + assert( 0 ); + } +} + static HANDLE get_display_device_init_mutex( void ) { static const WCHAR display_device_initW[] = @@ -3008,6 +3034,7 @@ void sysparams_init(void) DWORD i, dispos, dpi_scaling; WCHAR layout[KL_NAMELENGTH]; + pthread_mutexattr_t attr; HKEY hkey; static const WCHAR software_wineW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e'}; @@ -3018,6 +3045,11 @@ void sysparams_init(void) static const WCHAR kl_preloadW[] = {'K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','\\','P','r','e','l','o','a','d'}; + pthread_mutexattr_init( &attr ); + pthread_mutexattr_settype( &attr, PTHREAD_MUTEX_RECURSIVE ); + pthread_mutex_init( &user_mutex, &attr ); + pthread_mutexattr_destroy( &attr ); + if ((hkey = reg_create_key( hkcu_key, kl_preloadW, sizeof(kl_preloadW), 0, NULL ))) { if (NtUserGetKeyboardLayoutName( layout )) @@ -4550,6 +4582,13 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); case NtUserIncrementKeyStateCounter: return InterlockedAdd( &global_key_state_counter, arg ); + case NtUserLock: + switch( arg ) + { + case 0: user_lock(); return 0; + case 1: user_unlock(); return 0; + default: user_check_not_lock(); return 0; + } case NtUserSetCallbacks: return (UINT_PTR)InterlockedExchangePointer( (void **)&user_callbacks, (void *)arg ); default: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 3017b7e6a72..34b3b545129 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -263,6 +263,9 @@ extern HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) DEC extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; +extern void user_lock(void) DECLSPEC_HIDDEN; +extern void user_unlock(void) DECLSPEC_HIDDEN; +extern void user_check_not_lock(void) DECLSPEC_HIDDEN; extern void wrappers_init( unixlib_handle_t handle ) DECLSPEC_HIDDEN; extern NTSTATUS gdi_init(void) DECLSPEC_HIDDEN; diff --git a/include/ntuser.h b/include/ntuser.h index a54da6095f1..f36549250bd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -87,6 +87,7 @@ enum NtUserFlushWindowSurfaces, NtUserGetDeskPattern, NtUserIncrementKeyStateCounter, + NtUserLock, NtUserSetCallbacks, };

1 0

Nikolay Sivov : atlthunk/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: c7fac86e4db573c052312f79eeded0651e897b06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7fac86e4db573c052312f79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 22 11:33:56 2022 +0300 atlthunk/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atlthunk/tests/Makefile.in | 1 - dlls/atlthunk/tests/atlthunk.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/atlthunk/tests/Makefile.in b/dlls/atlthunk/tests/Makefile.in index 1927af38900..9da3a9696ad 100644 --- a/dlls/atlthunk/tests/Makefile.in +++ b/dlls/atlthunk/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = atlthunk.dll IMPORTS = atlthunk diff --git a/dlls/atlthunk/tests/atlthunk.c b/dlls/atlthunk/tests/atlthunk.c index b316ae1eae1..ca719e0836a 100644 --- a/dlls/atlthunk/tests/atlthunk.c +++ b/dlls/atlthunk/tests/atlthunk.c @@ -23,8 +23,8 @@ static LRESULT WINAPI test_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { ok(msg == 1, "msg = %u\n", msg); - ok(wparam == 2, "wparam = %lu\n", wparam); - ok(lparam == 3, "lparam = %lu\n", lparam); + ok(wparam == 2, "wparam = %Id\n", wparam); + ok(lparam == 3, "lparam = %Id\n", lparam); return (LRESULT)hwnd | 0x1000; } @@ -49,7 +49,7 @@ static void test_thunk_proc(void) ok(thunk_proc != NULL, "thunk_proc = NULL\n"); res = thunk_proc((HWND)0x1234, 1, 2, 3); - ok(res == (i | 0x1000), "res = %lu\n", res); + ok(res == (i | 0x1000), "res = %Iu\n", res); } for(i=0; i < ARRAY_SIZE(thunks); i++)

1 0

Gabriel Ivăncescu : winepulse.drv: Expose audio devices to the application.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 1ccdbcf475e21a9320dc81e0b0acac7fd997f338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccdbcf475e21a9320dc81e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 18 20:37:59 2022 +0200 winepulse.drv: Expose audio devices to the application. This exposes the actual devices (and virtual sinks/sources) as reported by PulseAudio to an application, allowing it to select the devices itself and, for example, record from (or render to) two devices at the same time. The "PulseAudio" device (which is movable) is still the default, as before, with the same GUID to preserve compatibility with existing setups. Based on a patch by Mark Harmstone <mark(a)harmstone.com>, with changes by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 205 +++++++++++++++++++++++++++++++++++------- dlls/winepulse.drv/pulse.c | 140 ++++++++++++++++++++++++++--- dlls/winepulse.drv/unixlib.h | 20 +++++ 3 files changed, 321 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ccdbcf475e21a9320dc…

1 0

Gabriel Ivăncescu : winepulse.drv: Cache the devices looked up in the registry.
by Alexandre Julliard 22 Feb '22

22 Feb '22

Module: wine Branch: master Commit: 0f4fe1c149e677f44f87dbe4c34128f068d54a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f4fe1c149e677f44f87dbe4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Feb 18 20:38:00 2022 +0200 winepulse.drv: Cache the devices looked up in the registry. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8ef3575fa50..0d9f56f8ffe 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -63,6 +63,14 @@ static struct pulse_config pulse_config; static HANDLE pulse_thread; static struct list g_sessions = LIST_INIT(g_sessions); +static struct list g_devices_cache = LIST_INIT(g_devices_cache); + +struct device_cache { + struct list entry; + GUID guid; + EDataFlow dataflow; + char pulse_name[0]; +}; static GUID pulse_render_guid = { 0xfd47d9cc, 0x4218, 0x4135, { 0x9c, 0xe2, 0x0c, 0x19, 0x5c, 0x87, 0x40, 0x5b } }; @@ -90,6 +98,10 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) if (__wine_unix_call(pulse_handle, process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { + struct device_cache *device, *device_next; + + LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) + free(device); __wine_unix_call(pulse_handle, process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); @@ -387,6 +399,7 @@ int WINAPI AUDDRV_GetPriority(void) static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow) { + struct device_cache *device; WCHAR key_name[MAX_PULSE_NAME_LEN + 2]; DWORD key_name_size; DWORD index = 0; @@ -402,6 +415,15 @@ static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_N return TRUE; } + /* Check the cache first */ + LIST_FOR_EACH_ENTRY(device, &g_devices_cache, struct device_cache, entry) { + if (!IsEqualGUID(guid, &device->guid)) + continue; + *flow = device->dataflow; + strcpy(pulse_name, device->pulse_name); + return TRUE; + } + if (RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ | KEY_WOW64_64KEY, &key) != ERROR_SUCCESS) { WARN("No devices found in registry\n"); return FALSE; @@ -412,6 +434,7 @@ static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_N LSTATUS status; GUID reg_guid; HKEY dev_key; + int len; key_name_size = ARRAY_SIZE(key_name); if (RegEnumKeyExW(key, index++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) @@ -440,7 +463,16 @@ static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_N return FALSE; } - return WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL); + if (!(len = WideCharToMultiByte(CP_UNIXCP, 0, key_name + 2, -1, pulse_name, MAX_PULSE_NAME_LEN, NULL, NULL))) + return FALSE; + + if ((device = malloc(FIELD_OFFSET(struct device_cache, pulse_name[len])))) { + device->guid = reg_guid; + device->dataflow = *flow; + strcpy(device->pulse_name, pulse_name); + list_add_tail(&g_devices_cache, &device->entry); + } + return TRUE; } }

1 0