February 2022 - Wine-Commits

Jacek Caban : user32: Directly use NtUserGetIconInfo in GetIconInfo.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 76f02eeb12734a27309680b9b25f8f7b52c0e5ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=76f02eeb12734a27309680b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:40:41 2022 +0100 user32: Directly use NtUserGetIconInfo in GetIconInfo. 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 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6e735dcd065..d8a35ee7b6e 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1815,18 +1815,9 @@ HCURSOR WINAPI GetCursorFrameInfo( HCURSOR handle, DWORD reserved, DWORD istep, /********************************************************************** * GetIconInfo (USER32.@) */ -BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) +BOOL WINAPI GetIconInfo( HICON icon, ICONINFO *info ) { - ICONINFOEXW infoW; - - infoW.cbSize = sizeof(infoW); - if (!GetIconInfoExW( hIcon, &infoW )) return FALSE; - iconinfo->fIcon = infoW.fIcon; - iconinfo->xHotspot = infoW.xHotspot; - iconinfo->yHotspot = infoW.yHotspot; - iconinfo->hbmColor = infoW.hbmColor; - iconinfo->hbmMask = infoW.hbmMask; - return TRUE; + return NtUserGetIconInfo( icon, info, NULL, NULL, NULL, 0 ); } /**********************************************************************

1 0

Paul Gofman : ntdll: Do not force 2G stack limit for the main thread of 64 bit process.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 3033e0907020a343f2891e489e57194f52f236a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3033e0907020a343f2891e48… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 23 19:16:32 2022 +0300 ntdll: Do not force 2G stack limit for the main thread of 64 bit process. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/thread.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ab12a4ea1c0..5eb201bd90b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2169,7 +2169,7 @@ static void start_main_thread(void) if (p___wine_main_wargv) *p___wine_main_wargv = main_wargv; *(ULONG_PTR *)&peb->CloudFileFlags = get_image_address(); set_load_order_app_name( main_wargv[0] ); - init_thread_stack( teb, is_win64 ? 0x7fffffff : 0, 0, 0 ); + init_thread_stack( teb, 0, 0, 0 ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 618ebb82bfb..0488129aa4c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1156,7 +1156,8 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, #ifdef _WIN64 /* 32-bit stack */ - if ((status = virtual_alloc_thread_stack( &stack, zero_bits, reserve_size, commit_size, 0 ))) + if ((status = virtual_alloc_thread_stack( &stack, zero_bits ? zero_bits : 0x7fffffff, + reserve_size, commit_size, 0 ))) return status; wow_teb->Tib.StackBase = PtrToUlong( stack.StackBase ); wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit );

1 0

Mohamad Al-Jaf : ntdll: Fix the spelling of a comment.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 25839fffc831b28519b30ca88ec43a99719b6899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25839fffc831b28519b30ca8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Feb 22 20:52:35 2022 -0500 ntdll: Fix the spelling of a comment. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..ba11000564e 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -438,7 +438,7 @@ NTSTATUS WINAPI RtlCreateSecurityDescriptor( /************************************************************************** * RtlCopySecurityDescriptor [NTDLL.@] * - * Copies an absolute or sefl-relative SECURITY_DESCRIPTOR. + * Copies an absolute or self-relative SECURITY_DESCRIPTOR. * * PARAMS * pSourceSD [O] SD to copy from.

1 0

Jacek Caban : win32u/tests: Add cursor icon tests.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 745b6a300ac031435c1ebe146aa6b4eb791eccb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=745b6a300ac031435c1ebe14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:39:56 2022 +0100 win32u/tests: Add cursor icon tests. 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/win32u/tests/Makefile.in | 2 +- dlls/win32u/tests/win32u.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/tests/Makefile.in b/dlls/win32u/tests/Makefile.in index c0fa70e4e08..fcbcfa50e39 100644 --- a/dlls/win32u/tests/Makefile.in +++ b/dlls/win32u/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = win32u.dll -IMPORTS = user32 win32u +IMPORTS = user32 gdi32 win32u C_SRCS = \ win32u.c diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 2348c21dd80..980ba23bd73 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -180,6 +180,51 @@ static void test_NtUserBuildHwndList(void) DestroyWindow( hwnd ); } +static void test_cursoricon(void) +{ + BYTE bmp_bits[1024]; + LONG width, height; + HANDLE handle; + unsigned int i; + BOOL ret; + + for (i = 0; i < sizeof(bmp_bits); ++i) + bmp_bits[i] = 111 * i; + + handle = CreateIcon( 0, 16, 16, 1, 1, bmp_bits, &bmp_bits[16 * 16 / 8] ); + ok(handle != 0, "CreateIcon failed\n"); + + ret = NtUserGetIconSize( handle, 0, &width, &height ); + ok( ret, "NtUserGetIconSize failed: %lu\n", GetLastError() ); + ok( width == 16, "width = %ld\n", width ); + ok( height == 32, "height = %ld\n", height ); + + ret = NtUserGetIconSize( handle, 6, &width, &height ); + ok( ret, "NtUserGetIconSize failed: %lu\n", GetLastError() ); + ok( width == 16, "width = %ld\n", width ); + ok( height == 32, "height = %ld\n", height ); + + ret = NtUserDestroyCursor( handle, 0 ); + ok( ret, "NtUserDestroyIcon failed: %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = NtUserGetIconSize( handle, 0, &width, &height ); + ok( !ret && GetLastError() == ERROR_INVALID_CURSOR_HANDLE, + "NtUserGetIconSize returned %x %lu\n", ret, GetLastError() ); + + /* Test a system icon */ + handle = LoadIconA( 0, (LPCSTR)IDI_HAND ); + ok( handle != NULL, "LoadIcon icon failed, error %lu\n", GetLastError() ); + + ret = NtUserGetIconSize( handle, 0, &width, &height ); + ok( width == 32, "width = %ld\n", width ); + ok( height == 64, "height = %ld\n", height ); + ok( ret, "NtUserGetIconSize failed: %lu\n", GetLastError() ); + + ret = DestroyIcon(handle); + ok(ret, "Destroy icon failed, error %lu.\n", GetLastError()); +} + START_TEST(win32u) { /* native win32u.dll fails if user32 is not loaded, so make sure it's fully initialized */ @@ -188,6 +233,7 @@ START_TEST(win32u) test_NtUserEnumDisplayDevices(); test_window_props(); test_NtUserBuildHwndList(); + test_cursoricon(); test_NtUserCloseWindowStation(); }

1 0

Jacek Caban : win32u: Move NtUserGetCursorFrameInfo implementation from user32.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 0885c7cc5a901005ce8611f410f360f5df80bba5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0885c7cc5a901005ce8611f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:40:14 2022 +0100 win32u: Move NtUserGetCursorFrameInfo implementation 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/cursoricon.c | 55 +++------------------------------------------ dlls/win32u/cursoricon.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 8 +++++++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 +++++++++ include/ntuser.h | 2 ++ 8 files changed, 82 insertions(+), 53 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 26c82c2c70c..a6a788565f4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1835,59 +1835,10 @@ HICON WINAPI LoadIconA(HINSTANCE hInstance, LPCSTR name) * Success: Handle to a frame of the cursor (specified by istep) * Failure: NULL cursor (0) */ -HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, DWORD *rate_jiffies, DWORD *num_steps) +HCURSOR WINAPI GetCursorFrameInfo( HCURSOR handle, DWORD reserved, DWORD istep, + DWORD *rate_jiffies, DWORD *num_steps ) { - struct cursoricon_object *ptr; - HCURSOR ret = 0; - UINT icon_steps; - - if (rate_jiffies == NULL || num_steps == NULL) return 0; - - if (!(ptr = get_icon_ptr( hCursor ))) return 0; - - TRACE("%p => %d %d %p %p\n", hCursor, reserved, istep, rate_jiffies, num_steps); - if (reserved != 0) - FIXME("Second parameter non-zero (%d), please report this!\n", reserved); - - icon_steps = get_icon_steps(ptr); - if (istep < icon_steps || !ptr->is_ani) - { - UINT icon_frames = 1; - - if (ptr->is_ani) - icon_frames = ptr->ani.num_frames; - if (ptr->is_ani && icon_frames > 1) - ret = ptr->ani.frames[istep]; - else - ret = hCursor; - if (icon_frames == 1) - { - *rate_jiffies = 0; - *num_steps = 1; - } - else if (icon_steps == 1) - { - *num_steps = ~0; - *rate_jiffies = ptr->delay; - } - else if (istep < icon_steps) - { - struct cursoricon_object *frame; - - *num_steps = icon_steps; - frame = get_icon_ptr( ptr->ani.frames[istep] ); - if (ptr->ani.num_steps == 1) - *num_steps = ~0; - else - *num_steps = ptr->ani.num_steps; - *rate_jiffies = frame->delay; - release_user_handle_ptr( frame ); - } - } - - release_user_handle_ptr( ptr ); - - return ret; + return NtUserGetCursorFrameInfo( handle, istep, rate_jiffies, num_steps ); } /********************************************************************** diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index f0a9c1b0609..43481f09b09 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -438,3 +438,59 @@ BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *heigh release_user_handle_ptr( obj ); return TRUE; } + +/********************************************************************** + * NtUserGetCursorFrameInfo (win32u.@) + */ +HCURSOR WINAPI NtUserGetCursorFrameInfo( HCURSOR cursor, DWORD istep, DWORD *rate_jiffies, + DWORD *num_steps ) +{ + struct cursoricon_object *obj; + HCURSOR ret = 0; + UINT icon_steps; + + if (!rate_jiffies || !num_steps) return 0; + + if (!(obj = get_icon_ptr( cursor ))) return 0; + + TRACE( "%p => %d %p %p\n", cursor, istep, rate_jiffies, num_steps ); + + icon_steps = obj->is_ani ? obj->ani.num_steps : 1; + if (istep < icon_steps || !obj->is_ani) + { + UINT icon_frames = 1; + + if (obj->is_ani) + icon_frames = obj->ani.num_frames; + if (obj->is_ani && icon_frames > 1) + ret = obj->ani.frames[istep]; + else + ret = cursor; + if (icon_frames == 1) + { + *rate_jiffies = 0; + *num_steps = 1; + } + else if (icon_steps == 1) + { + *num_steps = ~0; + *rate_jiffies = obj->delay; + } + else if (istep < icon_steps) + { + struct cursoricon_object *frame; + + *num_steps = icon_steps; + frame = get_icon_ptr( obj->ani.frames[istep] ); + if (obj->ani.num_steps == 1) + *num_steps = ~0; + else + *num_steps = obj->ani.num_steps; + *rate_jiffies = frame->delay; + release_user_handle_ptr( frame ); + } + } + + release_user_handle_ptr( obj ); + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 54d9d6ea754..d2a401b0d76 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -114,6 +114,7 @@ static void * const syscalls[] = NtUserGetClipboardSequenceNumber, NtUserGetClipboardViewer, NtUserGetCursor, + NtUserGetCursorFrameInfo, NtUserGetDoubleClickTime, NtUserGetDpiForMonitor, NtUserGetForegroundWindow, diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 980ba23bd73..77a0eaf6b9a 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -184,6 +184,8 @@ static void test_cursoricon(void) { BYTE bmp_bits[1024]; LONG width, height; + DWORD rate, steps; + HCURSOR frame; HANDLE handle; unsigned int i; BOOL ret; @@ -204,6 +206,12 @@ static void test_cursoricon(void) ok( width == 16, "width = %ld\n", width ); ok( height == 32, "height = %ld\n", height ); + frame = NtUserGetCursorFrameInfo( handle, 0, &rate, &steps ); + ok( frame != NULL, "NtUserGetCursorFrameInfo failed: %lu\n", GetLastError() ); + ok( frame == handle, "frame != handle\n" ); + ok( rate == 0, "rate = %lu\n", rate ); + ok( steps == 1, "steps = %lu\n", steps ); + ret = NtUserDestroyCursor( handle, 0 ); ok( ret, "NtUserDestroyIcon failed: %lu\n", GetLastError() ); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index dddc3a5b187..29994ffb575 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -913,7 +913,7 @@ @ stub NtUserGetCurrentDpiInfoForWindow @ stub NtUserGetCurrentInputMessageSource @ stdcall -syscall NtUserGetCursor() -@ stub NtUserGetCursorFrameInfo +@ stdcall -syscall NtUserGetCursorFrameInfo(long long ptr ptr) @ stub NtUserGetCursorInfo @ stub NtUserGetDC @ stub NtUserGetDCEx diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 0908c2db019..5a10fb4f8bd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetCursor ) \ + SYSCALL_ENTRY( NtUserGetCursorFrameInfo ) \ SYSCALL_ENTRY( NtUserGetDoubleClickTime ) \ SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ SYSCALL_ENTRY( NtUserGetForegroundWindow ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 6b50f545948..72c0222555e 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -289,6 +289,16 @@ NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args ) return NtUserGetIconSize( handle, step, width, height ); } +NTSTATUS WINAPI wow64_NtUserGetCursorFrameInfo( UINT *args ) +{ + HCURSOR cursor = get_ptr( &args ); + DWORD istep = get_ulong( &args ); + DWORD *rate_jiffies = get_ptr( &args ); + DWORD *num_steps = get_ptr( &args ); + + return HandleToUlong( NtUserGetCursorFrameInfo( cursor, istep, rate_jiffies, num_steps )); +} + NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) { DWORD from = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 6c6e6518297..37eb6500a4c 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -199,6 +199,8 @@ HWND WINAPI NtUserGetClipboardOwner(void); DWORD WINAPI NtUserGetClipboardSequenceNumber(void); HWND WINAPI NtUserGetClipboardViewer(void); HCURSOR WINAPI NtUserGetCursor(void); +HCURSOR WINAPI NtUserGetCursorFrameInfo( HCURSOR hCursor, DWORD istep, DWORD *rate_jiffies, + DWORD *num_steps ); LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info ); UINT WINAPI NtUserGetDoubleClickTime(void);

1 0

Mohamad Al-Jaf : wusa: Use case insensitive comparison for expressions.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 20ab5e7d45b972cfd78763aa23f7aa80cc49639f URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ab5e7d45b972cfd78763aa… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Feb 22 18:35:41 2022 -0500 wusa: Use case insensitive comparison for expressions. Some update packages use both lowercase and uppercase names for expressions. For example, Microsoft-Windows-MediaFeaturePack-OOB-Package_x64.msu uses both Runtime and runtime for expressions. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index d1bb385cd06..de8387cd575 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -480,10 +480,10 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke { WCHAR path[MAX_PATH]; - if (!wcscmp(key, L"runtime.system32")) + if (!wcsicmp(key, L"runtime.system32")) { #ifdef __x86_64__ - if (!wcscmp(assembly->identity.architecture, L"x86")) + if (!wcsicmp(assembly->identity.architecture, L"x86")) { GetSystemWow64DirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); @@ -492,7 +492,7 @@ static WCHAR *lookup_expression(struct assembly_entry *assembly, const WCHAR *ke GetSystemDirectoryW(path, ARRAY_SIZE(path)); return strdupW(path); } - if (!wcscmp(key, L"runtime.windows")) + if (!wcsicmp(key, L"runtime.windows")) { GetWindowsDirectoryW(path, ARRAY_SIZE(path)); return strdupW(path);

1 0

Jacek Caban : win32u: Move NtUserGetIconSize implementation from user32.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 9e4be5467cca9f8ce9bf2c8c97c6198c113c2641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e4be5467cca9f8ce9bf2c8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:39:47 2022 +0100 win32u: Move NtUserGetIconSize implementation 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/cursoricon.c | 13 +++---------- dlls/win32u/cursoricon.c | 35 +++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index e97d4f1e0d9..26c82c2c70c 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -334,16 +334,9 @@ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, */ BOOL get_icon_size( HICON handle, SIZE *size ) { - struct cursoricon_object *info; - struct cursoricon_frame *frame; - - if (!(info = get_icon_ptr( handle ))) return FALSE; - frame = get_icon_frame( info, 0 ); - size->cx = frame->width; - size->cy = frame->height; - release_icon_frame( info, frame); - release_user_handle_ptr( info ); - return TRUE; + BOOL ret = NtUserGetIconSize( handle, 0, &size->cx, &size->cy ); + if (ret) size->cy /= 2; + return ret; } struct png_wrapper diff --git a/dlls/win32u/cursoricon.c b/dlls/win32u/cursoricon.c index c83f3790c11..f0a9c1b0609 100644 --- a/dlls/win32u/cursoricon.c +++ b/dlls/win32u/cursoricon.c @@ -212,6 +212,22 @@ HICON alloc_cursoricon_handle( BOOL is_icon ) return handle; } +static struct cursoricon_object *get_icon_frame_ptr( HICON handle, UINT step ) +{ + struct cursoricon_object *obj, *ret; + + if (!(obj = get_icon_ptr( handle ))) return NULL; + if (!obj->is_ani) return obj; + if (step >= obj->ani.num_steps) + { + release_user_handle_ptr( obj ); + return NULL; + } + ret = get_icon_ptr( obj->ani.frames[step] ); + release_user_handle_ptr( obj ); + return ret; +} + static BOOL free_icon_handle( HICON handle ) { struct cursoricon_object *obj = free_user_handle( handle, NTUSER_OBJ_ICON ); @@ -403,3 +419,22 @@ HICON WINAPI NtUserFindExistingCursorIcon( UNICODE_STRING *module, UNICODE_STRIN user_unlock(); return ret; } + +/*********************************************************************** + * NtUserGetIconSize (win32u.@) + */ +BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *height ) +{ + struct cursoricon_object *obj; + + if (!(obj = get_icon_frame_ptr( handle, step ))) + { + SetLastError( ERROR_INVALID_CURSOR_HANDLE ); + return FALSE; + } + + *width = obj->frame.width; + *height = obj->frame.height * 2; + release_user_handle_ptr( obj ); + return TRUE; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index b4255449b83..54d9d6ea754 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -117,6 +117,7 @@ static void * const syscalls[] = NtUserGetDoubleClickTime, NtUserGetDpiForMonitor, NtUserGetForegroundWindow, + NtUserGetIconSize, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardLayoutName, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 20ee7a3cebd..dddc3a5b187 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -935,7 +935,7 @@ @ stub NtUserGetHDevName @ stub NtUserGetHimetricScaleFactorFromPixelLocation @ stub NtUserGetIconInfo -@ stub NtUserGetIconSize +@ stdcall -syscall NtUserGetIconSize(long long ptr ptr) @ stub NtUserGetImeHotKey @ stub NtUserGetImeInfoEx @ stub NtUserGetInputContainerId diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 0141a216ee9..0908c2db019 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -104,6 +104,7 @@ SYSCALL_ENTRY( NtUserGetDoubleClickTime ) \ SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ SYSCALL_ENTRY( NtUserGetForegroundWindow ) \ + SYSCALL_ENTRY( NtUserGetIconSize ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cd345429af7..6b50f545948 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -279,6 +279,16 @@ NTSTATUS WINAPI wow64_NtUserFindExistingCursorIcon( UINT *args ) return HandleToUlong( ret ); } +NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args ) +{ + HICON handle = get_handle( &args ); + UINT step = get_ulong( &args ); + LONG *width = get_ptr( &args ); + LONG *height = get_ptr( &args ); + + return NtUserGetIconSize( handle, step, width, height ); +} + NTSTATUS WINAPI wow64_NtUserAttachThreadInput( UINT *args ) { DWORD from = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index f385f91f8ce..6c6e6518297 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -204,6 +204,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path UINT WINAPI NtUserGetDoubleClickTime(void); BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ); HWND WINAPI NtUserGetForegroundWindow(void); +BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *height ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Michael Stefaniuc : dmusic: Sync up the dmobject.c files.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: 7ea710c69ba46f6255c0e049b5c29bc3e06b6433 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea710c69ba46f6255c0e049… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 23 20:45:09 2022 +0100 dmusic: Sync up the dmobject.c files. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/dmobject.c | 2 +- dlls/dmscript/dmobject.c | 2 +- dlls/dmstyle/dmobject.c | 2 +- dlls/dmusic/dmobject.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dmcompos/dmobject.c b/dlls/dmcompos/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmcompos/dmobject.c +++ b/dlls/dmcompos/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); diff --git a/dlls/dmscript/dmobject.c b/dlls/dmscript/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmscript/dmobject.c +++ b/dlls/dmscript/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmstyle/dmobject.c +++ b/dlls/dmstyle/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 84b08e0d772..b526b23d031 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -295,7 +295,7 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size) hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);

1 0

Jacek Caban : win32u: Move NtUserDrawIconEx implementation from user32.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: b3d25fbe3c41a4dc7bc7d8c3220254d1ee36f7ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d25fbe3c41a4dc7bc7d8c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:41:38 2022 +0100 win32u: Move NtUserDrawIconEx implementation 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/cursoricon.c | 174 +------------------------------------------ dlls/user32/mdi.c | 2 +- dlls/user32/nonclient.c | 10 +-- dlls/user32/static.c | 4 +- dlls/user32/uitools.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/win32u/cursoricon.c | 143 ++++++++++++++++++++++++++++++++++- dlls/win32u/dc.c | 12 +++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/ntgdi_private.h | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 7 ++ include/ntuser.h | 2 + 14 files changed, 179 insertions(+), 185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b3d25fbe3c41a4dc7bc7…

1 0

Jacek Caban : user32: Use GetIconInfo in CopyIcon.
by Alexandre Julliard Feb. 23, 2022

Feb. 23, 2022

Module: wine Branch: master Commit: c24326b8b67d01dba4c7bb116b92b30b6daa9ae2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c24326b8b67d01dba4c7bb11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 23 13:41:03 2022 +0100 user32: Use GetIconInfo in CopyIcon. 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d8a35ee7b6e..fdf79e5fdf5 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1632,11 +1632,10 @@ HICON WINAPI CreateIcon( HINSTANCE instance, int width, int height, BYTE planes, */ HICON WINAPI CopyIcon( HICON icon ) { - ICONINFOEXW info; + ICONINFO info; HICON res; - info.cbSize = sizeof(info); - if (!GetIconInfoExW( icon, &info )) + if (!GetIconInfo( icon, &info )) return NULL; res = CopyImage( icon, info.fIcon ? IMAGE_ICON : IMAGE_CURSOR, 0, 0, 0 );

1 0