August 2022 - Wine-commits - list.winehq.org

Piotr Caban : compstui: Add CommonPropertySheetUI tests.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 852bbe6d542eda608db442f3979862ba0f0a8124 URL: https://gitlab.winehq.org/wine/wine/-/commit/852bbe6d542eda608db442f3979862… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 16 15:45:03 2022 +0200 compstui: Add CommonPropertySheetUI tests. --- configure | 1 + configure.ac | 1 + dlls/compstui/tests/Makefile.in | 7 ++ dlls/compstui/tests/compstui.c | 153 ++++++++++++++++++++++++++++++++++++++++ dlls/compstui/tests/rsrc.rc | 28 ++++++++ 5 files changed, 190 insertions(+) diff --git a/configure b/configure index 8585cf11b1f..89500dc8f7a 100755 --- a/configure +++ b/configure @@ -21296,6 +21296,7 @@ wine_fn_config_makefile dlls/comm.drv16 enable_win16 wine_fn_config_makefile dlls/commdlg.dll16 enable_win16 wine_fn_config_makefile dlls/compobj.dll16 enable_win16 wine_fn_config_makefile dlls/compstui enable_compstui +wine_fn_config_makefile dlls/compstui/tests enable_tests wine_fn_config_makefile dlls/comsvcs enable_comsvcs wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 diff --git a/configure.ac b/configure.ac index c41f84ae1f2..49d414e1d17 100644 --- a/configure.ac +++ b/configure.ac @@ -2435,6 +2435,7 @@ WINE_CONFIG_MAKEFILE(dlls/comm.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compstui) +WINE_CONFIG_MAKEFILE(dlls/compstui/tests) WINE_CONFIG_MAKEFILE(dlls/comsvcs) WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) diff --git a/dlls/compstui/tests/Makefile.in b/dlls/compstui/tests/Makefile.in new file mode 100644 index 00000000000..8904782645f --- /dev/null +++ b/dlls/compstui/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = compstui.dll +IMPORTS = comctl32 compstui user32 + +C_SRCS = \ + compstui.c + +RC_SRCS = rsrc.rc diff --git a/dlls/compstui/tests/compstui.c b/dlls/compstui/tests/compstui.c new file mode 100644 index 00000000000..f4e3af459a9 --- /dev/null +++ b/dlls/compstui/tests/compstui.c @@ -0,0 +1,153 @@ +/* + * Copyright 2022 Piotr Caban + * + * 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 <windows.h> +#include <prsht.h> +#include <ddk/compstui.h> + +#include "wine/test.h" + +typedef struct { + WORD cbSize; + WORD Flags; + LPWSTR pTitle; + HWND hWndParent; + HINSTANCE hInst; + union { + HICON hIcon; + ULONG_PTR IconID; + }; +} PROPSHEETUI_INFO_HEADERW; + +static INT_PTR CALLBACK prop_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + { + HWND dlg = GetParent(hwnd); + + PostMessageW(dlg, PSM_PRESSBUTTON, PSBTN_OK, 0); + } + return FALSE; +} + +#define ADD_PAGES 0x1 + +static LONG WINAPI propsheetui_callback(PROPSHEETUI_INFO *info, LPARAM lparam) +{ + PROPSHEETUI_INFO_HEADERW *info_header; + + ok(info->cbSize == sizeof(*info), "info->cbSize = %hd\n", info->cbSize); + + switch(info->Reason) + { + case PROPSHEETUI_REASON_BEFORE_INIT: + ok(!info->Version, "info->Version = %hd\n", info->Version); + ok(!info->Flags, "info->Flags = %hd\n", info->Flags); + ok(!info->hComPropSheet, "info->hComPropSheet = %p\n", info->hComPropSheet); + ok(!info->pfnComPropSheet, "info->pfnComPropSheet = %p\n", info->pfnComPropSheet); + ok(!info->Result, "info->Result = %Ix\n", info->Result); + break; + case PROPSHEETUI_REASON_INIT: + ok(info->Version == PROPSHEETUI_INFO_VERSION, "info->Version = %hd\n", info->Version); + ok(info->Flags == PSUIINFO_UNICODE, "info->Flags = %hd\n", info->Flags); + ok(info->hComPropSheet != NULL, "info->hComPropSheet = NULL\n"); + ok(info->pfnComPropSheet != NULL, "info->pfnComPropSheet = NULL\n"); + ok(!info->UserData, "info->UserData = %Ix\n", info->UserData); + ok(!info->Result, "info->Result = %Ix\n", info->Result); + break; + case PROPSHEETUI_REASON_GET_INFO_HEADER: + ok(info->Version == PROPSHEETUI_INFO_VERSION, "info->Version = %hd\n", info->Version); + ok(info->Flags == PSUIINFO_UNICODE, "info->Flags = %hd\n", info->Flags); + ok(info->hComPropSheet != NULL, "info->hComPropSheet = NULL\n"); + ok(info->pfnComPropSheet != NULL, "info->pfnComPropSheet = NULL\n"); + ok(!info->UserData, "info->UserData = %Ix\n", info->UserData); + ok(!info->Result, "info->Result = %Ix\n", info->Result); + + info_header = (PROPSHEETUI_INFO_HEADERW*)lparam; + ok(info_header->cbSize == sizeof(*info_header), "info_header->cbSize = %hd\n", info_header->cbSize); + ok(!info_header->Flags, "info_header->Flags = %hx\n", info_header->Flags); + ok(!info_header->pTitle, "info_header->pTitle = %p\n", info_header->pTitle); + ok(info_header->hWndParent == (HWND)0x4321, "info_header->hWndParent = %p\n", info_header->hWndParent); + ok(!info_header->hInst, "info_header->hInst = %p\n", info_header->hInst); + + info_header->hWndParent = 0; + + if (info->lParamInit & ADD_PAGES) + { + HPROPSHEETPAGE hpsp; + PROPSHEETPAGEW psp; + LONG_PTR ret; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + U(psp).pszTemplate = L"prop_page1"; + psp.pfnDlgProc = prop_page_proc; + hpsp = CreatePropertySheetPageW(&psp); + ok(hpsp != NULL, "hpsp = %p\n", hpsp); + ret = info->pfnComPropSheet(info->hComPropSheet, CPSFUNC_ADD_HPROPSHEETPAGE, (LPARAM)hpsp, 0); + ok(ret, "ret = 0\n"); + } + break; + case PROPSHEETUI_REASON_DESTROY: + if (info->lParamInit & ADD_PAGES) + ok(lparam, "lparam = 0\n"); + else + ok(!lparam, "lparam = %Ix\n", lparam); + + ok(info->Version == PROPSHEETUI_INFO_VERSION, "info->Version = %hd\n", info->Version); + ok(info->Flags == PSUIINFO_UNICODE, "info->Flags = %hd\n", info->Flags); + ok(info->hComPropSheet != NULL, "info->hComPropSheet = NULL\n"); + ok(info->pfnComPropSheet != NULL, "info->pfnComPropSheet = NULL\n"); + ok(!info->UserData, "info->UserData = %Ix\n", info->UserData); + ok(!info->Result, "info->Result = %Ix\n", info->Result); + break; + default: + ok(0, "unhandled info->Reason = %hd\n", info->Reason); + break; + } + + return 1; +} + +static void test_CommonPropertySheetUI(void) +{ + DWORD res; + LONG ret; + + SetLastError(0xdeadbeef); + res = 0xdeadbeef; + ret = CommonPropertySheetUIW(0, NULL, 0, &res); + ok(ret == ERR_CPSUI_GETLASTERROR, "ret = %ld\n", ret); + ok(res == 0xdeadbeef, "res = %lx\n", res); + ok(!GetLastError(), "CommonPropertySheetUIW error %ld\n", GetLastError()); + + res = 0xdeadbeef; + ret = CommonPropertySheetUIW((HWND)0x4321, propsheetui_callback, 0, &res); + ok(ret == ERR_CPSUI_NO_PROPSHEETPAGE, "CommonPropertySheetUIW returned %ld\n", ret); + ok(!res, "res = %lx\n", res); + + res = 0xdeadbeef; + ret = CommonPropertySheetUIW((HWND)0x4321, propsheetui_callback, ADD_PAGES, &res); + ok(ret == CPSUI_OK, "CommonPropertySheetUIW returned %ld\n", ret); + ok(!res, "res = %lx\n", res); +} + +START_TEST(compstui) +{ + test_CommonPropertySheetUI(); +} diff --git a/dlls/compstui/tests/rsrc.rc b/dlls/compstui/tests/rsrc.rc new file mode 100644 index 00000000000..141fe606a3c --- /dev/null +++ b/dlls/compstui/tests/rsrc.rc @@ -0,0 +1,28 @@ +/* + * Copyright 2022 Piotr Caban + * + * 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 "windef.h" +#include "winuser.h" + +PROP_PAGE1 DIALOG 0, 0, 120, 60 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Page1" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Test", 10, 10, 6, 100, 8 +}

1 0

Jacek Caban : wow64win: Fix NtUserGetClipboardData thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: c2accdb16549b705f0e75ae70dd8240f4a280c03 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2accdb16549b705f0e75ae70dd824… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:26:23 2022 +0200 wow64win: Fix NtUserGetClipboardData thunk. --- dlls/wow64win/user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 5474abd76da..0d873418536 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1809,12 +1809,14 @@ NTSTATUS WINAPI wow64_NtUserGetClipboardData( UINT *args ) params.data = UlongToPtr( params32->data ); params.size = params32->size; + params.data_size = params32->data_size; + params.data_only = params32->data_only; ret = NtUserGetClipboardData( format, &params ); + params32->size = params.size; params32->data_size = params.data_size; params32->seqno = params.seqno; - params32->data_only = params.data_only; return HandleToUlong( ret ); }

1 0

Jacek Caban : wow64win: Fix returning strings in NtUserGetIconInfo thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: bb9bede0e5e0c87347e9c5a79a2cc6d7cbd50179 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb9bede0e5e0c87347e9c5a79a2cc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:28:37 2022 +0200 wow64win: Fix returning strings in NtUserGetIconInfo thunk. --- dlls/wow64win/user.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 0d873418536..bbe3e37a24d 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1981,8 +1981,16 @@ NTSTATUS WINAPI wow64_NtUserGetIconInfo( UINT *args ) info32->yHotspot = info.yHotspot; info32->hbmMask = HandleToUlong( info.hbmMask ); info32->hbmColor = HandleToUlong( info.hbmColor ); - if (module32) module32->Length = module.Length; - if (res_name32) res_name32->Length = res_name.Length; + if (module32) + { + module32->Buffer = PtrToUlong( module.Buffer ); + module32->Length = module.Length; + } + if (res_name32) + { + res_name32->Buffer = PtrToUlong( res_name.Buffer ); + res_name32->Length = res_name.Length; + } return TRUE; }

1 0

Jacek Caban : wow64win: Fix NtUserGetMenuBarInfo thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 7bc4ca5bef18e3a209e23f7279018502da5946d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bc4ca5bef18e3a209e23f72790185… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:37:19 2022 +0200 wow64win: Fix NtUserGetMenuBarInfo thunk. --- dlls/wow64win/user.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index bbe3e37a24d..d4b9aac4fb6 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2091,12 +2091,13 @@ NTSTATUS WINAPI wow64_NtUserGetMenuBarInfo( UINT *args ) } info.cbSize = sizeof(info); - info.rcBar = info32->rcBar; - info.hMenu = UlongToHandle( info32->hMenu ); - info.hwndMenu = UlongToHandle( info32->hwndMenu ); - info.fBarFocused = info32->fBarFocused; - info.fFocused = info32->fFocused; - return NtUserGetMenuBarInfo( hwnd, id, item, &info ); + if (!NtUserGetMenuBarInfo( hwnd, id, item, &info )) return FALSE; + info32->rcBar = info.rcBar; + info32->hMenu = HandleToUlong( info.hMenu ); + info32->hwndMenu = HandleToUlong( info.hwndMenu ); + info32->fBarFocused = info.fBarFocused; + info32->fFocused = info.fFocused; + return TRUE; } NTSTATUS WINAPI wow64_NtUserGetMenuItemRect( UINT *args ) @@ -2136,7 +2137,7 @@ NTSTATUS WINAPI wow64_NtUserGetMouseMovePointsEx( UINT *args ) if (size != sizeof(MOUSEMOVEPOINT32) || count < 0 || count > ARRAYSIZE( ptin )) { - RtlSetLastWin32Error( ERROR_INVALID_PARAMETER ); + set_last_error32( ERROR_INVALID_PARAMETER ); return -1; }

1 0

Jacek Caban : wow64win: Fix handling NULL input32 in NtUserSendInput.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: ab6df6348dbba516f2e5a91c74f6cbb5e39bba67 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab6df6348dbba516f2e5a91c74f6cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:47:31 2022 +0200 wow64win: Fix handling NULL input32 in NtUserSendInput. --- dlls/wow64win/user.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index d4b9aac4fb6..1247eb86525 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3222,12 +3222,18 @@ NTSTATUS WINAPI wow64_NtUserSendInput( UINT *args ) INPUT *inputs = NULL; unsigned int i; - if (size != sizeof(*inputs32)) + if (size != sizeof(*inputs32) || !count) { set_last_error32( ERROR_INVALID_PARAMETER ); return 0; } + if (!inputs32) + { + set_last_error32( ERROR_NOACCESS ); + return 0; + } + if (count && !(inputs = Wow64AllocateTemp( count * sizeof(*inputs) ))) return 0;

1 0

Jacek Caban : wow64win: Support GCLP_MENUNAME in NtUserSetClassLongPtr thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 1300cbcb2139997eb76163ed10d8934401a7e5e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/1300cbcb2139997eb76163ed10d893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:48:27 2022 +0200 wow64win: Support GCLP_MENUNAME in NtUserSetClassLongPtr thunk. --- dlls/wow64win/user.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1247eb86525..c71042f46f4 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3297,6 +3297,16 @@ NTSTATUS WINAPI wow64_NtUserSetClassLongPtr( UINT *args ) LONG_PTR newval = get_ulong( &args ); BOOL ansi = get_ulong( &args ); + if (offset == GCLP_MENUNAME) + { + struct client_menu_name menu_name; + struct client_menu_name32 *menu_name32 = UlongToPtr( newval ); + NtUserSetClassLong( hwnd, offset, + (UINT_PTR)client_menu_name_32to64( &menu_name, menu_name32 ), ansi ); + client_menu_name_64to32( &menu_name, menu_name32 ); + return 0; + } + return NtUserSetClassLongPtr( hwnd, offset, newval, ansi ); }

1 0

Jacek Caban : wow64win: Fix NtUserThunkedMenuItemInfo thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: bbc14c9a11ccdaa5671b35ec06d5186d324b8c33 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbc14c9a11ccdaa5671b35ec06d518… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:50:44 2022 +0200 wow64win: Fix NtUserThunkedMenuItemInfo thunk. --- dlls/wow64win/user.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c71042f46f4..13d1d31a4a5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3845,6 +3845,7 @@ NTSTATUS WINAPI wow64_NtUserThunkedMenuItemInfo( UINT *args ) UNICODE_STRING32 *str32 = get_ptr( &args ); MENUITEMINFOW info = { sizeof(info) }, *info_ptr; UNICODE_STRING str; + UINT ret; if (info32) { @@ -3858,19 +3859,58 @@ NTSTATUS WINAPI wow64_NtUserThunkedMenuItemInfo( UINT *args ) info.fState = info32->fState; info.wID = info32->wID; info.hSubMenu = UlongToHandle( info32->hSubMenu ); - info.hbmpChecked = UlongToHandle( info32->hbmpUnchecked ); + info.hbmpChecked = UlongToHandle( info32->hbmpChecked ); + info.hbmpUnchecked = UlongToHandle( info32->hbmpUnchecked ); info.dwItemData = info32->dwItemData; info.dwTypeData = UlongToPtr( info32->dwTypeData ); info.cch = info32->cch; info.hbmpItem = UlongToHandle( info32->hbmpItem ); break; + case NtUserCheckMenuRadioItem: + info.cch = info32->cch; + break; + case NtUserGetMenuItemInfoA: + case NtUserGetMenuItemInfoW: + info.dwTypeData = UlongToPtr( info32->dwTypeData ); + info.cch = info32->cch; + break; } info_ptr = &info; } else info_ptr = NULL; - return NtUserThunkedMenuItemInfo( handle, pos, flags, method, info_ptr, - unicode_str_32to64( &str, str32 )); + ret = NtUserThunkedMenuItemInfo( handle, pos, flags, method, info_ptr, + unicode_str_32to64( &str, str32 )); + + if (info_ptr) + { + switch (method) + { + case NtUserGetMenuItemInfoA: + case NtUserGetMenuItemInfoW: + if (info.fMask & (MIIM_TYPE | MIIM_STRING | MIIM_FTYPE)) + info32->fType = info.fType; + if (info.fMask & (MIIM_TYPE | MIIM_BITMAP)) + info32->hbmpItem = HandleToUlong( info.hbmpItem ); + if (info.fMask & (MIIM_TYPE | MIIM_STRING)) + { + info32->dwTypeData = (UINT_PTR)info.dwTypeData; + info32->cch = info.cch; + } + if (info.fMask & MIIM_STATE) info32->fState = info.fState; + if (info.fMask & MIIM_ID) info32->wID = info.wID; + info32->hSubMenu = HandleToUlong( info.hSubMenu ); + if (info.fMask & MIIM_CHECKMARKS) + { + info32->hbmpChecked = HandleToUlong( info.hbmpChecked ); + info32->hbmpUnchecked = HandleToUlong( info.hbmpUnchecked ); + } + if (info.fMask & MIIM_DATA) info32->dwItemData = info.dwItemData; + break; + } + } + + return ret; } NTSTATUS WINAPI wow64_NtUserToUnicodeEx( UINT *args )

1 0

Jacek Caban : wow64win: Fix output handling in NtUserTrackMouseEvent thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 35cf1fde3c1f9a9b8dc0a3a65b2d6c3f5085b2ba URL: https://gitlab.winehq.org/wine/wine/-/commit/35cf1fde3c1f9a9b8dc0a3a65b2d6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 13:51:49 2022 +0200 wow64win: Fix output handling in NtUserTrackMouseEvent thunk. --- dlls/wow64win/user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 13d1d31a4a5..c8b799881b2 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3936,6 +3936,7 @@ NTSTATUS WINAPI wow64_NtUserTrackMouseEvent( UINT *args ) DWORD dwHoverTime; } *info32 = get_ptr( &args ); TRACKMOUSEEVENT info; + BOOL ret; if (info32->cbSize != sizeof(*info32)) { @@ -3947,7 +3948,11 @@ NTSTATUS WINAPI wow64_NtUserTrackMouseEvent( UINT *args ) info.dwFlags = info32->dwFlags; info.hwndTrack = UlongToHandle( info32->hwndTrack ); info.dwHoverTime = info32->dwHoverTime; - return NtUserTrackMouseEvent( &info ); + ret = NtUserTrackMouseEvent( &info ); + info32->dwFlags = info.dwFlags; + info32->hwndTrack = HandleToUlong( info.hwndTrack ); + info32->dwHoverTime = info.dwHoverTime; + return ret; } NTSTATUS WINAPI wow64_NtUserTrackPopupMenuEx( UINT *args )

1 0

Jacek Caban : wow64win: Use in-place conversion in NtUserDrawText thunk.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 44b706f364b1f013c53e9638428cb675f989ecde URL: https://gitlab.winehq.org/wine/wine/-/commit/44b706f364b1f013c53e9638428cb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 14:46:05 2022 +0200 wow64win: Use in-place conversion in NtUserDrawText thunk. --- dlls/wow64win/user.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c8b799881b2..54079700340 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -824,22 +824,19 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) struct draw_text_params *params = arg; struct draw_text_params32 *params32; RECT *rect_ptr = params->ret_rect; - ULONG ret_len, len; + ULONG ret_len; void *ret_ptr; NTSTATUS ret; - len = (size - FIELD_OFFSET( struct draw_text_params, str )) / sizeof(WCHAR); - if (!(params32 = Wow64AllocateTemp( FIELD_OFFSET( struct draw_text_params32, str[len] )))) - return 0; - - params32->hdc = HandleToUlong( params->hdc ); - params32->count = params->count; - params32->rect = params->rect; - params32->ret_rect = 0; + params32 = (struct draw_text_params32 *)(params + 1) - 1; params32->flags = params->flags; - if (len) memcpy( params32->str, params->str, len * sizeof(WCHAR) ); + params32->ret_rect = 0; + params32->rect = params->rect; + params32->count = params->count; + params32->hdc = HandleToUlong( params->hdc ); - ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params, size, &ret_ptr, &ret_len ); + ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32, + size - sizeof(*params) + sizeof(*params32), &ret_ptr, &ret_len ); if (ret_len == sizeof(RECT) && rect_ptr) { *rect_ptr = *(const RECT *)ret_ptr;

1 0

Jacek Caban : wow64win: Use LongToHandle for user handles conversion.
by Alexandre Julliard 17 Aug '22

17 Aug '22

Module: wine Branch: master Commit: 4a3c7e2758ac10b7947e859015f2a755d25fd7fe URL: https://gitlab.winehq.org/wine/wine/-/commit/4a3c7e2758ac10b7947e859015f2a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 17 14:50:50 2022 +0200 wow64win: Use LongToHandle for user handles conversion. --- dlls/wow64win/user.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 54079700340..38024f50548 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -332,7 +332,7 @@ static MSG *msg_32to64( MSG *msg, const MSG32 *msg32 ) { if (!msg32) return NULL; - msg->hwnd = UlongToHandle( msg32->hwnd ); + msg->hwnd = LongToHandle( msg32->hwnd ); msg->message = msg32->message; msg->wParam = msg32->wParam; msg->lParam = msg32->lParam; @@ -1216,7 +1216,7 @@ NTSTATUS WINAPI wow64_NtUserCallHwndParam( UINT *args ) } *params32 = UlongToPtr( param ); struct map_window_points_params params; - params.hwnd_to = UlongToHandle( params32->hwnd_to ); + params.hwnd_to = LongToHandle( params32->hwnd_to ); params.points = UlongToPtr( params32->points ); params.count = params32->count; return NtUserCallHwndParam( hwnd, (UINT_PTR)&params, code ); @@ -1701,7 +1701,7 @@ NTSTATUS WINAPI wow64_NtUserFlashWindowEx( UINT *args ) } info.cbSize = sizeof(info); - info.hwnd = UlongToHandle( info32->hwnd ); + info.hwnd = LongToHandle( info32->hwnd ); info.dwFlags = info32->dwFlags; info.uCount = info32->uCount; info.dwTimeout = info32->dwTimeout; @@ -2399,13 +2399,13 @@ NTSTATUS WINAPI wow64_NtUserRegisterClassExWOW( UINT *args ) wc.lpfnWndProc = UlongToPtr( wc32->lpfnWndProc ); wc.cbClsExtra = wc32->cbClsExtra; wc.cbWndExtra = wc32->cbWndExtra; - wc.hInstance = UlongToHandle( wc32->hInstance ); - wc.hIcon = UlongToHandle( wc32->hIcon ); - wc.hCursor = UlongToHandle( wc32->hCursor ); + wc.hInstance = UlongToPtr( wc32->hInstance ); + wc.hIcon = LongToHandle( wc32->hIcon ); + wc.hCursor = LongToHandle( wc32->hCursor ); wc.hbrBackground = UlongToHandle( wc32->hbrBackground ); wc.lpszMenuName = UlongToPtr( wc32->lpszMenuName ); wc.lpszClassName = UlongToPtr( wc32->lpszClassName ); - wc.hIconSm = UlongToHandle( wc32->hIconSm ); + wc.hIconSm = LongToHandle( wc32->hIconSm ); return NtUserRegisterClassExWOW( &wc, unicode_str_32to64( &name, name32 ), @@ -3022,7 +3022,7 @@ NTSTATUS WINAPI wow64_NtUserMsgWaitForMultipleObjectsEx( UINT *args ) set_last_error32( ERROR_INVALID_PARAMETER ); return WAIT_FAILED; } - for (i = 0; i < count; i++) handles[i] = UlongToHandle( handles32[i] ); + for (i = 0; i < count; i++) handles[i] = LongToHandle( handles32[i] ); return NtUserMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); } @@ -3855,7 +3855,7 @@ NTSTATUS WINAPI wow64_NtUserThunkedMenuItemInfo( UINT *args ) info.fType = info32->fType; info.fState = info32->fState; info.wID = info32->wID; - info.hSubMenu = UlongToHandle( info32->hSubMenu ); + info.hSubMenu = LongToHandle( info32->hSubMenu ); info.hbmpChecked = UlongToHandle( info32->hbmpChecked ); info.hbmpUnchecked = UlongToHandle( info32->hbmpUnchecked ); info.dwItemData = info32->dwItemData; @@ -3943,7 +3943,7 @@ NTSTATUS WINAPI wow64_NtUserTrackMouseEvent( UINT *args ) info.cbSize = sizeof(info); info.dwFlags = info32->dwFlags; - info.hwndTrack = UlongToHandle( info32->hwndTrack ); + info.hwndTrack = LongToHandle( info32->hwndTrack ); info.dwHoverTime = info32->dwHoverTime; ret = NtUserTrackMouseEvent( &info ); info32->dwFlags = info.dwFlags;

1 0