Author: pschweitzer Date: Thu Mar 17 18:18:18 2016 New Revision: 71019
URL: http://svn.reactos.org/svn/reactos?rev=71019&view=rev Log: [MPR] Import Wine commit: - e8c8ddcbfc8bc4458add06062005a4022162deab, Don't send lpRemoteName when requesting network place.
This is the end: ReactOS WNet is fully in sync with Wine, with all the features required for network providers in. Enjoy your VBox/VMware shared folders working with synced upstream!
CORE-10878 CORE-10032
Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff trunk/reactos/dll/win32/mpr/wnet.c
Modified: trunk/reactos/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_ros.diff?... ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Thu Mar 17 18:18:18 2016 @@ -45,29 +45,3 @@ 22 stdcall @(long) MPR_Alloc 23 stdcall @(ptr long) MPR_ReAlloc 24 stdcall @(ptr) MPR_Free -Index: wnet.c -=================================================================== ---- wnet.c (révision 70645) -+++ wnet.c (copie de travail) -@@ -750,7 +750,12 @@ - providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) - { - HANDLE handle; -+ PVOID RemoteName = lpNet->lpRemoteName; - -+ if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && -+ RemoteName && !strcmpW(RemoteName, lpNet->lpProvider)) -+ lpNet->lpRemoteName = NULL; -+ - ret = providerTable->table[index].openEnum( - dwScope, dwType, dwUsage, lpNet, &handle); - if (ret == WN_SUCCESS) -@@ -760,6 +765,8 @@ - ret = *lphEnum ? WN_SUCCESS : - WN_OUT_OF_MEMORY; - } -+ -+ lpNet->lpRemoteName = RemoteName; - } - else - ret = WN_NOT_SUPPORTED;
Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=71... ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Thu Mar 17 18:18:18 2016 @@ -750,7 +750,7 @@ providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL) { HANDLE handle; - PVOID RemoteName = lpNet->lpRemoteName; + PWSTR RemoteName = lpNet->lpRemoteName;
if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) && RemoteName && !strcmpW(RemoteName, lpNet->lpProvider))