Hans Leidekker : wldap32: Build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e5f1c0f7fc0fb5fa550756fc71398c9a71906d62
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e5f1c0f7fc0fb5fa550756fc71398c9a71906d62

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Mon Apr 19 10:04:51 2021 +0200

wldap32: Build with msvcrt.

Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wldap32/Makefile.in |  2 ++
 dlls/wldap32/libldap.h   | 10 +++++-----
 dlls/wldap32/page.c      |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/wldap32/Makefile.in b/dlls/wldap32/Makefile.in
index 18a37151f99..831c00d65e1 100644
--- a/dlls/wldap32/Makefile.in
+++ b/dlls/wldap32/Makefile.in
@@ -4,6 +4,8 @@ IMPORTS   = user32
 EXTRAINCL = $(LDAP_CFLAGS)
 EXTRALIBS = $(LDAP_LIBS)
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	add.c \
 	ber.c \
diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h
index 1dfadf7e3bc..cc247e8fd82 100644
--- a/dlls/wldap32/libldap.h
+++ b/dlls/wldap32/libldap.h
@@ -19,8 +19,8 @@
 /* compatible with structures defined in ldap.h */
 typedef struct bervalU
 {
-    unsigned long bv_len;
-    char         *bv_val;
+    ULONG_PTR bv_len;
+    char     *bv_val;
 } BerValueU;
 
 typedef struct
@@ -79,8 +79,8 @@ typedef struct
 
 typedef struct timevalU
 {
-    unsigned long tv_sec;
-    unsigned long tv_usec;
+    LONG_PTR tv_sec;
+    LONG_PTR tv_usec;
 } LDAP_TIMEVALU;
 
 #ifndef SASL_CB_LIST_END
@@ -92,7 +92,7 @@ typedef struct timevalU
 
 typedef struct sasl_interactU
 {
-    unsigned long id;
+    ULONG_PTR     id;
     const char   *challenge;
     const char   *prompt;
     const char   *defresult;
diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c
index 5364280f271..49be2203b3f 100644
--- a/dlls/wldap32/page.c
+++ b/dlls/wldap32/page.c
@@ -245,7 +245,7 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, LDAPControlW **ctrls, UL
 
     for (i = 0; ctrls[i]; i++)
     {
-        if (!lstrcmpW( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid ))
+        if (!wcscmp( LDAP_PAGED_RESULT_OID_STRING_W, ctrls[i]->ldctl_oid ))
             control = ctrls[i];
     }
     if (!control) return WLDAP32_LDAP_CONTROL_NOT_FOUND;