September 2018 - Wine-commits

Tag wine-3.16 : Alexandre Julliard : Release 3.16
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: refs/tags/wine-3.16 Tag: 2346a04549835658b5827283f87f4022d496b600 URL: https://source.winehq.org/git/wine.git/?a=tag;h=2346a04549835658b5827283f87… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 21:19:10 2018 +0200 Release 3.16

1 0

Alex Henrie : ntdll/tests: Handle case where process doesn' t have its own DEP policy.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: e3fe1b09468efc9d6faf8ec05a91e3972458b293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3fe1b09468efc9d6faf8ec0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 12 00:31:54 2018 -0600 ntdll/tests: Handle case where process doesn't have its own DEP policy. If neither MEM_EXECUTE_OPTION_ENABLE nor MEM_EXECUTE_OPTION_DISABLE is set in the ProcessExecuteFlags, the process is using the system DEP setting. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4..e7b07e5 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -38,6 +38,7 @@ static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); static BOOL is_wow64; @@ -96,6 +97,8 @@ static BOOL InitFunctionPtrs(void) pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + pGetSystemDEPPolicy = (void *)GetProcAddress(hkernel32, "GetSystemDEPPolicy"); + /* starting with Win7 */ pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); if (!pNtQuerySystemInformationEx) @@ -1851,7 +1854,7 @@ static void test_mapprotection(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); trace("Process execute flags %08x\n", oldflags); - if (oldflags & MEM_EXECUTE_OPTION_DISABLE) + if (!(oldflags & MEM_EXECUTE_OPTION_ENABLE)) { if (oldflags & MEM_EXECUTE_OPTION_PERMANENT) { @@ -1859,6 +1862,12 @@ static void test_mapprotection(void) return; } + if (pGetSystemDEPPolicy && pGetSystemDEPPolicy() == AlwaysOn) + { + skip("System policy requires noexec\n"); + return; + } + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); reset_flags = TRUE;

1 0

Józef Kucia : vkd3d: Do not hardcode aspect mask in d3d12_command_list_ClearUnorderedAccessViewUint ().
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: vkd3d Branch: master Commit: be4a775c07ce4142ecf2791ff9badf82069768aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be4a775c07ce4142ecf2791… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 14 14:19:53 2018 +0200 vkd3d: Do not hardcode aspect mask in d3d12_command_list_ClearUnorderedAccessViewUint(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index decff14..a7cac8f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3921,7 +3921,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID color.uint32[2] = values[2]; color.uint32[3] = values[3]; - range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.aspectMask = cpu_descriptor->uav.texture.vk_aspect_mask; range.baseMipLevel = cpu_descriptor->uav.texture.miplevel_idx; range.levelCount = 1; range.baseArrayLayer = cpu_descriptor->uav.texture.layer_idx; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4490ae2..10f1d83 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1692,6 +1692,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor->u.view = view; + descriptor->uav.texture.vk_aspect_mask = vkd3d_desc.format->vk_aspect_mask; descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; descriptor->uav.texture.layer_idx = vkd3d_desc.layer_idx; descriptor->uav.texture.layer_count = vkd3d_desc.layer_count; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6ba12f9..5aaa565 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -281,6 +281,7 @@ struct d3d12_desc } buffer; struct { + VkImageAspectFlags vk_aspect_mask; unsigned int miplevel_idx; unsigned int layer_idx; unsigned int layer_count;

1 0

Henri Verbeet : build: Fix the "missing widl" message.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: vkd3d Branch: master Commit: 5c9fa15d4d14d7dc874cc3725fa37e0509a8c607 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5c9fa15d4d14d7dc874cc37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 20:17:05 2018 +0430 build: Fix the "missing widl" message. I.e., print the name of the target instead of the prerequisite. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3ee2f13..1fdc916 100644 --- a/Makefile.am +++ b/Makefile.am @@ -157,7 +157,7 @@ if HAVE_WIDL $(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@ $(AM_V_at)$(RM) $@.tmp else - @echo "widl is required to generate $<" + @echo "widl is required to generate $@" endif EXTRA_DIST += $(vkd3d_demos_shaders)

1 0

Alexandre Julliard : testbot: Fix Perl syntax error.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: tools Branch: master Commit: 1bcd00996ebdef47983026c4de59bff8fceca5a3 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1bcd00996ebdef47983026c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 19:40:20 2018 +0200 testbot: Fix Perl syntax error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index e755b57..621b017 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -821,7 +821,7 @@ sub OnSubmit($) $Task->VM($BuildVM); my $Builds = { "exe32" => 1 }; - $Builds->{"exe64"} = 1 if (defined $self->GetParam("Run64"); + $Builds->{"exe64"} = 1 if defined $self->GetParam("Run64"); $Task->Timeout(GetBuildTimeout($Impacts, $Builds)); # Save the build step so the others can reference it

1 0

Francois Gouget : testbot: Use tighter build timeouts.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: tools Branch: master Commit: 9798c36416a595c3cd9c4195660c3c9850473af7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9798c36416a595c3cd9c419… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 14 16:54:00 2018 +0200 testbot: Use tighter build timeouts. There is no need to allow for a full rebuild if the patch only touches a few modules. This is particularly significant for Wine builds since they take longer. Reducing the timeouts ensures the TestBot will not be blocked longer than necessary should a task get stuck either due to an issue in the patch, or to a network issue. This also centralizes all build timeout calcultations in GetBuildTimeout(). Finally this slightly changes a couple of timeouts in the scheduler and activity modules because the $BuildTimeout and $ReconfigTimeout parameters are going away. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 16 +++++--- testbot/lib/WineTestBot/Activity.pm | 2 +- testbot/lib/WineTestBot/Config.pm | 53 +++++++++++++----------- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- testbot/lib/WineTestBot/PatchUtils.pm | 62 ++++++++++++++++++++++++----- testbot/lib/WineTestBot/Patches.pm | 19 +++++---- testbot/web/Submit.pl | 20 +++++++++- 7 files changed, 122 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=9798c36416a595c3cd9…

1 0

Bernhard Übelacker : wintab32: Correct ordinal in comment to the same as in the spec file.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 3f53876cda6726c55d69b308291ede984eeddd59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f53876cda6726c55d69b308… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Thu Sep 13 17:29:22 2018 +0200 wintab32: Correct ordinal in comment to the same as in the spec file. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 8db6217..17f9a11 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -457,7 +457,7 @@ UINT WINAPI WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput) } /*********************************************************************** - * WTOpenW (WINTAB32.2021) + * WTOpenW (WINTAB32.1021) */ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) { @@ -750,7 +750,7 @@ BOOL WINAPI WTOverlap(HCTX hCtx, BOOL fToTop) } /*********************************************************************** - * WTConfig (WINTAB32.61) + * WTConfig (WINTAB32.60) */ BOOL WINAPI WTConfig(HCTX hCtx, HWND hWnd) {

1 0

Michael Müller : virtdisk: Add GetStorageDependencyInformation stub.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 4ecb8b7e99a7cd9316125d4cdaf39a60b6d6be99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ecb8b7e99a7cd9316125d4c… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Sep 13 17:40:45 2018 +0200 virtdisk: Add GetStorageDependencyInformation stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/virtdisk.spec | 2 +- dlls/virtdisk/virtdisk_main.c | 21 +++++++++++++++++++++ include/virtdisk.h | 2 -- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec index 2946b66..6bd5f14 100644 --- a/dlls/virtdisk/virtdisk.spec +++ b/dlls/virtdisk/virtdisk.spec @@ -8,7 +8,7 @@ @ stub EnumerateVirtualDiskMetadata @ stub ExpandVirtualDisk @ stub GetAllAttachedVirtualDiskPhysicalPaths -@ stub GetStorageDependencyInformation +@ stdcall GetStorageDependencyInformation(long long long ptr ptr) @ stub GetVirtualDiskInformation @ stub GetVirtualDiskMetadata @ stub GetVirtualDiskOperationProgress diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c index 0da0dca..3e6c5c1 100644 --- a/dlls/virtdisk/virtdisk_main.c +++ b/dlls/virtdisk/virtdisk_main.c @@ -22,6 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "virtdisk.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(virtdisk); @@ -44,3 +46,22 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) return TRUE; } + +DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used) +{ + ULONG temp_size = sizeof(STORAGE_DEPENDENCY_INFO); + + FIXME("(%p, 0x%x, %u, %p, %p): stub\n", obj, flags, size, info, used); + + if (used) *used = temp_size; + + if (!info || !size) + return ERROR_INVALID_PARAMETER; + + if (size < temp_size) + return ERROR_INSUFFICIENT_BUFFER; + + info->NumberEntries = 0; + + return ERROR_SUCCESS; +} diff --git a/include/virtdisk.h b/include/virtdisk.h index ebca703..b4c07f3 100644 --- a/include/virtdisk.h +++ b/include/virtdisk.h @@ -20,8 +20,6 @@ #ifndef __WINE_VIRTDISK_DLL_H #define __WINE_VIRTDISK_DLL_H -#include <windows.h> - #ifdef __cplusplus extern "C" { #endif

1 0

Gijs Vermeulen : virtdisk/tests: Add GetStorageDependencyInformation tests.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 43d04a3289fb0c62fd64682c4da6fead951fa8dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=43d04a3289fb0c62fd64682c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 13 17:40:46 2018 +0200 virtdisk/tests: Add GetStorageDependencyInformation tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/virtdisk/tests/Makefile.in | 4 +++ dlls/virtdisk/tests/virtdisk.c | 64 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/configure b/configure index a3916ee..3a60728 100755 --- a/configure +++ b/configure @@ -19877,6 +19877,7 @@ wine_fn_config_makefile dlls/ver.dll16 enable_win16 wine_fn_config_makefile dlls/version enable_version wine_fn_config_makefile dlls/version/tests enable_tests wine_fn_config_makefile dlls/virtdisk enable_virtdisk +wine_fn_config_makefile dlls/virtdisk/tests enable_tests wine_fn_config_makefile dlls/vmm.vxd enable_win16 wine_fn_config_makefile dlls/vnbt.vxd enable_win16 wine_fn_config_makefile dlls/vnetbios.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 006f7d9..6936a71 100644 --- a/configure.ac +++ b/configure.ac @@ -3733,6 +3733,7 @@ WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/version) WINE_CONFIG_MAKEFILE(dlls/version/tests) WINE_CONFIG_MAKEFILE(dlls/virtdisk) +WINE_CONFIG_MAKEFILE(dlls/virtdisk/tests) WINE_CONFIG_MAKEFILE(dlls/vmm.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vnbt.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vnetbios.vxd,enable_win16) diff --git a/dlls/virtdisk/tests/Makefile.in b/dlls/virtdisk/tests/Makefile.in new file mode 100644 index 0000000..3ace1a7 --- /dev/null +++ b/dlls/virtdisk/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = virtdisk.dll + +C_SRCS = \ + virtdisk.c diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c new file mode 100644 index 0000000..d1f699f --- /dev/null +++ b/dlls/virtdisk/tests/virtdisk.c @@ -0,0 +1,64 @@ +/* + * Copyright 2018 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "virtdisk.h" +#include "wine/heap.h" +#include "wine/test.h" + +static DWORD (WINAPI *pGetStorageDependencyInformation)(HANDLE,GET_STORAGE_DEPENDENCY_FLAG,ULONG,STORAGE_DEPENDENCY_INFO*,ULONG*); + +static void test_GetStorageDependencyInformation(void) +{ + DWORD ret; + HANDLE handle; + STORAGE_DEPENDENCY_INFO *info; + ULONG size; + + handle = CreateFileA("C:", 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + ok(handle != INVALID_HANDLE_VALUE, "Expected a handle\n"); + + size = sizeof(STORAGE_DEPENDENCY_INFO); + info = heap_alloc(size); + + ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, 0, info, 0); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + ret = pGetStorageDependencyInformation(handle, GET_STORAGE_DEPENDENCY_FLAG_DISK_HANDLE, size, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret); + + heap_free(info); + CloseHandle(handle); +} + +START_TEST(virtdisk) +{ + HMODULE module = LoadLibraryA("virtdisk.dll"); + if(!module) + { + win_skip("virtdisk.dll not installed\n"); + return; + } + + pGetStorageDependencyInformation = (void *)GetProcAddress( module, "GetStorageDependencyInformation" ); + if (pGetStorageDependencyInformation) + test_GetStorageDependencyInformation(); + else + win_skip("GetStorageDependencyInformation is not available\n"); +}

1 0

Pierre Schweitzer : mpr: Implement WNetClearConnections().
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 0799550075654094a3bed080aac722b9bea01307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0799550075654094a3bed080… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun Sep 9 15:48:00 2018 +0200 mpr: Implement WNetClearConnections(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45802 Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/mpr.spec | 1 + dlls/mpr/wnet.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 4df3db3..2f102ab 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -55,6 +55,7 @@ @ stdcall WNetCancelConnection2W(wstr long long) @ stdcall WNetCancelConnectionA(str long) @ stdcall WNetCancelConnectionW(wstr long) +@ stdcall WNetClearConnections(long) @ stdcall WNetCloseEnum(long) @ stdcall WNetConnectionDialog1A(ptr) @ stdcall WNetConnectionDialog1W(ptr) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index a2f8a04..8d83bd6 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -4,7 +4,7 @@ * Copyright 1999 Ulrich Weigand * Copyright 2004 Juan Lang * Copyright 2007 Maarten Lankhorst - * Copyright 2016 Pierre Schweitzer + * Copyright 2016-2018 Pierre Schweitzer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2407,6 +2407,56 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, return err; } +/***************************************************************** + * WNetClearConnections [MPR.@] + */ +DWORD WINAPI WNetClearConnections ( HWND owner ) +{ + HANDLE connected; + DWORD ret, size, count; + NETRESOURCEW * resources, * iter; + + ret = WNetOpenEnumW(RESOURCE_CONNECTED, RESOURCETYPE_ANY, 0, NULL, &connected); + if (ret != WN_SUCCESS) + { + if (ret != WN_NO_NETWORK) + { + return ret; + } + + /* Means no provider, then, clearing is OK */ + return WN_SUCCESS; + } + + size = 0x1000; + resources = HeapAlloc(GetProcessHeap(), 0, size); + if (!resources) + { + WNetCloseEnum(connected); + return WN_OUT_OF_MEMORY; + } + + for (;;) + { + size = 0x1000; + count = -1; + + memset(resources, 0, size); + ret = WNetEnumResourceW(connected, &count, resources, &size); + if (ret == WN_SUCCESS || ret == WN_MORE_DATA) + { + for (iter = resources; count; count--, iter++) + WNetCancelConnection2W(iter->lpLocalName, 0, TRUE); + } + else + break; + } + + HeapFree(GetProcessHeap(), 0, resources); + WNetCloseEnum(connected); + + return ret; +} /*

1 0