| ntdsapi.h (6.3.9600.17415-Windows 8.1) | | ntdsapi.h (10.0.10586.0-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 30 | | skipping to change at line 30 |
| --*/ | | --*/ |
| | |
| #ifndef _NTDSAPI_H_ | | #ifndef _NTDSAPI_H_ |
| #define _NTDSAPI_H_ | | #define _NTDSAPI_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 _MSC_VER >= 1200 |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #pragma warning(push) |
| | #pragma warning(disable:4820) /* padding added after data member */ |
| | #endif |
| | |
| | #pragma region Desktop Family or WinMgmt Package |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PKG_WINM |
| | GMT) |
| | |
| #include <schedule.h> | | #include <schedule.h> |
| #include <dsparse.h> | | #include <dsparse.h> |
| | |
| #if !defined(_NTDSAPI_) | | #if !defined(_NTDSAPI_) |
| #define NTDSAPI DECLSPEC_IMPORT | | #define NTDSAPI DECLSPEC_IMPORT |
| #if !defined(_NTDSAPI_POSTXP_ASLIB_) | | #if !defined(_NTDSAPI_POSTXP_ASLIB_) |
| #define NTDSAPI_POSTXP DECLSPEC_IMPORT | | #define NTDSAPI_POSTXP DECLSPEC_IMPORT |
| #else | | #else |
| #define NTDSAPI_POSTXP | | #define NTDSAPI_POSTXP |
| | |
| skipping to change at line 73 | | skipping to change at line 78 |
| | |
| // Following constants define the Active Directory Behavior | | // Following constants define the Active Directory Behavior |
| // Version numbers. | | // Version numbers. |
| #define DS_BEHAVIOR_WIN2000 0 | | #define DS_BEHAVIOR_WIN2000 0 |
| #define DS_BEHAVIOR_WIN2003_WITH_MIXED_DOMAINS 1 | | #define DS_BEHAVIOR_WIN2003_WITH_MIXED_DOMAINS 1 |
| #define DS_BEHAVIOR_WIN2003 2 | | #define DS_BEHAVIOR_WIN2003 2 |
| #define DS_BEHAVIOR_WIN2008 3 | | #define DS_BEHAVIOR_WIN2008 3 |
| #define DS_BEHAVIOR_WIN2008R2 4 | | #define DS_BEHAVIOR_WIN2008R2 4 |
| #define DS_BEHAVIOR_WIN2012 5 | | #define DS_BEHAVIOR_WIN2012 5 |
| #define DS_BEHAVIOR_WIN2012R2 6 | | #define DS_BEHAVIOR_WIN2012R2 6 |
|
| | // ISSUE-JSIMMONS-2014/03/16 Fix when final product name is available: |
| | #define DS_BEHAVIOR_WINTHRESHOLD 7 |
| | |
| // Deprecated constants | | // Deprecated constants |
| #define DS_BEHAVIOR_LONGHORN DS_BEHAVIOR_WIN2008 | | #define DS_BEHAVIOR_LONGHORN DS_BEHAVIOR_WIN2008 |
| #define DS_BEHAVIOR_WIN7 DS_BEHAVIOR_WIN2008R2 | | #define DS_BEHAVIOR_WIN7 DS_BEHAVIOR_WIN2008R2 |
| #define DS_BEHAVIOR_WIN8 DS_BEHAVIOR_WIN2012 | | #define DS_BEHAVIOR_WIN8 DS_BEHAVIOR_WIN2012 |
| #define DS_BEHAVIOR_WINBLUE DS_BEHAVIOR_WIN2012R2 | | #define DS_BEHAVIOR_WINBLUE DS_BEHAVIOR_WIN2012R2 |
| | |
| #define DS_DEFAULT_LOCALE \ | | #define DS_DEFAULT_LOCALE \ |
| (MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), \ | | (MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), \ |
| SORT_DEFAULT)) | | SORT_DEFAULT)) |
| | |
| skipping to change at line 791 | | skipping to change at line 798 |
| #define GUID_SYSTEMS_CONTAINER_W L"ab1d30f3768811d1aded00c04f
d8d5cd" | | #define GUID_SYSTEMS_CONTAINER_W L"ab1d30f3768811d1aded00c04f
d8d5cd" |
| #define GUID_DOMAIN_CONTROLLERS_CONTAINER_W L"a361b2ffffd211d1aa4b00c04f
d7d83a" | | #define GUID_DOMAIN_CONTROLLERS_CONTAINER_W L"a361b2ffffd211d1aa4b00c04f
d7d83a" |
| #define GUID_INFRASTRUCTURE_CONTAINER_W L"2fbac1870ade11d297c400c04f
d8d5cd" | | #define GUID_INFRASTRUCTURE_CONTAINER_W L"2fbac1870ade11d297c400c04f
d8d5cd" |
| #define GUID_DELETED_OBJECTS_CONTAINER_W L"18e2ea80684f11d2b9aa00c04f
79f805" | | #define GUID_DELETED_OBJECTS_CONTAINER_W L"18e2ea80684f11d2b9aa00c04f
79f805" |
| #define GUID_LOSTANDFOUND_CONTAINER_W L"ab8153b7768811d1aded00c04f
d8d5cd" | | #define GUID_LOSTANDFOUND_CONTAINER_W L"ab8153b7768811d1aded00c04f
d8d5cd" |
| #define GUID_FOREIGNSECURITYPRINCIPALS_CONTAINER_W L"22b70c67d56e4efb91e9300fca
3dc1aa" | | #define GUID_FOREIGNSECURITYPRINCIPALS_CONTAINER_W L"22b70c67d56e4efb91e9300fca
3dc1aa" |
| #define GUID_PROGRAM_DATA_CONTAINER_W L"09460c08ae1e4a4ea0f64aee7d
aa1e5a" | | #define GUID_PROGRAM_DATA_CONTAINER_W L"09460c08ae1e4a4ea0f64aee7d
aa1e5a" |
| #define GUID_MICROSOFT_PROGRAM_DATA_CONTAINER_W L"f4be92a4c777485e878e9421d5
3087db" | | #define GUID_MICROSOFT_PROGRAM_DATA_CONTAINER_W L"f4be92a4c777485e878e9421d5
3087db" |
| #define GUID_NTDS_QUOTAS_CONTAINER_W L"6227f0af1fc2410d8e3bb10615
bb5b0f" | | #define GUID_NTDS_QUOTAS_CONTAINER_W L"6227f0af1fc2410d8e3bb10615
bb5b0f" |
| #define GUID_MANAGED_SERVICE_ACCOUNTS_CONTAINER_W L"1EB93889E40C45DF9F0C64D23B
BB6237" | | #define GUID_MANAGED_SERVICE_ACCOUNTS_CONTAINER_W L"1EB93889E40C45DF9F0C64D23B
BB6237" |
|
| | #define GUID_KEYS_CONTAINER_W L"683A24E2E8164BD3AF86AC3C2C
F3F981" |
| | |
| #define GUID_USERS_CONTAINER_BYTE "\xa9\xd1\xca\x15\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" | | #define GUID_USERS_CONTAINER_BYTE "\xa9\xd1\xca\x15\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" |
| #define GUID_COMPUTRS_CONTAINER_BYTE "\xaa\x31\x28\x25\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" | | #define GUID_COMPUTRS_CONTAINER_BYTE "\xaa\x31\x28\x25\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" |
| #define GUID_SYSTEMS_CONTAINER_BYTE "\xab\x1d\x30\xf3\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" | | #define GUID_SYSTEMS_CONTAINER_BYTE "\xab\x1d\x30\xf3\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" |
| #define GUID_DOMAIN_CONTROLLERS_CONTAINER_BYTE "\xa3\x61\xb2\xff\xff\xd
2\x11\xd1\xaa\x4b\x00\xc0\x4f\xd7\xd8\x3a" | | #define GUID_DOMAIN_CONTROLLERS_CONTAINER_BYTE "\xa3\x61\xb2\xff\xff\xd
2\x11\xd1\xaa\x4b\x00\xc0\x4f\xd7\xd8\x3a" |
| #define GUID_INFRASTRUCTURE_CONTAINER_BYTE "\x2f\xba\xc1\x87\x0a\xd
e\x11\xd2\x97\xc4\x00\xc0\x4f\xd8\xd5\xcd" | | #define GUID_INFRASTRUCTURE_CONTAINER_BYTE "\x2f\xba\xc1\x87\x0a\xd
e\x11\xd2\x97\xc4\x00\xc0\x4f\xd8\xd5\xcd" |
| #define GUID_DELETED_OBJECTS_CONTAINER_BYTE "\x18\xe2\xea\x80\x68\x4
f\x11\xd2\xb9\xaa\x00\xc0\x4f\x79\xf8\x05" | | #define GUID_DELETED_OBJECTS_CONTAINER_BYTE "\x18\xe2\xea\x80\x68\x4
f\x11\xd2\xb9\xaa\x00\xc0\x4f\x79\xf8\x05" |
| #define GUID_LOSTANDFOUND_CONTAINER_BYTE "\xab\x81\x53\xb7\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" | | #define GUID_LOSTANDFOUND_CONTAINER_BYTE "\xab\x81\x53\xb7\x76\x8
8\x11\xd1\xad\xed\x00\xc0\x4f\xd8\xd5\xcd" |
| #define GUID_FOREIGNSECURITYPRINCIPALS_CONTAINER_BYTE "\x22\xb7\x0c\x67\xd5\x6
e\x4e\xfb\x91\xe9\x30\x0f\xca\x3d\xc1\xaa" | | #define GUID_FOREIGNSECURITYPRINCIPALS_CONTAINER_BYTE "\x22\xb7\x0c\x67\xd5\x6
e\x4e\xfb\x91\xe9\x30\x0f\xca\x3d\xc1\xaa" |
| #define GUID_PROGRAM_DATA_CONTAINER_BYTE "\x09\x46\x0c\x08\xae\x1
e\x4a\x4e\xa0\xf6\x4a\xee\x7d\xaa\x1e\x5a" | | #define GUID_PROGRAM_DATA_CONTAINER_BYTE "\x09\x46\x0c\x08\xae\x1
e\x4a\x4e\xa0\xf6\x4a\xee\x7d\xaa\x1e\x5a" |
| | |
| skipping to change at line 3233 | | skipping to change at line 3241 |
| #define FLAG_FOREST_OPTIONAL_FEATURE (0x00000001) // The optional feature is
a forest level feature. | | #define FLAG_FOREST_OPTIONAL_FEATURE (0x00000001) // The optional feature is
a forest level feature. |
| #define FLAG_DOMAIN_OPTIONAL_FEATURE (0x00000002) // The optional feature is
a domain level feature. | | #define FLAG_DOMAIN_OPTIONAL_FEATURE (0x00000002) // The optional feature is
a domain level feature. |
| #define FLAG_DISABLABLE_OPTIONAL_FEATURE (0x00000004) // The optional feature ma
y be turned off. | | #define FLAG_DISABLABLE_OPTIONAL_FEATURE (0x00000004) // The optional feature ma
y be turned off. |
| #define FLAG_SERVER_OPTIONAL_FEATURE (0x00000008) // The optional feature is
a server level feature.. | | #define FLAG_SERVER_OPTIONAL_FEATURE (0x00000008) // The optional feature is
a server level feature.. |
| | |
| // GUID of the Recycle Bin optional feature | | // GUID of the Recycle Bin optional feature |
| #define GUID_RECYCLE_BIN_OPTIONAL_FEATURE_A "d8dc6d76d0ac5e44f3b9a7f9b6744f2
a" | | #define GUID_RECYCLE_BIN_OPTIONAL_FEATURE_A "d8dc6d76d0ac5e44f3b9a7f9b6744f2
a" |
| #define GUID_RECYCLE_BIN_OPTIONAL_FEATURE_W L"d8dc6d76d0ac5e44f3b9a7f9b6744f2
a" | | #define GUID_RECYCLE_BIN_OPTIONAL_FEATURE_W L"d8dc6d76d0ac5e44f3b9a7f9b6744f2
a" |
| #define GUID_RECYCLE_BIN_OPTIONAL_FEATURE_BYTE "\xd8\xdc\x6d\x76\xd0\xac\x5e\x4
4\xf3\xb9\xa7\xf9\xb6\x74\x4f\x2a" | | #define GUID_RECYCLE_BIN_OPTIONAL_FEATURE_BYTE "\xd8\xdc\x6d\x76\xd0\xac\x5e\x4
4\xf3\xb9\xa7\xf9\xb6\x74\x4f\x2a" |
| | |
|
| // GUID of the Link History Support optional feature | | #define GUID_PRIVILEGED_ACCESS_MANAGEMENT_OPTIONAL_FEATURE_A "73e843ece8cc404 |
| #define GUID_LINK_HISTORY_OPTIONAL_FEATURE_A "76b9ec0aca58e11195301dba472401 | | 6b4ab07ffe4ab5bcd" |
| 9b" | | #define GUID_PRIVILEGED_ACCESS_MANAGEMENT_OPTIONAL_FEATURE_W L"73e843ece8cc404 |
| #define GUID_LINK_HISTORY_OPTIONAL_FEATURE_W L"76b9ec0aca58e11195301dba472401 | | 6b4ab07ffe4ab5bcd" |
| 9b" | | #define GUID_PRIVILEGED_ACCESS_MANAGEMENT_OPTIONAL_FEATURE_BYTE "\x73\xe8\x43\xe |
| #define GUID_LINK_HISTORY_OPTIONAL_FEATURE_BYTE "\x76\xb9\xec\x0a\xca\x58\xe1\x | | c\xe8\xcc\x40\x46\xb4\xab\x07\xff\xe4\xab\x5b\xcd" |
| 11\x95\x30\x1d\xba\x47\x24\x01\x9b" | | |
| | |
| // GUID of the Alternate Link Data Storage Support optional feature | | |
| #define GUID_ALTERNATE_LINK_DATA_STORAGE_OPTIONAL_FEATURE_A "3c29dc65f8e04f4 | | |
| 58b1a98dc1848978f" | | |
| #define GUID_ALTERNATE_LINK_DATA_STORAGE_OPTIONAL_FEATURE_W L"3c29dc65f8e04f4 | | |
| 58b1a98dc1848978f" | | |
| #define GUID_ALTERNATE_LINK_DATA_STORAGE_OPTIONAL_FEATURE_BYTE "\x3c\x29\xdc\x6 | | |
| 5\xf8\xe0\x4f\x45\x8b\x1a\x98\xdc\x18\x48\x97\x8f" | | |
| | |
| // GUID of Link Quota feature | | |
| #define GUID_LINK_QUOTA_OPTIONAL_FEATURE_A "5b0ab0d503ec4d8196f1533f42602 | | |
| 36f" | | |
| #define GUID_LINK_QUOTA_OPTIONAL_FEATURE_W L"5b0ab0d503ec4d8196f1533f42602 | | |
| 36f" | | |
| #define GUID_LINK_QUOTA_OPTIONAL_FEATURE_BYTE "\x5b\x0a\xb0\xd5\x03\xec\x4d\ | | |
| x81\x96\xf1\x53\x3f\x42\x60\x23\x6f" | | |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| #endif !MIDL_PASS | | #endif !MIDL_PASS |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_PK
G_WINMGMT) */ |
| #pragma endregion | | #pragma endregion |
| | |
|
| | #if _MSC_VER >= 1200 |
| | #pragma warning(pop) |
| | #endif |
| | |
| #endif // _NTDSAPI_H_ | | #endif // _NTDSAPI_H_ |
| | |
| End of changes. 6 change blocks. |
| 26 lines changed or deleted | | 22 lines changed or added |
|