From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 24 Apr 2014 15:53:15 +0000 (+0000)
Subject: [WLDAP32]
X-Git-Tag: backups/0.3.17@66124~1545
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=28603830c4636ae87b2d4d64d1cb3f7aac685fd8;hp=d61a213f6681ab8b127fe0b1410effa15b78d5c1

[WLDAP32]
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62951
---

diff --git a/reactos/dll/win32/wldap32/init.c b/reactos/dll/win32/wldap32/init.c
index 6a863604ea0..c17d27aa76c 100644
--- a/reactos/dll/win32/wldap32/init.c
+++ b/reactos/dll/win32/wldap32/init.c
@@ -98,13 +98,12 @@ oom:
 }
 
 /* Determine if a URL starts with a known LDAP scheme */
-static int has_ldap_scheme( char *url )
+static BOOL has_ldap_scheme( char *url )
 {
-    if (!strncasecmp( url, "ldap://", 7 ) || 
-        !strncasecmp( url, "ldaps://", 8 ) ||
-        !strncasecmp( url, "ldapi://", 8 ) ||
-        !strncasecmp( url, "cldap://", 8 )) return 1;
-    return 0;
+    return !strncasecmp( url, "ldap://", 7 )  ||
+           !strncasecmp( url, "ldaps://", 8 ) ||
+           !strncasecmp( url, "ldapi://", 8 ) ||
+           !strncasecmp( url, "cldap://", 8 );
 }
 
 /* Flatten an array of hostnames into a space separated string of URLs.
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index f3e07dd7c0d..5ba07dee928 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -213,7 +213,7 @@ reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/wintrust            # Synced to Wine-1.7.17
-reactos/dll/win32/wldap32             # Synced to Wine-1.7.1
+reactos/dll/win32/wldap32             # Synced to Wine-1.7.17
 reactos/dll/win32/wmi                 # Synced to Wine-1.7.17
 reactos/dll/win32/wtsapi32            # Synced to Wine-1.7.1
 reactos/dll/win32/wuapi               # Synced to Wine-1.7.1