- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: 59485f00c917061c097c1805d7fa7f61c380c749 URL: https://gitlab.winehq.org/wine/wine/-/commit/59485f00c917061c097c1805d7fa7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 15:06:15 2023 +0100 ntdll: Remove DECLSPEC_HIDDEN usage. --- dlls/ntdll/ntdll_misc.h | 66 ++++---- dlls/ntdll/relay.c | 36 ++--- dlls/ntdll/resource.c | 4 +- dlls/ntdll/signal_i386.c | 8 +- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/unix/signal_arm.c | 6 +- dlls/ntdll/unix/signal_arm64.c | 8 +- dlls/ntdll/unix/signal_i386.c | 14 +- dlls/ntdll/unix/signal_x86_64.c | 14 +- dlls/ntdll/unix/system.c | 4 +- dlls/ntdll/unix/unix_private.h | 344 ++++++++++++++++++++-------------------- dlls/ntdll/unixlib.h | 2 +- 12 files changed, 254 insertions(+), 254 deletions(-)

1 0

Paweł Ulita : user32: Add stubs for GetWindowDpiHostingBehavior and SetThreadDpiHostingBehavior.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: 09edd1391979bf41fe6c99f34488823cef0280a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/09edd1391979bf41fe6c99f3448882… Author: Paweł Ulita <pawelulita(a)fastmail.com> Date: Sun Nov 12 15:21:27 2023 +0100 user32: Add stubs for GetWindowDpiHostingBehavior and SetThreadDpiHostingBehavior. This prevents Native Instruments Kontakt 7 from crashing on start-up. --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 2 ++ dlls/user32/win.c | 10 ++++++++++ include/windef.h | 6 ++++++ include/winuser.h | 2 ++ 5 files changed, 29 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5ededfee62a..bc78c1fef88 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -746,6 +746,15 @@ DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT return ULongToHandle( prev ); } +/********************************************************************** + * SetThreadDpiHostingBehavior (USER32.@) + */ +DPI_HOSTING_BEHAVIOR WINAPI SetThreadDpiHostingBehavior( DPI_HOSTING_BEHAVIOR value ) +{ + FIXME("(%d): stub\n", value); + return DPI_HOSTING_BEHAVIOR_DEFAULT; +} + /*********************************************************************** * MonitorFromRect (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 96e6e1a7d6b..9f9f03041b4 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -410,6 +410,7 @@ @ stdcall GetWindowDC(long) NtUserGetWindowDC @ stdcall GetWindowDisplayAffinity(long ptr) @ stdcall GetWindowDpiAwarenessContext(long) +@ stdcall GetWindowDpiHostingBehavior(long) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) @ stdcall -arch=win64 GetWindowLongPtrA(long long) @@ -719,6 +720,7 @@ @ stdcall SetTaskmanWindow (long) @ stdcall SetThreadDesktop(long) NtUserSetThreadDesktop @ stdcall SetThreadDpiAwarenessContext(ptr) +@ stdcall SetThreadDpiHostingBehavior(ptr) @ stdcall SetTimer(long long long ptr) @ stdcall SetUserObjectInformationA(long long ptr long) @ stdcall SetUserObjectInformationW(long long ptr long) NtUserSetObjectInformation diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6459ddf9f28..b8c04047333 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -616,6 +616,16 @@ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) } +/*********************************************************************** + * GetWindowDpiHostingBehavior (USER32.@) + */ +DPI_HOSTING_BEHAVIOR WINAPI GetWindowDpiHostingBehavior( HWND hwnd ) +{ + FIXME("(%p): stub\n", hwnd); + return DPI_HOSTING_BEHAVIOR_DEFAULT; +} + + static LONG_PTR get_window_long_ptr( HWND hwnd, int offset, LONG_PTR ret, BOOL ansi ) { if (offset == DWLP_DLGPROC && NtUserGetDialogInfo( hwnd )) diff --git a/include/windef.h b/include/windef.h index b22e15c4dbf..78e4f56052c 100644 --- a/include/windef.h +++ b/include/windef.h @@ -439,4 +439,10 @@ typedef enum DPI_AWARENESS } #endif +typedef enum { + DPI_HOSTING_BEHAVIOR_INVALID = -1, + DPI_HOSTING_BEHAVIOR_DEFAULT = 0, + DPI_HOSTING_BEHAVIOR_MIXED = 1 +} DPI_HOSTING_BEHAVIOR; + #endif /* _WINDEF_ */ diff --git a/include/winuser.h b/include/winuser.h index 73e7919aaea..ee0f05e1cb8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4296,6 +4296,7 @@ WINUSERAPI DWORD WINAPI GetWindowContextHelpId(HWND); WINUSERAPI HDC WINAPI GetWindowDC(HWND); WINUSERAPI BOOL WINAPI GetWindowDisplayAffinity(HWND,DWORD*); WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext(HWND); +WINUSERAPI DPI_HOSTING_BEHAVIOR WINAPI GetWindowDpiHostingBehavior(HWND); WINUSERAPI BOOL WINAPI GetWindowFeedbackSetting(HWND,FEEDBACK_TYPE,DWORD,UINT32*,void*); WINUSERAPI BOOL WINAPI GetWindowInfo(HWND, PWINDOWINFO); WINUSERAPI LONG WINAPI GetWindowLongA(HWND,INT); @@ -4608,6 +4609,7 @@ WINUSERAPI BOOL WINAPI SetSystemMenu(HWND,HMENU); WINUSERAPI UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,void*); WINUSERAPI BOOL WINAPI SetThreadDesktop(HDESK); WINUSERAPI DPI_AWARENESS_CONTEXT WINAPI SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT); +WINUSERAPI DPI_HOSTING_BEHAVIOR WINAPI SetThreadDpiHostingBehavior(DPI_HOSTING_BEHAVIOR); WINUSERAPI UINT_PTR WINAPI SetTimer(HWND,UINT_PTR,UINT,TIMERPROC); WINUSERAPI BOOL WINAPI SetUserObjectInformationA(HANDLE,INT,LPVOID,DWORD); WINUSERAPI BOOL WINAPI SetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD);

1 0

Hans Leidekker : wldp: Improve the WldpGetLockdownPolicy() stub.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: c090bdbe0ae300177afb2fda2a6c3f735fd127f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c090bdbe0ae300177afb2fda2a6c3f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 15 12:22:27 2023 +0100 wldp: Improve the WldpGetLockdownPolicy() stub. --- configure | 1 + configure.ac | 1 + dlls/wldp/tests/Makefile.in | 4 +++ dlls/wldp/tests/wldp.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wldp/wldp.c | 5 +-- include/wldp.h | 9 +++++ 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e14a35b5266..2ffbfd8520c 100755 --- a/configure +++ b/configure @@ -22205,6 +22205,7 @@ wine_fn_config_makefile dlls/wlanui enable_wlanui wine_fn_config_makefile dlls/wldap32 enable_wldap32 wine_fn_config_makefile dlls/wldap32/tests enable_tests wine_fn_config_makefile dlls/wldp enable_wldp +wine_fn_config_makefile dlls/wldp/tests enable_tests wine_fn_config_makefile dlls/wmasf enable_wmasf wine_fn_config_makefile dlls/wmi enable_wmi wine_fn_config_makefile dlls/wmiutils enable_wmiutils diff --git a/configure.ac b/configure.ac index 154e0ee06aa..aba623ee6e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3247,6 +3247,7 @@ WINE_CONFIG_MAKEFILE(dlls/wlanui) WINE_CONFIG_MAKEFILE(dlls/wldap32) WINE_CONFIG_MAKEFILE(dlls/wldap32/tests) WINE_CONFIG_MAKEFILE(dlls/wldp) +WINE_CONFIG_MAKEFILE(dlls/wldp/tests) WINE_CONFIG_MAKEFILE(dlls/wmasf) WINE_CONFIG_MAKEFILE(dlls/wmi) WINE_CONFIG_MAKEFILE(dlls/wmiutils) diff --git a/dlls/wldp/tests/Makefile.in b/dlls/wldp/tests/Makefile.in new file mode 100644 index 00000000000..3271c17dad2 --- /dev/null +++ b/dlls/wldp/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wldp.dll + +SOURCES = \ + wldp.c diff --git a/dlls/wldp/tests/wldp.c b/dlls/wldp/tests/wldp.c new file mode 100644 index 00000000000..4a41f1e9407 --- /dev/null +++ b/dlls/wldp/tests/wldp.c @@ -0,0 +1,82 @@ +/* + * Copyright 2023 Hans Leidekker 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 "windef.h" +#include "winbase.h" +#include "wldp.h" + +#include "wine/test.h" + +static HRESULT (WINAPI *pWldpGetLockdownPolicy)(WLDP_HOST_INFORMATION *, DWORD *, DWORD); +static HRESULT (WINAPI *pWldpQueryWindowsLockdownMode)(WLDP_WINDOWS_LOCKDOWN_MODE *); + +static void test_WldpGetLockdownPolicy(void) +{ + WLDP_HOST_INFORMATION info; + DWORD state; + HRESULT hr; + + if (!pWldpGetLockdownPolicy) + { + win_skip( "WldpGetLockdownPolicy not available\n" ); + return; + } + + state = 0xdeadbeef; + hr = pWldpGetLockdownPolicy( NULL, &state, 0 ); + ok( hr == 0x10000000, "got %#lx\n", hr ); + ok( state == WLDP_LOCKDOWN_DEFINED_FLAG, "got %#lx\n", state ); + + memset( &info, 0, sizeof(info) ); + info.dwRevision = 1; + info.dwHostId = WLDP_HOST_ID_GLOBAL; + state = 0xdeadbeef; + hr = pWldpGetLockdownPolicy( &info, &state, 0 ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( state == WLDP_LOCKDOWN_DEFINED_FLAG, "got %#lx\n", state ); +} + +static void test_WldpQueryWindowsLockdownMode(void) +{ + WLDP_WINDOWS_LOCKDOWN_MODE mode; + HRESULT hr; + + if (!pWldpQueryWindowsLockdownMode) + { + win_skip( "WldpQueryWindowsLockdownMode not available\n" ); + return; + } + + mode = 0xdeadbeef; + hr = pWldpQueryWindowsLockdownMode( &mode ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( mode == WLDP_WINDOWS_LOCKDOWN_MODE_UNLOCKED, "got %u\n", mode ); +} + +START_TEST(wldp) +{ + HMODULE hwldp = LoadLibraryW( L"wldp" ); + + pWldpGetLockdownPolicy = (void *)GetProcAddress( hwldp, "WldpGetLockdownPolicy" ); + pWldpQueryWindowsLockdownMode = (void *)GetProcAddress( hwldp, "WldpQueryWindowsLockdownMode" ); + + test_WldpGetLockdownPolicy(); + test_WldpQueryWindowsLockdownMode(); +} diff --git a/dlls/wldp/wldp.c b/dlls/wldp/wldp.c index 0c2fd0c4b70..25c85c68304 100644 --- a/dlls/wldp/wldp.c +++ b/dlls/wldp/wldp.c @@ -44,9 +44,10 @@ HRESULT WINAPI WldpIsDynamicCodePolicyEnabled(BOOL *is_enabled) */ HRESULT WINAPI WldpGetLockdownPolicy(WLDP_HOST_INFORMATION *info, DWORD *state, DWORD flags) { - FIXME("%p %p %lu\n", info, state, flags); + FIXME("%p %p %lx\n", info, state, flags); - *state = 0; + *state = WLDP_LOCKDOWN_DEFINED_FLAG; + if (!info) return HRESULT_FROM_NT(0); return S_OK; } diff --git a/include/wldp.h b/include/wldp.h index 93f246fffa4..262e917b5bc 100644 --- a/include/wldp.h +++ b/include/wldp.h @@ -19,6 +19,14 @@ #ifndef WLDP_H #define WLDP_H +#define WLDP_LOCKDOWN_UNDEFINED 0x00000000 +#define WLDP_LOCKDOWN_DEFINED_FLAG 0x80000000 +#define WLDP_LOCKDOWN_CONFIG_CI_FLAG 0x00000001 +#define WLDP_LOCKDOWN_CONFIG_CI_AUDIT_FLAG 0x00000002 +#define WLDP_LOCKDOWN_UMCIENFORCE_FLAG 0x00000004 +#define WLDP_LOCKDOWN_AUDIT_FLAG 0x00000008 +#define WLDP_LOCKDOWN_EXCLUSION_FLAG 0x00000010 + typedef enum WLDP_HOST_ID { WLDP_HOST_ID_UNKNOWN, @@ -50,5 +58,6 @@ typedef struct WLDP_HOST_INFORMATION HRESULT WINAPI WldpGetLockdownPolicy(WLDP_HOST_INFORMATION*,DWORD*,DWORD); HRESULT WINAPI WldpIsDynamicCodePolicyEnabled(BOOL*); +HRESULT WINAPI WldpQueryWindowsLockdownMode(WLDP_WINDOWS_LOCKDOWN_MODE*); #endif

1 0

Dmitry Timoshkov : user32/tests: Add some tests for font charset returned by SPI_GETICONTITLELOGFONT and SPI_GETNONCLIENTMETRICS.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: f4fd21e3fe53f66e9fc4fb2d8e1c584dc10ce760 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4fd21e3fe53f66e9fc4fb2d8e1c58… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 17 19:10:44 2022 +0300 user32/tests: Add some tests for font charset returned by SPI_GETICONTITLELOGFONT and SPI_GETNONCLIENTMETRICS. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/sysparams.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 12cbf630319..a6bdf73dd34 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -4136,6 +4136,31 @@ static void test_GetAutoRotationState(void) ok(ret, "Expected GetAutoRotationState to succeed, error %ld\n", GetLastError()); } +static void test_LOGFONT_charset(void) +{ + CHARSETINFO csi; + LOGFONTA lf; + NONCLIENTMETRICSA ncm; + BOOL ret; + + ret = TranslateCharsetInfo(ULongToPtr(GetACP()), &csi, TCI_SRCCODEPAGE); + ok(ret, "TranslateCharsetInfo(%d) error %lu\n", GetACP(), GetLastError()); + + GetObjectA(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); + ok(lf.lfCharSet == csi.ciCharset, "got %d, expected %d\n", lf.lfCharSet, csi.ciCharset); + + ret = SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, FALSE); + ok(ret, "SystemParametersInfoW error %lu\n", GetLastError()); + todo_wine + ok(lf.lfCharSet == DEFAULT_CHARSET, "got %d\n", lf.lfCharSet); + + ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth); + ret = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + ok(ret, "SystemParametersInfoW error %lu\n", GetLastError()); + todo_wine + ok(ncm.lfCaptionFont.lfCharSet == DEFAULT_CHARSET, "got %d\n", ncm.lfCaptionFont.lfCharSet); +} + START_TEST(sysparams) { int argc; @@ -4183,6 +4208,8 @@ START_TEST(sysparams) strict=(argc >= 3 && strcmp(argv[2],"strict")==0); trace("strict=%d\n",strict); + test_LOGFONT_charset(); + trace("testing GetSystemMetrics with your current desktop settings\n"); test_GetSystemMetrics( ); test_metrics_for_dpi( 192 );

1 0

Alexandre Julliard : ntdll: Redirect PE function pointers through the ARM64EC redirection map.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: 406016536703f084b950b62f0dae714c1c11bb53 URL: https://gitlab.winehq.org/wine/wine/-/commit/406016536703f084b950b62f0dae71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 15:00:29 2023 +0100 ntdll: Redirect PE function pointers through the ARM64EC redirection map. --- dlls/ntdll/unix/loader.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 8 ++++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b7a18f94950..5b6098df3bc 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1819,6 +1819,55 @@ static void load_ntdll_wow64_functions( HMODULE module ) } +/*********************************************************************** + * redirect_arm64ec_ptr + * + * Redirect a function pointer through the arm64ec redirection table. + */ +static void *redirect_arm64ec_ptr( void *module, void *ptr, + const IMAGE_ARM64EC_REDIRECTION_ENTRY *map, ULONG map_count ) +{ + int min = 0, max = map_count - 1; + ULONG_PTR rva = (char *)ptr - (char *)module; + + while (min <= max) + { + int pos = (min + max) / 2; + if (map[pos].Source == rva) return get_rva( module, map[pos].Destination ); + if (map[pos].Source < rva) min = pos + 1; + else max = pos - 1; + } + return ptr; +} + + +/*********************************************************************** + * redirect_ntdll_functions + * + * Redirect ntdll functions on arm64ec. + */ +static void redirect_ntdll_functions( HMODULE module ) +{ + const IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; + const IMAGE_ARM64EC_METADATA *metadata; + const IMAGE_ARM64EC_REDIRECTION_ENTRY *map; + + if (!(loadcfg = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, NULL ))) return; + if (!(metadata = (void *)loadcfg->CHPEMetadataPointer)) return; + if (!(map = get_rva( module, metadata->RedirectionMetadata ))) return; +#define REDIRECT(name) \ + p##name = redirect_arm64ec_ptr( module, p##name, map, metadata->RedirectionMetadataCount ) + REDIRECT( DbgUiRemoteBreakin ); + REDIRECT( KiRaiseUserExceptionDispatcher ); + REDIRECT( KiUserExceptionDispatcher ); + REDIRECT( KiUserApcDispatcher ); + REDIRECT( KiUserCallbackDispatcher ); + REDIRECT( LdrInitializeThunk ); + REDIRECT( RtlUserThreadStart ); +#undef REDIRECT +} + + /*********************************************************************** * load_ntdll */ @@ -1851,6 +1900,7 @@ static void load_ntdll(void) if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); + if (is_arm64ec()) redirect_ntdll_functions( module ); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d9d830a7462..f15efa45d14 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -64,6 +64,7 @@ static inline TEB64 *NtCurrentTeb64(void) { return (TEB64 *)NtCurrentTeb()->GdiB extern WOW_PEB *wow_peb DECLSPEC_HIDDEN; extern ULONG_PTR user_space_wow_limit DECLSPEC_HIDDEN; +extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; static inline WOW_TEB *get_wow_teb( TEB *teb ) { @@ -81,6 +82,12 @@ static inline BOOL is_old_wow64(void) return !is_win64 && wow_peb; } +static inline BOOL is_arm64ec(void) +{ + return (current_machine == IMAGE_FILE_MACHINE_ARM64 && + main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64); +} + /* thread private data, stored in NtCurrentTeb()->GdiTebBatch */ struct ntdll_thread_data { @@ -152,7 +159,6 @@ extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; extern BOOL is_prefix_bootstrap DECLSPEC_HIDDEN; -extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN; extern char **main_envp DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Set function pointers in the ARM64EC metadata on dll load.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: e4c9ec075b788148951c18f34225091969c5a957 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4c9ec075b788148951c18f3422509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 13:09:07 2023 +0100 ntdll: Set function pointers in the ARM64EC metadata on dll load. --- dlls/ntdll/loader.c | 96 +++++++++++++++++++++++++++++++++++++++---------- dlls/ntdll/ntdll_misc.h | 13 +++++++ 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 93edc237405..89756c57433 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -241,6 +241,52 @@ static void module_push_unload_trace( const WINE_MODREF *wm ) unload_trace_ptr = unload_traces; } +#ifdef __arm64ec__ + +static void update_hybrid_metadata( void *module, IMAGE_NT_HEADERS *nt, + const IMAGE_ARM64EC_METADATA *metadata ) +{ + DWORD i, protect_old; + const IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); + + if (metadata->Version != 1) + { + ERR( "unknown version %lu\n", metadata->Version ); + return; + } + + /* assume that all pointers are in the same section */ + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) + { + if ((sec->VirtualAddress <= metadata->__os_arm64x_dispatch_call) && + (sec->VirtualAddress + sec->Misc.VirtualSize > metadata->__os_arm64x_dispatch_call)) + { + void *base = get_rva( module, sec->VirtualAddress ); + SIZE_T size = sec->Misc.VirtualSize; + + NtProtectVirtualMemory( NtCurrentProcess(), &base, &size, PAGE_READWRITE, &protect_old ); + +#define SET_FUNC(func,val) *(void **)get_rva( module, metadata->func ) = val + SET_FUNC( __os_arm64x_dispatch_call, __os_arm64x_check_call ); + SET_FUNC( __os_arm64x_dispatch_call_no_redirect, __os_arm64x_dispatch_call_no_redirect ); + SET_FUNC( __os_arm64x_dispatch_fptr, __os_arm64x_dispatch_fptr ); + SET_FUNC( __os_arm64x_dispatch_icall, __os_arm64x_check_icall ); + SET_FUNC( __os_arm64x_dispatch_icall_cfg, __os_arm64x_check_icall_cfg ); + SET_FUNC( __os_arm64x_dispatch_ret, __os_arm64x_dispatch_ret ); + SET_FUNC( GetX64InformationFunctionPointer, __os_arm64x_get_x64_information ); + SET_FUNC( SetX64InformationFunctionPointer, __os_arm64x_set_x64_information ); +#undef SET_FUNC + + NtProtectVirtualMemory( NtCurrentProcess(), &base, &size, protect_old, &protect_old ); + return; + } + } + ERR( "module %p no section found for %lx\n", module, metadata->__os_arm64x_dispatch_call ); +} + +#endif + /********************************************************************* * RtlGetUnloadEventTrace [NTDLL.@] */ @@ -1983,26 +2029,10 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, * Create a random security cookie for buffer overflow protection. Make * sure it does not accidentally match the default cookie value. */ -static void set_security_cookie( void *module, SIZE_T len ) +static void set_security_cookie( ULONG_PTR *cookie ) { static ULONG seed; - IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg; - ULONG loadcfg_size; - ULONG_PTR *cookie; - - loadcfg = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &loadcfg_size ); - if (!loadcfg) return; - if (loadcfg_size < offsetof(IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie) + sizeof(loadcfg->SecurityCookie)) return; - if (!loadcfg->SecurityCookie) return; - if (loadcfg->SecurityCookie < (ULONG_PTR)module || - loadcfg->SecurityCookie > (ULONG_PTR)module + len - sizeof(ULONG_PTR)) - { - WARN( "security cookie %p outside of image %p-%p\n", - (void *)loadcfg->SecurityCookie, module, (char *)module + len ); - return; - } - cookie = (ULONG_PTR *)loadcfg->SecurityCookie; TRACE( "initializing security cookie %p\n", cookie ); if (!seed) seed = NtGetTickCount() ^ GetCurrentProcessId(); @@ -2025,6 +2055,36 @@ static void set_security_cookie( void *module, SIZE_T len ) } } + +/*********************************************************************** + * update_load_config + */ +static void update_load_config( void *module ) +{ + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + IMAGE_LOAD_CONFIG_DIRECTORY *cfg; + ULONG size; + + cfg = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, &size ); + if (!cfg) return; + size = min( size, cfg->Size ); + if (size > offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, SecurityCookie ) && + cfg->SecurityCookie > (ULONG_PTR)module && + cfg->SecurityCookie < (ULONG_PTR)module + nt->OptionalHeader.SizeOfImage) + { + set_security_cookie( (ULONG_PTR *)cfg->SecurityCookie ); + } +#ifdef __arm64ec__ + if (size > offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer ) && + cfg->CHPEMetadataPointer > (ULONG_PTR)module && + cfg->CHPEMetadataPointer < (ULONG_PTR)module + nt->OptionalHeader.SizeOfImage) + { + update_hybrid_metadata( module, nt, (void *)cfg->CHPEMetadataPointer ); + } +#endif +} + + static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T len ) { char *base; @@ -2135,7 +2195,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, if (image_info->ComPlusILOnly) wm->ldr.Flags |= LDR_COR_ILONLY; wm->system = system; - set_security_cookie( *module, map_size ); + update_load_config( *module ); /* fixup imports */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8d489afda7f..d24bd0c887a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -131,4 +131,17 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) extern TEB_FLS_DATA *fls_alloc_data(void) DECLSPEC_HIDDEN; extern void heap_thread_detach(void) DECLSPEC_HIDDEN; +#ifdef __arm64ec__ + +extern void *__os_arm64x_check_call; +extern void *__os_arm64x_check_icall; +extern void *__os_arm64x_check_icall_cfg; +extern void *__os_arm64x_dispatch_call_no_redirect; +extern void *__os_arm64x_dispatch_fptr; +extern void *__os_arm64x_dispatch_ret; +extern void *__os_arm64x_get_x64_information; +extern void *__os_arm64x_set_x64_information; + +#endif + #endif

1 0

Alexandre Julliard : makefiles: Use --defines instead of --header for compatibility with older bison.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: 6eff423a8ff8d0ca0066bf60138c5112e4ce5084 URL: https://gitlab.winehq.org/wine/wine/-/commit/6eff423a8ff8d0ca0066bf60138c51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 10:42:20 2023 +0100 makefiles: Use --defines instead of --header for compatibility with older bison. Spotted by Rémi Bernon. --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index a766c820fc1..8ce575b15ca 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2685,7 +2685,7 @@ static void output_source_y( struct makefile *make, struct incl_file *source, co if (find_include_file( make, header )) { output( "%s: %s\n", obj_dir_path( make, header ), source->filename ); - output( "\t%s%s -o %s.tab.$$$$.c --header=$@ %s && rm -f %s.tab.$$$$.c\n", + output( "\t%s%s -o %s.tab.$$$$.c --defines=$@ %s && rm -f %s.tab.$$$$.c\n", cmd_prefix( "BISON" ), bison, obj_dir_path( make, obj ), source->filename, obj_dir_path( make, obj )); strarray_add( &make->clean_files, header );

1 0

Alexandre Julliard : ntdll: Implement __os_arm64x_get/set_x64_information().
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: 56409f2c79dec68a869c0b6b45a8bb85438aebb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/56409f2c79dec68a869c0b6b45a8bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 14:19:20 2023 +0100 ntdll: Implement __os_arm64x_get/set_x64_information(). --- dlls/ntdll/signal_arm64ec.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index f17cbdaf063..a71e3214aeb 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -36,6 +36,96 @@ WINE_DEFAULT_DEBUG_CHANNEL(unwind); WINE_DECLARE_DEBUG_CHANNEL(relay); +static UINT64 mxcsr_to_fpcsr( UINT mxcsr ) +{ + UINT fpcr = 0, fpsr = 0; + + if (mxcsr & 0x0001) fpsr |= 0x0001; /* invalid operation */ + if (mxcsr & 0x0002) fpsr |= 0x0080; /* denormal */ + if (mxcsr & 0x0004) fpsr |= 0x0002; /* zero-divide */ + if (mxcsr & 0x0008) fpsr |= 0x0004; /* overflow */ + if (mxcsr & 0x0010) fpsr |= 0x0008; /* underflow */ + if (mxcsr & 0x0020) fpsr |= 0x0010; /* precision */ + + if (mxcsr & 0x0040) fpcr |= 0x0001; /* denormals are zero */ + if (mxcsr & 0x0080) fpcr |= 0x0100; /* invalid operation mask */ + if (mxcsr & 0x0100) fpcr |= 0x8000; /* denormal mask */ + if (mxcsr & 0x0200) fpcr |= 0x0200; /* zero-divide mask */ + if (mxcsr & 0x0400) fpcr |= 0x0400; /* overflow mask */ + if (mxcsr & 0x0800) fpcr |= 0x0800; /* underflow mask */ + if (mxcsr & 0x1000) fpcr |= 0x1000; /* precision mask */ + if (mxcsr & 0x2000) fpcr |= 0x800000; /* round down */ + if (mxcsr & 0x4000) fpcr |= 0x400000; /* round up */ + if (mxcsr & 0x8000) fpcr |= 0x1000000; /* flush to zero */ + return fpcr | ((UINT64)fpsr << 32); +} + +static UINT fpcsr_to_mxcsr( UINT fpcr, UINT fpsr ) +{ + UINT ret = 0; + + if (fpsr & 0x0001) ret |= 0x0001; /* invalid operation */ + if (fpsr & 0x0002) ret |= 0x0004; /* zero-divide */ + if (fpsr & 0x0004) ret |= 0x0008; /* overflow */ + if (fpsr & 0x0008) ret |= 0x0010; /* underflow */ + if (fpsr & 0x0010) ret |= 0x0020; /* precision */ + if (fpsr & 0x0080) ret |= 0x0002; /* denormal */ + + if (fpcr & 0x0000001) ret |= 0x0040; /* denormals are zero */ + if (fpcr & 0x0000100) ret |= 0x0080; /* invalid operation mask */ + if (fpcr & 0x0000200) ret |= 0x0200; /* zero-divide mask */ + if (fpcr & 0x0000400) ret |= 0x0400; /* overflow mask */ + if (fpcr & 0x0000800) ret |= 0x0800; /* underflow mask */ + if (fpcr & 0x0001000) ret |= 0x1000; /* precision mask */ + if (fpcr & 0x0008000) ret |= 0x0100; /* denormal mask */ + if (fpcr & 0x0400000) ret |= 0x4000; /* round up */ + if (fpcr & 0x0800000) ret |= 0x2000; /* round down */ + if (fpcr & 0x1000000) ret |= 0x8000; /* flush to zero */ + return ret; +} + + +/*********************************************************************** + * LdrpGetX64Information + */ +static NTSTATUS WINAPI LdrpGetX64Information( ULONG type, void *output, void *extra_info ) +{ + switch (type) + { + case 0: + { + UINT64 fpcr, fpsr; + + __asm__ __volatile__( "mrs %0, fpcr; mrs %1, fpsr" : "=r" (fpcr), "=r" (fpsr) ); + *(UINT *)output = fpcsr_to_mxcsr( fpcr, fpsr ); + return STATUS_SUCCESS; + } + default: + FIXME( "not implemented type %u\n", type ); + return STATUS_INVALID_PARAMETER; + } +} + +/*********************************************************************** + * LdrpSetX64Information + */ +static NTSTATUS WINAPI LdrpSetX64Information( ULONG type, ULONG_PTR input, void *extra_info ) +{ + switch (type) + { + case 0: + { + UINT64 fpcsr = mxcsr_to_fpcsr( input ); + __asm__ __volatile__( "msr fpcr, %0; msr fpsr, %1" :: "r" (fpcsr), "r" (fpcsr >> 32) ); + return STATUS_SUCCESS; + } + default: + FIXME( "not implemented type %u\n", type ); + return STATUS_INVALID_PARAMETER; + } +} + + /******************************************************************* * KiUserExceptionDispatcher (NTDLL.@) */ @@ -313,6 +403,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3 __os_arm64x_check_call = arm64x_check_call; __os_arm64x_check_icall = arm64x_check_call; __os_arm64x_check_icall_cfg = arm64x_check_call; + __os_arm64x_get_x64_information = LdrpGetX64Information; + __os_arm64x_set_x64_information = LdrpSetX64Information; } loader_init( context, (void **)&context->Rcx );

1 0

Alexandre Julliard : ntdll: Implement __os_arm64x_check_call().
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: wine Branch: master Commit: 36036b9b60af330c50dc7cbda3d0c238937017f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/36036b9b60af330c50dc7cbda3d0c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 13:35:15 2023 +0100 ntdll: Implement __os_arm64x_check_call(). --- dlls/ntdll/signal_arm64ec.c | 103 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index be22278a252..f17cbdaf063 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -159,6 +159,102 @@ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, } +static int code_match( BYTE *code, const BYTE *seq, size_t len ) +{ + for ( ; len; len--, code++, seq++) if (*seq && *code != *seq) return 0; + return 1; +} + +void *check_call( void **target, void *exit_thunk, void *dest ) +{ + static const BYTE jmp_sequence[] = + { + 0xff, 0x25 /* jmp *xxx(%rip) */ + }; + static const BYTE fast_forward_sequence[] = + { + 0x48, 0x8b, 0xc4, /* mov %rsp,%rax */ + 0x48, 0x89, 0x58, 0x20, /* mov %rbx,0x20(%rax) */ + 0x55, /* push %rbp */ + 0x5d, /* pop %rbp */ + 0xe9 /* jmp arm_code */ + }; + static const BYTE syscall_sequence[] = + { + 0x4c, 0x8b, 0xd1, /* mov %rcx,%r10 */ + 0xb8, 0, 0, 0, 0, /* mov $xxx,%eax */ + 0xf6, 0x04, 0x25, 0x08, /* testb $0x1,0x7ffe0308 */ + 0x03, 0xfe, 0x7f, 0x01, + 0x75, 0x03, /* jne 1f */ + 0x0f, 0x05, /* syscall */ + 0xc3, /* ret */ + 0xcd, 0x2e, /* 1: int $0x2e */ + 0xc3 /* ret */ + }; + + for (;;) + { + if (dest == __wine_unix_call_dispatcher) return dest; + if (RtlIsEcCode( dest )) return dest; + if (code_match( dest, jmp_sequence, sizeof(jmp_sequence) )) + { + int *off_ptr = (int *)((char *)dest + sizeof(jmp_sequence)); + void **addr_ptr = (void **)((char *)(off_ptr + 1) + *off_ptr); + dest = *addr_ptr; + continue; + } + if (!((ULONG_PTR)dest & 15)) /* fast-forward and syscall thunks are always aligned */ + { + if (code_match( dest, fast_forward_sequence, sizeof(fast_forward_sequence) )) + { + int *off_ptr = (int *)((char *)dest + sizeof(fast_forward_sequence)); + return (char *)(off_ptr + 1) + *off_ptr; + } + if (code_match( dest, syscall_sequence, sizeof(syscall_sequence) )) + { + ULONG id = ((ULONG *)dest)[1]; + FIXME( "syscall %x at %p not implemented\n", id, dest ); + } + } + *target = dest; + return exit_thunk; + } +} + +static void __attribute__((naked)) arm64x_check_call(void) +{ + asm( "stp x29, x30, [sp,#-0xb0]!\n\t" + "mov x29, sp\n\t" + "stp x0, x1, [sp, #0x10]\n\t" + "stp x2, x3, [sp, #0x20]\n\t" + "stp x4, x5, [sp, #0x30]\n\t" + "stp x6, x7, [sp, #0x40]\n\t" + "stp x8, x9, [sp, #0x50]\n\t" + "stp x10, x15, [sp, #0x60]\n\t" + "stp d0, d1, [sp, #0x70]\n\t" + "stp d2, d3, [sp, #0x80]\n\t" + "stp d4, d5, [sp, #0x90]\n\t" + "stp d6, d7, [sp, #0xa0]\n\t" + "add x0, sp, #0x58\n\t" /* x9 = &target */ + "mov x1, x10\n\t" /* x10 = exit_thunk */ + "mov x2, x11\n\t" /* x11 = dest */ + "bl " __ASM_NAME("check_call") "\n\t" + "mov x11, x0\n\t" + "ldp x0, x1, [sp, #0x10]\n\t" + "ldp x2, x3, [sp, #0x20]\n\t" + "ldp x4, x5, [sp, #0x30]\n\t" + "ldp x6, x7, [sp, #0x40]\n\t" + "ldp x8, x9, [sp, #0x50]\n\t" + "ldp x10, x15, [sp, #0x60]\n\t" + "ldp d0, d1, [sp, #0x70]\n\t" + "ldp d2, d3, [sp, #0x80]\n\t" + "ldp d4, d5, [sp, #0x90]\n\t" + "ldp d6, d7, [sp, #0xa0]\n\t" + "ldp x29, x30, [sp], #0xb0\n\t" + "ret" ); +} + + /************************************************************************** * __chkstk (NTDLL.@) * @@ -212,6 +308,13 @@ void WINAPI RtlUserThreadStart( PRTL_THREAD_START_ROUTINE entry, void *arg ) */ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unk2, ULONG_PTR unk3, ULONG_PTR unk4 ) { + if (!__os_arm64x_check_call) + { + __os_arm64x_check_call = arm64x_check_call; + __os_arm64x_check_icall = arm64x_check_call; + __os_arm64x_check_icall_cfg = arm64x_check_call; + } + loader_init( context, (void **)&context->Rcx ); TRACE_(relay)( "\1Starting thread proc %p (arg=%p)\n", (void *)context->Rcx, (void *)context->Rdx ); NtContinue( context, TRUE );

1 0

Conor McCarthy : vkd3d: Introduce struct d3d12_pipeline_state_desc for graphics pipelines.
by Alexandre Julliard Nov. 15, 2023

Nov. 15, 2023

Module: vkd3d Branch: master Commit: 39afbb8e323030adbcc7287cc6ea67fe5f57ba48 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/39afbb8e323030adbcc7287cc6ea6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Nov 14 12:49:17 2023 +1000 vkd3d: Introduce struct d3d12_pipeline_state_desc for graphics pipelines. A generic container for both compute and graphics pipeline descriptions to facilitate reading the description from a stream. --- libs/vkd3d/state.c | 130 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 25 +++++++++ 2 files changed, 105 insertions(+), 50 deletions(-)

1 0