Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-28 13:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MPR] Sync with Wine Staging 3.3. CORE-14434

Browse source
This commit is contained in:
Amine Khaldi 2018-03-17 13:24:48 +01:00
parent 32eba10892
commit 1a914df648
12 changed files with 76 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/mpr/auth.c
View file

@ -18,7 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
/*****************************************************************
* WNetLogoffA [MPR.@]

2
dll/win32/mpr/mpr.rc
View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <winuser.h>
#include "mprres.h"
#include "version.rc"

9
dll/win32/mpr/mpr_main.c
View file

@ -18,10 +18,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "winnetwk.h"
#include "wine/debug.h"
#include "wnetpriv.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
/*
* FIXME: The following routines should use a private heap ...
*/

4
dll/win32/mpr/mprres.h
View file

@ -15,10 +15,12 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef __WINE_MPRRES_H__
#define __WINE_MPRRES_H__
#include <windef.h>
#include <winuser.h>
#define IDS_ENTIRENETWORK 1
#define IDD_PROXYDLG 0x400

10
dll/win32/mpr/multinet.c
View file

@ -18,7 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
/*****************************************************************
* MultinetGetConnectionPerformanceA [MPR.@]

3
dll/win32/mpr/netspi.h
View file

@ -24,6 +24,9 @@
#ifndef _NETSPI_H_
#define _NETSPI_H_
#include "windef.h"
#include "winnetwk.h"
/*
* Note: The Unicode variants of all these routines/structures
* apparently don't exist, at least not in Win95 ...

15
dll/win32/mpr/nps.c
View file

@ -19,9 +19,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "netspi.h"
#include "wine/debug.h"
#include "winerror.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
#include "wine/unicode.h"
#include "mprres.h"
/***********************************************************************
* NPS_ProxyPasswordDialog

5
dll/win32/mpr/precomp.h
View file

@ -1,3 +1,4 @@
#ifndef _MPR_PCH_
#define _MPR_PCH_
@ -16,6 +17,4 @@
#include "mprres.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
#endif /* _MPR_PCH_ */
#endif /* !_MPR_PCH_ */

11
dll/win32/mpr/pwcache.c
View file

@ -19,10 +19,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include <stdio.h>
#include "windef.h"
#include "winbase.h"
#include "winnetwk.h"
#include "winreg.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\";
static inline BYTE hex( BYTE x )

2
dll/win32/mpr/version.rc
View file

@ -25,4 +25,4 @@
#define WINE_PRODUCTVERSION 5,0,2195,6611
#define WINE_PRODUCTVERSION_STR "5.00.2195.6611"
#include <wine/wine_common_ver.rc>
#include "wine/wine_common_ver.rc"

24
dll/win32/mpr/wnet.c
View file

@ -21,13 +21,23 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <winioctl.h>
#include <npapi.h>
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
#include "winioctl.h"
#include "winnetwk.h"
#include "npapi.h"
#include "winreg.h"
#include "winuser.h"
#define WINE_MOUNTMGR_EXTENSIONS
#include <ddk/mountmgr.h>
#include <wine/unicode.h>
#include "ddk/mountmgr.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "mprres.h"
#include "wnetpriv.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
/* Data structures representing network service providers. Assumes only one
* thread creates them, and that they are constant for the life of the process
@ -2577,7 +2587,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel,
break;
}
case REMOTE_NAME_INFO_LEVEL:
err = WN_NO_NETWORK;
err = WN_NOT_CONNECTED;
break;
default:

2
media/doc/README.WINE
View file

@ -98,7 +98,7 @@ reactos/dll/win32/mciwave # Synced to WineStaging-3.3
reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3
reactos/dll/win32/mlang # Synced to WineStaging-3.3
reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3
reactos/dll/win32/mpr # Synced to Wine-3.0
reactos/dll/win32/mpr # Synced to WineStaging-3.3
reactos/dll/win32/mprapi # Synced to WineStaging-2.9
reactos/dll/win32/msacm32 # Synced to WineStaging-2.16
reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9