October 2021 - Wine-commits

Huw Davies : iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c.
by Alexandre Julliard 06 Oct '21

06 Oct '21

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: Implement IcmpSendEcho2Ex() using nsiproxy.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 7156d2b1e4dd7be5ee6194c60afa6aafec8b2544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7156d2b1e4dd7be5ee6194c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 10:12:58 2021 +0100 iphlpapi: Implement IcmpSendEcho2Ex() using nsiproxy. This results in a small change in behaviour reflected by the change to the tests: previously IcmpCreateFile() would fail if neither a SOCK_RAW nor a SOCK_DGRAM socket were available. With this patch, that failure is delayed until IcmpSendEcho2Ex(). There's no evidence that the original behaviour matches Windows; it's likely the tests were written this way to match Wine's implementation. If there does turn out to be an app that depends on the old behaviour, it would be possible to send an ioctl during IcmpCreateFile() to probe for this. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/Makefile.in | 1 - dlls/iphlpapi/icmp.c | 643 ----------------------------------------- dlls/iphlpapi/ip.h | 180 ------------ dlls/iphlpapi/ip_icmp.h | 186 ------------ dlls/iphlpapi/iphlpapi_main.c | 172 +++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 14 +- 6 files changed, 177 insertions(+), 1019 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7156d2b1e4dd7be5ee61…

1 0

Huw Davies : iphlpapi: Build with msvcrt.
by Alexandre Julliard 06 Oct '21

06 Oct '21

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 06 Oct '21

06 Oct '21

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 06 Oct '21

06 Oct '21

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: Reduce test output verbosity.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 34b378fa9a9830183d5c48299d8f0a17939e2a18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b378fa9a9830183d5c4829… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:51 2021 +0200 dinput8/tests: Reduce test output verbosity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51784 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 498 +++++++++++++++++++++++------------------------ 1 file changed, 249 insertions(+), 249 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34b378fa9a9830183d5c…

1 0

Rémi Bernon : dinput8/tests: Reduce pnp_driver_start todo_wine verbosity.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 3864c98f1e0b0733bece31d2fc3e105b4b8817a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3864c98f1e0b0733bece31d2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:52 2021 +0200 dinput8/tests: Reduce pnp_driver_start todo_wine verbosity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51784 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 466331b326b..71159fb66be 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -499,11 +499,15 @@ static BOOL pnp_driver_start( const WCHAR *resource ) WCHAR path[MAX_PATH], filename[MAX_PATH]; SC_HANDLE manager, service; const CERT_CONTEXT *cert; + int old_mute_threshold; BOOL ret, need_reboot; HANDLE catalog; HDEVINFO set; FILE *f; + old_mute_threshold = winetest_mute_threshold; + winetest_mute_threshold = 1; + load_resource( resource, filename ); ret = MoveFileExW( filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING ); ok( ret, "failed to move file, error %u\n", GetLastError() ); @@ -536,6 +540,7 @@ static BOOL pnp_driver_start( const WCHAR *resource ) ok( ret, "Failed to delete file, error %u\n", GetLastError() ); ret = DeleteFileW( L"winetest.sys" ); ok( ret, "Failed to delete file, error %u\n", GetLastError() ); + winetest_mute_threshold = old_mute_threshold; return FALSE; } @@ -584,6 +589,8 @@ static BOOL pnp_driver_start( const WCHAR *resource ) CloseServiceHandle( service ); CloseServiceHandle( manager ); + + winetest_mute_threshold = old_mute_threshold; return ret || GetLastError() == ERROR_SERVICE_ALREADY_RUNNING; }

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_Initialize tests.
by Alexandre Julliard 06 Oct '21

06 Oct '21

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

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputEffect_GetParameters tests.
by Alexandre Julliard 06 Oct '21

06 Oct '21

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 Y and Z axes as force-feedback capable axes.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 02f9306f0b3aa14c05a1cd8d273223c9fa92e829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f9306f0b3aa14c05a1cd8d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 10:21:55 2021 +0200 dinput8/tests: Add Y and Z axes as force-feedback capable axes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 110 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 75 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02f9306f0b3aa14c05a1…

1 0