September 2019 - Wine-commits

Alex Henrie : include: Add structures and constants needed for ParseNetworkString.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: c520ad0185a1069c0f2524fc2e546be5683b97d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c520ad0185a1069c0f2524fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:12 2019 -0600 include: Add structures and constants needed for ParseNetworkString. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iphlpapi.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ include/windns.h | 1 + 2 files changed, 48 insertions(+) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index f52387a..c618e73 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -26,6 +26,26 @@ extern "C" { #include <ipexport.h> #include <iptypes.h> +#define NET_STRING_IPV4_ADDRESS 0x00000001 +#define NET_STRING_IPV4_SERVICE 0x00000002 +#define NET_STRING_IPV4_NETWORK 0x00000004 +#define NET_STRING_IPV6_ADDRESS 0x00000008 +#define NET_STRING_IPV6_ADDRESS_NO_SCOPE 0x00000010 +#define NET_STRING_IPV6_SERVICE 0x00000020 +#define NET_STRING_IPV6_SERVICE_NO_SCOPE 0x00000040 +#define NET_STRING_IPV6_NETWORK 0x00000080 +#define NET_STRING_NAMED_ADDRESS 0x00000100 +#define NET_STRING_NAMED_SERVICE 0x00000200 +#define NET_STRING_IP_ADDRESS (NET_STRING_IPV4_ADDRESS|NET_STRING_IPV6_ADDRESS) +#define NET_STRING_IP_ADDRESS_NO_SCOPE (NET_STRING_IPV4_ADDRESS|NET_STRING_IPV6_ADDRESS_NO_SCOPE) +#define NET_STRING_IP_SERVICE (NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_SERVICE) +#define NET_STRING_IP_SERVICE_NO_SCOPE (NET_STRING_IPV4_SERVICE|NET_STRING_IPV6_SERVICE_NO_SCOPE) +#define NET_STRING_IP_NETWORK (NET_STRING_IPV4_NETWORK|NET_STRING_IPV6_NETWORK) +#define NET_STRING_ANY_ADDRESS (NET_STRING_NAMED_ADDRESS|NET_STRING_IP_ADDRESS) +#define NET_STRING_ANY_ADDRESS_NO_SCOPE (NET_STRING_NAMED_ADDRESS|NET_STRING_IP_ADDRESS_NO_SCOPE) +#define NET_STRING_ANY_SERVICE (NET_STRING_NAMED_SERVICE|NET_STRING_IP_SERVICE) +#define NET_STRING_ANY_SERVICE_NO_SCOPE (NET_STRING_NAMED_SERVICE|NET_STRING_IP_SERVICE_NO_SCOPE) + DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved); @@ -162,6 +182,33 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, H DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); +typedef enum NET_ADDRESS_FORMAT_ { + NET_ADDRESS_FORMAT_UNSPECIFIED, + NET_ADDRESS_DNS_NAME, + NET_ADDRESS_IPV4, + NET_ADDRESS_IPV6, +} NET_ADDRESS_FORMAT; + +#ifdef __WINE_WINDNS_H + +typedef struct NET_ADDRESS_INFO_ +{ + NET_ADDRESS_FORMAT Format; + union + { + struct + { + WCHAR Address[DNS_MAX_NAME_BUFFER_LENGTH]; + WCHAR Port[6]; + } NamedAddress; + SOCKADDR_IN Ipv4Address; + SOCKADDR_IN6 Ipv6Address; + SOCKADDR IpAddress; + } DUMMYUNIONNAME; +} NET_ADDRESS_INFO, *PNET_ADDRESS_INFO; + +#endif /* __WINE_WINDNS_H */ + #ifdef __cplusplus } #endif diff --git a/include/windns.h b/include/windns.h index d9a4b9a..9a31fac 100644 --- a/include/windns.h +++ b/include/windns.h @@ -177,6 +177,7 @@ typedef struct #define DNS_ADDRESS_STRING_LENGTH IP6_ADDRESS_STRING_LENGTH #define IP4_ADDRESS_STRING_BUFFER_LENGTH IP4_ADDRESS_STRING_LENGTH #define IP6_ADDRESS_STRING_BUFFER_LENGTH IP6_ADDRESS_STRING_LENGTH +#define DNS_MAX_NAME_BUFFER_LENGTH 256 typedef struct _IP4_ARRAY {

1 0

Alex Henrie : iphlpapi/tests: Add tests for ParseNetworkString.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: 0e53616fe294b388f4bf69f3f3a50cf1a6fdc1c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e53616fe294b388f4bf69f3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 4 23:14:13 2019 -0600 iphlpapi/tests: Add tests for ParseNetworkString. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 111 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index a2be862..d4b1100 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -39,6 +39,7 @@ #include "windef.h" #include "winbase.h" #include "ws2tcpip.h" +#include "windns.h" #include "iphlpapi.h" #include "iprtrmib.h" #include "netioapi.h" @@ -98,6 +99,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); +static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); @@ -153,6 +155,7 @@ static void loadIPHlpApi(void) pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); + pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } @@ -2271,6 +2274,113 @@ static void test_GetUdp6Table(void) } } +static void test_ParseNetworkString(void) +{ + struct + { + char str[32]; + IN_ADDR addr; + DWORD ret; + } + ipv4_address_tests[] = + { + {"1.2.3.4", {{{1, 2, 3, 4}}}}, + {"1.2.3.4a", {}, ERROR_INVALID_PARAMETER}, + {"1.2.3.0x4a", {}, ERROR_INVALID_PARAMETER}, + {"1.2.3", {}, ERROR_INVALID_PARAMETER}, + {"a1.2.3.4", {}, ERROR_INVALID_PARAMETER}, + {"0xdeadbeef", {}, ERROR_INVALID_PARAMETER}, + {"1.2.3.4:22", {}, ERROR_INVALID_PARAMETER}, + {"::1", {}, ERROR_INVALID_PARAMETER}, + {"winehq.org", {}, ERROR_INVALID_PARAMETER}, + }; + struct + { + char str[32]; + IN_ADDR addr; + DWORD port; + DWORD ret; + } + ipv4_service_tests[] = + { + {"1.2.3.4:22", {{{1, 2, 3, 4}}}, 22}, + {"winehq.org:22", {}, 0, ERROR_INVALID_PARAMETER}, + {"1.2.3.4", {}, 0, ERROR_INVALID_PARAMETER}, + {"1.2.3.4:0", {}, 0, ERROR_INVALID_PARAMETER}, + {"1.2.3.4:65536", {}, 0, ERROR_INVALID_PARAMETER}, + }; + WCHAR wstr[IP6_ADDRESS_STRING_BUFFER_LENGTH] = {'1','2','7','.','0','.','0','.','1',':','2','2',0}; + NET_ADDRESS_INFO info; + USHORT port; + BYTE prefix_len; + DWORD ret; + int i; + + if (!pParseNetworkString) + { + skip("ParseNetworkString not available\n"); + return; + } + + ret = pParseNetworkString(wstr, -1, NULL, NULL, NULL); + ok(ret == ERROR_SUCCESS, "expected success, got %d\n", ret); + + ret = pParseNetworkString(NULL, NET_STRING_IPV4_SERVICE, &info, NULL, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + for (i = 0; i < ARRAY_SIZE(ipv4_address_tests); i++) + { + MultiByteToWideChar(CP_ACP, 0, ipv4_address_tests[i].str, sizeof(ipv4_address_tests[i].str), + wstr, sizeof(wstr)); + memset(&info, 0x99, sizeof(info)); + port = 0x9999; + prefix_len = 0x99; + + ret = pParseNetworkString(wstr, NET_STRING_IPV4_ADDRESS, &info, &port, &prefix_len); + + ok(ret == ipv4_address_tests[i].ret, + "%s gave error %d\n", ipv4_address_tests[i].str, ret); + ok(info.Format == ret ? NET_ADDRESS_FORMAT_UNSPECIFIED : NET_ADDRESS_IPV4, + "%s gave format %d\n", ipv4_address_tests[i].str, info.Format); + ok(info.Ipv4Address.sin_addr.S_un.S_addr == (ret ? 0x99999999 : ipv4_address_tests[i].addr.S_un.S_addr), + "%s gave address %d.%d.%d.%d\n", ipv4_address_tests[i].str, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b1, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b2, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b3, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b4); + ok(info.Ipv4Address.sin_port == (ret ? 0x9999 : 0), + "%s gave port %d\n", ipv4_service_tests[i].str, ntohs(info.Ipv4Address.sin_port)); + ok(port == (ret ? 0x9999 : 0), + "%s gave port %d\n", ipv4_service_tests[i].str, port); + ok(prefix_len == (ret ? 0x99 : 255), + "%s gave prefix length %d\n", ipv4_service_tests[i].str, prefix_len); + } + + for (i = 0; i < ARRAY_SIZE(ipv4_service_tests); i++) + { + MultiByteToWideChar(CP_ACP, 0, ipv4_service_tests[i].str, sizeof(ipv4_service_tests[i].str), + wstr, sizeof(wstr)); + memset(&info, 0x99, sizeof(info)); + port = 0x9999; + prefix_len = 0x99; + + ret = pParseNetworkString(wstr, NET_STRING_IPV4_SERVICE, &info, &port, &prefix_len); + + ok(ret == ipv4_service_tests[i].ret, + "%s gave error %d\n", ipv4_service_tests[i].str, ret); + ok(info.Format == ret ? NET_ADDRESS_FORMAT_UNSPECIFIED : NET_ADDRESS_IPV4, + "%s gave format %d\n", ipv4_address_tests[i].str, info.Format); + ok(info.Ipv4Address.sin_addr.S_un.S_addr == (ret ? 0x99999999 : ipv4_service_tests[i].addr.S_un.S_addr), + "%s gave address %d.%d.%d.%d\n", ipv4_service_tests[i].str, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b1, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b2, + info.Ipv4Address.sin_addr.S_un.S_un_b.s_b3, info.Ipv4Address.sin_addr.S_un.S_un_b.s_b4); + ok(ntohs(info.Ipv4Address.sin_port) == (ret ? 0x9999 : ipv4_service_tests[i].port), + "%s gave port %d\n", ipv4_service_tests[i].str, ntohs(info.Ipv4Address.sin_port)); + ok(port == (ret ? 0x9999 : ipv4_service_tests[i].port), + "%s gave port %d\n", ipv4_service_tests[i].str, port); + ok(prefix_len == (ret ? 0x99 : 255), + "%s gave prefix length %d\n", ipv4_service_tests[i].str, prefix_len); + } +} + START_TEST(iphlpapi) { @@ -2300,6 +2410,7 @@ START_TEST(iphlpapi) test_GetUnicastIpAddressTable(); test_ConvertLengthToIpv4Mask(); test_GetUdp6Table(); + test_ParseNetworkString(); freeIPHlpApi(); } }

1 0

Alex Henrie : include: Add ip2string.h.
by Alexandre Julliard 05 Sep '19

05 Sep '19

Module: wine Branch: master Commit: 8599d8e52eaf912698e0ea5d96c0d9790aac659f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8599d8e52eaf912698e0ea5d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Sep 5 00:06:17 2019 -0600 include: Add ip2string.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/ip2string.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 47a36ff..0f78085 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -323,6 +323,7 @@ SOURCES = \ inspectable.idl \ interactioncontext.h \ intshcut.h \ + ip2string.h \ ipexport.h \ iphlpapi.h \ ipifcons.h \ diff --git a/include/ip2string.h b/include/ip2string.h new file mode 100644 index 0000000..6c96c8d --- /dev/null +++ b/include/ip2string.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2019 Alex Henrie + * + * 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 + */ + +#ifndef __WINE_IP2STRING_H +#define __WINE_IP2STRING_H + +#ifdef __cplusplus +extern "C" { +#endif + +NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const char **terminator, IN_ADDR *address); +NTSTATUS WINAPI RtlIpv4StringToAddressW(const WCHAR *str, BOOLEAN strict, const WCHAR **terminator, IN_ADDR *address); +#define RtlIpv4StringToAddress WINELIB_NAME_AW(RtlIpv4StringToAddress) +NTSTATUS WINAPI RtlIpv4StringToAddressExA(const char *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +NTSTATUS WINAPI RtlIpv4StringToAddressExW(const WCHAR *str, BOOLEAN strict, IN_ADDR *address, USHORT *port); +#define RtlIpv4StringToAddressEx WINELIB_NAME_AW(RtlIpv4StringToAddressEx) + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Francois Gouget : d3dx9_36/tests: Spelling fixes in ok() messages.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: 92c00c51b21594987d342b5ce00c174ab4e84595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92c00c51b21594987d342b5c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 4 02:38:05 2019 +0200 d3dx9_36/tests: Spelling fixes in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index b67ffb2..e6326bc 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1491,7 +1491,7 @@ static void test_setting_constants(void) ok(refcnt == 0, "The Direct3D device reference count was %u, should be 0\n", refcnt); refcnt = IDirect3D9_Release(d3d); - ok(refcnt == 0, "The Direct3D object referenct count was %u, should be 0\n", refcnt); + ok(refcnt == 0, "The Direct3D object reference count was %u, should be 0\n", refcnt); if (wnd) DestroyWindow(wnd); } @@ -6170,7 +6170,7 @@ static void test_registerset(void) ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); count = IDirect3D9_Release(d3d); - ok(count == 0, "The Direct3D object referenct count was %u, should be 0\n", count); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); if (wnd) DestroyWindow(wnd); } @@ -6407,7 +6407,7 @@ static void test_registerset_defaults(void) ok(count == 0, "The Direct3D device reference count was %u, should be 0\n", count); count = IDirect3D9_Release(d3d); - ok(count == 0, "The Direct3D object referenct count was %u, should be 0\n", count); + ok(count == 0, "The Direct3D object reference count was %u, should be 0\n", count); if (wnd) DestroyWindow(wnd); }

1 0

Gabriel Ivăncescu : kernel32/locale: Set whether we used the default char when using Unix codepage.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: cf923114252207fe72ef9dab7020dec95b1b5a44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf923114252207fe72ef9dab… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 4 17:27:23 2019 +0300 kernel32/locale: Set whether we used the default char when using Unix codepage. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b546cb0..2698b3d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2726,6 +2726,7 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, { ret = wine_cp_wcstombs( unix_cptable, flags, src, srclen, dst, dstlen, defchar, used ? &used_tmp : NULL ); + if (used) *used = used_tmp; break; } /* fall through */

1 0

Gabriel Ivăncescu : kernel32/locale: Don' t fail with non-NULL args when the Unix codepage falls back to UTF-8.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: 6f8bea3049f5194277f7189778732b01e389009e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8bea3049f5194277f71897… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 4 17:27:24 2019 +0300 kernel32/locale: Don't fail with non-NULL args when the Unix codepage falls back to UTF-8. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2698b3d..7710cc9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2727,9 +2727,13 @@ INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, ret = wine_cp_wcstombs( unix_cptable, flags, src, srclen, dst, dstlen, defchar, used ? &used_tmp : NULL ); if (used) *used = used_tmp; - break; } - /* fall through */ + else + { + ret = wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); + if (used) *used = FALSE; + } + break; case CP_UTF8: if (defchar || used) {

1 0

Jactry Zeng : mfmediaengine: Add IMFMediaEngine stub.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: 00c1e64ba46b068c386206f7cd9b0a00902a04b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c1e64ba46b068c386206f7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 3 21:18:53 2019 +0800 mfmediaengine: Add IMFMediaEngine stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 482 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/Makefile.in | 2 +- dlls/mfmediaengine/tests/mfmediaengine.c | 152 ++++++++++ include/mfmediaengine.idl | 51 ++++ 4 files changed, 684 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00c1e64ba46b068c3862…

1 0

Jacek Caban : ntdll: Call virtual_handle_fault from signal handler on x86_64.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: 00f8790799954ed347d89e6fdf6c3beac21e0231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00f8790799954ed347d89e6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:46:42 2019 +0200 ntdll: Call virtual_handle_fault from signal handler on x86_64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b368d51..a8d1985 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2648,29 +2648,6 @@ done: /********************************************************************** - * raise_segv_exception - */ -static void raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) -{ - NTSTATUS status; - - switch(rec->ExceptionCode) - { - case EXCEPTION_ACCESS_VIOLATION: - if (rec->NumberParameters == 2) - { - if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], - rec->ExceptionInformation[0], FALSE ))) - set_cpu_context( context ); - } - break; - } - status = NtRaiseException( rec, context, TRUE ); - raise_status( status, rec ); -} - - -/********************************************************************** * raise_generic_exception * * Generic raise function for exceptions that don't need special treatment. @@ -2960,7 +2937,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case -1: /* overflow */ rec = setup_exception( sigcontext ); rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; - setup_raise_exception( sigcontext, rec, raise_segv_exception ); + setup_raise_exception( sigcontext, rec, raise_generic_exception ); return; } } @@ -2968,7 +2945,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec = setup_exception( sigcontext ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) { - setup_raise_exception( sigcontext, rec, raise_segv_exception ); + setup_raise_exception( sigcontext, rec, raise_generic_exception ); return; } @@ -3001,10 +2978,12 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } break; case TRAP_x86_PAGEFLT: /* Page fault */ - rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; rec->ExceptionInformation[0] = (ERROR_sig(ucontext) >> 1) & 0x09; rec->ExceptionInformation[1] = (ULONG_PTR)siginfo->si_addr; + if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], + rec->ExceptionInformation[0], FALSE ))) + return; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ rec->ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; @@ -3022,7 +3001,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } - setup_raise_exception( sigcontext, rec, raise_segv_exception ); + setup_raise_exception( sigcontext, rec, raise_generic_exception ); } /**********************************************************************

1 0

Jacek Caban : ntdll: Remove no longer needed func argument from setup_raise_exception.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: 200490b36c913f8abc4927f9da0a3214d3e70236 URL: https://source.winehq.org/git/wine.git/?a=commit;h=200490b36c913f8abc4927f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:46:50 2019 +0200 ntdll: Remove no longer needed func argument from setup_raise_exception. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index a8d1985..3079732 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2759,7 +2759,7 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext ) return &stack->rec; } -static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, raise_func func ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) { struct stack_layout *stack = CONTAINING_RECORD( rec, struct stack_layout, rec ); ULONG64 *rsp_ptr; @@ -2793,7 +2793,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; RDI_sig(sigcontext) = (ULONG_PTR)&stack->rec; RSI_sig(sigcontext) = (ULONG_PTR)&stack->context; - RDX_sig(sigcontext) = (ULONG_PTR)func; + RDX_sig(sigcontext) = (ULONG_PTR)raise_generic_exception; RBP_sig(sigcontext) = (ULONG_PTR)rsp_ptr; RSP_sig(sigcontext) = (ULONG_PTR)stack; /* clear single-step, direction, and align check flag */ @@ -2912,7 +2912,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r default: return FALSE; } - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); return TRUE; } @@ -2937,7 +2937,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) case -1: /* overflow */ rec = setup_exception( sigcontext ); rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); return; } } @@ -2945,7 +2945,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec = setup_exception( sigcontext ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) { - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); return; } @@ -3001,7 +3001,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); } /********************************************************************** @@ -3038,7 +3038,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); } /********************************************************************** @@ -3079,7 +3079,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); } /********************************************************************** @@ -3093,7 +3093,7 @@ static void int_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD *rec = setup_exception( sigcontext ); rec->ExceptionCode = CONTROL_C_EXIT; - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); } } @@ -3108,7 +3108,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) EXCEPTION_RECORD *rec = setup_exception( sigcontext ); rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; rec->ExceptionFlags = EH_NONCONTINUABLE; - setup_raise_exception( sigcontext, rec, raise_generic_exception ); + setup_raise_exception( sigcontext, rec ); }

1 0

Jacek Caban : ntdll: Call send_debug_event from debug handler on x86_64.
by Alexandre Julliard 04 Sep '19

04 Sep '19

Module: wine Branch: master Commit: 649be380b1f0c9d32cea6bfa8ac1e0a070d10543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=649be380b1f0c9d32cea6bfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 4 12:47:11 2019 +0200 ntdll: Call send_debug_event from debug handler on x86_64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 +- dlls/ntdll/signal_x86_64.c | 41 +++++++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index c9da131..6b4e68f 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1357,7 +1357,7 @@ static void test_debugger(const char *argv0) } else win_skip("call_debug_service_code not supported on this architecture\n"); - if (sizeof(loop_code) > 1 && broken(1) /* FIXME: broken in Wine */) + if (sizeof(loop_code) > 1 && (sizeof(void*) == 8 || broken(1) /* FIXME: broken in Wine */)) { memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 3079732..feb2e69 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2577,10 +2577,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } -/******************************************************************* - * NtRaiseException (NTDLL.@) - */ -NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { NTSTATUS status; @@ -2615,8 +2612,6 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL TRACE(" r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", context->R12, context->R13, context->R14, context->R15 ); } - status = send_debug_event( rec, TRUE, context ); - if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) goto done; /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; @@ -2647,6 +2642,24 @@ done: } +/******************************************************************* + * NtRaiseException (NTDLL.@) + */ +NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) +{ + NTSTATUS status; + + if (first_chance) + { + status = send_debug_event( rec, TRUE, context ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + return NtSetContextThread( GetCurrentThread(), context ); + } + + return raise_exception( rec, context, first_chance); +} + + /********************************************************************** * raise_generic_exception * @@ -2763,6 +2776,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec { struct stack_layout *stack = CONTAINING_RECORD( rec, struct stack_layout, rec ); ULONG64 *rsp_ptr; + NTSTATUS status; if (rec->ExceptionCode == EXCEPTION_SINGLE_STEP) { @@ -2782,12 +2796,19 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec stack->context.EFlags &= ~0x100; /* clear single-step flag */ } + status = send_debug_event( rec, TRUE, &stack->context ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) + { + restore_context( &stack->context, sigcontext ); + return; + } + /* store return address and %rbp without aligning, so that the offset is fixed */ rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; - *(--rsp_ptr) = RIP_sig(sigcontext); - *(--rsp_ptr) = RBP_sig(sigcontext); - *(--rsp_ptr) = RDI_sig(sigcontext); - *(--rsp_ptr) = RSI_sig(sigcontext); + *(--rsp_ptr) = stack->context.Rip; + *(--rsp_ptr) = stack->context.Rbp; + *(--rsp_ptr) = stack->context.Rdi; + *(--rsp_ptr) = stack->context.Rsi; /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline;

1 0