| dsclient.h (6.1.7601.17514-Windows_7.0) | | dsclient.h (6.3.9600.17415-Windows_8.1) |
|
| | // |
| | // Copyright (C) Microsoft. All rights reserved. |
| | // |
| #pragma once | | #pragma once |
|
| | #include <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| //---------------------------------------------------------------------------// | | //---------------------------------------------------------------------------// |
| // CLSIDs exposed for the dsclient. | | // CLSIDs exposed for the dsclient. |
| //---------------------------------------------------------------------------// | | //---------------------------------------------------------------------------// |
| | |
| // this CLSID is used to signal that the DSOBJECTNAMEs structure originated | | // this CLSID is used to signal that the DSOBJECTNAMEs structure originated |
| // for the Microsoft DS. | | // for the Microsoft DS. |
| | |
| DEFINE_GUID(CLSID_MicrosoftDS, 0xfe1290f0, 0xcfbd, 0x11cf, 0xa3, 0x30, 0x0, 0xaa
, 0x0, 0xc1, 0x6e, 0x65); | | DEFINE_GUID(CLSID_MicrosoftDS, 0xfe1290f0, 0xcfbd, 0x11cf, 0xa3, 0x30, 0x0, 0xaa
, 0x0, 0xc1, 0x6e, 0x65); |
| #define CLSID_DsFolder CLSID_MicrosoftDS | | #define CLSID_DsFolder CLSID_MicrosoftDS |
| | |
| skipping to change at line 182 | | skipping to change at line 189 |
| DWORD dwCount; | | DWORD dwCount; |
| DOMAINDESC aDomains[1]; | | DOMAINDESC aDomains[1]; |
| } DOMAIN_TREE, DOMAINTREE, * PDOMAIN_TREE, * LPDOMAINTREE; | | } DOMAIN_TREE, DOMAINTREE, * PDOMAIN_TREE, * LPDOMAINTREE; |
| | |
| #undef INTERFACE | | #undef INTERFACE |
| #define INTERFACE IDsBrowseDomainTree | | #define INTERFACE IDsBrowseDomainTree |
| | |
| DECLARE_INTERFACE_IID_(IDsBrowseDomainTree, IUnknown, "7cabcf1e-78f5-11d2-960c-0
0c04fa31a86") | | DECLARE_INTERFACE_IID_(IDsBrowseDomainTree, IUnknown, "7cabcf1e-78f5-11d2-960c-0
0c04fa31a86") |
| { | | { |
| // *** IUnknown methods *** | | // *** IUnknown methods *** |
|
| STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE; | | STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ void **ppvObj) P |
| STDMETHOD_(ULONG,AddRef)(THIS) PURE; | | URE; |
| STDMETHOD_(ULONG,Release)(THIS) PURE; | | STDMETHOD_(ULONG, AddRef) (THIS) PURE; |
| | STDMETHOD_(ULONG, Release)(THIS) PURE; |
| | |
| // *** IDsBrowseDomainTree methods *** | | // *** IDsBrowseDomainTree methods *** |
|
| STDMETHOD(BrowseTo)(THIS_ HWND hwndParent, __out LPWSTR *ppszTargetPath, __i
n DWORD dwFlags) PURE; | | STDMETHOD(BrowseTo)(THIS_ HWND hwndParent, _Out_ LPWSTR *ppszTargetPath, _In
_ DWORD dwFlags) PURE; |
| STDMETHOD(GetDomains)(THIS_ PDOMAIN_TREE *ppDomainTree, DWORD dwFlags) PURE; | | STDMETHOD(GetDomains)(THIS_ PDOMAIN_TREE *ppDomainTree, DWORD dwFlags) PURE; |
| STDMETHOD(FreeDomains)(THIS_ PDOMAIN_TREE *ppDomainTree) PURE; | | STDMETHOD(FreeDomains)(THIS_ PDOMAIN_TREE *ppDomainTree) PURE; |
| STDMETHOD(FlushCachedDomains)(THIS) PURE; | | STDMETHOD(FlushCachedDomains)(THIS) PURE; |
| STDMETHOD(SetComputer)(THIS_ LPCWSTR pszComputerName, LPCWSTR pszUserName, L
PCWSTR pszPassword) PURE; | | STDMETHOD(SetComputer)(THIS_ LPCWSTR pszComputerName, LPCWSTR pszUserName, L
PCWSTR pszPassword) PURE; |
| }; | | }; |
| | |
| //---------------------------------------------------------------------------// | | //---------------------------------------------------------------------------// |
| | |
| //---------------------------------------------------------------------------// | | //---------------------------------------------------------------------------// |
| // | | // |
| | |
| skipping to change at line 261 | | skipping to change at line 268 |
| // | | // |
| // IDsDisplaySpecifier - a COM object for interacting with display specifiers | | // IDsDisplaySpecifier - a COM object for interacting with display specifiers |
| // | | // |
| | |
| #undef INTERFACE | | #undef INTERFACE |
| #define INTERFACE IDsDisplaySpecifier | | #define INTERFACE IDsDisplaySpecifier |
| | |
| DECLARE_INTERFACE_IID_(IDsDisplaySpecifier, IUnknown, "1ab4a8c0-6a0b-11d2-ad49-0
0c04fa31a86") | | DECLARE_INTERFACE_IID_(IDsDisplaySpecifier, IUnknown, "1ab4a8c0-6a0b-11d2-ad49-0
0c04fa31a86") |
| { | | { |
| // *** IUnknown methods *** | | // *** IUnknown methods *** |
|
| STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID * ppvObj) PURE; | | STDMETHOD(QueryInterface) (THIS_ _In_ REFIID riid, _Outptr_ void **ppvObj) P |
| STDMETHOD_(ULONG,AddRef)(THIS) PURE; | | URE; |
| STDMETHOD_(ULONG,Release)(THIS) PURE; | | STDMETHOD_(ULONG, AddRef) (THIS) PURE; |
| | STDMETHOD_(ULONG, Release)(THIS) PURE; |
| | |
| // *** IDsDisplaySpecifier methods *** | | // *** IDsDisplaySpecifier methods *** |
| STDMETHOD(SetServer)(THIS_ LPCWSTR pszServer, LPCWSTR pszUserName, LPCWSTR p
szPassword, DWORD dwFlags) PURE; | | STDMETHOD(SetServer)(THIS_ LPCWSTR pszServer, LPCWSTR pszUserName, LPCWSTR p
szPassword, DWORD dwFlags) PURE; |
| STDMETHOD(SetLanguageID)(THIS_ LANGID langid) PURE; | | STDMETHOD(SetLanguageID)(THIS_ LANGID langid) PURE; |
| STDMETHOD(GetDisplaySpecifier)(THIS_ LPCWSTR pszObjectClass, REFIID riid, vo
id **ppv) PURE; | | STDMETHOD(GetDisplaySpecifier)(THIS_ LPCWSTR pszObjectClass, REFIID riid, vo
id **ppv) PURE; |
|
| STDMETHOD(GetIconLocation)(THIS_ LPCWSTR pszObjectClass, __in DWORD dwFlags,
__out_ecount(cchBuffer) LPWSTR pszBuffer, __in INT cchBuffer, __out INT *presid
) PURE; | | STDMETHOD(GetIconLocation)(THIS_ LPCWSTR pszObjectClass, _In_ DWORD dwFlags,
_Out_writes_(cchBuffer) LPWSTR pszBuffer, _In_ INT cchBuffer, _Out_ INT *presid
) PURE; |
| STDMETHOD_(HICON, GetIcon)(THIS_ LPCWSTR pszObjectClass, DWORD dwFlags, INT
cxIcon, INT cyIcon) PURE; | | STDMETHOD_(HICON, GetIcon)(THIS_ LPCWSTR pszObjectClass, DWORD dwFlags, INT
cxIcon, INT cyIcon) PURE; |
|
| STDMETHOD(GetFriendlyClassName)(THIS_ LPCWSTR pszObjectClass, __out_ecount(c | | STDMETHOD(GetFriendlyClassName)(THIS_ LPCWSTR pszObjectClass, _Out_writes_(c |
| chBuffer) LPWSTR pszBuffer, __in INT cchBuffer) PURE; | | chBuffer) LPWSTR pszBuffer, _In_ INT cchBuffer) PURE; |
| STDMETHOD(GetFriendlyAttributeName)(THIS_ LPCWSTR pszObjectClass, __in LPCWS | | STDMETHOD(GetFriendlyAttributeName)(THIS_ LPCWSTR pszObjectClass, _In_ LPCWS |
| TR pszAttributeName, __out_ecount(cchBuffer) LPWSTR pszBuffer, __in UINT cchBuff | | TR pszAttributeName, _Out_writes_(cchBuffer) LPWSTR pszBuffer, _In_ UINT cchBuff |
| er) PURE; | | er) PURE; |
| STDMETHOD_(BOOL, IsClassContainer)(THIS_ LPCWSTR pszObjectClass, LPCWSTR psz
ADsPath, DWORD dwFlags) PURE; | | STDMETHOD_(BOOL, IsClassContainer)(THIS_ LPCWSTR pszObjectClass, LPCWSTR psz
ADsPath, DWORD dwFlags) PURE; |
| STDMETHOD(GetClassCreationInfo)(THIS_ LPCWSTR pszObjectClass, LPDSCLASSCREAT
IONINFO* ppdscci) PURE; | | STDMETHOD(GetClassCreationInfo)(THIS_ LPCWSTR pszObjectClass, LPDSCLASSCREAT
IONINFO* ppdscci) PURE; |
| STDMETHOD(EnumClassAttributes)(THIS_ LPCWSTR pszObjectClass, LPDSENUMATTRIBU
TES pcbEnum, LPARAM lParam) PURE; | | STDMETHOD(EnumClassAttributes)(THIS_ LPCWSTR pszObjectClass, LPDSENUMATTRIBU
TES pcbEnum, LPARAM lParam) PURE; |
| STDMETHOD_(ADSTYPE, GetAttributeADsType)(THIS_ LPCWSTR pszAttributeName) PUR
E; | | STDMETHOD_(ADSTYPE, GetAttributeADsType)(THIS_ LPCWSTR pszAttributeName) PUR
E; |
| }; | | }; |
| | |
| //---------------------------------------------------------------------------// | | //---------------------------------------------------------------------------// |
| // | | // |
| // DsBrowseForContainer | | // DsBrowseForContainer |
| // -------------------- | | // -------------------- |
| | |
| skipping to change at line 447 | | skipping to change at line 454 |
| // these to modify the contents of the dialog as required. | | // these to modify the contents of the dialog as required. |
| // | | // |
| | |
| #define DSBID_BANNER 256 | | #define DSBID_BANNER 256 |
| #define DSBID_CONTAINERLIST 257 | | #define DSBID_CONTAINERLIST 257 |
| | |
| // | | // |
| // API exported for browsing for containers. | | // API exported for browsing for containers. |
| // | | // |
| | |
|
| STDAPI_(int) DsBrowseForContainerW(__inout PDSBROWSEINFOW pInfo); | | STDAPI_(int) DsBrowseForContainerW(_Inout_ PDSBROWSEINFOW pInfo); |
| STDAPI_(int) DsBrowseForContainerA(__inout PDSBROWSEINFOA pInfo); | | STDAPI_(int) DsBrowseForContainerA(_Inout_ PDSBROWSEINFOA pInfo); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define DsBrowseForContainer DsBrowseForContainerW | | #define DsBrowseForContainer DsBrowseForContainerW |
| #else | | #else |
| #define DsBrowseForContainer DsBrowseForContainerA | | #define DsBrowseForContainer DsBrowseForContainerA |
| #endif | | #endif |
| | |
| // NOTE: these are here to keep old clients building - remove soon | | // NOTE: these are here to keep old clients building - remove soon |
| | |
| STDAPI_(HICON) DsGetIcon(DWORD dwFlags, LPCWSTR pszObjectClass, INT cxImage, INT
cyImage); | | STDAPI_(HICON) DsGetIcon(DWORD dwFlags, LPCWSTR pszObjectClass, INT cxImage, INT
cyImage); |
|
| STDAPI DsGetFriendlyClassName(LPCWSTR pszObjectClass, __out_ecount(cchBuffer) LP
WSTR pszBuffer, UINT cchBuffer); | | STDAPI DsGetFriendlyClassName(LPCWSTR pszObjectClass, _Out_writes_(cchBuffer) LP
WSTR pszBuffer, UINT cchBuffer); |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| struct __declspec(uuid("1ab4a8c0-6a0b-11d2-ad49-00c04fa31a86")) IDsDisplaySpecif
ier; | | struct __declspec(uuid("1ab4a8c0-6a0b-11d2-ad49-00c04fa31a86")) IDsDisplaySpecif
ier; |
| #endif | | #endif |
| | |
| #endif // GUID_DEFS_ONLY | | #endif // GUID_DEFS_ONLY |
|
| | |
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| End of changes. 10 change blocks. |
| 16 lines changed or deleted | | 25 lines changed or added |
|