From 32d02efe947cf82a7e78123046af5e5a158512f6 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Thu, 17 Mar 2016 18:18:18 +0000
Subject: [PATCH] [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

svn path=/trunk/; revision=71019
---
 reactos/dll/win32/mpr/mpr_ros.diff | 26 --------------------------
 reactos/dll/win32/mpr/wnet.c       |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/reactos/dll/win32/mpr/mpr_ros.diff b/reactos/dll/win32/mpr/mpr_ros.diff
index a32d326f75b..d884b0dad6b 100644
--- a/reactos/dll/win32/mpr/mpr_ros.diff
+++ b/reactos/dll/win32/mpr/mpr_ros.diff
@@ -45,29 +45,3 @@ Index: mpr.spec
  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;
diff --git a/reactos/dll/win32/mpr/wnet.c b/reactos/dll/win32/mpr/wnet.c
index c6baf5be4ee..361619f384c 100644
--- a/reactos/dll/win32/mpr/wnet.c
+++ b/reactos/dll/win32/mpr/wnet.c
@@ -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))