Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MPR]

Browse source 
Import Wine commit:
- 96a93ee608b2919d1a8f583002e8262ef54a6743, Enumerate connections capability before looking for functions entry points.

svn path=/trunk/; revision=73500
This commit is contained in:
Pierre Schweitzer 2017-01-02 20:16:14 +00:00
parent 83f928948d
commit d915c39751
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,10 +59,10 @@ Index: wnet.c
} WNetProvider, *PWNetProvider; } WNetProvider, *PWNetProvider;
typedef struct _WNetProviderTable typedef struct _WNetProviderTable
@@ -214,6 +207,9 @@ @@ -219,6 +212,10 @@
provider->addConnection = MPR_GETPROC(NPAddConnection); provider->addConnection3 = MPR_GETPROC(NPAddConnection3);
provider->addConnection3 = MPR_GETPROC(NPAddConnection3); if (connectCap & WNNC_CON_CANCELCONNECTION)
provider->cancelConnection = MPR_GETPROC(NPCancelConnection); provider->cancelConnection = MPR_GETPROC(NPCancelConnection);
+#ifdef __REACTOS__ +#ifdef __REACTOS__
+ if (connectCap & WNNC_CON_GETCONNECTIONS) + if (connectCap & WNNC_CON_GETCONNECTIONS)
+ provider->getConnection = MPR_GETPROC(NPGetConnection); + provider->getConnection = MPR_GETPROC(NPGetConnection);
@ -70,7 +70,7 @@ Index: wnet.c
TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection %p\n", provider->addConnection);
TRACE("NPAddConnection3 %p\n", provider->addConnection3); TRACE("NPAddConnection3 %p\n", provider->addConnection3);
TRACE("NPCancelConnection %p\n", provider->cancelConnection); TRACE("NPCancelConnection %p\n", provider->cancelConnection);
@@ -251,6 +247,85 @@ @@ -256,6 +253,85 @@
debugstr_w(provider)); debugstr_w(provider));
} }
@ -156,7 +156,7 @@ Index: wnet.c
void wnetInit(HINSTANCE hInstDll) void wnetInit(HINSTANCE hInstDll)
{ {
static const WCHAR providerOrderKey[] = { 'S','y','s','t','e','m','\\', static const WCHAR providerOrderKey[] = { 'S','y','s','t','e','m','\\',
@@ -329,6 +404,64 @@ @@ -334,6 +410,64 @@
} }
RegCloseKey(hKey); RegCloseKey(hKey);
} }
@ -221,7 +221,7 @@ Index: wnet.c
} }
void wnetFree(void) void wnetFree(void)
@@ -1870,6 +2003,43 @@ @@ -1875,6 +2009,43 @@
} }
} }
@ -265,7 +265,7 @@ Index: wnet.c
return ret; return ret;
} }
@@ -2061,6 +2231,37 @@ @@ -2066,6 +2237,37 @@
} }
} }
} }
@ -303,7 +303,7 @@ Index: wnet.c
return ret; return ret;
} }
@@ -2188,6 +2389,7 @@ @@ -2193,6 +2395,7 @@
/* 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 )
{ {
@ -311,7 +311,7 @@ Index: wnet.c
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;
@@ -2230,6 +2432,32 @@ @@ -2235,6 +2438,32 @@
} }
CloseHandle( mgr ); CloseHandle( mgr );
return ret; return ret;

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

@ -209,7 +209,7 @@ static void _tryLoadProvider(PCWSTR provider)
if (connectCap & WNNC_CON_ADDCONNECTION) if (connectCap & WNNC_CON_ADDCONNECTION)
provider->addConnection = MPR_GETPROC(NPAddConnection); provider->addConnection = MPR_GETPROC(NPAddConnection);
if (connectCap & WNNC_CON_ADDCONNECTION3) if (connectCap & WNNC_CON_ADDCONNECTION3)
provider->addConnection3 = MPR_GETPROC(NPAddConnection3); provider->addConnection3 = MPR_GETPROC(NPAddConnection3);
if (connectCap & WNNC_CON_CANCELCONNECTION) if (connectCap & WNNC_CON_CANCELCONNECTION)
provider->cancelConnection = MPR_GETPROC(NPCancelConnection); provider->cancelConnection = MPR_GETPROC(NPCancelConnection);
#ifdef __REACTOS__ #ifdef __REACTOS__