October 2021 - Wine-Commits

Huw Davies : iphlpapi: Implement IcmpParseReplies().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: f6ca752201b191326ce837edeae56792b5c23044 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ca752201b191326ce837ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:56 2021 +0100 iphlpapi: Implement IcmpParseReplies(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 49 ++++++++++++++++++++++++++++++------------ 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 6c51548b6e3..ce188084c01 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -157,7 +157,7 @@ @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() -@ stub IcmpParseReplies +@ stdcall IcmpParseReplies(ptr long) @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d52441f022a..9e525a2116c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2,6 +2,7 @@ * iphlpapi dll implementation * * Copyright (C) 2003,2006 Juan Lang + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4541,3 +4542,16 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, return ERROR_INVALID_PARAMETER; } + +/****************************************************************** + * IcmpParseReplies (IPHLPAPI.@) + */ +DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) +{ + ICMP_ECHO_REPLY *icmp_reply = reply; + DWORD num_pkts = icmp_reply->Reserved; + + icmp_reply->Reserved = 0; + if (!num_pkts) SetLastError( icmp_reply->Status ); + return num_pkts; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 223d6d270cb..080feb364f9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1043,20 +1043,40 @@ static void testIcmpSendEcho(void) IcmpCloseHandle(icmp); } -/* -still-to-be-tested NT4-onward functions: -CreateIpForwardEntry -DeleteIpForwardEntry -CreateIpNetEntry -DeleteIpNetEntry -GetFriendlyIfIndex -GetRTTAndHopCount -SetIfEntry -SetIpForwardEntry -SetIpNetEntry -SetIpStatistics -SetIpTTL -*/ +static void testIcmpParseReplies( void ) +{ + ICMP_ECHO_REPLY reply = { 0 }; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 0, "gle %d\n", GetLastError() ); + + reply.Status = 12345; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 12345, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + + reply.Reserved = 1; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 1, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); + + reply.Reserved = 3; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 3, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); +} + static void testWinNT4Functions(void) { testGetNumberOfInterfaces(); @@ -1076,6 +1096,7 @@ static void testWinNT4Functions(void) testGetUdpTable(); testSetTcpEntry(); testIcmpSendEcho(); + testIcmpParseReplies(); } static void testGetInterfaceInfo(void)

1 0

Huw Davies : iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 9d8abb1ee5eee8d71ec33501e0ff584475a8bddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d8abb1ee5eee8d71ec33501… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:57 2021 +0100 iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/icmp.c | 58 ------------------------------------------- dlls/iphlpapi/iphlpapi_main.c | 23 +++++++++++++++++ 2 files changed, 23 insertions(+), 58 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef03219e52..6441d7dd8ad 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -353,64 +353,6 @@ done: * Exported Routines. */ -/*********************************************************************** - * Icmp6CreateFile (IPHLPAPI.@) - */ -HANDLE WINAPI Icmp6CreateFile(VOID) -{ - icmp_t* icp; - - int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); - if (sid < 0) - { - /* Some systems (e.g. Linux 3.0+ and Mac OS X) support - non-privileged ICMP via SOCK_DGRAM type. */ - sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); - } - if (sid < 0) { - ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return INVALID_HANDLE_VALUE; - } - - icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); - if (icp==NULL) { - close(sid); - SetLastError(IP_NO_RESOURCES); - return INVALID_HANDLE_VALUE; - } - icp->sid=sid; - icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; - return (HANDLE)icp; -} - - -/*********************************************************************** - * Icmp6SendEcho2 (IPHLPAPI.@) - */ -DWORD WINAPI Icmp6SendEcho2( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - struct sockaddr_in6* SourceAddress, - struct sockaddr_in6* DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - FIXME("(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, - ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /*********************************************************************** * IcmpCreateFile (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9e525a2116c..2286c732383 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4555,3 +4555,26 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) if (!num_pkts) SetLastError( icmp_reply->Status ); return num_pkts; } + +/*********************************************************************** + * Icmp6CreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI Icmp6CreateFile( void ) +{ + FIXME( "stub\n" ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * Icmp6SendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI Icmp6SendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, void *apc_ctxt, + struct sockaddr_in6 *src, struct sockaddr_in6 *dst, void *request, WORD request_size, + IP_OPTION_INFORMATION *opts, void *reply, DWORD reply_size, DWORD timeout ) +{ + FIXME( "(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", handle, event, + apc_routine, apc_ctxt, src, dst, request, request_size, opts, reply, reply_size, timeout ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +}

1 0

Huw Davies : iphlpapi: Build with msvcrt.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 36cd04aed32e0de24e2c216094ec77606f146ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cd04aed32e0de24e2c2160… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:59 2021 +0100 iphlpapi: Build with msvcrt. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 2 -- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++------------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index e413337a420..d01c764c61f 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -2,8 +2,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ iphlpapi_main.c diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6cdf7948901..cb27044ae02 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -41,7 +41,6 @@ #include "wine/nsi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); @@ -75,7 +74,7 @@ DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; - sprintfW( str, fmt, + swprintf( str, len, fmt, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); return ERROR_SUCCESS; @@ -536,8 +535,8 @@ DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); - if (strlenW( adapter_name ) < strlenW( device_tcpip )) return ERROR_INVALID_PARAMETER; - err = ConvertStringToGuidW( adapter_name + strlenW( device_tcpip ), &guid ); + if (wcslen( adapter_name ) < wcslen( device_tcpip )) return ERROR_INVALID_PARAMETER; + err = ConvertStringToGuidW( adapter_name + wcslen( device_tcpip ), &guid ); if (err) return err; err = ConvertInterfaceGuidToLuid( &guid, &luid ); if (err) return err; @@ -834,8 +833,8 @@ static ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) for (aa = info; aa; aa = aa->Next) { size += sizeof(*aa) + ((strlen( aa->AdapterName ) + 1 + 1) & ~1); - size += (strlenW( aa->Description ) + 1 + strlenW( aa->DnsSuffix ) + 1) * sizeof(WCHAR); - if (aa->FriendlyName) size += (strlenW(aa->FriendlyName) + 1) * sizeof(WCHAR); + size += (wcslen( aa->Description ) + 1 + wcslen( aa->DnsSuffix ) + 1) * sizeof(WCHAR); + if (aa->FriendlyName) size += (wcslen( aa->FriendlyName ) + 1) * sizeof(WCHAR); size = (size + align) & ~align; address_lists_iterate( aa, address_entry_size, &size ); } @@ -858,17 +857,17 @@ static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRE memcpy( dst->AdapterName, src->AdapterName, len ); ptr += (len + 1) & ~1; dst->Description = (WCHAR *)ptr; - len = (strlenW( src->Description ) + 1) * sizeof(WCHAR); + len = (wcslen( src->Description ) + 1) * sizeof(WCHAR); memcpy( dst->Description, src->Description, len ); ptr += len; dst->DnsSuffix = (WCHAR *)ptr; - len = (strlenW( src->DnsSuffix ) + 1) * sizeof(WCHAR); + len = (wcslen( src->DnsSuffix ) + 1) * sizeof(WCHAR); memcpy( dst->DnsSuffix, src->DnsSuffix, len ); ptr += len; if (src->FriendlyName) { dst->FriendlyName = (WCHAR *)ptr; - len = (strlenW( src->FriendlyName ) + 1) * sizeof(WCHAR); + len = (wcslen( src->FriendlyName ) + 1) * sizeof(WCHAR); memcpy( dst->FriendlyName, src->FriendlyName, len ); ptr += len; } @@ -1198,9 +1197,9 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags (search = heap_alloc( size ))) { if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && - search->dwStringCount && strlenW( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + search->dwStringCount && wcslen( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) { - strcpyW( aa->DnsSuffix, search->pStringArray[0] ); + wcscpy( aa->DnsSuffix, search->pStringArray[0] ); } heap_free( search ); } @@ -4097,7 +4096,7 @@ DWORD WINAPI ConvertInterfaceAliasToLuid( const WCHAR *alias, NET_LUID *luid ) if (!alias || !*alias || !luid) return ERROR_INVALID_PARAMETER; luid->Value = 0; - len = strlenW( alias ); + len = wcslen( alias ); err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), (void **)&data, sizeof(*data), NULL, 0, NULL, 0, &count, 0 ); @@ -4299,8 +4298,8 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE } } - if (prefix) needed = snprintfW( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); - else needed = snprintfW( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); + if (prefix) needed = swprintf( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); + else needed = swprintf( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); if (needed >= len) return ERROR_NOT_ENOUGH_MEMORY; memcpy( name, buf, (needed + 1) * sizeof(WCHAR) ); @@ -4338,19 +4337,19 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) if (!luid) return ERROR_INVALID_PARAMETER; memset( luid, 0, sizeof(*luid) ); - if (!name || !(sep = strchrW( name, '_' )) || sep >= name + ARRAY_SIZE(buf)) return ERROR_INVALID_NAME; + if (!name || !(sep = wcschr( name, '_' )) || sep >= name + ARRAY_SIZE(buf)) return ERROR_INVALID_NAME; memcpy( buf, name, (sep - name) * sizeof(WCHAR) ); buf[sep - name] = '\0'; if (sep - name > ARRAY_SIZE(iftype) - 1 && !memcmp( buf, iftype, (ARRAY_SIZE(iftype) - 1) * sizeof(WCHAR) )) { - type = atoiW( buf + ARRAY_SIZE(iftype) - 1 ); + type = wcstol( buf + ARRAY_SIZE(iftype) - 1, NULL, 10 ); } else { for (i = 0; i < ARRAY_SIZE(name_prefixes); i++) { - if (!strcmpW( buf, name_prefixes[i].prefix )) + if (!wcscmp( buf, name_prefixes[i].prefix )) { type = name_prefixes[i].type; break; @@ -4359,7 +4358,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } if (type == ~0u) return ERROR_INVALID_NAME; - luid->Info.NetLuidIndex = atoiW( sep + 1 ); + luid->Info.NetLuidIndex = wcstol( sep + 1, NULL, 10 ); luid->Info.IfType = type; return ERROR_SUCCESS; }

1 0

Huw Davies : iphlpapi: Build with nameless structs and unions.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 3aa7c462293ff64e9bdd1c8192eab4f554cd9dbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa7c462293ff64e9bdd1c81… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:13:00 2021 +0100 iphlpapi: Build with nameless structs and unions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 78 +++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3aa7c462293ff64e9bdd…

1 0

Huw Davies : iphlpapi: Use wide character string literals.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 8f73b8e15f3b42b5ffc1641d4e2c31fae1f2ef9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f73b8e15f3b42b5ffc1641d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:13:01 2021 +0100 iphlpapi: Use wide character string literals. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 59 +++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 42cd58fa1a6..d9a85beda5f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 -static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; +static const WCHAR *device_tcpip = L"\\DEVICE\\TCPIP_"; DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); @@ -67,12 +67,8 @@ DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) { - static const WCHAR fmt[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', - '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; - if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; - swprintf( str, len, fmt, + swprintf( str, len, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); return ERROR_SUCCESS; @@ -1536,8 +1532,8 @@ DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - memcpy( row->wszName, device_tcpip, sizeof(device_tcpip) ); - ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); + wcscpy( row->wszName, device_tcpip ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + wcslen( device_tcpip ), CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; @@ -1917,8 +1913,8 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; row = table->Adapter + num++; row->Index = stat[i].if_index; - memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); - ConvertGuidToStringW( &stat[i].if_guid, row->Name + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); + wcscpy( row->Name, device_tcpip ); + ConvertGuidToStringW( &stat[i].if_guid, row->Name + wcslen( device_tcpip ), CHARS_IN_GUID ); } done: NsiFreeTable( keys, NULL, NULL, stat ); @@ -4244,16 +4240,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ return err; } -static const WCHAR otherW[] = {'o','t','h','e','r',0}; -static const WCHAR ethernetW[] = {'e','t','h','e','r','n','e','t',0}; -static const WCHAR tokenringW[] = {'t','o','k','e','n','r','i','n','g',0}; -static const WCHAR pppW[] = {'p','p','p',0}; -static const WCHAR loopbackW[] = {'l','o','o','p','b','a','c','k',0}; -static const WCHAR atmW[] = {'a','t','m',0}; -static const WCHAR wirelessW[] = {'w','i','r','e','l','e','s','s',0}; -static const WCHAR tunnelW[] = {'t','u','n','n','e','l',0}; -static const WCHAR ieee1394W[] = {'i','e','e','e','1','3','9','4',0}; - struct name_prefix { const WCHAR *prefix; @@ -4261,15 +4247,15 @@ struct name_prefix }; static const struct name_prefix name_prefixes[] = { - { otherW, IF_TYPE_OTHER }, - { ethernetW, IF_TYPE_ETHERNET_CSMACD }, - { tokenringW, IF_TYPE_ISO88025_TOKENRING }, - { pppW, IF_TYPE_PPP }, - { loopbackW, IF_TYPE_SOFTWARE_LOOPBACK }, - { atmW, IF_TYPE_ATM }, - { wirelessW, IF_TYPE_IEEE80211 }, - { tunnelW, IF_TYPE_TUNNEL }, - { ieee1394W, IF_TYPE_IEEE1394 } + { L"other", IF_TYPE_OTHER }, + { L"ethernet", IF_TYPE_ETHERNET_CSMACD }, + { L"tokenring", IF_TYPE_ISO88025_TOKENRING }, + { L"ppp", IF_TYPE_PPP }, + { L"loopback", IF_TYPE_SOFTWARE_LOOPBACK }, + { L"atm", IF_TYPE_ATM }, + { L"wireless", IF_TYPE_IEEE80211 }, + { L"tunnel", IF_TYPE_TUNNEL }, + { L"ieee1394", IF_TYPE_IEEE1394 } }; /****************************************************************** @@ -4280,8 +4266,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE DWORD i, needed; const WCHAR *prefix = NULL; WCHAR buf[IF_MAX_STRING_SIZE + 1]; - static const WCHAR prefix_fmt[] = {'%','s','_','%','d',0}; - static const WCHAR unk_fmt[] = {'i','f','t','y','p','e','%','d','_','%','d',0}; TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); @@ -4296,8 +4280,8 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE } } - if (prefix) needed = swprintf( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); - else needed = swprintf( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); + if (prefix) needed = swprintf( buf, len, L"%s_%d", prefix, luid->Info.NetLuidIndex ); + else needed = swprintf( buf, len, L"iftype%d_%d", luid->Info.IfType, luid->Info.NetLuidIndex ); if (needed >= len) return ERROR_NOT_ENOUGH_MEMORY; memcpy( name, buf, (needed + 1) * sizeof(WCHAR) ); @@ -4326,8 +4310,8 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) { const WCHAR *sep; - static const WCHAR iftype[] = {'i','f','t','y','p','e',0}; DWORD type = ~0u, i; + int iftype_len = wcslen( L"iftype" ); WCHAR buf[IF_MAX_STRING_SIZE + 1]; TRACE( "(%s %p)\n", debugstr_w(name), luid ); @@ -4339,9 +4323,9 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) memcpy( buf, name, (sep - name) * sizeof(WCHAR) ); buf[sep - name] = '\0'; - if (sep - name > ARRAY_SIZE(iftype) - 1 && !memcmp( buf, iftype, (ARRAY_SIZE(iftype) - 1) * sizeof(WCHAR) )) + if (sep - name > iftype_len && !memcmp( buf, L"iftype", iftype_len * sizeof(WCHAR) )) { - type = wcstol( buf + ARRAY_SIZE(iftype) - 1, NULL, 10 ); + type = wcstol( buf + iftype_len, NULL, 10 ); } else { @@ -4564,7 +4548,6 @@ BOOL WINAPI IcmpCloseHandle( HANDLE handle ) HANDLE WINAPI IcmpCreateFile( void ) { struct icmp_handle_data *data = heap_alloc( sizeof(*data) ); - static const WCHAR device_name[] = {'\\','\\','.','\\','N','s','i',0}; if (!data) { @@ -4572,7 +4555,7 @@ HANDLE WINAPI IcmpCreateFile( void ) return INVALID_HANDLE_VALUE; } - data->nsi_device = CreateFileW( device_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + data->nsi_device = CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL ); if (data->nsi_device == INVALID_HANDLE_VALUE) {

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_GetParameters tests.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 7255718bb43f0e9f0e8d5c27c9e4f66457f09ab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7255718bb43f0e9f0e8d5c27… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:54 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputEffect_GetParameters tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 192 insertions(+), 1 deletion(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 6f97f17108f..f4f1a4d282b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5096,10 +5096,29 @@ static BOOL test_device_types(void) static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) { + struct hid_expect expect_dc_reset = + { + .code = IOCTL_HID_WRITE_REPORT, + .report_id = 1, + .report_len = 2, + .report_buf = {1, 0x01}, + }; + static const DWORD expect_axes_init[2] = {0}; + static const DIEFFECT expect_desc_init = + { + .dwSize = sizeof(DIEFFECT), + .dwTriggerButton = -1, + .rgdwAxes = (void *)expect_axes_init, + }; struct check_created_effect_params check_params = {0}; IDirectInputEffect *effect; + DIPERIODIC periodic = {0}; + DIENVELOPE envelope = {0}; + LONG directions[4] = {0}; + DIEFFECT desc = {0}; + DWORD axes[4] = {0}; + ULONG ref, flags; HRESULT hr; - ULONG ref; GUID guid; hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); @@ -5152,6 +5171,178 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( IsEqualGUID( &guid, &GUID_Square ), "got guid %s, expected %s\n", debugstr_guid( &guid ), debugstr_guid( &GUID_Square ) ); + hr = IDirectInputEffect_GetParameters( effect, NULL, 0 ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, NULL, DIEP_DURATION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + desc.dwSize = sizeof(DIEFFECT); + hr = IDirectInputEffect_GetParameters( effect, &desc, 0 ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DURATION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); + set_hid_expect( file, NULL, 0 ); + + desc.dwDuration = 0xdeadbeef; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DURATION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwDuration ); + memset( &desc, 0xcd, sizeof(desc) ); + desc.dwSize = sizeof(DIEFFECT); + desc.dwFlags = 0; + flags = DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERREPEATINTERVAL; + hr = IDirectInputEffect_GetParameters( effect, &desc, flags ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwSamplePeriod ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwGain ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwStartDelay ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwTriggerRepeatInterval ); + + memset( &desc, 0xcd, sizeof(desc) ); + desc.dwSize = sizeof(DIEFFECT); + desc.dwFlags = 0; + desc.lpEnvelope = NULL; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); + todo_wine + ok( hr == E_POINTER, "GetParameters returned %#x\n", hr ); + desc.lpEnvelope = &envelope; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + envelope.dwSize = sizeof(DIENVELOPE); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ENVELOPE ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + + desc.dwFlags = 0; + desc.cAxes = 0; + desc.rgdwAxes = NULL; + desc.rglDirection = NULL; + desc.lpEnvelope = NULL; + desc.cbTypeSpecificParams = 0; + desc.lpvTypeSpecificParams = NULL; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + desc.dwFlags = DIEFF_OBJECTOFFSETS; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%#x", dwTriggerButton ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + check_member( desc, expect_desc_init, "%u", cAxes ); + desc.dwFlags = DIEFF_OBJECTIDS; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_TRIGGERBUTTON ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%#x", dwTriggerButton ); + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + check_member( desc, expect_desc_init, "%u", cAxes ); + desc.dwFlags |= DIEFF_CARTESIAN; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + desc.dwFlags |= DIEFF_POLAR; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + desc.dwFlags |= DIEFF_SPHERICAL; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + check_member( desc, expect_desc_init, "%u", cAxes ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + + desc.dwFlags |= DIEFF_SPHERICAL; + desc.cAxes = 2; + desc.rgdwAxes = axes; + desc.rglDirection = directions; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_AXES | DIEP_DIRECTION ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", cAxes ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[0] ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); + todo_wine + check_member( desc, expect_desc_init, "%p", rglDirection ); + todo_wine + ok( desc.dwFlags == DIEFF_OBJECTIDS, "got flags %#x, expected %#x\n", desc.dwFlags, DIEFF_OBJECTIDS ); + + desc.dwFlags |= DIEFF_SPHERICAL; + desc.lpEnvelope = &envelope; + desc.cbTypeSpecificParams = sizeof(periodic); + desc.lpvTypeSpecificParams = &periodic; + hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_ALLPARAMS ); + todo_wine + ok( hr == DI_OK, "GetParameters returned %#x\n", hr ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwDuration ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwSamplePeriod ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwGain ); + todo_wine + check_member( desc, expect_desc_init, "%#x", dwTriggerButton ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwTriggerRepeatInterval ); + todo_wine + check_member( desc, expect_desc_init, "%u", cAxes ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[0] ); + check_member( desc, expect_desc_init, "%u", rgdwAxes[1] ); + todo_wine + check_member( desc, expect_desc_init, "%p", rglDirection ); + todo_wine + check_member( desc, expect_desc_init, "%p", lpEnvelope ); + todo_wine + check_member( desc, expect_desc_init, "%u", cbTypeSpecificParams ); + todo_wine + check_member( desc, expect_desc_init, "%u", dwStartDelay ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); }

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_Initialize tests.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: d86451aaee72b5f58cfbef9a12f5439dfd34ea0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d86451aaee72b5f58cfbef9a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:53 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputEffect_Initialize tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 76 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 71159fb66be..6f97f17108f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5100,6 +5100,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) IDirectInputEffect *effect; HRESULT hr; ULONG ref; + GUID guid; hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); ok( hr == E_POINTER, "CreateEffect returned %#x\n", hr ); @@ -5123,6 +5124,34 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ok( hr == DI_OK, "EnumCreatedEffectObjects returned %#x\n", hr ); ok( check_params.count == 1, "got count %u, expected 1\n", check_params.count ); + hr = IDirectInputEffect_Initialize( effect, NULL, DIRECTINPUT_VERSION, &GUID_Sine ); + todo_wine + ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, 0, &GUID_Sine ); + todo_wine + ok( hr == DIERR_NOTINITIALIZED, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, NULL ); + todo_wine + ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); + + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_NULL ); + todo_wine + ok( hr == DIERR_DEVICENOTREG, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_Sine ); + ok( hr == DI_OK, "Initialize returned %#x\n", hr ); + hr = IDirectInputEffect_Initialize( effect, instance, DIRECTINPUT_VERSION, &GUID_Square ); + ok( hr == DI_OK, "Initialize returned %#x\n", hr ); + + hr = IDirectInputEffect_GetEffectGuid( effect, NULL ); + todo_wine + ok( hr == E_POINTER, "GetEffectGuid returned %#x\n", hr ); + hr = IDirectInputEffect_GetEffectGuid( effect, &guid ); + todo_wine + ok( hr == DI_OK, "GetEffectGuid returned %#x\n", hr ); + todo_wine + ok( IsEqualGUID( &guid, &GUID_Square ), "got guid %s, expected %s\n", debugstr_guid( &guid ), + debugstr_guid( &GUID_Square ) ); + ref = IDirectInputEffect_Release( effect ); ok( ref == 0, "Release returned %d\n", ref ); } @@ -5238,11 +5267,12 @@ static void test_force_feedback_joystick( void ) USAGE(1, PID_USAGE_EFFECT_TYPE), COLLECTION(1, NamedArray), + USAGE(1, PID_USAGE_ET_SQUARE), USAGE(1, PID_USAGE_ET_SINE), LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 1), + LOGICAL_MAXIMUM(1, 2), PHYSICAL_MINIMUM(1, 1), - PHYSICAL_MAXIMUM(1, 1), + PHYSICAL_MAXIMUM(1, 2), REPORT_SIZE(1, 8), REPORT_COUNT(1, 1), OUTPUT(1, Data|Ary|Abs), @@ -5459,10 +5489,10 @@ static void test_force_feedback_joystick( void ) .dwOfs = 0x1e, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(11)|DIDFT_OUTPUT, .dwFlags = 0x80008000, - .tszName = L"ET Sine", + .tszName = L"ET Square", .wCollectionNumber = 8, .wUsagePage = HID_USAGE_PAGE_PID, - .wUsage = PID_USAGE_ET_SINE, + .wUsage = PID_USAGE_ET_SQUARE, .wReportId = 3, }, { @@ -5471,6 +5501,18 @@ static void test_force_feedback_joystick( void ) .dwOfs = 0x1f, .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(12)|DIDFT_OUTPUT, .dwFlags = 0x80008000, + .tszName = L"ET Sine", + .wCollectionNumber = 8, + .wUsagePage = HID_USAGE_PAGE_PID, + .wUsage = PID_USAGE_ET_SINE, + .wReportId = 3, + }, + { + .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), + .guidType = GUID_Unknown, + .dwOfs = 0x20, + .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(13)|DIDFT_OUTPUT, + .dwFlags = 0x80008000, .tszName = L"X Axis", .wCollectionNumber = 9, .wUsagePage = HID_USAGE_PAGE_GENERIC, @@ -5480,8 +5522,8 @@ static void test_force_feedback_joystick( void ) { .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, - .dwOfs = 0x20, - .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(13)|DIDFT_OUTPUT, + .dwOfs = 0x21, + .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(14)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Direction Enable", .wCollectionNumber = 7, @@ -5493,7 +5535,7 @@ static void test_force_feedback_joystick( void ) .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW), .guidType = GUID_Unknown, .dwOfs = 0x14, - .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(14)|DIDFT_OUTPUT, + .dwType = DIDFT_NODATA|DIDFT_MAKEINSTANCE(15)|DIDFT_OUTPUT, .dwFlags = 0x80008000, .tszName = L"Magnitude", .wCollectionNumber = 10, @@ -5603,6 +5645,14 @@ static void test_force_feedback_joystick( void ) }; const DIEFFECTINFOW expect_effects[] = { + { + .dwSize = sizeof(DIEFFECTINFOW), + .guid = GUID_Square, + .dwEffType = DIEFT_PERIODIC, + .dwStaticParams = DIEP_AXES | DIEP_TYPESPECIFICPARAMS, + .dwDynamicParams = DIEP_AXES | DIEP_TYPESPECIFICPARAMS, + .tszName = L"GUID_Square", + }, { .dwSize = sizeof(DIEFFECTINFOW), .guid = GUID_Sine, @@ -5735,7 +5785,7 @@ static void test_force_feedback_joystick( void ) res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); - ok( res == 1, "got %u expected %u\n", res, 1 ); + ok( res == 2, "got %u expected %u\n", res, 2 ); hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", @@ -5744,11 +5794,11 @@ static void test_force_feedback_joystick( void ) effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); ok( hr == DI_OK, "GetEffectInfo returned %#x\n", hr ); - check_member_guid( effectinfo, expect_effects[0], guid ); - check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); - check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); - check_member( effectinfo, expect_effects[0], "%#x", dwDynamicParams ); - check_member_wstr( effectinfo, expect_effects[0], tszName ); + check_member_guid( effectinfo, expect_effects[1], guid ); + check_member( effectinfo, expect_effects[1], "%#x", dwEffType ); + check_member( effectinfo, expect_effects[1], "%#x", dwStaticParams ); + check_member( effectinfo, expect_effects[1], "%#x", dwDynamicParams ); + check_member_wstr( effectinfo, expect_effects[1], tszName ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr );

1 0

Alexandre Julliard : makefiles: Use the STATICLIB variable for static import libraries.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 518f9a12c18bd951bc71f3128e296841ede3774e URL: https://source.winehq.org/git/wine.git/?a=commit;h=518f9a12c18bd951bc71f312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:20:26 2021 +0200 makefiles: Use the STATICLIB variable for static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsiid/Makefile.in | 2 +- dlls/dmoguids/Makefile.in | 2 +- dlls/dxerr8/Makefile.in | 2 +- dlls/dxerr9/Makefile.in | 2 +- dlls/dxguid/Makefile.in | 2 +- dlls/mfuuid/Makefile.in | 2 +- dlls/strmbase/Makefile.in | 2 +- dlls/strmiids/Makefile.in | 2 +- dlls/uuid/Makefile.in | 2 +- dlls/wbemuuid/Makefile.in | 2 +- dlls/winecrt0/Makefile.in | 2 +- dlls/wmcodecdspuuid/Makefile.in | 2 +- tools/make_makefiles | 16 +++++++--------- tools/makedep.c | 10 +++++----- 14 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/adsiid/Makefile.in b/dlls/adsiid/Makefile.in index d741ea55c7b..14a46b31108 100644 --- a/dlls/adsiid/Makefile.in +++ b/dlls/adsiid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libadsiid.a +STATICLIB = libadsiid.a C_SRCS = \ adsiid.c diff --git a/dlls/dmoguids/Makefile.in b/dlls/dmoguids/Makefile.in index db38e5756a5..183a4359918 100644 --- a/dlls/dmoguids/Makefile.in +++ b/dlls/dmoguids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdmoguids.a +STATICLIB = libdmoguids.a C_SRCS = \ dmoguids.c diff --git a/dlls/dxerr8/Makefile.in b/dlls/dxerr8/Makefile.in index c056b1cd1af..04e9d382723 100644 --- a/dlls/dxerr8/Makefile.in +++ b/dlls/dxerr8/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr8.a +STATICLIB = libdxerr8.a C_SRCS = \ dxerr8.c diff --git a/dlls/dxerr9/Makefile.in b/dlls/dxerr9/Makefile.in index 04fac1fb3e0..1f3bdaed39f 100644 --- a/dlls/dxerr9/Makefile.in +++ b/dlls/dxerr9/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxerr9.a +STATICLIB = libdxerr9.a C_SRCS = \ dxerr9.c diff --git a/dlls/dxguid/Makefile.in b/dlls/dxguid/Makefile.in index 551bff93695..60f50bd2146 100644 --- a/dlls/dxguid/Makefile.in +++ b/dlls/dxguid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libdxguid.a +STATICLIB = libdxguid.a C_SRCS = \ dx10guid.c \ diff --git a/dlls/mfuuid/Makefile.in b/dlls/mfuuid/Makefile.in index b42583bbb73..a17fead940c 100644 --- a/dlls/mfuuid/Makefile.in +++ b/dlls/mfuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libmfuuid.a +STATICLIB = libmfuuid.a C_SRCS = \ mfplay.c \ diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index 0fef7b6ff03..077abc1da50 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmbase.a +STATICLIB = libstrmbase.a C_SRCS = \ dispatch.c \ diff --git a/dlls/strmiids/Makefile.in b/dlls/strmiids/Makefile.in index 09edc7018fc..1b9bbd98fb6 100644 --- a/dlls/strmiids/Makefile.in +++ b/dlls/strmiids/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libstrmiids.a +STATICLIB = libstrmiids.a C_SRCS = \ evr.c \ diff --git a/dlls/uuid/Makefile.in b/dlls/uuid/Makefile.in index ba163e30ca2..2a27740d7ed 100644 --- a/dlls/uuid/Makefile.in +++ b/dlls/uuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libuuid.a +STATICLIB = libuuid.a C_SRCS = \ d2d.c \ diff --git a/dlls/wbemuuid/Makefile.in b/dlls/wbemuuid/Makefile.in index 449a0e68a87..87a07d463e1 100644 --- a/dlls/wbemuuid/Makefile.in +++ b/dlls/wbemuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwbemuuid.a +STATICLIB = libwbemuuid.a C_SRCS = \ wbemuuid.c diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 45cff11233e..17da4da29c6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwinecrt0.a +STATICLIB = libwinecrt0.a C_SRCS = \ crt_dllmain.c \ diff --git a/dlls/wmcodecdspuuid/Makefile.in b/dlls/wmcodecdspuuid/Makefile.in index d8f5d024413..04b5a7a378f 100644 --- a/dlls/wmcodecdspuuid/Makefile.in +++ b/dlls/wmcodecdspuuid/Makefile.in @@ -1,4 +1,4 @@ -MODULE = libwmcodecdspuuid.a +STATICLIB = libwmcodecdspuuid.a C_SRCS = \ wmcodecdspuuid.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 3abba2da840..a316b42dd73 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -229,7 +229,7 @@ sub parse_makefile($) { die "Configure substitution is not allowed in $file" unless $file eq "Makefile"; } - if (/^\s*(MODULE|IMPORTLIB|TESTDLL|PARENTSRC|APPMODE|EXTRADLLFLAGS)\s*=\s*(.*)/) + if (/^\s*(MODULE|IMPORTLIB|TESTDLL|STATICLIB|PARENTSRC|EXTRADLLFLAGS)\s*=\s*(.*)/) { my $var = $1; $make{$var} = $2; @@ -433,17 +433,16 @@ sub update_makefiles(@) die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; } - elsif (defined($make{"MODULE"}) && $make{"MODULE"} =~ /\.a$/) # import lib + elsif (defined($make{"STATICLIB"})) { - die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; - die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; + die "invalid STATICLIB name" unless $make{"STATICLIB"} =~ /\.a$/; } elsif (defined($make{"MODULE"})) # dll or program { (my $name = $file) =~ s/^(dlls|programs)\/(.*)\/Makefile/$2/; my $dllflags = $make{"EXTRADLLFLAGS"} || ""; - if (defined $make{"APPMODE"}) { $dllflags .= " " . $make{"APPMODE"}; } + die "invalid MODULE name" if $make{"MODULE"} =~ /\.a$/; die "MODULE should not be defined in $file" unless $file =~ /^(dlls|programs)\//; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; if ($file =~ /^programs\//) @@ -454,7 +453,6 @@ sub update_makefiles(@) } else { - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"} ; die "EXTRADLLFLAGS should not contain -mconsole or -mwindows in $file" if $dllflags =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless ($name =~ /\./ && $make{"MODULE"} eq $name) || $make{"MODULE"} eq "$name.dll"; } @@ -467,9 +465,9 @@ sub update_makefiles(@) } elsif ($file =~ /^tools.*\/Makefile$/) { - die "APPMODE should not be defined in $file" if defined $make{"APPMODE"}; - die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; + die "MODULE should not be defined in $file" if defined $make{"MODULE"}; die "STATICLIB should not be defined in $file" if defined $make{"STATICLIB"}; + die "EXTRADLLFLAGS should not be defined in $file" if defined $make{"EXTRADLLFLAGS"}; $args = ",,[test \"x\$enable_tools\" = xno]"; } push @lines, "WINE_CONFIG_MAKEFILE($dir$args)\n"; diff --git a/tools/makedep.c b/tools/makedep.c index 88b179a9070..bb2201dadb1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2965,12 +2965,12 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && !(source->file->flags & FLAG_C_UNIX) && - (make->is_cross || (make->module && make->staticlib) || + (make->is_cross || make->staticlib || (source->file->flags & FLAG_C_IMPLIB))); int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || - (make->module && make->staticlib))); + make->staticlib)); if ((source->file->flags & FLAG_GENERATED) && (!make->testdll || !strendswith( source->filename, "testlist.c" ))) @@ -2988,11 +2988,11 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); - if (make->sharedlib || (make->staticlib && !make->module) || (source->file->flags & FLAG_C_UNIX)) + if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); } - else if (make->module || make->staticlib || make->testdll) + else if (make->module || make->testdll) { output_filenames( dll_flags ); if (source->use_msvcrt) output_filenames( msvcrt_flags ); @@ -4084,7 +4084,7 @@ static void load_sources( struct makefile *make ) make->install_dev = get_expanded_make_var_array( make, "INSTALL_DEV" ); make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); - if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; + if (make->staticlib) make->module = make->staticlib; make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" );

1 0

Alexandre Julliard : tools: Move some portability defines out of port.h.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 207068c48ce80d35badbe79a253b8a735c70fc52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=207068c48ce80d35badbe79a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 10:16:59 2021 +0200 tools: Move some portability defines out of port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/port.h | 49 ------------------------------------------------- tools/makedep.c | 9 +-------- tools/tools.h | 25 +++++++++++++++++++++++++ tools/widl/typelib.c | 2 +- tools/widl/widl.c | 2 +- tools/winedump/output.c | 4 ++-- tools/winedump/pdb.c | 4 ++-- tools/winedump/pe.c | 2 +- tools/wmc/mcl.c | 2 +- tools/wmc/mcy.y | 2 +- tools/wmc/utils.c | 3 +-- tools/wmc/utils.h | 1 - tools/wmc/wmc.h | 1 + 13 files changed, 37 insertions(+), 69 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index b7f537bec86..3bb13275c32 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -53,17 +53,12 @@ #include <io.h> #include <process.h> -#define mkdir(path,mode) mkdir(path) - static inline void *dlopen(const char *name, int flags) { return NULL; } static inline void *dlsym(void *handle, const char *name) { return NULL; } static inline int dlclose(void *handle) { return 0; } static inline const char *dlerror(void) { return "No dlopen support on Windows"; } #ifdef _MSC_VER - -#define popen _popen -#define pclose _pclose /* The UCRT headers in the Windows SDK #error out if we #define snprintf. * The C headers that came with previous Visual Studio versions do not have * snprintf. Check for VS 2015, which appears to be the first version to @@ -71,25 +66,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #if _MSC_VER < 1900 # define snprintf _snprintf #endif -#define strtoll _strtoi64 -#define strtoull _strtoui64 -#define strncasecmp _strnicmp -#define strcasecmp _stricmp - -typedef long off_t; -typedef int pid_t; -typedef int ssize_t; - -#endif /* _MSC_VER */ - -#else /* _WIN32 */ - -#ifndef __int64 -# if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) || defined(_WIN64) -# define __int64 long -# else -# define __int64 long long -# endif #endif #endif /* _WIN32 */ @@ -106,36 +82,11 @@ typedef int ssize_t; #define RTLD_GLOBAL 0x100 #endif -#ifndef S_ISLNK -# define S_ISLNK(mod) (0) -#endif - -#ifndef S_ISDIR -# define S_ISDIR(mod) (((mod) & _S_IFMT) == _S_IFDIR) -#endif - -#ifndef S_ISCHR -# define S_ISCHR(mod) (((mod) & _S_IFMT) == _S_IFCHR) -#endif - -#ifndef S_ISREG -# define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) -#endif - /* So we open files in 64 bit access mode on Linux */ #ifndef O_LARGEFILE # define O_LARGEFILE 0 #endif -#ifndef O_NONBLOCK -# define O_NONBLOCK 0 -#endif - -#ifndef O_BINARY -# define O_BINARY 0 -#endif - - /**************************************************************** * Constants */ diff --git a/tools/makedep.c b/tools/makedep.c index 121fd4f3565..15939edfb78 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -31,14 +31,7 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#if defined(_WIN32) && !defined(__CYGWIN__) -#include <direct.h> -#include <io.h> -#define mkdir(path,mode) mkdir(path) -#endif + #include "tools.h" #include "wine/list.h" diff --git a/tools/tools.h b/tools/tools.h index f013bf7a510..cd87e20c163 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#include <sys/stat.h> #include <fcntl.h> #include <time.h> #include <errno.h> @@ -34,10 +35,34 @@ #endif #if defined(_WIN32) && !defined(__CYGWIN__) +# include <direct.h> +# include <io.h> # include <process.h> +# define mkdir(path,mode) mkdir(path) +# ifndef S_ISREG +# define S_ISREG(mod) (((mod) & _S_IFMT) == _S_IFREG) +# endif +# ifdef _MSC_VER +# define popen _popen +# define pclose _pclose +# define strtoll _strtoi64 +# define strtoull _strtoui64 +# define strncasecmp _strnicmp +# define strcasecmp _stricmp +# endif #else # include <sys/wait.h> # include <unistd.h> +# ifndef O_BINARY +# define O_BINARY 0 +# endif +# ifndef __int64 +# if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) +# define __int64 long +# else +# define __int64 long long +# endif +# endif #endif #if !defined(__GNUC__) && !defined(__attribute__) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 1d7e21da937..7f34aa4efcf 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -250,7 +250,7 @@ static void tlb_read(int fd, void *buf, int count) error("error while reading importlib.\n"); } -static void tlb_lseek(int fd, off_t offset) +static void tlb_lseek(int fd, int offset) { if(lseek(fd, offset, SEEK_SET) == -1) error("lseek failed\n"); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 5c11f6285ea..97a26743cf3 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -287,7 +287,7 @@ static void add_widl_version_define(void) if (p) version += atoi(p + 1); - snprintf(version_str, sizeof(version_str), "__WIDL__=0x%x", version); + sprintf(version_str, "__WIDL__=0x%x", version); wpp_add_cmdline_define(version_str); } diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 5911f22f6c8..ad3a70c3b0f 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -68,7 +68,7 @@ void output_spec_symbol (const parsed_symbol *sym) assert (sym && sym->symbol); if (sym->ordinal >= 0) - snprintf(ord_spec, 12, "%d", sym->ordinal); + sprintf(ord_spec, "%d", sym->ordinal); else { ord_spec[0] = '@'; @@ -485,7 +485,7 @@ void output_c_banner (const parsed_symbol *sym) size_t i; if (sym->ordinal >= 0) - snprintf(ord_spec, sizeof (ord_spec), "%d", sym->ordinal); + sprintf(ord_spec, "%d", sym->ordinal); else { ord_spec[0] = '@'; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9057a544065..30001d224da 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -279,9 +279,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx printf("-Unknown symbol info version %d\n", symbols->version); } if (symbols->flags & 0x8000) /* new */ - snprintf(tcver, sizeof(tcver), "%u.%u", (symbols->flags >> 8) & 0x7f, symbols->flags & 0xff); + sprintf(tcver, "%u.%u", (symbols->flags >> 8) & 0x7f, symbols->flags & 0xff); else - snprintf(tcver, sizeof(tcver), "old-%x", symbols->flags); + sprintf(tcver, "old-%x", symbols->flags); printf("Symbols:\n" "\tsignature: %08x\n" "\tversion: %u\n" diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index e21084ad4cf..4455ab61bd0 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -2442,7 +2442,7 @@ static void do_grab_sym( void ) { char ordinal_text[256]; /* Ordinal only entry */ - snprintf (ordinal_text, sizeof(ordinal_text), "%s_%u", + sprintf (ordinal_text, "%s_%u", globals.forward_dll ? globals.forward_dll : OUTPUT_UC_DLL_NAME, exportDir->Base + i); str_toupper(ordinal_text); diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 93e666fed74..c0ca4eeba5c 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -26,8 +26,8 @@ #include <assert.h> #include <string.h> -#include "utils.h" #include "wmc.h" +#include "utils.h" #include "lang.h" #include "mcy.tab.h" diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 2ed8f72813a..879c46ffc77 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -44,8 +44,8 @@ #include <stdlib.h> #include <assert.h> -#include "utils.h" #include "wmc.h" +#include "utils.h" #include "lang.h" static const char err_syntax[] = "Syntax error\n"; diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index a1286f8da30..5a91d420cb4 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -28,10 +28,9 @@ #include <assert.h> #include <ctype.h> -#include "wmctypes.h" +#include "wmc.h" #include "winnls.h" #include "utils.h" -#include "wmc.h" #define SUPPRESS_YACC_ERROR_MESSAGE diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index 39db674d4c9..3a8010d77cc 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -21,7 +21,6 @@ #ifndef __WMC_UTILS_H #define __WMC_UTILS_H -#include "../tools.h" #include "wmctypes.h" int mcy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 438a645ebfc..913c2a9443e 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -21,6 +21,7 @@ #ifndef __WMC_WMC_H #define __WMC_WMC_H +#include "../tools.h" #include "wmctypes.h" /*

1 0

Eric Pouech : dbghelp/dwarf: Correctly compute address of label.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 2da1698312bbc7dc1c2df4d4c15ca969499b9391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da1698312bbc7dc1c2df4d4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 6 10:02:12 2021 +0200 dbghelp/dwarf: Correctly compute address of label. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 430544196c5..c15b59b57c3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1988,7 +1988,7 @@ static void dwarf2_parse_subprogram_label(dwarf2_subprogram_t* subpgm, name.u.string = NULL; loc.kind = loc_absolute; - loc.offset = subpgm->ctx->module_ctx->load_offset + low_pc.u.uvalue; + loc.offset = subpgm->ctx->module_ctx->load_offset + low_pc.u.uvalue - subpgm->func->address; symt_add_function_point(subpgm->ctx->module_ctx->module, subpgm->func, SymTagLabel, &loc, name.u.string); }

1 0