[akhaldi] 62952: [WLDAP32_WINETEST] * Sync with Wine 1.7.17. CORE-8080

Author: akhaldi
Date: Thu Apr 24 15:53:26 2014
New Revision: 62952

URL: http://svn.reactos.org/svn/reactos?rev=62952&view=rev
Log:
[WLDAP32_WINETEST]
* Sync with Wine 1.7.17.
CORE-8080

Modified:
    trunk/rostests/winetests/wldap32/parse.c

Modified: trunk/rostests/winetests/wldap32/parse.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/parse.c?...
==============================================================================
--- trunk/rostests/winetests/wldap32/parse.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wldap32/parse.c	[iso-8859-1] Thu Apr 24 15:53:26 2014
@@ -48,16 +48,16 @@
     timeout.tv_sec = 20;
     timeout.tv_usec = 0;
     ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_ONELEVEL, (char *)"(ou=*)", NULL, 0, ctrls, NULL, &timeout, 10, &res );
-    if (ret == LDAP_SERVER_DOWN)
+    if (ret == LDAP_SERVER_DOWN || ret == LDAP_TIMEOUT)
     {
         skip("test server can't be reached\n");
-        ldap_control_free( sort );
+        ldap_control_freeA( sort );
         return;
     }
     ok( !ret, "ldap_search_ext_sA failed 0x%x\n", ret );
     ok( res != NULL, "expected res != NULL\n" );

-    if (GetProcAddress(GetModuleHandle("wldap32.dll"), "ber_init"))
+    if (GetProcAddress(GetModuleHandleA("wldap32.dll"), "ber_init"))
     {
         ret = ldap_parse_resultA( NULL, res, &result, NULL, NULL, NULL, &server_ctrls, 1 );
         ok( ret == LDAP_PARAM_ERROR, "ldap_parse_resultA failed 0x%x\n", ret );
@@ -82,8 +82,8 @@
     ret = ldap_parse_sort_controlA( ld, server_ctrls, &result, NULL );
     ok( ret == LDAP_CONTROL_NOT_FOUND, "ldap_parse_sort_controlA failed 0x%x\n", ret );

-    ldap_control_free( sort );
-    ldap_controls_free( server_ctrls );
+    ldap_control_freeA( sort );
+    ldap_controls_freeA( server_ctrls );
 }

static void test_ldap_search_extW( LDAP *ld )