- Wine-Devel - list.winehq.org

[PATCH v2 1/3] user32: Create separate FIXME() messages for each packet type in DisplayConfigGetDeviceInfo().
by Brendan Shanks July 14, 2020

July 14, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Trace the names of packet types (both implemented and unimplemented) dlls/user32/sysparams.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8b2b3381dc3..3ec6c54023b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,7 +4815,7 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { - FIXME("stub: %p\n", packet); + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; @@ -4825,6 +4825,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; @@ -4833,6 +4836,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { DISPLAYCONFIG_TARGET_DEVICE_NAME *target_name = (DISPLAYCONFIG_TARGET_DEVICE_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: stub\n"); + if (packet->size < sizeof(*target_name)) return ERROR_INVALID_PARAMETER; @@ -4841,6 +4847,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: { DISPLAYCONFIG_TARGET_PREFERRED_MODE *preferred_mode = (DISPLAYCONFIG_TARGET_PREFERRED_MODE *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE: stub\n"); + if (packet->size < sizeof(*preferred_mode)) return ERROR_INVALID_PARAMETER; @@ -4849,6 +4858,9 @@ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) case DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: { DISPLAYCONFIG_ADAPTER_NAME *adapter_name = (DISPLAYCONFIG_ADAPTER_NAME *)packet; + + FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME: stub\n"); + if (packet->size < sizeof(*adapter_name)) return ERROR_INVALID_PARAMETER; -- 2.26.2

2 5

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

July 14, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: - Keep original protocol table format - Implement getprotobynumber using binary search --- configure.ac | 2 - dlls/ws2_32/socket.c | 76 ++++++++------------------- dlls/ws2_32/tests/protocol.c | 99 ++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 57 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..a860258beb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6507,58 +6507,26 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) static const struct { int prot; const char *names[3]; } protocols[] = { + /* keep this list sorted by number for binary search */ { 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" }}, }; /*********************************************************************** @@ -6567,24 +6535,18 @@ 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 (_strnicmp( protocols[i].names[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 ); break; } } + if (!retval) { WARN( "protocol %s not found\n", debugstr_a(name) ); @@ -6601,24 +6563,28 @@ 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) + int start = 0, end = ARRAY_SIZE(protocols) - 1, i; + + do { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + i = (start + end) / 2; + if (number < protocols[i].prot) + { + end = i - 1; + } + else if (number > protocols[i].prot) + { + start = i + 1; + } + else { - if (protocols[i].prot != number) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break; } } + while (start <= end); + if (!retval) { WARN( "protocol %d not found\n", number ); diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 99bd1373a9..4cc7770dad 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -192,6 +192,103 @@ static void test_WSAEnumProtocolsW(void) } } +struct protocol +{ + int prot; + const char *names[3]; + BOOL missing_from_xp; +}; + +static const struct protocol protocols[] = +{ + /* keep this list sorted by number for intelligent linear search */ + { 0, { "ip", "IP" }}, + { 1, { "icmp", "ICMP" }}, + { 3, { "ggp", "GGP" }}, + { 6, { "tcp", "TCP" }}, + { 8, { "egp", "EGP" }}, + { 12, { "pup", "PUP" }}, + { 17, { "udp", "UDP" }}, + { 20, { "hmp", "HMP" }}, + { 22, { "xns-idp", "XNS-IDP" }}, + { 27, { "rdp", "RDP" }}, + { 41, { "ipv6", "IPv6" }, TRUE}, + { 43, { "ipv6-route", "IPv6-Route" }, TRUE}, + { 44, { "ipv6-frag", "IPv6-Frag" }, TRUE}, + { 50, { "esp", "ESP" }}, + { 51, { "ah", "AH" }}, + { 58, { "ipv6-icmp", "IPv6-ICMP" }, TRUE}, + { 59, { "ipv6-nonxt", "IPv6-NoNxt" }, TRUE}, + { 60, { "ipv6-opts", "IPv6-Opts" }, TRUE}, + { 66, { "rvd", "RVD" }}, + { } +}; + +void test_getprotobyname(void) +{ + struct protoent *ent; + char all_caps_name[16]; + int i, j; + + for (i = 0; i < ARRAY_SIZE(protocols) - 1; i++) + { + for (j = 0; protocols[i].names[j]; j++) + { + ent = getprotobyname(protocols[i].names[j]); + ok((ent && ent->p_proto == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(protocols[i].names[j]), protocols[i].prot, 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 == protocols[i].prot) || broken(!ent && protocols[i].missing_from_xp), + "Expected %s to be protocol number %d, got %d\n", + wine_dbgstr_a(all_caps_name), protocols[i].prot, ent ? ent->p_proto : -1); + } + } +} + +void test_getprotobynumber(void) +{ + struct protoent *ent; + const struct protocol *ref = &protocols[0]; + int i, j; + + for (i = -1; i <= 256; i++) + { + ent = getprotobynumber(i); + + if (i != ref->prot) + { + 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, ref->names[0]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d to be %s, got %s\n", + i, ref->names[0], wine_dbgstr_a(ent ? ent->p_name : NULL)); + + for (j = 0; ref->names[1+j]; j++) + { + ok((ent && ent->p_aliases && ent->p_aliases[j] && + strcmp(ent->p_aliases[j], ref->names[1+j]) == 0) || + broken(!ent && ref->missing_from_xp), + "Expected protocol number %d alias %d to be %s, got %s\n", + i, j, ref->names[0], wine_dbgstr_a(ent && ent->p_aliases ? ent->p_aliases[j] : NULL)); + } + + ref++; + } +} + START_TEST( protocol ) { WSADATA data; @@ -201,4 +298,6 @@ START_TEST( protocol ) test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); + test_getprotobyname(); + test_getprotobynumber(); } -- 2.27.0

3 8

[PATCH] api-ms-win-core-systemtopology-l1-1-0: Add dll.
by Myah Caron July 14, 2020

July 14, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Apparently Death Stranding requires this DLL. --- configure.ac | 1 + dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-systemtopology-l1-1-0.spec | 2 ++ tools/make_specfiles | 1 + 4 files changed, 5 insertions(+) create mode 100644 dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec diff --git a/configure.ac b/configure.ac index d596422320..4829648c3a 100644 --- a/configure.ac +++ b/configure.ac @@ -2946,6 +2946,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-synch-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-sysinfo-l1-2-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-systemtopology-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-threadpool-legacy-l1-1-0) diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in new file mode 100644 index 0000000000..beed9fb9c2 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-systemtopology-l1-1-0.dll diff --git a/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec new file mode 100644 index 0000000000..b5365eb930 --- /dev/null +++ b/dlls/api-ms-win-core-systemtopology-l1-1-0/api-ms-win-core-systemtopology-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetNumaHighestNodeNumber(ptr) kernelbase.GetNumaHighestNodeNumber +@ stdcall GetNumaNodeProcessorMaskEx(long ptr) kernelbase.GetNumaNodeProcessorMaskEx diff --git a/tools/make_specfiles b/tools/make_specfiles index 420d850b73..f8f8da8d5c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -223,6 +223,7 @@ my @dll_groups = "api-ms-win-core-string-obsolete-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", + "api-ms-win-core-systemtopology-l1-1-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-ansi-l1-1-0", "api-ms-win-core-synch-l1-1-0", -- 2.27.0

2 2

[PATCH 9/9] msvcrt: Use _wcsnicmp instead of strnicmpW.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/file.c | 6 +++--- dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-)

1 0

[PATCH 8/9] msvcrt: Don't use strncmpiW in _wcsnicmp_l.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)

1 0

[PATCH 7/9] msvcrt: Don't use strncmpiW in _wcsnicoll_l.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH 6/9] msvcrt: Don't use strncmpW in msvcrt_get_flags.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 5/9] msvcrt: Don't use strncmpW in wcsncmp.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)

1 0

[PATCH 4/9] msvcrt: Don't use strcmpiW in _wcsicmp_l.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 69 ++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 31 deletions(-)

1 0

[PATCH 3/9] msvcrt: Don't use strcmpiW in _wcsicoll_l.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0