aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog13
-rw-r--r--winsup/w32api/include/dsgetdc.h23
-rw-r--r--winsup/w32api/lib/netapi32.def2
3 files changed, 38 insertions, 0 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index fae2465..66126ec 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,16 @@
+2008-06-17 Corinna Vinschen <corinna@vinschen.de>
+
+ * include/dsgetdc.h (DS_FORCE_REDISCOVERY, DS_FORCE_REDISCOVERY,
+ DS_DIRECTORY_SERVICE_REQUIRED, DS_DIRECTORY_SERVICE_PREFERRED,
+ DS_GC_SERVER_REQUIRED, DS_PDC_REQUIRED, DS_BACKGROUND_ONLY,
+ DS_IP_REQUIRED, DS_KDC_REQUIRED, DS_TIMESERV_REQUIRED,
+ DS_WRITABLE_REQUIRED, DS_GOOD_TIMESERV_PREFERRED, DS_AVOID_SELF,
+ DS_ONLY_LDAP_NEEDED, DS_IS_FLAT_NAME, DS_IS_DNS_NAME,
+ DS_RETURN_DNS_NAME, DS_RETURN_FLAT_NAME): Define.
+ (DsGetDcNameW, DsGetDcNameA): Declare.
+ (DsGetDcName): Define.
+ * lib/netapi32.def (DsGetDcNameA, DsGetDcNameW): Export.
+
2008-05-28 Chris Sutcliffe <ir0nh34d@users.sf.net>
* include/commctrl.h (NMLVODSTATECHANGE): Define.
diff --git a/winsup/w32api/include/dsgetdc.h b/winsup/w32api/include/dsgetdc.h
index e0f3c3c..793cab2 100644
--- a/winsup/w32api/include/dsgetdc.h
+++ b/winsup/w32api/include/dsgetdc.h
@@ -24,6 +24,23 @@ extern "C" {
/*--- Active Directory Reference - Active Directory Structures - Directory Service Structures */
#if (_WIN32_WINNT >= 0x0500)
+#define DS_FORCE_REDISCOVERY 0x00000001
+#define DS_DIRECTORY_SERVICE_REQUIRED 0x00000010
+#define DS_DIRECTORY_SERVICE_PREFERRED 0x00000020
+#define DS_GC_SERVER_REQUIRED 0x00000040
+#define DS_PDC_REQUIRED 0x00000080
+#define DS_BACKGROUND_ONLY 0x00000100
+#define DS_IP_REQUIRED 0x00000200
+#define DS_KDC_REQUIRED 0x00000400
+#define DS_TIMESERV_REQUIRED 0x00000800
+#define DS_WRITABLE_REQUIRED 0x00001000
+#define DS_GOOD_TIMESERV_PREFERRED 0x00002000
+#define DS_AVOID_SELF 0x00004000
+#define DS_ONLY_LDAP_NEEDED 0x00008000
+#define DS_IS_FLAT_NAME 0x00010000
+#define DS_IS_DNS_NAME 0x00020000
+#define DS_RETURN_DNS_NAME 0x40000000
+#define DS_RETURN_FLAT_NAME 0x80000000
typedef struct _DOMAIN_CONTROLLER_INFOA {
LPSTR DomainControllerName;
LPSTR DomainControllerAddress;
@@ -83,12 +100,18 @@ typedef struct _DS_DOMAIN_TRUSTSW {
#define DS_DOMAIN_PRIMARY 0x0008
#define DS_DOMAIN_NATIVE_MODE 0x0010
#define DS_DOMAIN_DIRECT_INBOUND 0x0020
+
+DWORD WINAPI DsGetDcNameW(LPCWSTR, LPCWSTR, GUID*, LPCWSTR, ULONG, PDOMAIN_CONTROLLER_INFOW*);
+DWORD WINAPI DsGetDcNameA(LPCSTR, LPCSTR, GUID*, LPCSTR, ULONG, PDOMAIN_CONTROLLER_INFOA*);
+
#ifdef UNICODE
typedef DOMAIN_CONTROLLER_INFOW DOMAIN_CONTROLLER_INFO,*PDOMAIN_CONTROLLER_INFO;
typedef DS_DOMAIN_TRUSTSW DS_DOMAIN_TRUSTS,*PDS_DOMAIN_TRUSTS;
+#define DsGetDcName DsGetDcNameW
#else
typedef DOMAIN_CONTROLLER_INFOA DOMAIN_CONTROLLER_INFO,*PDOMAIN_CONTROLLER_INFO;
typedef DS_DOMAIN_TRUSTSA DS_DOMAIN_TRUSTS,*PDS_DOMAIN_TRUSTS;
+#define DsGetDcName DsGetDcNameA
#endif
#endif /* (_WIN32_WINNT >= 0x0500) */
diff --git a/winsup/w32api/lib/netapi32.def b/winsup/w32api/lib/netapi32.def
index e8d0ef4..01f91a8 100644
--- a/winsup/w32api/lib/netapi32.def
+++ b/winsup/w32api/lib/netapi32.def
@@ -1,5 +1,7 @@
LIBRARY NETAPI32.DLL
EXPORTS
+DsGetDcNameA@24
+DsGetDcNameW@24
I_BrowserDebugCall@12
I_BrowserDebugTrace@8
I_BrowserQueryOtherDomains@16