[ros-diffs] [akhaldi] 60433: [WLDAP32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 28 15:31:01 2013
New Revision: 60433

URL: http://svn.reactos.org/svn/reactos?rev=60433&view=rev
Log:
[WLDAP32_WINETEST]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/rostests/winetests/wldap32/CMakeLists.txt
    trunk/rostests/winetests/wldap32/parse.c
    trunk/rostests/winetests/wldap32/testlist.c

Modified: trunk/rostests/winetests/wldap32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/CMakeLi…
==============================================================================
--- trunk/rostests/winetests/wldap32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wldap32/CMakeLists.txt	[iso-8859-1] Sat Sep 28 15:31:01 2013
@@ -1,10 +1,5 @@
-
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
 
 add_executable(wldap32_winetest parse.c testlist.c)
-target_link_libraries(wldap32_winetest wine)
 set_module_type(wldap32_winetest win32cui)
-add_importlibs(wldap32_winetest wldap32 msvcrt kernel32 ntdll)
+add_importlibs(wldap32_winetest wldap32 msvcrt kernel32)
 add_cd_file(TARGET wldap32_winetest DESTINATION reactos/bin FOR all)

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] Sat Sep 28 15:31:01 2013
@@ -86,6 +86,43 @@
     ldap_controls_free( server_ctrls );
 }
 
+static void test_ldap_search_extW( LDAP *ld )
+{
+    ULONG ret, message, timelimit;
+    WCHAR base[] = {0}, filter[] = {'o','u','=','*',0};
+
+    timelimit = 20;
+    ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL,
timelimit, 0, &message );
+    if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE)
+    {
+        skip("test server can't be reached\n");
+        return;
+    }
+    ok( !ret, "ldap_search_extW failed 0x%08x\n", ret );
+
+    timelimit = 0;
+    ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL,
timelimit, 0, &message );
+    ok( !ret, "ldap_search_extW failed 0x%08x\n", ret );
+}
+
+static void test_ldap_set_optionW( LDAP *ld )
+{
+    ULONG ret, oldvalue;
+
+    ret = ldap_get_optionW( ld, LDAP_OPT_REFERRALS, &oldvalue );
+    if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE)
+    {
+        skip("test server can't be reached\n");
+        return;
+    }
+
+    ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF );
+    ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW
failed 0x%08x\n", ret );
+
+    ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue );
+    ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret );
+}
+
 START_TEST (parse)
 {
     LDAP *ld;
@@ -94,5 +131,7 @@
     ok( ld != NULL, "ldap_init failed\n" );
 
     test_ldap_parse_sort_control( ld );
+    test_ldap_search_extW( ld );
+    test_ldap_set_optionW( ld );
     ldap_unbind( ld );
 }

Modified: trunk/rostests/winetests/wldap32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/testlis…
==============================================================================
--- trunk/rostests/winetests/wldap32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wldap32/testlist.c	[iso-8859-1] Sat Sep 28 15:31:01 2013
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_parse(void);