Move some not private LDAP definitions and API declarations from winldap_private.h to public header winldap.h
Dmitry Timoshkov
dmitry at baikal.ru
Tue Aug 9 03:25:08 CDT 2005
Hello,
Changelog:
Dmitry Timoshkov <dmitry at codeweavers.com>
Move some not private LDAP definitions and API declarations from
winldap_private.h to public header winldap.h.
diff -up cvs/hq/wine/dlls/wldap32/winldap_private.h wine/dlls/wldap32/winldap_private.h
--- cvs/hq/wine/dlls/wldap32/winldap_private.h 2005-08-09 12:55:33.000000000 +0900
+++ wine/dlls/wldap32/winldap_private.h 2005-08-09 17:15:41.000000000 +0900
@@ -22,6 +22,9 @@
* native headers.
*/
+#ifndef __WINE_WINLDAP_PRIVATE_H
+#define __WINE_WINLDAP_PRIVATE_H
+
typedef enum {
WLDAP32_LDAP_SERVER_DOWN = 0x51,
WLDAP32_LDAP_LOCAL_ERROR = 0x52,
@@ -43,44 +46,6 @@ typedef enum {
WLDAP32_LDAP_REFERRAL_LIMIT_EXCEEDED = 0x61
} LDAP_RETCODE;
-#define LDAP_OPT_THREAD_FN_PTRS 0x05
-#define LDAP_OPT_REBIND_FN 0x06
-#define LDAP_OPT_REBIND_ARG 0x07
-#define LDAP_OPT_SSL 0x0a
-#define LDAP_OPT_IO_FN_PTRS 0x0b
-#define LDAP_OPT_CACHE_FN_PTRS 0x0d
-#define LDAP_OPT_CACHE_STRATEGY 0x0e
-#define LDAP_OPT_CACHE_ENABLE 0x0f
-#define LDAP_OPT_REFERRAL_HOP_LIMIT 0x10
-#define LDAP_OPT_VERSION 0x11
-#define LDAP_OPT_SERVER_ERROR 0x33
-#define LDAP_OPT_SERVER_EXT_ERROR 0x34
-#define LDAP_OPT_PING_KEEP_ALIVE 0x36
-#define LDAP_OPT_PING_WAIT_TIME 0x37
-#define LDAP_OPT_PING_LIMIT 0x38
-#define LDAP_OPT_DNSDOMAIN_NAME 0x3b
-#define LDAP_OPT_GETDSNAME_FLAGS 0x3d
-#define LDAP_OPT_HOST_REACHABLE 0x3e
-#define LDAP_OPT_PROMPT_CREDENTIALS 0x3f
-#define LDAP_OPT_TCP_KEEPALIVE 0x40
-#define LDAP_OPT_FAST_CONCURRENT_BIND 0x41
-#define LDAP_OPT_SEND_TIMEOUT 0x42
-#define LDAP_OPT_REFERRAL_CALLBACK 0x70
-#define LDAP_OPT_CLIENT_CERTIFICATE 0x80
-#define LDAP_OPT_SERVER_CERTIFICATE 0x81
-#define LDAP_OPT_AUTO_RECONNECT 0x91
-#define LDAP_OPT_SSPI_FLAGS 0x92
-#define LDAP_OPT_SSL_INFO 0x93
-#define LDAP_OPT_REF_DEREF_CONN_PER_MSG 0x94
-#define LDAP_OPT_TLS LDAP_OPT_SSL
-#define LDAP_OPT_TLS_INFO LDAP_OPT_SSL_INFO
-#define LDAP_OPT_SIGN 0x95
-#define LDAP_OPT_ENCRYPT 0x96
-#define LDAP_OPT_SASL_METHOD 0x97
-#define LDAP_OPT_AREC_EXCLUSIVE 0x98
-#define LDAP_OPT_SECURITY_CONTEXT 0x99
-#define LDAP_OPT_ROOTDSE_CACHE 0x9a
-
typedef struct ldap
{
struct
@@ -112,7 +77,7 @@ typedef struct l_timeval
{
LONG tv_sec;
LONG tv_usec;
-} LDAP_TIMEVAL, *PLDAP_TIMEVAL;
+} WLDAP32_LDAP_TIMEVAL, *WLDAP32_PLDAP_TIMEVAL;
typedef struct ldapmsg
{
@@ -154,54 +119,6 @@ typedef struct ldapcontrolW
BOOLEAN ldctl_iscritical;
} LDAPControlW, *PLDAPControlW;
-typedef struct ldapsortkeyA
-{
- PCHAR sk_attrtype;
- PCHAR sk_matchruleoid;
- BOOLEAN sk_reverseorder;
-} LDAPSortKeyA, *PLDAPSortKeyA;
-
-typedef struct ldapsortkeyW
-{
- PWCHAR sk_attrtype;
- PWCHAR sk_matchruleoid;
- BOOLEAN sk_reverseorder;
-} LDAPSortKeyW, *PLDAPSortKeyW;
-
-typedef struct ldapapiinfoA
-{
- int ldapai_info_version;
- int ldapai_api_version;
- int ldapai_protocol_version;
- char **ldapai_extensions;
- char *ldapai_vendor_name;
- int ldapai_vendor_version;
-} LDAPAPIInfoA;
-
-typedef struct ldapapiinfoW
-{
- int ldapai_info_version;
- int ldapai_api_version;
- int ldapai_protocol_version;
- PWCHAR *ldapai_extensions;
- PWCHAR ldapai_vendor_name;
- int ldapai_vendor_version;
-} LDAPAPIInfoW;
-
-typedef struct ldap_apifeature_infoA
-{
- int ldapaif_info_version;
- char *ldapaif_name;
- int ldapaif_version;
-} LDAPAPIFeatureInfoA;
-
-typedef struct ldap_apifeature_infoW
-{
- int ldapaif_info_version;
- PWCHAR ldapaif_name;
- int ldapaif_version;
-} LDAPAPIFeatureInfoW;
-
ULONG ldap_bindA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG);
ULONG ldap_bindW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG);
ULONG ldap_bind_sA(WLDAP32_LDAP*,PCHAR,PCHAR,ULONG);
@@ -267,7 +184,4 @@ ULONG WLDAP32_ldap_unbind_s(WLDAP32_LDAP
ULONG ldap_value_freeA(PCHAR*);
ULONG ldap_value_freeW(PWCHAR*);
-ULONG LdapGetLastError(void);
-ULONG LdapMapErrorToWin32(ULONG);
-int LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
-int LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
+#endif /* __WINE_WINLDAP_PRIVATE_H */
diff -up cvs/hq/wine/dlls/wldap32/wldap32.h wine/dlls/wldap32/wldap32.h
--- cvs/hq/wine/dlls/wldap32/wldap32.h 2005-08-09 12:55:33.000000000 +0900
+++ wine/dlls/wldap32/wldap32.h 2005-08-09 17:16:12.000000000 +0900
@@ -18,10 +18,62 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifndef __WINE_WLDAP32_H
+#define __WINE_WLDAP32_H
+
/* A set of helper functions to convert LDAP data structures
* to and from ansi (A), wide character (W) and utf8 (U) encodings.
*/
+
+typedef struct ldapsortkeyA
+{
+ PCHAR sk_attrtype;
+ PCHAR sk_matchruleoid;
+ BOOLEAN sk_reverseorder;
+} LDAPSortKeyA, *PLDAPSortKeyA;
+
+typedef struct ldapsortkeyW
+{
+ PWCHAR sk_attrtype;
+ PWCHAR sk_matchruleoid;
+ BOOLEAN sk_reverseorder;
+} LDAPSortKeyW, *PLDAPSortKeyW;
+
+typedef struct ldapapiinfoA
+{
+ int ldapai_info_version;
+ int ldapai_api_version;
+ int ldapai_protocol_version;
+ char **ldapai_extensions;
+ char *ldapai_vendor_name;
+ int ldapai_vendor_version;
+} LDAPAPIInfoA;
+
+typedef struct ldapapiinfoW
+{
+ int ldapai_info_version;
+ int ldapai_api_version;
+ int ldapai_protocol_version;
+ PWCHAR *ldapai_extensions;
+ PWCHAR ldapai_vendor_name;
+ int ldapai_vendor_version;
+} LDAPAPIInfoW;
+
+typedef struct ldap_apifeature_infoA
+{
+ int ldapaif_info_version;
+ char *ldapaif_name;
+ int ldapaif_version;
+} LDAPAPIFeatureInfoA;
+
+typedef struct ldap_apifeature_infoW
+{
+ int ldapaif_info_version;
+ PWCHAR ldapaif_name;
+ int ldapaif_version;
+} LDAPAPIFeatureInfoW;
+
static inline LPWSTR strAtoW( LPCSTR str )
{
LPWSTR ret = NULL;
@@ -745,3 +797,5 @@ static inline void featureinfofreeU( LDA
}
#endif /* HAVE_LDAP */
+
+#endif /* __WINE_WLDAP32_H */
diff -up cvs/hq/wine/include/winldap.h wine/include/winldap.h
--- cvs/hq/wine/include/winldap.h 2005-07-27 15:18:23.000000000 +0900
+++ wine/include/winldap.h 2005-08-09 17:17:58.000000000 +0900
@@ -16,6 +16,62 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifndef __WINE_WINLDAP_H
+#define __WINE_WINLDAP_H
+
+#define LDAP_OPT_API_INFO 0x00
+#define LDAP_OPT_DESC 0x01
+#define LDAP_OPT_DEREF 0x02
+#define LDAP_OPT_SIZELIMIT 0x03
+#define LDAP_OPT_TIMELIMIT 0x04
+#define LDAP_OPT_THREAD_FN_PTRS 0x05
+#define LDAP_OPT_REBIND_FN 0x06
+#define LDAP_OPT_REBIND_ARG 0x07
+#define LDAP_OPT_REFERRALS 0x08
+#define LDAP_OPT_RESTART 0x09
+#define LDAP_OPT_SSL 0x0a
+#define LDAP_OPT_IO_FN_PTRS 0x0b
+#define LDAP_OPT_CACHE_FN_PTRS 0x0d
+#define LDAP_OPT_CACHE_STRATEGY 0x0e
+#define LDAP_OPT_CACHE_ENABLE 0x0f
+#define LDAP_OPT_REFERRAL_HOP_LIMIT 0x10
+#define LDAP_OPT_VERSION 0x11
+#define LDAP_OPT_PROTOCOL_VERSION 0x11 /* duplicate */
+#define LDAP_OPT_API_FEATURE_INFO 0x15
+#define LDAP_OPT_HOST_NAME 0x30
+#define LDAP_OPT_ERROR_NUMBER 0x31
+#define LDAP_OPT_ERROR_STRING 0x32
+#define LDAP_OPT_SERVER_ERROR 0x33
+#define LDAP_OPT_SERVER_EXT_ERROR 0x34
+#define LDAP_OPT_PING_KEEP_ALIVE 0x36
+#define LDAP_OPT_PING_WAIT_TIME 0x37
+#define LDAP_OPT_PING_LIMIT 0x38
+#define LDAP_OPT_DNSDOMAIN_NAME 0x3b
+#define LDAP_OPT_GETDSNAME_FLAGS 0x3d
+#define LDAP_OPT_HOST_REACHABLE 0x3e
+#define LDAP_OPT_PROMPT_CREDENTIALS 0x3f
+#define LDAP_OPT_TCP_KEEPALIVE 0x40
+#define LDAP_OPT_FAST_CONCURRENT_BIND 0x41
+#define LDAP_OPT_SEND_TIMEOUT 0x42
+#define LDAP_OPT_REFERRAL_CALLBACK 0x70
+#define LDAP_OPT_CLIENT_CERTIFICATE 0x80
+#define LDAP_OPT_SERVER_CERTIFICATE 0x81
+#define LDAP_OPT_AUTO_RECONNECT 0x91
+#define LDAP_OPT_SSPI_FLAGS 0x92
+#define LDAP_OPT_SSL_INFO 0x93
+#define LDAP_OPT_REF_DEREF_CONN_PER_MSG 0x94
+#define LDAP_OPT_TLS LDAP_OPT_SSL
+#define LDAP_OPT_TLS_INFO LDAP_OPT_SSL_INFO
+#define LDAP_OPT_SIGN 0x95
+#define LDAP_OPT_ENCRYPT 0x96
+#define LDAP_OPT_SASL_METHOD 0x97
+#define LDAP_OPT_AREC_EXCLUSIVE 0x98
+#define LDAP_OPT_SECURITY_CONTEXT 0x99
+#define LDAP_OPT_ROOTDSE_CACHE 0x9a
+
+#define LDAP_OPT_ON ((void *)1)
+#define LDAP_OPT_OFF ((void *)0)
+
typedef enum {
LDAP_SUCCESS = 0x00,
LDAP_OPERATIONS_ERROR = 0x01,
@@ -210,6 +266,44 @@ typedef struct ldapcontrolW
DECL_WINELIB_TYPE_AW(LDAPControl)
DECL_WINELIB_TYPE_AW(PLDAPControl)
+typedef struct ldapapiinfoA
+{
+ int ldapai_info_version;
+ int ldapai_api_version;
+ int ldapai_protocol_version;
+ char **ldapai_extensions;
+ char *ldapai_vendor_name;
+ int ldapai_vendor_version;
+} LDAPAPIInfoA;
+
+typedef struct ldapapiinfoW
+{
+ int ldapai_info_version;
+ int ldapai_api_version;
+ int ldapai_protocol_version;
+ PWCHAR *ldapai_extensions;
+ PWCHAR ldapai_vendor_name;
+ int ldapai_vendor_version;
+} LDAPAPIInfoW;
+
+DECL_WINELIB_TYPE_AW(LDAPAPIInfo)
+
+typedef struct ldap_apifeature_infoA
+{
+ int ldapaif_info_version;
+ char *ldapaif_name;
+ int ldapaif_version;
+} LDAPAPIFeatureInfoA;
+
+typedef struct ldap_apifeature_infoW
+{
+ int ldapaif_info_version;
+ PWCHAR ldapaif_name;
+ int ldapaif_version;
+} LDAPAPIFeatureInfoW;
+
+DECL_WINELIB_TYPE_AW(LDAPAPIFeatureInfo)
+
typedef struct ldapvlvinfo
{
int ldvlv_version;
@@ -503,3 +597,5 @@ ULONG LdapGetLastError(void);
ULONG LdapMapErrorToWin32(ULONG);
int LdapUnicodeToUTF8(LPCWSTR,int,LPSTR,int);
int LdapUTF8ToUnicode(LPCSTR,int,LPWSTR,int);
+
+#endif /* __WINE_WINLDAP_H */
More information about the wine-patches
mailing list