[MPR]
authorPierre Schweitzer <pierre@reactos.org>
Thu, 17 Mar 2016 18:18:18 +0000 (18:18 +0000)
committerPierre Schweitzer <pierre@reactos.org>
Thu, 17 Mar 2016 18:18:18 +0000 (18:18 +0000)
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

svn path=/trunk/; revision=71019

reactos/dll/win32/mpr/mpr_ros.diff
reactos/dll/win32/mpr/wnet.c

index a32d326..d884b0d 100644 (file)
@@ -45,29 +45,3 @@ Index: mpr.spec
  22 stdcall @(long) MPR_Alloc\r
  23 stdcall @(ptr long) MPR_ReAlloc\r
  24 stdcall @(ptr) MPR_Free\r
-Index: wnet.c\r
-===================================================================\r
---- wnet.c     (rĂ©vision 70645)\r
-+++ wnet.c     (copie de travail)\r
-@@ -750,7 +750,12 @@\r
-                              providerTable->table[index].dwEnumScopes & WNNC_ENUM_GLOBAL)\r
-                             {\r
-                                 HANDLE handle;\r
-+                                PVOID RemoteName = lpNet->lpRemoteName;\r
\r
-+                                if ((lpNet->dwUsage & RESOURCEUSAGE_CONTAINER) &&\r
-+                                    RemoteName && !strcmpW(RemoteName, lpNet->lpProvider))\r
-+                                    lpNet->lpRemoteName = NULL;\r
-+\r
-                                 ret = providerTable->table[index].openEnum(\r
-                                  dwScope, dwType, dwUsage, lpNet, &handle);\r
-                                 if (ret == WN_SUCCESS)\r
-@@ -760,6 +765,8 @@\r
-                                     ret = *lphEnum ? WN_SUCCESS :\r
-                                      WN_OUT_OF_MEMORY;\r
-                                 }\r
-+\r
-+                                lpNet->lpRemoteName = RemoteName;\r
-                             }\r
-                             else\r
-                                 ret = WN_NOT_SUPPORTED;\r
index c6baf5b..361619f 100644 (file)
@@ -750,7 +750,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
                              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))