- Wine-Devel - list.winehq.org

[PATCH] ws2_32: Drop dependencies on system getprotoby(name|number) functions
by Alex Henrie July 13, 2020

July 13, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Implementing these functions entirely in Wine allows us to make sure that protocol 0 is "ip" (not "hotopt" like on Linux) and that protocols supported by neither Windows nor Wine do not appear in the list. Plus, it will facilitate the conversion of ws2_32 to PE. --- configure.ac | 2 - dlls/ws2_32/socket.c | 165 +++++++++++++++++------------------ dlls/ws2_32/tests/protocol.c | 147 +++++++++++++++++++++++++++++++ 3 files changed, 229 insertions(+), 85 deletions(-) diff --git a/configure.ac b/configure.ac index 4829648c3a..9002ce8d60 100644 --- a/configure.ac +++ b/configure.ac @@ -2245,8 +2245,6 @@ AC_CHECK_FUNCS(\ getaddrinfo \ getnameinfo \ getnetbyname \ - getprotobyname \ - getprotobynumber \ getservbyport \ ) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 69fbb37af2..36a92f2354 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6505,60 +6505,82 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) } -static const struct { int prot; const char *names[3]; } protocols[] = -{ - { 0, { "ip", "IP" }}, - { 1, { "icmp", "ICMP" }}, - { 2, { "igmp", "IGMP" }}, - { 3, { "ggp", "GGP" }}, - { 6, { "tcp", "TCP" }}, - { 8, { "egp", "EGP" }}, - { 9, { "igp", "IGP" }}, - { 12, { "pup", "PUP" }}, - { 17, { "udp", "UDP" }}, - { 20, { "hmp", "HMP" }}, - { 22, { "xns-idp", "XNS-IDP" }}, - { 27, { "rdp", "RDP" }}, - { 29, { "iso-tp4", "ISO-TP4" }}, - { 33, { "dccp", "DCCP" }}, - { 36, { "xtp", "XTP" }}, - { 37, { "ddp", "DDP" }}, - { 38, { "idpr-cmtp", "IDPR-CMTP" }}, - { 41, { "ipv6", "IPv6" }}, - { 43, { "ipv6-route", "IPv6-Route" }}, - { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 45, { "idrp", "IDRP" }}, - { 46, { "rsvp", "RSVP" }}, - { 47, { "gre", "GRE" }}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, - { 57, { "skip", "SKIP" }}, - { 58, { "ipv6-icmp", "IPv6-ICMP" }}, - { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, - { 60, { "ipv6-opts", "IPv6-Opts" }}, - { 66, { "rvd", "RVD" }}, - { 73, { "rspf", "RSPF" }}, - { 81, { "vmtp", "VMTP" }}, - { 88, { "eigrp", "EIGRP" }}, - { 89, { "ospf", "OSPFIGP" }}, - { 93, { "ax.25", "AX.25" }}, - { 94, { "ipip", "IPIP" }}, - { 97, { "etherip", "ETHERIP" }}, - { 98, { "encap", "ENCAP" }}, - { 103, { "pim", "PIM" }}, - { 108, { "ipcomp", "IPCOMP" }}, - { 112, { "vrrp", "VRRP" }}, - { 115, { "l2tp", "L2TP" }}, - { 124, { "isis", "ISIS" }}, - { 132, { "sctp", "SCTP" }}, - { 133, { "fc", "FC" }}, - { 135, { "mobility-header", "Mobility-Header" }}, - { 136, { "udplite", "UDPLite" }}, - { 137, { "mpls-in-ip", "MPLS-in-IP" }}, - { 139, { "hip", "HIP" }}, - { 140, { "shim6", "Shim6" }}, - { 141, { "wesp", "WESP" }}, - { 142, { "rohc", "ROHC" }}, +static const char * const protocols[][3] = +{ + /* 0 */ + { "ip", "IP" }, + { "icmp", "ICMP" }, + { }, + { "ggp", "GGP" }, + { }, + { }, + { "tcp", "TCP" }, + { }, + { "egp", "EGP" }, + { }, + /* 10 */ + { }, + { }, + { "pup", "PUP" }, + { }, + { }, + { }, + { }, + { "udp", "UDP" }, + { }, + { }, + /* 20 */ + { "hmp", "HMP" }, + { }, + { "xns-idp", "XNS-IDP" }, + { }, + { }, + { }, + { }, + { "rdp", "RDP" }, + { }, + { }, + /* 30 */ + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + /* 40 */ + { }, + { "ipv6", "IPv6" }, + { }, + { "ipv6-route", "IPv6-Route" }, + { "ipv6-frag", "IPv6-Frag" }, + { }, + { }, + { }, + { }, + { }, + /* 50 */ + { "esp", "ESP" }, + { "ah", "AH" }, + { }, + { }, + { }, + { }, + { }, + { }, + { "ipv6-icmp", "IPv6-ICMP" }, + { "ipv6-nonxt", "IPv6-NoNxt" }, + /* 60 */ + { "ipv6-opts", "IPv6-Opts" }, + { }, + { }, + { }, + { }, + { }, + { "rvd", "RVD" }, }; /*********************************************************************** @@ -6567,21 +6589,12 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNAME - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobyname(name)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + unsigned int i; + for (i = 0; i < ARRAY_SIZE(protocols); i++) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + if (protocols[i][0] && _strnicmp( protocols[i][0], name, -1 ) == 0) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); + retval = WS_create_pe( protocols[i][0], (char **)&protocols[i][1], i ); break; } } @@ -6601,23 +6614,9 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; -#ifdef HAVE_GETPROTOBYNUMBER - struct protoent* proto; - EnterCriticalSection( &csWSgetXXXbyYYY ); - if( (proto = getprotobynumber(number)) != NULL ) - retval = WS_create_pe( proto->p_name, proto->p_aliases, proto->p_proto ); - LeaveCriticalSection( &csWSgetXXXbyYYY ); -#endif - if (!retval) + if (number < ARRAY_SIZE(protocols) && protocols[number][0]) { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) - { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; - } + retval = WS_create_pe( protocols[number][0], (char **)&protocols[number][1], number ); } if (!retval) { diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..323119da1c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,151 @@ static void test_WSAEnumProtocolsW(void) } } +static const struct +{ + const char *names[3]; + BOOL missing_from_xp; +} +protocols[] = +{ + /* 0 */ + { { "ip", "IP" } }, + { { "icmp", "ICMP" } }, + { }, + { { "ggp", "GGP" } }, + { }, + { }, + { { "tcp", "TCP" } }, + { }, + { { "egp", "EGP" } }, + { }, + /* 10 */ + { }, + { }, + { { "pup", "PUP" } }, + { }, + { }, + { }, + { }, + { { "udp", "UDP" } }, + { }, + { }, + /* 20 */ + { { "hmp", "HMP" } }, + { }, + { { "xns-idp", "XNS-IDP" } }, + { }, + { }, + { }, + { }, + { { "rdp", "RDP" } }, + { }, + { }, + /* 30 */ + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + { }, + /* 40 */ + { }, + { { "ipv6", "IPv6" }, TRUE }, + { }, + { { "ipv6-route", "IPv6-Route" }, TRUE }, + { { "ipv6-frag", "IPv6-Frag" }, TRUE }, + { }, + { }, + { }, + { }, + { }, + /* 50 */ + { { "esp", "ESP" }, TRUE }, + { { "ah", "AH" }, TRUE }, + { }, + { }, + { }, + { }, + { }, + { }, + { { "ipv6-icmp", "IPv6-ICMP" }, TRUE }, + { { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE }, + /* 60 */ + { { "ipv6-opts", "IPv6-Opts" }, TRUE }, + { }, + { }, + { }, + { }, + { }, + { { "rvd", "RVD" } }, +}; + +void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols); i++) + { + for (j = 0; protocols[i].names[j]; j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == i) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), i, ent ? ent->p_proto : -1); + } + + if (protocols[i].names[0]) + { + for (j = 0; protocols[i].names[0][j]; j++) + all_caps_name[j] = toupper(protocols[i].names[0][j]); + all_caps_name[j] = 0; + ent = getprotobyname(all_caps_name); + ok((ent && ent->p_proto == i) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), i, ent ? ent->p_proto : -1); + } + } +} + +void test_getprotobynumber(void) +{ + struct protoent *ent; + int i, j; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + + if (i < 0 || i >= ARRAY_SIZE(protocols) || !protocols[i].names[0]) + { + ok(!ent, + "Expected protocol number %d to be undefined, got %s\n", + i, wine_dbgstr_a(ent ? ent->p_name : NULL)); + continue; + } + + ok((ent && ent->p_name && strcmp(ent->p_name, protocols[i].names[0]) == 0) || + broken(!ent && protocols[i].missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, protocols[i].names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + for (j = 0; protocols[i].names[1+j]; j++) + { + ok((ent && ent->p_aliases && ent->p_aliases[j] && + strcmp(ent->p_aliases[j], protocols[i].names[1+j]) == 0) || + broken(!ent && protocols[i].missing_from_xp), + "Expected protocol number %d alias %d to be %s, got %s\n", + i, j, protocols[i].names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[j] : NULL)); + } + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +346,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

3 3

[PATCH 1/5] wined3d: Fix / update reported driver model version.
by Matteo Bruni July 13, 2020

July 13, 2020

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 454125c1462d..45f3f61f2fe7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. +/* Certain applications (e.g. Steam) complain if we report an outdated driver + * version. * * The driver version has the form "x.y.z.w". * - * "x" is the Windows version the driver is meant for: + * "x" is the Windows version / driver model the driver is meant for: * 4 -> 95/98/NT4 * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Windows 7 - * 9 -> Windows 8 - * 10 -> Windows 10 + * 6 -> XP + * 7 -> Vista - WDDM 1.0 + * 8 -> Windows 7 - WDDM 1.1 + * 9 -> Windows 8 - WDDM 1.2 + * 10 -> Windows 8.1 - WDDM 1.3 + * 20 -> Windows 10 - WDDM 2.0 + * 21 -> Windows 10 Anniversary Update - WDDM 2.1 + * 22 -> Windows 10 Creators Update - WDDM 2.2 + * 23 -> Windows 10 Fall Creators Update - WDDM 2.3 + * 24 -> Windows 10 April 2018 Update - WDDM 2.4 + * 25 -> Windows 10 October 2018 Update - WDDM 2.5 + * 26 -> Windows 10 May 2019 Update - WDDM 2.6 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 2) + { + driver_os_version = 9; + driver_model = DRIVER_MODEL_NT6X; + } else { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 9; + driver_os_version = 10; driver_model = DRIVER_MODEL_NT6X; } break; case 10: - driver_os_version = 10; + driver_os_version = 26; driver_model = DRIVER_MODEL_NT6X; break; -- 2.26.2

2 7

[PATCH v2] msvcrt: Remove extra pointers on lldiv() implementation and test.
by Serge Gautherie July 13, 2020

July 13, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/msvcrt/math.c | 9 +++++---- dlls/ucrtbase/tests/misc.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e91547..ae4a267 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2114,11 +2114,12 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) /********************************************************************* * lldiv (MSVCR100.@) */ -MSVCRT_lldiv_t* CDECL MSVCRT_lldiv(MSVCRT_lldiv_t *ret, - MSVCRT_longlong num, MSVCRT_longlong denom) +MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) { - ret->quot = num / denom; - ret->rem = num % denom; + MSVCRT_lldiv_t ret; + + ret.quot = num / denom; + ret.rem = num % denom; return ret; } diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cd100cf..e4928b1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -520,12 +520,19 @@ static void test__sopen_s(void) static void test_lldiv(void) { - static lldiv_t* (CDECL *p_lldiv)(lldiv_t*,LONGLONG,LONGLONG) = (void*)lldiv; lldiv_t r; - p_lldiv(&r, (LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); + r = lldiv(((LONGLONG)0x111 << 32) + 0x222, (LONGLONG)1 << 32); ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x69CF0012 << 32) + 0x0033E78A, 0x30); + ok(r.quot == ((LONGLONG)0x02345000 << 32) + 0x600114D2, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == 0x2A, "rem = %s\n", wine_dbgstr_longlong(r.rem)); + + r = lldiv(((LONGLONG)0x243A5678 << 32) + 0x9ABCDEF0, (LONGLONG)0x12 << 48); + ok(r.quot == 0x0203, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == ((LONGLONG)0x00045678 << 32) + 0x9ABCDEF0, "rem = %s\n", wine_dbgstr_longlong(r.rem)); } static void test_isblank(void) -- 2.10.0.windows.1

2 1

[PATCH 6/6] server: Remove no longer needed get_console_mode and set_console_mode requests.
by Jacek Caban July 13, 2020

July 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 58 --------------------------------------------- server/protocol.def | 14 ----------- 2 files changed, 72 deletions(-)

2 1

[PATCH 4/6] server: Introduce IOCTL_CONDRV_SET_MODE ioctl.
by Jacek Caban July 13, 2020

July 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 1 + server/console.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)

2 1

[PATCH 2/6] kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode.
by Jacek Caban July 13, 2020

July 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 2 +- dlls/kernelbase/console.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-)

2 1

[PATCH 5/6] kernelbase: Use IOCTL_CONDRV_SET_MODE in SetConsoleMode.
by Jacek Caban July 13, 2020

July 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)

1 0

[PATCH 3/6] kernel32: Use IOCTL_CONDRV_GET_MODE in VerifyConsoleIoHandle.
by Jacek Caban July 13, 2020

July 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)

1 0

[PATCH 1/6] server: Introduce IOCTL_CONDRV_GET_MODE ioctl.
by Jacek Caban July 13, 2020

July 13, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 3 +++ server/console.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

presentation and work suggestion
by carlos July 13, 2020

July 13, 2020

Hello, My name is Carlos Rivera, I would like to contribute to Wine, I think it is an incredible project. A few months ago I talked to Jeremy White, I was looking to change jobs and I saw an ad for a job offer as a codeweaver's developer. Anyway, I decided that this project inspired too much respect and I wanted to take it easy and try to collaborate first, to see If I was up to the task. During these months I haven't had much time to spend on Wine, I have read the documentation and following the advice on the web I haved looked for FIXMES in the code. I think I may have found a couple of things that hopefully I may be able to work on and give it a try. It is these two things: file: server/change.c function: do_change_notify, line 306 /* FIXME: this is O(n) ... probably can be improved */ LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { if (get_unix_fd( dir->fd ) != unix_fd) continue; dir->notified = 1; break; } I think I could try to implement a hash table to avoid the loop. Also in the same file, line 396, function dir_set_sd: if (!obj->sd || !security_equal_sid( owner, sd_get_owner( obj->sd ) )) { /* FIXME: get Unix uid and call fchown */ } I think I need to figure out the uid from perhaps PAM? I am not sure, but I am willing to find out if you people think this is worthwhile. I don't know how useful fixing these things may be, but they may be a good way to get started. What do you think? Regards, Carlos.

2 3