https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a914df648f281f65515e1262fc624596b288b56
commit 1a914df648f281f65515e1262fc624596b288b56 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Mar 17 13:24:48 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Mar 17 13:24:48 2018 +0100 [MPR] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mpr/auth.c | 10 +++++++++- dll/win32/mpr/mpr.rc | 2 -- dll/win32/mpr/mpr_main.c | 9 ++++++++- dll/win32/mpr/mprres.h | 4 +++- dll/win32/mpr/multinet.c | 10 +++++++++- dll/win32/mpr/netspi.h | 3 +++ dll/win32/mpr/nps.c | 15 ++++++++++++++- dll/win32/mpr/precomp.h | 5 ++--- dll/win32/mpr/pwcache.c | 11 +++++++++-- dll/win32/mpr/version.rc | 2 +- dll/win32/mpr/wnet.c | 24 +++++++++++++++++------- media/doc/README.WINE | 2 +- 12 files changed, 76 insertions(+), 21 deletions(-) diff --git a/dll/win32/mpr/auth.c b/dll/win32/mpr/auth.c index bf5c671f88..e2a28a3d83 100644 --- a/dll/win32/mpr/auth.c +++ b/dll/win32/mpr/auth.c @@ -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.@] diff --git a/dll/win32/mpr/mpr.rc b/dll/win32/mpr/mpr.rc index d34b55657e..93f5cebda0 100644 --- a/dll/win32/mpr/mpr.rc +++ b/dll/win32/mpr/mpr.rc @@ -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" diff --git a/dll/win32/mpr/mpr_main.c b/dll/win32/mpr/mpr_main.c index f6ca1021b2..d7535f504e 100644 --- a/dll/win32/mpr/mpr_main.c +++ b/dll/win32/mpr/mpr_main.c @@ -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 ... */ diff --git a/dll/win32/mpr/mprres.h b/dll/win32/mpr/mprres.h index 83e95450a6..5c42e56547 100644 --- a/dll/win32/mpr/mprres.h +++ b/dll/win32/mpr/mprres.h @@ -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 diff --git a/dll/win32/mpr/multinet.c b/dll/win32/mpr/multinet.c index 326c5b14eb..f05cd214ef 100644 --- a/dll/win32/mpr/multinet.c +++ b/dll/win32/mpr/multinet.c @@ -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.@] diff --git a/dll/win32/mpr/netspi.h b/dll/win32/mpr/netspi.h index c6bb1ea521..0a82475931 100644 --- a/dll/win32/mpr/netspi.h +++ b/dll/win32/mpr/netspi.h @@ -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 ... diff --git a/dll/win32/mpr/nps.c b/dll/win32/mpr/nps.c index bb1264635a..f8a143363f 100644 --- a/dll/win32/mpr/nps.c +++ b/dll/win32/mpr/nps.c @@ -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 diff --git a/dll/win32/mpr/precomp.h b/dll/win32/mpr/precomp.h index 6d5a884c54..84dd7aabf4 100644 --- a/dll/win32/mpr/precomp.h +++ b/dll/win32/mpr/precomp.h @@ -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_ */ diff --git a/dll/win32/mpr/pwcache.c b/dll/win32/mpr/pwcache.c index 6568b9d549..aa09522a5f 100644 --- a/dll/win32/mpr/pwcache.c +++ b/dll/win32/mpr/pwcache.c @@ -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 ) diff --git a/dll/win32/mpr/version.rc b/dll/win32/mpr/version.rc index a2cc94aa98..c27f9c7888 100644 --- a/dll/win32/mpr/version.rc +++ b/dll/win32/mpr/version.rc @@ -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" diff --git a/dll/win32/mpr/wnet.c b/dll/win32/mpr/wnet.c index fc701b6595..82c9302849 100644 --- a/dll/win32/mpr/wnet.c +++ b/dll/win32/mpr/wnet.c @@ -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: diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 869affc759..3bb27a2ce3 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -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
