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

Arkadiusz Hiler : mshtml: Enable CSS grid layout.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 269f636da74405d1b29081dd5b88eb3319e2c66f URL: https://source.winehq.org/git/wine.git/?a=commit;h=269f636da74405d1b29081dd… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Jun 23 21:24:37 2022 +0300 mshtml: Enable CSS grid layout. Final Fantasy XIV launcher uses it to show login form next to the news. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/mshtml/nsembed.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e34861b13fa..8f456b40ef2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -540,6 +540,7 @@ static void set_preferences(void) set_lang(pref); set_bool_pref(pref, "security.warn_entering_secure", FALSE); set_bool_pref(pref, "security.warn_submit_insecure", FALSE); + set_bool_pref(pref, "layout.css.grid.enabled", TRUE); set_int_pref(pref, "layout.spellcheckDefault", 0); nsIPrefBranch_Release(pref);

1 0

Alexandre Julliard : make_unicode: Verify checksums of downloaded files.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 3ccb5f238ecc19e73ba058c9bf86bd31e55e5697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ccb5f238ecc19e73ba058c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 10:58:46 2022 +0200 make_unicode: Verify checksums of downloaded files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index aaa28fca05e..dc2197f2e8e 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -32,18 +32,30 @@ my $TZVERSION = "2022a"; my %data_files = ( - ucd => { url => "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip", name => "UCD-$UNIVERSION.zip" }, - unihan => { url => "https://www.unicode.org/Public/$UNIVERSION/ucd/Unihan.zip", name => "Unihan-$UNIVERSION.zip" }, - idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt" }, - cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.…" }, - cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip" }, - sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… 10 Sorting Weight Table.txt" }, - codepages => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… Supported Code Page Data Files.zip" }, - iso639 => { url => "https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3_Code_Tabl…" }, - ksx1001 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/KSX1001.TXT" }, - jis0208 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT" }, - jis0212 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0212.TXT" }, - tzdata => { url => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz" }, + ucd => { url => "https://www.unicode.org/Public/$UNIVERSION/ucd/UCD.zip", name => "UCD-$UNIVERSION.zip", + sha => "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" }, + unihan => { url => "https://www.unicode.org/Public/$UNIVERSION/ucd/Unihan.zip", name => "Unihan-$UNIVERSION.zip", + sha => "2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d" }, + idna => { url => "https://www.unicode.org/Public/idna/$UNIVERSION/IdnaMappingTable.txt", name => "IdnaMappingTable-$UNIVERSION.txt", + sha => "d43d9ca367af27b0e4c9dc645cadc23690bdecaf7ec2687f37f01180022d4dfa" }, + cldr => { url => "https://github.com/unicode-org/cldr/archive/refs/tags/release-$CLDRVERSION.…", + sha => "a2b7aee281ad2f497d47995808cf5e8f24123b0814ca47f7a824556aec8a0d91" }, + cldr33 => { url => "https://www.unicode.org/Public/cldr/33/cldr-common-33.0.zip", + sha => "fa3490082c086d21257153609642f54fcf788fcfda4966fe67f3f6daca0d58b9" }, + sorting => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… 10 Sorting Weight Table.txt", + sha => "81fcfa1e5ed3e3a94d329959ff7d97d522ddf9d653d2c4d6ddcccc5cd4df663f" }, + codepages => { url => "https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F6… Supported Code Page Data Files.zip", + sha => "5074e6dd253056ba61fc6c870c9a955467855129c6ad3a51761c386b301b125a" }, + iso639 => { url => "https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3_Code_Tabl…", + sha => "d912749d10c344835f052a9f31d13f13d5ffc99bc589e1eb88f2b4663e990881" }, + ksx1001 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/KSC/KSX1001.TXT", + sha => "d8d2a35206ac0ea2865f5d801c9d6717f735bf46f263a658a64a960abe59e371" }, + jis0208 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0208.TXT", + sha => "1c571870457f19c97720631fa83ee491549a96ba1436da1296786a67d8632e87" }, + jis0212 => { url => "https://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/JIS0212.TXT", + sha => "477820bb3055bbcc90880d788cd95607d221dc94457bae249231adecf13c12e6" }, + tzdata => { url => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz", + sha => "ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664" }, ); @@ -1897,6 +1909,9 @@ sub open_data_file($@) !system "wget", "-q", "-O", $filename, $url or die "cannot fetch $url"; } + my $sha = Digest::SHA->new( "sha256" )->addfile( $filename )->hexdigest; + die "invalid checksum $sha for $filename" unless $sha eq $data->{sha}; + if ($filename =~ /\.zip$/) { open FILE, "-|", "unzip", "-p", $filename, $name or die "cannot extract $name from $filename";

1 0

Alexandre Julliard : makefiles: Never install external libraries.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: b819b9956284c85d0d08d5ee0ab00cd080c39f6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b819b9956284c85d0d08d5ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 18:45:37 2022 +0200 makefiles: Never install external libraries. Spotted by Kevin Puetz. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 83e4844050a..81e9c20fd4f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3349,8 +3349,9 @@ static void output_static_lib( struct makefile *make ) output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->unixobj_files ); output( "\n" ); - add_install_rule( make, make->staticlib, make->staticlib, - strmake( "d%s/%s", so_dir, make->staticlib )); + if (!make->extlib) + add_install_rule( make, make->staticlib, make->staticlib, + strmake( "d%s/%s", so_dir, make->staticlib )); } if (crosstarget) {

1 0

Jacek Caban : user32: Reimplement SetMenuItemBitmaps on top of NtUserThunkedMenuItemInfo.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 177513a53274c75f8279ee393326ca663c908ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=177513a53274c75f8279ee39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 16:38:32 2022 +0200 user32: Reimplement SetMenuItemBitmaps on top of NtUserThunkedMenuItemInfo. --- dlls/user32/menu.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 76144706771..342ee08a89b 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -714,30 +714,21 @@ DWORD WINAPI GetMenuCheckMarkDimensions(void) /********************************************************************** * SetMenuItemBitmaps (USER32.@) */ -BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, - HBITMAP hNewUnCheck, HBITMAP hNewCheck) +BOOL WINAPI SetMenuItemBitmaps( HMENU menu, UINT pos, UINT flags, HBITMAP uncheck, HBITMAP check ) { - POPUPMENU *menu; - MENUITEM *item; - UINT pos; + MENUITEMINFOW info; - if (!(menu = find_menu_item(hMenu, nPos, wFlags, &pos))) + info.cbSize = sizeof(info); + info.fMask = MIIM_STATE; + if (!NtUserThunkedMenuItemInfo( menu, pos, flags, NtUserGetMenuItemInfoW, &info, NULL )) return FALSE; - item = &menu->items[pos]; - if (!hNewCheck && !hNewUnCheck) - { - item->fState &= ~MF_USECHECKBITMAPS; - } - else /* Install new bitmaps */ - { - item->hCheckBit = hNewCheck; - item->hUnCheckBit = hNewUnCheck; - item->fState |= MF_USECHECKBITMAPS; - } - release_menu_ptr(menu); - - return TRUE; + info.fMask = MIIM_STATE | MIIM_CHECKMARKS; + info.hbmpChecked = check; + info.hbmpUnchecked = uncheck; + if (check || uncheck) info.fState |= MF_USECHECKBITMAPS; + else info.fState &= ~MF_USECHECKBITMAPS; + return NtUserThunkedMenuItemInfo( menu, pos, flags, NtUserSetMenuItemInfo, &info, NULL ); }

1 0

Zebediah Figura : win32u: Use syscall interface for NtUserGetRawInputBuffer.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 13a04cdf519b8a7b23a5d52c0e81a9d03df901da URL: https://source.winehq.org/git/wine.git/?a=commit;h=13a04cdf519b8a7b23a5d52c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 16:51:18 2022 -0500 win32u: Use syscall interface for NtUserGetRawInputBuffer. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 - dlls/win32u/wrappers.c | 6 ------ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 18 ++++++++++++++++++ 7 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0b148a628b3..9d95d3cf94a 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1184,7 +1184,6 @@ static struct unix_funcs unix_funcs = NtUserGetMessage, NtUserGetPriorityClipboardFormat, NtUserGetQueueStatus, - NtUserGetRawInputBuffer, NtUserGetSystemMenu, NtUserGetUpdateRect, NtUserGetUpdateRgn, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index cf5615f4dde..12af30f6c98 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -145,6 +145,7 @@ static void * const syscalls[] = NtUserGetProcessDpiAwarenessContext, NtUserGetProcessWindowStation, NtUserGetProp, + NtUserGetRawInputBuffer, NtUserGetRawInputData, NtUserGetSystemDpiForProcess, NtUserGetThreadDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 80bfb0bc253..c71f0d20429 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -983,7 +983,7 @@ @ stdcall -syscall NtUserGetProp(long wstr) @ stdcall NtUserGetQueueStatus(long) @ stub NtUserGetQueueStatusReadonly -@ stdcall NtUserGetRawInputBuffer(ptr ptr long) +@ stdcall -syscall NtUserGetRawInputBuffer(ptr ptr long) @ stdcall -syscall NtUserGetRawInputData(ptr long ptr ptr long) @ stub NtUserGetRawInputDeviceInfo @ stub NtUserGetRawInputDeviceList diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 7b4b820d392..a3f3855de7a 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -248,7 +248,6 @@ struct unix_funcs BOOL (WINAPI *pNtUserGetMessage)( MSG *msg, HWND hwnd, UINT first, UINT last ); INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); DWORD (WINAPI *pNtUserGetQueueStatus)( UINT flags ); - UINT (WINAPI *pNtUserGetRawInputBuffer)( RAWINPUT *data, UINT *data_size, UINT header_size ); HMENU (WINAPI *pNtUserGetSystemMenu)( HWND hwnd, BOOL revert ); BOOL (WINAPI *pNtUserGetUpdateRect)( HWND hwnd, RECT *rect, BOOL erase ); INT (WINAPI *pNtUserGetUpdateRgn)( HWND hwnd, HRGN hrgn, BOOL erase ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index a4504135314..b451e57e3b1 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1048,12 +1048,6 @@ DWORD WINAPI NtUserGetQueueStatus( UINT flags ) return unix_funcs->pNtUserGetQueueStatus( flags ); } -UINT WINAPI DECLSPEC_HOTPATCH NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT header_size ) -{ - if (!unix_funcs) return ~0u; - return unix_funcs->pNtUserGetRawInputBuffer( data, data_size, header_size ); -} - BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 6c4e12bf59a..618a7990554 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -132,6 +132,7 @@ SYSCALL_ENTRY( NtUserGetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetProp ) \ + SYSCALL_ENTRY( NtUserGetRawInputBuffer ) \ SYSCALL_ENTRY( NtUserGetRawInputData ) \ SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8105b66654c..9c6730b24ae 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -957,3 +957,21 @@ NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) return ~0u; } } + +NTSTATUS WINAPI wow64_NtUserGetRawInputBuffer( UINT *args ) +{ + RAWINPUT *data = get_ptr( &args ); + UINT *data_size = get_ptr( &args ); + UINT header_size = get_ulong( &args ); + + if (header_size != sizeof(RAWINPUTHEADER32)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + /* RAWINPUT has different sizes on 32-bit and 64-bit, but no translation is + * done. The function actually returns different structures depending on + * whether it's operating under WoW64 or not. */ + return NtUserGetRawInputBuffer( data, data_size, sizeof(RAWINPUTHEADER) ); +}

1 0

Alexandre Julliard : make_unicode: Add a table of downloaded files and their URLs.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: cfaa28933b82a990aebb48988aa2a43b9dbb6651 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfaa28933b82a990aebb4898… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 24 10:58:21 2022 +0200 make_unicode: Add a table of downloaded files and their URLs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 170 +++++++++++++++++++++++++---------------------------- 1 file changed, 81 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfaa28933b82a990aebb…

1 0

Zebediah Figura : win32u: Use syscall interface for NtUserGetRawInputData.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 5b7a862c03e7e35b4eea6f3d52de05919a36c148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b7a862c03e7e35b4eea6f3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 16:43:46 2022 -0500 win32u: Use syscall interface for NtUserGetRawInputData. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 - dlls/win32u/wrappers.c | 6 --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 102 insertions(+), 10 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 121ed4bbefd..0b148a628b3 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1185,7 +1185,6 @@ static struct unix_funcs unix_funcs = NtUserGetPriorityClipboardFormat, NtUserGetQueueStatus, NtUserGetRawInputBuffer, - NtUserGetRawInputData, NtUserGetSystemMenu, NtUserGetUpdateRect, NtUserGetUpdateRgn, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index ffb1529e03f..cf5615f4dde 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -145,6 +145,7 @@ static void * const syscalls[] = NtUserGetProcessDpiAwarenessContext, NtUserGetProcessWindowStation, NtUserGetProp, + NtUserGetRawInputData, NtUserGetSystemDpiForProcess, NtUserGetThreadDesktop, NtUserGetTitleBarInfo, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 4a8d839007e..80bfb0bc253 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -984,7 +984,7 @@ @ stdcall NtUserGetQueueStatus(long) @ stub NtUserGetQueueStatusReadonly @ stdcall NtUserGetRawInputBuffer(ptr ptr long) -@ stdcall NtUserGetRawInputData(ptr long ptr ptr long) +@ stdcall -syscall NtUserGetRawInputData(ptr long ptr ptr long) @ stub NtUserGetRawInputDeviceInfo @ stub NtUserGetRawInputDeviceList @ stub NtUserGetRawPointerDeviceData diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 51a3d752763..7b4b820d392 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -249,8 +249,6 @@ struct unix_funcs INT (WINAPI *pNtUserGetPriorityClipboardFormat)( UINT *list, INT count ); DWORD (WINAPI *pNtUserGetQueueStatus)( UINT flags ); UINT (WINAPI *pNtUserGetRawInputBuffer)( RAWINPUT *data, UINT *data_size, UINT header_size ); - UINT (WINAPI *pNtUserGetRawInputData)( HRAWINPUT rawinput, UINT command, - void *data, UINT *data_size, UINT header_size ); HMENU (WINAPI *pNtUserGetSystemMenu)( HWND hwnd, BOOL revert ); BOOL (WINAPI *pNtUserGetUpdateRect)( HWND hwnd, RECT *rect, BOOL erase ); INT (WINAPI *pNtUserGetUpdateRgn)( HWND hwnd, HRGN hrgn, BOOL erase ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 05c25a006e9..a4504135314 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1054,12 +1054,6 @@ UINT WINAPI DECLSPEC_HOTPATCH NtUserGetRawInputBuffer( RAWINPUT *data, UINT *dat return unix_funcs->pNtUserGetRawInputBuffer( data, data_size, header_size ); } -UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, UINT *data_size, UINT header_size ) -{ - if (!unix_funcs) return ~0u; - return unix_funcs->pNtUserGetRawInputData( rawinput, command, data, data_size, header_size ); -} - BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT *out_size ) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index e1364c2811e..6c4e12bf59a 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -132,6 +132,7 @@ SYSCALL_ENTRY( NtUserGetProcessDpiAwarenessContext ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetProp ) \ + SYSCALL_ENTRY( NtUserGetRawInputData ) \ SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserGetTitleBarInfo ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 08b8fb6f2a0..8105b66654c 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -56,6 +56,14 @@ typedef struct POINT pt; } MSG32; +typedef struct +{ + DWORD dwType; + DWORD dwSize; + UINT32 hDevice; + UINT32 wParam; +} RAWINPUTHEADER32; + static MSG *msg_32to64( MSG *msg, MSG32 *msg32 ) { if (!msg32) return NULL; @@ -858,3 +866,94 @@ NTSTATUS WINAPI wow64_NtUserGetTitleBarInfo( UINT *args ) return NtUserGetTitleBarInfo( hwnd, info ); } + +NTSTATUS WINAPI wow64_NtUserGetRawInputData( UINT *args ) +{ + HRAWINPUT handle = get_handle( &args ); + UINT command = get_ulong( &args ); + void *data = get_ptr( &args ); + UINT *data_size = get_ptr( &args ); + UINT header_size = get_ulong( &args ); + + if (header_size != sizeof(RAWINPUTHEADER32)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + switch (command) + { + case RID_INPUT: + if (data) + { + UINT data_size64, body_size, ret; + RAWINPUTHEADER32 *data32 = data; + RAWINPUTHEADER *data64 = NULL; + + data_size64 = *data_size + sizeof(RAWINPUTHEADER); + if (!(data64 = Wow64AllocateTemp( data_size64 ))) + { + SetLastError( STATUS_NO_MEMORY ); + return ~0u; + } + + ret = NtUserGetRawInputData( handle, command, data64, &data_size64, sizeof(RAWINPUTHEADER) ); + if (ret == ~0u) return ret; + + body_size = ret - sizeof(RAWINPUTHEADER); + if (*data_size < sizeof(RAWINPUTHEADER32) + body_size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return ~0u; + } + + data32->dwType = data64->dwType; + data32->dwSize = sizeof(RAWINPUTHEADER32) + body_size; + data32->hDevice = (UINT_PTR)data64->hDevice; + data32->wParam = data64->wParam; + memcpy( data32 + 1, data64 + 1, body_size ); + return sizeof(RAWINPUTHEADER32) + body_size; + } + else + { + UINT data_size64, ret; + + ret = NtUserGetRawInputData( handle, command, NULL, &data_size64, sizeof(RAWINPUTHEADER) ); + if (ret == ~0u) return ret; + *data_size = data_size64 - sizeof(RAWINPUTHEADER) + sizeof(RAWINPUTHEADER32); + return 0; + } + + case RID_HEADER: + { + UINT data_size64 = sizeof(RAWINPUTHEADER); + RAWINPUTHEADER32 *data32 = data; + RAWINPUTHEADER data64; + UINT ret; + + if (!data) + { + *data_size = sizeof(RAWINPUTHEADER32); + return 0; + } + + if (*data_size < sizeof(RAWINPUTHEADER32)) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return ~0u; + } + + ret = NtUserGetRawInputData( handle, command, &data64, &data_size64, sizeof(RAWINPUTHEADER) ); + if (ret == ~0u) return ret; + data32->dwType = data64.dwType; + data32->dwSize = data64.dwSize - sizeof(RAWINPUTHEADER) + sizeof(RAWINPUTHEADER32); + data32->hDevice = (UINT_PTR)data64.hDevice; + data32->wParam = data64.wParam; + return sizeof(RAWINPUTHEADER32); + } + + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } +}

1 0

Zebediah Figura : win32u: Move raw input thread data allocation from user32.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: 7c418f14f352c5d715825484418d8d9d0e9f2f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c418f14f352c5d715825484… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 15:58:34 2022 -0500 win32u: Move raw input thread data allocation from user32. --- dlls/user32/rawinput.c | 11 ----------- dlls/user32/user_main.c | 2 -- dlls/user32/user_private.h | 1 - dlls/win32u/ntuser_private.h | 1 - dlls/win32u/rawinput.c | 15 ++++++++++++--- dlls/win32u/sysparams.c | 1 + 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 9286aceb670..d6290f08d12 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -351,17 +351,6 @@ BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage) } -struct rawinput_thread_data * WINAPI rawinput_thread_data(void) -{ - struct user_thread_info *thread_info = get_user_thread_info(); - struct rawinput_thread_data *data = thread_info->rawinput; - if (data) return data; - data = thread_info->rawinput = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - RAWINPUT_BUFFER_SIZE + sizeof(struct user_thread_info) ); - return data; -} - - /*********************************************************************** * GetRawInputDeviceList (USER32.@) */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 72d5f30e536..55e72dcf203 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -169,7 +169,6 @@ static const struct user_callbacks user_funcs = register_imm, unregister_imm, try_finally, - rawinput_thread_data, }; static NTSTATUS WINAPI User32CopyImage( const struct copy_image_params *params, ULONG size ) @@ -271,7 +270,6 @@ static void thread_detach(void) NtUserCallNoParam( NtUserThreadDetach ); HeapFree( GetProcessHeap(), 0, thread_info->wmchar_data ); - HeapFree( GetProcessHeap(), 0, thread_info->rawinput ); exiting_thread_id = 0; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d15a3b6856e..71248e03bb8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -62,7 +62,6 @@ struct tagWND; struct hardware_msg_data; extern BOOL rawinput_device_get_usages(HANDLE handle, USAGE *usage_page, USAGE *usage); -extern struct rawinput_thread_data * WINAPI rawinput_thread_data(void); extern void CDECL rawinput_update_device_list(void); extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index fd644484e48..eb851f57cdb 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -50,7 +50,6 @@ struct user_callbacks void (WINAPI *unregister_imm)( HWND hwnd ); NTSTATUS (CDECL *try_finally)( NTSTATUS (CDECL *func)( void *), void *arg, void (CALLBACK *finally_func)( BOOL )); - struct rawinput_thread_data *(WINAPI *get_rawinput_thread_data)(void); }; #define WM_SYSTIMER 0x0118 diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 046e25ecf6a..d6d4e0c13f7 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -58,6 +58,15 @@ typedef struct } RAWINPUT64; #endif +static struct rawinput_thread_data *get_rawinput_thread_data(void) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + struct rawinput_thread_data *data = thread_info->rawinput; + if (data) return data; + data = thread_info->rawinput = calloc( 1, RAWINPUT_BUFFER_SIZE + sizeof(struct user_thread_info) ); + return data; +} + static bool rawinput_from_hardware_message( RAWINPUT *rawinput, const struct hardware_msg_data *msg_data ) { SIZE_T size; @@ -223,7 +232,7 @@ UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT heade return 0; } - if (!user_callbacks || !(thread_data = user_callbacks->get_rawinput_thread_data())) return ~0u; + if (!(thread_data = get_rawinput_thread_data())) return ~0u; rawinput = thread_data->buffer; /* first RAWINPUT block in the buffer is used for WM_INPUT message data */ @@ -286,7 +295,7 @@ UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, TRACE( "rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size ); - if (!user_callbacks || !(thread_data = user_callbacks->get_rawinput_thread_data())) + if (!(thread_data = get_rawinput_thread_data())) { SetLastError( ERROR_OUTOFMEMORY ); return ~0u; @@ -339,7 +348,7 @@ BOOL process_rawinput_message( MSG *msg, UINT hw_id, const struct hardware_msg_d { struct rawinput_thread_data *thread_data; - if (!user_callbacks || !(thread_data = user_callbacks->get_rawinput_thread_data())) + if (!(thread_data = get_rawinput_thread_data())) return FALSE; if (msg->message == WM_INPUT_DEVICE_CHANGE) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index a8c1d977c7d..8565b1bef99 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4689,6 +4689,7 @@ static void thread_detach(void) free( thread_info->key_state ); thread_info->key_state = 0; + free( thread_info->rawinput ); destroy_thread_windows(); NtClose( thread_info->server_queue );

1 0

Zebediah Figura : win32u: Move process_rawinput_message() from user32.
by Alexandre Julliard June 24, 2022

June 24, 2022

Module: wine Branch: master Commit: e2d3fc7c07d19207ee8a81f92dfdcad0d09387bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2d3fc7c07d19207ee8a81f9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 15:56:29 2022 -0500 win32u: Move process_rawinput_message() from user32. --- dlls/user32/message.c | 19 ------- dlls/user32/rawinput.c | 120 +------------------------------------------ dlls/user32/sysparams.c | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 3 +- dlls/user32/win.h | 1 - dlls/win32u/message.c | 2 +- dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/rawinput.c | 23 +++++++++ dlls/win32u/win32u_private.h | 4 ++ 10 files changed, 33 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e2d3fc7c07d19207ee8a…

1 0

Alexandre Julliard : make_unicode: Generate the time zone registry keys.
by Alexandre Julliard June 24, 2022

June 24, 2022

1 0