[MPR] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Mar 2018 12:24:48 +0000 (13:24 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Mar 2018 12:24:48 +0000 (13:24 +0100)
12 files changed:
dll/win32/mpr/auth.c
dll/win32/mpr/mpr.rc
dll/win32/mpr/mpr_main.c
dll/win32/mpr/mprres.h
dll/win32/mpr/multinet.c
dll/win32/mpr/netspi.h
dll/win32/mpr/nps.c
dll/win32/mpr/precomp.h
dll/win32/mpr/pwcache.c
dll/win32/mpr/version.rc
dll/win32/mpr/wnet.c
media/doc/README.WINE

index bf5c671..e2a28a3 100644 (file)
  * 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.@]
index d34b556..93f5ceb 100644 (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"
index f6ca102..d7535f5 100644 (file)
  * 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 ...
   */
index 83e9545..5c42e56 100644 (file)
  * 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
index 326c5b1..f05cd21 100644 (file)
  * 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.@]
index c6bb1ea..0a82475 100644 (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 ...
index bb12646..f8a1433 100644 (file)
  * 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
index 6d5a884..84dd7aa 100644 (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_ */
index 6568b9d..aa09522 100644 (file)
  * 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 )
index a2cc94a..c27f9c7 100644 (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"
index fc701b6..82c9302 100644 (file)
  * 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:
index 869affc..3bb27a2 100644 (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