|  dsclient.h (5.2.3790.3959-Windows 5.0)  |   |  dsclient.h (6.0.6001.18000-Windows 6.0)  | 
 
       | 
      | #ifndef __dsclient_h |   | #pragma once | 
      | #define __dsclient_h |   |  | 
       |   |  | 
      | //---------------------------------------------------------------------------// |   | //---------------------------------------------------------------------------// | 
      | // 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 180 |   | skipping to change at line 179 | 
      | typedef struct |   | typedef struct | 
      | { |   | { | 
      |   DWORD dsSize; |   |   DWORD dsSize; | 
      |   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_(IDsBrowseDomainTree, IUnknown) |   | 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_ REFIID riid, LPVOID * ppvObj) PURE; | 
      |     STDMETHOD_(ULONG,AddRef)(THIS)  PURE; |   |     STDMETHOD_(ULONG,AddRef)(THIS)  PURE; | 
      |     STDMETHOD_(ULONG,Release)(THIS) PURE; |   |     STDMETHOD_(ULONG,Release)(THIS) PURE; | 
       |   |  | 
      |     // *** IDsBrowseDomainTree methods *** |   |     // *** IDsBrowseDomainTree methods *** | 
      |     STDMETHOD(BrowseTo)(THIS_ HWND hwndParent, LPWSTR *ppszTargetPath, DWORD dwF
lags) PURE; |   |     STDMETHOD(BrowseTo)(THIS_ HWND hwndParent, LPWSTR *ppszTargetPath, DWORD dwF
lags) 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; | 
       |   |  | 
      | skipping to change at line 259 |   | skipping to change at line 258 | 
      |     CLSID aWizardExtensions[1]; |   |     CLSID aWizardExtensions[1]; | 
      | } DSCLASSCREATIONINFO, * LPDSCLASSCREATIONINFO; |   | } DSCLASSCREATIONINFO, * LPDSCLASSCREATIONINFO; | 
       |   |  | 
      | // |   | // | 
      | // 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_(IDsDisplaySpecifier, IUnknown) |   | 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_ REFIID riid, LPVOID * ppvObj) PURE; | 
      |     STDMETHOD_(ULONG,AddRef)(THIS)  PURE; |   |     STDMETHOD_(ULONG,AddRef)(THIS)  PURE; | 
      |     STDMETHOD_(ULONG,Release)(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, DWORD dwFlags, LPWS
TR pszBuffer, INT cchBuffer, INT *presid) PURE; |   |     STDMETHOD(GetIconLocation)(THIS_ LPCWSTR pszObjectClass, DWORD dwFlags, LPWS
TR pszBuffer, INT cchBuffer, 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, LPWSTR pszBuff
er, INT cchBuffer) PURE; |   |     STDMETHOD(GetFriendlyClassName)(THIS_ LPCWSTR pszObjectClass, LPWSTR pszBuff
er, INT cchBuffer) PURE; | 
       | 
      |     STDMETHOD(GetFriendlyAttributeName)(THIS_ LPCWSTR pszObjectClass, LPCWSTR ps
zAttributeName, LPWSTR pszBuffer, UINT cchBuffer) PURE; |   |     STDMETHOD(GetFriendlyAttributeName)(THIS_ LPCWSTR pszObjectClass, LPCWSTR ps
zAttributeName, __out_ecount(cchBuffer) LPWSTR pszBuffer, UINT cchBuffer) 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 448 |   | skipping to change at line 447 | 
      | // 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(PDSBROWSEINFOW pInfo); |   | STDAPI_(int) DsBrowseForContainerW(__inout PDSBROWSEINFOW pInfo); | 
      | STDAPI_(int) DsBrowseForContainerA(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, LPWSTR pszObjectClass, INT cxImage, INT  |   | STDAPI_(HICON) DsGetIcon(DWORD dwFlags, LPCWSTR pszObjectClass, INT cxImage, INT | 
      | cyImage); |   |  cyImage); | 
      | STDAPI DsGetFriendlyClassName(LPWSTR pszObjectClass, LPWSTR pszBuffer, UINT cchB |   | STDAPI DsGetFriendlyClassName(LPCWSTR pszObjectClass, __out_ecount(cchBuffer) LP | 
      | uffer); |   | WSTR pszBuffer, UINT cchBuffer); | 
       |   |  | 
       | 
      | #endif  // GUID_DEFS_ONLY |   | #ifdef  __cplusplus | 
       |   | struct __declspec(uuid("1ab4a8c0-6a0b-11d2-ad49-00c04fa31a86")) IDsDisplaySpecif | 
       |   | ier; | 
      | #endif |   | #endif | 
       | 
       |   |                                                                                  | 
       |   | #endif  // GUID_DEFS_ONLY | 
      |   |  | 
     |  End of changes. 8 change blocks.  | 
     | 12 lines changed or deleted |   | 13 lines changed or added | 
      |