[ros-diffs] [pschweitzer] 71984: [MPR] Provide ReactOS specific implementation for WNetGetConnection(), we cannot use Wine's due to Wine specific MountMgr calls.

Author: pschweitzer
Date: Sat Jul 23 19:52:23 2016
New Revision: 71984

URL: http://svn.reactos.org/svn/reactos?rev=71984&view=rev
Log:
[MPR]
Provide ReactOS specific implementation for WNetGetConnection(), we cannot use Wine's
due to Wine specific MountMgr calls.

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] Sat Jul 23 19:52:23 2016
@@ -45,3 +45,68 @@
  22 stdcall @(long) MPR_Alloc
  23 stdcall @(ptr long) MPR_ReAlloc
  24 stdcall @(ptr) MPR_Free
+Index: wnet.c
+===================================================================
+--- wnet.c	(revision 71983)
++++ wnet.c	(working copy)
+@@ -48,6 +48,9 @@
+     PF_NPGetResourceInformation getResourceInformation;
+     PF_NPAddConnection addConnection;
+     PF_NPAddConnection3 addConnection3;
++#ifdef __REACTOS__
++    PF_NPGetConnection getConnection;
++#endif
+ } WNetProvider, *PWNetProvider;
+ 
+ typedef struct _WNetProviderTable
+@@ -196,6 +199,9 @@
+                         }
+                         provider->addConnection = MPR_GETPROC(NPAddConnection);
+                         provider->addConnection3 = MPR_GETPROC(NPAddConnection3);
++#ifdef __REACTOS__
++                        provider->getConnection = MPR_GETPROC(NPGetConnection);
++#endif
+                         TRACE("NPAddConnection %p\n",
provider->addConnection);
+                         TRACE("NPAddConnection3 %p\n",
provider->addConnection3);
+                         providerTable->numProviders++;
+@@ -1949,6 +1955,7 @@
+ /* find the network connection for a given drive; helper for WNetGetConnection */
+ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size )
+ {
++#ifndef __REACTOS__
+     char buffer[1024];
+     struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer;
+     HANDLE mgr;
+@@ -1991,6 +1998,32 @@
+     }
+     CloseHandle( mgr );
+     return ret;
++#else
++    DWORD ret = WN_NO_NETWORK;
++    DWORD index;
++    WCHAR local[3] = {letter, ':', 0};
++
++    if (providerTable != NULL)
++    {
++        for (index = 0; index < providerTable->numProviders; index++)
++        {
++            if(providerTable->table[index].getCaps(WNNC_CONNECTION) &
++                WNNC_CON_GETCONNECTIONS)
++            {
++                if (providerTable->table[index].getConnection)
++                    ret = providerTable->table[index].getConnection(
++                        local, remote, size);
++                else
++                    ret = WN_NO_NETWORK;
++                if (ret == WN_SUCCESS || ret == WN_MORE_DATA)
++                    break;
++            }
++        }
++    }
++    if (ret)
++        SetLastError(ret);
++    return ret;
++#endif
+ }
+ 
+ /**************************************************************************

Modified: trunk/reactos/dll/win32/mpr/wnet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=7…
==============================================================================
--- trunk/reactos/dll/win32/mpr/wnet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mpr/wnet.c	[iso-8859-1] Sat Jul 23 19:52:23 2016
@@ -48,6 +48,9 @@
     PF_NPGetResourceInformation getResourceInformation;
     PF_NPAddConnection addConnection;
     PF_NPAddConnection3 addConnection3;
+#ifdef __REACTOS__
+    PF_NPGetConnection getConnection;
+#endif
 } WNetProvider, *PWNetProvider;
 
 typedef struct _WNetProviderTable
@@ -196,6 +199,9 @@
                         }
                         provider->addConnection = MPR_GETPROC(NPAddConnection);
                         provider->addConnection3 = MPR_GETPROC(NPAddConnection3);
+#ifdef __REACTOS__
+                        provider->getConnection = MPR_GETPROC(NPGetConnection);
+#endif
                         TRACE("NPAddConnection %p\n",
provider->addConnection);
                         TRACE("NPAddConnection3 %p\n",
provider->addConnection3);
                         providerTable->numProviders++;
@@ -1949,6 +1955,7 @@
 /* find the network connection for a given drive; helper for WNetGetConnection */
 static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size )
 {
+#ifndef __REACTOS__
     char buffer[1024];
     struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer;
     HANDLE mgr;
@@ -1991,6 +1998,32 @@
     }
     CloseHandle( mgr );
     return ret;
+#else
+    DWORD ret = WN_NO_NETWORK;
+    DWORD index;
+    WCHAR local[3] = {letter, ':', 0};
+
+    if (providerTable != NULL)
+    {
+        for (index = 0; index < providerTable->numProviders; index++)
+        {
+            if(providerTable->table[index].getCaps(WNNC_CONNECTION) &
+                WNNC_CON_GETCONNECTIONS)
+            {
+                if (providerTable->table[index].getConnection)
+                    ret = providerTable->table[index].getConnection(
+                        local, remote, size);
+                else
+                    ret = WN_NO_NETWORK;
+                if (ret == WN_SUCCESS || ret == WN_MORE_DATA)
+                    break;
+            }
+        }
+    }
+    if (ret)
+        SetLastError(ret);
+    return ret;
+#endif
 }
 
 /**************************************************************************