February 2022 - Wine-Commits

Jacek Caban : user32: Store module as unicode string in cursoricon_object.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: dd2dd0066519800373b2f26100ecb6bd7b0ee33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd2dd0066519800373b2f261… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 22 13:40:22 2022 +0100 user32: Store module as unicode string in cursoricon_object. 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 | 51 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2b421cd1bf1..6da3e398db1 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -73,7 +73,7 @@ struct cursoricon_object struct user_object obj; /* object header */ struct list entry; /* entry in shared icons list */ ULONG_PTR param; /* opaque param used by 16-bit code */ - HMODULE module; /* module for icons loaded from resources */ + UNICODE_STRING module; /* module for icons loaded from resources */ LPWSTR resname; /* resource name for icons loaded from resources */ HRSRC rsrc; /* resource for shared icons */ BOOL is_shared; /* whether this object is shared */ @@ -1184,7 +1184,6 @@ done: struct cursoricon_frame *frame; info->is_icon = bIcon; - info->module = module; info->hotspot = hotspot; frame = get_icon_frame( info, 0 ); frame->delay = ~0; @@ -1201,6 +1200,19 @@ done: } 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 (cFlag & LR_SHARED) { info->is_shared = TRUE; @@ -1687,18 +1699,24 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, /* If shared icon, check whether it was already loaded */ if (loadflags & LR_SHARED) { + WCHAR buf[MAX_PATH]; + UNICODE_STRING module = { 0, sizeof(buf) - sizeof(WCHAR), buf }; struct cursoricon_object *ptr; - USER_Lock(); - LIST_FOR_EACH_ENTRY( ptr, &icon_cache, struct cursoricon_object, entry ) + if (!LdrGetDllFullName( hInstance, &module )) { - if (ptr->module != hInstance) continue; - if (ptr->rsrc != hRsrc) continue; - hIcon = ptr->obj.handle; - break; + USER_Lock(); + LIST_FOR_EACH_ENTRY( ptr, &icon_cache, struct cursoricon_object, entry ) + { + if (ptr->module.Length != module.Length) continue; + if (memcmp( ptr->module.Buffer, module.Buffer, module.Length )) continue; + if (ptr->rsrc != hRsrc) continue; + hIcon = ptr->obj.handle; + break; + } + USER_Unlock(); + if (hIcon) return hIcon; } - USER_Unlock(); - if (hIcon) return hIcon; } if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; @@ -2159,7 +2177,6 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) { struct cursoricon_frame *frame; struct cursoricon_object *ptr; - HMODULE module; BOOL ret = TRUE; if (info->cbSize != sizeof(*info)) @@ -2191,10 +2208,12 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) info->wResID = 0; info->szModName[0] = 0; info->szResName[0] = 0; - if (ptr->module) + if (ptr->module.Length) { if (IS_INTRESOURCE( ptr->resname )) info->wResID = LOWORD( ptr->resname ); else lstrcpynW( info->szResName, ptr->resname, MAX_PATH ); + memcpy( info->szModName, ptr->module.Buffer, ptr->module.Length ); + info->szModName[ptr->module.Length / sizeof(WCHAR)] = 0; } if (!info->hbmMask || (!info->hbmColor && frame->color)) { @@ -2202,10 +2221,8 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) DeleteObject( info->hbmColor ); ret = FALSE; } - module = ptr->module; release_icon_frame( ptr, frame ); release_user_handle_ptr( ptr ); - if (ret && module) GetModuleFileNameW( module, info->szModName, MAX_PATH ); return ret; } @@ -3003,14 +3020,16 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, struct cursoricon_object *icon; int depth = (flags & LR_MONOCHROME) ? 1 : get_display_bpp(); HICON resource_icon = NULL; + HINSTANCE module; ICONINFO info; HICON res; if (!(icon = get_icon_ptr( hnd ))) return 0; - if (icon->rsrc && (flags & LR_COPYFROMRESOURCE)) + if (icon->rsrc && (flags & LR_COPYFROMRESOURCE) && icon->module.Length && + !LdrGetDllHandle( NULL, 0, &icon->module, &module )) { - resource_icon = CURSORICON_Load( icon->module, icon->resname, desiredx, + resource_icon = CURSORICON_Load( module, icon->resname, desiredx, desiredy, depth, !icon->is_icon, flags ); release_user_handle_ptr( icon ); if (!(icon = get_icon_ptr( resource_icon )))

1 0

Eric Pouech : winmm: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 71189f62604c2cb8208c85372a0e027dd2b79055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71189f62604c2cb8208c8537… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 08:15:19 2022 -0600 winmm: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 2 +- dlls/winmm/driver.c | 18 ++--- dlls/winmm/joystick.c | 24 +++---- dlls/winmm/lolvldrv.c | 16 ++--- dlls/winmm/mci.c | 70 +++++++++---------- dlls/winmm/mmio.c | 48 ++++++------- dlls/winmm/playsound.c | 14 ++-- dlls/winmm/time.c | 2 +- dlls/winmm/waveform.c | 178 ++++++++++++++++++++++++------------------------- dlls/winmm/winmm.c | 50 +++++++------- 10 files changed, 211 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71189f62604c2cb8208c…

1 0

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

Feb. 22, 2022

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: Introduce NtUserSetCursorIconData.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

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: Factor out create_icon_frame.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

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: Simplify cursor hotspot handling.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

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

Alexandre Julliard : ntdll: Implement ApiSetQueryApiSetPresence/Ex().
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: cb2fb8c25eb641f96e0b5d84f8049d67f50c0f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb2fb8c25eb641f96e0b5d84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:35:18 2022 +0100 ntdll: Implement ApiSetQueryApiSetPresence/Ex(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 3 --- dlls/ntdll/loader.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 12 ------------ dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 2 ++ 5 files changed, 48 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bd151708220..58dcfaaec99 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -1468,7 +1468,6 @@ static void test_apisets(void) win_skip( "ApiSetQueryApiSetPresence not implemented\n" ); return; } - todo_wine if (!pApiSetQueryApiSetPresenceEx) win_skip( "ApiSetQueryApiSetPresenceEx not implemented\n" ); todo_wine if (!pIsApiSetImplemented) win_skip( "IsApiSetImplemented not implemented\n" ); @@ -1480,9 +1479,7 @@ static void test_apisets(void) winetest_push_context( "%u:%s", i, tests[i].name ); present = 0xff; status = pApiSetQueryApiSetPresence( &name, &present ); - todo_wine ok( status == STATUS_SUCCESS, "wrong ret %x\n", status ); - todo_wine_if( !tests[i].present ) ok( present == tests[i].present || broken(!present && tests[i].broken) /* win8 */, "wrong present %u\n", present ); if (pApiSetQueryApiSetPresenceEx) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 49911d6c707..d3b63dc7ada 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4526,6 +4526,51 @@ void WINAPI RtlReleasePath( PWSTR path ) } +/********************************************************************* + * ApiSetQueryApiSetPresence (NTDLL.@) + */ +NTSTATUS WINAPI ApiSetQueryApiSetPresence( const UNICODE_STRING *name, BOOLEAN *present ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + UNICODE_STRING str; + + *present = (!get_apiset_entry( map, name->Buffer, name->Length / sizeof(WCHAR), &entry ) && + !get_apiset_target( map, entry, NULL, &str )); + return STATUS_SUCCESS; +} + + +/********************************************************************* + * ApiSetQueryApiSetPresenceEx (NTDLL.@) + */ +NTSTATUS WINAPI ApiSetQueryApiSetPresenceEx( const UNICODE_STRING *name, BOOLEAN *in_schema, BOOLEAN *present ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + NTSTATUS status; + UNICODE_STRING str; + ULONG i, len = name->Length / sizeof(WCHAR); + + /* extension not allowed */ + for (i = 0; i < len; i++) if (name->Buffer[i] == '.') return STATUS_INVALID_PARAMETER; + + status = get_apiset_entry( map, name->Buffer, len, &entry ); + if (status == STATUS_APISET_NOT_PRESENT) + { + *in_schema = *present = FALSE; + return STATUS_SUCCESS; + } + if (status) return status; + + /* the name must match exactly */ + *in_schema = (entry->NameLength == name->Length && + !wcsnicmp( (WCHAR *)((char *)map + entry->NameOffset), name->Buffer, len )); + *present = *in_schema && !get_apiset_target( map, entry, NULL, &str ); + return STATUS_SUCCESS; +} + + /****************************************************************** * DllMain (NTDLL.@) */ diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 3bef5a561c8..bce8d7db54e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -381,15 +381,3 @@ ULONG WINAPIV EtwTraceMessage( TRACEHANDLE handle, ULONG flags, LPGUID guid, /*U va_end( valist ); return ret; } - -/********************************************************************* - * ApiSetQueryApiSetPresence (NTDLL.@) - */ -BOOL WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING *namespace, BOOLEAN *present) -{ - FIXME("(%s, %p) stub!\n", debugstr_us(namespace), present); - - if(present) - *present = TRUE; - return TRUE; -} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 29174965394..d514bca5e11 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -7,6 +7,7 @@ @ stdcall A_SHAInit(ptr) @ stdcall A_SHAUpdate(ptr ptr long) @ stdcall ApiSetQueryApiSetPresence(ptr ptr) +@ stdcall ApiSetQueryApiSetPresenceEx(ptr ptr ptr) @ stub CsrAllocateCaptureBuffer @ stub CsrAllocateCapturePointer @ stub CsrAllocateMessagePointer diff --git a/include/winternl.h b/include/winternl.h index ae331562026..6a95c4e0fdc 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3866,6 +3866,8 @@ typedef struct _API_SET_VALUE_ENTRY * Function declarations */ +NTSYSAPI NTSTATUS WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING*,BOOLEAN*); +NTSYSAPI NTSTATUS WINAPI ApiSetQueryApiSetPresenceEx(const UNICODE_STRING*,BOOLEAN*,BOOLEAN*); NTSYSAPI void WINAPI DbgBreakPoint(void); NTSYSAPI NTSTATUS WINAPIV DbgPrint(LPCSTR fmt, ...); NTSYSAPI NTSTATUS WINAPIV DbgPrintEx(ULONG iComponentId, ULONG Level, LPCSTR fmt, ...);

1 0

Alexandre Julliard : ntdll: Map explicitly loaded apiset dlls to their target library.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: 7b233f3032e4850b0f387faef4aae5ed6d5175de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b233f3032e4850b0f387fae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 22 12:31:40 2022 +0100 ntdll: Map explicitly loaded apiset dlls to their target library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 6 ++---- dlls/ntdll/loader.c | 43 +++++++++++++++++++++++++++++-------------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index dcf3b8b3765..bd151708220 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -708,7 +708,6 @@ static void test_LoadLibraryEx_search_flags(void) ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); shcore = GetModuleHandleA( "shcore.dll" ); - todo_wine ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); @@ -722,7 +721,6 @@ static void test_LoadLibraryEx_search_flags(void) ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); shcore = GetModuleHandleA( "shcore.dll" ); - todo_wine ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); @@ -733,7 +731,6 @@ static void test_LoadLibraryEx_search_flags(void) strcpy( buffer, apiset_dll ); buffer[strlen(buffer) - 5] = '9'; mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); - todo_wine ok( !!mod || broken(!mod) /* win8 */, "Got NULL module, error %u.\n", GetLastError() ); if (mod) { @@ -776,9 +773,10 @@ static void test_LoadLibraryEx_search_flags(void) ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); mod = LoadLibraryExA( "ext-ms-win-ras-rasapi32-l1-1-0.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine /* rasapi32 doesn't have interesting dependencies on wine */ ok( !mod, "rasapi32 loaded\n" ); - ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); if (mod) FreeLibrary( mod ); + else ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); mod = LoadLibraryA( "ext-ms-win-ras-rasapi32-l1-1-0.dll" ); ok( !!mod || broken(!mod) /* win7 */, "rasapi32 not found %u\n", GetLastError() ); if (mod) FreeLibrary( mod ); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 387f8b6b2d6..49911d6c707 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2830,6 +2830,30 @@ done: } + +/****************************************************************************** + * find_apiset_dll + */ +static NTSTATUS find_apiset_dll( const WCHAR *name, WCHAR **fullname ) +{ + const API_SET_NAMESPACE *map = NtCurrentTeb()->Peb->ApiSetMap; + const API_SET_NAMESPACE_ENTRY *entry; + UNICODE_STRING str; + ULONG len; + + if (get_apiset_entry( map, name, wcslen(name), &entry )) return STATUS_APISET_NOT_PRESENT; + if (get_apiset_target( map, entry, NULL, &str )) return STATUS_DLL_NOT_FOUND; + + len = wcslen( system_dir ) + str.Length / sizeof(WCHAR); + if (!(*fullname = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + wcscpy( *fullname, system_dir ); + memcpy( *fullname + wcslen( system_dir ), str.Buffer, str.Length ); + (*fullname)[len] = 0; + return STATUS_SUCCESS; +} + + /*********************************************************************** * get_env_var */ @@ -2991,17 +3015,6 @@ done: return status; } -/*********************************************************************** - * is_apiset_dll_name - * - */ -static BOOL is_apiset_dll_name( const WCHAR *name ) -{ - static const WCHAR name_prefix[] = L"api-ms-win-"; - - return !wcsnicmp( name, name_prefix, ARRAY_SIZE(name_prefix) - 1 ); -} - /*********************************************************************** * find_dll_file * @@ -3024,7 +3037,11 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (!contains_path( libname )) { - status = find_actctx_dll( libname, &fullname ); + status = find_apiset_dll( libname, &fullname ); + if (status == STATUS_DLL_NOT_FOUND) goto done; + + if (status) status = find_actctx_dll( libname, &fullname ); + if (status == STATUS_SUCCESS) { TRACE ("found %s for %s\n", debugstr_w(fullname), debugstr_w(libname) ); @@ -3044,8 +3061,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) { status = search_dll_file( load_path, libname, nt_name, pwm, mapping, image_info, id ); - if (status == STATUS_DLL_NOT_FOUND && load_path && is_apiset_dll_name( libname )) - status = search_dll_file( NULL, libname, nt_name, pwm, mapping, image_info, id ); if (status == STATUS_DLL_NOT_FOUND) status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); }

1 0

Eric Pouech : windowscodecs: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: aa180417b88072643b4edf21f246325dc410b145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa180417b88072643b4edf21… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:42:16 2022 +0100 windowscodecs: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/bitmap.c | 12 +++--- dlls/windowscodecs/bmpdecode.c | 10 ++--- dlls/windowscodecs/bmpencode.c | 8 ++-- dlls/windowscodecs/clipper.c | 4 +- dlls/windowscodecs/clsfactory.c | 6 +-- dlls/windowscodecs/colorcontext.c | 4 +- dlls/windowscodecs/colortransform.c | 4 +- dlls/windowscodecs/converter.c | 4 +- dlls/windowscodecs/ddsformat.c | 16 ++++---- dlls/windowscodecs/decoder.c | 10 ++--- dlls/windowscodecs/encoder.c | 12 +++--- dlls/windowscodecs/fliprotate.c | 4 +- dlls/windowscodecs/gifformat.c | 16 ++++---- dlls/windowscodecs/icoformat.c | 14 +++---- dlls/windowscodecs/imgfactory.c | 22 +++++----- dlls/windowscodecs/info.c | 30 +++++++------- dlls/windowscodecs/libjpeg.c | 4 +- dlls/windowscodecs/libtiff.c | 2 +- dlls/windowscodecs/metadatahandler.c | 16 ++++---- dlls/windowscodecs/metadataquery.c | 24 +++++------ dlls/windowscodecs/palette.c | 4 +- dlls/windowscodecs/propertybag.c | 12 +++--- dlls/windowscodecs/scaler.c | 4 +- dlls/windowscodecs/stream.c | 76 +++++++++++++++++------------------ dlls/windowscodecs/tgaformat.c | 12 +++--- dlls/windowscodecs/wincodecs_common.c | 2 +- dlls/wmphoto/Makefile.in | 1 - dlls/wmphoto/main.c | 2 +- 29 files changed, 167 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa180417b88072643b4e…

1 0

Eric Pouech : wmvcore: Enable compilation with long types.
by Alexandre Julliard Feb. 22, 2022

Feb. 22, 2022

Module: wine Branch: master Commit: dcc72808f039f46efda85c52c2f61ffd32070910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcc72808f039f46efda85c52… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 22 09:43:52 2022 +0100 wmvcore: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 1 - dlls/wmvcore/wmvcore_main.c | 10 +++++----- dlls/wmvcore/writer.c | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 56dd85bb191..6aed828abae 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index ff837921286..4be55cbb707 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -30,7 +30,7 @@ HRESULT WINAPI winegstreamer_create_wm_sync_reader(IWMSyncReader **reader); HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_async_reader(reader); } @@ -44,7 +44,7 @@ HRESULT WINAPI WMCreateReaderPriv(IWMReader **reader) HRESULT WINAPI WMCreateSyncReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { - TRACE("reserved %p, rights %#x, reader %p.\n", reserved, rights, reader); + TRACE("reserved %p, rights %#lx, reader %p.\n", reserved, rights, reader); return winegstreamer_create_wm_sync_reader(reader); } @@ -144,7 +144,7 @@ static ULONG WINAPI WMProfileManager_AddRef(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI WMProfileManager_Release(IWMProfileManager2 *iface) WMProfileManager *This = impl_from_IWMProfileManager2(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -200,7 +200,7 @@ static HRESULT WINAPI WMProfileManager_GetSystemProfileCount(IWMProfileManager2 static HRESULT WINAPI WMProfileManager_LoadSystemProfile(IWMProfileManager2 *iface, DWORD index, IWMProfile **ret) { WMProfileManager *This = impl_from_IWMProfileManager2(iface); - FIXME("(%p)->(%d %p)\n", This, index, ret); + FIXME("(%p)->(%ld %p)\n", This, index, ret); return E_NOTIMPL; } diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index 717984db1af..5c62cd35143 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -69,7 +69,7 @@ static ULONG WINAPI WMWriter_AddRef(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -79,7 +79,7 @@ static ULONG WINAPI WMWriter_Release(IWMWriter *iface) WMWriter *This = impl_from_IWMWriter(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) heap_free(This); @@ -118,21 +118,21 @@ static HRESULT WINAPI WMWriter_GetInputCount(IWMWriter *iface, DWORD *pcInputs) static HRESULT WINAPI WMWriter_GetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps **input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_SetInputProps(IWMWriter *iface, DWORD dwInputNum, IWMInputMediaProps *input) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNum, input); + FIXME("(%p)->(%ld %p)\n", This, dwInputNum, input); return E_NOTIMPL; } static HRESULT WINAPI WMWriter_GetInputFormatCount(IWMWriter *iface, DWORD dwInputNumber, DWORD *pcFormat) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, dwInputNumber, pcFormat); + FIXME("(%p)->(%ld %p)\n", This, dwInputNumber, pcFormat); return E_NOTIMPL; } @@ -140,7 +140,7 @@ static HRESULT WINAPI WMWriter_GetInputFormat(IWMWriter *iface, DWORD dwInputNum IWMInputMediaProps **props) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwInputNumber, dwFormatNumber, props); + FIXME("(%p)->(%ld %ld %p)\n", This, dwInputNumber, dwFormatNumber, props); return E_NOTIMPL; } @@ -161,7 +161,7 @@ static HRESULT WINAPI WMWriter_EndWriting(IWMWriter *iface) static HRESULT WINAPI WMWriter_AllocateSample(IWMWriter *iface, DWORD size, INSSBuffer **sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %p)\n", This, size, sample); + FIXME("(%p)->(%ld %p)\n", This, size, sample); return E_NOTIMPL; } @@ -169,7 +169,7 @@ static HRESULT WINAPI WMWriter_WriteSample(IWMWriter *iface, DWORD dwInputNum, Q DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriter(iface); - FIXME("(%p)->(%d %s %x %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); + FIXME("(%p)->(%ld %s %lx %p)\n", This, dwInputNum, wine_dbgstr_longlong(cnsSampleTime), flags, sample); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetSinkCount(IWMWriterAdvanced3 *iface, D static HRESULT WINAPI WMWriterAdvanced_GetSink(IWMWriterAdvanced3 *iface, DWORD sink_num, IWMWriterSink **sink) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %p)\n", This, sink_num, sink); + FIXME("(%p)->(%lu %p)\n", This, sink_num, sink); return E_NOTIMPL; } @@ -254,7 +254,7 @@ static HRESULT WINAPI WMWriterAdvanced_WriteStreamSample(IWMWriterAdvanced3 *ifa QWORD sample_time, DWORD sample_send_time, QWORD sample_duration, DWORD flags, INSSBuffer *sample) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %u %s %x %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), + FIXME("(%p)->(%u %s %lu %s %lx %p)\n", This, stream_num, wine_dbgstr_longlong(sample_time), sample_send_time, wine_dbgstr_longlong(sample_duration), flags, sample); return E_NOTIMPL; } @@ -290,7 +290,7 @@ static HRESULT WINAPI WMWriterAdvanced_GetStatistics(IWMWriterAdvanced3 *iface, static HRESULT WINAPI WMWriterAdvanced_SetSyncTolerance(IWMWriterAdvanced3 *iface, DWORD window) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u)\n", This, window); + FIXME("(%p)->(%lu)\n", This, window); return E_NOTIMPL; } @@ -305,7 +305,7 @@ static HRESULT WINAPI WMWriterAdvanced2_GetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE *time, BYTE *value, WORD *length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); + FIXME("(%p)->(%lu %s %p %p %p)\n", This, input_num, debugstr_w(name), time, value, length); return E_NOTIMPL; } @@ -313,7 +313,7 @@ static HRESULT WINAPI WMWriterAdvanced2_SetInputSetting(IWMWriterAdvanced3 *ifac const WCHAR *name, WMT_ATTR_DATATYPE type, const BYTE *value, WORD length) { WMWriter *This = impl_from_IWMWriterAdvanced3(iface); - FIXME("(%p)->(%u %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); + FIXME("(%p)->(%lu %s %d %p %u)\n", This, input_num, debugstr_w(name), type, value, length); return E_NOTIMPL; }

1 0