April 2019 - Wine-devel - list.winehq.org

wine-4.0.1-rc1 Available
by Michael Stefaniuc 27 Apr '19

27 Apr '19

Hello guys, I have pushed wine-4.0.1-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Nothing fancy for the start. So without further ado the interesting stuff from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes - Sinhala and Tamil translation updates ---------------------------------------------------------------- Bugs fixed in 4.0.1 (total 44): 8226 DlgDirListComboBox does not fail properly on bad path spec argument 23863 The Bard's Tale (2005): unplayable due to almost completely black screen 26653 Multiple VB6 applications need oleaut32 VarRound to support VT_DECIMAL 28140 Theatre of War 3: Korea demo 1.2.0 crashes on startup (hook engine can't cope with GOT/PIC register load code at API entry, needs DECLSPEC_HOTPATCH for kernel32.SizeofResource and kernel32.FindClose) 31954 Second Sight hangs with a black screen after the intro videos 33456 D3DXMatrixTransformation: Broken calculation when scalingrotation and scaling is used 35516 Microworlds EX hangs when clicking toolbar button 37705 Heroes of Might and Magic VI Shades of Darkness Textures Fail to Display in Most Campaign Maps 38138 Avencast: Rise of the Mage: invisible doors 38558 cmd.exe bundled with Windows XP messed up when using FOR /F 39663 GOG Galaxy client 1.x hangs or reports 'Something went wrong during DeelevateStrategy' error in Win7 mode (GOG Galaxy service needs wtsapi32.WTSQueryUserToken implementation) 39890 Orcish Inn fails to start with exception System.NotImplementedException 40441 Chicken tournament crashes when loading texture 44300 Windows Media Player 7.1 fails to play media due to unimplemented function wmvcore.dll.WMCheckURLExtension 44469 Multiple apps using Windows 10 v1507+ UCRT crash due to multiple missing api-ms-win-crt-private-l1-1-0.dll._o__xxx stubs/forwards (Win10 DISM pkgmgr.exe, MS DirectX Shader Compiler) 45326 Multiple 64-bit kernel drivers crash on unimplemented function ntoskrnl.exe.__C_specific_handler (NoxPlayer 6.x, MTA:SA 1.5.x) 45473 Rogue Squadron 3D crashes on startup 45631 League of Legends client crashes when joining a lobby with other players 45632 Garena client v2.0.x crashes on startup ('ntdll.NtQueryVirtualMemory' needs to validate 'MemoryInformationLength' before writing to buffer) 46127 aria2 1.34 fails to connect, reports 'WinTLS: Channel setup failed. Schannel provider did not fulfill requested flags. Excepted: 33180 Actual: 33052' 46298 Middle-earth: Shadow of War (steam appid 356190) crashes on launch 46300 Yousician: unimplemented function mfplat.dll.MFGetSystemTime 46303 Warcraft 3: Reign of Chaos (Czech language) can't be installed from CD 46318 vbscript doesn't parse if identifier is also keyword token 46319 32-bit IL-only executable launched as 32-bit subprocess on Wine and 64-bit subprocess on Windows 46387 ReactOS/Windows XP TASKMGR: Column headers don't scroll when scrolling horizontally (multiple listview or header control) 46442 FormatCurrency(9) returns .9.00 (period in front) 46465 Visual Studio 2015 crashes on unimplemented function msvcp140.dll._Equivalent 46481 strftime has a buffer overflow 46482 Gas Guzzlers Combat Carnage crashes when changing screen resolution 46485 PBM_STEPIT crashes with division by zero when MinVal == MaxVal == 0 46493 Functions ilogb* are not implemented 46494 64bit WinMerge crash after clicking "About WinMerge" 46499 Multiple games crash in GetRawInputData when exiting(House Party, Murderous Pursuits, ICEY) 46520 Kindred Spirits on the Roof crashes 46536 Empire Earth (GOG version) main menu rendering is broken 46569 ToDoList 7.1 : fails to launch after WINE upgrade to 4.0 version 46581 HeidiSQL generates OLE error when executing custom queries against MSSQL server. 46583 LINE latest version doesn't work 46678 Width of latin characters is wrong with some fonts. 46691 comctl32/tests/propsheet.c shows uninitalized memory use 46708 Photoline crashed right after start, no problem with wine 3.0.4 46729 Wine directx not detecting Intel HD Graphics 620 (Rev 02) chipset 46907 msi crashes in RemoveFiles action for a broken msi ---------------------------------------------------------------- Changes since 4.0.0: Alexandre Julliard (2): server: Report a 64-bit CPU for IL-only binaries. dinput: Add error check to silence a compiler warning. Alistair Leslie-Hughes (4): dsound: IDirectSoundNotify is only available when DSBCAPS_CTRLPOSITIONNOTIFY is specified. mfplat: Implement MFGetSystemTime. oleaut32: Correctly get the Currency separator in VarFormatCurrency. oleaut32: Support VT_DECIMAL in VarRound. Andrew Eikum (1): winhttp: Don't crash setting up secure proxy. Brendan McGrath (2): vbscript: Allow more keywords to be used as identifiers. vbscript: Allow most keywords to be used as 'dot' identifiers. David Adam (2): ddraw/tests: Add tests for the "dwMipMapCount" field of texture sub-levels. ddraw: Fix the "dwMipMapCount" field of texture sub-levels. Dmitry Timoshkov (2): windowscodecs: Implement IWICPalette::InitializeFromBitmap. wpcap: Fix compilation with recent pcap/pcap.h versions. Fabian Maurer (2): api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 (WinBuild.160101.0800). ucrtbase: Forward a few functions for dxil.dll and pkgmgr.exe. Gabriel Ivăncescu (1): libport: Handle partially overlapping buffers. Gijs Vermeulen (3): msvcp140: Export _Equivalent and port tests. ntdll: Validate len in NtQueryVirtualMemory. kernel32: Add DECLSPEC_HOTPATCH to SizeofResource(). Hans Leidekker (3): secur32: Return ISC_RET_USED_SUPPLIED_CREDS for schannel contexts if the feature was requested. mscms: Add a partial implementation of WcsOpenColorProfileA/W. msi: Avoid a crash in RemoveFiles if the component directory is invalid. Isira Seneviratne (10): po: Update Sinhala translation. po: Update Sinhala translation. po: Update Sinhala translation. po: Add Tamil translation. po: Update Tamil translation. po: Update Tamil translation. kernel32: Add the Sinhala NLS file. kernel32: Fix LOCALE_SSCRIPTS value for Sinhala. kernel32/nls: Fix some values in Sinhala NLS file. kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA. Jacek Caban (1): ntoskrnl.exe: Add __C_specific_handler entry. Józef Kucia (3): ddraw: Pass correct box when mapping system memory vertex buffers. d3d9: Validate surface parameter in d3d9_device_ColorFill(). wined3d: Add GPU information for Intel HD Graphics 620. Ken Thomases (1): loader: On Mac, move the top-down allocations area down to avoid regions reserved by the system. Mark Jansen (1): msi: Do not leak rootkey. Matteo Bruni (3): d3dx9: Improve D3DXMatrixTransformation() implementation. d3dx9: Improve D3DXMatrixTransformation2D(). d3dx9/tests: Avoid some 64-bit test failures. Michael Stefaniuc (1): tools: Get the ANNOUNCE bug list from the stable-notes git notes. Nikolay Sivov (9): api-ms-win-core-libraryloader-l1-2-1: Add missing FindResourceW() forward. comctl32/progress: Handle min == max case in PBM_STEPIT. user32/dialog: Fix setting negative dialog item ids. d3d11: Implement d3d11_device_GetImmediateContext1(). comctl32/listview: Take care of scrolling offset when repositioning header. comctl32/propsheet: Avoid posting uninitialized data (Valgrind). comctl32/toolbar: Send BN_CLICKED for button that was pressed, not released. usp10: Use single path for all fonts in ScriptGetCMap(). ucrtbase: Add ilogb* functions. Paul Gofman (8): wined3d: Use lower 8 bits only from _ALPHAREF state. wined3d: Return 1e10f for MaxVertexW from wined3d_get_device_caps(). wined3d: Only use the LSB of the _SAMP_SRGB_TEXTURE state value. kernel32/tests: Add test for overlapped file read. ntdll/tests: Add more tests for overlapped file read. ntdll: Return STATUS_PENDING from NtReadFile() for async read in case of no buffering. kernel32: Add DECLSPEC_HOTPATCH to FindClose(). user32: Select more appropriate stretch mode for colored images interpolation. Piotr Caban (4): msvcrt: Optimize tolower function when locale was never changed. msvcrt: Optimize toupper function when locale was never changed. msvcp140: Don't forward __ExceptionPtrCreate to msvcr120. msvcrt: Fix buffer overflow in _get_tzname. Sebastian Lackner (1): wtsapi32: Improve WTSQueryUserToken stub. Sveinar Søpler (1): wined3d: Add GPU information for the NVIDIA RTX series. Sven Baars (14): windowscodecs: Fix a memory leak (Valgrind). gdiplus: Fix a memory leak on error path (Valgrind). wsdapi: Fix some memory leaks (Valgrind). strmbase: Fix some memory leaks (Valgrind). ole32: Fix some memory leaks (Valgrind). mstask: Fix some memory leaks on error path (Valgrind). mstask: Move memory allocation to avoid a memory leak (Valgrind). taskschd: Fix some memory leaks (Valgrind). dinput: Free the device after a callback (Valgrind). riched20: Fix IRichEditOle COM aggregation (Valgrind). ws2_32: Use heap_realloc instead of HeapReAlloc to avoid an invalid realloc (Valgrind). windowscodecs: Add missing source_bpp initialization (Valgrind). setupapi: Add a missing return statement (Coverity). dsound: Add missing SetEventHandle error handling (Coverity). Vijay Kiran Kamuju (2): user32: Add DlgDirList wildcard checks. wmvcore: Add stub for WMCheckURlExtension. Zebediah Figura (5): comsvcs/tests: Add tests for implicit MTA creation in RegisterDispenser(). comsvcs: Create an implicit MTA thread in RegisterDispenser(). msvcr120: Add nexttoward implementation. hid: Handle overlapped file handles. ntdll: Avoid crashing while tracing parameters to NtCreateNamedPipeFile(). Zhiyi Zhang (5): msacm32: Reference count local drivers. user32: Check for null handle in GetRawInputData(). kernel32: Add DECLSPEC_HOTPATCH to VirtualAllocEx(). d3d8: Fix building on Mac. user32: Fix a memory leak. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH 1/2] avicap32: Fix compilation with older videodev2.h
by Martin Storsjo 27 Apr '19

27 Apr '19

Older videodev2.h lack the V4L2_CAP_DEVICE_CAPS define and the device_caps field in the v4l2_capability struct. Even if Wine is built with --without-v4l2, this code section is compiled, because it is compiled in as long as the videodev2.h header is found. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/avicap32/avicap32_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 1c4170e239..9e2a99d4c7 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -129,9 +129,11 @@ static BOOL query_video_device(int devnum, char *name, int namesize, char *versi memset(&caps, 0, sizeof(caps)); if (xioctl(fd, VIDIOC_QUERYCAP, &caps) != -1) { BOOL isCaptureDevice; +#ifdef V4L2_CAP_DEVICE_CAPS if (caps.capabilities & V4L2_CAP_DEVICE_CAPS) isCaptureDevice = caps.device_caps & V4L2_CAP_VIDEO_CAPTURE; else +#endif isCaptureDevice = caps.capabilities & V4L2_CAP_VIDEO_CAPTURE; if (isCaptureDevice) { lstrcpynA(name, (char *)caps.card, namesize); -- 2.17.1

1 1

RE: [PATCH] setupapi: Rewrite DiskSpaceList logic using lists.
by Jefferson Carpenter 27 Apr '19

27 Apr '19

-typedef struct { - WCHAR lpzName[20]; - LONGLONG dwFreeSpace; - LONGLONG dwWantedSpace; -} DRIVE_ENTRY, *LPDRIVE_ENTRY; +struct file_entry +{ + struct list entry; + WCHAR *path; + UINT operation; + LONGLONG size; +}; + +struct space_list +{ + struct list files; + UINT flags; +}; -typedef struct { - DWORD dwDriveCount; - DRIVE_ENTRY Drives[26]; -} DISKSPACELIST, *LPDISKSPACELIST; Until tests are written that constrain the behavior of this module, I'm not sure it makes sense to alter the structs here. - rc = GetLogicalDriveStringsW(255,drives); - - if (rc == 0) - return NULL; - - list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); - - list->dwDriveCount = 0; - - ptr = drives; - - while (*ptr) + list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)); + if (list) { - DWORD type = GetDriveTypeW(ptr); - if (type == DRIVE_FIXED) - { - DWORD clusters; - DWORD sectors; - DWORD bytes; - DWORD total; - lstrcpyW(list->Drives[list->dwDriveCount].lpzName,ptr); - GetDiskFreeSpaceW(ptr,&sectors,&bytes,&clusters,&total); - list->Drives[list->dwDriveCount].dwFreeSpace = clusters * sectors * - bytes; - list->Drives[list->dwDriveCount].dwWantedSpace = 0; - list->dwDriveCount++; - } - ptr += lstrlenW(ptr) + 1; + list->flags = flags; + list_init(&list->files); } + Likewise, I see no reason to alter this behavior until there are tests for it. +struct file_entry +{ + struct list entry; + WCHAR *path; + UINT operation; + LONGLONG size; +}; + +struct space_list +{ + struct list files; + UINT flags; +}; If flags and operation were a bitfield and enum respectively (instead of UINT and UINT) the compiler could aid us in detecting unintended implicit conversions so far as they go, and it would be easier to find the values that those fields can correctly be assigned to in the source code. Only at API boundaries must the types be precisely the types chosen by Microsoft. -BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) +BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC diskspace) { - LPDISKSPACELIST list = DiskSpace; - HeapFree(GetProcessHeap(),0,list); + struct space_list *list = diskspace; + struct file_entry *file, *file2; + + if (!diskspace) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(file, file2, &list->files, struct file_entry, entry) + { + HeapFree(GetProcessHeap(), 0, file->path); + list_remove(&file->entry); + HeapFree(GetProcessHeap(), 0, file); + } + + HeapFree(GetProcessHeap(), 0, list); return TRUE; } Note this function is also longer after the above modifications to the data structures. You should write tests that confirm the computations and effects of SetupAPI, and then write the Wine implementation guided by those. - Jefferson

2 1

Wine staging 4.7 release
by Alistair Leslie-Hughes 27 Apr '19

27 Apr '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 4.7 (839 patches are applied to wine vanilla) NOTE: FAudio will not be supported until distro's have FAudio library as part of their standard repositories. Upstreamed (Either directly from staging or fixed with a similar patch). * qwave: Added QOSCreateHandle stub. * mciavi32: Add Support for MCI_MCIAVI_PLAY_FULLSCREEN. * Report system information SystemPerformanceInformation info class. * ntdll: Implement basic IO stats for SystemPerformanceInformation in NtQuerySystemInformation. * wintrust: use enhanced crypto provider in VerifyImageHash. * avifile.dll16: Correctly convert result of AVIStreamGetFrame to a segptr. * avifile.dll16: Convert between AVISTREAMINFO (16 bit) and AVISTREAMINFOA. * server: Add default security descriptor ownership for processes. * server: Add default security descriptor DACL for processes. Added: * [46972] combase: Add GetRestrictedErrorInfo/RoOriginateLanguageException stubs. * [46558] windowscodecs: Byte swap png read/write for 16-bpp data. * [46309] winex11.drv: Use root-relative coordinates for events, if possible. * [15346] winex11.drv: Query the X server for the actual rect of the window before unmapping it. * [47074] gdi32: Add D3DKMTQueryStatistics stub. Updated: * ntdll-Junction_Points * eventfd_synchronization * server-Desktop_Refcount Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

2 1

[PATCH] server: Create primary group using DOMAIN_GROUP_RID_USERS.
by Vijay Kiran Kamuju 27 Apr '19

27 Apr '19

From: Qian Hong <qhong(a)codeweavers.com> From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 2 +- server/token.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a22014793ff..aee45874257 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3016,7 +3016,7 @@ static void test_process_security(void) ok(res, "GetTokenInformation failed with error %d\n", GetLastError()); UserSid = user->User.Sid; test_sid_str(UserSid); - todo_wine ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); + ok(EqualPrefixSid(UsersSid, UserSid), "TokenPrimaryGroup Sid and TokenUser Sid don't match.\n"); CloseHandle( token ); if (!res) diff --git a/server/token.c b/server/token.c index 895809e7252..e0f28c6da6e 100644 --- a/server/token.c +++ b/server/token.c @@ -839,6 +839,7 @@ struct token *token_create_admin( void ) { security_local_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_interactive_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { security_authenticated_user_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, + { security_domain_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_OWNER }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, -- 2.17.0

1 0

[PATCH] winecfg: Correct Windows Server version names.
by Isira Seneviratne 27 Apr '19

27 Apr '19

1 0

[PATCH v2 2/2] po: Update French translation.
by Isira Seneviratne 27 Apr '19

27 Apr '19

1 0

[PATCH v2 1/2] po: Update Sinhala translation.
by Isira Seneviratne 27 Apr '19

27 Apr '19

1 0

[PATCH] advapi32/tests: Extend security label / token integrity tests.
by Vijay Kiran Kamuju 27 Apr '19

27 Apr '19

From: Michael Müller <michael(a)fds-team.de> Fix tests for Win2008 and make the variables global. From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/Makefile.in | 2 +- dlls/advapi32/tests/security.c | 402 ++++++++++++++++++++++++++++++-- 2 files changed, 390 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/tests/Makefile.in b/dlls/advapi32/tests/Makefile.in index 36ce031ef62..4437e6e5de7 100644 --- a/dlls/advapi32/tests/Makefile.in +++ b/dlls/advapi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = advapi32.dll -IMPORTS = ole32 advapi32 +IMPORTS = ole32 user32 advapi32 C_SRCS = \ cred.c \ diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a22014793ff..51d462d687b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -139,6 +139,13 @@ static HMODULE hmod; static int myARGC; static char** myARGV; +static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_LOW_RID}}; +static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_MEDIUM_RID}}; +static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + #define SID_SLOTS 4 static char debugsid_str[SID_SLOTS][256]; static int debugsid_index = 0; @@ -6292,10 +6299,6 @@ static void test_TokenIntegrityLevel(void) HANDLE token; DWORD size; DWORD res; - static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, - {SECURITY_MANDATORY_HIGH_RID}}; - static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, - {SECURITY_MANDATORY_MEDIUM_RID}}; SetLastError(0xdeadbeef); res = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); @@ -6471,10 +6474,6 @@ static void test_AddAce(void) static void test_AddMandatoryAce(void) { - static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, - {SECURITY_MANDATORY_LOW_RID}}; - static SID medium_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, - {SECURITY_MANDATORY_MEDIUM_RID}}; static SID_IDENTIFIER_AUTHORITY sia_world = {SECURITY_WORLD_SID_AUTHORITY}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd2, *sd = (SECURITY_DESCRIPTOR *)&buffer_sd; @@ -7112,15 +7111,15 @@ static void test_token_label(void) static void test_token_security_descriptor(void) { - static SID low_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, - {SECURITY_MANDATORY_LOW_RID}}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; - SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2; + SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)&buffer_sd, *sd2, *sd3; char buffer_acl[256], buffer[MAX_PATH]; - ACL *acl = (ACL *)&buffer_acl, *acl2, *acl_child; + ACL *acl = (ACL *)&buffer_acl, *acl2, *acl_child, *sacl; BOOL defaulted, present, ret, found; - HANDLE token, token2, token3; + HANDLE token, token2, token3, token4, token5, token6; EXPLICIT_ACCESSW exp_access; + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer_integrity[64]; PROCESS_INFORMATION info; DWORD size, index, retd; ACCESS_ALLOWED_ACE *ace; @@ -7271,6 +7270,186 @@ static void test_token_security_descriptor(void) /* The security label is also not inherited */ if (pAddMandatoryAce) { + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "Expected medium or high integrity level\n"); + + if (EqualSid(tml->Label.Sid, &high_level)) + { + DWORD process_id; + HANDLE process; + HWND shell; + + /* This test tries to get a medium token and then impersonates this token. The + * idea is to check whether the sd label of a newly created token depends on the + * current active token or the integrity level of the newly created token. */ + + /* Steal process token of the explorer.exe process */ + shell = GetShellWindow(); + todo_wine ok(shell != NULL, "Failed to get shell window\n"); + if (!shell) shell = GetDesktopWindow(); /* FIXME: Workaround for Wine */ + ok(GetWindowThreadProcessId(shell, &process_id), + "Failed to get process id of shell window: %u\n", GetLastError()); + process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, process_id); + ok(process != NULL, "Failed to open process: %u\n", GetLastError()); + ok(OpenProcessToken(process, TOKEN_ALL_ACCESS, &token4), + "Failed to open process token: %u\n", GetLastError()); + CloseHandle(process); + + /* Check TokenIntegrityLevel and LABEL_SECURITY_INFORMATION of explorer.exe token */ + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token4, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + todo_wine ok(EqualSid(tml->Label.Sid, &medium_level)||EqualSid(tml->Label.Sid,&high_level), + "Expected medium or high (Win2008) integrity level\n"); + + size = 0; + ret = GetKernelObjectSecurity(token4, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %u, error %u\n", ret, GetLastError()); + + sd3 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = GetKernelObjectSecurity(token4, LABEL_SECURITY_INFORMATION, sd3, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + sacl = NULL; + ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + ok(present, "No SACL in the security descriptor\n"); + ok(sacl != NULL, "NULL SACL in the security descriptor\n"); + + if (sacl) + { + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + todo_wine ok(EqualSid(&ace->SidStart, &medium_level)||EqualSid(&ace->SidStart,&high_level), + "Expected medium or high (Win2008) integrity level\n"); + } + + HeapFree(GetProcessHeap(), 0, sd3); + + /* Start child process with the explorer.exe token */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "%s tests/security.c test_token_sd_medium", myARGV[0]); + ret = CreateProcessAsUserA(token4, NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); + ok(ret || GetLastError() == ERROR_PRIVILEGE_NOT_HELD, + "CreateProcess failed with error %u\n", GetLastError()); + if (ret) + { + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } + else + win_skip("Skipping test for creating process with medium level token\n"); + + ret = DuplicateTokenEx(token4, 0, NULL, SecurityImpersonation, TokenImpersonation, &token5); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + ret = SetThreadToken(NULL, token5); + todo_wine ok(ret, "SetThreadToken failed with error %u\n", GetLastError()); + CloseHandle(token4); + + /* Restrict current process token while impersonating a medium integrity token */ + ret = CreateRestrictedToken(token, 0, 0, NULL, 0, NULL, 0, NULL, &token6); + ok(ret, "CreateRestrictedToken failed with error %u\n", GetLastError()); + + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token6, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + ok(EqualSid(tml->Label.Sid, &high_level), "Expected high integrity level\n"); + + size = 0; + ret = GetKernelObjectSecurity(token6, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %u, error %u\n", ret, GetLastError()); + + sd3 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = GetKernelObjectSecurity(token6, LABEL_SECURITY_INFORMATION, sd3, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + sacl = NULL; + ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "No SACL in the security descriptor\n"); + todo_wine ok(sacl != NULL, "NULL SACL in the security descriptor\n"); + + if (sacl) + { + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, &medium_level)||EqualSid(&ace->SidStart,&high_level), + "Expected medium or high (Win2008) integrity level\n"); + } + + HeapFree(GetProcessHeap(), 0, sd3); + RevertToSelf(); + CloseHandle(token5); + + /* Start child process with the restricted token */ + sprintf(buffer, "%s tests/security.c test_token_sd_restricted", myARGV[0]); + ret = CreateProcessAsUserA(token6, NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); + ok(ret, "CreateProcess failed with error %u\n", GetLastError()); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + CloseHandle(token6); + + /* DuplicateTokenEx should assign security label even when SA points to empty SD */ + memset(sd, 0, sizeof(buffer_sd)); + ret = InitializeSecurityDescriptor(sd, SECURITY_DESCRIPTOR_REVISION); + ok(ret, "InitializeSecurityDescriptor failed with error %u\n", GetLastError()); + + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = sd; + sa.bInheritHandle = FALSE; + + ret = DuplicateTokenEx(token, 0, &sa, 0, TokenPrimary, &token6); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + size = 0; + ret = GetKernelObjectSecurity(token6, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %u, error %u\n", ret, GetLastError()); + + sd3 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = GetKernelObjectSecurity(token6, LABEL_SECURITY_INFORMATION, sd3, size, &size); + todo_wine ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + sacl = NULL; + ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted); + todo_wine ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "No SACL in the security descriptor\n"); + todo_wine ok(sacl != NULL, "NULL SACL in the security descriptor\n"); + + if (sacl) + { + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, &high_level), + "Expected high integrity level\n"); + } + + HeapFree(GetProcessHeap(), 0, sd3); + CloseHandle(token6); + } + else + skip("Skipping test, running without admin rights\n"); + ret = InitializeAcl(acl, 256, ACL_REVISION); ok(ret, "InitializeAcl failed with error %u\n", GetLastError()); @@ -7286,6 +7465,90 @@ static void test_token_security_descriptor(void) ret = SetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd); ok(ret, "SetKernelObjectSecurity failed with error %u\n", GetLastError()); + + /* changing the label of the security descriptor does not change the integrity level of the token itself */ + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "Expected medium or high integrity level\n"); + + /* restricting / duplicating a token resets the mandatory sd label */ + ret = CreateRestrictedToken(token, 0, 0, NULL, 0, NULL, 0, NULL, &token4); + ok(ret, "CreateRestrictedToken failed with error %u\n", GetLastError()); + + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token4, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "Expected medium or high integrity level\n"); + + size = 0; + ret = GetKernelObjectSecurity(token4, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %u, error %u\n", ret, GetLastError()); + + sd3 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = GetKernelObjectSecurity(token4, LABEL_SECURITY_INFORMATION, sd3, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "No SACL in the security descriptor\n"); + todo_wine ok(sacl != NULL, "NULL SACL in the security descriptor\n"); + + if (sacl) + { + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, &medium_level) || EqualSid(&ace->SidStart, &high_level), + "Low integrity level should not have been inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd3); + CloseHandle(token4); + + ret = DuplicateTokenEx(token, 0, NULL, 0, TokenPrimary, &token4); + ok(ret, "DuplicateTokenEx failed with error %u\n", GetLastError()); + + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token4, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL*) buffer_integrity; + ok(EqualSid(tml->Label.Sid, &medium_level) || EqualSid(tml->Label.Sid, &high_level), + "Expected medium or high integrity level\n"); + + size = 0; + ret = GetKernelObjectSecurity(token4, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + todo_wine ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %u, error %u\n", ret, GetLastError()); + + sd3 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = GetKernelObjectSecurity(token4, LABEL_SECURITY_INFORMATION, sd3, size, &size); + todo_wine ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + sacl = NULL; + ret = GetSecurityDescriptorSacl(sd3, &present, &sacl, &defaulted); + todo_wine ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + todo_wine ok(present, "No SACL in the security descriptor\n"); + todo_wine ok(sacl != NULL, "NULL SACL in the security descriptor\n"); + + if (sacl) + { + ret = pGetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(EqualSid(&ace->SidStart, &medium_level) || EqualSid(&ace->SidStart, &high_level), + "Low integrity level should not have been inherited\n"); + } + + HeapFree(GetProcessHeap(), 0, sd3); + CloseHandle(token4); } else win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); @@ -7392,6 +7655,115 @@ static void test_child_token_sd(void) HeapFree(GetProcessHeap(), 0, sd); } +static void test_child_token_sd_restricted(void) +{ + static SID high_level = {SID_REVISION, 1, {SECURITY_MANDATORY_LABEL_AUTHORITY}, + {SECURITY_MANDATORY_HIGH_RID}}; + SYSTEM_MANDATORY_LABEL_ACE *ace_label; + BOOL ret, present, defaulted; + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer_integrity[64]; + SECURITY_DESCRIPTOR *sd; + HANDLE token; + DWORD size; + ACL *acl; + + if (!pAddMandatoryAce) + { + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + return; + } + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + ok(present, "SACL not present\n"); + ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + ok(EqualSid(&ace_label->SidStart, &high_level), + "Expected high integrity level\n"); + + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + ok(EqualSid(tml->Label.Sid, &high_level), "Expected high integrity level\n"); + + HeapFree(GetProcessHeap(), 0, sd); +} + +static void test_child_token_sd_medium(void) +{ + SYSTEM_MANDATORY_LABEL_ACE *ace_label; + BOOL ret, present, defaulted; + TOKEN_MANDATORY_LABEL *tml; + BYTE buffer_integrity[64]; + SECURITY_DESCRIPTOR *sd; + HANDLE token; + DWORD size; + ACL *acl; + + if (!pAddMandatoryAce) + { + win_skip("SYSTEM_MANDATORY_LABEL not supported\n"); + return; + } + + ret = OpenProcessToken(GetCurrentProcess(), MAXIMUM_ALLOWED, &token); + ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); + + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Unexpected GetKernelObjectSecurity return value %d, error %u\n", ret, GetLastError()); + + sd = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetKernelObjectSecurity(token, LABEL_SECURITY_INFORMATION, sd, size, &size); + ok(ret, "GetKernelObjectSecurity failed with error %u\n", GetLastError()); + + acl = NULL; + present = FALSE; + defaulted = TRUE; + ret = GetSecurityDescriptorSacl(sd, &present, &acl, &defaulted); + ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); + ok(present, "SACL not present\n"); + ok(acl && acl != (void *)0xdeadbeef, "Got invalid SACL\n"); + ok(!defaulted, "SACL defaulted\n"); + ok(acl->AceCount == 1, "Expected exactly one ACE\n"); + ret = pGetAce(acl, 0, (void **)&ace_label); + ok(ret, "GetAce failed with error %u\n", GetLastError()); + ok(ace_label->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace_label->Header.AceType); + todo_wine ok(EqualSid(&ace_label->SidStart, &medium_level)||EqualSid(&ace_label->SidStart,&high_level), + "Expected medium or high (Win2008) integrity level\n"); + + memset(buffer_integrity, 0, sizeof(buffer_integrity)); + ret = GetTokenInformation(token, TokenIntegrityLevel, buffer_integrity, sizeof(buffer_integrity), &size); + ok(ret, "GetTokenInformation failed with error %u\n", GetLastError()); + tml = (TOKEN_MANDATORY_LABEL *)buffer_integrity; + todo_wine ok(EqualSid(tml->Label.Sid, &medium_level)||EqualSid(tml->Label.Sid,&high_level), + "Expected medium or high (Win2008) integrity level\n"); + + HeapFree(GetProcessHeap(), 0, sd); +} + static void test_GetExplicitEntriesFromAclW(void) { static const WCHAR wszCurrentUser[] = { 'C','U','R','R','E','N','T','_','U','S','E','R','\0'}; @@ -7576,6 +7948,10 @@ START_TEST(security) { if (!strcmp(myARGV[2], "test_token_sd")) test_child_token_sd(); + else if (!strcmp(myARGV[2], "test_token_sd_restricted")) + test_child_token_sd_restricted(); + else if (!strcmp(myARGV[2], "test_token_sd_medium")) + test_child_token_sd_medium(); else test_process_security_child(); return; -- 2.17.0

2 1

[PATCH] netprofm: Implement and consolidate INetworkListManager::GetConnectivity
by Soeren Grunewald 26 Apr '19

26 Apr '19

Origin is constantly checking the connections status, which produces a lot of fixme's. To get rid of this, improve the existing implementation and lower the log-level from fixme to trace. For now we announce only IPV4 connection status, since we have to extend the structures for IPV6. Since we actually have used a similar functionality at three different places. To get rid of this we introduce a new helper function which returns us the status of a network object. This is then used at all occurrences. We also drop the status flags from the connection structure, since the status of a connection is equal to the status of the attached network object. This way we avoid code/data duplication. Instead we query the info directly from the attached network using the newly added function mentioned above. Finally we rework the code, which loops over all network objects to determine the best available connection. Signed-off-by: Soeren Grunewald <soeren.grunewald(a)gmx.net> --- dlls/netprofm/list.c | 60 +++++++++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index f6823f09cf..40a3710365 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -62,8 +62,6 @@ struct connection struct list entry; GUID id; INetwork *network; - VARIANT_BOOL connected_to_internet; - VARIANT_BOOL connected; }; struct connection_point @@ -477,13 +475,26 @@ static HRESULT WINAPI network_get_IsConnected( return S_OK; } +static NLM_CONNECTIVITY connectivitystate_from_network( struct network *network ) +{ + if ( network->connected_to_internet ) + return NLM_CONNECTIVITY_IPV4_INTERNET; + + if ( network->connected ) + return NLM_CONNECTIVITY_IPV4_SUBNET; + + return NLM_CONNECTIVITY_DISCONNECTED; +} + static HRESULT WINAPI network_GetConnectivity( INetwork *iface, NLM_CONNECTIVITY *pConnectivity ) { - FIXME( "%p, %p\n", iface, pConnectivity ); + struct network *network = impl_from_INetwork( iface ); + + TRACE( "%p, %p\n", iface, pConnectivity ); - *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + *pConnectivity = connectivitystate_from_network( network ); return S_OK; } @@ -1328,9 +1339,29 @@ static HRESULT WINAPI list_manager_GetConnectivity( INetworkListManager *iface, NLM_CONNECTIVITY *pConnectivity ) { - FIXME( "%p, %p\n", iface, pConnectivity ); + struct list_manager *mgr = impl_from_INetworkListManager( iface ); + struct network *network; + + NLM_CONNECTIVITY best = NLM_CONNECTIVITY_DISCONNECTED; + NLM_CONNECTIVITY state; - *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + TRACE( "%p, %p\n", iface, pConnectivity ); + + LIST_FOR_EACH_ENTRY( network, &mgr->networks, struct network, entry ) + { + state = connectivitystate_from_network( network ); + if ( state == NLM_CONNECTIVITY_IPV4_INTERNET ) + { + best = state; + break; + } + if ( state == NLM_CONNECTIVITY_IPV4_SUBNET ) + { + best = state; + } + } + + *pConnectivity = best; return S_OK; } @@ -1538,10 +1569,11 @@ static HRESULT WINAPI connection_get_IsConnectedToInternet( VARIANT_BOOL *pbIsConnected ) { struct connection *connection = impl_from_INetworkConnection( iface ); + struct network *network = impl_from_INetwork( connection->network ); TRACE( "%p, %p\n", iface, pbIsConnected ); - *pbIsConnected = connection->connected_to_internet; + *pbIsConnected = network->connected_to_internet; return S_OK; } @@ -1550,10 +1582,11 @@ static HRESULT WINAPI connection_get_IsConnected( VARIANT_BOOL *pbIsConnected ) { struct connection *connection = impl_from_INetworkConnection( iface ); + struct network *network = impl_from_INetwork( connection->network ); TRACE( "%p, %p\n", iface, pbIsConnected ); - *pbIsConnected = connection->connected; + *pbIsConnected = network->connected; return S_OK; } @@ -1561,9 +1594,12 @@ static HRESULT WINAPI connection_GetConnectivity( INetworkConnection *iface, NLM_CONNECTIVITY *pConnectivity ) { - FIXME( "%p, %p\n", iface, pConnectivity ); + struct connection *connection = impl_from_INetworkConnection( iface ); + struct network *network = impl_from_INetwork( connection->network ); - *pConnectivity = NLM_CONNECTIVITY_IPV4_INTERNET; + TRACE( "%p, %p\n", iface, pConnectivity ); + + *pConnectivity = connectivitystate_from_network( network ); return S_OK; } @@ -1701,8 +1737,6 @@ static struct connection *create_connection( const GUID *id ) ret->refs = 1; ret->id = *id; ret->network = NULL; - ret->connected = VARIANT_FALSE; - ret->connected_to_internet = VARIANT_FALSE; list_init( &ret->entry ); return ret; @@ -1748,12 +1782,10 @@ static void init_networks( struct list_manager *mgr ) if (aa->FirstUnicastAddress) { network->connected = VARIANT_TRUE; - connection->connected = VARIANT_TRUE; } if (aa->FirstGatewayAddress) { network->connected_to_internet = VARIANT_TRUE; - connection->connected_to_internet = VARIANT_TRUE; } connection->network = &network->INetwork_iface; -- 2.20.1

1 0