ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/trunk/; revision=70950
This commit is contained in:
Amine Khaldi
2016-03-05 11:01:59 +00:00
parent d3b1ceab03
commit eff9d67cf2
3 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/wldap32/control.c
+36 -4
View File
@@ -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;
}
/***********************************************************************
reactos/dll/win32/wldap32/wldap32.h
+13
View File
@@ -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;
reactos/media/doc/README.WINE
+1 -1
View File
@@ -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