Headers diff for wkscli.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.212-Windows 10 1511 10586.494 versions

lmjoin.h (6.3.9600.17415-Windows 8.1)		lmjoin.h (10.0.10586.212-Windows 10 1511 10586.494)

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

#ifndef __LMJOIN_H__		#ifndef __LMJOIN_H__
#define __LMJOIN_H__		#define __LMJOIN_H__

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


#pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

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


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

//		//
// Types of name that can be validated		// Types of name that can be validated
//		//
typedef enum _NETSETUP_NAME_TYPE {		typedef enum _NETSETUP_NAME_TYPE {

NetSetupUnknown = 0,		NetSetupUnknown = 0,
NetSetupMachine,		NetSetupMachine,
NetSetupWorkgroup,		NetSetupWorkgroup,
NetSetupDomain,		NetSetupDomain,
NetSetupNonExistentDomain,		NetSetupNonExistentDomain,

skipping to change at line 67		skipping to change at line 67
//		//
typedef enum _NETSETUP_JOIN_STATUS {		typedef enum _NETSETUP_JOIN_STATUS {

NetSetupUnknownStatus = 0,		NetSetupUnknownStatus = 0,
NetSetupUnjoined,		NetSetupUnjoined,
NetSetupWorkgroupName,		NetSetupWorkgroupName,
NetSetupDomainName		NetSetupDomainName

} NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS;		} NETSETUP_JOIN_STATUS, *PNETSETUP_JOIN_STATUS;


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

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

//		//
// Flags to determine the behavior of the join/unjoin APIs		// Flags to determine the behavior of the join/unjoin APIs
//		//
#define NETSETUP_JOIN_DOMAIN 0x00000001 // If not present, workgroup is joined		#define NETSETUP_JOIN_DOMAIN 0x00000001 // If not present, workgroup is joined
#define NETSETUP_ACCT_CREATE 0x00000002 // Do the server side account cr eation/rename		#define NETSETUP_ACCT_CREATE 0x00000002 // Do the server side account cr eation/rename
#define NETSETUP_ACCT_DELETE 0x00000004 // Delete the account when a dom ain is left		#define NETSETUP_ACCT_DELETE 0x00000004 // Delete the account when a dom ain is left
#define NETSETUP_WIN9X_UPGRADE 0x00000010 // Invoked during upgrade of Win dows 9x to		#define NETSETUP_WIN9X_UPGRADE 0x00000010 // Invoked during upgrade of Win dows 9x to
// Windows NT		// Windows NT
#define NETSETUP_DOMAIN_JOIN_IF_JOINED 0x00000020 // Allow the client to join a new domain		#define NETSETUP_DOMAIN_JOIN_IF_JOINED 0x00000020 // Allow the client to join a new domain
// even if it is already joined to a domain		// even if it is already joined to a domain

skipping to change at line 294		skipping to change at line 300
NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetValidateName(		NetValidateName(
_In_opt_ LPCWSTR lpServer,		_In_opt_ LPCWSTR lpServer,
_In_ LPCWSTR lpName,		_In_ LPCWSTR lpName,
_In_opt_ LPCWSTR lpAccount,		_In_opt_ LPCWSTR lpAccount,
_In_opt_ LPCWSTR lpPassword,		_In_opt_ LPCWSTR lpPassword,
_In_ NETSETUP_NAME_TYPE NameType		_In_ NETSETUP_NAME_TYPE NameType
);		);


		#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)

//		//
// Determines whether a workstation is joined to a domain or not		// Determines whether a workstation is joined to a domain or not
//		//
NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetGetJoinInformation(		NetGetJoinInformation(
_In_opt_ LPCWSTR lpServer,		_In_opt_ LPCWSTR lpServer,
_Outptr_ LPWSTR *lpNameBuffer,		_Outptr_ LPWSTR *lpNameBuffer,
_Out_ PNETSETUP_JOIN_STATUS BufferType		_Out_ PNETSETUP_JOIN_STATUS BufferType
);		);


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

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

//		//
// Determines the list of OUs that the client can create a machine account in		// Determines the list of OUs that the client can create a machine account in
//		//
NET_API_STATUS		NET_API_STATUS
NET_API_FUNCTION		NET_API_FUNCTION
NetGetJoinableOUs(		NetGetJoinableOUs(
_In_ LPCWSTR lpServer,		_In_ LPCWSTR lpServer,
_In_ LPCWSTR lpDomain,		_In_ LPCWSTR lpDomain,
_In_opt_ LPCWSTR lpAccount,		_In_opt_ LPCWSTR lpAccount,
_In_opt_ LPCWSTR lpPassword,		_In_opt_ LPCWSTR lpPassword,

skipping to change at line 382		skipping to change at line 400
NetEnumerateComputerNames(		NetEnumerateComputerNames(
_In_opt_ LPCWSTR Server,		_In_opt_ LPCWSTR Server,
_In_ NET_COMPUTER_NAME_TYPE NameType,		_In_ NET_COMPUTER_NAME_TYPE NameType,
_In_ ULONG Reserved,		_In_ ULONG Reserved,
_Out_ PDWORD EntryCount,		_Out_ PDWORD EntryCount,
_Outptr_result_buffer_(EntryCount) LPWSTR *ComputerNames		_Outptr_result_buffer_(EntryCount) LPWSTR *ComputerNames
);		);

#endif // (_WIN32_WINNT >= 0x0501)		#endif // (_WIN32_WINNT >= 0x0501)


#ifdef __cplusplus		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */
}
#endif		#pragma region Deskotp Family or Application Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_APP)

		#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10)

		//
		// AAD join type
		//
		typedef enum _DSREG_JOIN_TYPE{
		DSREG_UNKNOWN_JOIN = 0,
		DSREG_DEVICE_JOIN = 1,
		DSREG_WORKPLACE_JOIN = 2
		} DSREG_JOIN_TYPE, *PDSREG_JOIN_TYPE;

		typedef struct _DSREG_USER_INFO
		{
		LPWSTR pszUserEmail;
		LPWSTR pszUserKeyId;
		LPWSTR pszUserKeyName;

		} DSREG_USER_INFO, *PDSREG_USER_INFO;

		//
		// The following type definition must be kept
		// in sync with wincrypt.h
		//
		#ifndef __WINCRYPT_H__
		typedef const struct _CERT_CONTEXT *PCCERT_CONTEXT;
		#endif // __WINCRYPT_H__

		typedef struct _DSREG_JOIN_INFO
		{
		DSREG_JOIN_TYPE joinType;

		PCCERT_CONTEXT pJoinCertificate;
		LPWSTR pszDeviceId;

		LPWSTR pszIdpDomain;
		LPWSTR pszTenantId;
		LPWSTR pszJoinUserEmail;

		LPWSTR pszTenantDisplayName;

		LPWSTR pszMdmEnrollmentUrl;
		LPWSTR pszMdmTermsOfUseUrl;
		LPWSTR pszMdmComplianceUrl;

		LPWSTR pszUserSettingSyncUrl;

		DSREG_USER_INFO *pUserInfo;

		} DSREG_JOIN_INFO, *PDSREG_JOIN_INFO;

		#endif // _WIN32_WINNT >= _WIN32_WINNT_WIN10

		#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP \| WINAPI_PARTITION_AP
		P) */
		#pragma endregion

		#pragma region Desktop Family
		#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)

		#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10)

		HRESULT
		NET_API_FUNCTION
		NetGetAadJoinInformation(
		_In_opt_ LPCWSTR pcszTenantId,
		_Outptr_result_maybenull_ PDSREG_JOIN_INFO *ppJoinInfo
		);

		VOID
		NET_API_FUNCTION
		NetFreeAadJoinInformation(
		_In_opt_ PDSREG_JOIN_INFO pJoinInfo
		);

		#endif // (_WIN32_WINNT >= _WIN32_WINNT_WIN10)

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


		#ifdef __cplusplus
		}
		#endif

#endif // __LMJOIN_H__		#endif // __LMJOIN_H__

End of changes. 7 change blocks.
6 lines changed or deleted		107 lines changed or added

lmuse.h (6.3.9600.17415-Windows 8.1)		lmuse.h (10.0.10586.212-Windows 10 1511 10586.494)

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

#ifndef _LMUSE_		#ifndef _LMUSE_
#define _LMUSE_		#define _LMUSE_

#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

#include <lmcons.h>		#include <lmcons.h>
#include <lmuseflg.h> // Deletion force level flags		#include <lmuseflg.h> // Deletion force level flags

//		//
// Function Prototypes		// Function Prototypes

skipping to change at line 193		skipping to change at line 193
// exists then update credentials after iss uing remote		// exists then update credentials after iss uing remote
// tree connection. This is needed as CSC c annot verify		// tree connection. This is needed as CSC c annot verify
// credentials while offline.		// credentials while offline.

#define USE_DEFAULT_CREDENTIALS 0x4 // No explicit credentials passed to NetUse Add		#define USE_DEFAULT_CREDENTIALS 0x4 // No explicit credentials passed to NetUse Add

#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 // _LMUSE_		#endif // _LMUSE_

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

This html diff was produced by rfcdiff 1.41.