[WLDAP32]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 24 Apr 2014 15:53:15 +0000 (15:53 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 24 Apr 2014 15:53:15 +0000 (15:53 +0000)
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62951

reactos/dll/win32/wldap32/init.c
reactos/media/doc/README.WINE

index 6a86360..c17d27a 100644 (file)
@@ -98,13 +98,12 @@ oom:
 }
 
 /* Determine if a URL starts with a known LDAP scheme */
 }
 
 /* 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.
 }
 
 /* Flatten an array of hostnames into a space separated string of URLs.
index f3e07dd..5ba07de 100644 (file)
@@ -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/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
 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