June 2022 - Wine-Commits - list.winehq.org

Zhiyi Zhang : light.msstyles: Add window parts.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 914b1246d372ebc94eb4e877f1d183fca48f641b URL: https://source.winehq.org/git/wine.git/?a=commit;h=914b1246d372ebc94eb4e877… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 20 00:06:48 2022 +0800 light.msstyles: Add window parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 62 ++- dlls/light.msstyles/blue_window_caption.bmp | Bin 0 -> 15450 bytes dlls/light.msstyles/blue_window_caption.svg | 9 + .../blue_window_caption_sizing_template.bmp | Bin 0 -> 11738 bytes .../blue_window_caption_sizing_template.svg | 10 + .../blue_window_close_button_background.bmp | Bin 0 -> 11562 bytes .../blue_window_close_button_background.svg | 22 + .../blue_window_close_button_glyph_13px.bmp | Bin 0 -> 5546 bytes .../blue_window_close_button_glyph_13px.svg | 13 + .../blue_window_close_button_glyph_19px.bmp | Bin 0 -> 11690 bytes .../blue_window_close_button_glyph_19px.svg | 13 + .../blue_window_close_button_glyph_23px.bmp | Bin 0 -> 17066 bytes .../blue_window_close_button_glyph_23px.svg | 13 + .../blue_window_close_button_glyph_26px.bmp | Bin 0 -> 21770 bytes .../blue_window_close_button_glyph_26px.svg | 13 + .../blue_window_close_button_glyph_32px.bmp | Bin 0 -> 32906 bytes .../blue_window_close_button_glyph_32px.svg | 13 + .../blue_window_close_button_glyph_39px.bmp | Bin 0 -> 48810 bytes .../blue_window_close_button_glyph_39px.svg | 13 + .../blue_window_close_button_glyph_52px.bmp | Bin 0 -> 86666 bytes .../blue_window_close_button_glyph_52px.svg | 13 + dlls/light.msstyles/blue_window_frame_bottom.bmp | Bin 0 -> 234 bytes dlls/light.msstyles/blue_window_frame_bottom.svg | 9 + dlls/light.msstyles/blue_window_frame_left.bmp | Bin 0 -> 4554 bytes dlls/light.msstyles/blue_window_frame_left.svg | 6 + dlls/light.msstyles/blue_window_frame_right.bmp | Bin 0 -> 4554 bytes dlls/light.msstyles/blue_window_frame_right.svg | 6 + .../blue_window_help_button_background.bmp | Bin 0 -> 2314 bytes .../blue_window_help_button_background.svg | 22 + .../blue_window_help_button_glyph_13px.bmp | Bin 0 -> 5546 bytes .../blue_window_help_button_glyph_13px.svg | 13 + .../blue_window_help_button_glyph_19px.bmp | Bin 0 -> 11690 bytes .../blue_window_help_button_glyph_19px.svg | 13 + .../blue_window_help_button_glyph_23px.bmp | Bin 0 -> 17066 bytes .../blue_window_help_button_glyph_23px.svg | 13 + .../blue_window_help_button_glyph_26px.bmp | Bin 0 -> 21770 bytes .../blue_window_help_button_glyph_26px.svg | 13 + .../blue_window_help_button_glyph_32px.bmp | Bin 0 -> 32906 bytes .../blue_window_help_button_glyph_32px.svg | 13 + .../blue_window_help_button_glyph_39px.bmp | Bin 0 -> 48810 bytes .../blue_window_help_button_glyph_39px.svg | 13 + .../blue_window_help_button_glyph_52px.bmp | Bin 0 -> 86666 bytes .../blue_window_help_button_glyph_52px.svg | 13 + .../blue_window_max_button_background.bmp | Bin 0 -> 2314 bytes .../blue_window_max_button_background.svg | 22 + .../blue_window_max_button_glyph_13px.bmp | Bin 0 -> 5546 bytes .../blue_window_max_button_glyph_13px.svg | 13 + .../blue_window_max_button_glyph_19px.bmp | Bin 0 -> 11690 bytes .../blue_window_max_button_glyph_19px.svg | 13 + .../blue_window_max_button_glyph_23px.bmp | Bin 0 -> 17066 bytes .../blue_window_max_button_glyph_23px.svg | 13 + .../blue_window_max_button_glyph_26px.bmp | Bin 0 -> 21770 bytes .../blue_window_max_button_glyph_26px.svg | 13 + .../blue_window_max_button_glyph_32px.bmp | Bin 0 -> 32906 bytes .../blue_window_max_button_glyph_32px.svg | 13 + .../blue_window_max_button_glyph_39px.bmp | Bin 0 -> 48810 bytes .../blue_window_max_button_glyph_39px.svg | 13 + .../blue_window_max_button_glyph_52px.bmp | Bin 0 -> 86666 bytes .../blue_window_max_button_glyph_52px.svg | 13 + dlls/light.msstyles/blue_window_max_caption.bmp | Bin 0 -> 370 bytes dlls/light.msstyles/blue_window_max_caption.svg | 7 + .../blue_window_mdi_close_button_background.bmp | Bin 0 -> 938 bytes .../blue_window_mdi_close_button_background.svg | 18 + .../blue_window_mdi_close_button_glyph.bmp | Bin 0 -> 1738 bytes .../blue_window_mdi_close_button_glyph.svg | 9 + .../blue_window_mdi_min_button_background.bmp | Bin 0 -> 938 bytes .../blue_window_mdi_min_button_background.svg | 18 + .../blue_window_mdi_min_button_glyph.bmp | Bin 0 -> 1738 bytes .../blue_window_mdi_min_button_glyph.svg | 9 + .../blue_window_mdi_restore_button_background.bmp | Bin 0 -> 938 bytes .../blue_window_mdi_restore_button_background.svg | 18 + .../blue_window_mdi_restore_button_glyph.bmp | Bin 0 -> 1738 bytes .../blue_window_mdi_restore_button_glyph.svg | 21 + .../blue_window_min_button_background.bmp | Bin 0 -> 2314 bytes .../blue_window_min_button_background.svg | 22 + .../blue_window_min_button_glyph_13px.bmp | Bin 0 -> 5546 bytes .../blue_window_min_button_glyph_13px.svg | 13 + .../blue_window_min_button_glyph_19px.bmp | Bin 0 -> 11690 bytes .../blue_window_min_button_glyph_19px.svg | 13 + .../blue_window_min_button_glyph_23px.bmp | Bin 0 -> 17066 bytes .../blue_window_min_button_glyph_23px.svg | 15 + .../blue_window_min_button_glyph_26px.bmp | Bin 0 -> 21770 bytes .../blue_window_min_button_glyph_26px.svg | 13 + .../blue_window_min_button_glyph_32px.bmp | Bin 0 -> 32906 bytes .../blue_window_min_button_glyph_32px.svg | 17 + .../blue_window_min_button_glyph_39px.bmp | Bin 0 -> 48810 bytes .../blue_window_min_button_glyph_39px.svg | 13 + .../blue_window_min_button_glyph_52px.bmp | Bin 0 -> 86666 bytes .../blue_window_min_button_glyph_52px.svg | 17 + dlls/light.msstyles/blue_window_min_caption.bmp | Bin 0 -> 3154 bytes dlls/light.msstyles/blue_window_min_caption.svg | 7 + .../blue_window_restore_button_background.bmp | Bin 0 -> 2314 bytes .../blue_window_restore_button_background.svg | 22 + .../blue_window_restore_button_glyph_13px.bmp | Bin 0 -> 5546 bytes .../blue_window_restore_button_glyph_13px.svg | 37 ++ .../blue_window_restore_button_glyph_19px.bmp | Bin 0 -> 11690 bytes .../blue_window_restore_button_glyph_19px.svg | 39 ++ .../blue_window_restore_button_glyph_23px.bmp | Bin 0 -> 17066 bytes .../blue_window_restore_button_glyph_23px.svg | 37 ++ .../blue_window_restore_button_glyph_26px.bmp | Bin 0 -> 21770 bytes .../blue_window_restore_button_glyph_26px.svg | 37 ++ .../blue_window_restore_button_glyph_32px.bmp | Bin 0 -> 32906 bytes .../blue_window_restore_button_glyph_32px.svg | 37 ++ .../blue_window_restore_button_glyph_39px.bmp | Bin 0 -> 48810 bytes .../blue_window_restore_button_glyph_39px.svg | 37 ++ .../blue_window_restore_button_glyph_52px.bmp | Bin 0 -> 86666 bytes .../blue_window_restore_button_glyph_52px.svg | 37 ++ dlls/light.msstyles/blue_window_small_caption.bmp | Bin 0 -> 746 bytes dlls/light.msstyles/blue_window_small_caption.svg | 9 + .../blue_window_small_caption_sizing_template.bmp | Bin 0 -> 9562 bytes .../blue_window_small_caption_sizing_template.svg | 23 + .../blue_window_small_close_button_background.bmp | Bin 0 -> 5546 bytes .../blue_window_small_close_button_background.svg | 17 + .../blue_window_small_close_button_glyph.bmp | Bin 0 -> 1706 bytes .../blue_window_small_close_button_glyph.svg | 13 + .../blue_window_small_frame_bottom.bmp | Bin 0 -> 234 bytes .../blue_window_small_frame_bottom.svg | 9 + .../blue_window_small_frame_left.bmp | Bin 0 -> 162 bytes .../blue_window_small_frame_left.svg | 6 + .../blue_window_small_frame_right.bmp | Bin 0 -> 162 bytes .../blue_window_small_frame_right.svg | 6 + dlls/light.msstyles/light.rc | 514 ++++++++++++++++++++- 122 files changed, 1549 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=914b1246d372ebc94eb4…

1 0

Rémi Bernon : winex11.drv: Merge settings.c into display.c.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 5cc3808a629b8517c3d7375284bfab9f01c818b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc3808a629b8517c3d73752… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:14:33 2022 +0200 winex11.drv: Merge settings.c into display.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/display.c | 962 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 999 ------------------------------------------- 3 files changed, 962 insertions(+), 1000 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc3808a629b8517c3d7…

1 0

Alexandre Julliard : ntdll: Add _i64tow_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: c45abb8a7c9f8d7333247f8fdd279efce208ce25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c45abb8a7c9f8d7333247f8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:05:49 2022 +0200 ntdll: Add _i64tow_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 +++ dlls/ntdll/wcstring.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9666fcc7f36..51041c4144b 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1504,12 +1504,15 @@ @ cdecl -arch=i386 -ret64 _ftol() @ cdecl _i64toa(int64 ptr long) @ cdecl _i64tow(int64 ptr long) +@ cdecl _i64tow_s(int64 ptr long long) @ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) +@ cdecl _itow_s(long ptr long long) @ cdecl _lfind(ptr ptr ptr long ptr) @ stdcall -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl _ltoa(long ptr long) @ cdecl _ltow(long ptr long) +@ cdecl _ltow_s(long ptr long long) @ cdecl _memccpy(ptr ptr long long) @ cdecl _memicmp(str str long) @ varargs _snprintf(ptr long str) NTDLL__snprintf diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 8d53388f4c4..a0d7042f30c 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -1127,6 +1127,80 @@ errno_t __cdecl _ultow_s( __msvcrt_ulong value, wchar_t *str, size_t size, int r } +/********************************************************************* + * _i64tow_s (NTDLL.@) + */ +errno_t __cdecl _i64tow_s( __int64 value, wchar_t *str, size_t size, int radix ) +{ + unsigned __int64 val; + BOOL is_negative; + wchar_t buffer[65], *pos; + + if (!str || !size) return EINVAL; + if (radix < 2 || radix > 36) + { + str[0] = 0; + return EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = TRUE; + val = -value; + } + else + { + is_negative = FALSE; + val = value; + } + + pos = buffer + 64; + *pos = 0; + + do + { + unsigned int digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) *--pos = '-'; + + if (buffer - pos + 65 > size) + { + str[0] = 0; + return ERANGE; + } + memcpy( str, pos, (buffer - pos + 65) * sizeof(wchar_t) ); + return 0; +} + + +/********************************************************************* + * _ltow_s (NTDLL.@) + */ +errno_t __cdecl _ltow_s( __msvcrt_long value, wchar_t *str, size_t size, int radix ) +{ + if (value < 0 && radix == 10) return _i64tow_s( value, str, size, radix ); + return _ui64tow_s( (__msvcrt_ulong)value, str, size, radix ); +} + + +/********************************************************************* + * _itow_s (NTDLL.@) + */ +errno_t __cdecl _itow_s( int value, wchar_t *str, size_t size, int radix ) +{ + if (value < 0 && radix == 10) return _i64tow_s( value, str, size, radix ); + return _ui64tow_s( (unsigned int)value, str, size, radix ); +} + + /********************************************************************* * _wtol (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Add _ui64tow_s.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 703212b67e37f35af6dcd1d23f81778bb07475b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=703212b67e37f35af6dcd1d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:05:32 2022 +0200 ntdll: Add _ui64tow_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/wcstring.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ca896902762..9666fcc7f36 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1529,8 +1529,10 @@ @ cdecl _toupper(long) @ cdecl _ui64toa(int64 ptr long) @ cdecl _ui64tow(int64 ptr long) +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) +@ cdecl _ultow_s(long ptr long long) @ cdecl -norelay _vsnprintf(ptr long str ptr) @ cdecl _vsnprintf_s(ptr long str ptr) @ cdecl _vsnwprintf(ptr long wstr ptr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 192bd9e9a46..8d53388f4c4 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -1082,6 +1082,51 @@ LPWSTR __cdecl _i64tow( } +/********************************************************************* + * _ui64tow_s (NTDLL.@) + */ +errno_t __cdecl _ui64tow_s( unsigned __int64 value, wchar_t *str, size_t size, int radix ) +{ + wchar_t buffer[65], *pos; + + if (!str || !size) return EINVAL; + if (radix < 2 || radix > 36) + { + str[0] = 0; + return EINVAL; + } + + pos = buffer + 64; + *pos = 0; + + do { + int digit = value % radix; + value = value / radix; + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } while (value != 0); + + if (buffer - pos + 65 > size) + { + str[0] = 0; + return ERANGE; + } + memcpy( str, pos, (buffer - pos + 65) * sizeof(wchar_t) ); + return 0; +} + + +/********************************************************************* + * _ultow_s (NTDLL.@) + */ +errno_t __cdecl _ultow_s( __msvcrt_ulong value, wchar_t *str, size_t size, int radix ) +{ + return _ui64tow_s( value, str, size, radix ); +} + + /********************************************************************* * _wtol (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Add _wcstoui64.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 9dcfda023332d6f39eca531574ba2bc6e149e7ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dcfda023332d6f39eca5315… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:05:00 2022 +0200 ntdll: Add _wcstoui64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2ed68e1bc5d..ca896902762 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1541,6 +1541,7 @@ @ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl -ret64 _wcstoi64(wstr ptr long) +@ cdecl -ret64 _wcstoui64(wstr ptr long) @ cdecl _wcsupr(wstr) @ cdecl _wcsupr_s(wstr long) @ cdecl _wtoi(wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 06447248235..192bd9e9a46 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -800,6 +800,50 @@ __int64 __cdecl _wcstoi64( const wchar_t *s, wchar_t **end, int base ) } +/********************************************************************* + * _wcstoui64 (NTDLL.@) + */ +unsigned __int64 __cdecl _wcstoui64( const wchar_t *s, wchar_t **end, int base ) +{ + BOOL negative = FALSE, empty = TRUE; + unsigned __int64 ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (wchar_t *)s; + while (iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && !wctoint( *s ) && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = wctoint( *s ) ? 10 : 8; + + while (*s) + { + int v = wctoint( *s ); + if (v < 0 || v >= base) break; + s++; + empty = FALSE; + + if (ret > UI64_MAX / base || ret * base > UI64_MAX - v) + ret = UI64_MAX; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (wchar_t *)s; + return negative ? -ret : ret; +} + + /********************************************************************* * _ultow (NTDLL.@) *

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ tooltip parts.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 4c292e773fc0ba044a3f8b7dd7eecb37a8e08a30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c292e773fc0ba044a3f8b7d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 15 16:11:33 2022 +0800 light.msstyles: Add Vista+ tooltip parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 16 + dlls/light.msstyles/blue_tooltip_ballon.bmp | Bin 0 -> 754 bytes dlls/light.msstyles/blue_tooltip_ballon.svg | 12 + .../blue_tooltip_ballon_stem_21px.bmp | Bin 0 -> 10722 bytes .../blue_tooltip_ballon_stem_21px.svg | 177 ++++++ .../blue_tooltip_ballon_stem_26px.bmp | Bin 0 -> 16362 bytes .../blue_tooltip_ballon_stem_26px.svg | 203 +++++++ .../blue_tooltip_ballon_stem_32px.bmp | Bin 0 -> 24714 bytes .../blue_tooltip_ballon_stem_32px.svg | 253 +++++++++ .../blue_tooltip_ballon_stem_42px.bmp | Bin 0 -> 42474 bytes .../blue_tooltip_ballon_stem_42px.svg | 319 +++++++++++ .../blue_tooltip_ballon_stem_53px.bmp | Bin 0 -> 66918 bytes .../blue_tooltip_ballon_stem_53px.svg | 406 ++++++++++++++ .../blue_tooltip_ballon_stem_63px.bmp | Bin 0 -> 95394 bytes .../blue_tooltip_ballon_stem_63px.svg | 472 ++++++++++++++++ .../blue_tooltip_ballon_stem_84px.bmp | Bin 0 -> 169482 bytes .../blue_tooltip_ballon_stem_84px.svg | 619 +++++++++++++++++++++ dlls/light.msstyles/blue_tooltip_standard.bmp | Bin 0 -> 754 bytes dlls/light.msstyles/blue_tooltip_standard.svg | 12 + dlls/light.msstyles/blue_tooltip_wrench_17px.bmp | Bin 0 -> 3402 bytes dlls/light.msstyles/blue_tooltip_wrench_17px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_21px.bmp | Bin 0 -> 5178 bytes dlls/light.msstyles/blue_tooltip_wrench_21px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_26px.bmp | Bin 0 -> 7626 bytes dlls/light.msstyles/blue_tooltip_wrench_26px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_34px.bmp | Bin 0 -> 13194 bytes dlls/light.msstyles/blue_tooltip_wrench_34px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_42px.bmp | Bin 0 -> 20298 bytes dlls/light.msstyles/blue_tooltip_wrench_42px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_51px.bmp | Bin 0 -> 29514 bytes dlls/light.msstyles/blue_tooltip_wrench_51px.svg | 24 + dlls/light.msstyles/blue_tooltip_wrench_68px.bmp | Bin 0 -> 52362 bytes dlls/light.msstyles/blue_tooltip_wrench_68px.svg | 24 + dlls/light.msstyles/light.rc | 127 +++++ 34 files changed, 2784 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c292e773fc0ba044a3f…

1 0

Zhiyi Zhang : light.msstyles: Add taskdialog class.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: c894d9a41ca91e616e87b04e8916dd18eb6c97d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c894d9a41ca91e616e87b04e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 15:49:32 2022 +0800 light.msstyles: Add taskdialog class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 44 +++ ...skdialog_expando_button_expanded_hover_19px.bmp | Bin 0 -> 1734 bytes ...skdialog_expando_button_expanded_hover_19px.svg | 6 + ...skdialog_expando_button_expanded_hover_24px.bmp | Bin 0 -> 2634 bytes ...skdialog_expando_button_expanded_hover_24px.svg | 6 + ...skdialog_expando_button_expanded_hover_29px.bmp | Bin 0 -> 3850 bytes ...skdialog_expando_button_expanded_hover_29px.svg | 6 + ...skdialog_expando_button_expanded_hover_33px.bmp | Bin 0 -> 5022 bytes ...skdialog_expando_button_expanded_hover_33px.svg | 6 + ...skdialog_expando_button_expanded_hover_38px.bmp | Bin 0 -> 6522 bytes ...skdialog_expando_button_expanded_hover_38px.svg | 6 + ...skdialog_expando_button_expanded_hover_43px.bmp | Bin 0 -> 8222 bytes ...skdialog_expando_button_expanded_hover_43px.svg | 6 + ...skdialog_expando_button_expanded_hover_48px.bmp | Bin 0 -> 10314 bytes ...skdialog_expando_button_expanded_hover_48px.svg | 6 + ...kdialog_expando_button_expanded_normal_19px.bmp | Bin 0 -> 1734 bytes ...kdialog_expando_button_expanded_normal_19px.svg | 6 + ...kdialog_expando_button_expanded_normal_24px.bmp | Bin 0 -> 2634 bytes ...kdialog_expando_button_expanded_normal_24px.svg | 6 + ...kdialog_expando_button_expanded_normal_29px.bmp | Bin 0 -> 3850 bytes ...kdialog_expando_button_expanded_normal_29px.svg | 6 + ...kdialog_expando_button_expanded_normal_33px.bmp | Bin 0 -> 5022 bytes ...kdialog_expando_button_expanded_normal_33px.svg | 6 + ...kdialog_expando_button_expanded_normal_38px.bmp | Bin 0 -> 6522 bytes ...kdialog_expando_button_expanded_normal_38px.svg | 6 + ...kdialog_expando_button_expanded_normal_43px.bmp | Bin 0 -> 8222 bytes ...kdialog_expando_button_expanded_normal_43px.svg | 6 + ...kdialog_expando_button_expanded_normal_48px.bmp | Bin 0 -> 10314 bytes ...kdialog_expando_button_expanded_normal_48px.svg | 6 + ...dialog_expando_button_expanded_pressed_19px.bmp | Bin 0 -> 1734 bytes ...dialog_expando_button_expanded_pressed_19px.svg | 6 + ...dialog_expando_button_expanded_pressed_24px.bmp | Bin 0 -> 2634 bytes ...dialog_expando_button_expanded_pressed_24px.svg | 6 + ...dialog_expando_button_expanded_pressed_29px.bmp | Bin 0 -> 3850 bytes ...dialog_expando_button_expanded_pressed_29px.svg | 6 + ...dialog_expando_button_expanded_pressed_33px.bmp | Bin 0 -> 5022 bytes ...dialog_expando_button_expanded_pressed_33px.svg | 6 + ...dialog_expando_button_expanded_pressed_38px.bmp | Bin 0 -> 6522 bytes ...dialog_expando_button_expanded_pressed_38px.svg | 6 + ...dialog_expando_button_expanded_pressed_43px.bmp | Bin 0 -> 8222 bytes ...dialog_expando_button_expanded_pressed_43px.svg | 6 + ...dialog_expando_button_expanded_pressed_48px.bmp | Bin 0 -> 10314 bytes ...dialog_expando_button_expanded_pressed_48px.svg | 6 + .../blue_taskdialog_expando_button_hover_19px.bmp | Bin 0 -> 1734 bytes .../blue_taskdialog_expando_button_hover_19px.svg | 6 + .../blue_taskdialog_expando_button_hover_24px.bmp | Bin 0 -> 2634 bytes .../blue_taskdialog_expando_button_hover_24px.svg | 6 + .../blue_taskdialog_expando_button_hover_29px.bmp | Bin 0 -> 3850 bytes .../blue_taskdialog_expando_button_hover_29px.svg | 6 + .../blue_taskdialog_expando_button_hover_33px.bmp | Bin 0 -> 5022 bytes .../blue_taskdialog_expando_button_hover_33px.svg | 6 + .../blue_taskdialog_expando_button_hover_38px.bmp | Bin 0 -> 6522 bytes .../blue_taskdialog_expando_button_hover_38px.svg | 6 + .../blue_taskdialog_expando_button_hover_43px.bmp | Bin 0 -> 8222 bytes .../blue_taskdialog_expando_button_hover_43px.svg | 6 + .../blue_taskdialog_expando_button_hover_48px.bmp | Bin 0 -> 10314 bytes .../blue_taskdialog_expando_button_hover_48px.svg | 6 + .../blue_taskdialog_expando_button_normal_19px.bmp | Bin 0 -> 1734 bytes .../blue_taskdialog_expando_button_normal_19px.svg | 6 + .../blue_taskdialog_expando_button_normal_24px.bmp | Bin 0 -> 2634 bytes .../blue_taskdialog_expando_button_normal_24px.svg | 6 + .../blue_taskdialog_expando_button_normal_29px.bmp | Bin 0 -> 3850 bytes .../blue_taskdialog_expando_button_normal_29px.svg | 6 + .../blue_taskdialog_expando_button_normal_33px.bmp | Bin 0 -> 5022 bytes .../blue_taskdialog_expando_button_normal_33px.svg | 6 + .../blue_taskdialog_expando_button_normal_38px.bmp | Bin 0 -> 6522 bytes .../blue_taskdialog_expando_button_normal_38px.svg | 6 + .../blue_taskdialog_expando_button_normal_43px.bmp | Bin 0 -> 8222 bytes .../blue_taskdialog_expando_button_normal_43px.svg | 6 + .../blue_taskdialog_expando_button_normal_48px.bmp | Bin 0 -> 10314 bytes .../blue_taskdialog_expando_button_normal_48px.svg | 6 + ...blue_taskdialog_expando_button_pressed_19px.bmp | Bin 0 -> 1734 bytes ...blue_taskdialog_expando_button_pressed_19px.svg | 6 + ...blue_taskdialog_expando_button_pressed_24px.bmp | Bin 0 -> 2634 bytes ...blue_taskdialog_expando_button_pressed_24px.svg | 6 + ...blue_taskdialog_expando_button_pressed_29px.bmp | Bin 0 -> 3850 bytes ...blue_taskdialog_expando_button_pressed_29px.svg | 6 + ...blue_taskdialog_expando_button_pressed_33px.bmp | Bin 0 -> 5022 bytes ...blue_taskdialog_expando_button_pressed_33px.svg | 6 + ...blue_taskdialog_expando_button_pressed_38px.bmp | Bin 0 -> 6522 bytes ...blue_taskdialog_expando_button_pressed_38px.svg | 6 + ...blue_taskdialog_expando_button_pressed_43px.bmp | Bin 0 -> 8222 bytes ...blue_taskdialog_expando_button_pressed_43px.svg | 6 + ...blue_taskdialog_expando_button_pressed_48px.bmp | Bin 0 -> 10314 bytes ...blue_taskdialog_expando_button_pressed_48px.svg | 6 + .../blue_taskdialog_footnote_separator.bmp | Bin 0 -> 146 bytes .../blue_taskdialog_footnote_separator.svg | 13 + .../blue_taskdialog_secondary_panel.bmp | Bin 0 -> 146 bytes .../blue_taskdialog_secondary_panel.svg | 13 + dlls/light.msstyles/light.rc | 347 +++++++++++++++++++++ 90 files changed, 669 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c894d9a41ca91e616e87…

1 0

Zebediah Figura : user32: Merge rawinput.c into input.c.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: ff166bac152a38b6984fe58ff3142c054251aab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff166bac152a38b6984fe58f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 18:30:25 2022 -0500 user32: Merge rawinput.c into input.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/input.c | 49 +++++++++++++++++++++++++++ dlls/user32/rawinput.c | 88 ------------------------------------------------- 3 files changed, 49 insertions(+), 89 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 79821929390..3a01810991d 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -34,7 +34,6 @@ C_SRCS = \ nonclient.c \ painting.c \ property.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 52d4414b673..106f890da7a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -6,6 +6,8 @@ * Copyright 1997 David Faure * Copyright 1998 Morten Welinder * Copyright 1998 Ulrich Weigand + * Copyright 2012 Henri Verbeet + * Copyright 2018 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -623,3 +625,50 @@ BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) return I_ScUnregisterDeviceNotification( handle ); } + +/*********************************************************************** + * GetRawInputDeviceInfoA (USER32.@) + */ +UINT WINAPI GetRawInputDeviceInfoA( HANDLE device, UINT command, void *data, UINT *size ) +{ + TRACE( "device %p, command %#x, data %p, size %p.\n", device, command, data, size ); + + /* RIDI_DEVICENAME size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, sizeW; + + if (!size) return ~0U; + + sizeW = *size; + + if (data && sizeW > 0) + nameW = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * sizeW ); + else + nameW = NULL; + + ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &sizeW ); + + if (ret && ret != ~0U) + WideCharToMultiByte( CP_ACP, 0, nameW, -1, data, *size, NULL, NULL ); + + *size = sizeW; + + HeapFree( GetProcessHeap(), 0, nameW ); + + return ret; + } + + return NtUserGetRawInputDeviceInfo( device, command, data, size ); +} + +/*********************************************************************** + * DefRawInputProc (USER32.@) + */ +LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_size ) +{ + FIXME( "data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size ); + + return 0; +} diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c deleted file mode 100644 index 98854d75690..00000000000 --- a/dlls/user32/rawinput.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Raw Input - * - * Copyright 2012 Henri Verbeet - * Copyright 2018 Zebediah Figura for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winioctl.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" -#include "ddk/hidclass.h" -#include "wine/debug.h" -#include "wine/server.h" -#include "wine/hid.h" - -#include "user_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(rawinput); - -/*********************************************************************** - * GetRawInputDeviceInfoA (USER32.@) - */ -UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) -{ - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); - - /* RIDI_DEVICENAME data_size is in chars, not bytes */ - if (command == RIDI_DEVICENAME) - { - WCHAR *nameW; - UINT ret, nameW_sz; - - if (!data_size) return ~0U; - - nameW_sz = *data_size; - - if (data && nameW_sz > 0) - nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz); - else - nameW = NULL; - - ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &nameW_sz ); - - if (ret && ret != ~0U) - WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL); - - *data_size = nameW_sz; - - HeapFree(GetProcessHeap(), 0, nameW); - - return ret; - } - - return NtUserGetRawInputDeviceInfo( device, command, data, data_size ); -} - -/*********************************************************************** - * DefRawInputProc (USER32.@) - */ -LRESULT WINAPI DefRawInputProc(RAWINPUT **data, INT data_count, UINT header_size) -{ - FIXME("data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size); - - return 0; -}

1 0

Zebediah Figura : win32u: Move NtUserRegisterRawInputDevices from user32.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: 0ce4ed675f927fb7f67e088af810e7e1f500783a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ce4ed675f927fb7f67e088a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 17:37:40 2022 -0500 win32u: Move NtUserRegisterRawInputDevices from user32. --- dlls/user32/rawinput.c | 63 ------------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/rawinput.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 40 +++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 8 files changed, 106 insertions(+), 65 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index d6290f08d12..1b02be1398d 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -401,69 +401,6 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return rawinput_devices_count; } -/*********************************************************************** - * RegisterRawInputDevices (USER32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(const RAWINPUTDEVICE *devices, UINT device_count, UINT size) -{ - struct rawinput_device *d; - BOOL ret; - UINT i; - - TRACE("devices %p, device_count %u, size %u.\n", devices, device_count, size); - - if (size != sizeof(*devices)) - { - WARN("Invalid structure size %u.\n", size); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - for (i = 0; i < device_count; ++i) - { - if ((devices[i].dwFlags & RIDEV_INPUTSINK) && - (devices[i].hwndTarget == NULL)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if ((devices[i].dwFlags & RIDEV_REMOVE) && - (devices[i].hwndTarget != NULL)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - - if (!(d = HeapAlloc( GetProcessHeap(), 0, device_count * sizeof(*d) ))) return FALSE; - - for (i = 0; i < device_count; ++i) - { - TRACE("device %u: page %#x, usage %#x, flags %#lx, target %p.\n", - i, devices[i].usUsagePage, devices[i].usUsage, - devices[i].dwFlags, devices[i].hwndTarget); - if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) - FIXME("Unhandled flags %#lx for device %u.\n", devices[i].dwFlags, i); - - d[i].usage_page = devices[i].usUsagePage; - d[i].usage = devices[i].usUsage; - d[i].flags = devices[i].dwFlags; - d[i].target = wine_server_user_handle( devices[i].hwndTarget ); - } - - SERVER_START_REQ( update_rawinput_devices ) - { - wine_server_add_data( req, d, device_count * sizeof(*d) ); - ret = !wine_server_call( req ); - } - SERVER_END_REQ; - - HeapFree( GetProcessHeap(), 0, d ); - - return ret; -} - /*********************************************************************** * GetRawInputDeviceInfoA (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 887394227a3..dbe2a4c1430 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -605,7 +605,7 @@ @ stub RegisterNetworkCapabilities @ stdcall RegisterPointerDeviceNotifications(long long) @ stdcall RegisterPowerSettingNotification(long ptr long) -@ stdcall RegisterRawInputDevices(ptr long long) +@ stdcall RegisterRawInputDevices(ptr long long) NtUserRegisterRawInputDevices @ stdcall RegisterServicesProcess(long) @ stdcall RegisterShellHookWindow (long) @ stdcall RegisterSuspendResumeNotification(long long) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index d6d4e0c13f7..359faa39083 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -366,3 +366,64 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d msg->pt = point_phys_to_win_dpi( msg->hwnd, msg->pt ); return TRUE; } + +/********************************************************************** + * NtUserRegisterRawInputDevices (win32u.@) + */ +BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT size ) +{ + struct rawinput_device *server_devices; + BOOL ret; + UINT i; + + TRACE( "devices %p, device_count %u, size %u.\n", devices, device_count, size ); + + if (size != sizeof(*devices)) + { + WARN( "Invalid structure size %u.\n", size ); + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + for (i = 0; i < device_count; ++i) + { + if ((devices[i].dwFlags & RIDEV_INPUTSINK) && !devices[i].hwndTarget) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if ((devices[i].dwFlags & RIDEV_REMOVE) && devices[i].hwndTarget) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + } + + if (!(server_devices = malloc( device_count * sizeof(*server_devices) ))) return FALSE; + + for (i = 0; i < device_count; ++i) + { + TRACE( "device %u: page %#x, usage %#x, flags %#x, target %p.\n", + i, devices[i].usUsagePage, devices[i].usUsage, + devices[i].dwFlags, devices[i].hwndTarget ); + if (devices[i].dwFlags & ~(RIDEV_REMOVE|RIDEV_NOLEGACY|RIDEV_INPUTSINK|RIDEV_DEVNOTIFY)) + FIXME( "Unhandled flags %#x for device %u.\n", devices[i].dwFlags, i ); + + server_devices[i].usage_page = devices[i].usUsagePage; + server_devices[i].usage = devices[i].usUsage; + server_devices[i].flags = devices[i].dwFlags; + server_devices[i].target = wine_server_user_handle( devices[i].hwndTarget ); + } + + SERVER_START_REQ( update_rawinput_devices ) + { + wine_server_add_data( req, server_devices, device_count * sizeof(*server_devices) ); + ret = !wine_server_call( req ); + } + SERVER_END_REQ; + + free( server_devices ); + + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 12af30f6c98..3f2c596f727 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -160,6 +160,7 @@ static void * const syscalls[] = NtUserOpenDesktop, NtUserOpenInputDesktop, NtUserOpenWindowStation, + NtUserRegisterRawInputDevices, NtUserRemoveClipboardFormatListener, NtUserRemoveMenu, NtUserRemoveProp, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c71f0d20429..687ef3af8dc 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1130,7 +1130,7 @@ @ stub NtUserRegisterManipulationThread @ stub NtUserRegisterPointerDeviceNotifications @ stub NtUserRegisterPointerInputTarget -@ stub NtUserRegisterRawInputDevices +@ stdcall -syscall NtUserRegisterRawInputDevices(ptr long long) @ stub NtUserRegisterServicesProcess @ stub NtUserRegisterSessionPort @ stub NtUserRegisterShellPTPListener diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 618a7990554..531f9f7f9cd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -147,6 +147,7 @@ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ + SYSCALL_ENTRY( NtUserRegisterRawInputDevices ) \ SYSCALL_ENTRY( NtUserRemoveClipboardFormatListener ) \ SYSCALL_ENTRY( NtUserRemoveMenu ) \ SYSCALL_ENTRY( NtUserRemoveProp ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9c6730b24ae..231f6a04a1e 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -64,6 +64,14 @@ typedef struct UINT32 wParam; } RAWINPUTHEADER32; +typedef struct +{ + USHORT usUsagePage; + USHORT usUsage; + DWORD dwFlags; + UINT32 hwndTarget; +} RAWINPUTDEVICE32; + static MSG *msg_32to64( MSG *msg, MSG32 *msg32 ) { if (!msg32) return NULL; @@ -975,3 +983,35 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputBuffer( UINT *args ) * whether it's operating under WoW64 or not. */ return NtUserGetRawInputBuffer( data, data_size, sizeof(RAWINPUTHEADER) ); } + +NTSTATUS WINAPI wow64_NtUserRegisterRawInputDevices( UINT *args ) +{ + const RAWINPUTDEVICE32 *devices32 = get_ptr( &args ); + UINT count = get_ulong( &args ); + UINT size = get_ulong( &args ); + + RAWINPUTDEVICE *devices64; + unsigned int i; + + if (size != sizeof(RAWINPUTDEVICE32)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (!(devices64 = Wow64AllocateTemp( count * sizeof(*devices64) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + for (i = 0; i < count; ++i) + { + devices64[i].usUsagePage = devices32[i].usUsagePage; + devices64[i].usUsage = devices32[i].usUsage; + devices64[i].dwFlags = devices32[i].dwFlags; + devices64[i].hwndTarget = UlongToPtr( devices32[i].hwndTarget ); + } + + return NtUserRegisterRawInputDevices( devices64, count, sizeof(*devices64) ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 18ddbcaa4a4..cb5696ec827 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -663,6 +663,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING * struct client_menu_name *client_menu_name, DWORD fnid, DWORD flags, DWORD *wow ); BOOL WINAPI NtUserRegisterHotKey( HWND hwnd, INT id, UINT modifiers, UINT vk ); +BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT device_count, UINT size ); INT WINAPI NtUserReleaseDC( HWND hwnd, HDC hdc ); BOOL WINAPI NtUserRemoveClipboardFormatListener( HWND hwnd ); BOOL WINAPI NtUserRemoveMenu( HMENU menu, UINT id, UINT flags );

1 0

Zebediah Figura : win32u: Move NtUserGetRegisteredRawInputDevices from user32.
by Alexandre Julliard June 30, 2022

June 30, 2022

Module: wine Branch: master Commit: cbbab655710ad938d8455568487e47c33aa7240f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbbab655710ad938d8455568… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 17:49:57 2022 -0500 win32u: Move NtUserGetRegisteredRawInputDevices from user32. --- dlls/user32/rawinput.c | 57 ----------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/rawinput.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 41 ++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 8 files changed, 105 insertions(+), 59 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 1b02be1398d..588d1685cc0 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -506,63 +506,6 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT return *data_size; } -static int __cdecl compare_raw_input_devices(const void *ap, const void *bp) -{ - const RAWINPUTDEVICE a = *(const RAWINPUTDEVICE *)ap; - const RAWINPUTDEVICE b = *(const RAWINPUTDEVICE *)bp; - - if (a.usUsagePage != b.usUsagePage) return a.usUsagePage - b.usUsagePage; - if (a.usUsage != b.usUsage) return a.usUsage - b.usUsage; - return 0; -} - -/*********************************************************************** - * GetRegisteredRawInputDevices (USER32.@) - */ -UINT WINAPI DECLSPEC_HOTPATCH GetRegisteredRawInputDevices(RAWINPUTDEVICE *devices, UINT *device_count, UINT size) -{ - struct rawinput_device *buffer = NULL; - unsigned int i, status, count = ~0U, buffer_size; - - TRACE("devices %p, device_count %p, size %u\n", devices, device_count, size); - - if (size != sizeof(RAWINPUTDEVICE) || !device_count || (devices && !*device_count)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return ~0U; - } - - buffer_size = *device_count * sizeof(*buffer); - if (devices && !(buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size))) - return ~0U; - - SERVER_START_REQ(get_rawinput_devices) - { - if (buffer) wine_server_set_reply(req, buffer, buffer_size); - status = wine_server_call_err(req); - *device_count = reply->device_count; - } - SERVER_END_REQ; - - if (buffer && !status) - { - for (i = 0, count = *device_count; i < count; ++i) - { - devices[i].usUsagePage = buffer[i].usage_page; - devices[i].usUsage = buffer[i].usage; - devices[i].dwFlags = buffer[i].flags; - devices[i].hwndTarget = wine_server_ptr_handle(buffer[i].target); - } - - qsort(devices, count, sizeof(*devices), compare_raw_input_devices); - } - - if (buffer) HeapFree(GetProcessHeap(), 0, buffer); - else count = 0; - return count; -} - - /*********************************************************************** * DefRawInputProc (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index dbe2a4c1430..3e20277251a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -372,7 +372,7 @@ @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) @ stdcall GetRawInputDeviceList(ptr ptr long) # @ stub GetReasonTitleFromReasonCode -@ stdcall GetRegisteredRawInputDevices(ptr ptr long) +@ stdcall GetRegisteredRawInputDevices(ptr ptr long) NtUserGetRegisteredRawInputDevices @ stdcall GetScrollBarInfo(long long ptr) @ stdcall GetScrollInfo(long long ptr) @ stdcall GetScrollPos(long long) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 359faa39083..1caf11f2e76 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -427,3 +427,62 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d return ret; } + +static int compare_raw_input_devices( const void *ap, const void *bp ) +{ + const RAWINPUTDEVICE a = *(const RAWINPUTDEVICE *)ap; + const RAWINPUTDEVICE b = *(const RAWINPUTDEVICE *)bp; + + if (a.usUsagePage != b.usUsagePage) return a.usUsagePage - b.usUsagePage; + if (a.usUsage != b.usUsage) return a.usUsage - b.usUsage; + return 0; +} + +/********************************************************************** + * NtUserGetRegisteredRawInputDevices (win32u.@) + */ +UINT WINAPI NtUserGetRegisteredRawInputDevices( RAWINPUTDEVICE *devices, UINT *device_count, UINT size ) +{ + struct rawinput_device *buffer = NULL; + unsigned int i, status, buffer_size; + + TRACE("devices %p, device_count %p, size %u\n", devices, device_count, size); + + if (size != sizeof(RAWINPUTDEVICE) || !device_count || (devices && !*device_count)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + buffer_size = *device_count * sizeof(*buffer); + if (devices && !(buffer = malloc( buffer_size ))) + return ~0u; + + SERVER_START_REQ(get_rawinput_devices) + { + if (buffer) wine_server_set_reply( req, buffer, buffer_size ); + status = wine_server_call_err(req); + *device_count = reply->device_count; + } + SERVER_END_REQ; + if (status) + { + free( buffer ); + return ~0u; + } + + if (!devices) return 0; + + for (i = 0; i < *device_count; ++i) + { + devices[i].usUsagePage = buffer[i].usage_page; + devices[i].usUsage = buffer[i].usage; + devices[i].dwFlags = buffer[i].flags; + devices[i].hwndTarget = wine_server_ptr_handle(buffer[i].target); + } + + qsort( devices, *device_count, sizeof(*devices), compare_raw_input_devices ); + + free( buffer ); + return *device_count; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3f2c596f727..49746725816 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -147,6 +147,7 @@ static void * const syscalls[] = NtUserGetProp, NtUserGetRawInputBuffer, NtUserGetRawInputData, + NtUserGetRegisteredRawInputDevices, NtUserGetSystemDpiForProcess, NtUserGetThreadDesktop, NtUserGetTitleBarInfo, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 687ef3af8dc..dab6e2a5ed8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -988,7 +988,7 @@ @ stub NtUserGetRawInputDeviceInfo @ stub NtUserGetRawInputDeviceList @ stub NtUserGetRawPointerDeviceData -@ stub NtUserGetRegisteredRawInputDevices +@ stdcall -syscall NtUserGetRegisteredRawInputDevices(ptr ptr long) @ stub NtUserGetRequiredCursorSizes @ stub NtUserGetResizeDCompositionSynchronizationObject @ stub NtUserGetScrollBarInfo diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 531f9f7f9cd..903f146025d 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -134,6 +134,7 @@ SYSCALL_ENTRY( NtUserGetProp ) \ SYSCALL_ENTRY( NtUserGetRawInputBuffer ) \ SYSCALL_ENTRY( NtUserGetRawInputData ) \ + SYSCALL_ENTRY( NtUserGetRegisteredRawInputDevices ) \ SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserGetTitleBarInfo ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 231f6a04a1e..87c522071aa 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1015,3 +1015,44 @@ NTSTATUS WINAPI wow64_NtUserRegisterRawInputDevices( UINT *args ) return NtUserRegisterRawInputDevices( devices64, count, sizeof(*devices64) ); } + +NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) +{ + RAWINPUTDEVICE32 *devices32 = get_ptr( &args ); + UINT *count = get_ptr( &args ); + UINT size = get_ulong( &args ); + + if (size != sizeof(RAWINPUTDEVICE32)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + if (devices32) + { + RAWINPUTDEVICE *devices64; + unsigned int ret, i; + + if (!(devices64 = Wow64AllocateTemp( (*count) * sizeof(*devices64) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return ~0u; + } + + ret = NtUserGetRegisteredRawInputDevices( devices64, count, sizeof(RAWINPUTDEVICE) ); + if (ret == ~0u) return ret; + + for (i = 0; i < *count; ++i) + { + devices32[i].usUsagePage = devices64[i].usUsagePage; + devices32[i].usUsage = devices64[i].usUsage; + devices32[i].dwFlags = devices64[i].dwFlags; + devices32[i].hwndTarget = (ULONG_PTR)devices64[i].hwndTarget; + } + return ret; + } + else + { + return NtUserGetRegisteredRawInputDevices( NULL, count, sizeof(RAWINPUTDEVICE) ); + } +} diff --git a/include/ntuser.h b/include/ntuser.h index cb5696ec827..9c4aaf041a4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -621,6 +621,7 @@ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ); DWORD WINAPI NtUserGetQueueStatus( UINT flags ); UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT header_size ); UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, UINT *data_size, UINT header_size ); +UINT WINAPI NtUserGetRegisteredRawInputDevices( RAWINPUTDEVICE *devices, UINT *device_count, UINT size ); ULONG WINAPI NtUserGetSystemDpiForProcess( HANDLE process ); HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread );

1 0