Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 22:23:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MPR]

Browse source 
Provide ReactOS specific implementation for WNetGetConnection(), we cannot use Wine's due to Wine specific MountMgr calls.

svn path=/trunk/; revision=71984
This commit is contained in:
Pierre Schweitzer 2016-07-23 19:52:23 +00:00
parent 1ce557f97e
commit 0ee9e9b016
2 changed files with 98 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

65
reactos/dll/win32/mpr/mpr_ros.diff
View file

@ -45,3 +45,68 @@ Index: mpr.spec
22 stdcall @(long) MPR_Alloc 22 stdcall @(long) MPR_Alloc
23 stdcall @(ptr long) MPR_ReAlloc 23 stdcall @(ptr long) MPR_ReAlloc
24 stdcall @(ptr) MPR_Free 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
}
/**************************************************************************

33
reactos/dll/win32/mpr/wnet.c
View file

@ -48,6 +48,9 @@ typedef struct _WNetProvider
PF_NPGetResourceInformation getResourceInformation; PF_NPGetResourceInformation getResourceInformation;
PF_NPAddConnection addConnection; PF_NPAddConnection addConnection;
PF_NPAddConnection3 addConnection3; PF_NPAddConnection3 addConnection3;
#ifdef __REACTOS__
PF_NPGetConnection getConnection;
#endif
} WNetProvider, *PWNetProvider; } WNetProvider, *PWNetProvider;
typedef struct _WNetProviderTable typedef struct _WNetProviderTable
@ -196,6 +199,9 @@ static void _tryLoadProvider(PCWSTR provider)
} }
provider->addConnection = MPR_GETPROC(NPAddConnection); provider->addConnection = MPR_GETPROC(NPAddConnection);
provider->addConnection3 = MPR_GETPROC(NPAddConnection3); provider->addConnection3 = MPR_GETPROC(NPAddConnection3);
#ifdef __REACTOS__
provider->getConnection = MPR_GETPROC(NPGetConnection);
#endif
TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection %p\n", provider->addConnection);
TRACE("NPAddConnection3 %p\n", provider->addConnection3); TRACE("NPAddConnection3 %p\n", provider->addConnection3);
providerTable->numProviders++; providerTable->numProviders++;
@ -1949,6 +1955,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName,
/* find the network connection for a given drive; helper for WNetGetConnection */ /* find the network connection for a given drive; helper for WNetGetConnection */
static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size )
{ {
#ifndef __REACTOS__
char buffer[1024]; char buffer[1024];
struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer; struct mountmgr_unix_drive *data = (struct mountmgr_unix_drive *)buffer;
HANDLE mgr; HANDLE mgr;
@ -1991,6 +1998,32 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size )
} }
CloseHandle( mgr ); CloseHandle( mgr );
return ret; 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
} }
/************************************************************************** /**************************************************************************