wine-devel February 2017

wine-devel@winehq.org

70 participants
300 discussions

Re: [PATCH 3/3] mshtml/tests: Added MHTML document tests.
by Marvin 03 Feb '17

03 Feb '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=28297 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2670: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: dmcompos/tests: Fix a failing test on Windows 8.
by Huw Davies 03 Feb '17

03 Feb '17

On Fri, Feb 03, 2017 at 02:24:49PM +0100, Michael Stefaniuc wrote: > On 02/03/2017 12:45 PM, Huw Davies wrote: > > The dirty bit is most likely uninitialized, so sometimes this returns S_OK. > Interesting, that seems to be only newtb-w8 that does that. Yes. FWIW, I tried calling IPersistStream_Save() in order to clear the dirty bit, but that returned E_NOTIMPL on all Windows versions... Huw.

2 1

Re: [PATCH 6/9] d3d9: Fix query result data for not started queries.
by Marvin 03 Feb '17

03 Feb '17

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=28290 Your paranoid android. === w864 (64 bit device) === device.c:3877: Test failed: Failed to reset device, hr 0x88760868, i=1.

1 0

Re: [PATCH 3/3] kernel32: Add GetThreadIOPendingFlag tests
by Dmitry Timoshkov 03 Feb '17

03 Feb '17

Piotr Caban <piotr(a)codeweavers.com> wrote: > + char path[16384] = {0}; ... > + r = GetTempPathA(MAX_PATH, path); > + ok(r, "GetTempPathA error: %u\n", GetLastError()); > + lstrcatA(path, "testIOPendingFlag"); > + r = CreateDirectoryA(path, NULL); > + ok(r, "CreateDirectoryA error: %d\n", GetLastError()); Why path[MAX_PATH] is not enough? Also you need to remove the created directory at the end of the test. -- Dmitry.

2 2

Re: [v2] kernel32: Read entry before LdrInitializeThunk
by Sebastian Lackner 03 Feb '17

03 Feb '17

On 03.02.2017 11:39, Andrew Wesie wrote: > Overwatch overwrites the PE header contents in a TLS callback. This results in > a crash on wine, because the entry point will be incorrect in start_process. > > Fix the issue by reading the entry point before LdrInitializeThunk is called, > and using this stored value in start_process instead of the PE header. > > Signed-off-by: Andrew Wesie <awesie(a)gmail.com> > --- > dlls/kernel32/process.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c > index 5a9fea2..48bb7bb 100644 > --- a/dlls/kernel32/process.c > +++ b/dlls/kernel32/process.c > @@ -88,6 +88,7 @@ static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); > > HMODULE kernel32_handle = 0; > SYSTEM_BASIC_INFORMATION system_info = { 0 }; > +LPTHREAD_START_ROUTINE entry_proc = NULL; > > const WCHAR *DIR_Windows = NULL; > const WCHAR *DIR_System = NULL; > @@ -1085,14 +1086,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) > */ > static DWORD WINAPI start_process( PEB *peb ) > { > - IMAGE_NT_HEADERS *nt; > - LPTHREAD_START_ROUTINE entry; > - > - nt = RtlImageNtHeader( peb->ImageBaseAddress ); > - entry = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + > - nt->OptionalHeader.AddressOfEntryPoint); > - > - if (!nt->OptionalHeader.AddressOfEntryPoint) > + if (entry_proc == (LPTHREAD_START_ROUTINE)peb->ImageBaseAddress) > { > ERR( "%s doesn't have an entry point, it cannot be executed\n", > debugstr_w(peb->ProcessParameters->ImagePathName.Buffer) ); > @@ -1101,11 +1095,11 @@ static DWORD WINAPI start_process( PEB *peb ) > > if (TRACE_ON(relay)) > DPRINTF( "%04x:Starting process %s (entryproc=%p)\n", GetCurrentThreadId(), > - debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry ); > + debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), entry_proc ); > > SetLastError( 0 ); /* clear error code */ > if (peb->BeingDebugged) DbgBreakPoint(); > - return call_process_entry( peb, entry ); > + return call_process_entry( peb, entry_proc ); > } > > > @@ -1186,6 +1180,7 @@ void CDECL __wine_kernel_init(void) > RTL_USER_PROCESS_PARAMETERS *params = peb->ProcessParameters; > HANDLE boot_events[2]; > BOOL got_environment = TRUE; > + IMAGE_NT_HEADERS *nt; > > /* Initialize everything */ > > @@ -1299,6 +1294,10 @@ void CDECL __wine_kernel_init(void) > > if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ > > + nt = RtlImageNtHeader( peb->ImageBaseAddress ); > + entry_proc = (LPTHREAD_START_ROUTINE)((char *)peb->ImageBaseAddress + > + nt->OptionalHeader.AddressOfEntryPoint); This will not work for .NET CLI-only images. Handling for them is still missing in Wine, but in this case ntdll replaces the entrypoint, which means it shouldn't be stored in a static variable. I would suggest a slightly different solution: pass the start routine as parameter to start_process(). There is no attempt to make this function compatible with Windows, so you can cache the entry point on the ntdll side. This is similar how it is done in this draft patch: https://github.com/wine-compholio/wine-staging/blob/master/patches/ntdll-CL… Nevertheless, it will require careful testing. This example shows that replacing the PE header is valid in some situations, so just ignoring all changes probably also isn't correct. Maybe it should use the value from some loader structure? > + > LdrInitializeThunk( start_process, 0, 0, 0 ); > > error: >

1 0

Re: [1/2] iphlpapi: Add GetUnicastIpAddressEntry implementation (resend)
by Hans Leidekker 03 Feb '17

03 Feb '17

On Fri, 2017-02-03 at 00:08 +0100, André Hentschel wrote: > + GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size); GAA_FLAG_INCLUDE_ALL_INTERFACES has no effect on Wine and you're not using the result of GAA_FLAG_INCLUDE_PREFIX. > + ptr = HeapAlloc(GetProcessHeap(), 0, size); > + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &size); > + if (FAILED(ret)) Please handle allocation failure. GetAdaptersAddresses returns ULONG, not HRESULT.

1 0

Re: [v2 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Sebastian Lackner 03 Feb '17

03 Feb '17

On 26.01.2017 12:09, Jonathan Doron wrote: > Signed-off-by: Jonathan Doron <jond(a)wizery.com> > --- > configure | 24 ++++++++++++++++++++++++ > configure.ac | 16 ++++++++++++++++ > dlls/ntdll/file.c | 22 +++++++++++++++++++++- > include/config.h.in | 3 +++ > include/winbase.h | 9 +++++++++ > 5 files changed, 73 insertions(+), 1 deletion(-) > > diff --git a/configure b/configure > index 1a96117..a9d7878 100755 > --- a/configure > +++ b/configure > @@ -16407,6 +16407,30 @@ _ACEOF > fi > > > +ac_fn_c_check_member "$LINENO" "struct statfs" "f_fsid.__val" "ac_cv_member_struct_statfs_f_fsid___val" "#include <sys/types.h> > +#ifdef HAVE_SYS_PARAM_H > +# include <sys/param.h> > +#endif > +#ifdef HAVE_SYS_MOUNT_H > +# include <sys/mount.h> > +#endif > +#ifdef HAVE_SYS_VFS_H > +# include <sys/vfs.h> > +#endif > +#ifdef HAVE_SYS_STATFS_H > +# include <sys/statfs.h> > +#endif > +" > +if test "x$ac_cv_member_struct_statfs_f_fsid___val" = xyes; then : > + > +cat >>confdefs.h <<_ACEOF > +#define HAVE_STRUCT_STATFS_F_SID_VAL 1 > +_ACEOF > + > + > +fi > + > + > ac_fn_c_check_member "$LINENO" "struct statvfs" "f_blocks" "ac_cv_member_struct_statvfs_f_blocks" "#ifdef HAVE_SYS_STATVFS_H > #include <sys/statvfs.h> > #endif There is usually no need to include changes for configure. It will automatically be updated when your patch gets accepted. The same also applies to config.h.in. > diff --git a/configure.ac b/configure.ac > index 353f271..3790a39 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2277,6 +2277,22 @@ AC_CHECK_MEMBERS([struct statfs.f_bfree, struct statfs.f_bavail, struct statfs.f > # include <sys/statfs.h> > #endif]) > > +dnl Check for f_fsid.__val > +AC_CHECK_MEMBERS([struct f_fsid.f_fsid.__val],,, Shouldn't this be "struct statfs.[...]" ? And is there any reason why this isn't merged in the block above, which checks other statfs fields? > +[#include <sys/types.h> > +#ifdef HAVE_SYS_PARAM_H > +# include <sys/param.h> > +#endif > +#ifdef HAVE_SYS_MOUNT_H > +# include <sys/mount.h> > +#endif > +#ifdef HAVE_SYS_VFS_H > +# include <sys/vfs.h> > +#endif > +#ifdef HAVE_SYS_STATFS_H > +# include <sys/statfs.h> > +#endif]) > + > AC_CHECK_MEMBERS([struct statvfs.f_blocks],,, > [#ifdef HAVE_SYS_STATVFS_H > #include <sys/statvfs.h> > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index 6eddd19..38ca0c5 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -2379,7 +2379,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > 0, /* FileRenameInformationBypassAccessCheck */ > 0, /* FileLinkInformationBypassAccessCheck */ > 0, /* FileVolumeNameInformation */ > - 0, /* FileIdInformation */ > + sizeof(FILE_ID_INFORMATION), /* FileIdInformation */ > 0, /* FileIdExtdDirectoryInformation */ > 0, /* FileReplaceCompletionInformation */ > 0, /* FileHardLinkFullIdInformation */ > @@ -2621,6 +2621,26 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > } > } > break; > + case FileIdInformation: > + { > + struct statfs volstats; > + FILE_ID_INFORMATION *info = ptr; > + if ((fstat(fd, &st) == -1) || (fstatfs(fd, &volstats) == -1)) Other blocks using fstatfs are protected with an #if defined(HAVE_FSTATFS) check. You might need that here, too. > + { > + io->u.Status = FILE_GetNtStatus(); > + } > + else > + { > + memset(info, 0, sizeof(*info)); > +#ifdef HAVE_STRUCT_STATFS_F_SID_VAL With my version of autoconf, the define is called HAVE_STRUCT_F_FSID_F_FSID___VAL (with two additional underscores). Are there differences between the versions of autoconf or have you guessed those names? Please note that you can use "autoreconf -f" to update various files automatically after changing configure.ac. > + memcpy(&info->VolumeSerialNumber, > + &volstats.f_fsid.__val, > + min(sizeof(info->VolumeSerialNumber), sizeof(volstats.f_fsid.__val))); > +#endif > + ((PLARGE_INTEGER)&info->FileId)->QuadPart = st.st_ino; Not really an issue, but it is usually preferred to avoid P* types. You could also write: ((LARGE_INTEGER *)&info->FileId)->QuadPart = st.st_ino; To make your changes even more convincing, I would also recommend to take a look at the existing tests and try to add one for this information class. This could for example be used to verify that FileId is indeed identical to the (smaller) FileId returned by some other info classes. > + } > + } > + break; > default: > FIXME("Unsupported class (%d)\n", class); > io->u.Status = STATUS_NOT_IMPLEMENTED; > diff --git a/include/config.h.in b/include/config.h.in > index 5dcd90b..6bba9df 100644 > --- a/include/config.h.in > +++ b/include/config.h.in > @@ -963,6 +963,9 @@ > /* Define to 1 if `f_namelen' is a member of `struct statfs'. */ > #undef HAVE_STRUCT_STATFS_F_NAMELEN > > +/* Define to 1 if `f_fsid.__val' is a member of `struct statfs'. */ > +#undef HAVE_STRUCT_STATFS_F_SID_VAL > + > /* Define to 1 if `f_blocks' is a member of `struct statvfs'. */ > #undef HAVE_STRUCT_STATVFS_F_BLOCKS > > diff --git a/include/winbase.h b/include/winbase.h > index eff5972..83c27f8 100644 > --- a/include/winbase.h > +++ b/include/winbase.h > @@ -905,6 +905,15 @@ typedef struct _FILE_REMOTE_PROTOCOL_INFO { > } ProtocolSpecificReserved; > } FILE_REMOTE_PROTOCOL_INFO, *PFILE_REMOTE_PROTOCOL_INFO; Those changes should probably go to include/winternl.h. On Windows they are in include/ntifs.h, but we don't have that in Wine yet, and all other FILE_*_INFORMATION structs are also in winternl.h. > > +typedef struct _FILE_ID_128 { > + BYTE Identifier[16]; My header files define this as UCHAR array. If there are multiple versions out there it shouldn't matter what you use, otherwise I would suggest to stick to what is used in official header files. > +} FILE_ID_128, *PFILE_ID_128; > + > +typedef struct _FILE_ID_INFORMATION { > + ULONGLONG VolumeSerialNumber; > + FILE_ID_128 FileId; > +} FILE_ID_INFORMATION, *PFILE_ID_INFORMATION; > + > #define PIPE_ACCESS_INBOUND 1 > #define PIPE_ACCESS_OUTBOUND 2 > #define PIPE_ACCESS_DUPLEX 3 > Feel free to ask if you have any questions. Regards, Sebastian

1 0

Re: [v2 1/3] ntdll: Define more file information classes.
by Sebastian Lackner 03 Feb '17

03 Feb '17

On 26.01.2017 12:09, Jonathan Doron wrote: > Signed-off-by: Jonathan Doron <jond(a)wizery.com> > --- > dlls/ntdll/file.c | 7 +++++++ > include/winternl.h | 7 +++++++ > 2 files changed, 14 insertions(+) > > diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c > index e1583da..6eddd19 100644 > --- a/dlls/ntdll/file.c > +++ b/dlls/ntdll/file.c > @@ -2376,7 +2376,14 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, > 0, /* FileNumaNodeInformation */ > 0, /* FileStandardLinkInformation */ > 0, /* FileRemoteProtocolInformation */ > + 0, /* FileRenameInformationBypassAccessCheck */ > + 0, /* FileLinkInformationBypassAccessCheck */ > + 0, /* FileVolumeNameInformation */ > + 0, /* FileIdInformation */ > + 0, /* FileIdExtdDirectoryInformation */ > 0, /* FileReplaceCompletionInformation */ > + 0, /* FileHardLinkFullIdInformation */ > + 0, /* FileIdExtdBothDirectoryInformation */ > }; > > struct stat st; > diff --git a/include/winternl.h b/include/winternl.h > index f35091c..891b6a7 100644 > --- a/include/winternl.h > +++ b/include/winternl.h > @@ -441,7 +441,14 @@ typedef enum _FILE_INFORMATION_CLASS { > FileNumaNodeInformation, > FileStandardLinkInformation, > FileRemoteProtocolInformation, > + FileRenameInformationBypassAccessCheck, > + FileLinkInformationBypassAccessCheck, > + FileVolumeNameInformation, > + FileIdInformation, > + FileIdExtdDirectoryInformation, > FileReplaceCompletionInformation, > + FileHardLinkFullIdInformation, > + FileIdExtdBothDirectoryInformation, > FileMaximumInformation It looks like the FileMaximumInformation constant is also used in the ntdll/directory tests. Unfortunately, your patch introduces new test failures (not catched automatically because include file changes do not trigger test runs): https://newtestbot.winehq.org/JobDetails.pl?Key=28259. You will have to update those files in the same patch to ensure all tests still pass. Best regards, Sebastian > } FILE_INFORMATION_CLASS, *PFILE_INFORMATION_CLASS; > >

1 0

Re: [1/2] iphlpapi: Add GetUnicastIpAddressEntry implementation (resend)
by Bruno Jesus 03 Feb '17

03 Feb '17

On Thu, Feb 2, 2017 at 9:08 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > For https://bugs.winehq.org/show_bug.cgi?id=41753 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > resending, because of bad timing together with the testbot > > dlls/iphlpapi/iphlpapi.spec | 2 +- > dlls/iphlpapi/iphlpapi_main.c | 77 +++++++++++++++++++++++++++++++++++++++++++ > include/netioapi.h | 17 ++++++++++ > include/ws2def.h | 13 ++++++++ > include/ws2ipdef.h | 7 ++++ > 5 files changed, 115 insertions(+), 1 deletion(-) > > diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec > index 500267c..1a1f8f7 100644 > --- a/dlls/iphlpapi/iphlpapi.spec > +++ b/dlls/iphlpapi/iphlpapi.spec > @@ -147,7 +147,7 @@ > @ stub GetUdpStatsFromStack > @ stdcall GetUdpTable( ptr ptr long ) > @ stub GetUdpTableFromStack > -#@ stub GetUnicastIpAddressEntry > +@ stdcall GetUnicastIpAddressEntry( ptr ) > #@ stub GetUnicastIpAddressTable > @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) > @ stdcall Icmp6CreateFile() > diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c > index 1daf54d..ff0ad3f 100644 > --- a/dlls/iphlpapi/iphlpapi_main.c > +++ b/dlls/iphlpapi/iphlpapi_main.c > @@ -2467,6 +2467,83 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, > return ret; > } > > +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) > +{ > + char buf[MAX_ADAPTER_NAME], *name; > + IP_ADAPTER_ADDRESSES *aa, *ptr; > + ULONG size = 0; > + DWORD ret; > + > + TRACE("%p\n", row); > + > + if (!row) > + return ERROR_INVALID_PARAMETER; > + > + if ((!(name = getInterfaceNameByIndex( row->InterfaceIndex, buf )) && > + !(name = getInterfaceNameByIndex( row->InterfaceLuid.Info.NetLuidIndex, buf )))) > + return ERROR_FILE_NOT_FOUND; > + > + GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size); > + ptr = HeapAlloc(GetProcessHeap(), 0, size); > + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &size); Is it possible to restrict GetAdaptersAddresses family to the one passed in the row? Because in the loop below you check if it matches and skip. If it is possible you could get rid of the row->Address.si_family != uaaddr->si_family test in the loop. > + if (FAILED(ret)) > + { > + HeapFree(GetProcessHeap(), 0, ptr); > + return ret; > + } > + > + ret = ERROR_FILE_NOT_FOUND; > + > + for (aa = ptr; aa; aa = aa->Next) > + { > + IP_ADAPTER_UNICAST_ADDRESS *ua; > + > + if (aa->u.s.IfIndex != row->InterfaceIndex) > + continue; > + > + ret = ERROR_NOT_FOUND; > + > + if (!aa->FirstUnicastAddress) > + continue; Is this really necessary? Since the while will not loop if ua = NULL too. > + ua = aa->FirstUnicastAddress; > + while (ua) > + { > + SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; > + if (row->Address.si_family != uaaddr->si_family) > + { > + ua = ua->Next; > + continue; > + } > + > + if ((row->Address.si_family == WS_AF_INET6 && !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(row->Address.Ipv6.sin6_addr))) || > + (row->Address.si_family == WS_AF_INET && !memcmp(&row->Address.Ipv4.sin_addr, &uaaddr->Ipv4.sin_addr, sizeof(row->Address.Ipv4.sin_addr)))) > + { > + memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); > + row->InterfaceIndex = aa->u.s.IfIndex; > + row->PrefixOrigin = ua->PrefixOrigin; > + row->SuffixOrigin = ua->SuffixOrigin; > + row->ValidLifetime = ua->ValidLifetime; > + row->PreferredLifetime = ua->PreferredLifetime; > + row->OnLinkPrefixLength = ua->OnLinkPrefixLength; > + row->SkipAsSource = 0; > + row->DadState = ua->DadState; > + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && row->Address.si_family == WS_AF_INET6) > + row->ScopeId.Value = aa->Ipv6IfIndex; > + else > + row->ScopeId.Value = 0; As I said in the tests and just to say again, that I don't know where this scopeid = ifindex comes from. > + NtQuerySystemTime(&row->CreationTimeStamp); > + HeapFree(GetProcessHeap(), 0, ptr); > + return NO_ERROR; > + } > + ua = ua->Next; > + } > + } > + HeapFree(GetProcessHeap(), 0, ptr); > + > + return ret; > +} > + Best wishes, Bruno

1 0

Re: [2/2] iphlpapi/tests: Add tests for GetUnicastIpAddressEntry (resend)
by Bruno Jesus 03 Feb '17

03 Feb '17

On Thu, Feb 2, 2017 at 9:09 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > resending, because of bad timing together with the testbot > > dlls/iphlpapi/tests/iphlpapi.c | 102 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 102 insertions(+) > > diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c > index e4a5864..3814548 100644 > --- a/dlls/iphlpapi/tests/iphlpapi.c > +++ b/dlls/iphlpapi/tests/iphlpapi.c > @@ -75,6 +75,7 @@ static DWORD (WINAPI *pGetTcpTable)(PMIB_TCPTABLE,PDWORD,BOOL); > static DWORD (WINAPI *pGetUdpTable)(PMIB_UDPTABLE,PDWORD,BOOL); > static DWORD (WINAPI *pGetPerAdapterInfo)(ULONG,PIP_PER_ADAPTER_INFO,PULONG); > static DWORD (WINAPI *pGetAdaptersAddresses)(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); > +static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); > static DWORD (WINAPI *pNotifyAddrChange)(PHANDLE,LPOVERLAPPED); > static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); > static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); > @@ -123,6 +124,7 @@ static void loadIPHlpApi(void) > pGetUdpTable = (void *)GetProcAddress(hLibrary, "GetUdpTable"); > pGetPerAdapterInfo = (void *)GetProcAddress(hLibrary, "GetPerAdapterInfo"); > pGetAdaptersAddresses = (void *)GetProcAddress(hLibrary, "GetAdaptersAddresses"); > + pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); > pNotifyAddrChange = (void *)GetProcAddress(hLibrary, "NotifyAddrChange"); > pCancelIPChangeNotify = (void *)GetProcAddress(hLibrary, "CancelIPChangeNotify"); > pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); > @@ -1965,6 +1967,105 @@ static void test_GetIfTable2(void) > pFreeMibTable( table ); > } > > +static void test_GetUnicastIpAddressEntry(void) > +{ > + IP_ADAPTER_ADDRESSES *aa, *ptr; > + MIB_UNICASTIPADDRESS_ROW row; > + DWORD ret, size; > + > + if (!pGetUnicastIpAddressEntry) > + { > + win_skip( "GetUnicastIpAddressEntry not available\n" ); > + return; > + } > + if (!pGetAdaptersAddresses) > + { > + win_skip("GetAdaptersAddresses not present\n"); > + return; > + } > + > + ret = pGetUnicastIpAddressEntry( NULL ); > + ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + ret = pGetUnicastIpAddressEntry( &row ); > + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.Address.Ipv4.sin_family = AF_INET; > + row.Address.Ipv4.sin_port = 0; > + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = 123; > + ret = pGetUnicastIpAddressEntry( &row ); > + todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = get_interface_index(); > + row.Address.Ipv4.sin_family = AF_INET; > + row.Address.Ipv4.sin_port = 0; > + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == ERROR_NOT_FOUND, "got %u\n", ret ); > + > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = 123; > + row.Address.Ipv4.sin_family = AF_INET; > + row.Address.Ipv4.sin_port = 0; > + row.Address.Ipv4.sin_addr.S_un.S_addr = 0x01020304; > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret ); > + > + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size); > + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); > + if (ret != ERROR_BUFFER_OVERFLOW) return; > + > + ptr = HeapAlloc(GetProcessHeap(), 0, size); > + ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES | GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &size); > + ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); > + > + for (aa = ptr; !ret && aa; aa = aa->Next) > + { > + IP_ADAPTER_UNICAST_ADDRESS *ua; > + > + ua = aa->FirstUnicastAddress; > + while (ua) > + { > + memset( &row, 0, sizeof(row) ); > + row.InterfaceIndex = S(U(*aa)).IfIndex; > + memcpy(&row.Address, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); > + > + ret = pGetUnicastIpAddressEntry( &row ); > + ok( ret == NO_ERROR, "got %u\n", ret ); > + ok( row.InterfaceIndex == S(U(*aa)).IfIndex, "got %u\n", row.InterfaceIndex ); > + if (ret == NO_ERROR) > + { > + ok(row.InterfaceLuid.Info.Reserved == aa->Luid.Info.Reserved, "Expected %d, got %d\n", aa->Luid.Info.Reserved, row.InterfaceLuid.Info.Reserved); > + ok(row.InterfaceLuid.Info.NetLuidIndex == aa->Luid.Info.NetLuidIndex, "Expected %d, got %d\n", aa->Luid.Info.NetLuidIndex, row.InterfaceLuid.Info.NetLuidIndex); > + ok(row.InterfaceLuid.Info.IfType == aa->Luid.Info.IfType, "Expected %d, got %d\n", aa->Luid.Info.IfType, row.InterfaceLuid.Info.IfType); > + ok(row.InterfaceIndex == aa->IfIndex, "Expected %d, got %d\n", aa->IfIndex, row.InterfaceIndex); > + ok(row.PrefixOrigin == ua->PrefixOrigin, "Expected %d, got %d\n", ua->PrefixOrigin, row.PrefixOrigin); > + ok(row.SuffixOrigin == ua->SuffixOrigin, "Expected %d, got %d\n", ua->SuffixOrigin, row.SuffixOrigin); > + ok(row.ValidLifetime == ua->ValidLifetime, "Expected %d, got %d\n", ua->ValidLifetime, row.ValidLifetime); > + ok(row.PreferredLifetime == ua->PreferredLifetime, "Expected %d, got %d\n", ua->PreferredLifetime, row.PreferredLifetime); > + ok(row.OnLinkPrefixLength == ua->OnLinkPrefixLength, "Expected %d, got %d\n", ua->OnLinkPrefixLength, row.OnLinkPrefixLength); > + ok(row.SkipAsSource == 0, "Expected 0, got %d\n", row.SkipAsSource); > + ok(row.DadState == ua->DadState, "Expected %d, got %d\n", ua->DadState, row.DadState); Some of these lines are a bit too long, like over 170 characters. Can you break line between message and parameters? > + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && row.Address.si_family == AF_INET6) > + ok(row.ScopeId.Value == aa->Ipv6IfIndex || broken(row.ScopeId.Value == 0), "Expected %d, got %d\n", aa->Ipv6IfIndex, row.ScopeId.Value); Is this really true? The index is supposed to be the same as scope ID? The broken makes it suspicious. I can't find any docs to back that. > + else > + ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); > + ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); > + } > + ua = ua->Next; > + } > + } > + HeapFree(GetProcessHeap(), 0, ptr); > +} > + > START_TEST(iphlpapi) > { > > @@ -1989,6 +2090,7 @@ START_TEST(iphlpapi) > test_interface_identifier_conversion(); > test_GetIfEntry2(); > test_GetIfTable2(); > + test_GetUnicastIpAddressEntry(); > freeIPHlpApi(); > } > } > -- > 2.7.4 > > >

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel February 2017