From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 5 Mar 2016 11:01:59 +0000 (+0000)
Subject: [WLDAP32] Sync with Wine Staging 1.9.4. CORE-10912
X-Git-Tag: ReactOS-0.4.1~265
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=eff9d67cf244d55b96c2d50019a45f7932fe6211

[WLDAP32] Sync with Wine Staging 1.9.4. CORE-10912

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

diff --git a/reactos/dll/win32/wldap32/control.c b/reactos/dll/win32/wldap32/control.c
index c75e31e07ac..dfe79863024 100644
--- a/reactos/dll/win32/wldap32/control.c
+++ b/reactos/dll/win32/wldap32/control.c
@@ -258,15 +258,37 @@ INT CDECL ldap_create_vlv_controlW( WLDAP32_LDAP *ld, WLDAP32_LDAPVLVInfo *info,
     return ret;
 }
 
+static inline void bv_val_dup( const struct WLDAP32_berval *src, struct WLDAP32_berval *dst )
+{
+    dst->bv_val = HeapAlloc( GetProcessHeap(), 0, src->bv_len );
+    if (dst->bv_val)
+    {
+        memcpy( dst->bv_val, src->bv_val, src->bv_len );
+        dst->bv_len = src->bv_len;
+    }
+    else
+        dst->bv_len = 0;
+}
+
 /***********************************************************************
  *      ldap_encode_sort_controlA     (WLDAP32.@)
  *
  * See ldap_encode_sort_controlW.
  */
 ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys,
-    PLDAPControlA control, BOOLEAN critical )
+    PLDAPControlA ret, BOOLEAN critical )
 {
-    return ldap_create_sort_controlA( ld, sortkeys, critical, &control );
+    LDAPControlA *control = NULL;
+    ULONG result;
+
+    if ((result = ldap_create_sort_controlA( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS)
+    {
+        ret->ldctl_oid = strdupU(control->ldctl_oid);
+        bv_val_dup( &control->ldctl_value, &ret->ldctl_value );
+        ret->ldctl_iscritical = control->ldctl_iscritical;
+        ldap_control_freeA( control );
+    }
+    return result;
 }
 
 /***********************************************************************
@@ -292,9 +314,19 @@ ULONG CDECL ldap_encode_sort_controlA( WLDAP32_LDAP *ld, PLDAPSortKeyA *sortkeys
  *  ldap_create_sort_control instead.
  */
 ULONG CDECL ldap_encode_sort_controlW( WLDAP32_LDAP *ld, PLDAPSortKeyW *sortkeys,
-    PLDAPControlW control, BOOLEAN critical )
+    PLDAPControlW ret, BOOLEAN critical )
 {
-    return ldap_create_sort_controlW( ld, sortkeys, critical, &control );
+    LDAPControlW *control = NULL;
+    ULONG result;
+
+    if ((result = ldap_create_sort_controlW( ld, sortkeys, critical, &control )) == WLDAP32_LDAP_SUCCESS)
+    {
+        ret->ldctl_oid = strdupW(control->ldctl_oid);
+        bv_val_dup( &control->ldctl_value, &ret->ldctl_value );
+        ret->ldctl_iscritical = control->ldctl_iscritical;
+        ldap_control_freeW( control );
+    }
+    return result;
 }
 
 /***********************************************************************
diff --git a/reactos/dll/win32/wldap32/wldap32.h b/reactos/dll/win32/wldap32/wldap32.h
index 09aa9f26318..5a58fe8583b 100644
--- a/reactos/dll/win32/wldap32/wldap32.h
+++ b/reactos/dll/win32/wldap32/wldap32.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include <wine/unicode.h>
+
 extern HINSTANCE hwldap32 DECLSPEC_HIDDEN;
 
 ULONG map_error( int ) DECLSPEC_HIDDEN;
@@ -39,6 +41,17 @@ static inline char *strdupU( const char *src )
     return dst;
 }
 
+static inline WCHAR *strdupW( const WCHAR *src )
+{
+    WCHAR *dst;
+
+    if (!src) return NULL;
+    dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) );
+    if (dst)
+        strcpyW( dst, src );
+    return dst;
+}
+
 static inline LPWSTR strAtoW( LPCSTR str )
 {
     LPWSTR ret = NULL;
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 29394822c68..a7f299c3244 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -211,7 +211,7 @@ reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/winscard            # Synced to WineStaging-1.7.55
 reactos/dll/win32/wintrust            # Synced to WineStaging-1.7.55
-reactos/dll/win32/wldap32             # Synced to WineStaging-1.7.55
+reactos/dll/win32/wldap32             # Synced to WineStaging-1.9.4
 reactos/dll/win32/wmi                 # Synced to WineStaging-1.7.55
 reactos/dll/win32/wmiutils            # Synced to WineStaging-1.7.55
 reactos/dll/win32/wmvcore             # Synced to WineStaging-1.7.55