Headers diff for netapi32.dll between 5.2.3790.3959-Windows 5.0 and 6.0.6002.18005-Windows 6.0 versions



 dsgetdc.h (5.2.3790.3959-Windows 5.0)   dsgetdc.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 65 skipping to change at line 65
#define DS_KDC_REQUIRED 0x00000400 #define DS_KDC_REQUIRED 0x00000400
#define DS_TIMESERV_REQUIRED 0x00000800 #define DS_TIMESERV_REQUIRED 0x00000800
#define DS_WRITABLE_REQUIRED 0x00001000 #define DS_WRITABLE_REQUIRED 0x00001000
#define DS_GOOD_TIMESERV_PREFERRED 0x00002000 #define DS_GOOD_TIMESERV_PREFERRED 0x00002000
#define DS_AVOID_SELF 0x00004000 #define DS_AVOID_SELF 0x00004000
#define DS_ONLY_LDAP_NEEDED 0x00008000 #define DS_ONLY_LDAP_NEEDED 0x00008000
#define DS_IS_FLAT_NAME 0x00010000 #define DS_IS_FLAT_NAME 0x00010000
#define DS_IS_DNS_NAME 0x00020000 #define DS_IS_DNS_NAME 0x00020000
#define DS_TRY_NEXTCLOSEST_SITE 0x00040000
#define DS_DIRECTORY_SERVICE_6_REQUIRED 0x00080000
#define DS_RETURN_DNS_NAME 0x40000000 #define DS_RETURN_DNS_NAME 0x40000000
#define DS_RETURN_FLAT_NAME 0x80000000 #define DS_RETURN_FLAT_NAME 0x80000000
#define DSGETDC_VALID_FLAGS ( \ #define DSGETDC_VALID_FLAGS ( \
DS_FORCE_REDISCOVERY | \ DS_FORCE_REDISCOVERY | \
DS_DIRECTORY_SERVICE_REQUIRED | \ DS_DIRECTORY_SERVICE_REQUIRED | \
DS_DIRECTORY_SERVICE_PREFERRED | \ DS_DIRECTORY_SERVICE_PREFERRED | \
DS_GC_SERVER_REQUIRED | \ DS_GC_SERVER_REQUIRED | \
DS_PDC_REQUIRED | \ DS_PDC_REQUIRED | \
DS_BACKGROUND_ONLY | \ DS_BACKGROUND_ONLY | \
DS_IP_REQUIRED | \ DS_IP_REQUIRED | \
DS_KDC_REQUIRED | \ DS_KDC_REQUIRED | \
DS_TIMESERV_REQUIRED | \ DS_TIMESERV_REQUIRED | \
DS_WRITABLE_REQUIRED | \ DS_WRITABLE_REQUIRED | \
DS_GOOD_TIMESERV_PREFERRED | \ DS_GOOD_TIMESERV_PREFERRED | \
DS_AVOID_SELF | \ DS_AVOID_SELF | \
DS_ONLY_LDAP_NEEDED | \ DS_ONLY_LDAP_NEEDED | \
DS_IS_FLAT_NAME | \ DS_IS_FLAT_NAME | \
DS_IS_DNS_NAME | \ DS_IS_DNS_NAME | \
DS_TRY_NEXTCLOSEST_SITE | \
DS_DIRECTORY_SERVICE_6_REQUIRED | \
DS_RETURN_FLAT_NAME | \ DS_RETURN_FLAT_NAME | \
DS_RETURN_DNS_NAME ) DS_RETURN_DNS_NAME )
// //
// Structure returned from DsGetDcName // Structure returned from DsGetDcName
// //
typedef struct _DOMAIN_CONTROLLER_INFOA { typedef struct _DOMAIN_CONTROLLER_INFOA {
LPSTR DomainControllerName; LPSTR DomainControllerName;
LPSTR DomainControllerAddress; LPSTR DomainControllerAddress;
skipping to change at line 168 skipping to change at line 174
#define DS_PDC_FLAG 0x00000001 // DC is PDC of Domain #define DS_PDC_FLAG 0x00000001 // DC is PDC of Domain
#define DS_GC_FLAG 0x00000004 // DC is a GC of forest #define DS_GC_FLAG 0x00000004 // DC is a GC of forest
#define DS_LDAP_FLAG 0x00000008 // Server supports an LDAP server #define DS_LDAP_FLAG 0x00000008 // Server supports an LDAP server
#define DS_DS_FLAG 0x00000010 // DC supports a DS and is a Domain Controller #define DS_DS_FLAG 0x00000010 // DC supports a DS and is a Domain Controller
#define DS_KDC_FLAG 0x00000020 // DC is running KDC service #define DS_KDC_FLAG 0x00000020 // DC is running KDC service
#define DS_TIMESERV_FLAG 0x00000040 // DC is running time service #define DS_TIMESERV_FLAG 0x00000040 // DC is running time service
#define DS_CLOSEST_FLAG 0x00000080 // DC is in closest site to client #define DS_CLOSEST_FLAG 0x00000080 // DC is in closest site to client
#define DS_WRITABLE_FLAG 0x00000100 // DC has a writable DS #define DS_WRITABLE_FLAG 0x00000100 // DC has a writable DS
#define DS_GOOD_TIMESERV_FLAG 0x00000200 // DC is running time service (and has clock hardware) #define DS_GOOD_TIMESERV_FLAG 0x00000200 // DC is running time service (and has clock hardware)
#define DS_NDNC_FLAG 0x00000400 // DomainName is non-domain NC serv iced by the LDAP server #define DS_NDNC_FLAG 0x00000400 // DomainName is non-domain NC serv iced by the LDAP server
#define DS_PING_FLAGS 0x0000FFFF // Flags returned on ping #define DS_SELECT_SECRET_DOMAIN_6_FLAG 0x00000800 // DC has some secrets
#define DS_FULL_SECRET_DOMAIN_6_FLAG 0x00001000 // DC has all secrets
#define DS_PING_FLAGS 0x000FFFFF // Flags returned on ping
#define DS_DNS_CONTROLLER_FLAG 0x20000000 // DomainControllerName is a DNS na me #define DS_DNS_CONTROLLER_FLAG 0x20000000 // DomainControllerName is a DNS na me
#define DS_DNS_DOMAIN_FLAG 0x40000000 // DomainName is a DNS name #define DS_DNS_DOMAIN_FLAG 0x40000000 // DomainName is a DNS name
#define DS_DNS_FOREST_FLAG 0x80000000 // DnsForestName is a DNS name #define DS_DNS_FOREST_FLAG 0x80000000 // DnsForestName is a DNS name
// //
// Function Prototypes // Function Prototypes
// //
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetDcNameA( DsGetDcNameA(
IN LPCSTR ComputerName OPTIONAL, IN __in_opt LPCSTR ComputerName OPTIONAL,
IN LPCSTR DomainName OPTIONAL, IN __in_opt LPCSTR DomainName OPTIONAL,
IN GUID *DomainGuid OPTIONAL, IN GUID *DomainGuid OPTIONAL,
IN LPCSTR SiteName OPTIONAL, IN __in_opt LPCSTR SiteName OPTIONAL,
IN ULONG Flags, IN ULONG Flags,
OUT PDOMAIN_CONTROLLER_INFOA *DomainControllerInfo OUT PDOMAIN_CONTROLLER_INFOA *DomainControllerInfo
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetDcNameW( DsGetDcNameW(
IN LPCWSTR ComputerName OPTIONAL, IN __in_opt LPCWSTR ComputerName OPTIONAL,
IN LPCWSTR DomainName OPTIONAL, IN __in_opt LPCWSTR DomainName OPTIONAL,
IN GUID *DomainGuid OPTIONAL, IN GUID *DomainGuid OPTIONAL,
IN LPCWSTR SiteName OPTIONAL, IN __in_opt LPCWSTR SiteName OPTIONAL,
IN ULONG Flags, IN ULONG Flags,
OUT PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo OUT PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo
); );
#ifdef UNICODE #ifdef UNICODE
#define DsGetDcName DsGetDcNameW #define DsGetDcName DsGetDcNameW
#else #else
#define DsGetDcName DsGetDcNameA #define DsGetDcName DsGetDcNameA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetSiteNameA( DsGetSiteNameA(
IN LPCSTR ComputerName OPTIONAL, IN __in_opt LPCSTR ComputerName OPTIONAL,
OUT LPSTR *SiteName OUT __deref_out LPSTR *SiteName
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetSiteNameW( DsGetSiteNameW(
IN LPCWSTR ComputerName OPTIONAL, IN __in_opt LPCWSTR ComputerName OPTIONAL,
OUT LPWSTR *SiteName OUT __deref_out LPWSTR *SiteName
); );
#ifdef UNICODE #ifdef UNICODE
#define DsGetSiteName DsGetSiteNameW #define DsGetSiteName DsGetSiteNameW
#else #else
#define DsGetSiteName DsGetSiteNameA #define DsGetSiteName DsGetSiteNameA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsValidateSubnetNameW( DsValidateSubnetNameW(
IN LPCWSTR SubnetName __in IN LPCWSTR SubnetName
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsValidateSubnetNameA( DsValidateSubnetNameA(
IN LPCSTR SubnetName __in IN LPCSTR SubnetName
); );
#ifdef UNICODE #ifdef UNICODE
#define DsValidateSubnetName DsValidateSubnetNameW #define DsValidateSubnetName DsValidateSubnetNameW
#else #else
#define DsValidateSubnetName DsValidateSubnetNameA #define DsValidateSubnetName DsValidateSubnetNameA
#endif // !UNICODE #endif // !UNICODE
// //
// Only include if winsock2.h has been included // Only include if winsock2.h has been included
// //
#ifdef _WINSOCK2API_ #ifdef _WINSOCK2API_
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsAddressToSiteNamesW( DsAddressToSiteNamesW(
IN LPCWSTR ComputerName OPTIONAL, IN __in_opt LPCWSTR ComputerName OPTIONAL,
IN DWORD EntryCount, IN DWORD EntryCount,
IN PSOCKET_ADDRESS SocketAddresses, IN PSOCKET_ADDRESS SocketAddresses,
OUT LPWSTR **SiteNames OUT __deref_out_ecount(EntryCount) LPWSTR **SiteNames
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsAddressToSiteNamesA( DsAddressToSiteNamesA(
IN LPCSTR ComputerName OPTIONAL, IN __in_opt LPCSTR ComputerName OPTIONAL,
IN DWORD EntryCount, IN DWORD EntryCount,
IN PSOCKET_ADDRESS SocketAddresses, IN PSOCKET_ADDRESS SocketAddresses,
OUT LPSTR **SiteNames OUT __deref_out_ecount(EntryCount) LPSTR **SiteNames
); );
#ifdef UNICODE #ifdef UNICODE
#define DsAddressToSiteNames DsAddressToSiteNamesW #define DsAddressToSiteNames DsAddressToSiteNamesW
#else #else
#define DsAddressToSiteNames DsAddressToSiteNamesA #define DsAddressToSiteNames DsAddressToSiteNamesA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsAddressToSiteNamesExW( DsAddressToSiteNamesExW(
IN LPCWSTR ComputerName OPTIONAL, IN __in_opt LPCWSTR ComputerName OPTIONAL,
IN DWORD EntryCount, IN DWORD EntryCount,
IN PSOCKET_ADDRESS SocketAddresses, IN PSOCKET_ADDRESS SocketAddresses,
OUT LPWSTR **SiteNames, OUT __deref_out_ecount(EntryCount) LPWSTR **SiteNames,
OUT LPWSTR **SubnetNames OUT __deref_out_ecount(EntryCount) LPWSTR **SubnetNames
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsAddressToSiteNamesExA( DsAddressToSiteNamesExA(
IN LPCSTR ComputerName OPTIONAL, IN __in_opt LPCSTR ComputerName OPTIONAL,
IN DWORD EntryCount, IN DWORD EntryCount,
IN PSOCKET_ADDRESS SocketAddresses, IN PSOCKET_ADDRESS SocketAddresses,
OUT LPSTR **SiteNames, OUT __deref_out_ecount(EntryCount) LPSTR **SiteNames,
OUT LPSTR **SubnetNames OUT __deref_out_ecount(EntryCount) LPSTR **SubnetNames
); );
#ifdef UNICODE #ifdef UNICODE
#define DsAddressToSiteNamesEx DsAddressToSiteNamesExW #define DsAddressToSiteNamesEx DsAddressToSiteNamesExW
#else #else
#define DsAddressToSiteNamesEx DsAddressToSiteNamesExA #define DsAddressToSiteNamesEx DsAddressToSiteNamesExA
#endif // !UNICODE #endif // !UNICODE
#endif // _WINSOCK2API_ #endif // _WINSOCK2API_
// //
skipping to change at line 406 skipping to change at line 414
#define PDS_DOMAIN_TRUSTS PDS_DOMAIN_TRUSTSW #define PDS_DOMAIN_TRUSTS PDS_DOMAIN_TRUSTSW
#else #else
#define DS_DOMAIN_TRUSTS DS_DOMAIN_TRUSTSA #define DS_DOMAIN_TRUSTS DS_DOMAIN_TRUSTSA
#define PDS_DOMAIN_TRUSTS PDS_DOMAIN_TRUSTSA #define PDS_DOMAIN_TRUSTS PDS_DOMAIN_TRUSTSA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsEnumerateDomainTrustsW ( DsEnumerateDomainTrustsW (
IN LPWSTR ServerName OPTIONAL, __in_opt LPWSTR ServerName OPTIONAL,
IN ULONG Flags, __in ULONG Flags,
OUT PDS_DOMAIN_TRUSTSW *Domains, __deref_out_ecount(*DomainCount) PDS_DOMAIN_TRUSTSW *Domains,
OUT PULONG DomainCount __out PULONG DomainCount
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsEnumerateDomainTrustsA ( DsEnumerateDomainTrustsA (
IN LPSTR ServerName OPTIONAL, __in_opt LPSTR ServerName OPTIONAL,
IN ULONG Flags, __in ULONG Flags,
OUT PDS_DOMAIN_TRUSTSA *Domains, __deref_out_ecount(*DomainCount) PDS_DOMAIN_TRUSTSA *Domains,
OUT PULONG DomainCount __out PULONG DomainCount
); );
#ifdef UNICODE #ifdef UNICODE
#define DsEnumerateDomainTrusts DsEnumerateDomainTrustsW #define DsEnumerateDomainTrusts DsEnumerateDomainTrustsW
#else #else
#define DsEnumerateDomainTrusts DsEnumerateDomainTrustsA #define DsEnumerateDomainTrusts DsEnumerateDomainTrustsA
#endif // !UNICODE #endif // !UNICODE
// //
// Only define this API if the caller has #included the pre-requisite // Only define this API if the caller has #included the pre-requisite
skipping to change at line 464 skipping to change at line 472
IN PLSA_FOREST_TRUST_INFORMATION OldForestTrustInfo OPTIONAL, IN PLSA_FOREST_TRUST_INFORMATION OldForestTrustInfo OPTIONAL,
OUT PLSA_FOREST_TRUST_INFORMATION *MergedForestTrustInfo OUT PLSA_FOREST_TRUST_INFORMATION *MergedForestTrustInfo
); );
#endif // _NTLSA_ || _NTSECAPI_ #endif // _NTLSA_ || _NTSECAPI_
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetDcSiteCoverageW( DsGetDcSiteCoverageW(
IN LPCWSTR ServerName OPTIONAL, IN __in_opt LPCWSTR ServerName OPTIONAL,
OUT PULONG EntryCount, OUT PULONG EntryCount,
OUT LPWSTR **SiteNames OUT __deref_out_ecount(*EntryCount) LPWSTR **SiteNames
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetDcSiteCoverageA( DsGetDcSiteCoverageA(
IN LPCSTR ServerName OPTIONAL, IN __in_opt LPCSTR ServerName OPTIONAL,
OUT PULONG EntryCount, OUT PULONG EntryCount,
OUT LPSTR **SiteNames OUT __deref_out_ecount(*EntryCount) LPSTR **SiteNames
); );
#ifdef UNICODE #ifdef UNICODE
#define DsGetDcSiteCoverage DsGetDcSiteCoverageW #define DsGetDcSiteCoverage DsGetDcSiteCoverageW
#else #else
#define DsGetDcSiteCoverage DsGetDcSiteCoverageA #define DsGetDcSiteCoverage DsGetDcSiteCoverageA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsDeregisterDnsHostRecordsW ( DsDeregisterDnsHostRecordsW (
IN LPWSTR ServerName OPTIONAL, __in_opt LPWSTR ServerName OPTIONAL,
IN LPWSTR DnsDomainName OPTIONAL, __in_opt LPWSTR DnsDomainName OPTIONAL,
IN GUID *DomainGuid OPTIONAL, __in_opt GUID *DomainGuid OPTIONAL,
IN GUID *DsaGuid OPTIONAL, __in_opt GUID *DsaGuid OPTIONAL,
IN LPWSTR DnsHostName __in LPWSTR DnsHostName
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsDeregisterDnsHostRecordsA ( DsDeregisterDnsHostRecordsA (
IN LPSTR ServerName OPTIONAL, __in_opt LPSTR ServerName OPTIONAL,
IN LPSTR DnsDomainName OPTIONAL, __in_opt LPSTR DnsDomainName OPTIONAL,
IN GUID *DomainGuid OPTIONAL, __in_opt GUID *DomainGuid OPTIONAL,
IN GUID *DsaGuid OPTIONAL, __in_opt GUID *DsaGuid OPTIONAL,
IN LPSTR DnsHostName __in LPSTR DnsHostName
); );
#ifdef UNICODE #ifdef UNICODE
#define DsDeregisterDnsHostRecords DsDeregisterDnsHostRecordsW #define DsDeregisterDnsHostRecords DsDeregisterDnsHostRecordsW
#else #else
#define DsDeregisterDnsHostRecords DsDeregisterDnsHostRecordsA #define DsDeregisterDnsHostRecords DsDeregisterDnsHostRecordsA
#endif // !UNICODE #endif // !UNICODE
#ifdef _WINSOCK2API_ // DsGetDcOpen/Next/Close depend on winsock2.h be included #ifdef _WINSOCK2API_ // DsGetDcOpen/Next/Close depend on winsock2.h be included
skipping to change at line 575 skipping to change at line 583
#define DsGetDcOpen DsGetDcOpenA #define DsGetDcOpen DsGetDcOpenA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetDcNextW( DsGetDcNextW(
IN HANDLE GetDcContextHandle, IN HANDLE GetDcContextHandle,
OUT PULONG SockAddressCount OPTIONAL, OUT PULONG SockAddressCount OPTIONAL,
OUT LPSOCKET_ADDRESS *SockAddresses OPTIONAL, OUT LPSOCKET_ADDRESS *SockAddresses OPTIONAL,
OUT LPWSTR *DnsHostName OPTIONAL OUT __deref_opt_out LPWSTR *DnsHostName OPTIONAL
); );
DSGETDCAPI DSGETDCAPI
DWORD DWORD
WINAPI WINAPI
DsGetDcNextA( DsGetDcNextA(
IN HANDLE GetDcContextHandle, IN HANDLE GetDcContextHandle,
OUT PULONG SockAddressCount OPTIONAL, OUT PULONG SockAddressCount OPTIONAL,
OUT LPSOCKET_ADDRESS *SockAddresses OPTIONAL, OUT LPSOCKET_ADDRESS *SockAddresses OPTIONAL,
OUT LPSTR *DnsHostName OPTIONAL OUT __deref_opt_out LPSTR *DnsHostName OPTIONAL
); );
#ifdef UNICODE #ifdef UNICODE
#define DsGetDcNext DsGetDcNextW #define DsGetDcNext DsGetDcNextW
#else #else
#define DsGetDcNext DsGetDcNextA #define DsGetDcNext DsGetDcNextA
#endif // !UNICODE #endif // !UNICODE
DSGETDCAPI DSGETDCAPI
VOID VOID
 End of changes. 29 change blocks. 
47 lines changed or deleted 55 lines changed or added


 dsrole.h (5.2.3790.3959-Windows 5.0)   dsrole.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 66 skipping to change at line 66
DsRoleOperationState DsRoleOperationState
} DSROLE_PRIMARY_DOMAIN_INFO_LEVEL; } DSROLE_PRIMARY_DOMAIN_INFO_LEVEL;
// //
// Flags to be used with the PRIMARY_DOMAIN_INFO_LEVEL structures below // Flags to be used with the PRIMARY_DOMAIN_INFO_LEVEL structures below
// //
#define DSROLE_PRIMARY_DS_RUNNING 0x00000001 #define DSROLE_PRIMARY_DS_RUNNING 0x00000001
#define DSROLE_PRIMARY_DS_MIXED_MODE 0x00000002 #define DSROLE_PRIMARY_DS_MIXED_MODE 0x00000002
#define DSROLE_UPGRADE_IN_PROGRESS 0x00000004 #define DSROLE_UPGRADE_IN_PROGRESS 0x00000004
#define DSROLE_PRIMARY_DS_READONLY 0x00000008
#define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT 0x01000000 #define DSROLE_PRIMARY_DOMAIN_GUID_PRESENT 0x01000000
// //
// Structure that correspond to the DSROLE_PRIMARY_DOMAIN_INFO_LEVEL // Structure that correspond to the DSROLE_PRIMARY_DOMAIN_INFO_LEVEL
// //
typedef struct _DSROLE_PRIMARY_DOMAIN_INFO_BASIC { typedef struct _DSROLE_PRIMARY_DOMAIN_INFO_BASIC {
DSROLE_MACHINE_ROLE MachineRole; DSROLE_MACHINE_ROLE MachineRole;
ULONG Flags; ULONG Flags;
LPWSTR DomainNameFlat; LPWSTR DomainNameFlat;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 lmaccess.h (5.2.3790.3959-Windows 5.0)   lmaccess.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 138 skipping to change at line 138
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetUserModalsSet ( NetUserModalsSet (
IN LPCWSTR servername OPTIONAL, IN LPCWSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
IN LPBYTE buf, IN LPBYTE buf,
OUT LPDWORD parm_err OPTIONAL OUT LPDWORD parm_err OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetUserChangePassword ( NetUserChangePassword (
IN LPCWSTR domainname OPTIONAL, __in_opt IN LPCWSTR domainname OPTIONAL,
IN LPCWSTR username OPTIONAL, __in_opt IN LPCWSTR username OPTIONAL,
IN LPCWSTR oldpassword, __in IN LPCWSTR oldpassword,
IN LPCWSTR newpassword __in IN LPCWSTR newpassword
); );
// //
// Data Structures - User // Data Structures - User
// //
typedef struct _USER_INFO_0 { typedef struct _USER_INFO_0 {
LPWSTR usri0_name; LPWSTR usri0_name;
}USER_INFO_0, *PUSER_INFO_0, *LPUSER_INFO_0; }USER_INFO_0, *PUSER_INFO_0, *LPUSER_INFO_0;
skipping to change at line 506 skipping to change at line 506
UF_SERVER_TRUST_ACCOUNT ) UF_SERVER_TRUST_ACCOUNT )
#define UF_ACCOUNT_TYPE_MASK ( \ #define UF_ACCOUNT_TYPE_MASK ( \
UF_TEMP_DUPLICATE_ACCOUNT | \ UF_TEMP_DUPLICATE_ACCOUNT | \
UF_NORMAL_ACCOUNT | \ UF_NORMAL_ACCOUNT | \
UF_INTERDOMAIN_TRUST_ACCOUNT | \ UF_INTERDOMAIN_TRUST_ACCOUNT | \
UF_WORKSTATION_TRUST_ACCOUNT | \ UF_WORKSTATION_TRUST_ACCOUNT | \
UF_SERVER_TRUST_ACCOUNT \ UF_SERVER_TRUST_ACCOUNT \
) )
#define UF_DONT_EXPIRE_PASSWD 0x10000 #define UF_DONT_EXPIRE_PASSWD 0x10000
#define UF_MNS_LOGON_ACCOUNT 0x20000 #define UF_MNS_LOGON_ACCOUNT 0x20000
#define UF_SMARTCARD_REQUIRED 0x40000 #define UF_SMARTCARD_REQUIRED 0x40000
#define UF_TRUSTED_FOR_DELEGATION 0x80000 #define UF_TRUSTED_FOR_DELEGATION 0x80000
#define UF_NOT_DELEGATED 0x100000 #define UF_NOT_DELEGATED 0x100000
#define UF_USE_DES_KEY_ONLY 0x200000 #define UF_USE_DES_KEY_ONLY 0x200000
#define UF_DONT_REQUIRE_PREAUTH 0x400000 #define UF_DONT_REQUIRE_PREAUTH 0x400000
#define UF_PASSWORD_EXPIRED 0x800000 #define UF_PASSWORD_EXPIRED 0x800000
#define UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION 0x1000000 #define UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION 0x1000000
#define UF_NO_AUTH_DATA_REQUIRED 0x2000000 #define UF_NO_AUTH_DATA_REQUIRED 0x2000000
#define UF_PARTIAL_SECRETS_ACCOUNT 0x4000000
#define UF_USE_AES_KEYS 0x8000000
#define UF_SETTABLE_BITS ( \ #define UF_SETTABLE_BITS ( \
UF_SCRIPT | \ UF_SCRIPT | \
UF_ACCOUNTDISABLE | \ UF_ACCOUNTDISABLE | \
UF_LOCKOUT | \ UF_LOCKOUT | \
UF_HOMEDIR_REQUIRED | \ UF_HOMEDIR_REQUIRED | \
UF_PASSWD_NOTREQD | \ UF_PASSWD_NOTREQD | \
UF_PASSWD_CANT_CHANGE | \ UF_PASSWD_CANT_CHANGE | \
UF_ACCOUNT_TYPE_MASK | \ UF_ACCOUNT_TYPE_MASK | \
UF_DONT_EXPIRE_PASSWD | \ UF_DONT_EXPIRE_PASSWD | \
UF_MNS_LOGON_ACCOUNT |\ UF_MNS_LOGON_ACCOUNT |\
UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED |\ UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED |\
UF_SMARTCARD_REQUIRED | \ UF_SMARTCARD_REQUIRED | \
UF_TRUSTED_FOR_DELEGATION | \ UF_TRUSTED_FOR_DELEGATION | \
UF_NOT_DELEGATED | \ UF_NOT_DELEGATED | \
UF_USE_DES_KEY_ONLY | \ UF_USE_DES_KEY_ONLY | \
UF_DONT_REQUIRE_PREAUTH |\ UF_DONT_REQUIRE_PREAUTH |\
UF_PASSWORD_EXPIRED |\ UF_PASSWORD_EXPIRED |\
UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION |\ UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION |\
UF_NO_AUTH_DATA_REQUIRED \ UF_NO_AUTH_DATA_REQUIRED |\
UF_USE_AES_KEYS |\
UF_PARTIAL_SECRETS_ACCOUNT \
) )
// //
// bit masks for the NetUserEnum filter parameter. // bit masks for the NetUserEnum filter parameter.
// //
#define FILTER_TEMP_DUPLICATE_ACCOUNT (0x0001) #define FILTER_TEMP_DUPLICATE_ACCOUNT (0x0001)
#define FILTER_NORMAL_ACCOUNT (0x0002) #define FILTER_NORMAL_ACCOUNT (0x0002)
// #define FILTER_PROXY_ACCOUNT (0x0004) // #define FILTER_PROXY_ACCOUNT (0x0004)
#define FILTER_INTERDOMAIN_TRUST_ACCOUNT (0x0008) #define FILTER_INTERDOMAIN_TRUST_ACCOUNT (0x0008)
skipping to change at line 1481 skipping to change at line 1485
#ifndef _LMDOMAIN_ #ifndef _LMDOMAIN_
#define _LMDOMAIN_ #define _LMDOMAIN_
// //
// Function Prototypes - Domain // Function Prototypes - Domain
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetGetDCName ( NetGetDCName (
IN LPCWSTR servername OPTIONAL, __in_opt IN LPCWSTR servername OPTIONAL,
IN LPCWSTR domainname OPTIONAL, __in_opt IN LPCWSTR domainname OPTIONAL,
OUT LPBYTE *bufptr OUT LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetGetAnyDCName ( NetGetAnyDCName (
IN LPCWSTR servername OPTIONAL, __in_opt IN LPCWSTR servername OPTIONAL,
IN LPCWSTR domainname OPTIONAL, __in_opt IN LPCWSTR domainname OPTIONAL,
OUT LPBYTE *bufptr OUT LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
I_NetLogonControl( I_NetLogonControl(
IN LPCWSTR ServerName OPTIONAL, IN LPCWSTR ServerName OPTIONAL,
IN DWORD FunctionCode, IN DWORD FunctionCode,
IN DWORD QueryLevel, IN DWORD QueryLevel,
OUT LPBYTE *Buffer OUT LPBYTE *Buffer
); );
skipping to change at line 1516 skipping to change at line 1520
IN LPBYTE Data, IN LPBYTE Data,
OUT LPBYTE *Buffer OUT LPBYTE *Buffer
); );
#ifndef _NTDEF_ #ifndef _NTDEF_
typedef LONG NTSTATUS, *PNTSTATUS; typedef LONG NTSTATUS, *PNTSTATUS;
#endif #endif
NTSTATUS NET_API_FUNCTION NTSTATUS NET_API_FUNCTION
NetEnumerateTrustedDomains ( NetEnumerateTrustedDomains (
IN LPWSTR ServerName OPTIONAL, __in_opt IN LPWSTR ServerName OPTIONAL,
OUT LPWSTR *DomainNames __deref_out OUT LPWSTR *DomainNames
); );
// //
// Special Values and Constants - Domain // Special Values and Constants - Domain
// //
// //
// FunctionCode values for I_NetLogonControl. // FunctionCode values for I_NetLogonControl.
// //
// NOTE : if you change the following NETLOGON_CONTROL_* values, // NOTE : if you change the following NETLOGON_CONTROL_* values,
 End of changes. 6 change blocks. 
21 lines changed or deleted 25 lines changed or added


 lmalert.h (5.2.3790.3959-Windows 5.0)   lmalert.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 44 skipping to change at line 44
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
// //
// Function Prototypes // Function Prototypes
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetAlertRaise( NetAlertRaise(
IN LPCWSTR AlertEventName, __in LPCWSTR AlertType,
IN LPVOID Buffer, __in LPVOID Buffer,
IN DWORD BufferSize __in DWORD BufferSize
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetAlertRaiseEx( NetAlertRaiseEx(
IN LPCWSTR AlertEventName, __in LPCWSTR AlertType,
IN LPVOID VariableInfo, __in LPVOID VariableInfo,
IN DWORD VariableInfoSize, __in DWORD VariableInfoSize,
IN LPCWSTR ServiceName __in LPCWSTR ServiceName
); );
// //
// Data Structures // Data Structures
// //
typedef struct _STD_ALERT { typedef struct _STD_ALERT {
DWORD alrt_timestamp; DWORD alrt_timestamp;
WCHAR alrt_eventname[EVLEN + 1]; WCHAR alrt_eventname[EVLEN + 1];
WCHAR alrt_servicename[SNLEN + 1]; WCHAR alrt_servicename[SNLEN + 1];
 End of changes. 2 change blocks. 
7 lines changed or deleted 7 lines changed or added


 lmdfs.h (5.2.3790.3959-Windows 5.0)   lmdfs.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 125 skipping to change at line 125
USHORT Reserved; // Must be set to 0. USHORT Reserved; // Must be set to 0.
} DFS_TARGET_PRIORITY, *PDFS_TARGET_PRIORITY; } DFS_TARGET_PRIORITY, *PDFS_TARGET_PRIORITY;
// //
// Level 1: // Level 1:
// //
typedef struct _DFS_INFO_1 { typedef struct _DFS_INFO_1 {
LPWSTR EntryPath; // Dfs name for the top of this piece of sto rage LPWSTR EntryPath; // Dfs name for the top of this piece of sto rage
} DFS_INFO_1, *PDFS_INFO_1, *LPDFS_INFO_1; } DFS_INFO_1, *PDFS_INFO_1, *LPDFS_INFO_1;
#if defined(_WIN64)
//
// WOW64 support: Permit 32-bit callers to use 64-bit
// driver.
//
typedef struct _DFS_INFO_1_32 {
ULONG EntryPath; // Dfs name for the top of this volume
} DFS_INFO_1_32, *PDFS_INFO_1_32, *LPDFS_INFO_1_32;
#endif /* _WIN64 */
// //
// Level 2: // Level 2:
// //
typedef struct _DFS_INFO_2 { typedef struct _DFS_INFO_2 {
LPWSTR EntryPath; // Dfs name for the top of this volume LPWSTR EntryPath; // Dfs name for the top of this volume
LPWSTR Comment; // Comment for this volume LPWSTR Comment; // Comment for this volume
DWORD State; // State of this volume, one of DFS_VOLUME_S TATE_* DWORD State; // State of this volume, one of DFS_VOLUME_S TATE_*
DWORD NumberOfStorages; // Number of storages for this volume DWORD NumberOfStorages; // Number of storages for this volume
} DFS_INFO_2, *PDFS_INFO_2, *LPDFS_INFO_2; } DFS_INFO_2, *PDFS_INFO_2, *LPDFS_INFO_2;
#if defined(_WIN64)
//
// WOW64 support: Permit 32-bit callers to use 64-bit
// driver.
//
typedef struct _DFS_INFO_2_32 {
ULONG EntryPath; // Dfs name for the top of this volume
ULONG Comment; // Comment for this volume
DWORD State; // State of this volume, one of DFS_VOLUME_S
TATE_*
DWORD NumberOfStorages; // Number of storage servers for this volume
} DFS_INFO_2_32, *PDFS_INFO_2_32, *LPDFS_INFO_2_32;
#endif /* _WIN64 */
typedef struct _DFS_STORAGE_INFO { typedef struct _DFS_STORAGE_INFO {
ULONG State; // State of this storage, one of DFS_STORAGE _STATE_* ULONG State; // State of this storage, one of DFS_STORAGE _STATE_*
// possibly OR'd with DFS_STORAGE_STATE_ACTI VE // possibly OR'd with DFS_STORAGE_STATE_ACTI VE
LPWSTR ServerName; // Name of server hosting this storage LPWSTR ServerName; // Name of server hosting this storage
LPWSTR ShareName; // Name of share hosting this storage LPWSTR ShareName; // Name of share hosting this storage
} DFS_STORAGE_INFO, *PDFS_STORAGE_INFO, *LPDFS_STORAGE_INFO; } DFS_STORAGE_INFO, *PDFS_STORAGE_INFO, *LPDFS_STORAGE_INFO;
#if defined(_WIN64) #if defined(_WIN64)
// //
skipping to change at line 424 skipping to change at line 453
DWORD Flags; DWORD Flags;
LPWSTR DfsName; // Dfs name LPWSTR DfsName; // Dfs name
} DFS_INFO_300, *PDFS_INFO_300, *LPDFS_INFO_300; } DFS_INFO_300, *PDFS_INFO_300, *LPDFS_INFO_300;
// //
// Add a new volume or additional storage for an existing volume at // Add a new volume or additional storage for an existing volume at
// DfsEntryPath. // DfsEntryPath.
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsAdd( NetDfsAdd(
IN LPWSTR DfsEntryPath, // DFS entry path for this added volume or s __in LPWSTR DfsEntryPath, // DFS entry path for this added volume or s
torage torage
IN LPWSTR ServerName, // Name of server hosting the storage __in LPWSTR ServerName, // Name of server hosting the storage
IN LPWSTR ShareName, // Existing share name for the storage __in LPWSTR ShareName, // Existing share name for the storage
IN LPWSTR Comment OPTIONAL, // Optional comment for this volume or stora __in_opt LPWSTR Comment, // Optional comment for this volume or stora
ge ge
IN DWORD Flags // See below. Zero for no flags. __in DWORD Flags // See below. Zero for no flags.
); );
// //
// Flags: // Flags:
// //
#define DFS_ADD_VOLUME 1 // Add a new volume to the DFS if not alread y there #define DFS_ADD_VOLUME 1 // Add a new volume to the DFS if not alread y there
#define DFS_RESTORE_VOLUME 2 // Volume/Replica is being restored - do not verify share etc. #define DFS_RESTORE_VOLUME 2 // Volume/Replica is being restored - do not verify share etc.
// //
// Setup/teardown API's for standard and FtDfs roots. // Setup/teardown API's for standard and FtDfs roots.
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsAddStdRoot( NetDfsAddStdRoot(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN LPWSTR RootShare, // Share to make Dfs root __in LPWSTR RootShare, // Share to make Dfs root
IN LPWSTR Comment OPTIONAL, // Comment __in_opt LPWSTR Comment, // Comment
IN DWORD Flags // Flags for operation. Zero for no flags. __in DWORD Flags // Flags for operation. Zero for no flags.
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsRemoveStdRoot( NetDfsRemoveStdRoot(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN LPWSTR RootShare, // Share that host Dfs root __in LPWSTR RootShare, // Share that host Dfs root
IN DWORD Flags // Flags for operation. Zero for no flags. __reserved DWORD Flags // Flags for operation. Zero for no flags.
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsAddFtRoot( NetDfsAddFtRoot(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN LPWSTR RootShare, // Share to make Dfs root __in LPWSTR RootShare, // Share to make Dfs root
IN LPWSTR FtDfsName, // Name of FtDfs to create/join __in LPWSTR FtDfsName, // Name of FtDfs to create/join
IN LPWSTR Comment, // Comment __in_opt LPWSTR Comment, // Comment
IN DWORD Flags // Flags for operation. Zero for no flags. __reserved DWORD Flags // Flags for operation. Zero for no fla
gs.
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsRemoveFtRoot( NetDfsRemoveFtRoot(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN LPWSTR RootShare, // Share that host Dfs root __in LPWSTR RootShare, // Share that host Dfs root
IN LPWSTR FtDfsName, // Name of FtDfs to remove or unjoin from. __in LPWSTR FtDfsName, // Name of FtDfs to remove or unjoin fro
IN DWORD Flags // Flags for operation. Zero for no flags. m.
__reserved DWORD Flags // Flags for operation. Zero for no fla
gs.
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsRemoveFtRootForced( NetDfsRemoveFtRootForced(
IN LPWSTR DomainName, // Name of domain the server is in __in LPWSTR DomainName, // Name of domain the server is in
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN LPWSTR RootShare, // Share that host Dfs root __in LPWSTR RootShare, // Share that host Dfs root
IN LPWSTR FtDfsName, // Name of FtDfs to remove or unjoin from. __in LPWSTR FtDfsName, // Name of FtDfs to remove or unjoin fro
IN DWORD Flags // Flags for operation. Zero for no flags. m.
__reserved DWORD Flags // Flags for operation. Zero for no fla
gs.
); );
// //
// Call to reinitialize the dfsmanager on a machine // Call to reinitialize the dfsmanager on a machine
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsManagerInitialize( NetDfsManagerInitialize(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN DWORD Flags // Flags for operation. Zero for no flags. __reserved DWORD Flags // Flags for operation. Zero for no fla
gs.
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsAddStdRootForced( NetDfsAddStdRootForced(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN LPWSTR RootShare, // Share to make Dfs root __in LPWSTR RootShare, // Share to make Dfs root
IN LPWSTR Comment OPTIONAL, // Comment __in_opt LPWSTR Comment, // Comment
IN LPWSTR Store // Drive:\dir backing the share __in LPWSTR Store // Drive:\dir backing the share
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsGetDcAddress( NetDfsGetDcAddress(
IN LPWSTR ServerName, // Server to remote to __in LPWSTR ServerName, // Server to remote to
IN OUT LPWSTR *DcIpAddress, // The IP address of the DC to use __deref_out LPWSTR *DcIpAddress, // The IP address of the DC to use
IN OUT BOOLEAN *IsRoot, // TRUE if server is a Dfs root, FALSE other __out PBOOLEAN IsRoot, // TRUE if server is a Dfs root, FALSE o
wise therwise
IN OUT ULONG *Timeout // Time, in sec, that we stay with this DC __out PULONG Timeout // Time, in sec, that we stay with this
DC
); );
// //
// Flags for NetDfsSetDcAddress() // Flags for NetDfsSetDcAddress()
// //
#define NET_DFS_SETDC_FLAGS 0x00000000 #define NET_DFS_SETDC_FLAGS 0x00000000
#define NET_DFS_SETDC_TIMEOUT 0x00000001 #define NET_DFS_SETDC_TIMEOUT 0x00000001
#define NET_DFS_SETDC_INITPKT 0x00000002 #define NET_DFS_SETDC_INITPKT 0x00000002
skipping to change at line 549 skipping to change at line 578
#endif #endif
} DFS_SITELIST_INFO, *PDFS_SITELIST_INFO, *LPDFS_SITELIST_INFO; } DFS_SITELIST_INFO, *PDFS_SITELIST_INFO, *LPDFS_SITELIST_INFO;
// //
// Remove a volume or additional storage for volume from the Dfs at // Remove a volume or additional storage for volume from the Dfs at
// DfsEntryPath. When applied to the last storage in a volume, removes // DfsEntryPath. When applied to the last storage in a volume, removes
// the volume from the DFS. // the volume from the DFS.
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsRemove( NetDfsRemove(
IN LPWSTR DfsEntryPath, // DFS entry path for this added volume or s __in LPWSTR DfsEntryPath, // DFS entry path for this added volume
torage or storage
IN LPWSTR ServerName, // Name of server hosting the storage __in_opt LPWSTR ServerName, // Name of server hosting the storage
IN LPWSTR ShareName // Name of share hosting the storage __in_opt LPWSTR ShareName // Name of share hosting the storage
); );
// //
// Get information about all of the volumes in the Dfs. DfsName is // Get information about all of the volumes in the Dfs. DfsName is
// the "server" part of the UNC name used to refer to this particular Dfs. // the "server" part of the UNC name used to refer to this particular Dfs.
// //
// Valid levels are 1-5, 200, 300 // Valid levels are 1-5, 200, 300
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsEnum( NetDfsEnum(
IN LPWSTR DfsName, // Name of the Dfs for enumeration __in LPWSTR DfsName, // Name of the Dfs for enumeration
IN DWORD Level, // Level of information requested __in DWORD Level, // Level of information requested
IN DWORD PrefMaxLen, // Advisory, but -1 means "get it all" __in DWORD PrefMaxLen, // Advisory, but -1 means "get it all"
OUT LPBYTE* Buffer, // API allocates and returns buffer with req __out LPBYTE *Buffer, // API allocates and returns buffer with
uested info requested info
OUT LPDWORD EntriesRead, // Number of entries returned __out LPDWORD EntriesRead, // Number of entries returned
IN OUT LPDWORD ResumeHandle // Must be 0 on first call, reused on subseq __inout LPDWORD ResumeHandle // Must be 0 on first call, reused on su
uent calls bsequent calls
); );
// //
// Get information about the volume or storage. // Get information about the volume or storage.
// If ServerName and ShareName are specified, the information returned // If ServerName and ShareName are specified, the information returned
// is specific to that server and share, else the information is specific // is specific to that server and share, else the information is specific
// to the volume as a whole. // to the volume as a whole.
// //
// Valid levels are 1-5, 100 // Valid levels are 1-5, 100
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsGetInfo( NetDfsGetInfo(
IN LPWSTR DfsEntryPath, // DFS entry path for the volume __in LPWSTR DfsEntryPath, // DFS entry path for the volume
IN LPWSTR ServerName OPTIONAL,// Name of server hosting a storage __in_opt LPWSTR ServerName, // Name of server hosting a storage
IN LPWSTR ShareName OPTIONAL, // Name of share on server serving the volum __in_opt LPWSTR ShareName, // Name of share on server serving the v
e olume
IN DWORD Level, // Level of information requested __in DWORD Level, // Level of information requested
OUT LPBYTE* Buffer // API allocates and returns buffer with req __out LPBYTE *Buffer // API allocates and returns buffer with
uested info requested info
); );
// //
// Set info about the volume or storage. // Set info about the volume or storage.
// If ServerName and ShareName are specified, the information set is // If ServerName and ShareName are specified, the information set is
// specific to that server and share, else the information is specific // specific to that server and share, else the information is specific
// to the volume as a whole. // to the volume as a whole.
// //
// Valid levels are 100, 101 and 102 // Valid levels are 100, 101 and 102
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsSetInfo( NetDfsSetInfo(
IN LPWSTR DfsEntryPath, // DFS entry path for the volume __in LPWSTR DfsEntryPath, // DFS entry path for the volume
IN LPWSTR ServerName OPTIONAL, // Name of server hosting a storage __in_opt LPWSTR ServerName, // Name of server hosting a storage
IN LPWSTR ShareName OPTIONAL, // Name of share hosting a storage __in_opt LPWSTR ShareName, // Name of share hosting a storage
IN DWORD Level, // Level of information to be set __in DWORD Level, // Level of information to be set
IN LPBYTE Buffer // Buffer holding information __in LPBYTE Buffer // Buffer holding information
); );
// //
// Get client's cached information about the volume or storage. // Get client's cached information about the volume or storage.
// If ServerName and ShareName are specified, the information returned // If ServerName and ShareName are specified, the information returned
// is specific to that server and share, else the information is specific // is specific to that server and share, else the information is specific
// to the volume as a whole. // to the volume as a whole.
// //
// Valid levels are 1-4 // Valid levels are 1-4
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsGetClientInfo( NetDfsGetClientInfo(
IN LPWSTR DfsEntryPath, // DFS entry path for the volume __in LPWSTR DfsEntryPath, // DFS entry path for the volume
IN LPWSTR ServerName OPTIONAL,// Name of server hosting a storage __in_opt LPWSTR ServerName, // Name of server hosting a storage
IN LPWSTR ShareName OPTIONAL, // Name of share on server serving the volum __in_opt LPWSTR ShareName, // Name of share on server serving the v
e olume
IN DWORD Level, // Level of information requested __in DWORD Level, // Level of information requested
OUT LPBYTE* Buffer // API allocates and returns buffer with req __out LPBYTE *Buffer // API allocates and returns buffer with
uested info requested info
); );
// //
// Set client's cached info about the volume or storage. // Set client's cached info about the volume or storage.
// If ServerName and ShareName are specified, the information set is // If ServerName and ShareName are specified, the information set is
// specific to that server and share, else the information is specific // specific to that server and share, else the information is specific
// to the volume as a whole. // to the volume as a whole.
// //
// Valid levels are 101 and 102. // Valid levels are 101 and 102.
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsSetClientInfo( NetDfsSetClientInfo(
IN LPWSTR DfsEntryPath, // DFS entry path for the volume __in LPWSTR DfsEntryPath, // DFS entry path for the volume
IN LPWSTR ServerName OPTIONAL, // Name of server hosting a storage __in_opt LPWSTR ServerName, // Name of server hosting a storage
IN LPWSTR ShareName OPTIONAL, // Name of share hosting a storage __in_opt LPWSTR ShareName, // Name of share hosting a storage
IN DWORD Level, // Level of information to be set __in DWORD Level, // Level of information to be set
IN LPBYTE Buffer // Buffer holding information __in LPBYTE Buffer // Buffer holding information
); );
// //
// Move a DFS volume and all subordinate volumes from one place in the // Move a DFS volume and all subordinate volumes from one place in the
// DFS to another place in the DFS. // DFS to another place in the DFS.
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsMove( NetDfsMove(
IN LPWSTR DfsEntryPath, // Current DFS entry path for this volum __in LPWSTR OldDfsEntryPath, // Current DFS entry path for this volum
e e
IN LPWSTR DfsNewEntryPath, // New DFS entry path for this volume __in LPWSTR NewDfsEntryPath, // New DFS entry path for this volume
IN ULONG Flags __in ULONG Flags
); );
// //
// Flags accepted by NetDfsMove // Flags accepted by NetDfsMove
// //
// //
// This indicates that if a colliding link is found it should be replaced // This indicates that if a colliding link is found it should be replaced
// //
#define DFS_MOVE_FLAG_REPLACE_IF_EXISTS 0x00000001 #define DFS_MOVE_FLAG_REPLACE_IF_EXISTS 0x00000001
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsRename( NetDfsRename(
IN LPWSTR Path, // Current Win32 path in a Dfs __in LPWSTR Path, // Current Win32 path in a Dfs
IN LPWSTR NewPath // New Win32 path in the same Dfs __in LPWSTR NewPath // New Win32 path in the same Dfs
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsGetSecurity( NetDfsGetSecurity(
IN LPWSTR DfsEntryPath, __in LPWSTR DfsEntry
IN SECURITY_INFORMATION SecurityInformation, Path,
OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor, __in SECURITY_INFORMATION Security
OUT LPDWORD lpcbSecurityDescriptor Information,
__deref_out_bcount(*lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR *ppSecur
ityDescriptor,
__out LPDWORD lpcbSecu
rityDescriptor
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsSetSecurity( NetDfsSetSecurity(
IN LPWSTR DfsEntryPath, __in LPWSTR DfsEntryPath,
IN SECURITY_INFORMATION SecurityInformation, __in SECURITY_INFORMATION SecurityInformation,
IN PSECURITY_DESCRIPTOR pSecurityDescriptor __in PSECURITY_DESCRIPTOR pSecurityDescriptor
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsGetStdContainerSecurity( NetDfsGetStdContainerSecurity(
IN LPWSTR MachineName, __in LPWSTR MachineN
IN SECURITY_INFORMATION SecurityInformation, ame,
OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor, __in SECURITY_INFORMATION Security
OUT LPDWORD lpcbSecurityDescriptor Information,
__deref_out_bcount(*lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR *ppSecur
ityDescriptor,
__out LPDWORD lpcbSecu
rityDescriptor
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsSetStdContainerSecurity( NetDfsSetStdContainerSecurity(
IN LPWSTR MachineName, __in LPWSTR MachineName,
IN SECURITY_INFORMATION SecurityInformation, __in SECURITY_INFORMATION SecurityInformation,
IN PSECURITY_DESCRIPTOR pSecurityDescriptor __in PSECURITY_DESCRIPTOR pSecurityDescriptor
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsGetFtContainerSecurity( NetDfsGetFtContainerSecurity(
IN LPWSTR DomainName, __in LPWSTR DomainNa
IN SECURITY_INFORMATION SecurityInformation, me,
OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor, __in SECURITY_INFORMATION Security
OUT LPDWORD lpcbSecurityDescriptor Information,
__deref_out_bcount(*lpcbSecurityDescriptor) PSECURITY_DESCRIPTOR *ppSecur
ityDescriptor,
__out LPDWORD lpcbSecu
rityDescriptor
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetDfsSetFtContainerSecurity( NetDfsSetFtContainerSecurity(
IN LPWSTR DomainName, __in LPWSTR DomainName,
IN SECURITY_INFORMATION SecurityInformation, __in SECURITY_INFORMATION SecurityInformation,
IN PSECURITY_DESCRIPTOR pSecurityDescriptor __in PSECURITY_DESCRIPTOR pSecurityDescriptor
); );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // _LMDFS_ #endif // _LMDFS_
 End of changes. 25 change blocks. 
102 lines changed or deleted 151 lines changed or added


 lmerrlog.h (5.2.3790.3959-Windows 5.0)   lmerrlog.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 77 skipping to change at line 77
#define LOGFLAGS_SEEK 0x2 #define LOGFLAGS_SEEK 0x2
#endif #endif
// //
// Function Prototypes - ErrorLog // Function Prototypes - ErrorLog
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetErrorLogClear ( NetErrorLogClear (
IN LPCWSTR server, __in_opt LPCWSTR UncServerName,
IN LPCWSTR backupfile, __in_opt LPCWSTR BackupFile,
IN LPBYTE reserved __in_opt LPBYTE Reserved
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetErrorLogRead ( NetErrorLogRead (
IN LPCWSTR server, __in_opt LPCWSTR UncServerName,
IN LPWSTR reserved1, __in_opt LPWSTR Reserved1,
IN LPHLOG errloghandle, __in LPHLOG ErrorLogHandle,
IN DWORD offset, __in DWORD Offset,
IN LPDWORD reserved2, __in_opt LPDWORD Reserved2,
IN DWORD reserved3, __in DWORD Reserved3,
IN DWORD offsetflag, __in DWORD OffsetFlag,
OUT LPBYTE * bufptr, __deref_out LPBYTE *BufPtr,
IN DWORD prefmaxlen, __in DWORD PrefMaxSize,
OUT LPDWORD bytesread, __out LPDWORD BytesRead,
OUT LPDWORD totalbytes __out LPDWORD TotalAvailable
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetErrorLogWrite ( NetErrorLogWrite (
IN LPBYTE reserved1, __in_opt LPBYTE Reserved1,
IN DWORD code, __in DWORD Code,
IN LPCWSTR component, __in LPCWSTR Component,
IN LPBYTE buffer, __in LPBYTE Buffer,
IN DWORD numbytes, __in DWORD NumBytes,
IN LPBYTE msgbuf, __in LPBYTE MsgBuf,
IN DWORD strcount, __in DWORD StrCount,
IN LPBYTE reserved2 __in_opt LPBYTE Reserved2
); );
// //
// Special Values and Constants // Special Values and Constants
// //
// //
// Generic (could be used by more than one service) // Generic (could be used by more than one service)
// error log messages from 0 to 25 // error log messages from 0 to 25
// //
 End of changes. 3 change blocks. 
22 lines changed or deleted 22 lines changed or added


 lmjoin.h (5.2.3790.3959-Windows 5.0)   lmjoin.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 80 skipping to change at line 80
// 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
#define NETSETUP_JOIN_UNSECURE 0x00000040 // Performs an unsecure join #define NETSETUP_JOIN_UNSECURE 0x00000040 // Performs an unsecure join
#define NETSETUP_MACHINE_PWD_PASSED 0x00000080 // Indicates that the machine (n ot user) password #define NETSETUP_MACHINE_PWD_PASSED 0x00000080 // Indicates that the machine (n ot user) password
// is passed. Valid only for un secure joins // is passed. Valid only for un secure joins
#define NETSETUP_DEFER_SPN_SET 0x00000100 // Specifies that writting SPN a nd DnsHostName #define NETSETUP_DEFER_SPN_SET 0x00000100 // Specifies that writting SPN a nd DnsHostName
// attributes on the computer o bject should be // attributes on the computer o bject should be
// defered until rename that wi ll follow join // defered until rename that wi ll follow join
#define NETSETUP_JOIN_DC_ACCOUNT 0x00000200 // Allow join if existing accoun
t is a DC
#define NETSETUP_JOIN_WITH_NEW_NAME 0x00000400 // Check for computer name chang
e
#define NETSETUP_INSTALL_INVOCATION 0x00040000 // The APIs were invoked during install #define NETSETUP_INSTALL_INVOCATION 0x00040000 // The APIs were invoked during install
#define NETSETUP_IGNORE_UNSUPPORTED_FLAGS 0x10000000 // If this bit is set, un recognized flags #define NETSETUP_IGNORE_UNSUPPORTED_FLAGS 0x10000000 // If this bit is set, un recognized flags
// will be ignored by th e NetJoin API and // will be ignored by th e NetJoin API and
// the API will behave a s if the flags // the API will behave a s if the flags
// were not set. // were not set.
#define NETSETUP_VALID_UNJOIN_FLAGS (NETSETUP_ACCT_DELETE | NETSETUP_IGNORE_UNSU PPORTED_FLAGS) #define NETSETUP_VALID_UNJOIN_FLAGS (NETSETUP_ACCT_DELETE | NETSETUP_IGNORE_UNSU PPORTED_FLAGS)
// //
skipping to change at line 103 skipping to change at line 106
// //
// Joins a machine to the domain. // Joins a machine to the domain.
// //
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetJoinDomain( NetJoinDomain(
IN LPCWSTR lpServer OPTIONAL, IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpDomain, IN LPCWSTR lpDomain,
IN LPCWSTR lpAccountOU, OPTIONAL IN LPCWSTR lpAccountOU, OPTIONAL
IN LPCWSTR lpAccount OPTIONAL, IN LPCWSTR lpAccount OPTIONAL,
IN LPCWSTR lpPassword OPTIONAL, __in_opt IN LPCWSTR lpPassword OPTIONAL,
IN DWORD fJoinOptions IN DWORD fJoinOptions
); );
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetUnjoinDomain( NetUnjoinDomain(
IN LPCWSTR lpServer OPTIONAL, IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpAccount OPTIONAL, IN LPCWSTR lpAccount OPTIONAL,
IN LPCWSTR lpPassword OPTIONAL, __in_opt IN LPCWSTR lpPassword OPTIONAL,
IN DWORD fUnjoinOptions IN DWORD fUnjoinOptions
); );
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetRenameMachineInDomain( NetRenameMachineInDomain(
IN LPCWSTR lpServer OPTIONAL, IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpNewMachineName OPTIONAL, IN LPCWSTR lpNewMachineName OPTIONAL,
IN LPCWSTR lpAccount OPTIONAL, IN LPCWSTR lpAccount OPTIONAL,
IN LPCWSTR lpPassword OPTIONAL, __in_opt IN LPCWSTR lpPassword OPTIONAL,
IN DWORD fRenameOptions IN DWORD fRenameOptions
); );
// //
// Determine the validity of a name // Determine the validity of a name
// //
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetValidateName( NetValidateName(
IN LPCWSTR lpServer OPTIONAL, IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpName, IN LPCWSTR lpName,
IN LPCWSTR lpAccount OPTIONAL, IN LPCWSTR lpAccount OPTIONAL,
IN LPCWSTR lpPassword OPTIONAL, __in_opt IN LPCWSTR lpPassword OPTIONAL,
IN NETSETUP_NAME_TYPE NameType IN NETSETUP_NAME_TYPE NameType
); );
// //
// 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 LPCWSTR lpServer OPTIONAL, __in_opt IN LPCWSTR lpServer OPTIONAL,
OUT LPWSTR *lpNameBuffer, __out_opt OUT LPWSTR *lpNameBuffer,
OUT PNETSETUP_JOIN_STATUS BufferType OUT PNETSETUP_JOIN_STATUS BufferType
); );
// //
// 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 OPTIONAL, IN LPCWSTR lpServer OPTIONAL,
IN LPCWSTR lpDomain, IN LPCWSTR lpDomain,
IN LPCWSTR lpAccount OPTIONAL, IN LPCWSTR lpAccount OPTIONAL,
IN LPCWSTR lpPassword OPTIONAL, __in_opt IN LPCWSTR lpPassword OPTIONAL,
OUT DWORD *OUCount, __out_opt OUT DWORD *OUCount,
OUT LPWSTR **OUs __deref_out OUT LPWSTR **OUs
); );
// //
// Computer rename preparation APIs // Computer rename preparation APIs
// //
#define NET_IGNORE_UNSUPPORTED_FLAGS 0x01 #define NET_IGNORE_UNSUPPORTED_FLAGS 0x01
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetAddAlternateComputerName( NetAddAlternateComputerName(
IN LPCWSTR Server OPTIONAL, IN LPCWSTR Server OPTIONAL,
IN LPCWSTR AlternateName, IN LPCWSTR AlternateName,
IN LPCWSTR DomainAccount OPTIONAL, IN LPCWSTR DomainAccount OPTIONAL,
IN LPCWSTR DomainAccountPassword OPTIONAL, __in_opt IN LPCWSTR DomainAccountPassword OPTIONAL,
IN ULONG Reserved IN ULONG Reserved
); );
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetRemoveAlternateComputerName( NetRemoveAlternateComputerName(
IN LPCWSTR Server OPTIONAL, IN LPCWSTR Server OPTIONAL,
IN LPCWSTR AlternateName, IN LPCWSTR AlternateName,
IN LPCWSTR DomainAccount OPTIONAL, IN LPCWSTR DomainAccount OPTIONAL,
IN LPCWSTR DomainAccountPassword OPTIONAL, __in_opt IN LPCWSTR DomainAccountPassword OPTIONAL,
IN ULONG Reserved IN ULONG Reserved
); );
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetSetPrimaryComputerName( NetSetPrimaryComputerName(
IN LPCWSTR Server OPTIONAL, IN LPCWSTR Server OPTIONAL,
IN LPCWSTR PrimaryName, IN LPCWSTR PrimaryName,
IN LPCWSTR DomainAccount OPTIONAL, IN LPCWSTR DomainAccount OPTIONAL,
IN LPCWSTR DomainAccountPassword OPTIONAL, __in_opt IN LPCWSTR DomainAccountPassword OPTIONAL,
IN ULONG Reserved IN ULONG Reserved
); );
// //
// The following enumeration must be kept // The following enumeration must be kept
// in sync with COMPUTER_NAME_TYPE defined // in sync with COMPUTER_NAME_TYPE defined
// in winbase.h // in winbase.h
// //
typedef enum _NET_COMPUTER_NAME_TYPE { typedef enum _NET_COMPUTER_NAME_TYPE {
skipping to change at line 219 skipping to change at line 222
NetAllComputerNames, NetAllComputerNames,
NetComputerNameTypeMax NetComputerNameTypeMax
} NET_COMPUTER_NAME_TYPE, *PNET_COMPUTER_NAME_TYPE; } NET_COMPUTER_NAME_TYPE, *PNET_COMPUTER_NAME_TYPE;
NET_API_STATUS NET_API_STATUS
NET_API_FUNCTION NET_API_FUNCTION
NetEnumerateComputerNames( NetEnumerateComputerNames(
IN LPCWSTR Server OPTIONAL, IN LPCWSTR Server OPTIONAL,
IN NET_COMPUTER_NAME_TYPE NameType, IN NET_COMPUTER_NAME_TYPE NameType,
IN ULONG Reserved, IN ULONG Reserved,
OUT PDWORD EntryCount, __out OUT PDWORD EntryCount,
OUT LPWSTR **ComputerNames __deref_out OUT LPWSTR **ComputerNames
); );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // __LMJOIN_H__ #endif // __LMJOIN_H__
 End of changes. 11 change blocks. 
14 lines changed or deleted 19 lines changed or added


 lmmsg.h (5.2.3790.3959-Windows 5.0)   lmmsg.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 42 skipping to change at line 42
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
// //
// Function Prototypes // Function Prototypes
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetMessageNameAdd ( NetMessageNameAdd (
IN LPCWSTR servername, __in_opt LPCWSTR servername,
IN LPCWSTR msgname __in LPCWSTR msgname
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetMessageNameEnum ( NetMessageNameEnum (
IN LPCWSTR servername, __in_opt LPCWSTR servername,
IN DWORD level, __in DWORD level,
OUT LPBYTE *bufptr, __in LPBYTE *bufptr,
IN DWORD prefmaxlen, __in DWORD prefmaxlen,
OUT LPDWORD entriesread, __out LPDWORD entriesread,
OUT LPDWORD totalentries, __out LPDWORD totalentries,
IN OUT LPDWORD resume_handle __out LPDWORD resume_handle
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetMessageNameGetInfo ( NetMessageNameGetInfo (
IN LPCWSTR servername, __in_opt LPCWSTR servername,
IN LPCWSTR msgname, __in LPCWSTR msgname,
IN DWORD level, __in DWORD level,
OUT LPBYTE *bufptr __in LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetMessageNameDel ( NetMessageNameDel (
IN LPCWSTR servername, __in_opt LPCWSTR servername,
IN LPCWSTR msgname __in LPCWSTR msgname
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetMessageBufferSend ( NetMessageBufferSend (
IN LPCWSTR servername, __in_opt LPCWSTR servername,
IN LPCWSTR msgname, __in LPCWSTR msgname,
IN LPCWSTR fromname, __in LPCWSTR fromname,
IN LPBYTE buf, __in LPBYTE buf,
IN DWORD buflen __in DWORD buflen
); );
// //
// Data Structures // Data Structures
// //
typedef struct _MSG_INFO_0 { typedef struct _MSG_INFO_0 {
LPWSTR msgi0_name; LPWSTR msgi0_name;
}MSG_INFO_0, *PMSG_INFO_0, *LPMSG_INFO_0; }MSG_INFO_0, *PMSG_INFO_0, *LPMSG_INFO_0;
 End of changes. 5 change blocks. 
20 lines changed or deleted 20 lines changed or added


 lmremutl.h (5.2.3790.3959-Windows 5.0)   lmremutl.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 40 skipping to change at line 40
extern "C" { extern "C" {
#endif #endif
// //
// Type Definitions // Type Definitions
// //
#ifndef DESC_CHAR_UNICODE #ifndef DESC_CHAR_UNICODE
typedef CHAR DESC_CHAR; typedef CHAR DESC_CHAR;
typedef LPSTR LPDESC;
#else // DESC_CHAR_UNICODE is defined #else // DESC_CHAR_UNICODE is defined
typedef WCHAR DESC_CHAR; typedef WCHAR DESC_CHAR;
typedef LPWSTR LPDESC;
#endif // DESC_CHAR_UNICODE is defined #endif // DESC_CHAR_UNICODE is defined
typedef DESC_CHAR * LPDESC;
// //
// Function Prototypes // Function Prototypes
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetRemoteTOD ( NetRemoteTOD (
IN LPCWSTR UncServerName, IN LPCWSTR UncServerName,
OUT LPBYTE *BufferPtr __out OUT LPBYTE *BufferPtr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetRemoteComputerSupports( NetRemoteComputerSupports(
IN LPCWSTR UncServerName OPTIONAL, // Must start with "\\". IN LPCWSTR UncServerName OPTIONAL, // Must start with "\\".
IN DWORD OptionsWanted, // Set SUPPORTS_ bits wanted. IN DWORD OptionsWanted, // Set SUPPORTS_ bits wanted.
OUT LPDWORD OptionsSupported // Supported features, masked. OUT LPDWORD OptionsSupported // Supported features, masked.
); );
NET_API_STATUS NET_API_STATUS
__cdecl __cdecl
RxRemoteApi( RxRemoteApi(
IN DWORD ApiNumber, IN DWORD ApiNumber,
IN LPCWSTR UncServerName, // Required, with \\name. __in IN LPCWSTR UncServerName, // Required, with \\name.
IN LPDESC ParmDescString, __in IN LPDESC ParmDescString,
IN LPDESC DataDesc16 OPTIONAL, __in_opt IN LPDESC DataDesc16 OPTIONAL,
IN LPDESC DataDesc32 OPTIONAL, __in_opt IN LPDESC DataDesc32 OPTIONAL,
IN LPDESC DataDescSmb OPTIONAL, __in_opt IN LPDESC DataDescSmb OPTIONAL,
IN LPDESC AuxDesc16 OPTIONAL, __in_opt IN LPDESC AuxDesc16 OPTIONAL,
IN LPDESC AuxDesc32 OPTIONAL, __in_opt IN LPDESC AuxDesc32 OPTIONAL,
IN LPDESC AuxDescSmb OPTIONAL, __in_opt IN LPDESC AuxDescSmb OPTIONAL,
IN DWORD Flags, IN DWORD Flags,
... // rest of API's arguments ... // rest of API's arguments
); );
// //
// Data Structures // Data Structures
// //
typedef struct _TIME_OF_DAY_INFO { typedef struct _TIME_OF_DAY_INFO {
DWORD tod_elapsedt; DWORD tod_elapsedt;
 End of changes. 5 change blocks. 
11 lines changed or deleted 11 lines changed or added


 lmserver.h (5.2.3790.3959-Windows 5.0)   lmserver.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 48 skipping to change at line 48
#endif #endif
#include <lmcons.h> #include <lmcons.h>
// //
// Function Prototypes - SERVER // Function Prototypes - SERVER
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerEnum ( NetServerEnum (
IN LMCSTR servername OPTIONAL, __in_opt IN LMCSTR servername OPTIONAL,
IN DWORD level, __in IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, __in IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN DWORD servertype, __in IN DWORD servertype,
IN LMCSTR domain OPTIONAL, __in_opt IN LMCSTR domain OPTIONAL,
IN OUT LPDWORD resume_handle OPTIONAL __out_opt IN OUT LPDWORD resume_handle OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerEnumEx ( NetServerEnumEx (
IN LMCSTR ServerName OPTIONAL, __in_opt IN LMCSTR ServerName OPTIONAL,
IN DWORD Level, __in IN DWORD Level,
OUT LPBYTE *Bufptr, __deref_out OUT LPBYTE *Bufptr,
IN DWORD PrefMaxlen, __in IN DWORD PrefMaxlen,
OUT LPDWORD EntriesRead, __out OUT LPDWORD EntriesRead,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN DWORD servertype, __in IN DWORD servertype,
IN LMCSTR domain OPTIONAL, __in_opt IN LMCSTR domain OPTIONAL,
IN LMCSTR FirstNameToReturn OPTIONAL __in_opt IN LMCSTR FirstNameToReturn OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerGetInfo ( NetServerGetInfo (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr __out OUT LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerSetInfo ( NetServerSetInfo (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
IN LPBYTE buf, IN LPBYTE buf,
OUT LPDWORD ParmError OPTIONAL __out_opt OUT LPDWORD ParmError OPTIONAL
); );
// //
// Temporary hack function. // Temporary hack function.
// //
NET_API_STATUS NET_API_STATUS
NetServerSetInfoCommandLine ( NetServerSetInfoCommandLine (
IN WORD argc, IN WORD argc,
IN LMSTR argv[] IN LMSTR argv[]
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerDiskEnum ( NetServerDiskEnum (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN OUT LPDWORD resume_handle OPTIONAL IN OUT LPDWORD resume_handle OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerComputerNameAdd( NetServerComputerNameAdd(
IN LMSTR ServerName OPTIONAL, __in_opt IN LMSTR ServerName OPTIONAL,
IN LMSTR EmulatedDomainName OPTIONAL, __in_opt IN LMSTR EmulatedDomainName OPTIONAL,
IN LMSTR EmulatedServerName __in IN LMSTR EmulatedServerName
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerComputerNameDel ( NetServerComputerNameDel (
IN LMSTR ServerName OPTIONAL, __in_opt IN LMSTR ServerName OPTIONAL,
IN LMSTR EmulatedServerName __in IN LMSTR EmulatedServerName
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerTransportAdd ( NetServerTransportAdd (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN DWORD level, IN DWORD level,
IN LPBYTE bufptr __in_bcount(sizeof(SERVER_TRANSPORT_INFO_0)) IN LPBYTE bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerTransportAddEx ( NetServerTransportAddEx (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
IN LPBYTE bufptr __in IN LPBYTE bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerTransportDel ( NetServerTransportDel (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN DWORD level, IN DWORD level,
IN LPBYTE bufptr __in_bcount(sizeof(SERVER_TRANSPORT_INFO_0)) IN LPBYTE bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServerTransportEnum ( NetServerTransportEnum (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN OUT LPDWORD resumehandle __inout_opt IN OUT LPDWORD resumehandle
); );
// //
// The following function can be called by Win NT services to register // The following function can be called by Win NT services to register
// their service type. This function is exported from advapi32.dll. // their service type. This function is exported from advapi32.dll.
// Therefore, if this is the only function called by that service, then // Therefore, if this is the only function called by that service, then
// it is not necessary to link to netapi32.lib. // it is not necessary to link to netapi32.lib.
// //
BOOL NET_API_FUNCTION BOOL NET_API_FUNCTION
SetServiceBits( SetServiceBits(
skipping to change at line 1357 skipping to change at line 1357
// Equate for use with sv102_licenses. // Equate for use with sv102_licenses.
// //
#define SV_USERS_PER_LICENSE 5 #define SV_USERS_PER_LICENSE 5
// //
// Equate for use with svti2_flags in NetServerTransportAddEx. // Equate for use with svti2_flags in NetServerTransportAddEx.
// //
#define SVTI2_REMAP_PIPE_NAMES 0x2 #define SVTI2_REMAP_PIPE_NAMES 0x2
#define SVTI2_SCOPED_NAME 0x4
#define SVTI2_VALID_FLAGS (SVTI2_REMAP_PIPE_NAMES|SVTI2_SCOPED_NAME)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif // _LMSERVER_ #endif // _LMSERVER_
 End of changes. 21 change blocks. 
42 lines changed or deleted 44 lines changed or added


 lmshare.h (5.2.3790.3959-Windows 5.0)   lmshare.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 51 skipping to change at line 51
#endif #endif
#include <lmcons.h> #include <lmcons.h>
// //
// Function Prototypes - Share // Function Prototypes - Share
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareAdd ( NetShareAdd (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN DWORD level, IN DWORD level,
IN LPBYTE buf, __inout IN LPBYTE buf,
OUT LPDWORD parm_err __out_opt OUT LPDWORD parm_err
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareEnum ( NetShareEnum (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN DWORD level, __in IN DWORD level,
OUT LPBYTE *bufptr, __deref_out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, __in IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN OUT LPDWORD resume_handle __inout_opt IN OUT LPDWORD resume_handle
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareEnumSticky ( NetShareEnumSticky (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN OUT LPDWORD resume_handle __inout_opt IN OUT LPDWORD resume_handle
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareGetInfo ( NetShareGetInfo (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN LMSTR netname, __in_opt IN LMSTR netname,
IN DWORD level, __in IN DWORD level,
OUT LPBYTE *bufptr __deref_opt_out OUT LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareSetInfo ( NetShareSetInfo (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN LMSTR netname, __in_opt IN LMSTR netname,
IN DWORD level, IN DWORD level,
IN LPBYTE buf, __inout_opt IN LPBYTE buf,
OUT LPDWORD parm_err __out_opt OUT LPDWORD parm_err
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareDel ( NetShareDel (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN LMSTR netname, __in_opt IN LMSTR netname,
IN DWORD reserved IN DWORD reserved
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareDelSticky ( NetShareDelSticky (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN LMSTR netname, __in_opt IN LMSTR netname,
IN DWORD reserved IN DWORD reserved
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetShareCheck ( NetShareCheck (
IN LMSTR servername, __in_opt IN LMSTR servername,
IN LMSTR device, __in_opt IN LMSTR device,
OUT LPDWORD type __out_opt OUT LPDWORD type
);
NET_API_STATUS NET_API_FUNCTION
NetShareDelEx (
__in_opt IN LMSTR servername,
IN DWORD level,
__in IN LPBYTE buf
); );
// //
// Data Structures - Share // Data Structures - Share
// //
typedef struct _SHARE_INFO_0 { typedef struct _SHARE_INFO_0 {
LMSTR shi0_netname; LMSTR shi0_netname;
} SHARE_INFO_0, *PSHARE_INFO_0, *LPSHARE_INFO_0; } SHARE_INFO_0, *PSHARE_INFO_0, *LPSHARE_INFO_0;
skipping to change at line 162 skipping to change at line 169
LMSTR shi502_remark; LMSTR shi502_remark;
DWORD shi502_permissions; DWORD shi502_permissions;
DWORD shi502_max_uses; DWORD shi502_max_uses;
DWORD shi502_current_uses; DWORD shi502_current_uses;
LMSTR shi502_path; LMSTR shi502_path;
LMSTR shi502_passwd; LMSTR shi502_passwd;
DWORD shi502_reserved; DWORD shi502_reserved;
PSECURITY_DESCRIPTOR shi502_security_descriptor; PSECURITY_DESCRIPTOR shi502_security_descriptor;
} SHARE_INFO_502, *PSHARE_INFO_502, *LPSHARE_INFO_502; } SHARE_INFO_502, *PSHARE_INFO_502, *LPSHARE_INFO_502;
typedef struct _SHARE_INFO_503 {
LMSTR shi503_netname;
DWORD shi503_type;
LMSTR shi503_remark;
DWORD shi503_permissions;
DWORD shi503_max_uses;
DWORD shi503_current_uses;
LMSTR shi503_path;
LMSTR shi503_passwd;
LMSTR shi503_servername;
DWORD shi503_reserved;
PSECURITY_DESCRIPTOR shi503_security_descriptor;
} SHARE_INFO_503, *PSHARE_INFO_503, *LPSHARE_INFO_503;
typedef struct _SHARE_INFO_1004 { typedef struct _SHARE_INFO_1004 {
LMSTR shi1004_remark; LMSTR shi1004_remark;
} SHARE_INFO_1004, *PSHARE_INFO_1004, *LPSHARE_INFO_1004; } SHARE_INFO_1004, *PSHARE_INFO_1004, *LPSHARE_INFO_1004;
typedef struct _SHARE_INFO_1005 { typedef struct _SHARE_INFO_1005 {
DWORD shi1005_flags; DWORD shi1005_flags;
} SHARE_INFO_1005, *PSHARE_INFO_1005, *LPSHARE_INFO_1005; } SHARE_INFO_1005, *PSHARE_INFO_1005, *LPSHARE_INFO_1005;
typedef struct _SHARE_INFO_1006 { typedef struct _SHARE_INFO_1006 {
DWORD shi1006_max_uses; DWORD shi1006_max_uses;
} SHARE_INFO_1006, *PSHARE_INFO_1006, *LPSHARE_INFO_1006; } SHARE_INFO_1006, *PSHARE_INFO_1006, *LPSHARE_INFO_1006;
typedef struct _SHARE_INFO_1501 { typedef struct _SHARE_INFO_1501 {
DWORD shi1501_reserved; DWORD shi1501_reserved;
PSECURITY_DESCRIPTOR shi1501_security_descriptor; PSECURITY_DESCRIPTOR shi1501_security_descriptor;
} SHARE_INFO_1501, *PSHARE_INFO_1501, *LPSHARE_INFO_1501; } SHARE_INFO_1501, *PSHARE_INFO_1501, *LPSHARE_INFO_1501;
typedef struct _SHARE_INFO_1503 {
GUID shi1503_sharefilter;
} SHARE_INFO_1503, *PSHARE_INFO_1503, *LPSHARE_INFO_1503;
//
// NetShareAlias functions
//
NET_API_STATUS NET_API_FUNCTION
NetServerAliasAdd(
__in_opt IN LMSTR servername,
IN DWORD level,
__out_bcount(sizeof(SERVER_ALIAS_INFO_0)) IN LPBYTE buf
);
NET_API_STATUS NET_API_FUNCTION
NetServerAliasDel(
__in_opt IN LMSTR servername,
IN DWORD level,
IN LPBYTE buf
);
NET_API_STATUS NET_API_FUNCTION
NetServerAliasEnum(
__in_opt IN LMSTR servername,
IN DWORD level,
__out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen,
__out OUT LPDWORD entriesread,
__out OUT LPDWORD totalentries,
__inout_opt IN OUT LPDWORD resumehandle
);
typedef struct _SERVER_ALIAS_INFO_0 {
LMSTR srvai0_alias;
LMSTR srvai0_target;
BOOLEAN srvai0_default;
ULONG srvai0_reserved;
} SERVER_ALIAS_INFO_0, *PSERVER_ALIAS_INFO_0, *LPSERVER_ALIAS_INFO_0;
// //
// Special Values and Constants - Share // Special Values and Constants - Share
// //
// //
// Values for parm_err parameter. // Values for parm_err parameter.
// //
#define SHARE_NETNAME_PARMNUM 1 #define SHARE_NETNAME_PARMNUM 1
#define SHARE_TYPE_PARMNUM 3 #define SHARE_TYPE_PARMNUM 3
#define SHARE_REMARK_PARMNUM 4 #define SHARE_REMARK_PARMNUM 4
#define SHARE_PERMISSIONS_PARMNUM 5 #define SHARE_PERMISSIONS_PARMNUM 5
#define SHARE_MAX_USES_PARMNUM 6 #define SHARE_MAX_USES_PARMNUM 6
#define SHARE_CURRENT_USES_PARMNUM 7 #define SHARE_CURRENT_USES_PARMNUM 7
#define SHARE_PATH_PARMNUM 8 #define SHARE_PATH_PARMNUM 8
#define SHARE_PASSWD_PARMNUM 9 #define SHARE_PASSWD_PARMNUM 9
#define SHARE_FILE_SD_PARMNUM 501 #define SHARE_FILE_SD_PARMNUM 501
#define SHARE_SERVER_PARMNUM 503
// //
// Single-field infolevels for NetShareSetInfo. // Single-field infolevels for NetShareSetInfo.
// //
#define SHARE_REMARK_INFOLEVEL \ #define SHARE_REMARK_INFOLEVEL \
(PARMNUM_BASE_INFOLEVEL + SHARE_REMARK_PARMNUM) (PARMNUM_BASE_INFOLEVEL + SHARE_REMARK_PARMNUM)
#define SHARE_MAX_USES_INFOLEVEL \ #define SHARE_MAX_USES_INFOLEVEL \
(PARMNUM_BASE_INFOLEVEL + SHARE_MAX_USES_PARMNUM) (PARMNUM_BASE_INFOLEVEL + SHARE_MAX_USES_PARMNUM)
#define SHARE_FILE_SD_INFOLEVEL \ #define SHARE_FILE_SD_INFOLEVEL \
skipping to change at line 267 skipping to change at line 329
#ifndef _LMSESSION_ #ifndef _LMSESSION_
#define _LMSESSION_ #define _LMSESSION_
// //
// Function Prototypes Session // Function Prototypes Session
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetSessionEnum ( NetSessionEnum (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN LMSTR UncClientName OPTIONAL, __in_opt IN LMSTR UncClientName OPTIONAL,
IN LMSTR username OPTIONAL, __in_opt IN LMSTR username OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out_opt OUT LPDWORD totalentries,
IN OUT LPDWORD resume_handle OPTIONAL __inout_opt IN OUT LPDWORD resume_handle OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetSessionDel ( NetSessionDel (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN LMSTR UncClientName, __in_opt IN LMSTR UncClientName,
IN LMSTR username __in_opt IN LMSTR username
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetSessionGetInfo ( NetSessionGetInfo (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN LMSTR UncClientName, __in_opt IN LMSTR UncClientName,
IN LMSTR username, __in_opt IN LMSTR username,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr __out OUT LPBYTE *bufptr
); );
// //
// Data Structures - Session // Data Structures - Session
// //
typedef struct _SESSION_INFO_0 { typedef struct _SESSION_INFO_0 {
LMSTR sesi0_cname; // client name (no backslashes) LMSTR sesi0_cname; // client name (no backslashes)
} SESSION_INFO_0, *PSESSION_INFO_0, *LPSESSION_INFO_0; } SESSION_INFO_0, *PSESSION_INFO_0, *LPSESSION_INFO_0;
skipping to change at line 369 skipping to change at line 431
#ifndef _LMCONNECTION_ #ifndef _LMCONNECTION_
#define _LMCONNECTION_ #define _LMCONNECTION_
// //
// Function Prototypes - CONNECTION // Function Prototypes - CONNECTION
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetConnectionEnum ( NetConnectionEnum (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN LMSTR qualifier, __in_opt IN LMSTR qualifier,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN OUT LPDWORD resume_handle OPTIONAL __inout_opt IN OUT LPDWORD resume_handle OPTIONAL
); );
// //
// Data Structures - CONNECTION // Data Structures - CONNECTION
// //
typedef struct _CONNECTION_INFO_0 { typedef struct _CONNECTION_INFO_0 {
DWORD coni0_id; DWORD coni0_id;
} CONNECTION_INFO_0, *PCONNECTION_INFO_0, *LPCONNECTION_INFO_0; } CONNECTION_INFO_0, *PCONNECTION_INFO_0, *LPCONNECTION_INFO_0;
skipping to change at line 412 skipping to change at line 474
#ifndef _LMFILE_ #ifndef _LMFILE_
#define _LMFILE_ #define _LMFILE_
// //
// Function Prototypes - FILE // Function Prototypes - FILE
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetFileClose ( NetFileClose (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD fileid IN DWORD fileid
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetFileEnum ( NetFileEnum (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN LMSTR basepath OPTIONAL, __in_opt IN LMSTR basepath OPTIONAL,
IN LMSTR username OPTIONAL, __in_opt IN LMSTR username OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out OUT LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out OUT LPDWORD entriesread,
OUT LPDWORD totalentries, __out OUT LPDWORD totalentries,
IN OUT PDWORD_PTR resume_handle OPTIONAL __inout_opt IN OUT PDWORD_PTR resume_handle OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetFileGetInfo ( NetFileGetInfo (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD fileid, IN DWORD fileid,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr __out OUT LPBYTE *bufptr
); );
// //
// Data Structures - File // Data Structures - File
// //
// File APIs are available at information levels 2 & 3 only. Levels 0 & // File APIs are available at information levels 2 & 3 only. Levels 0 &
// 1 are not supported. // 1 are not supported.
// //
 End of changes. 30 change blocks. 
60 lines changed or deleted 121 lines changed or added


 lmstats.h (5.2.3790.3959-Windows 5.0)   lmstats.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 45 skipping to change at line 45
#endif #endif
#include <lmcons.h> #include <lmcons.h>
// //
// Function Prototypes - Statistics // Function Prototypes - Statistics
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetStatisticsGet ( NetStatisticsGet (
IN LMSTR server, __in LPTSTR ServerName,
IN LMSTR service, __in LPTSTR Service,
IN DWORD level, __in DWORD Level,
IN DWORD options, __in DWORD Options,
OUT LPBYTE *bufptr __deref_out LPBYTE *Buffer
); );
// //
// Data Structures - Statistics // Data Structures - Statistics
// //
#ifdef LM20_WORKSTATION_STATISTICS #ifdef LM20_WORKSTATION_STATISTICS
typedef struct _STAT_WORKSTATION_0 { typedef struct _STAT_WORKSTATION_0 {
DWORD stw0_start; DWORD stw0_start;
DWORD stw0_numNCB_r; DWORD stw0_numNCB_r;
 End of changes. 1 change blocks. 
5 lines changed or deleted 5 lines changed or added


 lmsvc.h (5.2.3790.3959-Windows 5.0)   lmsvc.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 72 skipping to change at line 72
DWORD svci2_specific_error; DWORD svci2_specific_error;
LPWSTR svci2_display_name; LPWSTR svci2_display_name;
} SERVICE_INFO_2, *PSERVICE_INFO_2, * LPSERVICE_INFO_2; } SERVICE_INFO_2, *PSERVICE_INFO_2, * LPSERVICE_INFO_2;
// //
// Function Prototypes // Function Prototypes
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServiceControl ( NetServiceControl (
IN LPCWSTR servername OPTIONAL, __in_opt LPCWSTR servername,
IN LPCWSTR service, __in LPCWSTR service,
IN DWORD opcode, __in DWORD opcode,
IN DWORD arg, __in DWORD arg,
OUT LPBYTE *bufptr __deref_out LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServiceEnum ( NetServiceEnum (
IN LPCWSTR servername OPTIONAL, __in_opt LPCWSTR servername,
IN DWORD level, __in DWORD level,
OUT LPBYTE *bufptr, __deref_out LPBYTE *bufptr,
IN DWORD prefmaxlen, __in DWORD prefmaxlen,
OUT LPDWORD entriesread, __out LPDWORD entriesread,
OUT LPDWORD totalentries, __out LPDWORD totalentries,
IN OUT LPDWORD resume_handle OPTIONAL __inout_opt LPDWORD resume_handle
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServiceGetInfo ( NetServiceGetInfo (
IN LPCWSTR servername OPTIONAL, __in_opt LPCWSTR servername,
IN LPCWSTR service, __in LPCWSTR service,
IN DWORD level, __in DWORD level,
OUT LPBYTE *bufptr __deref_out LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetServiceInstall ( NetServiceInstall (
IN LPCWSTR servername OPTIONAL, __in_opt LPCWSTR servername,
IN LPCWSTR service, __in LPCWSTR service,
IN DWORD argc, __in DWORD argc,
IN LPCWSTR argv[], __in_ecount(argc) LPCWSTR argv[],
OUT LPBYTE *bufptr __deref_out LPBYTE *bufptr
); );
// //
// Special Values and Constants // Special Values and Constants
// //
// //
// Bitmask and bit values for svci1_status, and svci2_status // Bitmask and bit values for svci1_status, and svci2_status
// fields. For each "subfield", there is a mask defined, // fields. For each "subfield", there is a mask defined,
// and a number of constants representing the value // and a number of constants representing the value
 End of changes. 4 change blocks. 
21 lines changed or deleted 21 lines changed or added


 lmuse.h (5.2.3790.3959-Windows 5.0)   lmuse.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 47 skipping to change at line 47
#include <lmcons.h> #include <lmcons.h>
#include <lmuseflg.h> // Deletion force level flags #include <lmuseflg.h> // Deletion force level flags
// //
// Function Prototypes // Function Prototypes
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetUseAdd ( NetUseAdd (
IN LMSTR UncServerName OPTIONAL, __in_opt IN LMSTR UncServerName OPTIONAL,
IN DWORD Level, IN DWORD Level,
IN LPBYTE Buf, __inout IN LPBYTE Buf,
OUT LPDWORD ParmError OPTIONAL __out_opt OUT LPDWORD ParmError OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetUseDel ( NetUseDel (
IN LMSTR UncServerName OPTIONAL, __in_opt IN LMSTR UncServerName OPTIONAL,
IN LMSTR UseName, __in IN LMSTR UseName,
IN DWORD ForceCond IN DWORD ForceCond
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetUseEnum ( NetUseEnum (
IN LMSTR UncServerName OPTIONAL, __in_opt IN LMSTR UncServerName OPTIONAL,
IN DWORD Level, IN DWORD Level,
OUT LPBYTE *BufPtr, __out_opt OUT LPBYTE *BufPtr,
IN DWORD PreferedMaximumSize, IN DWORD PreferedMaximumSize,
OUT LPDWORD EntriesRead, __out_opt OUT LPDWORD EntriesRead,
OUT LPDWORD TotalEntries, __out OUT LPDWORD TotalEntries,
IN OUT LPDWORD ResumeHandle __out_opt IN OUT LPDWORD ResumeHandle
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetUseGetInfo ( NetUseGetInfo (
IN LMSTR UncServerName OPTIONAL, __in_opt IN LMSTR UncServerName OPTIONAL,
IN LMSTR UseName, __in IN LMSTR UseName,
IN DWORD Level, IN DWORD Level,
OUT LPBYTE *BufPtr __out_opt OUT LPBYTE *BufPtr
); );
// //
// Data Structures // Data Structures
// //
typedef struct _USE_INFO_0 { typedef struct _USE_INFO_0 {
LMSTR ui0_local; LMSTR ui0_local;
LMSTR ui0_remote; LMSTR ui0_remote;
}USE_INFO_0, *PUSE_INFO_0, *LPUSE_INFO_0; }USE_INFO_0, *PUSE_INFO_0, *LPUSE_INFO_0;
skipping to change at line 163 skipping to change at line 163
#define USE_IPC 3 #define USE_IPC 3
// //
// Flags defined in the use_info_3 structure // Flags defined in the use_info_3 structure
// //
#define CREATE_NO_CONNECT 0x1 // creation flags #define CREATE_NO_CONNECT 0x1 // creation flags
#define CREATE_BYPASS_CSC 0x2 // force connection to server, bypassing CS C #define CREATE_BYPASS_CSC 0x2 // force connection to server, bypassing CS C
// all ops on this connection go to the se rver, // all ops on this connection go to the se rver,
// never to the cache // never to the cache
#define CREATE_CRED_RESET 0x4 // Create a connection with credentials pass
ed in
// this netuse if none exist. If connection
already
// exists then update credentials after iss
uing remote
// tree connection. This is needed as CSC c
annot verify
// 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 // _LMUSE_ #endif // _LMUSE_
 End of changes. 9 change blocks. 
13 lines changed or deleted 23 lines changed or added


 lmwksta.h (5.2.3790.3959-Windows 5.0)   lmwksta.h (6.0.6002.18005-Windows 6.0) 
skipping to change at line 47 skipping to change at line 47
#include <lmcons.h> #include <lmcons.h>
#include <lmuseflg.h> // Deletion force level flags #include <lmuseflg.h> // Deletion force level flags
// //
// Function Prototypes // Function Prototypes
// //
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaGetInfo ( NetWkstaGetInfo (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr __deref_opt_out OUT LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaSetInfo ( NetWkstaSetInfo (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
IN LPBYTE buffer, IN LPBYTE buffer,
OUT LPDWORD parm_err OPTIONAL __out_opt OUT LPDWORD parm_err OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaUserGetInfo ( NetWkstaUserGetInfo (
IN LMSTR reserved, __in_opt IN LMSTR reserved,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr __out_opt OUT LPBYTE *bufptr
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaUserSetInfo ( NetWkstaUserSetInfo (
IN LMSTR reserved, __in_opt IN LMSTR reserved,
IN DWORD level, IN DWORD level,
OUT LPBYTE buf, OUT LPBYTE buf,
OUT LPDWORD parm_err OPTIONAL __out_opt OUT LPDWORD parm_err OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaUserEnum ( NetWkstaUserEnum (
IN LMSTR servername OPTIONAL, __in_opt LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out_opt LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out_opt LPDWORD entriesread,
OUT LPDWORD totalentries, __out LPDWORD totalentries,
IN OUT LPDWORD resumehandle OPTIONAL __inout_opt LPDWORD resumehandle OPTIONAL
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaTransportAdd ( NetWkstaTransportAdd (
IN LMSTR servername OPTIONAL, __in_opt LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
IN LPBYTE buf, __in LPBYTE buf,
OUT LPDWORD parm_err __out_opt LPDWORD parm_err
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaTransportDel ( NetWkstaTransportDel (
IN LMSTR servername OPTIONAL, __in_opt IN LMSTR servername OPTIONAL,
IN LMSTR transportname, __in_opt IN LMSTR transportname,
IN DWORD ucond IN DWORD ucond
); );
NET_API_STATUS NET_API_FUNCTION NET_API_STATUS NET_API_FUNCTION
NetWkstaTransportEnum ( NetWkstaTransportEnum (
IN LMSTR servername OPTIONAL, __in_opt LMSTR servername OPTIONAL,
IN DWORD level, IN DWORD level,
OUT LPBYTE *bufptr, __out_opt LPBYTE *bufptr,
IN DWORD prefmaxlen, IN DWORD prefmaxlen,
OUT LPDWORD entriesread, __out_opt LPDWORD entriesread,
OUT LPDWORD totalentries, __out LPDWORD totalentries,
IN OUT LPDWORD resumehandle OPTIONAL __inout_opt LPDWORD resumehandle OPTIONAL
); );
// //
// Data Structures // Data Structures
// //
// //
// NetWkstaGetInfo and NetWkstaSetInfo // NetWkstaGetInfo and NetWkstaSetInfo
// //
 End of changes. 17 change blocks. 
23 lines changed or deleted 23 lines changed or added

This html diff was produced by rfcdiff 1.41.