29 Nov
2007
29 Nov
'07
11:52 a.m.
Author: winesync
Date: Thu Nov 29 14:52:05 2007
New Revision: 30892
URL: http://svn.reactos.org/svn/reactos?rev=30892&view=rev
Log:
Autosyncing with Wine HEAD
Added:
trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc (with props)
Modified:
trunk/reactos/dll/win32/wldap32/add.c
trunk/reactos/dll/win32/wldap32/ber.c
trunk/reactos/dll/win32/wldap32/bind.c
trunk/reactos/dll/win32/wldap32/compare.c
trunk/reactos/dll/win32/wldap32/control.c
trunk/reactos/dll/win32/wldap32/delete.c
trunk/reactos/dll/win32/wldap32/dn.c
trunk/reactos/dll/win32/wldap32/error.c
trunk/reactos/dll/win32/wldap32/extended.c
trunk/reactos/dll/win32/wldap32/init.c
trunk/reactos/dll/win32/wldap32/misc.c
trunk/reactos/dll/win32/wldap32/modify.c
trunk/reactos/dll/win32/wldap32/modrdn.c
trunk/reactos/dll/win32/wldap32/option.c
trunk/reactos/dll/win32/wldap32/page.c
trunk/reactos/dll/win32/wldap32/parse.c
trunk/reactos/dll/win32/wldap32/rename.c
trunk/reactos/dll/win32/wldap32/search.c
trunk/reactos/dll/win32/wldap32/value.c
trunk/reactos/dll/win32/wldap32/winldap_private.h
trunk/reactos/dll/win32/wldap32/wldap32.h
trunk/reactos/dll/win32/wldap32/wldap32.rbuild
trunk/reactos/dll/win32/wldap32/wldap32.rc
trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc
trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc
trunk/reactos/dll/win32/wldap32/wldap32_No.rc
Modified: trunk/reactos/dll/win32/wldap32/add.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/add.c?re…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/add.c (original)
+++ trunk/reactos/dll/win32/wldap32/add.c Thu Nov 29 14:52:05 2007
@@ -33,10 +33,6 @@
#include <ldap.h>
#endif
-#ifndef LDAP_NOT_SUPPORTED
-#define LDAP_NOT_SUPPORTED 0x5c
-#endif
-
#include "winldap_private.h"
#include "wldap32.h"
@@ -53,7 +49,7 @@
*/
ULONG CDECL ldap_addA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **attrsW = NULL;
@@ -105,12 +101,12 @@
*/
ULONG CDECL ldap_addW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **attrsU = NULL;
int msg;
-
+
ret = WLDAP32_LDAP_NO_MEMORY;
TRACE( "(%p, %s, %p)\n", ld, debugstr_w(dn), attrs );
@@ -149,7 +145,7 @@
ULONG CDECL ldap_add_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **attrsW = NULL;
@@ -217,7 +213,7 @@
ULONG CDECL ldap_add_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **attrsU = NULL;
@@ -269,7 +265,7 @@
ULONG CDECL ldap_add_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[],
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **attrsW = NULL;
@@ -335,7 +331,7 @@
ULONG CDECL ldap_add_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[],
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **attrsU = NULL;
@@ -385,7 +381,7 @@
*/
ULONG CDECL ldap_add_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *attrs[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **attrsW = NULL;
@@ -432,7 +428,7 @@
*/
ULONG CDECL ldap_add_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *attrs[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **attrsU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/ber.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/ber.c?re…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/ber.c (original)
+++ trunk/reactos/dll/win32/wldap32/ber.c Thu Nov 29 14:52:05 2007
@@ -315,7 +315,7 @@
* ... [I] Values to encode.
*
* RETURNS
- * Success: Non-negative number.
+ * Success: Non-negative number.
* Failure: LBER_ERROR
*
* NOTES
@@ -410,7 +410,7 @@
* ... [I] Pointers to values to be decoded.
*
* RETURNS
- * Success: Non-negative number.
+ * Success: Non-negative number.
* Failure: LBER_ERROR
*
* NOTES
Modified: trunk/reactos/dll/win32/wldap32/bind.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/bind.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/bind.c (original)
+++ trunk/reactos/dll/win32/wldap32/bind.c Thu Nov 29 14:52:05 2007
@@ -31,9 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -48,7 +45,7 @@
*/
ULONG CDECL ldap_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *credW = NULL;
@@ -97,7 +94,7 @@
*/
ULONG CDECL ldap_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *credU = NULL;
struct berval pwd = { 0, NULL };
@@ -144,7 +141,7 @@
*/
ULONG CDECL ldap_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR cred, ULONG method )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *credW = NULL;
@@ -190,7 +187,7 @@
*/
ULONG CDECL ldap_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR cred, ULONG method )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *credU = NULL;
struct berval pwd = { 0, NULL };
@@ -233,7 +230,7 @@
const PCHAR mechanism, const BERVAL *cred, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, int *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW, *mechanismW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -285,7 +282,7 @@
* cred [I] Credentials.
* serverctrls [I] Array of LDAP server controls.
* clientctrls [I] Array of LDAP client controls.
- * message [O] Message ID of the bind operation.
+ * message [O] Message ID of the bind operation.
*
* RETURNS
* Success: LDAP_SUCCESS
@@ -299,7 +296,7 @@
const PWCHAR mechanism, const BERVAL *cred, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, int *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU, *mechanismU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -353,7 +350,7 @@
const PCHAR mechanism, const BERVAL *cred, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, PBERVAL *serverdata )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW, *mechanismW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -419,7 +416,7 @@
const PWCHAR mechanism, const BERVAL *cred, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, PBERVAL *serverdata )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU, *mechanismU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -471,7 +468,7 @@
*/
ULONG CDECL ldap_simple_bindA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR passwd )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *passwdW = NULL;
@@ -515,11 +512,11 @@
* Failure: An LDAP error code.
*
* NOTES
- * Set dn and passwd to NULL to bind as an anonymous user.
+ * Set dn and passwd to NULL to bind as an anonymous user.
*/
ULONG CDECL ldap_simple_bindW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *passwdU = NULL;
struct berval pwd = { 0, NULL };
@@ -565,7 +562,7 @@
*/
ULONG CDECL ldap_simple_bind_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR passwd )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *passwdW = NULL;
@@ -609,11 +606,11 @@
* Failure: An LDAP error code.
*
* NOTES
- * Set dn and passwd to NULL to bind as an anonymous user.
+ * Set dn and passwd to NULL to bind as an anonymous user.
*/
ULONG CDECL ldap_simple_bind_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR passwd )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *passwdU = NULL;
struct berval pwd = { 0, NULL };
@@ -660,7 +657,7 @@
*/
ULONG CDECL WLDAP32_ldap_unbind( WLDAP32_LDAP *ld )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", ld );
@@ -688,7 +685,7 @@
*/
ULONG CDECL WLDAP32_ldap_unbind_s( WLDAP32_LDAP *ld )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", ld );
Modified: trunk/reactos/dll/win32/wldap32/compare.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/compare.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/compare.c (original)
+++ trunk/reactos/dll/win32/wldap32/compare.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -47,7 +45,7 @@
*/
ULONG CDECL ldap_compareA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *attrW = NULL, *valueW = NULL;
@@ -99,7 +97,7 @@
*/
ULONG CDECL ldap_compareW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *attrU = NULL, *valueU = NULL;
struct berval val = { 0, NULL };
@@ -153,7 +151,7 @@
struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls,
ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *attrW = NULL, *valueW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -229,7 +227,7 @@
struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls,
ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *attrU = NULL, *valueU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -292,7 +290,7 @@
ULONG CDECL ldap_compare_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value,
struct WLDAP32_berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls
)
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *attrW = NULL, *valueW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -366,7 +364,7 @@
ULONG CDECL ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value,
struct WLDAP32_berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls
)
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *attrU = NULL, *valueU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -428,7 +426,7 @@
*/
ULONG CDECL ldap_compare_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *attrW = NULL, *valueW = NULL;
@@ -480,7 +478,7 @@
*/
ULONG CDECL ldap_compare_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *attrU = NULL, *valueU = NULL;
struct berval val = { 0, NULL };
Modified: trunk/reactos/dll/win32/wldap32/control.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/control.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/control.c (original)
+++ trunk/reactos/dll/win32/wldap32/control.c Thu Nov 29 14:52:05 2007
@@ -31,9 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -48,7 +45,7 @@
*/
ULONG CDECL ldap_control_freeA( LDAPControlA *control )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", control );
@@ -71,7 +68,7 @@
*/
ULONG CDECL ldap_control_freeW( LDAPControlW *control )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", control );
@@ -88,7 +85,7 @@
*/
ULONG CDECL ldap_controls_freeA( LDAPControlA **controls )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", controls );
@@ -111,7 +108,7 @@
*/
ULONG CDECL ldap_controls_freeW( LDAPControlW **controls )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", controls );
@@ -129,7 +126,7 @@
ULONG CDECL ldap_create_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkey,
UCHAR critical, PLDAPControlA *control )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPSortKeyW **sortkeyW = NULL;
LDAPControlW *controlW = NULL;
@@ -179,7 +176,7 @@
ULONG CDECL ldap_create_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkey,
UCHAR critical, PLDAPControlW *control )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPSortKey **sortkeyU = NULL;
LDAPControl *controlU = NULL;
@@ -212,7 +209,7 @@
INT CDECL ldap_create_vlv_controlA( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
UCHAR critical, LDAPControlA **control )
{
- INT ret = LDAP_NOT_SUPPORTED;
+ INT ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControlW *controlW = NULL;
@@ -222,7 +219,7 @@
ret = ldap_create_vlv_controlW( ld, info, critical, &controlW );
- if (ret == LDAP_SUCCESS)
+ if (ret == WLDAP32_LDAP_SUCCESS)
{
*control = controlWtoA( controlW );
if (!*control) ret = WLDAP32_LDAP_NO_MEMORY;
@@ -258,7 +255,7 @@
INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
UCHAR critical, LDAPControlW **control )
{
- INT ret = LDAP_NOT_SUPPORTED;
+ INT ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControl *controlU = NULL;
@@ -338,7 +335,7 @@
*
* RETURNS
* LDAP_SUCCESS
- *
+ *
* NOTES
* Obsolete, use ldap_controls_freeW.
*/
Modified: trunk/reactos/dll/win32/wldap32/delete.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/delete.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/delete.c (original)
+++ trunk/reactos/dll/win32/wldap32/delete.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -47,7 +45,7 @@
*/
ULONG CDECL ldap_deleteA( WLDAP32_LDAP *ld, PCHAR dn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
@@ -87,7 +85,7 @@
*/
ULONG CDECL ldap_deleteW( WLDAP32_LDAP *ld, PWCHAR dn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
int msg;
@@ -122,7 +120,7 @@
ULONG CDECL ldap_delete_extA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -182,7 +180,7 @@
ULONG CDECL ldap_delete_extW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -228,7 +226,7 @@
ULONG CDECL ldap_delete_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -284,7 +282,7 @@
ULONG CDECL ldap_delete_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -317,7 +315,7 @@
#endif
return ret;
}
-
+
/***********************************************************************
* ldap_delete_sA (WLDAP32.@)
*
@@ -325,7 +323,7 @@
*/
ULONG CDECL ldap_delete_sA( WLDAP32_LDAP *ld, PCHAR dn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
@@ -360,7 +358,7 @@
*/
ULONG CDECL ldap_delete_sW( WLDAP32_LDAP *ld, PWCHAR dn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/dn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/dn.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/dn.c (original)
+++ trunk/reactos/dll/win32/wldap32/dn.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
#endif
#include "winldap_private.h"
@@ -75,7 +73,7 @@
* dn [I] DN to convert.
*
* RETURNS
- * Success: Pointer to a string containing the user-friendly name.
+ * Success: Pointer to a string containing the user-friendly name.
* Failure: NULL
*
* NOTES
@@ -139,7 +137,7 @@
*
* RETURNS
* Success: Pointer to a NULL-terminated array that contains the DN
- * components.
+ * components.
* Failure: NULL
*
* NOTES
@@ -232,7 +230,7 @@
*/
ULONG CDECL ldap_ufn2dnA( PCHAR ufn, PCHAR *dn )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
PWCHAR ufnW = NULL, dnW = NULL;
@@ -268,7 +266,7 @@
*
* PARAMS
* ufn [I] User-friendly name to convert.
- * dn [O] Receives a pointer to a string containing the DN.
+ * dn [O] Receives a pointer to a string containing the DN.
*
* RETURNS
* Success: LDAP_SUCCESS
@@ -279,7 +277,7 @@
*/
ULONG CDECL ldap_ufn2dnW( PWCHAR ufn, PWCHAR *dn )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
char *ufnU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/error.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/error.c?…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/error.c (original)
+++ trunk/reactos/dll/win32/wldap32/error.c Thu Nov 29 14:52:05 2007
@@ -32,9 +32,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -132,7 +129,7 @@
*/
ULONG CDECL WLDAP32_ldap_result2error( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res, ULONG
free )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
int error;
Modified: trunk/reactos/dll/win32/wldap32/extended.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/extended…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/extended.c (original)
+++ trunk/reactos/dll/win32/wldap32/extended.c Thu Nov 29 14:52:05 2007
@@ -31,9 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -63,7 +60,7 @@
TRACE( "(%p, 0x%08x)\n", ld, msgid );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
/***********************************************************************
@@ -74,7 +71,7 @@
ULONG CDECL ldap_extended_operationA( WLDAP32_LDAP *ld, PCHAR oid, struct WLDAP32_berval
*data,
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *oidW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -138,7 +135,7 @@
ULONG CDECL ldap_extended_operationW( WLDAP32_LDAP *ld, PWCHAR oid, struct WLDAP32_berval
*data,
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *oidU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -184,7 +181,7 @@
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, PCHAR *retoid,
struct WLDAP32_berval **retdata )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *oidW = NULL, *retoidW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -255,7 +252,7 @@
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, PWCHAR *retoid,
struct WLDAP32_berval **retdata )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *oidU = NULL, *retoidU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/init.c (original)
+++ trunk/reactos/dll/win32/wldap32/init.c Thu Nov 29 14:52:05 2007
@@ -32,9 +32,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -79,7 +76,7 @@
q = p;
i = 0;
-
+
while (*p)
{
if (p[1] != '\0')
@@ -90,7 +87,7 @@
res[i] = strdupU( q );
if (!res[i]) goto oom;
i++;
-
+
while (isspace( *p )) p++;
q = p;
}
@@ -120,7 +117,7 @@
/* Determine if a URL starts with a known LDAP scheme */
static int has_ldap_scheme( char *url )
{
- if (!strncasecmp( url, "ldap://", 7 ) ||
+ if (!strncasecmp( url, "ldap://", 7 ) ||
!strncasecmp( url, "ldaps://", 8 ) ||
!strncasecmp( url, "ldapi://", 8 ) ||
!strncasecmp( url, "cldap://", 8 )) return 1;
@@ -134,11 +131,11 @@
static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnumber )
{
char *res, *p, *q, **v;
- unsigned int i = 0, size = 0;
+ unsigned int i = 0, size = 0;
static const char sep[] = " ", fmt[] = ":%d";
char port[7];
- sprintf( port, fmt, portnumber );
+ sprintf( port, fmt, portnumber );
for (v = hostnames; *v; v++)
{
@@ -153,14 +150,14 @@
size += strlen( *v );
- if (!strchr( q, ':' ))
+ if (!strchr( q, ':' ))
size += strlen( port );
i++;
}
size += (i - 1) * strlen( sep );
-
+
res = HeapAlloc( GetProcessHeap(), 0, size + 1 );
if (!res) return NULL;
@@ -258,7 +255,7 @@
* The hostname string can be a space separated string of hostnames,
* in which case the LDAP runtime will try to connect to the hosts
* in order, until a connection can be made. A hostname may have a
- * trailing portnumber (separated from the hostname by a ':'), which
+ * trailing portnumber (separated from the hostname by a ':'), which
* will take precedence over the portnumber supplied as a parameter
* to this function.
*/
@@ -297,7 +294,7 @@
/***********************************************************************
* ldap_connect (WLDAP32.@)
*
- * Connect to an LDAP server.
+ * Connect to an LDAP server.
*
* PARAMS
* ld [I] Pointer to an LDAP context.
@@ -317,7 +314,7 @@
TRACE( "(%p, %p)\n", ld, timeout );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
- return LDAP_SUCCESS; /* FIXME: do something, e.g. ping the host */
+ return WLDAP32_LDAP_SUCCESS; /* FIXME: do something, e.g. ping the host */
}
/***********************************************************************
@@ -366,7 +363,7 @@
* The hostname string can be a space separated string of hostnames,
* in which case the LDAP runtime will try to connect to the hosts
* in order, until a connection can be made. A hostname may have a
- * trailing portnumber (separated from the hostname by a ':'), which
+ * trailing portnumber (separated from the hostname by a ':'), which
* will take precedence over the portnumber supplied as a parameter
* to this function. The connection will not be made until the first
* LDAP function that needs it is called.
@@ -449,7 +446,7 @@
* The hostname string can be a space separated string of hostnames,
* in which case the LDAP runtime will try to connect to the hosts
* in order, until a connection can be made. A hostname may have a
- * trailing portnumber (separated from the hostname by a ':'), which
+ * trailing portnumber (separated from the hostname by a ':'), which
* will take precedence over the portnumber supplied as a parameter
* to this function.
*/
@@ -531,7 +528,7 @@
* The hostname string can be a space separated string of hostnames,
* in which case the LDAP runtime will try to connect to the hosts
* in order, until a connection can be made. A hostname may have a
- * trailing portnumber (separated from the hostname by a ':'), which
+ * trailing portnumber (separated from the hostname by a ':'), which
* will take precedence over the portnumber supplied as a parameter
* to this function. The connection will not be made until the first
* LDAP function that needs it is called.
@@ -579,7 +576,7 @@
ULONG CDECL ldap_start_tls_sA( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage
**result,
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -630,7 +627,7 @@
ULONG CDECL ldap_start_tls_sW( WLDAP32_LDAP *ld, PULONG retval, WLDAP32_LDAPMessage
**result,
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -665,7 +662,7 @@
ULONG CDECL ldap_startup( PLDAP_VERSION_INFO version, HANDLE *instance )
{
TRACE( "(%p, %p)\n", version, instance );
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
/***********************************************************************
Modified: trunk/reactos/dll/win32/wldap32/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/misc.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/misc.c (original)
+++ trunk/reactos/dll/win32/wldap32/misc.c Thu Nov 29 14:52:05 2007
@@ -32,9 +32,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -57,7 +54,7 @@
*/
ULONG CDECL WLDAP32_ldap_abandon( WLDAP32_LDAP *ld, ULONG msgid )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p, 0x%08x)\n", ld, msgid );
@@ -112,7 +109,7 @@
TRACE( "(%p, %s)\n", ld, debugstr_w(filter) );
if (!ld) return WLDAP32_LDAP_PARAM_ERROR;
- return LDAP_SUCCESS; /* FIXME: do some checks */
+ return WLDAP32_LDAP_SUCCESS; /* FIXME: do some checks */
}
/***********************************************************************
@@ -121,7 +118,7 @@
ULONG CDECL ldap_cleanup( HANDLE instance )
{
TRACE( "(%p)\n", instance );
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
/***********************************************************************
@@ -160,7 +157,7 @@
*/
ULONG CDECL WLDAP32_ldap_count_entries( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p, %p)\n", ld, res );
@@ -187,7 +184,7 @@
*/
ULONG CDECL WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP_COUNT_REFERENCES
TRACE( "(%p, %p)\n", ld, res );
@@ -258,7 +255,7 @@
else
{
escape_filter_element( src, srclen, dst );
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
}
@@ -317,7 +314,7 @@
/***********************************************************************
* ldap_first_attributeW (WLDAP32.@)
*
- * Get the first attribute for a given entry.
+ * Get the first attribute for a given entry.
*
* PARAMS
* ld [I] Pointer to an LDAP context.
@@ -364,7 +361,7 @@
* Failure: NULL
*
* NOTES
- * The returned entry will be freed when the message is freed.
+ * The returned entry will be freed when the message is freed.
*/
WLDAP32_LDAPMessage * CDECL WLDAP32_ldap_first_entry( WLDAP32_LDAP *ld,
WLDAP32_LDAPMessage *res )
{
@@ -442,7 +439,7 @@
*/
ULONG CDECL WLDAP32_ldap_msgfree( WLDAP32_LDAPMessage *res )
{
- ULONG ret = LDAP_SUCCESS;
+ ULONG ret = WLDAP32_LDAP_SUCCESS;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", res );
@@ -633,7 +630,7 @@
* src [I] Wide character string to convert.
* srclen [I] Size of string to convert, in characters.
* dst [O] Pointer to a buffer that receives the converted string.
- * dstlen [I] Size of the destination buffer in characters.
+ * dstlen [I] Size of the destination buffer in characters.
*
* RETURNS
* The number of characters written into the destination buffer.
@@ -655,7 +652,7 @@
* src [I] UTF8 string to convert.
* srclen [I] Size of string to convert, in characters.
* dst [O] Pointer to a buffer that receives the converted string.
- * dstlen [I] Size of the destination buffer in characters.
+ * dstlen [I] Size of the destination buffer in characters.
*
* RETURNS
* The number of characters written into the destination buffer.
Modified: trunk/reactos/dll/win32/wldap32/modify.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modify.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/modify.c (original)
+++ trunk/reactos/dll/win32/wldap32/modify.c Thu Nov 29 14:52:05 2007
@@ -33,10 +33,6 @@
#include <ldap.h>
#endif
-#ifndef LDAP_NOT_SUPPORTED
-#define LDAP_NOT_SUPPORTED 0x5c
-#endif
-
#include "winldap_private.h"
#include "wldap32.h"
@@ -53,7 +49,7 @@
*/
ULONG CDECL ldap_modifyA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **modsW = NULL;
@@ -105,7 +101,7 @@
*/
ULONG CDECL ldap_modifyW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **modsU = NULL;
@@ -150,7 +146,7 @@
ULONG CDECL ldap_modify_extA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[],
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **modsW = NULL;
@@ -218,7 +214,7 @@
ULONG CDECL ldap_modify_extW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[],
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **modsU = NULL;
@@ -270,7 +266,7 @@
ULONG CDECL ldap_modify_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[],
PLDAPControlA *serverctrls, PLDAPControlA *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **modsW = NULL;
@@ -336,7 +332,7 @@
ULONG CDECL ldap_modify_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[],
PLDAPControlW *serverctrls, PLDAPControlW *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **modsU = NULL;
@@ -386,7 +382,7 @@
*/
ULONG CDECL ldap_modify_sA( WLDAP32_LDAP *ld, PCHAR dn, LDAPModA *mods[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL;
LDAPModW **modsW = NULL;
@@ -433,7 +429,7 @@
*/
ULONG CDECL ldap_modify_sW( WLDAP32_LDAP *ld, PWCHAR dn, LDAPModW *mods[] )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL;
LDAPMod **modsU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/modrdn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/modrdn.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/modrdn.c (original)
+++ trunk/reactos/dll/win32/wldap32/modrdn.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -47,7 +45,7 @@
*/
ULONG CDECL ldap_modrdnA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newdnW = NULL;
@@ -96,7 +94,7 @@
*/
ULONG CDECL ldap_modrdnW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *newdnU = NULL;
int msg;
@@ -137,7 +135,7 @@
*/
ULONG CDECL ldap_modrdn2A( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newdnW = NULL;
@@ -187,7 +185,7 @@
*/
ULONG CDECL ldap_modrdn2W( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *newdnU = NULL;
int msg;
@@ -228,7 +226,7 @@
*/
ULONG CDECL ldap_modrdn2_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn, INT delete )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newdnW = NULL;
@@ -273,7 +271,7 @@
*/
ULONG CDECL ldap_modrdn2_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn, INT delete )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *newdnU = NULL;
@@ -308,7 +306,7 @@
*/
ULONG CDECL ldap_modrdn_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR newdn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newdnW = NULL;
@@ -352,7 +350,7 @@
*/
ULONG CDECL ldap_modrdn_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newdn )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *newdnU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/option.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/option.c (original)
+++ trunk/reactos/dll/win32/wldap32/option.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -47,7 +45,7 @@
*/
ULONG CDECL ldap_get_optionA( WLDAP32_LDAP *ld, int option, void *value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p, 0x%08x, %p)\n", ld, option, value );
@@ -159,11 +157,11 @@
case WLDAP32_LDAP_OPT_SSPI_FLAGS:
case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
FIXME( "Unsupported option: 0x%02x\n", option );
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
default:
FIXME( "Unknown option: 0x%02x\n", option );
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
}
#endif
@@ -186,7 +184,7 @@
*/
ULONG CDECL ldap_get_optionW( WLDAP32_LDAP *ld, int option, void *value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p, 0x%08x, %p)\n", ld, option, value );
@@ -265,7 +263,7 @@
case WLDAP32_LDAP_OPT_REBIND_FN:
case WLDAP32_LDAP_OPT_RESTART:
case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
@@ -298,11 +296,11 @@
case WLDAP32_LDAP_OPT_SSPI_FLAGS:
case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
FIXME( "Unsupported option: 0x%02x\n", option );
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
default:
FIXME( "Unknown option: 0x%02x\n", option );
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
}
#endif
@@ -316,7 +314,7 @@
*/
ULONG CDECL ldap_set_optionA( WLDAP32_LDAP *ld, int option, void *value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p, 0x%08x, %p)\n", ld, option, value );
@@ -353,11 +351,11 @@
case WLDAP32_LDAP_OPT_REBIND_FN:
case WLDAP32_LDAP_OPT_RESTART:
case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
case WLDAP32_LDAP_OPT_API_FEATURE_INFO:
case WLDAP32_LDAP_OPT_API_INFO:
- return LDAP_UNWILLING_TO_PERFORM;
+ return WLDAP32_LDAP_UNWILLING_TO_PERFORM;
case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
@@ -389,11 +387,11 @@
case WLDAP32_LDAP_OPT_SSPI_FLAGS:
case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
FIXME( "Unsupported option: 0x%02x\n", option );
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
default:
FIXME( "Unknown option: 0x%02x\n", option );
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
}
#endif
@@ -416,10 +414,10 @@
*
* NOTES
* Set value to LDAP_OPT_ON or LDAP_OPT_OFF for on/off options.
- */
+ */
ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p, 0x%08x, %p)\n", ld, option, value );
@@ -456,11 +454,11 @@
case WLDAP32_LDAP_OPT_REBIND_FN:
case WLDAP32_LDAP_OPT_RESTART:
case WLDAP32_LDAP_OPT_THREAD_FN_PTRS:
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
case WLDAP32_LDAP_OPT_API_FEATURE_INFO:
case WLDAP32_LDAP_OPT_API_INFO:
- return LDAP_UNWILLING_TO_PERFORM;
+ return WLDAP32_LDAP_UNWILLING_TO_PERFORM;
case WLDAP32_LDAP_OPT_AREC_EXCLUSIVE:
case WLDAP32_LDAP_OPT_AUTO_RECONNECT:
@@ -492,11 +490,11 @@
case WLDAP32_LDAP_OPT_SSPI_FLAGS:
case WLDAP32_LDAP_OPT_TCP_KEEPALIVE:
FIXME( "Unsupported option: 0x%02x\n", option );
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
default:
FIXME( "Unknown option: 0x%02x\n", option );
- return LDAP_LOCAL_ERROR;
+ return WLDAP32_LDAP_LOCAL_ERROR;
}
#endif
Modified: trunk/reactos/dll/win32/wldap32/page.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/page.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/page.c (original)
+++ trunk/reactos/dll/win32/wldap32/page.c Thu Nov 29 14:52:05 2007
@@ -31,9 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -53,7 +50,7 @@
ULONG CDECL ldap_create_page_controlA( WLDAP32_LDAP *ld, ULONG pagesize,
struct WLDAP32_berval *cookie, UCHAR critical, PLDAPControlA *control )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControlW *controlW = NULL;
@@ -126,7 +123,7 @@
*control = ctrl;
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
#endif /* HAVE_LDAP */
@@ -162,7 +159,7 @@
return create_page_control( pagesize, cookie, critical, control );
#else
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
#endif
}
@@ -172,7 +169,7 @@
FIXME( "(%p, %p, 0x%08x, %p)\n", ld, search, pagesize, message );
if (!ld) return ~0UL;
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
}
ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search,
@@ -183,13 +180,13 @@
pagesize, count, results );
if (!ld) return ~0UL;
- return LDAP_NOT_SUPPORTED;
+ return WLDAP32_LDAP_NOT_SUPPORTED;
}
ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search,
ULONG *count, WLDAP32_LDAPMessage *results )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results );
@@ -206,7 +203,7 @@
ULONG CDECL ldap_parse_page_controlA( WLDAP32_LDAP *ld, PLDAPControlA *ctrls,
ULONG *count, struct WLDAP32_berval **cookie )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControlW **ctrlsW = NULL;
@@ -220,7 +217,7 @@
ret = ldap_parse_page_controlW( ld, ctrlsW, count, cookie );
controlarrayfreeW( ctrlsW );
-
+
#endif
return ret;
}
@@ -231,7 +228,7 @@
ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls,
ULONG *count, struct WLDAP32_berval **cookie )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControlW *control = NULL;
BerElement *ber;
@@ -250,8 +247,8 @@
}
if (!control)
- return WLDAP32_LDAP_CONTROL_NOT_FOUND;
-
+ return WLDAP32_LDAP_CONTROL_NOT_FOUND;
+
ber = ber_init( &((LDAPControl *)control)->ldctl_value );
if (!ber)
return WLDAP32_LDAP_NO_MEMORY;
@@ -260,10 +257,10 @@
if ( tag == LBER_ERROR )
ret = WLDAP32_LDAP_DECODING_ERROR;
else
- ret = LDAP_SUCCESS;
+ ret = WLDAP32_LDAP_SUCCESS;
ber_free( ber, 1 );
-
+
#endif
return ret;
}
@@ -273,7 +270,7 @@
FIXME( "(%p, %p)\n", ld, search );
if (!ld) return ~0UL;
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope,
Modified: trunk/reactos/dll/win32/wldap32/parse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/parse.c (original)
+++ trunk/reactos/dll/win32/wldap32/parse.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -48,7 +46,7 @@
ULONG CDECL ldap_parse_extended_resultA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
PCHAR *oid, struct WLDAP32_berval **data, BOOLEAN free )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *oidW = NULL;
@@ -72,7 +70,7 @@
/***********************************************************************
* ldap_parse_extended_resultW (WLDAP32.@)
*
- * Parse the result of an extended operation.
+ * Parse the result of an extended operation.
*
* PARAMS
* ld [I] Pointer to an LDAP context.
@@ -92,7 +90,7 @@
ULONG CDECL ldap_parse_extended_resultW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *result,
PWCHAR *oid, struct WLDAP32_berval **data, BOOLEAN free )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *oidU = NULL;
@@ -121,7 +119,7 @@
ULONG CDECL ldap_parse_referenceA( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
PCHAR **referrals )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR **referralsW = NULL;
@@ -134,7 +132,7 @@
*referrals = strarrayWtoA( referralsW );
ldap_value_freeW( referralsW );
-#endif
+#endif
return ret;
}
@@ -158,14 +156,14 @@
ULONG CDECL ldap_parse_referenceW( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *message,
PWCHAR **referrals )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP_PARSE_REFERENCE
char **referralsU = NULL;
TRACE( "(%p, %p, %p)\n", ld, message, referrals );
if (!ld) return ~0UL;
-
+
ret = ldap_parse_reference( ld, message, &referralsU, NULL, 0 );
*referrals = strarrayUtoW( referralsU );
@@ -184,7 +182,7 @@
ULONG *retcode, PCHAR *matched, PCHAR *error, PCHAR **referrals,
PLDAPControlA **serverctrls, BOOLEAN free )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR **matchedW = NULL, **errorW = NULL, **referralsW = NULL;
LDAPControlW **serverctrlsW = NULL;
@@ -215,7 +213,7 @@
/***********************************************************************
* ldap_parse_resultW (WLDAP32.@)
*
- * Parse a result message.
+ * Parse a result message.
*
* PARAMS
* ld [I] Pointer to an LDAP context.
@@ -241,7 +239,7 @@
ULONG *retcode, PWCHAR *matched, PWCHAR *error, PWCHAR **referrals,
PLDAPControlW **serverctrls, BOOLEAN free )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char **matchedU = NULL, **errorU = NULL, **referralsU = NULL;
LDAPControl **serverctrlsU = NULL;
@@ -277,7 +275,7 @@
ULONG CDECL ldap_parse_sort_controlA( WLDAP32_LDAP *ld, PLDAPControlA *control,
ULONG *result, PCHAR *attr )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *attrW = NULL;
LDAPControlW **controlW = NULL;
@@ -321,11 +319,17 @@
ULONG CDECL ldap_parse_sort_controlW( WLDAP32_LDAP *ld, PLDAPControlW *control,
ULONG *result, PWCHAR *attr )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *attrU = NULL;
LDAPControl **controlU = NULL;
+#ifdef HAVE_LDAP_PARSE_SORT_CONTROL
unsigned long res;
+#elif defined(HAVE_LDAP_PARSE_SORTRESPONSE_CONTROL)
+ ber_int_t res;
+ LDAPControl *sortcontrol = NULL;
+ unsigned int i;
+#endif
TRACE( "(%p, %p, %p, %p)\n", ld, control, result, attr );
@@ -336,10 +340,29 @@
if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
}
- ret = ldap_parse_sort_control( ld, controlU, &res, &attrU );
-
- *result = res;
- *attr = strUtoW( attrU );
+#ifdef HAVE_LDAP_PARSE_SORT_CONTROL
+ if (!(ret = ldap_parse_sort_control( ld, controlU, &res, &attrU )))
+ {
+ *result = res;
+ *attr = strUtoW( attrU );
+ }
+#elif defined(HAVE_LDAP_PARSE_SORTRESPONSE_CONTROL)
+ for (i = 0; controlU[i]; i++)
+ {
+ if (!strcmp( LDAP_SERVER_RESP_SORT_OID, controlU[i]->ldctl_oid ))
+ sortcontrol = controlU[i];
+ }
+ if (!sortcontrol)
+ {
+ controlarrayfreeU( controlU );
+ return WLDAP32_LDAP_CONTROL_NOT_FOUND;
+ }
+ if (!(ret = ldap_parse_sortresponse_control( ld, sortcontrol, &res, &attrU
)))
+ {
+ *result = res;
+ *attr = strUtoW( attrU );
+ }
+#endif
controlarrayfreeU( controlU );
#endif
@@ -355,7 +378,7 @@
PULONG targetpos, PULONG listcount,
struct WLDAP32_berval **context, PINT errcode )
{
- int ret = LDAP_NOT_SUPPORTED;
+ int ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControlW **controlW = NULL;
@@ -386,7 +409,7 @@
* PARAMS
* ld [I] Pointer to an LDAP context.
* control [I] Controls obtained from a result message.
- * targetpos [O] Positition of the target in the result list.
+ * targetpos [O] Positition of the target in the result list.
* listcount [O] Estimate of the number of results in the list.
* context [O] Server side context.
* errcode [O] Error code from the listview operation.
@@ -402,10 +425,16 @@
PULONG targetpos, PULONG listcount,
struct WLDAP32_berval **context, PINT errcode )
{
- int ret = LDAP_NOT_SUPPORTED;
+ int ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
LDAPControl **controlU = NULL;
+#ifdef HAVE_LDAP_PARSE_VLV_CONTROL
unsigned long pos, count;
+#elif defined(HAVE_LDAP_PARSE_VLVRESPONSE_CONTROL)
+ ber_int_t pos, count;
+ LDAPControl *vlvcontrol = NULL;
+ unsigned int i;
+#endif
TRACE( "(%p, %p, %p, %p, %p, %p)\n", ld, control, targetpos,
listcount, context, errcode );
@@ -417,11 +446,31 @@
if (!controlU) return WLDAP32_LDAP_NO_MEMORY;
}
- ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,
- (struct berval **)context, errcode );
-
- *targetpos = pos;
- *listcount = count;
+#ifdef HAVE_LDAP_PARSE_VLV_CONTROL
+ if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count,
+ (struct berval **)context, errcode )))
+ {
+ *targetpos = pos;
+ *listcount = count;
+ }
+#elif defined(HAVE_LDAP_PARSE_VLVRESPONSE_CONTROL)
+ for (i = 0; controlU[i]; i++)
+ {
+ if (!strcmp( LDAP_CONTROL_VLVRESPONSE, controlU[i]->ldctl_oid ))
+ vlvcontrol = controlU[i];
+ }
+ if (!vlvcontrol)
+ {
+ controlarrayfreeU( controlU );
+ return WLDAP32_LDAP_CONTROL_NOT_FOUND;
+ }
+ if (!(ret = ldap_parse_vlvresponse_control( ld, vlvcontrol, &pos, &count,
+ (struct berval **)context, errcode )))
+ {
+ *targetpos = pos;
+ *listcount = count;
+ }
+#endif
controlarrayfreeU( controlU );
#endif
Modified: trunk/reactos/dll/win32/wldap32/rename.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/rename.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/rename.c (original)
+++ trunk/reactos/dll/win32/wldap32/rename.c Thu Nov 29 14:52:05 2007
@@ -31,8 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -49,7 +47,7 @@
PCHAR newparent, INT delete, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newrdnW = NULL, *newparentW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -125,7 +123,7 @@
PWCHAR newparent, INT delete, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *newrdnU = NULL, *newparentU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -182,7 +180,7 @@
PCHAR newparent, INT delete, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *dnW = NULL, *newrdnW = NULL, *newparentW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -246,12 +244,12 @@
* RETURNS
* Success: LDAP_SUCCESS
* Failure: An LDAP error code.
- */
+ */
ULONG CDECL ldap_rename_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR newrdn,
PWCHAR newparent, INT delete, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *dnU = NULL, *newrdnU = NULL, *newparentU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/search.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/search.c (original)
+++ trunk/reactos/dll/win32/wldap32/search.c Thu Nov 29 14:52:05 2007
@@ -31,9 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -49,7 +46,7 @@
ULONG CDECL ldap_searchA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
PCHAR attrs[], ULONG attrsonly )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL;
@@ -110,7 +107,7 @@
ULONG CDECL ldap_searchW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
PWCHAR attrs[], ULONG attrsonly )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *baseU = NULL, *filterU = NULL, **attrsU = NULL;
int msg;
@@ -161,7 +158,7 @@
PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, ULONG timelimit, ULONG sizelimit, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -242,7 +239,7 @@
PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, ULONG *message )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *baseU = NULL, *filterU = NULL, **attrsU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -303,7 +300,7 @@
PCHAR filter, PCHAR attrs[], ULONG attrsonly, PLDAPControlA *serverctrls,
PLDAPControlA *clientctrls, struct l_timeval* timeout, ULONG sizelimit,
WLDAP32_LDAPMessage **res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL;
LDAPControlW **serverctrlsW = NULL, **clientctrlsW = NULL;
@@ -381,7 +378,7 @@
PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls,
PLDAPControlW *clientctrls, struct l_timeval* timeout, ULONG sizelimit,
WLDAP32_LDAPMessage **res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *baseU = NULL, *filterU = NULL, **attrsU = NULL;
LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL;
@@ -437,7 +434,7 @@
ULONG CDECL ldap_search_sA( WLDAP32_LDAP *ld, PCHAR base, ULONG scope, PCHAR filter,
PCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL;
@@ -497,7 +494,7 @@
ULONG CDECL ldap_search_sW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter,
PWCHAR attrs[], ULONG attrsonly, WLDAP32_LDAPMessage **res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *baseU = NULL, *filterU = NULL, **attrsU = NULL;
@@ -542,7 +539,7 @@
const PCHAR filter, PCHAR attrs[], ULONG attrsonly,
struct l_timeval *timeout, WLDAP32_LDAPMessage **res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR *baseW = NULL, *filterW = NULL, **attrsW = NULL;
@@ -606,7 +603,7 @@
const PWCHAR filter, PWCHAR attrs[], ULONG attrsonly,
struct l_timeval *timeout, WLDAP32_LDAPMessage **res )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
char *baseU = NULL, *filterU = NULL, **attrsU = NULL;
Modified: trunk/reactos/dll/win32/wldap32/value.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/value.c?…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/value.c (original)
+++ trunk/reactos/dll/win32/wldap32/value.c Thu Nov 29 14:52:05 2007
@@ -31,9 +31,6 @@
#ifdef HAVE_LDAP_H
#include <ldap.h>
-#else
-#define LDAP_SUCCESS 0x00
-#define LDAP_NOT_SUPPORTED 0x5c
#endif
#include "winldap_private.h"
@@ -59,7 +56,7 @@
*/
ULONG CDECL WLDAP32_ldap_count_values_len( struct WLDAP32_berval **vals )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
TRACE( "(%p)\n", vals );
@@ -76,7 +73,7 @@
*/
ULONG CDECL ldap_count_valuesA( PCHAR *vals )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR **valsW = NULL;
@@ -112,7 +109,7 @@
*/
ULONG CDECL ldap_count_valuesW( PWCHAR *vals )
{
- ULONG ret = LDAP_NOT_SUPPORTED;
+ ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED;
#ifdef HAVE_LDAP
WCHAR **p = vals;
@@ -193,9 +190,9 @@
while (i > 0) HeapFree( GetProcessHeap(), 0, str[--i] );
HeapFree( GetProcessHeap(), 0, str );
return NULL;
- }
+ }
i++;
- p++;
+ p++;
}
str[i] = NULL;
return str;
@@ -340,7 +337,7 @@
ldap_value_free_len( (struct berval **)vals );
#endif
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
/***********************************************************************
@@ -353,7 +350,7 @@
TRACE( "(%p)\n", vals );
strarrayfreeA( vals );
- return LDAP_SUCCESS;
+ return WLDAP32_LDAP_SUCCESS;
}
/***********************************************************************
@@ -373,5 +370,5 @@
TRACE( "(%p)\n", vals );
strarrayfreeW( vals );
- return LDAP_SUCCESS;
-}
+ return WLDAP32_LDAP_SUCCESS;
+}
Modified: trunk/reactos/dll/win32/wldap32/winldap_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/winldap_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/winldap_private.h (original)
+++ trunk/reactos/dll/win32/wldap32/winldap_private.h Thu Nov 29 14:52:05 2007
@@ -23,6 +23,8 @@
*/
typedef enum {
+ WLDAP32_LDAP_SUCCESS = 0x00,
+ WLDAP32_LDAP_UNWILLING_TO_PERFORM = 0x35,
WLDAP32_LDAP_SERVER_DOWN = 0x51,
WLDAP32_LDAP_LOCAL_ERROR = 0x52,
WLDAP32_LDAP_ENCODING_ERROR = 0x53,
@@ -189,6 +191,14 @@
#define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319"
#define LDAP_PAGED_RESULT_OID_STRING_W (const WCHAR
[]){'1','.','2','.', \
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0}
+
+#define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474"
+#define LDAP_SERVER_RESP_SORT_OID_W (const WCHAR
[]){'1','.','2','.', \
+
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0}
+
+#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10"
+#define LDAP_CONTROL_VLVRESPONSE_W (const WCHAR
[]){'2','.','1','6','.', \
+
'8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0}
typedef struct ldapcontrolA
{
Modified: trunk/reactos/dll/win32/wldap32/wldap32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32.h (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32.h Thu Nov 29 14:52:05 2007
@@ -443,8 +443,8 @@
}
controlW->ldctl_oid = strAtoW( control->ldctl_oid );
- controlW->ldctl_value.bv_len = len;
- controlW->ldctl_value.bv_val = val;
+ controlW->ldctl_value.bv_len = len;
+ controlW->ldctl_value.bv_val = val;
controlW->ldctl_iscritical = control->ldctl_iscritical;
return controlW;
@@ -471,7 +471,7 @@
}
controlA->ldctl_oid = strWtoA( control->ldctl_oid );
- controlA->ldctl_value.bv_len = len;
+ controlA->ldctl_value.bv_len = len;
controlA->ldctl_value.bv_val = val;
controlA->ldctl_iscritical = control->ldctl_iscritical;
@@ -499,8 +499,8 @@
}
controlU->ldctl_oid = strWtoU( control->ldctl_oid );
- controlU->ldctl_value.bv_len = len;
- controlU->ldctl_value.bv_val = val;
+ controlU->ldctl_value.bv_len = len;
+ controlU->ldctl_value.bv_val = val;
controlU->ldctl_iscritical = control->ldctl_iscritical;
return controlU;
@@ -527,10 +527,10 @@
}
controlW->ldctl_oid = strUtoW( control->ldctl_oid );
- controlW->ldctl_value.bv_len = len;
- controlW->ldctl_value.bv_val = val;
+ controlW->ldctl_value.bv_len = len;
+ controlW->ldctl_value.bv_val = val;
controlW->ldctl_iscritical = control->ldctl_iscritical;
-
+
return controlW;
}
Modified: trunk/reactos/dll/win32/wldap32/wldap32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32.rbuild (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32.rbuild Thu Nov 29 14:52:05 2007
@@ -1,12 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="wldap32" type="win32dll"
baseaddress="${BASEADDRESS_WLDAP32}" installbase="system32"
installname="wldap32.dll" allowwarnings="true">
<importlibrary definition="wldap32.spec.def" />
<include base="wldap32">.</include>
<include base="ReactOS">include/reactos/wine</include>
- <define name="__REACTOS__" />
<define name="__WINESRC__" />
- <define name="_WIN32_IE">0x600</define>
- <define name="_WIN32_WINNT">0x501</define>
- <define name="WINVER">0x501</define>
+ <define name="WINVER">0x600</define>
+ <define name="_WIN32_WINNT">0x600</define>
<library>wine</library>
<library>user32</library>
<library>kernel32</library>
Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32.rc (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32.rc Thu Nov 29 14:52:05 2007
@@ -30,4 +30,5 @@
#include "wldap32_Nl.rc"
#include "wldap32_No.rc"
#include "wldap32_Ru.rc"
+#include "wldap32_Sv.rc"
#include "wldap32_Tr.rc"
Modified: trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32_Fr.rc Thu Nov 29 14:52:05 2007
@@ -117,7 +117,7 @@
92 "Opération non supportée par cette version du protocole LDAP"
93 "Le contrôle spécifié n'a pas été trouvé dans le message"
94 "Pas de résultat dans le message"
- 95 "Plusde résultats retournés"
+ 95 "Plus de résultats retournés"
96 "Boucle lors du traitement des référants"
97 "Limite du nombre de référents dépassée"
}
Modified: trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32_Ko.rc Thu Nov 29 14:52:05 2007
@@ -2,7 +2,7 @@
* Korean resources for WLDAP32
*
* Copyright 2005 YunSong Hwang
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
Modified: trunk/reactos/dll/win32/wldap32/wldap32_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32_No.rc (original)
+++ trunk/reactos/dll/win32/wldap32/wldap32_No.rc Thu Nov 29 14:52:05 2007
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE DISCARDABLE
{
Added: trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32_…
==============================================================================
--- trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc (added)
+++ trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc Thu Nov 29 14:52:05 2007
@@ -1,0 +1,123 @@
+/*
+ * Swedish resources for WLDAP32
+ *
+ * Copyright 2007 Daniel Nylander
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+ 0 "Lyckades"
+ 1 "Operations Error"
+ 2 "Protokollfel"
+ 3 "Time Limit Exceeded"
+ 4 "Size Limit Exceeded"
+ 5 "Compare False"
+ 6 "Compare True"
+ 7 "Authentication Method Not Supported"
+ 8 "Strong Authentication Required"
+ 9 "Referral (v2)"
+ 10 "Referral"
+ 11 "Administration Limit Exceeded"
+ 12 "Unavailable Critical Extension"
+ 13 "Confidentiality Required"
+ 14 ""
+ 15 ""
+ 16 "Inget sådant attribut"
+ 17 "Odefinierad typ"
+ 18 "Inappropriate Matching"
+ 19 "Constraint Violation"
+ 20 "Attribut eller värde finns"
+ 21 "Ogiltig syntax"
+ 22 ""
+ 23 ""
+ 24 ""
+ 25 ""
+ 26 ""
+ 27 ""
+ 28 ""
+ 29 ""
+ 30 ""
+ 31 ""
+ 32 "Inget sådant objekt"
+ 33 "Alias Problem"
+ 34 "Invalid DN Syntax"
+ 35 "Is Leaf"
+ 36 "Alias Dereference Problem"
+ 37 ""
+ 38 ""
+ 39 ""
+ 40 ""
+ 41 ""
+ 42 ""
+ 43 ""
+ 44 ""
+ 45 ""
+ 46 ""
+ 47 ""
+ 48 "Inappropriate Authentication"
+ 49 "Invalid Credentials"
+ 50 "Insufficient Rights"
+ 51 "Upptagen"
+ 52 "Otillgänglig"
+ 53 "Unwilling To Perform"
+ 54 "Loop Detected"
+ 55 ""
+ 56 ""
+ 57 ""
+ 58 ""
+ 59 ""
+ 60 "Sort Control Missing"
+ 61 "Index range error"
+ 62 ""
+ 63 ""
+ 64 "Naming Violation"
+ 65 "Object Class Violation"
+ 66 "Not allowed on Non-leaf"
+ 67 "Not allowed on RDN"
+ 68 "Finns redan"
+ 69 "No Object Class Mods"
+ 70 "Results Too Large"
+ 71 "Affects Multiple DSAs"
+ 72 ""
+ 73 ""
+ 74 ""
+ 75 ""
+ 76 ""
+ 77 ""
+ 78 ""
+ 79 ""
+ 80 "Other"
+ 81 "Server Down"
+ 82 "Lokalt fel"
+ 83 "Encoding Error"
+ 84 "Decoding Error"
+ 85 "Tidsgräns överstigen"
+ 86 "Auth Unknown"
+ 87 "Filter Error"
+ 88 "User Cancelled"
+ 89 "Parameter Error"
+ 90 "No Memory"
+ 91 "Can't connect to the LDAP server"
+ 92 "Operation not supported by this version of the LDAP protocol"
+ 93 "Specified control was not found in message"
+ 94 "No result present in message"
+ 95 "More results returned"
+ 96 "Loop while handling referrals"
+ 97 "Referral hop limit exceeded"
+}
Propchange: trunk/reactos/dll/win32/wldap32/wldap32_Sv.rc
------------------------------------------------------------------------------
svn:eol-style = native