Headers diff for mpr.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.0-Windows 10 1511 10586.494 versions

npapi.h (6.3.9600.17415-Windows 8.1)		npapi.h (10.0.10586.0-Windows 10 1511 10586.494)

skipping to change at line 29		skipping to change at line 29
--*/		--*/

#ifndef _NPAPI_INCLUDED		#ifndef _NPAPI_INCLUDED
#define _NPAPI_INCLUDED		#define _NPAPI_INCLUDED

#if _MSC_VER > 1000		#if _MSC_VER > 1000
#pragma once		#pragma once
#endif		#endif
#include <winapifamily.h>		#include <winapifamily.h>


#pragma region Desktop Family		#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#ifdef __cplusplus		#ifdef __cplusplus
extern "C" {		extern "C" {
#endif		#endif


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY
		STEM) */
		#pragma endregion

		#pragma region Desktop Family or RemoteFS Package
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_PKG_REMO
		TEFS)

//		//
// CONNECTIONS		// CONNECTIONS
//		//

DWORD APIENTRY		DWORD APIENTRY
NPAddConnection (		NPAddConnection (
_In_ LPNETRESOURCEW lpNetResource,		_In_ LPNETRESOURCEW lpNetResource,
_In_opt_ LPWSTR lpPassword,		_In_opt_ LPWSTR lpPassword,
_In_opt_ LPWSTR lpUserName		_In_opt_ LPWSTR lpUserName
);		);

skipping to change at line 263		skipping to change at line 269

#define WNTYPE_DRIVE 1		#define WNTYPE_DRIVE 1
#define WNTYPE_FILE 2		#define WNTYPE_FILE 2
#define WNTYPE_PRINTER 3		#define WNTYPE_PRINTER 3
#define WNTYPE_COMM 4		#define WNTYPE_COMM 4

#define WNPS_FILE 0		#define WNPS_FILE 0
#define WNPS_DIR 1		#define WNPS_DIR 1
#define WNPS_MULT 2		#define WNPS_MULT 2


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_PK
		G_REMOTEFS) */
		#pragma endregion

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

DWORD APIENTRY		DWORD APIENTRY
NPDeviceMode(		NPDeviceMode(
_In_ HWND hParent		_In_ HWND hParent
);		);

typedef DWORD (APIENTRY *PF_NPDeviceMode) (		typedef DWORD (APIENTRY *PF_NPDeviceMode) (
_In_ HWND hParent		_In_ HWND hParent
);		);

// flag for search dialog		// flag for search dialog

skipping to change at line 292		skipping to change at line 304
);		);

typedef DWORD (APIENTRY *PF_NPSearchDialog) (		typedef DWORD (APIENTRY *PF_NPSearchDialog) (
_In_ HWND hwndParent,		_In_ HWND hwndParent,
_In_opt_ LPNETRESOURCEW lpNetResource,		_In_opt_ LPNETRESOURCEW lpNetResource,
_Out_writes_(cbBuffer) LPVOID lpBuffer,		_Out_writes_(cbBuffer) LPVOID lpBuffer,
_In_ DWORD cbBuffer,		_In_ DWORD cbBuffer,
_Out_ LPDWORD lpnFlags		_Out_ LPDWORD lpnFlags
);		);


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
		#pragma endregion

		#pragma region Desktop Family or RemoteFS Package
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_PKG_REMO
		TEFS)

DWORD APIENTRY		DWORD APIENTRY
NPGetResourceParent(		NPGetResourceParent(
_In_ LPNETRESOURCEW lpNetResource,		_In_ LPNETRESOURCEW lpNetResource,
_Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer,		_Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer,
_Inout_ LPDWORD lpBufferSize		_Inout_ LPDWORD lpBufferSize
);		);

typedef DWORD (APIENTRY *PF_NPGetResourceParent) (		typedef DWORD (APIENTRY *PF_NPGetResourceParent) (
_In_ LPNETRESOURCEW lpNetResource,		_In_ LPNETRESOURCEW lpNetResource,
_Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer,		_Out_writes_bytes_(*lpBufferSize) LPVOID lpBuffer,

skipping to change at line 336		skipping to change at line 354
);		);

typedef DWORD (APIENTRY *PF_NPFormatNetworkName) (		typedef DWORD (APIENTRY *PF_NPFormatNetworkName) (
_In_ LPWSTR lpRemoteName,		_In_ LPWSTR lpRemoteName,
_Out_writes_(*lpnLength) LPWSTR lpFormattedName,		_Out_writes_(*lpnLength) LPWSTR lpFormattedName,
_Inout_ LPDWORD lpnLength,		_Inout_ LPDWORD lpnLength,
_In_ DWORD dwFlags,		_In_ DWORD dwFlags,
_In_ DWORD dwAveCharPerLine		_In_ DWORD dwAveCharPerLine
);		);


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_PK
		G_REMOTEFS) */
		#pragma endregion

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

DWORD APIENTRY		DWORD APIENTRY
NPGetPropertyText(		NPGetPropertyText(
_In_ DWORD iButton,		_In_ DWORD iButton,
_In_ DWORD nPropSel,		_In_ DWORD nPropSel,
_In_ LPWSTR lpName,		_In_ LPWSTR lpName,
_Out_writes_(nButtonNameLen) LPWSTR lpButtonName,		_Out_writes_(nButtonNameLen) LPWSTR lpButtonName,
_In_ DWORD nButtonNameLen,		_In_ DWORD nButtonNameLen,
_In_ DWORD nType		_In_ DWORD nType
);		);


skipping to change at line 409		skipping to change at line 433
_In_ LPWSTR lpDir,		_In_ LPWSTR lpDir,
_In_ DWORD dwOper		_In_ DWORD dwOper
);		);

typedef DWORD (APIENTRY *PF_NPDirectoryNotify) (		typedef DWORD (APIENTRY *PF_NPDirectoryNotify) (
_In_ HWND hwnd,		_In_ HWND hwnd,
_In_ LPWSTR lpDir,		_In_ LPWSTR lpDir,
_In_ DWORD dwOper		_In_ DWORD dwOper
);		);


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
		#pragma endregion

		#pragma region Desktop Family or OneCore Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

VOID		VOID
WNetSetLastErrorA(		WNetSetLastErrorA(
_In_ DWORD err,		_In_ DWORD err,
_In_ LPSTR lpError,		_In_ LPSTR lpError,
_In_ LPSTR lpProviders		_In_ LPSTR lpProviders
);		);

VOID		VOID
WNetSetLastErrorW(		WNetSetLastErrorW(
_In_ DWORD err,		_In_ DWORD err,
_In_ LPWSTR lpError,		_In_ LPWSTR lpError,
_In_ LPWSTR lpProviders		_In_ LPWSTR lpProviders
);		);

#ifdef UNICODE		#ifdef UNICODE
#define WNetSetLastError WNetSetLastErrorW		#define WNetSetLastError WNetSetLastErrorW
#else		#else
#define WNetSetLastError WNetSetLastErrorA		#define WNetSetLastError WNetSetLastErrorA
#endif // UNICODE		#endif // UNICODE


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY
		STEM) */
		#pragma endregion

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

//		//
// CREDENTIAL MANAGEMENT and other classes of providers		// CREDENTIAL MANAGEMENT and other classes of providers
//		//

// Define the Net/Authentication and othr Provider Classes		// Define the Net/Authentication and othr Provider Classes
#define WN_NETWORK_CLASS 0x00000001		#define WN_NETWORK_CLASS 0x00000001
#define WN_CREDENTIAL_CLASS 0x00000002		#define WN_CREDENTIAL_CLASS 0x00000002
#define WN_PRIMARY_AUTHENT_CLASS 0x00000004		#define WN_PRIMARY_AUTHENT_CLASS 0x00000004
#define WN_SERVICE_CLASS 0x00000008		#define WN_SERVICE_CLASS 0x00000008


skipping to change at line 596		skipping to change at line 632

typedef DWORD (APIENTRY *PF_NPFMXGetPermHelp) (		typedef DWORD (APIENTRY *PF_NPFMXGetPermHelp) (
_In_ LPWSTR lpDriveName,		_In_ LPWSTR lpDriveName,
_In_ DWORD nDialogType,		_In_ DWORD nDialogType,
_In_ BOOL fDirectory,		_In_ BOOL fDirectory,
_Out_writes_(*lpBufferSize) LPVOID lpFileNameBuffer,		_Out_writes_(*lpBufferSize) LPVOID lpFileNameBuffer,
_Inout_ LPDWORD lpBufferSize,		_Inout_ LPDWORD lpBufferSize,
_Out_ LPDWORD lpnHelpContext		_Out_ LPDWORD lpnHelpContext
);		);


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
		#pragma endregion

		#pragma region Desktop Family or OneCore Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion

#endif // _NPAPI_INCLUDED		#endif // _NPAPI_INCLUDED

End of changes. 9 change blocks.
3 lines changed or deleted		51 lines changed or added

winnetwk.h (6.3.9600.17415-Windows 8.1)		winnetwk.h (10.0.10586.0-Windows 10 1511 10586.494)

skipping to change at line 34		skipping to change at line 34

#ifndef _WINNETWK_		#ifndef _WINNETWK_
#define _WINNETWK_		#define _WINNETWK_

#pragma once		#pragma once

#ifdef __cplusplus		#ifdef __cplusplus
extern "C" {		extern "C" {
#endif		#endif


#pragma region Desktop Family		#if _MSC_VER >= 1200
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)		#pragma warning(push)
		#pragma warning(disable:4820) // padding added after data member
		#endif

		#pragma region Desktop Family or System Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

//		//
// Network types		// Network types
//		//

#include <wnnc.h>		#include <wnnc.h>

//		//
// Network Resources.		// Network Resources.
//		//

skipping to change at line 270		skipping to change at line 275
_In_ LPCWSTR lpLocalName,		_In_ LPCWSTR lpLocalName,
_Out_writes_opt_(*lpnLength) LPWSTR lpRemoteName,		_Out_writes_opt_(*lpnLength) LPWSTR lpRemoteName,
_Inout_ LPDWORD lpnLength		_Inout_ LPDWORD lpnLength
);		);
#ifdef UNICODE		#ifdef UNICODE
#define WNetGetConnection WNetGetConnectionW		#define WNetGetConnection WNetGetConnectionW
#else		#else
#define WNetGetConnection WNetGetConnectionA		#define WNetGetConnection WNetGetConnectionA
#endif // !UNICODE		#endif // !UNICODE


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY
		STEM) */
		#pragma endregion

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)		#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN)
_Check_return_		_Check_return_
DWORD APIENTRY		DWORD APIENTRY
WNetRestoreSingleConnectionW(		WNetRestoreSingleConnectionW(
_In_opt_ HWND hwndParent,		_In_opt_ HWND hwndParent,
_In_ LPCWSTR lpDevice,		_In_ LPCWSTR lpDevice,
_In_ BOOL fUseUI		_In_ BOOL fUseUI
);		);

#else		#else
_Check_return_		_Check_return_
DWORD APIENTRY		DWORD APIENTRY
WNetRestoreConnectionW(		WNetRestoreConnectionW(
_In_opt_ HWND hWnd,		_In_opt_ HWND hWnd,
_In_ LPCWSTR lpDevice		_In_ LPCWSTR lpDevice
);		);

#endif		#endif


		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
		#pragma endregion

		#pragma region Desktop Family or System Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SYSTEM)

#if(WINVER >= 0x0400)		#if(WINVER >= 0x0400)
_Check_return_		_Check_return_
DWORD APIENTRY		DWORD APIENTRY
WNetUseConnectionA(		WNetUseConnectionA(
_In_opt_ HWND hwndOwner,		_In_opt_ HWND hwndOwner,
_In_ LPNETRESOURCEA lpNetResource,		_In_ LPNETRESOURCEA lpNetResource,
_In_opt_ LPCSTR lpPassword,		_In_opt_ LPCSTR lpPassword,
_In_opt_ LPCSTR lpUserId,		_In_opt_ LPCSTR lpUserId,
_In_ DWORD dwFlags,		_In_ DWORD dwFlags,
_Out_writes_opt_(*lpBufferSize) LPSTR lpAccessName,		_Out_writes_opt_(*lpBufferSize) LPSTR lpAccessName,

skipping to change at line 815		skipping to change at line 832
_In_ LPNETRESOURCEW lpNetResource,		_In_ LPNETRESOURCEW lpNetResource,
_Out_ LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct		_Out_ LPNETCONNECTINFOSTRUCT lpNetConnectInfoStruct
);		);
#ifdef UNICODE		#ifdef UNICODE
#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceW		#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceW
#else		#else
#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA		#define MultinetGetConnectionPerformance MultinetGetConnectionPerformanceA
#endif // !UNICODE		#endif // !UNICODE
#endif /* WINVER >= 0x0400 */		#endif /* WINVER >= 0x0400 */


#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_SY STEM) */
#pragma endregion		#pragma endregion


		#if _MSC_VER >= 1200
		#pragma warning(pop)
		#endif

#ifdef __cplusplus		#ifdef __cplusplus
}		}
#endif		#endif

#endif // _WINNETWK_		#endif // _WINNETWK_

End of changes. 5 change blocks.
3 lines changed or deleted		25 lines changed or added

This html diff was produced by rfcdiff 1.41.