wine-commits March 2024

wine-commits@winehq.org

1 participants
775 discussions

Brendan Shanks : ntdll: Remove support for msg_accrights FD passing.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: af2c68662890927f36481c679a9ecbba8ef36a6d URL: https://gitlab.winehq.org/wine/wine/-/commit/af2c68662890927f36481c679a9ecb… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Mar 8 21:50:45 2024 -0800 ntdll: Remove support for msg_accrights FD passing. --- dlls/ntdll/unix/server.c | 44 ++++++++++++++++---------------------------- dlls/ntdll/unix/socket.c | 14 +------------- 2 files changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 88ac9551060..c1ee8e27f0c 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -872,29 +872,17 @@ void wine_server_send_fd( int fd ) struct send_fd data; struct msghdr msghdr; struct iovec vec; - int ret; - -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - msghdr.msg_accrights = (void *)&fd; - msghdr.msg_accrightslen = sizeof(fd); -#else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ char cmsg_buffer[256]; struct cmsghdr *cmsg; - msghdr.msg_control = cmsg_buffer; - msghdr.msg_controllen = sizeof(cmsg_buffer); - msghdr.msg_flags = 0; - cmsg = CMSG_FIRSTHDR( &msghdr ); - cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); - cmsg->cmsg_level = SOL_SOCKET; - cmsg->cmsg_type = SCM_RIGHTS; - *(int *)CMSG_DATA(cmsg) = fd; - msghdr.msg_controllen = cmsg->cmsg_len; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + int ret; msghdr.msg_name = NULL; msghdr.msg_namelen = 0; msghdr.msg_iov = &vec; msghdr.msg_iovlen = 1; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; vec.iov_base = (void *)&data; vec.iov_len = sizeof(data); @@ -902,6 +890,13 @@ void wine_server_send_fd( int fd ) data.tid = GetCurrentThreadId(); data.fd = fd; + cmsg = CMSG_FIRSTHDR( &msghdr ); + cmsg->cmsg_len = CMSG_LEN( sizeof(fd) ); + cmsg->cmsg_level = SOL_SOCKET; + cmsg->cmsg_type = SCM_RIGHTS; + *(int *)CMSG_DATA(cmsg) = fd; + msghdr.msg_controllen = cmsg->cmsg_len; + for (;;) { if ((ret = sendmsg( fd_socket, &msghdr, 0 )) == sizeof(data)) return; @@ -922,22 +917,17 @@ static int receive_fd( obj_handle_t *handle ) { struct iovec vec; struct msghdr msghdr; - int ret, fd = -1; - -#ifdef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS - msghdr.msg_accrights = (void *)&fd; - msghdr.msg_accrightslen = sizeof(fd); -#else /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ char cmsg_buffer[256]; - msghdr.msg_control = cmsg_buffer; - msghdr.msg_controllen = sizeof(cmsg_buffer); - msghdr.msg_flags = 0; -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ + int ret, fd = -1; msghdr.msg_name = NULL; msghdr.msg_namelen = 0; msghdr.msg_iov = &vec; msghdr.msg_iovlen = 1; + msghdr.msg_control = cmsg_buffer; + msghdr.msg_controllen = sizeof(cmsg_buffer); + msghdr.msg_flags = 0; + vec.iov_base = (void *)handle; vec.iov_len = sizeof(*handle); @@ -945,7 +935,6 @@ static int receive_fd( obj_handle_t *handle ) { if ((ret = recvmsg( fd_socket, &msghdr, MSG_CMSG_CLOEXEC )) > 0) { -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS struct cmsghdr *cmsg; for (cmsg = CMSG_FIRSTHDR( &msghdr ); cmsg; cmsg = CMSG_NXTHDR( &msghdr, cmsg )) { @@ -959,7 +948,6 @@ static int receive_fd( obj_handle_t *handle ) } #endif } -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ if (fd != -1) fcntl( fd, F_SETFD, FD_CLOEXEC ); /* in case MSG_CMSG_CLOEXEC is not supported */ return fd; } diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 4b0dca37e7d..65f30759db3 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -371,7 +371,6 @@ static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_socka } } -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS static WSACMSGHDR *fill_control_message( int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len ) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -513,14 +512,6 @@ error: control->len = 0; return 0; } -#else -static int convert_control_headers(struct msghdr *hdr, WSABUF *control) -{ - ERR( "Message control headers cannot be properly supported on this system.\n" ); - control->len = 0; - return 0; -} -#endif /* HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ struct cmsghdr_32 { @@ -721,9 +712,7 @@ static ssize_t fixup_icmp_over_dgram( struct msghdr *hdr, union unix_sockaddr *u static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *size ) { -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS char control_buffer[512]; -#endif union unix_sockaddr unix_addr; struct msghdr hdr; NTSTATUS status; @@ -737,10 +726,9 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz } hdr.msg_iov = async->iov; hdr.msg_iovlen = async->count; -#ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS hdr.msg_control = control_buffer; hdr.msg_controllen = sizeof(control_buffer); -#endif + while ((ret = virtual_locked_recvmsg( fd, &hdr, async->unix_flags )) < 0 && errno == EINTR); if (ret < 0)

1 0

Nikolay Sivov : include: Add ID2D1DeviceContext6 definition.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: f2e6fc695a1bd2672fa320b578b2dfb75d86c0d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2e6fc695a1bd2672fa320b578b2df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 01:58:31 2024 +0100 include: Add ID2D1DeviceContext6 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_3.idl | 83 +++++++++++++++++++++++++++++++++++++++++++++++-- include/d2d1effects.idl | 31 ++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 8e53f630ea4..a4868889012 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -85,6 +85,22 @@ typedef enum D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_FORCE_DWORD = 0xffffffff } D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION; +typedef enum D2D1_GAMMA1 +{ + D2D1_GAMMA1_G22 = D2D1_GAMMA_2_2, + D2D1_GAMMA1_G10 = D2D1_GAMMA_1_0, + D2D1_GAMMA1_G2084 = 2, + D2D1_GAMMA1_FORCE_DWORD = 0xffffffff +} D2D1_GAMMA1; + +typedef enum D2D1_COLOR_CONTEXT_TYPE +{ + D2D1_COLOR_CONTEXT_TYPE_ICC = 0x0, + D2D1_COLOR_CONTEXT_TYPE_SIMPLE = 0x1, + D2D1_COLOR_CONTEXT_TYPE_DXGI = 0x2, + D2D1_COLOR_CONTEXT_TYPE_FORCE_DWORD = 0xffffffff +} D2D1_COLOR_CONTEXT_TYPE; + typedef struct D2D1_INK_POINT { float x; @@ -142,6 +158,15 @@ typedef struct D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS options; } D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES; +typedef struct D2D1_SIMPLE_COLOR_PROFILE +{ + D2D1_POINT_2F redPrimary; + D2D1_POINT_2F greenPrimary; + D2D1_POINT_2F bluePrimary; + D2D1_POINT_2F whitePointXZ; + D2D1_GAMMA1 gamma; +} D2D1_SIMPLE_COLOR_PROFILE; + [ object, uuid(bae8b344-23fc-4071-8cb5-d05d6f073848), @@ -505,8 +530,62 @@ interface ID2D1DeviceContext4 : ID2D1DeviceContext3 ); } -interface ID2D1DeviceContext5; -interface ID2D1DeviceContext6; +interface ID2D1SvgDocument; + +[ + object, + uuid(1ab42875-c57f-4be9-bd85-9cd78d6f55ee), + local, +] +interface ID2D1ColorContext1 : ID2D1ColorContext +{ + D2D1_COLOR_CONTEXT_TYPE GetColorContextType(void); + DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(void); + HRESULT GetSimpleColorProfile( + [out] D2D1_SIMPLE_COLOR_PROFILE *simple_profile + ); +} + +[ + object, + uuid(7836d248-68cc-4df6-b9e8-de991bf62eb7), + local, +] +interface ID2D1DeviceContext5 : ID2D1DeviceContext4 +{ + HRESULT CreateSvgDocument( + [in] IStream *input_xml_stream, + [in] D2D1_SIZE_F viewport_size, + [out] ID2D1SvgDocument **svg_document + ); + void DrawSvgDocument( + [in] ID2D1SvgDocument *svg_document + ); + HRESULT CreateColorContextFromDxgiColorSpace( + [in] DXGI_COLOR_SPACE_TYPE color_space, + [out] ID2D1ColorContext1 **color_context + ); + HRESULT CreateColorContextFromSimpleColorProfile( + [in] const D2D1_SIMPLE_COLOR_PROFILE *simple_profile, + [out] ID2D1ColorContext1 **color_context + ); +} + +[ + object, + uuid(985f7e37-4ed0-4a19-98a3-15b0edfde306), + local, +] +interface ID2D1DeviceContext6 : ID2D1DeviceContext5 +{ + void BlendImage( + [in] ID2D1Image *image, + [in] D2D1_BLEND_MODE blend_mode, + [in] const D2D1_POINT_2F *target_offset, + [in] const D2D1_RECT_F *image_rect, + [in] D2D1_INTERPOLATION_MODE interpolation_mode + ); +} [ object, diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 00bf323ecba..32277027f88 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -120,3 +120,34 @@ typedef enum D2D1_CROP_PROP D2D1_CROP_PROP_BORDER_MODE = 0x1, D2D1_CROP_PROP_FORCE_DWORD = 0xffffffff } D2D1_CROP_PROP; + +typedef enum D2D1_BLEND_MODE +{ + D2D1_BLEND_MODE_MULTIPLY = 0x0, + D2D1_BLEND_MODE_SCREEN = 0x1, + D2D1_BLEND_MODE_DARKEN = 0x2, + D2D1_BLEND_MODE_LIGHTEN = 0x3, + D2D1_BLEND_MODE_DISSOLVE = 0x4, + D2D1_BLEND_MODE_COLOR_BURN = 0x5, + D2D1_BLEND_MODE_LINEAR_BURN = 0x6, + D2D1_BLEND_MODE_DARKER_COLOR = 0x7, + D2D1_BLEND_MODE_LIGHTER_COLOR = 0x8, + D2D1_BLEND_MODE_COLOR_DODGE = 0x9, + D2D1_BLEND_MODE_LINEAR_DODGE = 0xa, + D2D1_BLEND_MODE_OVERLAY = 0xb, + D2D1_BLEND_MODE_SOFT_LIGHT = 0xc, + D2D1_BLEND_MODE_HARD_LIGHT = 0xd, + D2D1_BLEND_MODE_VIVID_LIGHT = 0xe, + D2D1_BLEND_MODE_LINEAR_LIGHT = 0xf, + D2D1_BLEND_MODE_PIN_LIGHT = 0x10, + D2D1_BLEND_MODE_HARD_MIX = 0x11, + D2D1_BLEND_MODE_DIFFERENCE = 0x12, + D2D1_BLEND_MODE_EXCLUSION = 0x13, + D2D1_BLEND_MODE_HUE = 0x14, + D2D1_BLEND_MODE_SATURATION = 0x15, + D2D1_BLEND_MODE_COLOR = 0x16, + D2D1_BLEND_MODE_LUMINOSITY = 0x17, + D2D1_BLEND_MODE_SUBTRACT = 0x18, + D2D1_BLEND_MODE_DIVISION = 0x19, + D2D1_BLEND_MODE_FORCE_DWORD = 0xffffffff +} D2D1_BLEND_MODE;

1 0

Nikolay Sivov : include: Add ID2D1Factory7 definition.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 94f5cd1d30955e976cb2f0f8842997dd2866f60c URL: https://gitlab.winehq.org/wine/wine/-/commit/94f5cd1d30955e976cb2f0f8842997… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 11 01:12:08 2024 +0100 include: Add ID2D1Factory7 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_3.idl | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 9ca42e661e1..8e53f630ea4 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -505,6 +505,9 @@ interface ID2D1DeviceContext4 : ID2D1DeviceContext3 ); } +interface ID2D1DeviceContext5; +interface ID2D1DeviceContext6; + [ object, uuid(a44472e1-8dfb-4e60-8492-6e2861c9ca8b), @@ -524,6 +527,62 @@ interface ID2D1Device2 : ID2D1Device1 ); } +[ + object, + uuid(852f2087-802c-4037-ab60-ff2e7ee6fc01), + local, +] +interface ID2D1Device3 : ID2D1Device2 +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext3 **context + ); +} + +[ + object, + uuid(d7bdb159-5683-4a46-bc9c-72dc720b858b), + local, +] +interface ID2D1Device4 : ID2D1Device3 +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext4 **context + ); + void SetMaximumColorGlyphCacheMemory( + UINT64 size + ); + UINT64 GetMaximumColorGlyphCacheMemory(void); +} + +[ + object, + uuid(d55ba0a4-6405-4694-aef5-08ee1a4358b4), + local, +] +interface ID2D1Device5 : ID2D1Device4 +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext5 **context + ); +} + +[ + object, + uuid(7bfef914-2d75-4bad-be87-e18ddb077b6d), + local, +] +interface ID2D1Device6 : ID2D1Device5 +{ + HRESULT CreateDeviceContext( + [in] D2D1_DEVICE_CONTEXT_OPTIONS options, + [out] ID2D1DeviceContext6 **context + ); +} + [ object, uuid(0869759f-4f00-413f-b03e-2bda45404d0f), @@ -537,6 +596,58 @@ interface ID2D1Factory3 : ID2D1Factory2 ); } +[ + object, + uuid(bd4ec2d2-0662-4bee-ba8e-6f29f032e096), + local, +] +interface ID2D1Factory4 : ID2D1Factory3 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device3 **d2d_device + ); +} + +[ + object, + uuid(c4349994-838e-4b0f-8cab-44997d9eeacc), + local, +] +interface ID2D1Factory5 : ID2D1Factory4 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device4 **d2d_device + ); +} + +[ + object, + uuid(f9976f46-f642-44c1-97ca-da32ea2a2635), + local, +] +interface ID2D1Factory6 : ID2D1Factory5 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device5 **d2d_device + ); +} + +[ + object, + uuid(bdc2bdd3-b96c-4de6-bdf7-99d4745454de), + local, +] +interface ID2D1Factory7 : ID2D1Factory6 +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device6 **d2d_device + ); +} + [ object, uuid(3bab440e-417e-47df-a2e2-bc0be6a00916),

1 0

Paul Gofman : imm32: Set lengths to 0 for NULL strings in ImmSetCompositionString().
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: d71fb7229f18028a31f1b6b437e576af14787e56 URL: https://gitlab.winehq.org/wine/wine/-/commit/d71fb7229f18028a31f1b6b437e576… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 8 19:45:07 2024 -0600 imm32: Set lengths to 0 for NULL strings in ImmSetCompositionString(). --- dlls/imm32/imm.c | 6 ++++++ dlls/imm32/tests/imm32.c | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 94de6c0f6d7..8c8504a092d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2539,6 +2539,9 @@ BOOL WINAPI ImmSetCompositionStringA( return FALSE; if (!(ime = imc_select_ime( data ))) return FALSE; + if (!lpComp) dwCompLen = 0; + if (!lpRead) dwReadLen = 0; + if (!ime_is_unicode( ime )) return ime->pImeSetCompositionString( hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen ); comp_len = MultiByteToWideChar(CP_ACP, 0, lpComp, dwCompLen, NULL, 0); @@ -2596,6 +2599,9 @@ BOOL WINAPI ImmSetCompositionStringW( return FALSE; if (!(ime = imc_select_ime( data ))) return FALSE; + if (!lpComp) dwCompLen = 0; + if (!lpRead) dwReadLen = 0; + if (ime_is_unicode( ime )) return ime->pImeSetCompositionString( hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen ); comp_len = WideCharToMultiByte(CP_ACP, 0, lpComp, dwCompLen, NULL, 0, NULL, diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7131bc2f6a5..db73463ef49 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -1085,12 +1085,24 @@ static void test_SCS_SETSTR(void) DWORD prop; imc = ImmGetContext(hwnd); - ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL,0); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); if (!ret) { win_skip("Composition isn't supported\n"); ImmReleaseContext(hwnd, imc); return; } + + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 128, NULL, 128); + ok(ret, "got error %lu.\n", GetLastError()); + + alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20); + ok(!alen, "got %ld.\n", alen); + wlen = ImmGetCompositionStringW(imc, GCS_COMPSTR, wstring, 20); + ok(!wlen, "got %ld.\n", alen); + + ret = ImmSetCompositionStringW(imc, SCS_SETSTR, string, sizeof(string), NULL, 2); + ok(ret, "got error %lu.\n", GetLastError()); + msg_spy_flush_msgs(); alen = ImmGetCompositionStringA(imc, GCS_COMPSTR, cstring, 20);

1 0

Alexandre Julliard : secur32/tests: Update count for new winehq.org certificate.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 834a88fc3f4f795dc7ae45b75c6edf9fa3b5bbba URL: https://gitlab.winehq.org/wine/wine/-/commit/834a88fc3f4f795dc7ae45b75c6edf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 18:11:20 2024 +0100 secur32/tests: Update count for new winehq.org certificate. --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index c3e9314c5e8..412d3703453 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -535,7 +535,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Alexandre Julliard : ntdll: Share RtlCaptureStackBackTrace implementation across platforms.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 38fb2f41ad1347b6e35dc87f6dc358a13d8905cb URL: https://gitlab.winehq.org/wine/wine/-/commit/38fb2f41ad1347b6e35dc87f6dc358… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:55:58 2024 +0100 ntdll: Share RtlCaptureStackBackTrace implementation across platforms. --- dlls/ntdll/exception.c | 21 +++++++++++++++ dlls/ntdll/signal_arm.c | 9 ------- dlls/ntdll/signal_arm64.c | 9 ------- dlls/ntdll/signal_arm64ec.c | 10 ------- dlls/ntdll/signal_i386.c | 30 --------------------- dlls/ntdll/signal_x86_64.c | 64 -------------------------------------------- dlls/ntdll/tests/exception.c | 25 +++++++++++++++++ 7 files changed, 46 insertions(+), 122 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 75d6f39325c..ac5f403131f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -510,6 +510,27 @@ __ASM_GLOBAL_IMPORT(IsBadStringPtrA) __ASM_GLOBAL_IMPORT(IsBadStringPtrW) #endif + +/************************************************************************* + * RtlCaptureStackBackTrace (NTDLL.@) + */ +USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, void **buffer, ULONG *hash_ret ) +{ + ULONG i, ret, hash; + + TRACE( "(%lu, %lu, %p, %p)\n", skip, count, buffer, hash_ret ); + + skip++; /* skip our own frame */ + ret = RtlWalkFrameChain( buffer, count + skip, skip << 8 ); + if (hash_ret) + { + for (i = hash = 0; i < ret; i++) hash += (ULONG_PTR)buffer[i]; + *hash_ret = hash; + } + return ret; +} + + /********************************************************************** * RtlGetEnabledExtendedFeatures (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 2d75902b12f..a0c9d647a24 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -737,15 +737,6 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "bl " __ASM_NAME("NtRaiseException") "\n\t" "bl " __ASM_NAME("RtlRaiseStatus") ) -/************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) - */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) -{ - FIXME( "(%ld, %ld, %p, %p) stub!\n", skip, count, buffer, hash ); - return 0; -} - /*********************************************************************** * _setjmp (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index df588fb64c1..23c01789293 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -849,15 +849,6 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "bl " __ASM_NAME("NtRaiseException") "\n\t" "bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); -/************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) - */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) -{ - FIXME( "(%ld, %ld, %p, %p) stub!\n", skip, count, buffer, hash ); - return 0; -} - /*********************************************************************** * _setjmpex (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 02e6dc009bf..643ec3331de 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -2040,16 +2040,6 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec, } -/************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) - */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) -{ - FIXME( "not implemented\n" ); - return 0; -} - - static int code_match( BYTE *code, const BYTE *seq, size_t len ) { for ( ; len; len--, code++, seq++) if (*seq && *code != *seq) return 0; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index cade0c973c2..13e5be6af68 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -474,36 +474,6 @@ ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) } -/************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) - */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) -{ - CONTEXT context; - ULONG i; - ULONG *frame; - - RtlCaptureContext( &context ); - if (hash) *hash = 0; - frame = (ULONG *)context.Ebp; - - while (skip--) - { - if (!is_valid_frame( (ULONG_PTR)frame )) return 0; - frame = (ULONG *)*frame; - } - - for (i = 0; i < count; i++) - { - if (!is_valid_frame( (ULONG_PTR)frame )) break; - buffer[i] = (void *)frame[1]; - if (hash) *hash += frame[1]; - frame = (ULONG *)*frame; - } - return i; -} - - /*********************************************************************** * RtlUserThreadStart (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1e928cad2c9..d37cd741c09 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -988,70 +988,6 @@ ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) } -static inline ULONG hash_pointers( void **ptrs, ULONG count ) -{ - /* Based on MurmurHash2, which is in the public domain */ - static const ULONG m = 0x5bd1e995; - static const ULONG r = 24; - ULONG hash = count * sizeof(void*); - for (; count > 0; ptrs++, count--) - { - ULONG_PTR data = (ULONG_PTR)*ptrs; - ULONG k1 = (ULONG)(data & 0xffffffff), k2 = (ULONG)(data >> 32); - k1 *= m; - k1 = (k1 ^ (k1 >> r)) * m; - k2 *= m; - k2 = (k2 ^ (k2 >> r)) * m; - hash = (((hash * m) ^ k1) * m) ^ k2; - } - hash = (hash ^ (hash >> 13)) * m; - return hash ^ (hash >> 15); -} - - -/************************************************************************* - * RtlCaptureStackBackTrace (NTDLL.@) - */ -USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) -{ - UNWIND_HISTORY_TABLE table; - DISPATCHER_CONTEXT dispatch; - CONTEXT context; - NTSTATUS status; - ULONG i; - USHORT num_entries = 0; - - TRACE( "(%lu, %lu, %p, %p)\n", skip, count, buffer, hash ); - - RtlCaptureContext( &context ); - dispatch.TargetIp = 0; - dispatch.ContextRecord = &context; - dispatch.HistoryTable = &table; - if (hash) *hash = 0; - for (i = 0; i < skip + count; i++) - { - status = virtual_unwind( UNW_FLAG_NHANDLER, &dispatch, &context ); - if (status != STATUS_SUCCESS) return i; - - if (!dispatch.EstablisherFrame) break; - - if (!is_valid_frame( dispatch.EstablisherFrame )) - { - ERR( "invalid frame %p (%p-%p)\n", (void *)dispatch.EstablisherFrame, - NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); - break; - } - - if (context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; - - if (i >= skip) buffer[num_entries++] = (void *)context.Rip; - } - if (hash && num_entries > 0) *hash = hash_pointers( buffer, num_entries ); - TRACE( "captured %hu frames\n", num_entries ); - return num_entries; -} - - /*********************************************************************** * _setjmp (NTDLL.@) * _setjmpex (NTDLL.@) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5ccd1af3906..e4922aac616 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10287,6 +10287,30 @@ static void test_set_live_context(void) } #endif +static void test_backtrace(void) +{ + void *buffer[1024]; + WCHAR *p, name[MAX_PATH]; + void *module; + ULONG hash, hash_expect; + int i, count = RtlCaptureStackBackTrace( 0, 1024, buffer, &hash ); + + ok( count > 1, "got %u entries\n", count ); + for (i = hash_expect = 0; i < count; i++) hash_expect += (ULONG_PTR)buffer[i]; + ok( hash == hash_expect, "hash mismatch %lx / %lx\n", hash, hash_expect ); + RtlPcToFileHeader( buffer[0], &module ); + ok( module == GetModuleHandleA(0), "wrong module %p/%p for %p\n", + module, GetModuleHandleA(0), buffer[0]); + + if (count && !buffer[count - 1]) count--; /* win11 32-bit */ + RtlPcToFileHeader( buffer[count - 1], &module ); + GetModuleFileNameW( module, name, sizeof(name) ); + if ((p = wcsrchr( name, '\\' ))) p++; + else p = name; + ok( !wcsicmp( p, L"ntdll.dll" ), "wrong module %p %s for frame %u %p\n", + module, debugstr_w(name), count - 1, buffer[count - 1] ); +} + START_TEST(exception) { HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); @@ -10562,5 +10586,6 @@ START_TEST(exception) test_suspend_thread(); test_suspend_process(); test_unload_trace(); + test_backtrace(); VirtualFree(code_mem, 0, MEM_RELEASE); }

1 0

Alexandre Julliard : ntdll: Export RtlVirtualUnwind2 and RtlWalkFrameChain.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 2bf209bb4f91ca8ca521e0df64beda67323c2d61 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bf209bb4f91ca8ca521e0df64beda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:53:39 2024 +0100 ntdll: Export RtlVirtualUnwind2 and RtlWalkFrameChain. --- dlls/ntdll/ntdll.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2c5a69a410c..3d45b3d1e9a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1095,12 +1095,13 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=!i386 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall -arch=!i386 RtlVirtualUnwind2(long long long ptr ptr ptr ptr ptr ptr ptr ptr ptr long) @ stdcall RtlWaitOnAddress(ptr ptr long ptr) @ stdcall RtlWakeAddressAll(ptr) @ stdcall RtlWakeAddressSingle(ptr) @ stdcall RtlWakeAllConditionVariable(ptr) @ stdcall RtlWakeConditionVariable(ptr) -@ stub RtlWalkFrameChain +@ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) @ stdcall RtlWow64EnableFsRedirectionEx(long ptr)

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on ARM64EC.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 3418bf6ccd3edcc0e5614831e845dce7ce5746d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3418bf6ccd3edcc0e5614831e845dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:53:28 2024 +0100 ntdll: Implement RtlWalkFrameChain on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8acb5c767ed..02e6dc009bf 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1995,6 +1995,38 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + pc = context.Rip; + if ((context.ContextFlags & CONTEXT_UNWOUND_TO_CALL) && RtlIsEcCode( pc )) pc -= 4; + func = RtlLookupFunctionEntry( pc, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Rip) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Rsp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + } + return num_entries; +} + + /******************************************************************* * __C_specific_handler (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on ARM64.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 6184f74ef51533fd261e8bc1ddedbe80a6f8b1fa URL: https://gitlab.winehq.org/wine/wine/-/commit/6184f74ef51533fd261e8bc1ddedbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:53:17 2024 +0100 ntdll: Implement RtlWalkFrameChain on ARM64. --- dlls/ntdll/signal_arm64.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3ad0a7daa97..df588fb64c1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -641,6 +641,38 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + pc = context.Pc; + if (context.ContextFlags & CONTEXT_UNWOUND_TO_CALL) pc -= 4; + func = RtlLookupFunctionEntry( pc, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Pc) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Sp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Pc; + } + return num_entries; +} + + extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile);

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on ARM.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 3938478aab58d0ea4fa6e07c44fc5862ecd7a39f URL: https://gitlab.winehq.org/wine/wine/-/commit/3938478aab58d0ea4fa6e07c44fc58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:53:05 2024 +0100 ntdll: Implement RtlWalkFrameChain on ARM. --- dlls/ntdll/signal_arm.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b59384c986c..2d75902b12f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -571,6 +571,38 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + pc = context.Pc; + if (context.ContextFlags & CONTEXT_UNWOUND_TO_CALL) pc -= 2; + func = RtlLookupFunctionEntry( pc, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Pc) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Sp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Pc; + } + return num_entries; +} + + extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile);

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2024