[MPR] Sync with Wine Staging 3.3. CORE-14434 · huwcampbell.com/reactos@1a914df

+9 -1

dll/win32/mpr/auth.c

··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include "precomp.h" 21 + #include <stdarg.h> 22 + 23 + #include "windef.h" 24 + #include "winbase.h" 25 + #include "winnetwk.h" 26 + #include "wine/debug.h" 27 + 28 + WINE_DEFAULT_DEBUG_CHANNEL(mpr); 29 + 22 30 23 31 /***************************************************************** 24 32 * WNetLogoffA [MPR.@]

-2

dll/win32/mpr/mpr.rc

··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include <winuser.h> 22 - 23 21 #include "mprres.h" 24 22 25 23 #include "version.rc"

+8 -1

dll/win32/mpr/mpr_main.c

··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include "precomp.h" 21 + #include <stdarg.h> 22 22 23 + #include "windef.h" 24 + #include "winbase.h" 25 + #include "objbase.h" 26 + #include "winnetwk.h" 27 + #include "wine/debug.h" 23 28 #include "wnetpriv.h" 29 + 30 + WINE_DEFAULT_DEBUG_CHANNEL(mpr); 24 31 25 32 /* 26 33 * FIXME: The following routines should use a private heap ...

+3 -1

dll/win32/mpr/mprres.h

··· 15 15 * License along with this library; if not, write to the Free Software 16 16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 17 17 */ 18 - 19 18 #ifndef __WINE_MPRRES_H__ 20 19 #define __WINE_MPRRES_H__ 20 + 21 + #include <windef.h> 22 + #include <winuser.h> 21 23 22 24 #define IDS_ENTIRENETWORK 1 23 25

+9 -1

dll/win32/mpr/multinet.c

··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include "precomp.h" 21 + #include <stdarg.h> 22 + 23 + #include "windef.h" 24 + #include "winbase.h" 25 + #include "winnetwk.h" 26 + #include "wine/debug.h" 27 + 28 + WINE_DEFAULT_DEBUG_CHANNEL(mpr); 29 + 22 30 23 31 /***************************************************************** 24 32 * MultinetGetConnectionPerformanceA [MPR.@]

+3

dll/win32/mpr/netspi.h

··· 24 24 #ifndef _NETSPI_H_ 25 25 #define _NETSPI_H_ 26 26 27 + #include "windef.h" 28 + #include "winnetwk.h" 29 + 27 30 /* 28 31 * Note: The Unicode variants of all these routines/structures 29 32 * apparently don't exist, at least not in Win95 ...

+14 -1

dll/win32/mpr/nps.c

··· 19 19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 20 20 */ 21 21 22 - #include "precomp.h" 22 + #include "config.h" 23 + 24 + #include <stdarg.h> 23 25 26 + #include "windef.h" 27 + #include "winbase.h" 28 + #include "winuser.h" 24 29 #include "netspi.h" 30 + #include "wine/debug.h" 31 + #include "winerror.h" 32 + 33 + WINE_DEFAULT_DEBUG_CHANNEL(mpr); 34 + 35 + #include "wine/unicode.h" 36 + 37 + #include "mprres.h" 25 38 26 39 /*********************************************************************** 27 40 * NPS_ProxyPasswordDialog

+2 -3

dll/win32/mpr/precomp.h

··· 1 + 1 2 #ifndef _MPR_PCH_ 2 3 #define _MPR_PCH_ 3 4 ··· 16 17 17 18 #include "mprres.h" 18 19 19 - WINE_DEFAULT_DEBUG_CHANNEL(mpr); 20 - 21 - #endif /* _MPR_PCH_ */ 20 + #endif /* !_MPR_PCH_ */

+9 -2

dll/win32/mpr/pwcache.c

··· 19 19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 20 20 */ 21 21 22 - #include "precomp.h" 22 + #include <stdarg.h> 23 + #include <stdio.h> 24 + 25 + #include "windef.h" 26 + #include "winbase.h" 27 + #include "winnetwk.h" 28 + #include "winreg.h" 29 + #include "wine/debug.h" 23 30 24 - #include <stdio.h> 31 + WINE_DEFAULT_DEBUG_CHANNEL(mpr); 25 32 26 33 static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\"; 27 34

+1 -1

dll/win32/mpr/version.rc

··· 25 25 #define WINE_PRODUCTVERSION 5,0,2195,6611 26 26 #define WINE_PRODUCTVERSION_STR "5.00.2195.6611" 27 27 28 - #include <wine/wine_common_ver.rc> 28 + #include "wine/wine_common_ver.rc"

+17 -7

dll/win32/mpr/wnet.c

··· 21 21 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 22 22 */ 23 23 24 - #include "precomp.h" 25 - 26 - #include <winioctl.h> 27 - #include <npapi.h> 24 + #include <stdarg.h> 25 + #include "windef.h" 26 + #include "winbase.h" 27 + #include "winnls.h" 28 + #include "winioctl.h" 29 + #include "winnetwk.h" 30 + #include "npapi.h" 31 + #include "winreg.h" 32 + #include "winuser.h" 28 33 #define WINE_MOUNTMGR_EXTENSIONS 29 - #include <ddk/mountmgr.h> 30 - #include <wine/unicode.h> 34 + #include "ddk/mountmgr.h" 35 + #include "wine/debug.h" 36 + #include "wine/unicode.h" 37 + #include "mprres.h" 38 + #include "wnetpriv.h" 39 + 40 + WINE_DEFAULT_DEBUG_CHANNEL(mpr); 31 41 32 42 /* Data structures representing network service providers. Assumes only one 33 43 * thread creates them, and that they are constant for the life of the process ··· 2577 2587 break; 2578 2588 } 2579 2589 case REMOTE_NAME_INFO_LEVEL: 2580 - err = WN_NO_NETWORK; 2590 + err = WN_NOT_CONNECTED; 2581 2591 break; 2582 2592 2583 2593 default:

+1 -1

media/doc/README.WINE

··· 98 98 reactos/dll/win32/mgmtapi # Synced to WineStaging-3.3 99 99 reactos/dll/win32/mlang # Synced to WineStaging-3.3 100 100 reactos/dll/win32/mmdevapi # Synced to WineStaging-3.3 101 - reactos/dll/win32/mpr # Synced to Wine-3.0 101 + reactos/dll/win32/mpr # Synced to WineStaging-3.3 102 102 reactos/dll/win32/mprapi # Synced to WineStaging-2.9 103 103 reactos/dll/win32/msacm32 # Synced to WineStaging-2.16 104 104 reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9