Trying to use Windows LDAP for Windows builds

Change-Id: Ic06bda1393de4da05af01f79b8ba54cf0ee2cb73

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>

8 files changed, 21 insertions, 11 deletions

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3b321eeb06ac..8f542d74e916 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1368,12 +1368,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 	ws2_32 \
 )
 
-ifeq ($(WITH_LDAP),YES)
-$(call gb_LinkTarget_add_libs,$(1),\
-	nsldap32v50.lib \
-)
-endif
-
 endif
 
 endef
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 979d166c3e9a..b77f16c80702 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	shell32 \
+	wldap32 \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index c1d07ed3ab8a..00e62d9eb2df 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -283,7 +283,7 @@ void LdapConnection::loadModule()
     {
 #if defined WNT
         s_Ldap_Module = osl_loadModuleRelativeAscii(
-            &thisModule, "nsldap32v50.dll", 0);
+            &thisModule, "wldap32.dll", 0);
 #elif defined WITH_OPENLDAP
         s_Ldap_Module = osl_loadModuleAscii(
             ("libldap-" SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) "."
diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
index 470d4b9c6ac9..1b84b76e246d 100644
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ b/extensions/source/config/ldap/wrapldapinclude.hxx
@@ -31,10 +31,24 @@
 #    define LDAP_CALL
 #endif
 #else
+#ifdef WNT
+#include <windows.h>
+#include <winldap.h>
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
+#ifndef LDAP_NO_ATTRS
+#    define LDAP_NO_ATTRS "1.1"
+#endif
+#else // !defined WNT
 #ifndef LDAP_INCLUDED
 #define LDAP_INCLUDED
 #include <ldap/ldap.h>
 #endif // LDAP_INCLUDED
+#endif // WNT
 #endif
 
 #ifdef WNT
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 4550ad5188bc..a04b6e275667 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -60,8 +60,7 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1
 .IF "$(WITH_LDAP)" == "YES"
 BUILD_ACTION += USE_LDAP=1
 .IF "$(WITH_OPENLDAP)" != "YES"
-SOLARINC += -I$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap
-BUILD_ACTION += USE_MOZLDAP=1
+BUILD_ACTION += USE_MICROSOFT_LDAP=1
 .ENDIF
 .ENDIF # "$(WITH_LDAP)" == "YES"
 .ELSE #"$(GUI)$(COM)"!="WNTMSC"
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 78dac2561475..81d6226aba13 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -252,6 +252,7 @@ gb_Library_PLAINLIBS_NONE += \
 	version \
 	wininet \
 	winspool \
+	wldap32 \
 	ws2_32 \
 
 gb_Library_LAYER := \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index efb000e19cec..41a231e62e40 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -423,6 +423,7 @@ gb_Library_PLAINLIBS_NONE += \
 	wininet \
 	winmm \
 	winspool \
+	wldap32 \
 	ws2_32 \
 
 gb_Library_LAYER := \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 67c09fdbe2e3..0ea1cc3bee2f 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -112,7 +112,7 @@ MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 MOZBASELIB=-lnspr4 -lxpcom
 .IF "$(GUI)$(COM)"=="WNTGCC"
-LDAPSDKLIB=-lnsldap32v50
+LDAPSDKLIB=-lwldap32
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 .IF "$(WITH_OPENLDAP)" == "YES"
 LDAPSDKLIB=-lldap
@@ -412,7 +412,7 @@ EXTLIB=iext.lib
 SOTLIB=isot.lib
 MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
 MOZBASELIB=nspr4.lib xpcom.lib
-LDAPSDKLIB=nsldap32v50.lib
+LDAPSDKLIB=wldap32.lib
 PAPILIB=ipap.lib
 SFX2LIB=sfx.lib
 SFXLIB=$(SFX2LIB)